diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-07-20 19:05:35 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 11:40:53 -0400 |
| commit | dc4f730ac95837590e8305f69778d1049e4a545e (patch) | |
| tree | 176fac9481db29c07a99576759d0bcb5e2aa46bb /libs/ardour/ardour | |
| parent | 03e99e986683a8ee9848b966d4d9d13b7e3abc45 (diff) | |
initial (incomplete) framework for DiskIOPoint manipulation
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/route.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/track.h | 10 | ||||
| -rw-r--r-- | libs/ardour/ardour/types.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/types_convert.h | 1 |
4 files changed, 11 insertions, 4 deletions
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index f3a0dac4df..c3d46f6175 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -740,6 +740,8 @@ private: framecnt_t update_port_latencies (PortSet& ports, PortSet& feeders, bool playback, framecnt_t) const; void setup_invisible_processors (); + virtual void setup_invisible_processors_oh_children_of_mine (ProcessorList&) {} + void unpan (); void set_plugin_state_dir (boost::weak_ptr<Processor>, const std::string&); diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h index 33903c2b91..1bd65a984c 100644 --- a/libs/ardour/ardour/track.h +++ b/libs/ardour/ardour/track.h @@ -185,6 +185,8 @@ class LIBARDOUR_API Track : public Route, public Recordable void adjust_playback_buffering (); void adjust_capture_buffering (); + void set_disk_io_position (DiskIOPoint); + PBD::Signal0<void> FreezeChange; PBD::Signal0<void> PlaylistChanged; PBD::Signal0<void> SpeedChanged; @@ -198,6 +200,7 @@ class LIBARDOUR_API Track : public Route, public Recordable boost::shared_ptr<Playlist> _playlists[DataType::num_types]; MeterPoint _saved_meter_point; + DiskIOPoint _disk_io_point; TrackMode _mode; bool _needs_butler; boost::shared_ptr<MonitorControl> _monitoring_control; @@ -227,9 +230,9 @@ class LIBARDOUR_API Track : public Route, public Recordable virtual void set_state_part_two () = 0; - FreezeRecord _freeze_record; - XMLNode* pending_state; - bool _destructive; + FreezeRecord _freeze_record; + XMLNode* pending_state; + bool _destructive; void maybe_declick (BufferSet&, framecnt_t, int); @@ -251,6 +254,7 @@ class LIBARDOUR_API Track : public Route, public Recordable private: void parameter_changed (std::string const & p); + void setup_invisible_processors_oh_children_of_mine (ProcessorList&); std::string _diskstream_name; }; diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index bf32e85cd0..3999c36aa3 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -195,7 +195,7 @@ namespace ARDOUR { enum DiskIOPoint { DiskIOPreFader, /* after the trim control, but before other processors */ DiskIOPostFader, /* before the main outs, after other processors */ - DiskIOCaustom, /* up to the user. Caveat Emptor! */ + DiskIOCustom, /* up to the user. Caveat Emptor! */ }; enum MeterType { diff --git a/libs/ardour/ardour/types_convert.h b/libs/ardour/ardour/types_convert.h index 52cf616c29..ab6fa8353e 100644 --- a/libs/ardour/ardour/types_convert.h +++ b/libs/ardour/ardour/types_convert.h @@ -58,6 +58,7 @@ DEFINE_ENUM_CONVERT(ARDOUR::BufferingPreset) DEFINE_ENUM_CONVERT(ARDOUR::AutoReturnTarget) DEFINE_ENUM_CONVERT(ARDOUR::MeterType) DEFINE_ENUM_CONVERT(ARDOUR::MeterPoint) +DEFINE_ENUM_CONVERT(ARDOUR::DiskIOPoint) DEFINE_ENUM_CONVERT(ARDOUR::NoteMode) DEFINE_ENUM_CONVERT(ARDOUR::ChannelMode) DEFINE_ENUM_CONVERT(ARDOUR::MonitorChoice) |