diff options
Diffstat (limited to 'src/gui/Controls.hpp')
-rw-r--r-- | src/gui/Controls.hpp | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/src/gui/Controls.hpp b/src/gui/Controls.hpp index db480dc2..d83a0bff 100644 --- a/src/gui/Controls.hpp +++ b/src/gui/Controls.hpp @@ -26,7 +26,6 @@ #include "raul/SharedPtr.hpp" namespace Ingen { namespace Client { class PortModel; } } -using namespace Ingen::Client; namespace Ingen { namespace GUI { @@ -44,23 +43,23 @@ public: Control(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& glade_xml); virtual ~Control(); - virtual void init(ControlPanel* panel, SharedPtr<PortModel> pm); + virtual void init(ControlPanel* panel, SharedPtr<Client::PortModel> pm); virtual void enable() = 0; virtual void disable() = 0; - inline const SharedPtr<PortModel> port_model() const { return _port_model; } + inline const SharedPtr<Client::PortModel> port_model() const { return _port_model; } protected: - virtual void set_value(const Atom& value) = 0; + virtual void set_value(const Raul::Atom& value) = 0; virtual void set_range(float min, float max) {} void menu_properties(); - ControlPanel* _control_panel; - SharedPtr<PortModel> _port_model; - sigc::connection _control_connection; - bool _enable_signal; + ControlPanel* _control_panel; + SharedPtr<Client::PortModel> _port_model; + sigc::connection _control_connection; + bool _enable_signal; Gtk::Menu* _menu; Gtk::MenuItem* _menu_properties; @@ -75,7 +74,7 @@ class SliderControl : public Control { public: SliderControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& glade_xml); - void init(ControlPanel* panel, SharedPtr<PortModel> pm); + void init(ControlPanel* panel, SharedPtr<Client::PortModel> pm); void enable(); void disable(); @@ -84,11 +83,11 @@ public: void set_max(float val); private: - void set_name(const string& name); - void set_value(const Atom& value); + void set_name(const std::string& name); + void set_value(const Raul::Atom& value); void set_range(float min, float max); - void port_variable_change(const string& key, const Raul::Atom& value); + void port_variable_change(const Raul::URI& key, const Raul::Atom& value); void update_range(); void update_value_from_slider(); @@ -142,14 +141,14 @@ class ToggleControl : public Control public: ToggleControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml); - void init(ControlPanel* panel, SharedPtr<PortModel> pm); + void init(ControlPanel* panel, SharedPtr<Client::PortModel> pm); void enable(); void disable(); private: - void set_name(const string& name); - void set_value(const Atom& value); + void set_name(const std::string& name); + void set_value(const Raul::Atom& value); void toggled(); |