diff options
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/audio_track.h | 3 | ||||
| -rw-r--r-- | libs/ardour/ardour/auditioner.h | 6 | ||||
| -rw-r--r-- | libs/ardour/ardour/midi_track.h | 3 | ||||
| -rw-r--r-- | libs/ardour/ardour/track.h | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h index 55def29b99..6b8f01986c 100644 --- a/libs/ardour/ardour/audio_track.h +++ b/libs/ardour/ardour/audio_track.h @@ -48,7 +48,8 @@ class LIBARDOUR_API AudioTrack : public Track boost::shared_ptr<Region> bounce_range (samplepos_t start, samplepos_t end, InterThreadInfo&, boost::shared_ptr<Processor> endpoint, bool include_endpoint); int export_stuff (BufferSet& bufs, samplepos_t start_sample, samplecnt_t nframes, - boost::shared_ptr<Processor> endpoint, bool include_endpoint, bool for_export, bool for_freeze); + boost::shared_ptr<Processor> endpoint, bool include_endpoint, bool for_export, bool for_freeze, + MidiStateTracker&); int set_state (const XMLNode&, int version); diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h index 6ca51fc0d6..2ad2fba96d 100644 --- a/libs/ardour/ardour/auditioner.h +++ b/libs/ardour/ardour/auditioner.h @@ -87,16 +87,16 @@ public: return boost::shared_ptr<Region> (); } - int export_stuff (BufferSet&, samplepos_t, samplecnt_t, boost::shared_ptr<Processor>, bool, bool, bool) { return -1; } + int export_stuff (BufferSet&, samplepos_t, samplecnt_t, boost::shared_ptr<Processor>, bool, bool, bool, MidiStateTracker&) { return -1; } void set_audition_synth_info(PluginInfoPtr in) { audition_synth_info = in; } samplecnt_t output_latency () const { return 0; } private: - + PluginInfoPtr audition_synth_info; //we will use this to create a new synth on-the-fly each time an audition is requested - + boost::shared_ptr<AudioRegion> the_region; boost::shared_ptr<MidiRegion> midi_region; samplepos_t current_sample; diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h index 5a1c1aadc4..6e98267b26 100644 --- a/libs/ardour/ardour/midi_track.h +++ b/libs/ardour/ardour/midi_track.h @@ -66,7 +66,8 @@ public: boost::shared_ptr<Processor> endpoint, bool include_endpoint, bool for_export, - bool for_freeze); + bool for_freeze, + MidiStateTracker& tracker); int set_state (const XMLNode&, int version); diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h index bb6b0dca37..3da9902c13 100644 --- a/libs/ardour/ardour/track.h +++ b/libs/ardour/ardour/track.h @@ -42,6 +42,7 @@ class DiskWriter; class IO; class RecordEnableControl; class RecordSafeControl; +class MidiStateTracker; /** A track is an route (bus) with a recordable diskstream and * related objects relevant to recording, playback and editing. @@ -110,7 +111,8 @@ public: virtual boost::shared_ptr<Region> bounce_range (samplepos_t start, samplepos_t end, InterThreadInfo& itt, boost::shared_ptr<Processor> endpoint, bool include_endpoint) = 0; virtual int export_stuff (BufferSet& bufs, samplepos_t start_sample, samplecnt_t nframes, - boost::shared_ptr<Processor> endpoint, bool include_endpoint, bool for_export, bool for_freeze) = 0; + boost::shared_ptr<Processor> endpoint, bool include_endpoint, bool for_export, bool for_freeze, + MidiStateTracker&) = 0; virtual int set_state (const XMLNode&, int version); static void zero_diskstream_id_in_xml (XMLNode&); |