move assignments out of assert() in editor_drag (thanks lincoln); change mouse mode...

[ardour.git] / gtk2_ardour / public_editor.h

diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index 7171edf98d214943f423e227f71285191c2049ae..85fb7faf70b3d96d7324bda2b83708599bba69af 100644 (file)
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -25,6 +25,7 @@
 #include <string>
 #include <glib.h>
 #include <gdk/gdktypes.h>
+#include <gtkmm/box.h>
 #include <gtkmm/window.h>
 #include <gtkmm/actiongroup.h>
 #include <jack/types.h>
@@ -150,19 +151,19 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulThingWithGoingAway
         * (defined in editing_syms.h)
         */
        virtual Editing::MouseMode current_mouse_mode () const = 0;
+
+       /** Switch into a mode in which editing is primarily focused on "within" regions,
+           rather than regions as black-box objects. For Ardour3, this is aimed at
+           editing MIDI regions but may expand in the future to other types of regions.
+       */
        
-       /** Set the midi edit mode (pencil, select, eraser, etc.)
-        * @param m Midi edit mode (defined in editing_syms.h)
-        * @param force Perform the effects of the change even if no change is required
-        * (ie even if the current midi edit mode is equal to \ref m)
-        */
-       virtual void set_midi_edit_mode (Editing::MidiEditMode m, bool force = false) = 0;
-       
-       /** @return The current mouse mode (gain, object, range, timefx etc.)
-        * (defined in editing_syms.h)
+       virtual void set_internal_edit (bool yn) = 0;
+
+       /** @return Whether editing is currently in "internal" mode or not
         */
-       virtual Editing::MidiEditMode current_midi_edit_mode () const = 0;
-       
+
+       virtual bool internal_editing() const = 0;
+
        /** @return Sound edited notes in MIDI regions while editing
         */
        virtual bool sound_notes () const = 0;
@@ -327,6 +328,14 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulThingWithGoingAway
        static const int vertical_spacing;
        static const int horizontal_spacing;
 
+#ifdef TOP_MENUBAR
+       /*
+        * This is needed for OS X primarily
+        * but also any other OS that uses a single
+        * top menubar instead of per window menus
+        */
+       virtual Gtk::HBox& get_status_bar_packer() = 0;
+#endif
 
        virtual gdouble get_trackview_group_vertical_offset () const = 0;
        virtual gdouble get_canvas_timebars_vsize () const = 0;