projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the horrible mess that was anything related to sources and paths.
[ardour.git]
/
libs
/
ardour
/
ardour
/
track.h
diff --git
a/libs/ardour/ardour/track.h
b/libs/ardour/ardour/track.h
index 9c99ecfd258e92d3e2feb9dd3cfb93fa0a42a1c3..566153d02f82eb8ad9529ef1868c2238d809b0c6 100644
(file)
--- a/
libs/ardour/ardour/track.h
+++ b/
libs/ardour/ardour/track.h
@@
-29,6
+29,7
@@
class Session;
class Diskstream;
class Playlist;
class RouteGroup;
class Diskstream;
class Playlist;
class RouteGroup;
+class Region;
class Track : public Route
{
class Track : public Route
{
@@
-37,7
+38,7
@@
class Track : public Route
virtual ~Track ();
virtual ~Track ();
-
int set_name (string str, void *src
);
+
bool set_name (const std::string& str
);
TrackMode mode () const { return _mode; }
virtual int set_mode (TrackMode m) { return false; }
TrackMode mode () const { return _mode; }
virtual int set_mode (TrackMode m) { return false; }
@@
-55,7
+56,7
@@
class Track : public Route
void toggle_monitor_input ();
void toggle_monitor_input ();
-
virtual
bool can_record();
+ bool can_record();
boost::shared_ptr<Diskstream> diskstream() const { return _diskstream; }
boost::shared_ptr<Diskstream> diskstream() const { return _diskstream; }
@@
-76,14
+77,14
@@
class Track : public Route
virtual void freeze (InterThreadInfo&) = 0;
virtual void unfreeze () = 0;
virtual void freeze (InterThreadInfo&) = 0;
virtual void unfreeze () = 0;
- virtual
void
bounce (InterThreadInfo&) = 0;
- virtual
void
bounce_range (nframes_t start, nframes_t end, InterThreadInfo&) = 0;
+ virtual
boost::shared_ptr<Region>
bounce (InterThreadInfo&) = 0;
+ virtual
boost::shared_ptr<Region>
bounce_range (nframes_t start, nframes_t end, InterThreadInfo&) = 0;
XMLNode& get_state();
XMLNode& get_template();
virtual int set_state(const XMLNode& node) = 0;
XMLNode& get_state();
XMLNode& get_template();
virtual int set_state(const XMLNode& node) = 0;
-
PBD::Controllable&
rec_enable_control() { return _rec_enable_control; }
+
boost::shared_ptr<PBD::Controllable>
rec_enable_control() { return _rec_enable_control; }
bool record_enabled() const;
void set_record_enable (bool yn, void *src);
bool record_enabled() const;
void set_record_enable (bool yn, void *src);
@@
-98,24
+99,19
@@
class Track : public Route
virtual XMLNode& state (bool full) = 0;
virtual XMLNode& state (bool full) = 0;
- virtual void passthru_silence (nframes_t start_frame, nframes_t end_frame,
- nframes_t nframes, nframes_t offset, int declick, bool meter) = 0;
-
- virtual uint32_t n_process_buffers () = 0;
-
boost::shared_ptr<Diskstream> _diskstream;
MeterPoint _saved_meter_point;
TrackMode _mode;
//private: (FIXME)
boost::shared_ptr<Diskstream> _diskstream;
MeterPoint _saved_meter_point;
TrackMode _mode;
//private: (FIXME)
- struct FreezeRecord
Insert
Info {
- FreezeRecord
InsertInfo(XMLNode& st, boost::shared_ptr<Insert> ins
)
- : state (st),
insert (ins
) {}
-
- XMLNode state;
- boost::shared_ptr<
Insert> insert
;
- PBD::ID id;
- UndoAction memento;
+ struct FreezeRecord
Processor
Info {
+ FreezeRecord
ProcessorInfo(XMLNode& st, boost::shared_ptr<Processor> proc
)
+ : state (st),
processor (proc
) {}
+
+ XMLNode
state;
+ boost::shared_ptr<
Processor> processor
;
+ PBD::ID
id;
+ UndoAction
memento;
};
struct FreezeRecord {
};
struct FreezeRecord {
@@
-125,10
+121,13
@@
class Track : public Route
~FreezeRecord();
~FreezeRecord();
- boost::shared_ptr<Playlist> playlist;
- vector<FreezeRecordInsertInfo*> insert_info;
- bool have_mementos;
- FreezeState state;
+ boost::shared_ptr<Playlist> playlist;
+ vector<FreezeRecordProcessorInfo*> processor_info;
+ bool have_mementos;
+ FreezeState state;
+ gain_t gain;
+ AutoState gain_automation_state;
+ AutoState pan_automation_state;
};
struct RecEnableControllable : public PBD::Controllable {
};
struct RecEnableControllable : public PBD::Controllable {
@@
-140,19
+139,15
@@
class Track : public Route
Track& track;
};
Track& track;
};
- //virtual void diskstream_record_enable_changed (void *src) = 0;
- //virtual void diskstream_input_channel_changed (void *src) = 0;
-
- //virtual void input_change_handler (void *src) = 0;
-
virtual void set_state_part_two () = 0;
FreezeRecord _freeze_record;
XMLNode* pending_state;
sigc::connection recenable_connection;
sigc::connection ic_connection;
virtual void set_state_part_two () = 0;
FreezeRecord _freeze_record;
XMLNode* pending_state;
sigc::connection recenable_connection;
sigc::connection ic_connection;
- RecEnableControllable _rec_enable_control;
bool _destructive;
bool _destructive;
+
+ boost::shared_ptr<RecEnableControllable> _rec_enable_control;
};
}; /* namespace ARDOUR*/
};
}; /* namespace ARDOUR*/