use AudioEngine destructor to do necessary stuff when shutting it down, and remove...

[ardour.git] / libs / ardour / ardour / audioengine.h

diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h
index f05944797d35fefafaf85c823593a83fd05cf249..ddffd1d5c0240341590c8363d9f6c0fff5b026eb 100644 (file)
--- a/libs/ardour/ardour/audioengine.h
+++ b/libs/ardour/ardour/audioengine.h
@@ -36,8 +36,6 @@
 #include "pbd/signals.h"
 #include "pbd/stacktrace.h"
 
-#include "midi++/mmc.h"
-
 #include "ardour/ardour.h"
 #include "ardour/data_type.h"
 #include "ardour/session_handle.h"
@@ -49,6 +47,8 @@
 #include <jack/session.h>
 #endif
 
+class MTDM;
+
 namespace ARDOUR {
 
 class InternalPort;
@@ -66,7 +66,7 @@ public:
     static AudioEngine* create ();
 
     virtual ~AudioEngine ();
-    
+
     int discover_backends();
     std::vector<const AudioBackendInfo*> available_backends() const;
     std::string current_backend_name () const;
@@ -100,7 +100,12 @@ public:
     pframes_t      sample_time_at_cycle_start ();
     pframes_t      samples_since_cycle_start ();
     bool           get_sync_offset (pframes_t& offset) const;
-    int            create_process_thread (boost::function<void()> func, pthread_t*, size_t stacksize);
+
+    int            create_process_thread (boost::function<void()> func);
+    int            join_process_threads ();
+    bool           in_process_thread ();
+    uint32_t       process_thread_count ();
+
     bool           is_realtime() const;
     bool           connected() const;
 
@@ -184,15 +189,21 @@ public:
     /* sets up the process callback thread */
     static void thread_init_callback (void *);
 
-    MIDI::MachineControl& mmc() { return _mmc; }
+    /* latency measurement */
+
+    MTDM* mtdm();
+    int  prepare_for_latency_measurement ();
+    void start_latency_detection ();
+    void stop_latency_detection ();
+    void set_latency_input_port (const std::string&);
+    void set_latency_output_port (const std::string&);
+    uint32_t latency_signal_delay () const { return _latency_signal_latency; }
 
   private:
     AudioEngine ();
 
     static AudioEngine*       _instance;
 
-    boost::shared_ptr<AudioBackend> _backend;
-
     Glib::Threads::Mutex      _process_lock;
     Glib::Threads::Cond        session_removed;
     bool                       session_remove_pending;
@@ -207,20 +218,25 @@ public:
     framecnt_t                 last_monitor_check;
     /// the number of frames processed since start() was called
     framecnt_t                _processed_frames;
-    bool                      _pre_freewheel_mmc_enabled;
     Glib::Threads::Thread*     m_meter_thread;
     ProcessThread*            _main_thread;
-    MIDI::MachineControl      _mmc;
-    
+    MTDM*                     _mtdm;
+    bool                      _measuring_latency;
+    PortEngine::PortHandle    _latency_input_port;
+    PortEngine::PortHandle    _latency_output_port;
+    framecnt_t                _latency_flush_frames;
+    std::string               _latency_input_name;
+    std::string               _latency_output_name;
+    framecnt_t                _latency_signal_latency;
+    bool                      _started_for_latency;
+    bool                      _in_destructor;
+
     void meter_thread ();
     void start_metering_thread ();
     void stop_metering_thread ();
     
     static gint      m_meter_exit;
     
-    void parameter_changed (const std::string&);
-    PBD::ScopedConnection config_connection;
-
     typedef std::map<std::string,AudioBackendInfo*> BackendMap;
     BackendMap _backends;
     AudioBackendInfo* backend_discover (const std::string&);