consolidate BundleAdded/Remove signal

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

diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index 6d2d73519c50f4834e450ca306e9526664e3f466..5e05ec373c67173771dea9d10955c2633749b3c7 100644 (file)
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -33,8 +33,9 @@ class RouteGroup;
 class Source;
 class Region;
 class Diskstream;
+class IO;
 
-class Track : public Route, public PublicDiskstream
+class LIBARDOUR_API Track : public Route, public PublicDiskstream
 {
   public:
        Track (Session&, std::string name, Route::Flag f = Route::Flag (0), TrackMode m = Normal, DataType default_type = DataType::AUDIO);
@@ -43,6 +44,7 @@ class Track : public Route, public PublicDiskstream
        int init ();
 
        bool set_name (const std::string& str);
+       void resync_track_name ();
 
        TrackMode mode () const { return _mode; }
        virtual int set_mode (TrackMode /*m*/) { return false; }
@@ -51,7 +53,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;
@@ -95,7 +97,7 @@ class Track : public Route, public PublicDiskstream
        virtual boost::shared_ptr<Region> bounce_range (framepos_t start, framepos_t end, InterThreadInfo&, 
                                                        boost::shared_ptr<Processor> endpoint, bool include_endpoint) = 0;
        virtual int export_stuff (BufferSet& bufs, framepos_t start_frame, framecnt_t nframes,
-                                 boost::shared_ptr<Processor> endpoint, bool include_endpoint, bool for_export) = 0;
+                                 boost::shared_ptr<Processor> endpoint, bool include_endpoint, bool for_export, bool for_freeze) = 0;
 
        XMLNode&    get_state();
        XMLNode&    get_template();
@@ -106,6 +108,7 @@ class Track : public Route, public PublicDiskstream
 
        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;
 
@@ -113,12 +116,12 @@ class Track : public Route, public PublicDiskstream
 
        /* PublicDiskstream interface */
        boost::shared_ptr<Playlist> playlist ();
-       void request_jack_monitors_input (bool);
-       void ensure_jack_monitors_input (bool);
+       void request_input_monitoring (bool);
+       void ensure_input_monitoring (bool);
        bool destructive () const;
        std::list<boost::shared_ptr<Source> > & last_capture_sources ();
        void set_capture_offset ();
-       std::list<boost::shared_ptr<Source> > steal_write_sources();
+       std::string steal_write_source_name ();
        void reset_write_sources (bool, bool force = false);
        float playback_buffer_load () const;
        float capture_buffer_load () const;
@@ -140,7 +143,7 @@ class Track : public Route, public PublicDiskstream
        void transport_stopped_wallclock (struct tm &, time_t, bool);
        bool pending_overwrite () const;
        double speed () const;
-       void prepare_to_stop (framepos_t);
+       void prepare_to_stop (framepos_t, framepos_t);
        void set_slaved (bool);
        ChanCount n_channels ();
        framepos_t get_capture_start_frame (uint32_t n = 0) const;
@@ -170,10 +173,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;
@@ -230,10 +229,9 @@ private:
        void diskstream_record_enable_changed ();
        void diskstream_speed_changed ();
        void diskstream_alignment_style_changed ();
+       void parameter_changed (std::string const & p);
 
-       void parameter_changed (std::string);
-       void deactivate_visible_processors ();
-       void activate_deactivated_processors ();
+       std::string _diskstream_name;
 };
 
 }; /* namespace ARDOUR*/