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

Just some whitespace fixes from where it looks like I've been working

Browse source 
without my editor configured correctly and haven't noticed. Sorry about
that.


git-svn-id: svn://localhost/ardour2/trunk@849 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Tim Mayberry 2006-08-24 11:55:23 +00:00
parent 3bba45c773
commit 7e95f29ce9
2 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libs/ardour/audioengine.cc
View file

@ -64,14 +64,14 @@ AudioEngine::AudioEngine (string client_name)
_freewheeling = false; _freewheeling = false;
_freewheel_thread_registered = false; _freewheel_thread_registered = false;
m_meter_thread = 0; m_meter_thread = 0;
m_meter_exit = false; m_meter_exit = false;
if (connect_to_jack (client_name)) { if (connect_to_jack (client_name)) {
throw NoBackendAvailable (); throw NoBackendAvailable ();
} }
start_metering_thread(); start_metering_thread();
} }
@ -207,7 +207,7 @@ AudioEngine::_xrun_callback (void *arg)
int int
AudioEngine::_graph_order_callback (void *arg) AudioEngine::_graph_order_callback (void *arg)
{ {
static_cast<AudioEngine *>(arg)->GraphReordered (); /* EMIT SIGNAL */ static_cast<AudioEngine *>(arg)->GraphReordered (); /* EMIT SIGNAL */
return 0; return 0;
} }
@ -349,9 +349,9 @@ AudioEngine::jack_bufsize_callback (jack_nframes_t nframes)
void void
AudioEngine::start_metering_thread () AudioEngine::start_metering_thread ()
{ {
if(m_meter_thread == 0) { if(m_meter_thread == 0) {
m_meter_thread = Glib::Thread::create (sigc::mem_fun(this, &AudioEngine::meter_thread), false); m_meter_thread = Glib::Thread::create (sigc::mem_fun(this, &AudioEngine::meter_thread), false);
} }
} }
void void

19
libs/ardour/io.cc
View file

@ -131,18 +131,19 @@ IO::IO (Session& s, string name,
_gain_automation_state = Off; _gain_automation_state = Off;
_gain_automation_style = Absolute; _gain_automation_style = Absolute;
{ {
// IO::Meter is emitted from another thread so the // IO::Meter is emitted from another thread so the
// Meter signal must be protected. // Meter signal must be protected.
Glib::Mutex::Lock guard (m_meter_signal_lock); Glib::Mutex::Lock guard (m_meter_signal_lock);
m_meter_connection = Meter.connect (mem_fun (*this, &IO::meter)); m_meter_connection = Meter.connect (mem_fun (*this, &IO::meter));
} }
} }
IO::~IO () IO::~IO ()
{ {
Glib::Mutex::Lock guard (m_meter_signal_lock); Glib::Mutex::Lock guard (m_meter_signal_lock);
Glib::Mutex::Lock lm (io_lock); Glib::Mutex::Lock lm (io_lock);
vector<Port *>::iterator i; vector<Port *>::iterator i;
@ -154,7 +155,7 @@ IO::~IO ()
_session.engine().unregister_port (*i); _session.engine().unregister_port (*i);
} }
m_meter_connection.disconnect(); m_meter_connection.disconnect();
} }
void void
@ -977,7 +978,7 @@ IO::disconnect_inputs (void* src)
drop_input_connection (); drop_input_connection ();
} }
} }
input_changed (ConnectionsChanged, src); /* EMIT SIGNAL */ input_changed (ConnectionsChanged, src); /* EMIT SIGNAL */
return 0; return 0;
} }