smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 23:35:03 +01:00
Code Issues Projects Releases Wiki Activity

processor-box: explicitly check for "Amp" (Fader)

Browse source
This commit is contained in:
Robin Gareus 2015-09-21 13:14:29 +02:00
parent e64e4e19bc
commit cba31db6fe
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gtk2_ardour/processor_box.cc
View file

@ -165,7 +165,7 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr<Processo
_controls.push_back (c);
if (boost::dynamic_pointer_cast<Amp> (_processor) == 0) {
/* Add non-Amp controls to the processor box */
/* Add non-Amp (Fader & Trim) controls to the processor box */
_vbox.pack_start (c->box);
}
}
@ -1796,7 +1796,7 @@ ProcessorBox::help_count_visible_prefader_processors (boost::weak_ptr<Processor>
if (processor && processor->display_to_user()) {
if (boost::dynamic_pointer_cast<Amp>(processor)) {
if (boost::dynamic_pointer_cast<Amp>(processor) && boost::dynamic_pointer_cast<Amp>(processor)->type() == X_("amp")) {
*amp_seen = true;
} else {
if (!*amp_seen) {
@ -1872,7 +1872,7 @@ ProcessorBox::setup_entry_positions ()
uint32_t num = 0;
for (list<ProcessorEntry*>::iterator i = children.begin(); i != children.end(); ++i) {
if (boost::dynamic_pointer_cast<Amp>((*i)->processor())) {
if (boost::dynamic_pointer_cast<Amp>((*i)->processor()) && boost::dynamic_pointer_cast<Amp>((*i)->processor())->type() == X_("amp")) {
pre_fader = false;
(*i)->set_position (ProcessorEntry::Fader, num++);
} else {
@ -2444,7 +2444,7 @@ ProcessorBox::get_editor_window (boost::shared_ptr<Processor> processor, bool us
}
}
if (boost::dynamic_pointer_cast<Amp> (processor)) {
if (boost::dynamic_pointer_cast<Amp> (processor) && boost::dynamic_pointer_cast<Amp> (processor)->type() == X_("amp")) {
if (_parent_strip) {
_parent_strip->revert_to_default_display ();

2
libs/ardour/amp.cc
View file

@ -59,7 +59,7 @@ Amp::Amp (Session& s, std::string type)
std::string
Amp::display_name() const
{
return _("Fader");
return _type == "trim" ? _("Trim") : _("Fader");
}
bool

1
libs/ardour/ardour/amp.h
View file

@ -39,6 +39,7 @@ public:
Amp(Session& s, std::string type = "amp");
std::string display_name() const;
std::string type() const { return _type;}
bool visible () const;