tweak Stateful/StatefulDiffCommand changes so that SessionObject's actually get a...

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

diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h
index a9c414e5663745be1e29f9c4a5cef5b704d25baf..6baa724cf2599ccd913098d3d2351bfaf98d3d1e 100644 (file)
--- a/libs/ardour/ardour/audioengine.h
+++ b/libs/ardour/ardour/audioengine.h
@@ -26,17 +26,19 @@
 #include <exception>
 #include <string>
 
-#include <sigc++/signal.h>
 
 #include <glibmm/thread.h>
 
 #include "pbd/rcu.h"
+#include "pbd/signals.h"
 
 #include "ardour/ardour.h"
 #include <jack/jack.h>
 #include <jack/transport.h>
-#include "ardour/types.h"
+
 #include "ardour/data_type.h"
+#include "ardour/session_handle.h"
+#include "ardour/types.h"
 
 namespace ARDOUR {
 
@@ -45,7 +47,7 @@ class MidiPort;
 class Port;
 class Session;
 
-class AudioEngine : public sigc::trackable
+class AudioEngine : public SessionHandlePtr
 {
    public:
        typedef std::set<Port*> Ports;
@@ -72,8 +74,8 @@ class AudioEngine : public sigc::trackable
 
        Glib::Mutex& process_lock() { return _process_lock; }
 
-       nframes_t frame_rate();
-       nframes_t frames_per_cycle();
+       nframes_t frame_rate() const;
+       nframes_t frames_per_cycle() const;
 
        size_t raw_buffer_size(DataType t);
 
@@ -92,6 +94,12 @@ class AudioEngine : public sigc::trackable
                return jack_frame_time (_priv_jack);
        }
 
+       nframes_t frame_time_at_cycle_start () {
+               jack_client_t* _priv_jack = _jack;
+               if (!_running || !_priv_jack) return 0;
+               return jack_last_frame_time (_priv_jack);
+       }
+
        nframes_t transport_frame () const {
                const jack_client_t* _priv_jack = _jack;
                if (!_running || !_priv_jack) return 0;
@@ -110,7 +118,7 @@ class AudioEngine : public sigc::trackable
        }
 
        void set_session (Session *);
-       void remove_session ();
+       void remove_session (); // not a replacement for SessionHandle::session_going_away()
 
        class PortRegistrationFailure : public std::exception {
        public:
@@ -185,32 +193,32 @@ class AudioEngine : public sigc::trackable
 _         the regular process() call to session->process() is not made.
        */
 
-       sigc::signal<int,nframes_t> Freewheel;
+       PBD::Signal1<int,nframes_t> Freewheel;
 
-       sigc::signal<void> Xrun;
+       PBD::Signal0<void> Xrun;
 
        /* this signal is if JACK notifies us of a graph order event */
 
-       sigc::signal<void> GraphReordered;
+       PBD::Signal0<void> GraphReordered;
 
        /* this signal is emitted if the sample rate changes */
 
-       sigc::signal<void,nframes_t> SampleRateChanged;
+       PBD::Signal1<void,nframes_t> SampleRateChanged;
 
        /* this signal is sent if JACK ever disconnects us */
 
-       sigc::signal<void> Halted;
+       PBD::Signal0<void> Halted;
 
        /* these two are emitted when the engine itself is
           started and stopped
        */
 
-       sigc::signal<void> Running;
-       sigc::signal<void> Stopped;
+       PBD::Signal0<void> Running;
+       PBD::Signal0<void> Stopped;
 
        /* this signal is emitted if a JACK port is registered or unregistered */
 
-       sigc::signal<void> PortRegisteredOrUnregistered;
+       PBD::Signal0<void> PortRegisteredOrUnregistered;
 
        std::string make_port_name_relative (std::string);
        std::string make_port_name_non_relative (std::string);
@@ -221,7 +229,6 @@ _      the regular process() call to session->process() is not made.
   private:
        static AudioEngine*       _instance;
 
-       ARDOUR::Session*           session;
        jack_client_t* volatile   _jack; /* could be reset to null by SIGPIPE or another thread */
        std::string                jack_client_name;
        Glib::Mutex               _process_lock;
@@ -229,9 +236,9 @@ _      the regular process() call to session->process() is not made.
        bool                       session_remove_pending;
        bool                      _running;
        bool                      _has_run;
-       nframes_t                 _buffer_size;
+       mutable nframes_t         _buffer_size;
        std::map<DataType,size_t> _raw_buffer_sizes;
-       nframes_t                 _frame_rate;
+       mutable 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
@@ -241,7 +248,7 @@ _      the regular process() call to session->process() is not made.
        bool                      _freewheeling;
        bool                      _freewheel_pending;
        bool                      _freewheel_thread_registered;
-       sigc::slot<int,nframes_t>  freewheel_action;
+       boost::function<int(nframes_t)>  freewheel_action;
        bool                       reconnect_on_halt;
        int                       _usecs_per_cycle;