Merged with trunk R992.

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

diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 7abc69f0592db6c281b9b057d920b9c32c9d1032..5c71bb16d385a935e2c52fb4b008085cacdcac1d 100644 (file)
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -89,14 +89,14 @@ class Route : public IO
        /* these are the core of the API of a Route. see the protected sections as well */
 
 
-       virtual int  roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame, 
-                          jack_nframes_t offset, int declick, bool can_record, bool rec_monitors_input);
+       virtual int  roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, 
+                          nframes_t offset, int declick, bool can_record, bool rec_monitors_input);
 
-       virtual int  no_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame, 
-                             jack_nframes_t offset, bool state_changing, bool can_record, bool rec_monitors_input);
+       virtual int  no_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, 
+                             nframes_t offset, bool state_changing, bool can_record, bool rec_monitors_input);
 
-       virtual int  silent_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame, 
-                                 jack_nframes_t offset, bool can_record, bool rec_monitors_input);
+       virtual int  silent_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, 
+                                 nframes_t offset, bool can_record, bool rec_monitors_input);
        virtual void toggle_monitor_input ();
        virtual bool can_record() { return false; }
        virtual void set_record_enable (bool yn, void *src) {}
@@ -174,9 +174,9 @@ class Route : public IO
        void all_redirects_flip();
        void all_redirects_active (bool state);
 
-       virtual jack_nframes_t update_total_latency();
-       jack_nframes_t signal_latency() const { return _own_latency; }
-       virtual void set_latency_delay (jack_nframes_t);
+       virtual nframes_t update_total_latency();
+       nframes_t signal_latency() const { return _own_latency; }
+       virtual void set_latency_delay (nframes_t);
 
        sigc::signal<void,void*> solo_changed;
        sigc::signal<void,void*> solo_safe_changed;
@@ -222,7 +222,7 @@ class Route : public IO
                    SoloControl
            };
            
-           ToggleControllable (Route&, ToggleType);
+           ToggleControllable (std::string name, Route&, ToggleType);
            void set_value (float);
            float get_value (void) const;
 
@@ -238,8 +238,6 @@ class Route : public IO
                return _mute_control;
        }
        
-       void automation_snapshot (jack_nframes_t now);
-
        void protect_automation ();
        
        void set_remote_control_id (uint32_t id);
@@ -250,7 +248,7 @@ class Route : public IO
        friend class Session;
 
        void set_solo_mute (bool yn);
-       void set_block_size (jack_nframes_t nframes);
+       void set_block_size (nframes_t nframes);
        bool has_external_redirects() const;
        void curve_reallocate ();
 
@@ -282,11 +280,11 @@ class Route : public IO
        gain_t                    desired_solo_gain;
        gain_t                    desired_mute_gain;
 
-       jack_nframes_t            check_initial_delay (jack_nframes_t, jack_nframes_t&, jack_nframes_t&);
+       nframes_t            check_initial_delay (nframes_t, nframes_t&, nframes_t&);
 
-       jack_nframes_t           _initial_delay;
-       jack_nframes_t           _roll_delay;
-       jack_nframes_t           _own_latency;
+       nframes_t           _initial_delay;
+       nframes_t           _roll_delay;
+       nframes_t           _own_latency;
        RedirectList             _redirects;
        Glib::RWLock      redirect_lock;
        IO                      *_control_outs;
@@ -299,23 +297,24 @@ class Route : public IO
        ToggleControllable _solo_control;
        ToggleControllable _mute_control;
        
-       void passthru (jack_nframes_t start_frame, jack_nframes_t end_frame, 
-                      jack_nframes_t nframes, jack_nframes_t offset, int declick, bool meter_inputs);
+       void passthru (nframes_t start_frame, nframes_t end_frame, 
+                      nframes_t nframes, nframes_t offset, int declick, bool meter_inputs);
 
        virtual void process_output_buffers (BufferSet& bufs,
-                                    jack_nframes_t start_frame, jack_nframes_t end_frame,
-                                    jack_nframes_t nframes, jack_nframes_t offset, bool with_redirects, int declick,
+                                    nframes_t start_frame, nframes_t end_frame,
+                                    nframes_t nframes, nframes_t offset, bool with_redirects, int declick,
                                     bool meter);
 
   protected:
 
        virtual XMLNode& state(bool);
 
-       void passthru_silence (jack_nframes_t start_frame, jack_nframes_t end_frame,
-                              jack_nframes_t nframes, jack_nframes_t offset, int declick,
+       void passthru_silence (nframes_t start_frame, nframes_t end_frame,
+                              nframes_t nframes, nframes_t offset, int declick,
                               bool meter);
        
-       void silence (jack_nframes_t nframes, jack_nframes_t offset);
+       void silence (nframes_t nframes, nframes_t offset);
+       
        sigc::connection input_signal_connection;
 
        state_id_t _current_state_id;