diff options
| author | Robin Gareus <robin@gareus.org> | 2017-10-04 00:35:29 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-10-04 00:54:55 +0200 |
| commit | e31f5d999837b0d0d63dc824c50e9da4acca7244 (patch) | |
| tree | ef4712ccd25e8cc651ffabcd16e120571c21921d /libs/ardour/ardour/disk_reader.h | |
| parent | 5dd9acf9ab39306277652c28fb5ac4af330e0af0 (diff) | |
Clean up State API:
* Processor implement get_state(), classes derived from Processor
implement protected ::state() -- as documented in processor.h
* likewise for Route, Track: make ::state() a protected interface
* removal of "full_state", use explicit "template_save"
* use RAII/Unwind to skip saving automation-state
Diffstat (limited to 'libs/ardour/ardour/disk_reader.h')
| -rw-r--r-- | libs/ardour/ardour/disk_reader.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h index 4bc78cbd67..cb37bc6cb1 100644 --- a/libs/ardour/ardour/disk_reader.h +++ b/libs/ardour/ardour/disk_reader.h @@ -35,7 +35,7 @@ template<typename T> class MidiRingBuffer; class LIBARDOUR_API DiskReader : public DiskIOProcessor { - public: +public: DiskReader (Session&, std::string const & name, DiskIOProcessor::Flag f = DiskIOProcessor::Flag (0)); ~DiskReader (); @@ -52,7 +52,6 @@ class LIBARDOUR_API DiskReader : public DiskIOProcessor int overwrite_existing_buffers (); void set_pending_overwrite (bool yn); - virtual XMLNode& state (bool full); int set_state (const XMLNode&, int version); PBD::Signal0<void> AlignmentStyleChanged; @@ -99,17 +98,19 @@ class LIBARDOUR_API DiskReader : public DiskIOProcessor static void set_no_disk_output (bool yn); static bool no_disk_output() { return _no_disk_output; } - protected: +protected: friend class Track; friend class MidiTrack; + XMLNode& state (); + void resolve_tracker (Evoral::EventSink<samplepos_t>& buffer, samplepos_t time); void playlist_changed (const PBD::PropertyChange&); int use_playlist (DataType, boost::shared_ptr<Playlist>); void playlist_ranges_moved (std::list< Evoral::RangeMove<samplepos_t> > const &, bool); - private: +private: /** The number of samples by which this diskstream's output should be delayed with respect to the transport sample. This is used for latency compensation. */ |