ardour/livetrax
13
0
Fork 0
Code

processor-box: remove label-cruft and properly label 'Send' & 'Return'

Browse Source
This commit is contained in:
Robin Gareus 2014-01-05 21:05:48 +01:00
parent e89e06ded2
commit 9dec072438
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk2_ardour/processor_box.cc
View File

@ -134,7 +134,15 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr<Processo
set<Evoral::Parameter> p = _processor->what_can_be_automated ();
for (set<Evoral::Parameter>::iterator i = p.begin(); i != p.end(); ++i) {
Control* c = new Control (_processor->automation_control (*i), _processor->describe_parameter (*i));
std::string label = _processor->describe_parameter (*i);
if (boost::dynamic_pointer_cast<Send> (_processor)) {
label = _("Send");
} else if (boost::dynamic_pointer_cast<Return> (_processor)) {
label = _("Return");
}
Control* c = new Control (_processor->automation_control (*i), label);
_controls.push_back (c);
@ -142,11 +150,6 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr<Processo
/* Add non-Amp controls to the processor box */
_vbox.pack_start (c->box);
}
if (boost::dynamic_pointer_cast<Send> (_processor)) {
/* Don't label send faders */
c->hide_label ();
}
}
_input_icon.set_ports(_processor->input_streams());
@ -511,7 +514,6 @@ ProcessorEntry::Control::set_tooltip ()
string sm = Glib::Markup::escape_text (s.str());
ARDOUR_UI::instance()->set_tip (_label, sm);
_slider_persistant_tooltip.set_tip (sm);
ARDOUR_UI::instance()->set_tip (_button, sm);
}
@ -620,12 +622,6 @@ ProcessorEntry::Control::hide_things ()
}
}
void
ProcessorEntry::Control::hide_label ()
{
_label.hide ();
}
string
ProcessorEntry::Control::state_id () const
{

2
gtk2_ardour/processor_box.h
View File

@ -171,7 +171,6 @@ private:
void add_state (XMLNode *) const;
void set_state (XMLNode const *);
void hide_things ();
void hide_label ();
bool visible () const {
return _visible;
@ -194,7 +193,6 @@ private:
/* things for a slider */
Gtk::Adjustment _adjustment;
Gtkmm2ext::HSliderController _slider;
Gtk::Label _label;
Gtkmm2ext::PersistentTooltip _slider_persistant_tooltip;
/* things for a button */
ArdourButton _button;