summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/progs/ingenuity/ControlGroups.cpp227
-rw-r--r--src/progs/ingenuity/ControlGroups.h48
-rw-r--r--src/progs/ingenuity/ControlPanel.cpp60
-rw-r--r--src/progs/ingenuity/ControlPanel.h39
-rw-r--r--src/progs/ingenuity/ingenuity.desktop10
-rw-r--r--src/progs/ingenuity/ingenuity.glade277
6 files changed, 370 insertions, 291 deletions
diff --git a/src/progs/ingenuity/ControlGroups.cpp b/src/progs/ingenuity/ControlGroups.cpp
index c2cc25a0..6862c499 100644
--- a/src/progs/ingenuity/ControlGroups.cpp
+++ b/src/progs/ingenuity/ControlGroups.cpp
@@ -31,22 +31,31 @@ namespace Ingenuity {
// ////////////////////// ControlGroup ///////////////////////////////// //
-ControlGroup::ControlGroup(ControlPanel* panel, SharedPtr<PortModel> pm, bool separator)
-: Gtk::VBox(false, 0),
- m_control_panel(panel),
- m_port_model(pm),
- m_has_separator(separator)
+ControlGroup::ControlGroup(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& glade_xml)
+: Gtk::VBox(cobject),
+ m_control_panel(NULL),
+ m_has_separator(false),
+ m_separator(NULL)
{
+}
+
+
+void
+ControlGroup::init(ControlPanel* panel, SharedPtr<PortModel> pm, bool separator)
+{
+ m_control_panel = panel;
+ m_port_model = pm,
+ m_has_separator = separator,
+
assert(m_port_model);
assert(panel);
- if (separator) {
- m_separator = new Gtk::HSeparator();
- pack_start(*m_separator, false, false, 4);
- } else {
- m_separator = NULL;
- }
-
+ /*if (separator) {
+ m_separator = new Gtk::VSeparator();
+ pack_start(*m_separator, false, false, 4);
+ }
+ */
+
pm->metadata_update_sig.connect(sigc::mem_fun(this, &ControlGroup::metadata_update));
pm->control_change_sig.connect(sigc::mem_fun(this, &ControlGroup::set_value));
}
@@ -64,21 +73,41 @@ ControlGroup::metadata_update(const string& key, const Atom& value)
// ////////////////// SliderControlGroup ////////////////////// //
-SliderControlGroup::SliderControlGroup(ControlPanel* panel, SharedPtr<PortModel> pm, bool separator)
-: ControlGroup(panel, pm, separator),
+
+SliderControlGroup::SliderControlGroup(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
+: ControlGroup(cobject, xml),
+ m_enabled(true),
+ m_enable_signal(false)
+{
+ xml->get_widget("control_strip_name_label", m_name_label);
+ xml->get_widget("control_strip_min_spinner", m_min_spinner);
+ xml->get_widget("control_strip_max_spinner", m_max_spinner);
+ xml->get_widget("control_strip_slider", m_slider);
+}
+
+
+void
+SliderControlGroup::init(ControlPanel* panel, SharedPtr<PortModel> pm, bool separator)
+/*: ControlGroup(panel, pm, separator),
m_enabled(true),
m_enable_signal(false),
m_name_label(pm->path().name(), 0.0, 0.0),
- m_range_box(false, 0),
- m_range_label("<small>Range: </small>"),
- m_min_spinner(1.0, (pm->is_integer() ? 0 : 4)), // climb rate, digits
- m_hyphen_label(" - "),
- m_max_spinner(1.0, (pm->is_integer() ? 0 : 4)),
- m_slider_box(false, 0),
- m_value_spinner(1.0, (pm->is_integer() ? 0 : 4)),
- m_slider(0, 1, (pm->is_integer() ? 1.0 : 0.0001))
+ m_min_spinner(1.0, (pm->is_integer() ? 0 : 2)), // climb rate, digits
+ m_max_spinner(1.0, (pm->is_integer() ? 0 : 2)),
+ m_box(false, 0),
+ m_value_spinner(1.0, (pm->is_integer() ? 0 : 2)),
+ m_slider(0, 1, (pm->is_integer() ? 1.0 : 0.0001))*/
{
- m_slider.set_increments(1.0, 10.0);
+ ControlGroup::init(panel, pm, separator);
+
+ assert(m_name_label);
+ assert(m_min_spinner);
+ assert(m_max_spinner);
+ assert(m_slider);
+
+ //m_slider->set_increments(1.0, 10.0);
+ //m_slider->set_value_pos(Gtk::POS_RIGHT);
+ m_slider->set_draw_value(true);
float min = 0.0f;
float max = 1.0f;
@@ -90,54 +119,49 @@ SliderControlGroup::SliderControlGroup(ControlPanel* panel, SharedPtr<PortModel>
max = max_atom.get_float();
}
- m_slider.property_draw_value() = false;
-
+ if (max <= min)
+ max = min + 1.0f;
+
set_name(pm->path().name());
- m_name_label.property_use_markup() = true;
- m_range_label.property_use_markup() = true;
+ //m_name_label->property_use_markup() = true;
+/*
m_value_spinner.set_range(-99999, 99999);
m_value_spinner.set_update_policy(Gtk::UPDATE_ALWAYS); // allow entered values outside range
m_value_spinner.set_value(m_port_model->value());
m_value_spinner.set_increments(1.0, 10.0);
- m_value_spinner.set_digits(5);
+ m_value_spinner.set_digits(2);
m_value_spinner.signal_value_changed().connect(
- sigc::mem_fun(*this, &SliderControlGroup::update_value_from_spinner));
- m_min_spinner.set_range(-99999, 99999);
- m_min_spinner.set_value(min);
- m_min_spinner.set_increments(1.0, 10.0);
- m_min_spinner.set_digits(5);
- m_min_spinner.signal_value_changed().connect(sigc::mem_fun(*this, &SliderControlGroup::min_changed));
- m_max_spinner.set_range(-99999, 99999);
- m_max_spinner.set_value(max);
- m_max_spinner.set_increments(1.0, 10.0);
- m_max_spinner.set_digits(5);
- m_max_spinner.signal_value_changed().connect(sigc::mem_fun(*this, &SliderControlGroup::max_changed));
-
- m_slider.set_value(m_port_model->value());
-
- m_slider.signal_event().connect(
+ sigc::mem_fun(*this, &SliderControlGroup::update_value_from_spinner));*/
+ //m_min_spinner->set_range(-99999, 99999);
+ m_min_spinner->set_value(min);
+ //m_min_spinner->set_increments(1.0, 10.0);
+ //m_min_spinner->set_digits(2);
+ m_min_spinner->signal_value_changed().connect(sigc::mem_fun(*this, &SliderControlGroup::min_changed));
+ //m_max_spinner->set_range(-99999, 99999);
+ m_max_spinner->set_value(max);
+ //m_max_spinner->set_increments(1.0, 10.0);
+ //m_max_spinner->set_digits(2);
+ m_max_spinner->signal_value_changed().connect(sigc::mem_fun(*this, &SliderControlGroup::max_changed));
+
+ m_slider->set_value(m_port_model->value());
+
+ m_slider->signal_event().connect(
sigc::mem_fun(*this, &SliderControlGroup::slider_pressed));
- m_slider.signal_value_changed().connect(
+ m_slider->signal_value_changed().connect(
sigc::mem_fun(*this, &SliderControlGroup::update_value_from_slider));
-
- m_range_box.pack_start(m_range_label, false, false, 2);
- m_range_box.pack_start(m_min_spinner, false, false, 1);
- m_range_box.pack_start(m_hyphen_label, false, false, 1);
- m_range_box.pack_start(m_max_spinner, false, false, 1);
-
- m_header_box.pack_start(m_name_label, true, true, 0);
- m_header_box.pack_start(m_range_box, true, true, 2);
+#if 0
+ m_box.pack_start(m_name_label, false, false, 6);
+ //m_box.pack_start(m_value_spinner, true, true, 1);
+ m_box.pack_start(m_min_spinner, false, false, 1);
+ m_box.pack_start(m_slider, true, true, 2);
+ m_box.pack_start(m_max_spinner, false, false, 1);
- m_slider_box.pack_start(m_value_spinner, false, false, 1);
- m_slider_box.pack_start(m_slider, true, true, 5);
-
- pack_start(m_header_box, false, false, 0);
- pack_start(m_slider_box, false, false, 0);
-
- m_slider.set_range(min, max);
+ pack_start(m_box);
+#endif
+ m_slider->set_range(min, max);
m_enable_signal = true;
@@ -148,9 +172,9 @@ SliderControlGroup::SliderControlGroup(ControlPanel* panel, SharedPtr<PortModel>
void
SliderControlGroup::set_name(const string& name)
{
- string name_label = "<small><span weight=\"bold\">";
- name_label += name + "</span></small>";
- m_name_label.set_markup(name_label);
+ string name_label = "<span weight=\"bold\">";
+ name_label += name + "</span>";
+ m_name_label->set_markup(name_label);
}
@@ -158,7 +182,7 @@ void
SliderControlGroup::set_min(float val)
{
m_enable_signal = false;
- m_min_spinner.set_value(val);
+ m_min_spinner->set_value(val);
m_enable_signal = true;
}
@@ -167,7 +191,7 @@ void
SliderControlGroup::set_max(float val)
{
m_enable_signal = false;
- m_max_spinner.set_value(val);
+ m_max_spinner->set_value(val);
m_enable_signal = true;
}
@@ -175,39 +199,37 @@ SliderControlGroup::set_max(float val)
void
SliderControlGroup::enable()
{
- m_slider.property_sensitive() = true;
- m_min_spinner.property_sensitive() = true;
- m_max_spinner.property_sensitive() = true;
- m_value_spinner.property_sensitive() = true;
- m_name_label.property_sensitive() = true;
- m_range_label.property_sensitive() = true;
+ m_slider->property_sensitive() = true;
+ m_min_spinner->property_sensitive() = true;
+ m_max_spinner->property_sensitive() = true;
+ //m_value_spinner.property_sensitive() = true;
+ m_name_label->property_sensitive() = true;
}
void
SliderControlGroup::disable()
{
- m_slider.property_sensitive() = false;
- m_min_spinner.property_sensitive() = false;
- m_max_spinner.property_sensitive() = false;
- m_value_spinner.property_sensitive() = false;
- m_name_label.property_sensitive() = false;
- m_range_label.property_sensitive() = false;
+ m_slider->property_sensitive() = false;
+ m_min_spinner->property_sensitive() = false;
+ m_max_spinner->property_sensitive() = false;
+ //m_value_spinner.property_sensitive() = false;
+ m_name_label->property_sensitive() = false;
}
void
SliderControlGroup::min_changed()
{
- double min = m_min_spinner.get_value();
- const double max = m_max_spinner.get_value();
+ double min = m_min_spinner->get_value();
+ const double max = m_max_spinner->get_value();
if (min >= max) {
min = max - 1.0;
- m_min_spinner.set_value(min);
+ m_min_spinner->set_value(min);
}
- m_slider.set_range(min, max);
+ m_slider->set_range(min, max);
if (m_enable_signal) {
char temp_buf[16];
@@ -220,15 +242,15 @@ SliderControlGroup::min_changed()
void
SliderControlGroup::max_changed()
{
- const double min = m_min_spinner.get_value();
- double max = m_max_spinner.get_value();
+ const double min = m_min_spinner->get_value();
+ double max = m_max_spinner->get_value();
if (max <= min) {
max = min + 1.0;
- m_max_spinner.set_value(max);
+ m_max_spinner->set_value(max);
}
- m_slider.set_range(min, max);
+ m_slider->set_range(min, max);
if (m_enable_signal) {
char temp_buf[16];
@@ -242,10 +264,10 @@ void
SliderControlGroup::update_value_from_slider()
{
if (m_enable_signal) {
- const float value = m_slider.get_value();
+ const float value = m_slider->get_value();
// Prevent spinner signal from doing all this over again (slow)
m_enable_signal = false;
- m_value_spinner.set_value(value);
+ //m_value_spinner.set_value(value);
m_control_panel->value_changed(m_port_model->path(), value);
//m_port_model->value(value);
m_enable_signal = true;
@@ -253,6 +275,7 @@ SliderControlGroup::update_value_from_slider()
}
+/*
void
SliderControlGroup::update_value_from_spinner()
{
@@ -260,16 +283,16 @@ SliderControlGroup::update_value_from_spinner()
m_enable_signal = false;
const float value = m_value_spinner.get_value();
- if (value < m_min_spinner.get_value()) {
- m_min_spinner.set_value(value);
- m_slider.set_range(m_min_spinner.get_value(), m_max_spinner.get_value());
+ if (value < m_min_spinner->get_value()) {
+ m_min_spinner->set_value(value);
+ m_slider->set_range(m_min_spinner->get_value(), m_max_spinner->get_value());
}
- if (value > m_max_spinner.get_value()) {
- m_max_spinner.set_value(value);
- m_slider.set_range(m_min_spinner.get_value(), m_max_spinner.get_value());
+ if (value > m_max_spinner->get_value()) {
+ m_max_spinner->set_value(value);
+ m_slider->set_range(m_min_spinner->get_value(), m_max_spinner->get_value());
}
- m_slider.set_value(m_value_spinner.get_value());
+ m_slider->set_value(m_value_spinner.get_value());
m_control_panel->value_changed(m_port_model->path(), value);
@@ -277,7 +300,7 @@ SliderControlGroup::update_value_from_spinner()
m_enable_signal = true;
}
}
-
+*/
/** Callback for when slider is grabbed so we can ignore set_control
* events for this port (and avoid nasty feedback issues).
@@ -302,7 +325,7 @@ SliderControlGroup::slider_pressed(GdkEvent* ev)
// ///////////// IntegerControlGroup ////////////// //
-
+#if 0
IntegerControlGroup::IntegerControlGroup(ControlPanel* panel, SharedPtr<PortModel> pm, bool separator)
: ControlGroup(panel, pm, separator),
m_enable_signal(false),
@@ -333,7 +356,7 @@ IntegerControlGroup::set_name(const string& name)
{
string name_label = "<span weight=\"bold\">";
name_label += name + "</span>";
- m_name_label.set_markup(name_label);
+ m_name_label->set_markup(name_label);
}
@@ -351,7 +374,7 @@ void
IntegerControlGroup::enable()
{
m_spinner.property_sensitive() = true;
- m_name_label.property_sensitive() = true;
+ m_name_label->property_sensitive() = true;
}
@@ -359,7 +382,7 @@ void
IntegerControlGroup::disable()
{
m_spinner.property_sensitive() = false;
- m_name_label.property_sensitive() = false;
+ m_name_label->property_sensitive() = false;
}
@@ -404,7 +427,7 @@ ToggleControlGroup::set_name(const string& name)
{
string name_label = "<span weight=\"bold\">";
name_label += name + "</span>";
- m_name_label.set_markup(name_label);
+ m_name_label->set_markup(name_label);
}
@@ -422,7 +445,7 @@ void
ToggleControlGroup::enable()
{
m_checkbutton.property_sensitive() = true;
- m_name_label.property_sensitive() = true;
+ m_name_label->property_sensitive() = true;
}
@@ -430,7 +453,7 @@ void
ToggleControlGroup::disable()
{
m_checkbutton.property_sensitive() = false;
- m_name_label.property_sensitive() = false;
+ m_name_label->property_sensitive() = false;
}
@@ -443,6 +466,6 @@ ToggleControlGroup::update_value()
//m_port_model->value(value);
}
}
-
+#endif
} // namespace Ingenuity
diff --git a/src/progs/ingenuity/ControlGroups.h b/src/progs/ingenuity/ControlGroups.h
index 48c638d3..85542dbe 100644
--- a/src/progs/ingenuity/ControlGroups.h
+++ b/src/progs/ingenuity/ControlGroups.h
@@ -39,7 +39,9 @@ class ControlPanel;
class ControlGroup : public Gtk::VBox
{
public:
- ControlGroup(ControlPanel* panel, SharedPtr<PortModel> pm, bool separator);
+ ControlGroup(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& glade_xml);
+
+ void init(ControlPanel* panel, SharedPtr<PortModel> pm, bool separator);
~ControlGroup() { delete m_separator; }
@@ -49,21 +51,17 @@ public:
assert(m_has_separator); remove(*m_separator); delete m_separator;
}
- virtual void enable() {}
- virtual void disable() {}
-
protected:
- virtual void set_name(const string& name) {}
- virtual void set_value(float val) = 0;
- virtual void set_min(float val) {}
- virtual void set_max(float val) {}
+ virtual void set_value(float value) = 0;
+ virtual void set_min(float min) = 0;
+ virtual void set_max(float max) = 0;
virtual void metadata_update(const string& key, const Atom& value);
- ControlPanel* m_control_panel;
- SharedPtr<PortModel> m_port_model;
- bool m_has_separator;
- Gtk::HSeparator* m_separator;
+ ControlPanel* m_control_panel;
+ SharedPtr<PortModel> m_port_model;
+ bool m_has_separator;
+ Gtk::VSeparator* m_separator;
};
@@ -74,7 +72,8 @@ protected:
class SliderControlGroup : public ControlGroup
{
public:
- SliderControlGroup(ControlPanel* panel, SharedPtr<PortModel> pm, bool separator);
+ SliderControlGroup(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& glade_xml);
+ void init(ControlPanel* panel, SharedPtr<PortModel> pm, bool separator);
void enable();
void disable();
@@ -99,16 +98,11 @@ private:
bool m_enabled;
bool m_enable_signal;
- Gtk::HBox m_header_box;
- Gtk::Label m_name_label;
- Gtk::HBox m_range_box;
- Gtk::Label m_range_label;
- Gtk::SpinButton m_min_spinner;
- Gtk::Label m_hyphen_label;
- Gtk::SpinButton m_max_spinner;
- Gtk::HBox m_slider_box;
- Gtk::SpinButton m_value_spinner;
- Gtk::HScale m_slider;
+ Gtk::Label* m_name_label;
+ Gtk::SpinButton* m_min_spinner;
+ Gtk::SpinButton* m_max_spinner;
+ //Gtk::SpinButton* m_value_spinner;
+ Gtk::VScale* m_slider;
};
@@ -117,14 +111,14 @@ SliderControlGroup::set_value(const float val)
{
m_enable_signal = false;
if (m_enabled) {
- m_slider.set_value(val);
- m_value_spinner.set_value(val);
+ m_slider->set_value(val);
+ //m_value_spinner->set_value(val);
}
m_enable_signal = true;
}
-
+#if 0
/** A spinbutton for integer controls.
*
@@ -174,7 +168,7 @@ private:
Gtk::Label m_name_label;
Gtk::CheckButton m_checkbutton;
};
-
+#endif
} // namespace Ingenuity
diff --git a/src/progs/ingenuity/ControlPanel.cpp b/src/progs/ingenuity/ControlPanel.cpp
index 73317bd9..eb316860 100644
--- a/src/progs/ingenuity/ControlPanel.cpp
+++ b/src/progs/ingenuity/ControlPanel.cpp
@@ -21,12 +21,13 @@
#include "NodeModel.h"
#include "PortModel.h"
#include "ControlGroups.h"
+#include "GladeFactory.h"
namespace Ingenuity {
ControlPanel::ControlPanel(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
-: Gtk::VBox(cobject),
+: Gtk::HBox(cobject),
m_callback_enabled(true)
{
xml->get_widget("control_panel_controls_box", m_control_box);
@@ -95,23 +96,30 @@ ControlPanel::add_port(SharedPtr<PortModel> pm)
// Add port
if (pm->is_control() && pm->is_input()) {
bool separator = (m_controls.size() > 0);
- ControlGroup* cg = NULL;
+ SliderControlGroup* cg = NULL;
if (pm->is_integer())
- cg = new IntegerControlGroup(this, pm, separator);
+ cerr << "FIXME: integer\n";
+ //cg = new IntegerControlGroup(this, pm, separator);
else if (pm->is_toggle())
- cg = new ToggleControlGroup(this, pm, separator);
- else
- cg = new SliderControlGroup(this, pm, separator);
+ cerr << "FIXME: toggle\n";
+ //cg = new ToggleControlGroup(this, pm, separator);
+ else {
+ Glib::RefPtr<Gnome::Glade::Xml> xml = GladeFactory::new_glade_reference("control_strip");
+ xml->get_widget_derived("control_strip", cg);
+ cg->init(this, pm, separator);
+ }
m_controls.push_back(cg);
m_control_box->pack_start(*cg, false, false, 0);
- if (pm->connected())
+ /*if (pm->connected())
cg->disable();
else
- cg->enable();
+ cg->enable();*/
+
+ cg->show();
- cerr << "FIXME: Control panel add port\n";
+ cerr << "FIXME: control panel connected port tracking\n";
// pm->connection_sig.connect(bind(sigc::mem_fun(this, &ControlPanel::connection), pm))
// pm->disconnection_sig.connect(bind(sigc::mem_fun(this, &ControlPanel::disconnection), pm))
}
@@ -167,6 +175,7 @@ ControlPanel::rename_port(const Path& old_path, const Path& new_path)
}
*/
+#if 0
/** Enable the control for the given port.
*
* Used when all connections to port are un-made.
@@ -197,7 +206,7 @@ ControlPanel::disable_port(const Path& path)
}
}
}
-
+#endif
/** Callback for ControlGroups to notify this of a change.
*/
@@ -214,37 +223,6 @@ ControlPanel::value_changed(const Path& port_path, float val)
}
}
-/*
-void
-ControlPanel::set_range_min(const Path& port_path, float val)
-{
- bool found = false;
- for (vector<ControlGroup*>::iterator i = m_controls.begin(); i != m_controls.end(); ++i) {
- if ((*i)->port_model()->path() == port_path) {
- found = true;
- (*i)->set_min(val);
- }
- }
- if (found == false)
- cerr << "[ControlPanel::set_range_min] Unable to find control " << port_path << endl;
-}
-
-
-void
-ControlPanel::set_range_max(const Path& port_path, float val)
-{
- bool found = false;
- for (vector<ControlGroup*>::iterator i = m_controls.begin(); i != m_controls.end(); ++i) {
- if ((*i)->port_model()->path() == port_path) {
- found = true;
- (*i)->set_max(val);
- }
- }
- if (found == false)
- cerr << "[ControlPanel::set_range_max] Unable to find control " << port_path << endl;
-}
-*/
-
void
ControlPanel::all_voices_selected()
{
diff --git a/src/progs/ingenuity/ControlPanel.h b/src/progs/ingenuity/ControlPanel.h
index 623ac347..8d91df8d 100644
--- a/src/progs/ingenuity/ControlPanel.h
+++ b/src/progs/ingenuity/ControlPanel.h
@@ -46,7 +46,7 @@ namespace Ingenuity {
*
* \ingroup Ingenuity
*/
-class ControlPanel : public Gtk::VBox {
+class ControlPanel : public Gtk::HBox {
public:
ControlPanel(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& glade_xml);
virtual ~ControlPanel();
@@ -58,8 +58,6 @@ public:
void add_port(SharedPtr<PortModel> port);
void remove_port(const Path& path);
- //void rename_port(const Path& old_path, const Path& new_path);
-
void enable_port(const Path& path);
void disable_port(const Path& path);
@@ -69,10 +67,6 @@ public:
// Callback for ControlGroup (FIXME: ugly)
void value_changed(const Path& port_path, float val);
- //inline void set_control(const Path& port_path, float value);
- //void set_range_min(const Path& port_path, float value);
- //void set_range_max(const Path& port_path, float value);
-
private:
void all_voices_selected();
void specific_voice_selected();
@@ -83,7 +77,7 @@ private:
pair<int,int> m_ideal_size;
vector<ControlGroup*> m_controls;
- Gtk::VBox* m_control_box;
+ Gtk::HBox* m_control_box;
Gtk::Box* m_voice_control_box;
Gtk::RadioButton* m_all_voices_radio;
Gtk::RadioButton* m_specific_voice_radio;
@@ -91,35 +85,6 @@ private:
};
-/** Set a port on this panel to a certain value.
- *
- * Profiling has shown this is performance critical. Needs to be made
- * faster.
- */
-/*
-inline void
-ControlPanel::set_control(const Path& port_path, const float val)
-{
- // FIXME: double lookup, ports should just have a pointer directly to
- // their control group
-
- m_callback_enabled = false;
- ControlGroup* cg = NULL;
-
- for (vector<ControlGroup*>::iterator i = m_controls.begin(); i != m_controls.end(); ++i) {
- cg = (*i);
- if (cg->port_model()->path() == port_path) {
- cg->set_value(val);
- m_callback_enabled = true;
- return;
- }
- }
-
- cerr << "[ControlPanel::set_control] Unable to find control " << port_path << endl;
- m_callback_enabled = true;
-}
-*/
-
} // namespace Ingenuity
#endif // CONTROLPANEL_H
diff --git a/src/progs/ingenuity/ingenuity.desktop b/src/progs/ingenuity/ingenuity.desktop
new file mode 100644
index 00000000..0db837dd
--- /dev/null
+++ b/src/progs/ingenuity/ingenuity.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Ingenuity
+Version=0.4.0pre
+Comment=Create synthesizers and effects processors in a modular environment
+Exec=ingenuity
+Terminal=false
+Icon=ingen-icon.svg
+Type=Application
+Categories=Application;AudioVideo;Sound;Audio
diff --git a/src/progs/ingenuity/ingenuity.glade b/src/progs/ingenuity/ingenuity.glade
index 684bbd0c..7ffe43bd 100644
--- a/src/progs/ingenuity/ingenuity.glade
+++ b/src/progs/ingenuity/ingenuity.glade
@@ -1693,10 +1693,10 @@
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkVBox" id="control_panel_controls_box">
+ <widget class="GtkHBox" id="control_panel_controls_box">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="homogeneous">True</property>
+ <property name="spacing">4</property>
<child>
<placeholder/>
@@ -1821,58 +1821,6 @@
<property name="spacing">0</property>
<child>
- <widget class="GtkToolbar" id="patch_view_crumb_toolbar">
- <property name="visible">True</property>
- <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
- <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
- <property name="tooltips">True</property>
- <property name="show_arrow">False</property>
-
- <child>
- <widget class="GtkToolItem" id="toolitem4">
- <property name="visible">True</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
-
- <child>
- <widget class="GtkViewport" id="patch_view_breadcrumb_container">
- <property name="visible">True</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkSeparatorToolItem" id="separatortoolitem12">
- <property name="visible">True</property>
- <property name="draw">True</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkToolbar" id="patch_view_toolbar">
<property name="visible">True</property>
<property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
@@ -1881,19 +1829,6 @@
<property name="show_arrow">False</property>
<child>
- <widget class="GtkSeparatorToolItem" id="separatortoolitem14">
- <property name="visible">True</property>
- <property name="draw">True</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkToggleToolButton" id="patch_view_process_but">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Enable DSP processing</property>
@@ -1993,8 +1928,7 @@
<child>
<widget class="GtkToolButton" id="patch_view_clear_but">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Destroy all children nodes
-(Click twice to clear ports as well)</property>
+ <property name="tooltip" translatable="yes">Clear (Destroy all children nodes, click twice to clear ports as well)</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">True</property>
<property name="stock_id">gtk-clear</property>
@@ -2011,7 +1945,7 @@
<child>
<widget class="GtkToolButton" id="patch_view_destroy_but">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Destroy patch</property>
+ <property name="tooltip" translatable="yes">Destroy this patch</property>
<property name="stock_id">gtk-delete</property>
<property name="visible_horizontal">True</property>
<property name="visible_vertical">True</property>
@@ -2024,19 +1958,6 @@
</child>
<child>
- <widget class="GtkSeparatorToolItem" id="separatortoolitem8">
- <property name="visible">True</property>
- <property name="draw">True</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkToolButton" id="patch_view_refresh_but">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Refresh view</property>
@@ -2112,6 +2033,58 @@
<property name="homogeneous">True</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkSeparatorToolItem" id="separatortoolitem14">
+ <property name="visible">True</property>
+ <property name="draw">True</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkToolItem" id="toolitem4">
+ <property name="visible">True</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+
+ <child>
+ <widget class="GtkViewport" id="patch_view_breadcrumb_container">
+ <property name="visible">True</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkToolbar" id="patch_view_crumb_toolbar">
+ <property name="visible">True</property>
+ <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+ <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+ <property name="tooltips">True</property>
+ <property name="show_arrow">False</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -2156,6 +2129,142 @@
<property name="x_options">fill</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkVBox" id="control_strip">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkSpinButton" id="control_strip_max_spinner">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">0</property>
+ <property name="numeric">True</property>
+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">False</property>
+ <property name="adjustment">1 0 100 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">0</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox69">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="control_strip_name_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">&lt;b&gt;Name&lt;/b&gt;</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">1</property>
+ <property name="yalign">1</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">90</property>
+ </widget>
+ <packing>
+ <property name="padding">2</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVScale" id="control_strip_slider">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="draw_value">True</property>
+ <property name="value_pos">GTK_POS_BOTTOM</property>
+ <property name="digits">2</property>
+ <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+ <property name="inverted">True</property>
+ <property name="adjustment">0.7 0 1 0 0 0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">4</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSpinButton" id="control_strip_min_spinner">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">0</property>
+ <property name="numeric">True</property>
+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">False</property>
+ <property name="adjustment">1 0 100 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">shrink|fill</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHSeparator" id="hseparator5">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 21:00:25 +0000