lots of MIDI editing stuff. to be explained on the website when its done

[ardour.git] / gtk2_ardour / mixer_strip.h

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index ced789f3ef81bb4a3cf88600c80926e888e35146..9bd811a2f728cd056e33dfbff41b3539103959ef 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -53,9 +53,6 @@
 #include "processor_box.h"
 #include "ardour_dialog.h"
 
-class MotionController;
-
-
 namespace Gtkmm2ext {
        class SliderController;
 }
@@ -76,6 +73,8 @@ namespace Gtk {
 
 class Mixer_UI;
 class IOSelectorWindow;
+class MotionController;
+class RouteGroupMenu;
 
 class MixerStrip : public RouteUI, public Gtk::EventBox
 {
@@ -94,12 +93,11 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void fast_update ();
        void set_embedded (bool);
        
-       ARDOUR::RouteGroup* mix_group() const;
+       ARDOUR::RouteGroup* route_group() const;
        void set_route (boost::shared_ptr<ARDOUR::Route>);
+       void set_button_names ();
 
-#ifdef GTKOSX
        sigc::signal<void>      WidthChanged;
-#endif
 
        static sigc::signal<void,boost::shared_ptr<ARDOUR::Route> > SwitchIO;
 
@@ -111,6 +109,11 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void set_selected(bool yn);
        void set_stuff_from_route ();
 
+       bool on_leave_notify_event (GdkEventCrossing* ev);
+       bool on_enter_notify_event (GdkEventCrossing* ev);
+       bool on_key_press_event (GdkEventKey* ev);
+       bool on_key_release_event (GdkEventKey* ev);
+
   private:
        Mixer_UI& _mixer;
 
@@ -136,8 +139,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        Gtk::Frame          global_frame;
        Gtk::VBox           global_vpacker;
 
-       ProcessorBox pre_processor_box;
-       ProcessorBox post_processor_box;
+       ProcessorBox processor_box;
        GainMeter   gpm;
        PannerUI    panners;
        
@@ -177,7 +179,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 
        Gtk::Button   group_button;
        Gtk::Label    group_label;
-       Gtk::Menu    *group_menu;
+       RouteGroupMenu *group_menu;
 
        gint input_press (GdkEventButton *);
        gint output_press (GdkEventButton *);
@@ -226,10 +228,9 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void comment_edited ();
        bool ignore_comment_edit;
 
-       void set_mix_group (ARDOUR::RouteGroup *);
-       void add_mix_group_to_menu (ARDOUR::RouteGroup *, Gtk::RadioMenuItem::Group*);
-       bool select_mix_group (GdkEventButton *);
-       void mix_group_changed (void *);
+       void set_route_group (ARDOUR::RouteGroup *);
+       bool select_route_group (GdkEventButton *);
+       void route_group_changed (void *);
 
        IOSelectorWindow *input_selector;
        IOSelectorWindow *output_selector;
@@ -257,8 +258,6 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        boost::shared_ptr<ARDOUR::Delivery> _current_delivery;
        void revert_to_default_display ();
 
-       void set_mix_group_to_new ();
-
        static int scrollbar_height;
 };