summaryrefslogtreecommitdiffstats
path: root/src/gui/Controls.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-04-16 19:02:36 +0000
committerDavid Robillard <d@drobilla.net>2011-04-16 19:02:36 +0000
commit9e5a7cf49ad84a5a3fa0aa61be11129fc4df1cc2 (patch)
tree089c1366a567dfbf88c0473288236b276ef24bf6 /src/gui/Controls.cpp
parent987710474b824cb92d83ff6fa7a090f50e10756f (diff)
downloadingen-9e5a7cf49ad84a5a3fa0aa61be11129fc4df1cc2.tar.gz
ingen-9e5a7cf49ad84a5a3fa0aa61be11129fc4df1cc2.tar.bz2
ingen-9e5a7cf49ad84a5a3fa0aa61be11129fc4df1cc2.zip
Squeeze blank lines and delete trailing whitespace.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3152 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui/Controls.cpp')
-rw-r--r--src/gui/Controls.cpp28
1 files changed, 0 insertions, 28 deletions
diff --git a/src/gui/Controls.cpp b/src/gui/Controls.cpp
index ed16350e..07e9da2c 100644
--- a/src/gui/Controls.cpp
+++ b/src/gui/Controls.cpp
@@ -36,7 +36,6 @@ namespace Ingen {
using namespace Client;
namespace GUI {
-
// ////////////////////// Control ///////////////////////////////// //
Control::Control(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& glade_xml)
@@ -53,7 +52,6 @@ Control::Control(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>&
sigc::mem_fun(this, &Control::menu_properties));
}
-
Control::~Control()
{
_enable_signal = false;
@@ -61,7 +59,6 @@ Control::~Control()
_port_model.reset();
}
-
void
Control::init(ControlPanel* panel, SharedPtr<PortModel> pm)
{
@@ -81,7 +78,6 @@ Control::init(ControlPanel* panel, SharedPtr<PortModel> pm)
set_label(pm->symbol().c_str());
}
-
void
Control::enable()
{
@@ -90,7 +86,6 @@ Control::enable()
i->get_widget()->set_sensitive(true);
}
-
void
Control::disable()
{
@@ -99,7 +94,6 @@ Control::disable()
i->get_widget()->set_sensitive(false);
}
-
void
Control::set_label(const string& name)
{
@@ -107,7 +101,6 @@ Control::set_label(const string& name)
_name_label->set_markup(name_markup);
}
-
void
Control::menu_properties()
{
@@ -118,10 +111,8 @@ Control::menu_properties()
window->present(_port_model);
}
-
// ////////////////// SliderControl ////////////////////// //
-
SliderControl::SliderControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
: Control(cobject, xml)
, _enabled(true)
@@ -131,7 +122,6 @@ SliderControl::SliderControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome::
xml->get_widget("control_strip_spinner", _value_spinner);
}
-
void
SliderControl::init(ControlPanel* panel, SharedPtr<PortModel> pm)
{
@@ -181,7 +171,6 @@ SliderControl::init(ControlPanel* panel, SharedPtr<PortModel> pm)
show_all();
}
-
bool
SliderControl::clicked(GdkEventButton* ev)
{
@@ -193,7 +182,6 @@ SliderControl::clicked(GdkEventButton* ev)
}
}
-
void
SliderControl::set_value(const Atom& atom)
{
@@ -220,7 +208,6 @@ SliderControl::set_value(const Atom& atom)
}
}
-
void
SliderControl::port_property_changed(const URI& key, const Atom& value)
{
@@ -235,7 +222,6 @@ SliderControl::port_property_changed(const URI& key, const Atom& value)
_enable_signal = true;
}
-
void
SliderControl::set_range(float min, float max)
{
@@ -245,7 +231,6 @@ SliderControl::set_range(float min, float max)
_slider->set_range(min, max);
}
-
void
SliderControl::update_value_from_slider()
{
@@ -270,7 +255,6 @@ SliderControl::update_value_from_slider()
}
}
-
void
SliderControl::update_value_from_spinner()
{
@@ -286,7 +270,6 @@ SliderControl::update_value_from_spinner()
}
}
-
/** Callback for when slider is grabbed so we can ignore set_control
* events for this port (and avoid nasty feedback issues).
*/
@@ -302,10 +285,8 @@ SliderControl::slider_pressed(GdkEvent* ev)
return false;
}
-
// ///////////// ToggleControl ////////////// //
-
ToggleControl::ToggleControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
: Control(cobject, xml)
{
@@ -313,7 +294,6 @@ ToggleControl::ToggleControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome::
xml->get_widget("toggle_control_check", _checkbutton);
}
-
void
ToggleControl::init(ControlPanel* panel, SharedPtr<PortModel> pm)
{
@@ -331,7 +311,6 @@ ToggleControl::init(ControlPanel* panel, SharedPtr<PortModel> pm)
show_all();
}
-
void
ToggleControl::set_value(const Atom& val)
{
@@ -355,7 +334,6 @@ ToggleControl::set_value(const Atom& val)
_enable_signal = true;
}
-
void
ToggleControl::toggled()
{
@@ -365,10 +343,8 @@ ToggleControl::toggled()
}
}
-
// ///////////// StringControl ////////////// //
-
StringControl::StringControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
: Control(cobject, xml)
{
@@ -376,7 +352,6 @@ StringControl::StringControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome::
xml->get_widget("string_control_entry", _entry);
}
-
void
StringControl::init(ControlPanel* panel, SharedPtr<PortModel> pm)
{
@@ -394,7 +369,6 @@ StringControl::init(ControlPanel* panel, SharedPtr<PortModel> pm)
show_all();
}
-
void
StringControl::set_value(const Atom& val)
{
@@ -406,7 +380,6 @@ StringControl::set_value(const Atom& val)
_enable_signal = true;
}
-
void
StringControl::activated()
{
@@ -415,6 +388,5 @@ StringControl::activated()
Raul::Atom(_entry->get_text().c_str()));
}
-
} // namespace GUI
} // namespace Ingen