start work on the changes to EngineControl (dialog) to integrate with new backend...

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

diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index 587a8dcd1b430a4564b20517241903f2398fa1d9..7159261b510dd96db8e3627de768e920de4cb7cd 100644 (file)
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -33,6 +33,7 @@ class RouteGroup;
 class Source;
 class Region;
 class Diskstream;
+class IO;
 
 class Track : public Route, public PublicDiskstream
 {
@@ -51,7 +52,7 @@ class Track : public Route, public PublicDiskstream
 
        virtual void set_monitoring (MonitorChoice);
        MonitorChoice monitoring_choice() const { return _monitoring; }
-       MonitorState monitoring_state () const;
+        MonitorState monitoring_state () const;
        PBD::Signal0<void> MonitoringChanged;
 
        MeterState metering_state () const;
@@ -102,10 +103,11 @@ class Track : public Route, public PublicDiskstream
        virtual int set_state (const XMLNode&, int version);
        static void zero_diskstream_id_in_xml (XMLNode&);
 
-       boost::shared_ptr<PBD::Controllable> rec_enable_control() { return _rec_enable_control; }
+       boost::shared_ptr<AutomationControl> rec_enable_control() { return _rec_enable_control; }
 
        bool record_enabled() const;
        void set_record_enabled (bool yn, void *src);
+       void prep_record_enabled (bool yn, void *src);
 
        bool using_diskstream_id (PBD::ID) const;
 
@@ -127,8 +129,8 @@ class Track : public Route, public PublicDiskstream
        void set_pending_overwrite (bool);
        int seek (framepos_t, bool complete_refill = false);
        bool hidden () const;
-       int can_internal_playback_seek (framepos_t);
-       int internal_playback_seek (framepos_t);
+       int can_internal_playback_seek (framecnt_t);
+       int internal_playback_seek (framecnt_t);
        void non_realtime_input_change ();
        void non_realtime_locate (framepos_t);
        void non_realtime_set_speed ();
@@ -170,10 +172,6 @@ class Track : public Route, public PublicDiskstream
 
        boost::shared_ptr<Diskstream> _diskstream;
        MeterPoint    _saved_meter_point;
-       /** used to keep track of processors that we are deactivating during record,
-           if `do-not-record-plugins' is enabled.
-       */
-       std::list<boost::weak_ptr<Processor> > _deactivated_processors;
        TrackMode     _mode;
        bool          _needs_butler;
        MonitorChoice _monitoring;
@@ -201,13 +199,13 @@ class Track : public Route, public PublicDiskstream
                FreezeState                        state;
        };
 
-       struct RecEnableControllable : public PBD::Controllable {
-               RecEnableControllable (Track&);
+       struct RecEnableControl : public AutomationControl {
+               RecEnableControl (boost::shared_ptr<Track> t);
 
                void set_value (double);
                double get_value (void) const;
 
-               Track& track;
+               boost::weak_ptr<Track> track;
        };
 
        virtual void set_state_part_two () = 0;
@@ -218,9 +216,9 @@ class Track : public Route, public PublicDiskstream
 
        void maybe_declick (BufferSet&, framecnt_t, int);
 
-       boost::shared_ptr<RecEnableControllable> _rec_enable_control;
+       boost::shared_ptr<RecEnableControl> _rec_enable_control;
        
-       framecnt_t check_initial_delay (framecnt_t nframes, framecnt_t&);
+       framecnt_t check_initial_delay (framecnt_t nframes, framepos_t&);
 
 private:
 
@@ -230,10 +228,6 @@ private:
        void diskstream_record_enable_changed ();
        void diskstream_speed_changed ();
        void diskstream_alignment_style_changed ();
-
-       void parameter_changed (std::string);
-       void deactivate_visible_processors ();
-       void activate_deactivated_processors ();
 };
 
 }; /* namespace ARDOUR*/