diff options
| author | Taybin Rutkin <taybin@taybin.com> | 2005-09-25 20:33:00 +0000 |
|---|---|---|
| committer | Taybin Rutkin <taybin@taybin.com> | 2005-09-25 20:33:00 +0000 |
| commit | e493b2b7c4fbbbfc457f02babf9546289b430177 (patch) | |
| tree | 598b5fa6dc9340c96961e3131cc994480d80ff6a /gtk2_ardour/mixer_strip.h | |
| parent | f872433e8e81ba5a3a9ebffa32c6ddd9e3358f07 (diff) | |
Fly my pretties!
git-svn-id: svn://localhost/trunk/ardour2@28 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_strip.h')
| -rw-r--r-- | gtk2_ardour/mixer_strip.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h index 055fa7a6bb..93538265fc 100644 --- a/gtk2_ardour/mixer_strip.h +++ b/gtk2_ardour/mixer_strip.h @@ -24,10 +24,10 @@ #include <vector> #include <cmath> -#include <gtk--.h> -#include <gtkmmext/auto_spin.h> -#include <gtkmmext/slider_controller.h> -#include <gtkmmext/click_box.h> +#include <gtkmm.h> +#include <gtkmm2ext/auto_spin.h> +#include <gtkmm2ext/slider_controller.h> +#include <gtkmm2ext/click_box.h> #include <ardour/types.h> #include <ardour/ardour.h> @@ -48,7 +48,7 @@ class MotionController; -namespace Gtkmmext { +namespace Gtkmm2ext { class SliderController; } @@ -130,7 +130,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox Gtk::ToggleButton polarity_button; - SigC::Connection newplug_connection; + sigc::connection newplug_connection; gint mark_update_safe (); guint32 mode_switch_in_progress; @@ -186,8 +186,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox void gain_automation_style_changed(); void pan_automation_style_changed(); - SigC::Connection panstate_connection; - SigC::Connection panstyle_connection; + sigc::connection panstate_connection; + sigc::connection panstyle_connection; void connect_to_pan (); std::string astate_string (ARDOUR::AutoState); @@ -235,7 +235,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox /* speed control (for tracks only) */ Gtk::Adjustment speed_adjustment; - Gtkmmext::ClickBox speed_spinner; + Gtkmm2ext::ClickBox speed_spinner; Gtk::Label speed_label; Gtk::Frame speed_frame; @@ -246,8 +246,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox void map_frozen (); void hide_redirect_editor (ARDOUR::Redirect* redirect); - SigC::Connection gain_watching; - SigC::Connection pan_watching; + sigc::connection gain_watching; + sigc::connection pan_watching; bool ignore_speed_adjustment; string solo_button_name () const { return "MixerSoloButton"; } |