fix OSX compilation

[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 eb23a8873b93919f0e3a93dcee3c0f77eee719e0..afe2f4a97da934dffd622ec786082eca2dcd7d68 100644 (file)
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -122,7 +122,7 @@ public:
        void resolve_note(uint8_t note_num, Evoral::Beats end_time);
 
        void cut_copy_clear (Editing::CutCopyOp);
-       bool paste (framepos_t pos, const ::Selection& selection, PasteContext& ctx);
+       bool paste (framepos_t pos, const ::Selection& selection, PasteContext& ctx, const int32_t sub_num);
        void paste_internal (framepos_t pos, unsigned paste_count, float times, const MidiCutBuffer&);
 
        void add_canvas_patch_change (ARDOUR::MidiModel::PatchChangePtr patch, const std::string& displaytext, bool);
@@ -328,12 +328,18 @@ public:
         */
        void create_note_at (framepos_t t, double y, Evoral::Beats length, bool snap_t);
 
-       void clear_selection (bool signal = true) { clear_selection_except (0, signal); }
+       /** An external request to clear the note selection, remove MRV from editor
+        * selection.
+        */
+       void clear_selection ();
 
-        ARDOUR::InstrumentInfo& instrument_info() const;
+       ARDOUR::InstrumentInfo& instrument_info() const;
 
        void note_deleted (NoteBase*);
 
+       void show_verbose_cursor_for_new_note_value(boost::shared_ptr<NoteType> current_note,
+                                                   uint8_t new_note) const;
+
 protected:
        void region_resized (const PBD::PropertyChange&);
 
@@ -349,19 +355,6 @@ private:
        friend class MidiRubberbandSelectDrag;
        friend class MidiVerticalSelectDrag;
 
-       /** Emitted when the selection has been cleared in one MidiRegionView,
-        *  with the expectation that others will clear their selections in
-        *  sympathy.
-        */
-       static PBD::Signal1<void, MidiRegionView*> SelectionCleared;
-       PBD::ScopedConnection _selection_cleared_connection;
-       void selection_cleared (MidiRegionView *);
-
-       /** this handles the case when the "external" world wants us to clear our internal selections
-        */
-       PBD::ScopedConnection _clear_midi_selection_connection;
-       void clear_midi_selection () { clear_selection(); }
-
        friend class EditNoteDialog;
 
        /** Play the NoteOn event of the given note immediately
@@ -371,7 +364,13 @@ private:
        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 (bool with_selection_signal = true);
+       /** Clear the note selection of just this midi region
+        */
+       void clear_selection_internal ();
+
+       void clear_editor_note_selection ();
+
+       void clear_events ();
 
        bool canvas_group_event(GdkEvent* ev);
        bool note_canvas_event(GdkEvent* ev);
@@ -389,13 +388,14 @@ private:
        void trim_note(NoteBase* ev, ARDOUR::MidiModel::TimeType start_delta,
                       ARDOUR::MidiModel::TimeType end_delta);
 
-       void clear_selection_except (NoteBase* ev, bool signal = true);
        void update_drag_selection (framepos_t start, framepos_t end, double y0, double y1, bool extend);
        void update_vertical_drag_selection (double last_y, double y, bool extend);
 
        void add_to_selection (NoteBase*);
        void remove_from_selection (NoteBase*);
 
+       std::string get_note_name (boost::shared_ptr<NoteType> note, uint8_t note_value) const;
+
        void show_verbose_cursor (std::string const &, double, double) const;
        void show_verbose_cursor (boost::shared_ptr<NoteType>) const;