Yet another blind copy/paste issue fix.

[ardour.git] / gtk2_ardour / route_ui.h

diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index 7e4dd2e9688bc4669ea9a6e440461552351936de..011498124ebb810c6b8e47af571097d26e2d72ee 100644 (file)
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -55,21 +55,25 @@ namespace Gtk {
        class Widget;
 }
 
-class ArdourButton;
+namespace ArdourWidgets {
+       class ArdourButton;
+       class Prompter;
+}
+
 class ArdourWindow;
 class IOSelectorWindow;
 class ControlSlaveUI;
 
 class RoutePinWindowProxy : public WM::ProxyBase
 {
-  public:
+public:
        RoutePinWindowProxy (std::string const &, boost::shared_ptr<ARDOUR::Route>);
        ~RoutePinWindowProxy();
 
        Gtk::Window* get (bool create = false);
        ARDOUR::SessionHandlePtr* session_handle();
 
-  private:
+private:
        boost::weak_ptr<ARDOUR::Route> _route;
 
        void route_going_away ();
@@ -78,7 +82,7 @@ class RoutePinWindowProxy : public WM::ProxyBase
 
 class RouteUI : public virtual Selectable, public virtual ARDOUR::SessionHandlePtr, public virtual PBD::ScopedConnectionList, public virtual sigc::trackable
 {
-  public:
+public:
        RouteUI (ARDOUR::Session*);
 
        virtual ~RouteUI();
@@ -104,8 +108,6 @@ class RouteUI : public virtual Selectable, public virtual ARDOUR::SessionHandleP
 
        boost::shared_ptr<ARDOUR::Route> _route;
 
-       void request_redraw ();
-
        virtual void set_color (uint32_t c);
        Gdk::Color route_color () const;
        void choose_color ();
@@ -116,17 +118,17 @@ class RouteUI : public virtual Selectable, public virtual ARDOUR::SessionHandleP
        bool multiple_solo_change;
 
        Gtk::HBox _invert_button_box;
-       ArdourButton* mute_button;
-       ArdourButton* solo_button;
-       ArdourButton* rec_enable_button; /* audio tracks */
-       ArdourButton* show_sends_button; /* busses */
-       ArdourButton* monitor_input_button;
-       ArdourButton* monitor_disk_button;
+       ArdourWidgets::ArdourButton* mute_button;
+       ArdourWidgets::ArdourButton* solo_button;
+       ArdourWidgets::ArdourButton* rec_enable_button; /* audio tracks */
+       ArdourWidgets::ArdourButton* show_sends_button; /* busses */
+       ArdourWidgets::ArdourButton* monitor_input_button;
+       ArdourWidgets::ArdourButton* monitor_disk_button;
 
        Glib::RefPtr<Gdk::Pixbuf> solo_safe_pixbuf;
 
-       ArdourButton* solo_safe_led;
-       ArdourButton* solo_isolated_led;
+       ArdourWidgets::ArdourButton* solo_safe_led;
+       ArdourWidgets::ArdourButton* solo_isolated_led;
 
 
        Gtk::Label monitor_input_button_label;
@@ -162,11 +164,6 @@ class RouteUI : public virtual Selectable, public virtual ARDOUR::SessionHandleP
        void edit_input_configuration ();
        void edit_output_configuration ();
 
-       void step_gain_up ();
-       void step_gain_down ();
-       void page_gain_up ();
-       void page_gain_down ();
-
        void build_sends_menu ();
        void set_sends_gain_from_track ();
        void set_sends_gain_to_zero ();
@@ -246,7 +243,7 @@ class RouteUI : public virtual Selectable, public virtual ARDOUR::SessionHandleP
        virtual void map_frozen ();
 
        void adjust_latency ();
-       bool process_save_template_prompter (ArdourPrompter& prompter, const std::string& dir);
+       bool process_save_template_prompter (ArdourWidgets::Prompter& prompter, const std::string& dir);
        void save_as_template ();
 
        static Gtkmm2ext::ActiveState solo_active_state (boost::shared_ptr<ARDOUR::Stripable>);
@@ -270,7 +267,7 @@ class RouteUI : public virtual Selectable, public virtual ARDOUR::SessionHandleP
        void comment_edited ();
        bool ignore_comment_edit;
 
-   protected:
+protected:
 
        ArdourWindow*  comment_window;
        Gtk::TextView* comment_area;
@@ -301,25 +298,26 @@ class RouteUI : public virtual Selectable, public virtual ARDOUR::SessionHandleP
 
        bool mark_hidden (bool yn);
 
-  private:
+private:
        void parameter_changed (std::string const&);
        void relabel_solo_button ();
        void track_mode_changed ();
 
        std::string route_state_id () const;
 
-  protected:
+protected:
        struct SoloMuteRelease {
-           SoloMuteRelease (bool was_active)
-           : active (was_active)
-           , exclusive (false) {}
-
-           boost::shared_ptr<ARDOUR::RouteList> routes;
-           boost::shared_ptr<ARDOUR::RouteList> routes_on;
-           boost::shared_ptr<ARDOUR::RouteList> routes_off;
-           boost::shared_ptr<ARDOUR::Route> route;
-           bool active;
-           bool exclusive;
+               SoloMuteRelease (bool was_active)
+                       : active (was_active)
+                       , exclusive (false)
+               {}
+
+               boost::shared_ptr<ARDOUR::RouteList> routes;
+               boost::shared_ptr<ARDOUR::RouteList> routes_on;
+               boost::shared_ptr<ARDOUR::RouteList> routes_off;
+               boost::shared_ptr<ARDOUR::Route> route;
+               bool active;
+               bool exclusive;
        };
 
        SoloMuteRelease* _solo_release;
@@ -335,7 +333,7 @@ private:
        bool invert_release (GdkEventButton *, uint32_t i);
 
        int _i_am_the_modifier;
-       std::vector<ArdourButton*> _invert_buttons;
+       std::vector<ArdourWidgets::ArdourButton*> _invert_buttons;
        Gtk::Menu* _invert_menu;
 
        StripableColorDialog _color_picker;