From 7e95f29ce95edf01d6d451f96fae03f3d3451ff8 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Thu, 24 Aug 2006 11:55:23 +0000 Subject: Just some whitespace fixes from where it looks like I've been working 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 --- libs/ardour/audioengine.cc | 24 ++++++++++++------------ libs/ardour/io.cc | 21 +++++++++++---------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 50089062d4..13feb3f3f3 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -63,15 +63,15 @@ AudioEngine::AudioEngine (string client_name) _buffer_size = 0; _freewheeling = false; _freewheel_thread_registered = false; - - m_meter_thread = 0; - m_meter_exit = false; - if (connect_to_jack (client_name)) { - throw NoBackendAvailable (); - } - - start_metering_thread(); + m_meter_thread = 0; + m_meter_exit = false; + + if (connect_to_jack (client_name)) { + throw NoBackendAvailable (); + } + + start_metering_thread(); } @@ -207,7 +207,7 @@ AudioEngine::_xrun_callback (void *arg) int AudioEngine::_graph_order_callback (void *arg) { - static_cast(arg)->GraphReordered (); /* EMIT SIGNAL */ + static_cast(arg)->GraphReordered (); /* EMIT SIGNAL */ return 0; } @@ -349,9 +349,9 @@ AudioEngine::jack_bufsize_callback (jack_nframes_t nframes) void AudioEngine::start_metering_thread () { - if(m_meter_thread == 0) { - m_meter_thread = Glib::Thread::create (sigc::mem_fun(this, &AudioEngine::meter_thread), false); - } + if(m_meter_thread == 0) { + m_meter_thread = Glib::Thread::create (sigc::mem_fun(this, &AudioEngine::meter_thread), false); + } } void diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index 4d2d26f801..494401b080 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -130,19 +130,20 @@ IO::IO (Session& s, string name, _gain_automation_state = Off; _gain_automation_style = Absolute; - - { - // IO::Meter is emitted from another thread so the - // Meter signal must be protected. - Glib::Mutex::Lock guard (m_meter_signal_lock); - m_meter_connection = Meter.connect (mem_fun (*this, &IO::meter)); - } + + { + // IO::Meter is emitted from another thread so the + // Meter signal must be protected. + Glib::Mutex::Lock guard (m_meter_signal_lock); + m_meter_connection = Meter.connect (mem_fun (*this, &IO::meter)); + } } IO::~IO () { - Glib::Mutex::Lock guard (m_meter_signal_lock); + Glib::Mutex::Lock guard (m_meter_signal_lock); + Glib::Mutex::Lock lm (io_lock); vector::iterator i; @@ -154,7 +155,7 @@ IO::~IO () _session.engine().unregister_port (*i); } - m_meter_connection.disconnect(); + m_meter_connection.disconnect(); } void @@ -977,7 +978,7 @@ IO::disconnect_inputs (void* src) drop_input_connection (); } } - input_changed (ConnectionsChanged, src); /* EMIT SIGNAL */ + input_changed (ConnectionsChanged, src); /* EMIT SIGNAL */ return 0; } -- cgit v1.2.3