projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Large nasty commit in the form of a 5000 line patch chock-full of completely
[ardour.git] / libs / ardour / route.cc
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 84979fce6a63706b2f6e4ba4083bd411356dbf50..568bfddfc34886e485424409f13f19a3da65eaab 100644 (file)
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -44,14 +44,14 @@
 
 using namespace std;
 using namespace ARDOUR;
-//using namespace sigc;
+using namespace PBD;
 
 
 uint32_t Route::order_key_cnt = 0;
 
 
-Route::Route (Session& sess, string name, int input_min, int input_max, int output_min, int output_max, Flag flg)
-       : IO (sess, name, input_min, input_max, output_min, output_max),
+Route::Route (Session& sess, string name, int input_min, int input_max, int output_min, int output_max, Flag flg, Buffer::Type default_type)
+       : IO (sess, name, input_min, input_max, output_min, output_max, default_type),
          _flags (flg),
          _midi_solo_control (*this, MIDIToggleControl::SoloControl, _session.midi_port()),
          _midi_mute_control (*this, MIDIToggleControl::MuteControl, _session.midi_port())
@@ -235,7 +235,7 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
        declick = _pending_declick;
 
        {
-               TentativeLockMonitor cm (control_outs_lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock cm (control_outs_lock, Glib::TRY_LOCK);
                
                if (cm.locked()) {
                        co = _control_outs;
@@ -245,7 +245,7 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
        }
        
        { 
-               TentativeLockMonitor dm (declick_lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock dm (declick_lock, Glib::TRY_LOCK);
                
                if (dm.locked()) {
                        dmg = desired_mute_gain;
@@ -330,7 +330,7 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
           -------------------------------------------------------------------------------------------------- */
 
        if (with_redirects) {
-               TentativeRWLockMonitor rm (redirect_lock, false, __LINE__, __FILE__);
+               Glib::RWLock::ReaderLock rm (redirect_lock, Glib::TRY_LOCK);
                if (rm.locked()) {
                        if (mute_gain > 0 || !_mute_affects_pre_fader) {
                                for (i = _redirects.begin(); i != _redirects.end(); ++i) {
@@ -499,7 +499,7 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
 
        if (post_fader_work) {
 
-               TentativeRWLockMonitor rm (redirect_lock, false, __LINE__, __FILE__);
+               Glib::RWLock::ReaderLock rm (redirect_lock, Glib::TRY_LOCK);
                if (rm.locked()) {
                        if (mute_gain > 0 || !_mute_affects_post_fader) {
                                for (i = _redirects.begin(); i != _redirects.end(); ++i) {
@@ -539,7 +539,7 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
                
                solo_audible = solo_gain > 0;
                mute_audible = dmg > 0 || !_mute_affects_control_outs;
-               
+
                if ( // silent anyway
 
                        (_gain == 0 && !apply_gain_automation) || 
@@ -622,7 +622,7 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
                        if (_session.transport_speed() > 1.5f || _session.transport_speed() < -1.5f) {
                                pan (bufs, nbufs, nframes, offset, speed_quietning); 
                        } else {
-                               // cerr << "panner state = " << _panner->automation_state() << endl;
+                               // cerr << _name << " panner state = " << _panner->automation_state() << endl;
                                if (!_panner->empty() &&
                                    (_panner->automation_state() & Play ||
                                     ((_panner->automation_state() & Touch) && !_panner->touching()))) {
@@ -723,7 +723,7 @@ Route::set_solo (bool yn, void *src)
 void
 Route::set_solo_mute (bool yn)
 {
-       LockMonitor lm (declick_lock, __LINE__, __FILE__);
+       Glib::Mutex::Lock lm (declick_lock);
 
        /* Called by Session in response to another Route being soloed.
         */
@@ -757,7 +757,7 @@ Route::set_mute (bool yn, void *src)
                        _midi_mute_control.send_feedback (_muted);
                }
                
-               LockMonitor lm (declick_lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm (declick_lock);
                desired_mute_gain = (yn?0.0f:1.0f);
        }
 }
@@ -772,7 +772,7 @@ Route::add_redirect (Redirect *redirect, void *src, uint32_t* err_streams)
        }
 
        {
-               RWLockMonitor lm (redirect_lock, true, __LINE__, __FILE__);
+               Glib::RWLock::WriterLock lm (redirect_lock);
 
                PluginInsert* pi;
                PortInsert* porti;
@@ -810,8 +810,8 @@ Route::add_redirect (Redirect *redirect, void *src, uint32_t* err_streams)
                while (_peak_power.size() < potential_max_streams) {
                        _peak_power.push_back(0);
                }
-               while (_stored_peak_power.size() < potential_max_streams) {
-                       _stored_peak_power.push_back(0);
+               while (_visible_peak_power.size() < potential_max_streams) {
+                       _visible_peak_power.push_back(0);
                }
 
                _redirects.push_back (redirect);
@@ -845,7 +845,7 @@ Route::add_redirects (const RedirectList& others, void *src, uint32_t* err_strea
        }
 
        {
-               RWLockMonitor lm (redirect_lock, true, __LINE__, __FILE__);
+               Glib::RWLock::WriterLock lm (redirect_lock);
 
                RedirectList::iterator existing_end = _redirects.end();
                --existing_end;
@@ -868,8 +868,8 @@ Route::add_redirects (const RedirectList& others, void *src, uint32_t* err_strea
                        while (_peak_power.size() < potential_max_streams) {
                                _peak_power.push_back(0);
                        }
-                       while (_stored_peak_power.size() < potential_max_streams) {
-                               _stored_peak_power.push_back(0);
+                       while (_visible_peak_power.size() < potential_max_streams) {
+                               _visible_peak_power.push_back(0);
                        }
 
                        _redirects.push_back (*i);
@@ -904,7 +904,7 @@ Route::clear_redirects (void *src)
        }
 
        {
-               RWLockMonitor lm (redirect_lock, true, __LINE__, __FILE__);
+               Glib::RWLock::WriterLock lm (redirect_lock);
 
                for (RedirectList::iterator i = _redirects.begin(); i != _redirects.end(); ++i) {
                        delete *i;
@@ -934,7 +934,7 @@ Route::remove_redirect (Redirect *redirect, void *src, uint32_t* err_streams)
        redirect_max_outs = 0;
 
        {
-               RWLockMonitor lm (redirect_lock, true, __LINE__, __FILE__);
+               Glib::RWLock::WriterLock lm (redirect_lock);
                RedirectList::iterator i;
                bool removed = false;
 
@@ -1013,7 +1013,7 @@ Route::remove_redirect (Redirect *redirect, void *src, uint32_t* err_streams)
 int
 Route::reset_plugin_counts (uint32_t* lpc)
 {
-       RWLockMonitor lm (redirect_lock, true, __LINE__, __FILE__);
+       Glib::RWLock::WriterLock lm (redirect_lock);
        return _reset_plugin_counts (lpc);
 }
 
@@ -1183,7 +1183,7 @@ Route::copy_redirects (const Route& other, Placement placement, uint32_t* err_st
        RedirectList to_be_deleted;
 
        {
-               RWLockMonitor lm (redirect_lock, true, __LINE__, __FILE__);
+               Glib::RWLock::WriterLock lm (redirect_lock);
                RedirectList::iterator tmp;
                RedirectList the_copy;
 
@@ -1262,7 +1262,7 @@ Route::copy_redirects (const Route& other, Placement placement, uint32_t* err_st
 void
 Route::all_redirects_flip ()
 {
-       RWLockMonitor lm (redirect_lock, false, __LINE__, __FILE__);
+       Glib::RWLock::ReaderLock lm (redirect_lock);
 
        if (_redirects.empty()) {
                return;
@@ -1278,7 +1278,7 @@ Route::all_redirects_flip ()
 void
 Route::all_redirects_active (bool state)
 {
-       RWLockMonitor lm (redirect_lock, false,  __LINE__, __FILE__);
+       Glib::RWLock::ReaderLock lm (redirect_lock);
 
        if (_redirects.empty()) {
                return;
@@ -1300,7 +1300,7 @@ Route::sort_redirects (uint32_t* err_streams)
 {
        {
                RedirectSorter comparator;
-               RWLockMonitor lm (redirect_lock, true, __LINE__, __FILE__);
+               Glib::RWLock::WriterLock lm (redirect_lock);
                uint32_t old_rmo = redirect_max_outs;
 
                /* the sweet power of C++ ... */
@@ -1779,7 +1779,7 @@ Route::silence (jack_nframes_t nframes, jack_nframes_t offset)
                }
 
                { 
-                       TentativeRWLockMonitor lm (redirect_lock, false, __LINE__, __FILE__);
+                       Glib::RWLock::ReaderLock lm (redirect_lock, Glib::TRY_LOCK);
                        
                        if (lm.locked()) {
                                for (RedirectList::iterator i = _redirects.begin(); i != _redirects.end(); ++i) {
@@ -1804,7 +1804,7 @@ Route::silence (jack_nframes_t nframes, jack_nframes_t offset)
 int
 Route::set_control_outs (const vector<string>& ports)
 {
-       LockMonitor lm (control_outs_lock, __LINE__, __FILE__);
+       Glib::Mutex::Lock lm (control_outs_lock);
        vector<string>::const_iterator i;
 
        if (_control_outs) {
@@ -2002,12 +2002,12 @@ Route::set_active (bool yn)
 }
 
 void
-Route::transport_stopped (bool abort_ignored, bool did_locate, bool can_flush_redirects)
+Route::handle_transport_stopped (bool abort_ignored, bool did_locate, bool can_flush_redirects)
 {
        jack_nframes_t now = _session.transport_frame();
 
        {
-               RWLockMonitor lm (redirect_lock, false, __LINE__, __FILE__);
+               Glib::RWLock::ReaderLock lm (redirect_lock);
 
                if (!did_locate) {
                        automation_snapshot (now);
@@ -2126,7 +2126,7 @@ Route::roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t
             bool can_record, bool rec_monitors_input)
 {
        {
-               TentativeRWLockMonitor lm(redirect_lock, false, __LINE__, __FILE__);
+               Glib::RWLock::ReaderLock lm (redirect_lock, Glib::TRY_LOCK);
                if (lm.locked()) {
                        // automation snapshot can also be called from the non-rt context
                        // and it uses the redirect list, so we take the lock out here
@@ -2150,7 +2150,7 @@ Route::roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t
        apply_gain_automation = false;
 
        { 
-               TentativeLockMonitor am (automation_lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock am (automation_lock, Glib::TRY_LOCK);
                
                if (am.locked() && _session.transport_rolling()) {
                        
@@ -2242,7 +2242,7 @@ Route::send_all_midi_feedback ()
        if (_session.get_midi_feedback()) {
 
                {
-                       RWLockMonitor lm (redirect_lock, false, __LINE__, __FILE__);
+                       Glib::RWLock::ReaderLock lm (redirect_lock);
                        for (RedirectList::iterator i = _redirects.begin(); i != _redirects.end(); ++i) {
                                (*i)->send_all_midi_feedback ();
                        }
@@ -2262,7 +2262,7 @@ Route::write_midi_feedback (MIDI::byte* buf, int32_t& bufsize)
        buf = _midi_mute_control.write_feedback (buf, bufsize, _muted);
 
        {
-               RWLockMonitor lm (redirect_lock, false, __LINE__, __FILE__);
+               Glib::RWLock::ReaderLock lm (redirect_lock);
                for (RedirectList::iterator i = _redirects.begin(); i != _redirects.end(); ++i) {
                        buf = (*i)->write_midi_feedback (buf, bufsize);
                }
@@ -2278,7 +2278,7 @@ Route::flush_redirects ()
           this is called from the RT audio thread.
        */
 
-       RWLockMonitor lm (redirect_lock, false, __LINE__, __FILE__);
+       Glib::RWLock::ReaderLock lm (redirect_lock);
 
        for (RedirectList::iterator i = _redirects.begin(); i != _redirects.end(); ++i) {
                (*i)->deactivate ();
Unnamed repository; edit this file 'description' to name the repository.