X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_track.h;h=ed138323601de36bc5ac3fc36223274881fbae5d;hb=71a90399fe8561310b848fbfb8d28a65a395a6c1;hp=c5f3bb977b85767c7cbfd2a9453e4989bf6907f9;hpb=4e6d0c9e61b62931a4a2120b548f0ff02a966351;p=ardour.git

diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index c5f3bb977b..ed13832360 100644
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -20,24 +20,24 @@
 #ifndef __ardour_midi_track_h__
 #define __ardour_midi_track_h__
 
-#include "ardour/interthread_info.h"
-#include "ardour/track.h"
+#include "ardour/midi_channel_filter.h"
 #include "ardour/midi_ring_buffer.h"
-#include "ardour/midi_state_tracker.h"
+#include "ardour/track.h"
 
 namespace ARDOUR
 {
 
-class Session;
+class InterThreadInfo;
 class MidiDiskstream;
 class MidiPlaylist;
 class RouteGroup;
 class SMFSource;
+class Session;
 
-class MidiTrack : public Track
+class LIBARDOUR_API MidiTrack : public Track
 {
 public:
-	MidiTrack (Session&, string name, Route::Flag f = Route::Flag (0), TrackMode m = Normal);
+	MidiTrack (Session&, std::string name, Route::Flag f = Route::Flag (0), TrackMode m = Normal);
 	~MidiTrack ();
 
 	int init ();
@@ -46,10 +46,12 @@ public:
 
 	void realtime_handle_transport_stopped ();
 	void realtime_locate ();
+	void non_realtime_locate (framepos_t);
 
 	boost::shared_ptr<Diskstream> create_diskstream ();
 	void set_diskstream (boost::shared_ptr<Diskstream>);
-	void set_record_enabled (bool yn, void *src);
+	void set_record_enabled (bool yn, PBD::Controllable::GroupControlDisposition);
+	void set_record_safe (bool yn, PBD::Controllable::GroupControlDisposition);
 
 	DataType data_type () const {
 		return DataType::MIDI;
@@ -71,7 +73,8 @@ public:
 	                  framecnt_t                   end_frame,
 	                  boost::shared_ptr<Processor> endpoint,
 	                  bool                         include_endpoint,
-	                  bool                         for_export);
+	                  bool                         for_export,
+	                  bool                         for_freeze);
 
 	int set_state (const XMLNode&, int version);
 
@@ -82,15 +85,22 @@ public:
 	struct MidiControl : public AutomationControl {
 		MidiControl(MidiTrack* route, const Evoral::Parameter& param,
 			    boost::shared_ptr<AutomationList> al = boost::shared_ptr<AutomationList>())
-			: AutomationControl (route->session(), param, al)
+			: AutomationControl (route->session(), param, ParameterDescriptor(param), al)
 			, _route (route)
 		{}
 
-		void set_value (double val);
+		void set_value (double val, PBD::Controllable::GroupControlDisposition group_override);
+		void set_value_unchecked (double);
+		bool writable() const { return true; }
 
 		MidiTrack* _route;
+
+	private:
+		void _set_value (double val, PBD::Controllable::GroupControlDisposition group_override);
 	};
 
+	virtual void set_parameter_automation_state (Evoral::Parameter param, AutoState);
+
 	NoteMode note_mode() const { return _note_mode; }
 	void set_note_mode (NoteMode m);
 
@@ -103,15 +113,27 @@ public:
 	PBD::Signal1<void,bool> StepEditStatusChange;
 
 	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 ();
+
+	/* Configure capture/playback channels (see MidiChannelFilter). */
+	void set_capture_channel_mode (ChannelMode mode, uint16_t mask);
+	void set_playback_channel_mode (ChannelMode mode, uint16_t mask);
+	void set_playback_channel_mask (uint16_t mask);
+	void set_capture_channel_mask (uint16_t mask);
+
+	ChannelMode get_playback_channel_mode() const { return _playback_filter.get_channel_mode(); }
+	ChannelMode get_capture_channel_mode()  const { return _capture_filter.get_channel_mode(); }
+	uint16_t    get_playback_channel_mask() const { return _playback_filter.get_channel_mask(); }
+	uint16_t    get_capture_channel_mask()  const { return _capture_filter.get_channel_mask(); }
+
+	MidiChannelFilter& playback_filter() { return _playback_filter; }
+	MidiChannelFilter& capture_filter()  { return _capture_filter; }
+
 	boost::shared_ptr<MidiPlaylist> midi_playlist ();
 
 	PBD::Signal1<void, boost::weak_ptr<MidiSource> > DataRecorded;
 	boost::shared_ptr<MidiBuffer> get_gui_feed_buffer () const;
 
-	void set_monitoring (MonitorChoice);
+	void set_monitoring (MonitorChoice, PBD::Controllable::GroupControlDisposition);
 	MonitorState monitoring_state () const;
 
 	void set_input_active (bool);
@@ -124,9 +146,16 @@ protected:
 	void act_on_mute ();
 
 private:
+	MidiRingBuffer<framepos_t> _immediate_events;
+	MidiRingBuffer<framepos_t> _step_edit_ring_buffer;
+	NoteMode                   _note_mode;
+	bool                       _step_editing;
+	bool                       _input_active;
+	MidiChannelFilter          _playback_filter;
+	MidiChannelFilter          _capture_filter;
 
 	virtual boost::shared_ptr<Diskstream> diskstream_factory (XMLNode const &);
-	
+
 	boost::shared_ptr<MidiDiskstream> midi_diskstream () const;
 
 	void write_out_of_band_data (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, framecnt_t nframes);
@@ -134,11 +163,6 @@ private:
 	void set_state_part_two ();
 	void set_state_part_three ();
 
-	MidiRingBuffer<framepos_t> _immediate_events;
-	MidiRingBuffer<framepos_t> _step_edit_ring_buffer;
-	NoteMode                  _note_mode;
-	bool                      _step_editing;
-	bool                      _input_active;
 
 	int no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, bool state_changing);
 	void push_midi_input_to_step_edit_ringbuffer (framecnt_t nframes);
@@ -148,6 +172,9 @@ private:
 
 	void track_input_active (IOChange, void*);
 	void map_input_active (bool);
+
+	/** Update automation controls to reflect any changes in buffers. */
+	void update_controls (const BufferSet& bufs);
 };
 
 } /* namespace ARDOUR*/