Merged with trunk R846

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

diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index 7389e174b0b7972ed6ca95f4e37751381ba5aac4..2e628fa5869cbf9fffb360bce46e3002e61ef634 100644 (file)
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -19,6 +19,8 @@
 #ifndef __ardour_track_h__
 #define __ardour_track_h__
 
+#include <boost/shared_ptr.hpp>
+
 #include <ardour/route.h>
 
 namespace ARDOUR {
@@ -31,11 +33,11 @@ class RouteGroup;
 class Track : public Route
 {
   public:
-       Track (Session&, string name, Route::Flag f = Route::Flag (0), TrackMode m = Normal, Buffer::Type default_type = Buffer::AUDIO);
+       Track (Session&, string name, Route::Flag f = Route::Flag (0), TrackMode m = Normal, DataType default_type = DataType::AUDIO);
 
-       virtual ~Track () {}
+       virtual ~Track ();
        
-       virtual int set_name (string str, void *src) = 0;
+       int set_name (string str, void *src);
 
        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) = 0;
@@ -48,19 +50,18 @@ class Track : public Route
 
        void toggle_monitor_input ();
 
-       bool can_record() const { return true; }
-       virtual void set_record_enable (bool yn, void *src) = 0;
+       bool can_record();
 
-       Diskstream& diskstream() const { return *_diskstream; }
+       boost::shared_ptr<Diskstream> diskstream() const { return _diskstream; }
 
        virtual int use_diskstream (string name) = 0;
        virtual int use_diskstream (const PBD::ID& id) = 0;
 
-       TrackMode    mode() const { return _mode; }
-       virtual void set_mode (TrackMode m) = 0;
+       TrackMode mode() const { return _mode; }
+       void      set_mode (TrackMode m);
 
        jack_nframes_t update_total_latency();
-       virtual void   set_latency_delay (jack_nframes_t) = 0;
+       void           set_latency_delay (jack_nframes_t);
 
        enum FreezeState {
                NoFreeze,
@@ -82,36 +83,35 @@ class Track : public Route
 
        PBD::Controllable& rec_enable_control() { return _rec_enable_control; }
 
-       virtual bool record_enabled() const = 0;
+       bool record_enabled() const;
+       void set_record_enable (bool yn, void *src);
+       
        void set_meter_point (MeterPoint, void* src);
        
-       sigc::signal<void>       ModeChanged;
-       sigc::signal<void,void*> DiskstreamChanged;
-       sigc::signal<void>       FreezeChange;
+       sigc::signal<void> ModeChanged;
+       sigc::signal<void> DiskstreamChanged;
+       sigc::signal<void> FreezeChange;
 
   protected:
-       Track (Session& sess, const XMLNode& node, Buffer::Type default_type = Buffer::AUDIO);
+       Track (Session& sess, const XMLNode& node, DataType default_type = DataType::AUDIO);
 
        virtual XMLNode& state (bool full) = 0;
 
-       virtual void passthru_silence (jack_nframes_t start_frame, jack_nframes_t end_frame, 
-               jack_nframes_t nframes, jack_nframes_t offset, int declick, bool meter) = 0;
-
-       virtual uint32_t n_process_buffers () = 0;
+       virtual ChanCount n_process_buffers () = 0;
        
-       Diskstream *_diskstream;
+       boost::shared_ptr<Diskstream> _diskstream;
        MeterPoint  _saved_meter_point;
        TrackMode   _mode;
 
-       //private:
+       //private: (FIXME)
        struct FreezeRecordInsertInfo {
-           FreezeRecordInsertInfo(XMLNode& st) 
-                   : state (st), insert (0) {}
+           FreezeRecordInsertInfo(XMLNode& st, boost::shared_ptr<Insert> ins) 
+                   : state (st), insert (ins) {}
 
-           XMLNode    state;
-           Insert*    insert;
-           PBD::ID    id;
-           UndoAction memento;
+           XMLNode                   state;
+           boost::shared_ptr<Insert> insert;
+           PBD::ID                   id;
+           UndoAction                memento;
        };
 
        struct FreezeRecord {