use XML state to store processors in mixer (strips) and fixup crash caused by missing...

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

diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h
index 0b423a7e28740a0442d554eeab4fb7e7b309cde2..cb5a6d72ceedd6c1a236b655727ddfb8df142365 100644 (file)
--- a/libs/ardour/ardour/audioengine.h
+++ b/libs/ardour/ardour/audioengine.h
@@ -46,6 +46,8 @@ class Port;
 class AudioEngine : public sigc::trackable
 {
    public:
+       typedef std::set<Port*> Ports;
+
        AudioEngine (std::string client_name);
        virtual ~AudioEngine ();
        
@@ -113,11 +115,11 @@ class AudioEngine : public sigc::trackable
 
        Port *register_input_port (DataType type, const std::string& portname);
        Port *register_output_port (DataType type, const std::string& portname);
-       int   unregister_port (Port *);
+       int   unregister_port (Port &);
        
        int connect (const std::string& source, const std::string& destination);
        int disconnect (const std::string& source, const std::string& destination);
-       int disconnect (Port *);
+       int disconnect (Port &);
        
        const char ** get_ports (const std::string& port_name_pattern, const std::string& type_name_pattern, uint32_t flags);
 
@@ -127,21 +129,20 @@ class AudioEngine : public sigc::trackable
        void get_physical_outputs (std::vector<std::string>&);
        void get_physical_inputs (std::vector<std::string>&);
 
-       std::string get_nth_physical_output (uint32_t n) {
-               return get_nth_physical (n, JackPortIsInput);
+       std::string get_nth_physical_output (DataType type, uint32_t n) {
+               return get_nth_physical (type, n, JackPortIsInput);
        }
 
-       std::string get_nth_physical_input (uint32_t n) {
-               return get_nth_physical (n, JackPortIsOutput);
+       std::string get_nth_physical_input (DataType type, uint32_t n) {
+               return get_nth_physical (type, n, JackPortIsOutput);
        }
 
        nframes_t get_port_total_latency (const Port&);
        void update_total_latencies ();
+       void update_total_latency (const Port&);
 
-       /* the caller may not delete the object pointed to by 
-          the return value
+       /** Caller may not delete the object pointed to by the return value
        */
-
        Port *get_port_by_name (const std::string& name, bool keep = true);
 
        enum TransportState {
@@ -194,26 +195,28 @@ class AudioEngine : public sigc::trackable
        std::string make_port_name_non_relative (std::string);
 
   private:
-       ARDOUR::Session      *session;
-       jack_client_t       *_jack;
-       std::string           jack_client_name;
-       Glib::Mutex           _process_lock;
-       Glib::Cond            session_removed;
-       bool                  session_remove_pending;
-       bool                 _running;
-       bool                 _has_run;
-       nframes_t       _buffer_size;
-       nframes_t       _frame_rate;
-       nframes_t        monitor_check_interval;
-       nframes_t        last_monitor_check;
-       nframes_t       _processed_frames;
-       bool                 _freewheeling;
-       bool                 _freewheel_thread_registered;
-       sigc::slot<int,nframes_t>  freewheel_action;
-       bool                  reconnect_on_halt;
-       int                  _usecs_per_cycle;
+       ARDOUR::Session *session;
+       jack_client_t *_jack;
+       std::string jack_client_name;
+       Glib::Mutex _process_lock;
+       Glib::Cond session_removed;
+       bool session_remove_pending;
+       bool _running;
+       bool _has_run;
+       nframes_t _buffer_size;
+       nframes_t _frame_rate;
+       /// number of frames between each check for changes in monitor input
+       nframes_t monitor_check_interval;
+       /// time of the last monitor check in frames
+       nframes_t last_monitor_check;
+       /// the number of frames processed since start() was called
+       nframes_t _processed_frames;
+       bool _freewheeling;
+       bool _freewheel_thread_registered;
+       sigc::slot<int,nframes_t> freewheel_action;
+       bool reconnect_on_halt;
+       int _usecs_per_cycle;
 
-       typedef std::set<Port*> Ports;
        SerializedRCUManager<Ports> ports;
 
        int    process_callback (nframes_t nframes);
@@ -223,9 +226,9 @@ class AudioEngine : public sigc::trackable
        typedef std::list<PortConnection> PortConnections;
 
        PortConnections port_connections;
-       void   remove_connections_for (Port*);
+       void   remove_connections_for (Port&);
 
-       std::string get_nth_physical (uint32_t which, int flags);
+       std::string get_nth_physical (DataType type, uint32_t n, int flags);
 
        static int  _xrun_callback (void *arg);
        static int  _graph_order_callback (void *arg);