X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_track.h;h=ed138323601de36bc5ac3fc36223274881fbae5d;hb=8724a9f68f2854be6c3c70f15efda8076ef5db1d;hp=cf6d3f7b6476c8fbc1eb4007e4adaf50e6a766a5;hpb=b9185d2c07c77eccf3679ac99f6b69f8fdd79c48;p=ardour.git diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h index cf6d3f7b64..ed13832360 100644 --- a/libs/ardour/ardour/midi_track.h +++ b/libs/ardour/ardour/midi_track.h @@ -20,10 +20,9 @@ #ifndef __ardour_midi_track_h__ #define __ardour_midi_track_h__ -#include "pbd/ffs.h" - -#include "ardour/track.h" +#include "ardour/midi_channel_filter.h" #include "ardour/midi_ring_buffer.h" +#include "ardour/track.h" namespace ARDOUR { @@ -38,7 +37,7 @@ class Session; 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 (); @@ -47,10 +46,12 @@ public: void realtime_handle_transport_stopped (); void realtime_locate (); + void non_realtime_locate (framepos_t); boost::shared_ptr create_diskstream (); void set_diskstream (boost::shared_ptr); - 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; @@ -72,7 +73,8 @@ public: framecnt_t end_frame, boost::shared_ptr endpoint, bool include_endpoint, - bool for_export); + bool for_export, + bool for_freeze); int set_state (const XMLNode&, int version); @@ -83,15 +85,22 @@ public: struct MidiControl : public AutomationControl { MidiControl(MidiTrack* route, const Evoral::Parameter& param, boost::shared_ptr al = boost::shared_ptr()) - : 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); @@ -105,42 +114,26 @@ public: boost::shared_ptr write_source (uint32_t n = 0); - /** Channel filtering mode. - * @param mask If mode is FilterChannels, each bit represents a midi channel: - * bit 0 = channel 0, bit 1 = channel 1 etc. the read and write methods will only - * process events whose channel bit is 1. - * If mode is ForceChannel, mask is simply a channel number which all events will - * be forced to while reading. - */ - 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 static_cast((g_atomic_int_get(&_playback_channel_mask) & 0xffff0000) >> 16); - } - uint16_t get_playback_channel_mask() const { - return g_atomic_int_get(&_playback_channel_mask) & 0x0000ffff; - } - ChannelMode get_capture_channel_mode() const { - return static_cast((g_atomic_int_get(&_capture_channel_mask) & 0xffff0000) >> 16); - } - uint16_t get_capture_channel_mask() const { - return g_atomic_int_get(&_capture_channel_mask) & 0x0000ffff; - } + /* 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 midi_playlist (); - PBD::Signal0 PlaybackChannelMaskChanged; - PBD::Signal0 PlaybackChannelModeChanged; - PBD::Signal0 CaptureChannelMaskChanged; - PBD::Signal0 CaptureChannelModeChanged; - PBD::Signal1 > DataRecorded; boost::shared_ptr 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); @@ -158,11 +151,11 @@ private: NoteMode _note_mode; bool _step_editing; bool _input_active; - uint32_t _playback_channel_mask; // 16 bits mode, 16 bits mask - uint32_t _capture_channel_mask; // 16 bits mode, 16 bits mask + MidiChannelFilter _playback_filter; + MidiChannelFilter _capture_filter; virtual boost::shared_ptr diskstream_factory (XMLNode const &); - + boost::shared_ptr midi_diskstream () const; void write_out_of_band_data (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, framecnt_t nframes); @@ -180,31 +173,8 @@ private: void track_input_active (IOChange, void*); void map_input_active (bool); - void filter_channels (BufferSet& bufs, ChannelMode mode, uint32_t mask); - -/* if mode is ForceChannel, force mask to the lowest set channel or 1 if no - * channels are set. - */ -#define force_mask(mode,mask) (((mode) == ForceChannel) ? (((mask) ? (1<<(PBD::ffs((mask))-1)) : 1)) : mask) - - void _set_playback_channel_mode(ChannelMode mode, uint16_t mask) { - mask = force_mask (mode, mask); - g_atomic_int_set(&_playback_channel_mask, (uint32_t(mode) << 16) | uint32_t(mask)); - } - void _set_playback_channel_mask (uint16_t mask) { - mask = force_mask (get_playback_channel_mode(), mask); - g_atomic_int_set(&_playback_channel_mask, (uint32_t(get_playback_channel_mode()) << 16) | uint32_t(mask)); - } - void _set_capture_channel_mode(ChannelMode mode, uint16_t mask) { - mask = force_mask (mode, mask); - g_atomic_int_set(&_capture_channel_mask, (uint32_t(mode) << 16) | uint32_t(mask)); - } - void _set_capture_channel_mask (uint16_t mask) { - mask = force_mask (get_capture_channel_mode(), mask); - g_atomic_int_set(&_capture_channel_mask, (uint32_t(get_capture_channel_mode()) << 16) | uint32_t(mask)); - } - -#undef force_mask + /** Update automation controls to reflect any changes in buffers. */ + void update_controls (const BufferSet& bufs); }; } /* namespace ARDOUR*/