diff options
author | Carl Hetherington <carl@carlh.net> | 2010-04-21 21:29:15 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2010-04-21 21:29:15 +0000 |
commit | 950ac6ef2b08b460adb16a1a3690077ecf55314c (patch) | |
tree | 480fbd68d985cb610b3f577268f333a3947c3f25 /libs/ardour/ardour | |
parent | 061a85191c301ac18f2e8ca59d43127a4499ba96 (diff) |
Don't try to load separate diskstreams in 3.0 session files. Fix a few uses of Diskstream outside Track.
git-svn-id: svn://localhost/ardour2/branches/3.0@6946 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/audio_track.h | 3 | ||||
-rw-r--r-- | libs/ardour/ardour/midi_track.h | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h index d74f5e53b9..c2428339c7 100644 --- a/libs/ardour/ardour/audio_track.h +++ b/libs/ardour/ardour/audio_track.h @@ -42,8 +42,6 @@ class AudioTrack : public Track int roll (nframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick, bool can_record, bool rec_monitors_input, bool& need_butler); - boost::shared_ptr<AudioDiskstream> audio_diskstream() const; - void use_new_diskstream (); void set_diskstream (boost::shared_ptr<Diskstream>); @@ -60,6 +58,7 @@ class AudioTrack : public Track boost::shared_ptr<AudioFileSource> write_source (uint32_t n = 0); protected: + boost::shared_ptr<AudioDiskstream> audio_diskstream () const; XMLNode& state (bool full); int _set_state (const XMLNode&, int, bool call_base); diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h index 0399492a02..5d5bdc0cb4 100644 --- a/libs/ardour/ardour/midi_track.h +++ b/libs/ardour/ardour/midi_track.h @@ -44,8 +44,6 @@ public: void handle_transport_stopped (bool abort, bool did_locate, bool flush_processors); - boost::shared_ptr<MidiDiskstream> midi_diskstream() const; - void use_new_diskstream (); void set_diskstream (boost::shared_ptr<Diskstream>); @@ -92,6 +90,10 @@ public: void set_midi_thru (bool yn); boost::shared_ptr<SMFSource> write_source (uint32_t n = 0); + void set_channel_mode (ChannelMode, uint16_t); + ChannelMode get_channel_mode (); + uint16_t get_channel_mask (); + boost::shared_ptr<MidiPlaylist> midi_playlist (); protected: XMLNode& state (bool full); @@ -99,6 +101,8 @@ protected: int _set_state (const XMLNode&, int, bool call_base); private: + boost::shared_ptr<MidiDiskstream> midi_diskstream () const; + void write_out_of_band_data (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes); void set_state_part_two (); |