diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-02 18:48:32 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-02 18:48:32 +0000 |
| commit | 11fdd6cd18a754ab39bf64965570bad932904e47 (patch) | |
| tree | 4f7f75e466c5deec750ae321095dc1ac1be693e9 /gtk2_ardour/route_ui.h | |
| parent | f9bff66f9bbae8164c983520cd77fd46e18d2c52 (diff) | |
solo buttons are now ArdourButtons
git-svn-id: svn://localhost/ardour2/branches/3.0@10401 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/route_ui.h')
| -rw-r--r-- | gtk2_ardour/route_ui.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h index 6601bb7d5d..a14437b0bf 100644 --- a/gtk2_ardour/route_ui.h +++ b/gtk2_ardour/route_ui.h @@ -93,18 +93,17 @@ class RouteUI : public virtual AxisView Gtk::HBox _invert_button_box; ArdourButton* mute_button; - BindableToggleButton* solo_button; + ArdourButton* solo_button; BindableToggleButton* rec_enable_button; /* audio tracks */ ArdourButton* show_sends_button; /* busses */ ArdourButton* monitor_input_button; ArdourButton* monitor_disk_button; - Gtk::Image* solo_safe_image; + Glib::RefPtr<Gdk::Pixbuf> solo_safe_pixbuf; ArdourButton* solo_safe_led; ArdourButton* solo_isolated_led; - Gtk::Label solo_button_label; Gtk::Label rec_enable_button_label; Gtk::Label monitor_input_button_label; Gtk::Label monitor_disk_button_label; @@ -219,10 +218,9 @@ class RouteUI : public virtual AxisView void save_as_template (); void open_remote_control_id_dialog (); - static int solo_visual_state (boost::shared_ptr<ARDOUR::Route>); - static int solo_visual_state_with_isolate (boost::shared_ptr<ARDOUR::Route>); - static int solo_isolate_visual_state (boost::shared_ptr<ARDOUR::Route>); - static int solo_safe_visual_state (boost::shared_ptr<ARDOUR::Route>); + static Gtkmm2ext::ActiveState solo_active_state (boost::shared_ptr<ARDOUR::Route>); + static Gtkmm2ext::ActiveState solo_isolate_active_state (boost::shared_ptr<ARDOUR::Route>); + static Gtkmm2ext::ActiveState solo_safe_active_state (boost::shared_ptr<ARDOUR::Route>); static Gtkmm2ext::ActiveState mute_active_state (ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>); protected: |