Merging from trunk

[ardour.git] / gtk2_ardour / route_ui.h

diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index acdc08430633c2bc018b7d94dcb1b99e65cb8fb9..69c9b7f5a9ac92f0788e2f4183fb028517774c99 100644 (file)
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -23,14 +23,13 @@
 
 #include <list>
 
-#include <gtk--.h>
 #include <pbd/xml++.h>
 #include <ardour/ardour.h>
 #include <ardour/route.h>
 
 #include "axis_view.h"
 
-namespace Gtkmmext {
+namespace Gtkmm2ext {
        class BindableToggleButton;
 }
 
@@ -38,6 +37,12 @@ namespace ARDOUR {
        class AudioTrack;
 }
 
+namespace Gtk {
+       class Menu;
+       class CheckMenuItem;
+       class Widget;
+}
+
 class RouteUI : public virtual AxisView
 {
   public:
@@ -45,7 +50,7 @@ class RouteUI : public virtual AxisView
        virtual ~RouteUI();
 
        bool is_audio_track() const;
-       ARDOUR::DiskStream* get_diskstream() const;
+       ARDOUR::AudioDiskstream* get_diskstream() const;
 
        ARDOUR::Route& route() const { return _route; }
        ARDOUR::AudioTrack* audio_track() const;
@@ -53,28 +58,28 @@ class RouteUI : public virtual AxisView
        string name() const;
        
        ARDOUR::Route& _route;
-
        
-       void set_color (Gdk_Color c);
+       void set_color (const Gdk::Color & c);
        bool choose_color ();
 
        bool ignore_toggle;
        bool wait_for_release;
 
-       Gtkmmext::BindableToggleButton * mute_button;
-       Gtkmmext::BindableToggleButton * solo_button;
-       Gtkmmext::BindableToggleButton * rec_enable_button;
+       Gtkmm2ext::BindableToggleButton * mute_button;
+       Gtkmm2ext::BindableToggleButton * solo_button;
+       Gtkmm2ext::BindableToggleButton * rec_enable_button;
        
        virtual string solo_button_name () const { return "SoloButton"; }
        virtual string safe_solo_button_name () const { return "SafeSoloButton"; }
        
        Gtk::Menu* mute_menu;
        Gtk::Menu* solo_menu;
+       Gtk::Menu* remote_control_menu;
 
        XMLNode *xml_node;
        void ensure_xml_node ();
 
-       XMLNode* get_child_xml_node (std::string childname);
+       XMLNode* get_child_xml_node (const string & childname);
        
        gint mute_press(GdkEventButton*);
        gint mute_release(GdkEventButton*);
@@ -88,6 +93,8 @@ class RouteUI : public virtual AxisView
        void session_rec_enable_changed();
 
        void build_solo_menu (void);
+       void build_remote_control_menu (void);
+       void refresh_remote_control_menu ();
 
        void solo_safe_toggle (void*, Gtk::CheckMenuItem*);
        void toggle_solo_safe (Gtk::CheckMenuItem*);
@@ -107,9 +114,9 @@ class RouteUI : public virtual AxisView
 
        int  set_color_from_route ();
 
-       SigC::Connection blink_connection;
+       sigc::connection blink_connection;
 
-       void rec_enable_button_blink (bool onoff, ARDOUR::DiskStream *, Gtk::Widget *w);
+       void rec_enable_button_blink (bool onoff, ARDOUR::AudioDiskstream *, Gtk::Widget *w);
        
        void remove_this_route ();
        static gint idle_remove_this_route (RouteUI *);
@@ -119,12 +126,14 @@ class RouteUI : public virtual AxisView
        virtual void name_changed (void *src);
        void route_removed ();
 
-       static gint okay_gplusplus_cannot_do_complex_templates (RouteUI *rui);
-
        Gtk::CheckMenuItem *route_active_menu_item;
        void toggle_route_active ();
        virtual void route_active_changed ();
 
+       Gtk::CheckMenuItem *polarity_menu_item;
+       void toggle_polarity ();
+       virtual void polarity_changed ();
+
        void disconnect_input ();
        void disconnect_output ();
 
@@ -133,6 +142,8 @@ class RouteUI : public virtual AxisView
        void update_solo_display ();
        virtual void map_frozen ();
 
+       void set_remote_control_id (uint32_t id, Gtk::CheckMenuItem* item);
+
        void reversibly_apply_route_boolean (string name, void (ARDOUR::Route::*func)(bool, void*), bool, void *);
        void reversibly_apply_audio_track_boolean (string name, void (ARDOUR::AudioTrack::*func)(bool, void*), bool, void *);
 };