smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-18 12:46:32 +01:00
Code Issues Projects Releases Wiki Activity

Fix broken whitespace (no functional changes).

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9288 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2011-04-04 22:46:48 +00:00
parent 847e8f0610
commit 62e730b57a
11 changed files with 561 additions and 560 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libs/ardour/audio_track.cc
View file

@ -249,7 +249,6 @@ AudioTrack::_set_state (const XMLNode& node, int version, bool call_base)
} }
} }
pending_state = const_cast<XMLNode*> (&node); pending_state = const_cast<XMLNode*> (&node);
if (_session.state_of_the_state() & Session::Loading) { if (_session.state_of_the_state() & Session::Loading) {
@ -506,10 +505,12 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
/* final argument: don't waste time with automation if we're recording or we've just stopped (yes it can happen) */ /* final argument: don't waste time with automation if we're recording or we've just stopped (yes it can happen) */
process_output_buffers (bufs, start_frame, end_frame, nframes, (!_session.get_record_enabled() || !Config->get_do_not_record_plugins()), declick, process_output_buffers (
bufs, start_frame, end_frame, nframes,
(!_session.get_record_enabled() || !Config->get_do_not_record_plugins()),
declick,
(!diskstream->record_enabled() && _session.transport_rolling())); (!diskstream->record_enabled() && _session.transport_rolling()));
} else { } else {
/* problem with the diskstream; just be quiet for a bit */ /* problem with the diskstream; just be quiet for a bit */
silence (nframes); silence (nframes);

9
libs/ardour/audio_unit.cc
View file

@ -133,7 +133,8 @@ _get_transport_state_callback (void* userData,
Float64* outCycleEndBeat) Float64* outCycleEndBeat)
{ {
if (userData) { if (userData) {
return ((AUPlugin*)userData)->get_transport_state_callback (outIsPlaying, outTransportStateChanged, return ((AUPlugin*)userData)->get_transport_state_callback (
outIsPlaying, outTransportStateChanged,
outCurrentSampleInTimeLine, outIsCycling, outCurrentSampleInTimeLine, outIsCycling,
outCycleStartBeat, outCycleEndBeat); outCycleStartBeat, outCycleEndBeat);
} }
@ -162,9 +163,11 @@ save_property_list (CFPropertyListRef propertyList, Glib::ustring path)
fd = open (path.c_str(), O_WRONLY|O_CREAT|O_EXCL, 0664); fd = open (path.c_str(), O_WRONLY|O_CREAT|O_EXCL, 0664);
while (fd < 0) { while (fd < 0) {
if (errno == EEXIST) { if (errno == EEXIST) {
error << string_compose (_("Preset file %1 exists; not overwriting"), path); error << string_compose (_("Preset file %1 exists; not overwriting"),
path) << endmsg;
} else { } else {
error << string_compose (_("Cannot open preset file %1 (%2)"), path, strerror (errno)) << endmsg; error << string_compose (_("Cannot open preset file %1 (%2)"),
path, strerror (errno)) << endmsg;
} }
CFRelease (xmlData); CFRelease (xmlData);
return -1; return -1;

1
libs/ardour/import.cc
View file

@ -17,7 +17,6 @@
*/ */
#ifdef WAF_BUILD #ifdef WAF_BUILD
#include "libardour-config.h" #include "libardour-config.h"
#endif #endif

6
libs/ardour/playlist.cc
View file

@ -102,7 +102,8 @@ void
Playlist::make_property_quarks () Playlist::make_property_quarks ()
{ {
Properties::regions.property_id = g_quark_from_static_string (X_("regions")); Properties::regions.property_id = g_quark_from_static_string (X_("regions"));
DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for regions = %1\n", Properties::regions.property_id)); DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for regions = %1\n",
Properties::regions.property_id));
} }
RegionListProperty::RegionListProperty (Playlist& pl) RegionListProperty::RegionListProperty (Playlist& pl)
@ -167,14 +168,12 @@ Playlist::Playlist (Session& sess, string nom, DataType type, bool hide)
first_set_state = false; first_set_state = false;
_name = nom; _name = nom;
_set_sort_id (); _set_sort_id ();
} }
Playlist::Playlist (Session& sess, const XMLNode& node, DataType type, bool hide) Playlist::Playlist (Session& sess, const XMLNode& node, DataType type, bool hide)
: SessionObject(sess, "unnamed playlist") : SessionObject(sess, "unnamed playlist")
, regions (*this) , regions (*this)
, _type(type) , _type(type)
{ {
#ifndef NDEBUG #ifndef NDEBUG
const XMLProperty* prop = node.property("type"); const XMLProperty* prop = node.property("type");
@ -477,7 +476,6 @@ Playlist::release_notifications (bool from_undo)
if (g_atomic_int_dec_and_test (&block_notifications)) { if (g_atomic_int_dec_and_test (&block_notifications)) {
flush_notifications (from_undo); flush_notifications (from_undo);
} }
} }
void void