Add load_session to profiling.

[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 07c51800d5c01a27034dd245fcb951666ae70dd9..86600e8b8d119100350178da49c25b36f02570b4 100644 (file)
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -127,7 +127,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);       
+
+        /** 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
@@ -300,13 +304,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
@@ -356,7 +354,8 @@ private:
        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 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);
@@ -380,12 +379,6 @@ private:
        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;