new files from sakari, missed last time

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

diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h
index 503b8166f0789cda21f0ff35f9fdd439101104a2..89abc6669ac272400517aecd320fb526509ff70a 100644 (file)
--- a/libs/ardour/ardour/audioengine.h
+++ b/libs/ardour/ardour/audioengine.h
@@ -106,7 +106,13 @@ class AudioEngine : public sigc::trackable
 
        class PortRegistrationFailure : public std::exception {
          public:
-               virtual const char *what() const throw() { return "failed port registration"; }
+               PortRegistrationFailure (const char* why = "") {
+                       reason = why;
+               }
+               virtual const char *what() const throw() { return reason; }
+
+         private:
+               const char* reason;
        };
 
        class NoBackendAvailable : public std::exception {
@@ -114,8 +120,8 @@ class AudioEngine : public sigc::trackable
                virtual const char *what() const throw() { return "could not connect to engine backend"; }
        };
 
-       Port *register_input_port (PortType, DataType, const std::string& portname);
-       Port *register_output_port (PortType, DataType, const std::string& portname);
+       Port *register_input_port (DataType, const std::string& portname, bool publish);
+       Port *register_output_port (DataType, const std::string& portname, bool publish);
        int   unregister_port (Port &);
        
        int connect (const std::string& source, const std::string& destination);
@@ -124,11 +130,13 @@ class AudioEngine : public sigc::trackable
        
        const char ** get_ports (const std::string& port_name_pattern, const std::string& type_name_pattern, uint32_t flags);
 
-       uint32_t n_physical_outputs () const;
-       uint32_t n_physical_inputs () const;
+       bool can_request_hardware_monitoring ();
+
+       uint32_t n_physical_outputs (DataType type) const;
+       uint32_t n_physical_inputs (DataType type) const;
 
-       void get_physical_outputs (std::vector<std::string>&);
-       void get_physical_inputs (std::vector<std::string>&);
+       void get_physical_outputs (DataType type, std::vector<std::string>&);
+       void get_physical_inputs (DataType type, std::vector<std::string>&);
 
        std::string get_nth_physical_output (DataType type, uint32_t n) {
                return get_nth_physical (type, n, JackPortIsInput);
@@ -144,7 +152,7 @@ class AudioEngine : public sigc::trackable
 
        /** Caller may not delete the object pointed to by the return value
        */
-       Port *get_port_by_name (const std::string& name, bool keep = true) const;
+       Port *get_port_by_name (const std::string& name, bool keep = true);
 
        enum TransportState {
                TransportStopped = JackTransportStopped,
@@ -196,36 +204,37 @@ 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;
-       mutable 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;
+       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;
+       nframes_t                  monitor_check_interval;
        /// time of the last monitor check in frames
-       nframes_t last_monitor_check;
+       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;
+       nframes_t                 _processed_frames;
+       bool                      _freewheeling;
+       bool                      _freewheel_pending;
+       bool                      _freewheel_thread_registered;
+       sigc::slot<int,nframes_t>  freewheel_action;
+       bool                       reconnect_on_halt;
+       int                       _usecs_per_cycle;
 
        SerializedRCUManager<Ports> ports;
 
-       Port *register_port (PortType ptype, DataType type, const std::string& portname, bool input);
+       Port *register_port (DataType type, const std::string& portname, bool input, bool publish);
 
        int    process_callback (nframes_t nframes);
        void   remove_all_ports ();
 
-       InternalPort* get_internal_port (const std::string& short_name);
+       Port* get_port (const std::string& short_name);
 
        typedef std::pair<std::string,std::string> PortConnection;
        typedef std::list<PortConnection> PortConnections;
@@ -235,6 +244,8 @@ class AudioEngine : public sigc::trackable
 
        std::string get_nth_physical (DataType type, uint32_t n, int flags);
 
+       void port_registration_failure (const std::string& portname);
+
        static int  _xrun_callback (void *arg);
        static int  _graph_order_callback (void *arg);
        static int  _process_callback (nframes_t nframes, void *arg);