Fixed incomplete merge for audioengine.cc
[ardour.git] / libs / ardour / audioengine.cc
index 116b99085b88ab1026133a08dfdd00570c8988b1..16283d92320a145ae360dbc1a548f12790c86709 100644 (file)
@@ -61,7 +61,6 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-gint AudioEngine::m_meter_exit;
 AudioEngine* AudioEngine::_instance = 0;
 
 #ifdef SILENCE_AFTER
@@ -99,7 +98,6 @@ AudioEngine::AudioEngine ()
        , _silence_hit_cnt (0)
 #endif
 {
-       g_atomic_int_set (&m_meter_exit, 0);
        reset_silence_countdown ();
        start_hw_event_processing();
        discover_backends ();
@@ -108,7 +106,6 @@ AudioEngine::AudioEngine ()
 AudioEngine::~AudioEngine ()
 {
        _in_destructor = true;
-       stop_metering_thread ();
        stop_hw_event_processing();
        drop_backend ();
        for (BackendMap::const_iterator i = _backends.begin(); i != _backends.end(); ++i) {
@@ -205,7 +202,15 @@ AudioEngine::process_callback (pframes_t nframes)
 
        if (!tm.locked()) {
                /* return having done nothing */
-               _processed_frames = next_processed_frames;
+               if (_session) {
+                       Xrun();
+               }
+               /* really only JACK requires this
+                * (other backends clear the output buffers
+                * before the process_callback. it may even be 
+                * jack/alsa only). but better safe than sorry.
+                */
+               PortManager::silence_outputs (nframes);
                return 0;
        }
 
@@ -283,7 +288,7 @@ AudioEngine::process_callback (pframes_t nframes)
 
                        /* fade out over 1 second */
                        session_removal_countdown = sample_rate()/2;
-                       session_removal_gain = 1.0;
+                       session_removal_gain = GAIN_COEFF_UNITY;
                        session_removal_gain_step = 1.0/session_removal_countdown;
 
                } else if (session_removal_countdown > 0) {
@@ -352,7 +357,6 @@ AudioEngine::process_callback (pframes_t nframes)
        }
 
        if (!_running) {
-               PortManager::cycle_end (nframes);
                _processed_frames = next_processed_frames;
                return 0;
        }
@@ -451,7 +455,7 @@ AudioEngine::backend_reset_requested()
 void
 AudioEngine::do_reset_backend()
 {
-       SessionEvent::create_per_thread_pool (X_("Backend reset processing thread"), 512);
+       SessionEvent::create_per_thread_pool (X_("Backend reset processing thread"), 1024);
     
        Glib::Threads::Mutex::Lock guard (_reset_request_lock);
     
@@ -464,25 +468,28 @@ AudioEngine::do_reset_backend()
                        Glib::Threads::RecMutex::Lock pl (_state_lock);
                        g_atomic_int_dec_and_test (&_hw_reset_request_count);
                
-                       std::cout << "AudioEngine::RESET::Reset request processing. Requests left: " << _hw_reset_request_count << std::endl;
-                       DeviceResetStarted(); // notify about device reset to be started
-               
-                       // backup the device name
-                       std::string name = _backend->device_name ();
-               
-                       std::cout << "AudioEngine::RESET::Stoping engine..." << std::endl;
-                       stop();
-               
-                       std::cout << "AudioEngine::RESET::Reseting device..." << std::endl;
-                       if ( 0 == _backend->reset_device () ) {
-                       
-                               std::cout << "AudioEngine::RESET::Starting engine..." << std::endl;
-                               start ();
-                       
+            std::cout << "AudioEngine::RESET::Reset request processing. Requests left: " << _hw_reset_request_count << std::endl;
+                        DeviceResetStarted(); // notify about device reset to be started
+            
+                        // backup the device name
+                        std::string name = _backend->device_name ();
+
+            std::cout << "AudioEngine::RESET::Reseting device..." << std::endl;
+                       if ( ( 0 == stop () ) &&
+                 ( 0 == _backend->reset_device () ) &&
+                 ( 0 == start () ) ) {
+                               
+                               std::cout << "AudioEngine::RESET::Engine started..." << std::endl;
+                               
                                // inform about possible changes
                                BufferSizeChanged (_backend->buffer_size() );
-                       } else {
-                               DeviceError();
+                DeviceResetFinished(); // notify about device reset finish
+            
+            } else {
+            
+                DeviceResetFinished(); // notify about device reset finish
+                               // we've got an error
+                DeviceError();
                        }
                        
                        std::cout << "AudioEngine::RESET::Done." << std::endl;
@@ -518,6 +525,8 @@ AudioEngine::do_devicelist_update()
 
             _devicelist_update_lock.unlock();
             
+            Glib::Threads::RecMutex::Lock pl (_state_lock);
+            
             g_atomic_int_dec_and_test (&_hw_devicelist_update_count);
             DeviceListChanged (); /* EMIT SIGNAL */
         
@@ -569,40 +578,6 @@ AudioEngine::stop_hw_event_processing()
 }
 
 
-
-void
-AudioEngine::stop_metering_thread ()
-{
-       if (m_meter_thread) {
-               g_atomic_int_set (&m_meter_exit, 1);
-               m_meter_thread->join ();
-               m_meter_thread = 0;
-       }
-}
-
-void
-AudioEngine::start_metering_thread ()
-{
-       if (m_meter_thread == 0) {
-               g_atomic_int_set (&m_meter_exit, 0);
-               m_meter_thread = Glib::Threads::Thread::create (boost::bind (&AudioEngine::meter_thread, this));
-       }
-}
-
-void
-AudioEngine::meter_thread ()
-{
-       pthread_set_name (X_("meter"));
-
-       while (true) {
-               Glib::usleep (10000); /* 1/100th sec interval */
-               if (g_atomic_int_get(&m_meter_exit)) {
-                       break;
-               }
-               Metering::Meter ();
-       }
-}
-
 void
 AudioEngine::set_session (Session *s)
 {
@@ -653,20 +628,19 @@ AudioEngine::remove_session ()
 void
 AudioEngine::reconnect_session_routes (bool reconnect_inputs, bool reconnect_outputs)
 {
-    if (_session) {
-        _session->reconnect_existing_routes(true, true, reconnect_inputs, reconnect_outputs);
-    }
+#ifdef USE_TRACKS_CODE_FEATURES
+       if (_session) {
+               _session->reconnect_existing_routes(true, true, reconnect_inputs, reconnect_outputs);
+       }
+#endif 
 }
 
 
 void
 AudioEngine::died ()
 {
-        /* called from a signal handler for SIGPIPE */
-
-       stop_metering_thread ();
-
-    _running = false;
+       /* called from a signal handler for SIGPIPE */
+       _running = false;
 }
 
 int
@@ -801,7 +775,7 @@ void
 AudioEngine::drop_backend ()
 {
        if (_backend) {
-               stop(false);
+               _backend->stop ();
                _backend->drop_device ();
                _backend.reset ();
                _running = false;
@@ -875,8 +849,6 @@ AudioEngine::start (bool for_latency)
 
        }
        
-       start_metering_thread ();
-       
        if (!for_latency) {
                Running(); /* EMIT SIGNAL */
        }
@@ -891,25 +863,24 @@ AudioEngine::stop (bool for_latency)
                return 0;
        }
 
-       if (_session && _running) {
+       if (_backend->stop ()) {
+               return -1;
+       }
+       
+       if (_session && _running &&
+           (_session->state_of_the_state() & Session::Loading) == 0 &&
+           (_session->state_of_the_state() & Session::Deletion) == 0) {
                // it's not a halt, but should be handled the same way:
                // disable record, stop transport and I/O processign but save the data.
                _session->engine_halted ();
        }
 
-       Glib::Threads::Mutex::Lock lm (_process_lock);
-
-       if (_backend->stop ()) {
-               return -1;
-       }
-       
        _running = false;
        _processed_frames = 0;
        _measuring_latency = MeasureNone;
        _latency_output_port = 0;
        _latency_input_port = 0;
        _started_for_latency = false;
-       stop_metering_thread ();
        
        Port::PortDrop ();
 
@@ -1187,6 +1158,12 @@ AudioEngine::set_systemic_output_latency (uint32_t ol)
        return _backend->set_systemic_output_latency  (ol);
 }
 
+bool
+AudioEngine::thread_initialised_for_audio_processing ()
+{
+    return SessionEvent::has_per_thread_pool () && AsyncMIDIPort::is_process_thread();
+}
+
 /* END OF BACKEND PROXY API */
 
 void
@@ -1250,7 +1227,6 @@ AudioEngine::halted_callback (const char* why)
                return;
        }
 
-    stop_metering_thread ();
        _running = false;
 
        Port::PortDrop (); /* EMIT SIGNAL */