continue with MTC debugging

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

diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h
index 9dec7c8ec34750e484a6d3e4ec0cdb4256ca4ba6..a9c414e5663745be1e29f9c4a5cef5b704d25baf 100644 (file)
--- a/libs/ardour/ardour/audioengine.h
+++ b/libs/ardour/ardour/audioengine.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002-2004 Paul Davis 
+    Copyright (C) 2002-2004 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -52,7 +52,7 @@ class AudioEngine : public sigc::trackable
 
        AudioEngine (std::string client_name);
        virtual ~AudioEngine ();
-       
+
        jack_client_t* jack() const;
        bool connected() const { return _jack != 0; }
 
@@ -82,44 +82,49 @@ class AudioEngine : public sigc::trackable
        bool get_sync_offset (nframes_t& offset) const;
 
        nframes_t frames_since_cycle_start () {
-               if (!_running || !_jack) return 0;
-               return jack_frames_since_cycle_start (_jack);
+               jack_client_t* _priv_jack = _jack;
+               if (!_running || !_priv_jack) return 0;
+               return jack_frames_since_cycle_start (_priv_jack);
        }
        nframes_t frame_time () {
-               if (!_running || !_jack) return 0;
-               return jack_frame_time (_jack);
+               jack_client_t* _priv_jack = _jack;
+               if (!_running || !_priv_jack) return 0;
+               return jack_frame_time (_priv_jack);
        }
 
        nframes_t transport_frame () const {
-               if (!_running || !_jack) return 0;
-               return jack_get_current_transport_frame (_jack);
+               const jack_client_t* _priv_jack = _jack;
+               if (!_running || !_priv_jack) return 0;
+               return jack_get_current_transport_frame (_priv_jack);
        }
-       
+
        int request_buffer_size (nframes_t);
-       
+
        nframes_t set_monitor_check_interval (nframes_t);
+       nframes_t processed_frames() const { return _processed_frames; }
 
-       float get_cpu_load() { 
-               if (!_running || !_jack) return 0;
-               return jack_cpu_load (_jack);
+       float get_cpu_load() {
+               jack_client_t* _priv_jack = _jack;
+               if (!_running || !_priv_jack) return 0;
+               return jack_cpu_load (_priv_jack);
        }
 
        void set_session (Session *);
        void remove_session ();
 
        class PortRegistrationFailure : public std::exception {
-         public:
+       public:
                PortRegistrationFailure (const char* why = "") {
                        reason = why;
                }
                virtual const char *what() const throw() { return reason; }
 
-         private:
+       private:
                const char* reason;
        };
 
        class NoBackendAvailable : public std::exception {
-         public:
+       public:
                virtual const char *what() const throw() { return "could not connect to engine backend"; }
        };
 
@@ -128,11 +133,11 @@ class AudioEngine : public sigc::trackable
        int   unregister_port (Port &);
 
        void split_cycle (nframes_t offset);
-       
+
        int connect (const std::string& source, const std::string& destination);
        int disconnect (const std::string& source, const std::string& destination);
        int disconnect (Port &);
-       
+
        const char ** get_ports (const std::string& port_name_pattern, const std::string& type_name_pattern, uint32_t flags);
 
        bool can_request_hardware_monitoring ();
@@ -177,7 +182,7 @@ class AudioEngine : public sigc::trackable
        bool freewheeling() const { return _freewheeling; }
 
        /* this signal is sent for every process() cycle while freewheeling.
-          the regular process() call to session->process() is not made.
+_         the regular process() call to session->process() is not made.
        */
 
        sigc::signal<int,nframes_t> Freewheel;
@@ -203,12 +208,21 @@ class AudioEngine : public sigc::trackable
        sigc::signal<void> Running;
        sigc::signal<void> Stopped;
 
+       /* this signal is emitted if a JACK port is registered or unregistered */
+
+       sigc::signal<void> PortRegisteredOrUnregistered;
+
        std::string make_port_name_relative (std::string);
        std::string make_port_name_non_relative (std::string);
 
+       static AudioEngine* instance() { return _instance; }
+       void died ();
+
   private:
+       static AudioEngine*       _instance;
+
        ARDOUR::Session*           session;
-       jack_client_t*            _jack;
+       jack_client_t* volatile   _jack; /* could be reset to null by SIGPIPE or another thread */
        std::string                jack_client_name;
        Glib::Mutex               _process_lock;
        Glib::Cond                 session_removed;
@@ -238,12 +252,6 @@ class AudioEngine : public sigc::trackable
        int    process_callback (nframes_t nframes);
        void   remove_all_ports ();
 
-       typedef std::pair<std::string,std::string> PortConnection;
-       typedef std::list<PortConnection> PortConnections;
-
-       PortConnections port_connections;
-       void   remove_connections_for (Port&);
-
        std::string get_nth_physical (DataType type, uint32_t n, int flags);
 
        void port_registration_failure (const std::string& portname);
@@ -256,16 +264,17 @@ class AudioEngine : public sigc::trackable
        static void _jack_timebase_callback (jack_transport_state_t, nframes_t, jack_position_t*, int, void*);
        static int  _jack_sync_callback (jack_transport_state_t, jack_position_t*, void *arg);
        static void _freewheel_callback (int , void *arg);
+       static void _registration_callback (jack_port_id_t, int, void *);
 
        void jack_timebase_callback (jack_transport_state_t, nframes_t, jack_position_t*, int);
        int  jack_sync_callback (jack_transport_state_t, jack_position_t*);
        int  jack_bufsize_callback (nframes_t);
        int  jack_sample_rate_callback (nframes_t);
 
-       static void halted (void *);
-
        int connect_to_jack (std::string client_name);
 
+       static void halted (void *);
+
        void meter_thread ();
        void start_metering_thread ();
        void stop_metering_thread ();