Merge branch 'master' into windows

[ardour.git] / gtk2_ardour / midi_region_view.h

diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h
index 8ad1214c78c8eae3fd2fc6b282477db6011f60c2..219d07f37615cf482900cbfb4294b2ba1fa734c7 100644 (file)
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -22,14 +22,16 @@
 #include <string>
 #include <vector>
 
+#ifdef interface
+#undef interface
+#endif
+
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
 
 #include "pbd/signals.h"
 
-#include "ardour/midi_track.h"
 #include "ardour/midi_model.h"
-#include "ardour/diskstream.h"
 #include "ardour/types.h"
 
 #include "editing.h"
@@ -64,6 +66,7 @@ class AutomationRegionView;
 class MidiCutBuffer;
 class MidiListEditor;
 class EditNoteDialog;
+class NotePlayer;
 
 class MidiRegionView : public RegionView
 {
@@ -126,7 +129,11 @@ public:
         * @key a reference to an instance of MIDI::Name::PatchPrimaryKey whose fields will
         *        will be set according to the result of the lookup
         */
-       void get_patch_key_at(double time, uint8_t channel, MIDI::Name::PatchPrimaryKey& key);
+       void get_patch_key_at (double time, uint8_t channel, MIDI::Name::PatchPrimaryKey& key) const;
+
+       /** Convert a given PatchChange into a PatchPrimaryKey
+        */
+       MIDI::Name::PatchPrimaryKey patch_change_to_patch_key (ARDOUR::MidiModel::PatchChangePtr);
 
        /** Change old_patch to new_patch.
         * @param old_patch the canvas patch change which is to be altered
@@ -140,6 +147,8 @@ public:
        void delete_patch_change (ArdourCanvas::CanvasPatchChange *);
        void edit_patch_change (ArdourCanvas::CanvasPatchChange *);
 
+       void delete_sysex (ArdourCanvas::CanvasSysEx*);
+
        /** Alter a given patch to be its predecessor in the MIDNAM file.
         */
        void previous_patch (ArdourCanvas::CanvasPatchChange &);
@@ -178,6 +187,8 @@ public:
        void   note_left(ArdourCanvas::CanvasNoteEvent* ev);
        void   patch_entered (ArdourCanvas::CanvasPatchChange *);
        void   patch_left (ArdourCanvas::CanvasPatchChange *);
+       void   sysex_entered (ArdourCanvas::CanvasSysEx* p);
+       void   sysex_left (ArdourCanvas::CanvasSysEx* p);
        void   note_mouse_position (float xfraction, float yfraction, bool can_set_cursor=true);
        void   unique_select(ArdourCanvas::CanvasNoteEvent* ev);
        void   note_selected(ArdourCanvas::CanvasNoteEvent* ev, bool add, bool extend=false);
@@ -232,6 +243,8 @@ public:
 
        MouseState mouse_state() const { return _mouse_state; }
 
+       void note_button_release ();
+
        struct NoteResizeData {
                ArdourCanvas::CanvasNote  *canvas_note;
                ArdourCanvas::SimpleRect  *resize_rect;
@@ -278,6 +291,11 @@ public:
 
        void show_list_editor ();
 
+       typedef std::set<ArdourCanvas::CanvasNoteEvent*> Selection;
+       Selection selection () const {
+               return _selection;
+       }
+       
        void selection_as_notelist (Notes& selected, bool allow_all_if_none_selected = false);
 
        void enable_display (bool);
@@ -292,13 +310,7 @@ public:
 
        void clear_selection (bool signal = true) { clear_selection_except (0, signal); }
 
-       std::string model_name () const {
-               return _model_name;
-       }
-
-       std::string custom_device_mode () const {
-               return _custom_device_mode;
-       }
+        ARDOUR::InstrumentInfo& instrument_info() const;
        
 protected:
        /** Allows derived types to specify their visibility requirements
@@ -338,16 +350,19 @@ private:
        /** Play the NoteOn event of the given note immediately
         * and schedule the playback of the corresponding NoteOff event.
         */
-       void play_midi_note(boost::shared_ptr<NoteType> note);
-       void play_midi_chord (std::vector<boost::shared_ptr<NoteType> > notes);
+       void play_midi_note (boost::shared_ptr<NoteType> note);
+       void start_playing_midi_note (boost::shared_ptr<NoteType> note);
+       void start_playing_midi_chord (std::vector<boost::shared_ptr<NoteType> > notes);
 
-       void clear_events();
+       void clear_events (bool with_selection_signal = true);
 
        bool canvas_event(GdkEvent* ev);
        bool note_canvas_event(GdkEvent* ev);
 
-       void midi_channel_mode_changed(ARDOUR::ChannelMode mode, uint16_t mask);
-       void midi_patch_settings_changed(std::string model, std::string custom_device_mode);
+       void midi_channel_mode_changed ();
+        PBD::ScopedConnection _channel_mode_changed_connection;
+       void instrument_settings_changed ();
+       PBD::ScopedConnection _instrument_changed_connection;
 
        void change_note_channel (ArdourCanvas::CanvasNoteEvent *, int8_t, bool relative=false);
        void change_note_velocity(ArdourCanvas::CanvasNoteEvent* ev, int8_t vel, bool relative=false);
@@ -367,16 +382,9 @@ private:
        void show_verbose_cursor (std::string const &, double, double) const;
        void show_verbose_cursor (boost::shared_ptr<NoteType>) const;
 
-       uint16_t _last_channel_selection;
        uint8_t  _current_range_min;
        uint8_t  _current_range_max;
 
-       /// MIDNAM information of the current track: Model name of MIDNAM file
-       std::string _model_name;
-
-       /// MIDNAM information of the current track: CustomDeviceMode
-       std::string _custom_device_mode;
-
        typedef std::list<ArdourCanvas::CanvasNoteEvent*> Events;
        typedef std::vector< boost::shared_ptr<ArdourCanvas::CanvasPatchChange> > PatchChanges;
        typedef std::vector< boost::shared_ptr<ArdourCanvas::CanvasSysEx> > SysExes;
@@ -405,8 +413,7 @@ private:
        MouseState _mouse_state;
        int _pressed_button;
 
-       typedef std::set<ArdourCanvas::CanvasNoteEvent*> Selection;
-       /// Currently selected CanvasNoteEvents
+       /** Currently selected CanvasNoteEvents */
        Selection _selection;
 
        bool _sort_needed;
@@ -473,6 +480,11 @@ private:
 
        Gdk::Cursor* pre_enter_cursor;
        Gdk::Cursor* pre_press_cursor;
+
+       NotePlayer* _note_player;
+
+        ARDOUR::ChannelMode get_channel_mode() const;
+        uint16_t get_selected_channels () const;
 };