*/
-//#define ALWAYS_DISPLAY_WIRES
-
#ifdef WAF_BUILD
#include "gtk2ardour-config.h"
#endif
+#ifdef COMPILER_MSVC
+#define rintf(x) round((x) + 0.5)
+#endif
+
#include <cmath>
#include <iostream>
#include <set>
#include <gtkmm2ext/choice.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/doi.h>
+#include <gtkmm2ext/rgb_macros.h>
#include "ardour/amp.h"
#include "ardour/audio_track.h"
#include "ardour/audioengine.h"
#include "ardour/internal_return.h"
#include "ardour/internal_send.h"
+#include "ardour/panner_shell.h"
#include "ardour/plugin_insert.h"
+#include "ardour/pannable.h"
#include "ardour/port_insert.h"
#include "ardour/profile.h"
#include "ardour/return.h"
#include "return_ui.h"
#include "route_processor_selection.h"
#include "send_ui.h"
-#include "utils.h"
+#include "timers.h"
#include "i18n.h"
RefPtr<Action> ProcessorBox::edit_action;
RefPtr<Action> ProcessorBox::edit_generic_action;
+static const uint32_t audio_port_color = 0x4A8A0EFF; // Green
+static const uint32_t midi_port_color = 0x960909FF; //Red
+
ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr<Processor> p, Width w)
: _button (ArdourButton::led_default_elements)
, _position (PreFader)
+ , _position_num(0)
+ , _selectable(true)
, _parent (parent)
, _processor (p)
, _width (w)
- , _visual_state (Gtk::STATE_NORMAL)
, _input_icon(true)
, _output_icon(false)
{
_vbox.show ();
- _button.set_diameter (3);
_button.set_distinct_led_click (true);
+ _button.set_fallthrough_to_parent(true);
_button.set_led_left (true);
_button.signal_led_clicked.connect (sigc::mem_fun (*this, &ProcessorEntry::led_clicked));
_button.set_text (name (_width));
_button.set_active (_processor->active());
+ _routing_icon.set_no_show_all(true);
+ _input_icon.set_no_show_all(true);
+
_button.show ();
-#ifdef ALWAYS_DISPLAY_WIRES
- _routing_icon.show();
-#endif
- _input_icon.show();
+ _routing_icon.set_visible(false);
+ _input_icon.hide();
_output_icon.show();
_processor->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&ProcessorEntry::processor_active_changed, this), gui_context());
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);
/* 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());
}
void
-ProcessorEntry::set_position (Position p)
+ProcessorEntry::set_position (Position p, uint32_t num)
{
_position = p;
+ _position_num = num;
+
+ if (_position_num == 0 || _routing_icon.get_visible()) {
+ _input_icon.show();
+ } else {
+ _input_icon.hide();
+ }
+
setup_visuals ();
}
switch (_position) {
case PreFader:
_button.set_name ("processor prefader");
- _routing_icon.set_name ("ProcessorPreFader");
break;
case Fader:
_button.set_name ("processor fader");
- _routing_icon.set_name ("ProcessorFader");
break;
case PostFader:
_button.set_name ("processor postfader");
- _routing_icon.set_name ("ProcessorPostFader");
break;
}
}
void
ProcessorEntry::processor_configuration_changed (const ChanCount in, const ChanCount out)
{
-#if 0 // debug, devel information
- printf("ProcessorEntry::processor_config_changed %s %d %d\n",
- name(Wide).c_str(),
- in.n_audio(), out.n_audio());
-#endif
-
_input_icon.set_ports(in);
_output_icon.set_ports(out);
_routing_icon.set_sources(in);
if (_processor) {
boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert> (_processor);
if (pi) {
+ std::string postfix = "";
+ uint32_t replicated;
+ if ((replicated = pi->get_count()) > 1) {
+ postfix = string_compose(_("\nThis mono plugin has been replicated %1 times."), replicated);
+ }
if (pi->plugin()->has_editor()) {
ARDOUR_UI::instance()->set_tip (_button,
- string_compose (_("<b>%1</b>\nDouble-click to show GUI.\nAlt+double-click to show generic GUI."), name (Wide)));
+ string_compose (_("<b>%1</b>\nDouble-click to show GUI.\nAlt+double-click to show generic GUI.%2"), name (Wide), postfix));
} else {
ARDOUR_UI::instance()->set_tip (_button,
- string_compose (_("<b>%1</b>\nDouble-click to show generic GUI."), name (Wide)));
+ string_compose (_("<b>%1</b>\nDouble-click to show generic GUI.%2"), name (Wide), postfix));
}
return;
}
}
} else {
+ boost::shared_ptr<ARDOUR::PluginInsert> pi;
+ uint32_t replicated;
+ if ((pi = boost::dynamic_pointer_cast<ARDOUR::PluginInsert> (_processor)) != 0
+ && (replicated = pi->get_count()) > 1)
+ {
+ name_display += string_compose(_("(%1x1) "), replicated);
+ }
switch (w) {
case Wide:
for (list<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i) {
items.push_back (CheckMenuElem ((*i)->name ()));
- CheckMenuItem* c = dynamic_cast<CheckMenuItem*> (&items.back ());
+ Gtk::CheckMenuItem* c = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ());
c->set_active ((*i)->visible ());
c->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &ProcessorEntry::toggle_control_visibility), *i));
}
_parent->update_gui_object_state (this);
}
+Menu *
+ProcessorEntry::build_send_options_menu ()
+{
+ using namespace Menu_Helpers;
+ Menu* menu = manage (new Menu);
+ MenuList& items = menu->items ();
+
+ boost::shared_ptr<Send> send = boost::dynamic_pointer_cast<Send> (_processor);
+ if (send) {
+
+ items.push_back (CheckMenuElem (_("Link panner controls")));
+ Gtk::CheckMenuItem* c = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ());
+ c->set_active (send->panner_shell()->is_linked_to_route());
+ c->signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::toggle_panner_link));
+
+ }
+ return menu;
+}
+
+void
+ProcessorEntry::toggle_panner_link ()
+{
+ boost::shared_ptr<Send> send = boost::dynamic_pointer_cast<Send> (_processor);
+ if (send) {
+ send->panner_shell()->set_linked_to_route(!send->panner_shell()->is_linked_to_route());
+ }
+}
+
ProcessorEntry::Control::Control (boost::shared_ptr<AutomationControl> c, string const & n)
: _control (c)
, _adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0, 1, 0.01, 0.1)
- , _slider (&_adjustment, 0, 13, false)
+ , _slider (&_adjustment, boost::shared_ptr<PBD::Controllable>(), 0, 13)
, _slider_persistant_tooltip (&_slider)
- , _button (ArdourButton::Element (ArdourButton::Text | ArdourButton::Indicator))
+ , _button (ArdourButton::led_default_elements)
, _ignore_ui_adjustment (false)
, _visible (false)
, _name (n)
box.add (_slider);
_slider.show ();
- double const lo = c->internal_to_interface (c->lower ());
- double const up = c->internal_to_interface (c->upper ());
-
+ const ARDOUR::ParameterDescriptor& desc = c->desc();
+ double const lo = c->internal_to_interface(desc.lower);
+ double const up = c->internal_to_interface(desc.upper);
+ double const normal = c->internal_to_interface(desc.normal);
+ double smallstep = desc.smallstep;
+ double largestep = desc.largestep;
+
+ if (smallstep == 0.0) {
+ smallstep = up / 1000.;
+ } else {
+ smallstep = c->internal_to_interface(desc.lower + smallstep);
+ }
+
+ if (largestep == 0.0) {
+ largestep = up / 40.;
+ } else {
+ largestep = c->internal_to_interface(desc.lower + largestep);
+ }
+
_adjustment.set_lower (lo);
_adjustment.set_upper (up);
- _adjustment.set_step_increment ((up - lo) / 100);
- _adjustment.set_page_increment ((up - lo) / 10);
- _slider.set_default_value (c->internal_to_interface (c->normal ()));
+ _adjustment.set_step_increment (smallstep);
+ _adjustment.set_page_increment (largestep);
+ _slider.set_default_value (normal);
_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &Control::slider_adjusted));
c->Changed.connect (_connection, MISSING_INVALIDATOR, boost::bind (&Control::control_changed, this), gui_context ());
}
- ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &Control::control_changed));
+ Timers::rapid_connect (sigc::mem_fun (*this, &Control::control_changed));
control_changed ();
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);
}
return;
}
- c->set_value (c->interface_to_internal (_adjustment.get_value ()));
+ c->set_value ( c->interface_to_internal(_adjustment.get_value ()) );
set_tooltip ();
}
} else {
- _adjustment.set_value (c->internal_to_interface (c->get_value ()));
+ _adjustment.set_value (c->internal_to_interface(c->get_value ()));
stringstream s;
s.precision (1);
}
}
-void
-ProcessorEntry::Control::hide_label ()
-{
- _label.hide ();
-}
-
string
ProcessorEntry::Control::state_id () const
{
return string_compose (X_("control %1"), c->id().to_s ());
}
-BlankProcessorEntry::BlankProcessorEntry (ProcessorBox* b, Width w, ChanCount cc)
- : ProcessorEntry (b, boost::shared_ptr<Processor>(), w)
-{
-#ifdef ALWAYS_DISPLAY_WIRES
- _vbox.pack_start (_routing_icon);
- _routing_icon.set_sources(cc);
- _routing_icon.set_sinks(cc);
- _routing_icon.show();
- setup_visuals ();
- _routing_icon.set_size_request (-1, 8);
- _vbox.set_size_request (-1, 8);
-#else
- _vbox.set_size_request (-1, 0);
-#endif
-}
-
PluginInsertProcessorEntry::PluginInsertProcessorEntry (ProcessorBox* b, boost::shared_ptr<ARDOUR::PluginInsert> p, Width w)
: ProcessorEntry (b, p, w)
, _plugin_insert (p)
void
PluginInsertProcessorEntry::plugin_insert_splitting_changed ()
{
-#if 0 // debug, devel information
- printf("--%s--\n", _plugin_insert->name().c_str());
- printf("AUDIO src: %d -> in:%d | * cnt %d * | out: %d -> snk: %d\n",
- _plugin_insert->input_streams().n_audio(),
- _plugin_insert->natural_input_streams().n_audio(),
- _plugin_insert->get_count(),
- _plugin_insert->natural_output_streams().n_audio(),
- _plugin_insert->output_streams().n_audio());
- printf("MIDI src: %d -> in:%d | * cnt %d * | out: %d -> snk: %d\n",
- _plugin_insert->input_streams().n_midi(),
- _plugin_insert->natural_input_streams().n_midi(),
- _plugin_insert->get_count(),
- _plugin_insert->natural_output_streams().n_midi(),
- _plugin_insert->output_streams().n_midi());
- printf("TOTAL src: %d -> in:%d | * cnt %d * | out: %d -> snk: %d\n",
- _plugin_insert->input_streams().n_total(),
- _plugin_insert->natural_input_streams().n_total(),
- _plugin_insert->get_count(),
- _plugin_insert->natural_output_streams().n_total(),
- _plugin_insert->output_streams().n_total());
-#endif
-
_output_icon.set_ports(_plugin_insert->output_streams());
_routing_icon.set_splitting(_plugin_insert->splitting ());
_plugin_insert->input_streams().n_audio() < _plugin_insert->natural_input_streams().n_audio()
)
{
- _routing_icon.set_size_request (-1, 8);
- _routing_icon.show();
+ _routing_icon.set_size_request (-1, 7);
+ _routing_icon.set_visible(true);
+ _input_icon.show();
} else {
-#ifdef ALWAYS_DISPLAY_WIRES
- _routing_icon.set_size_request (-1, 4);
-#else
- _routing_icon.hide();
-#endif
+ _routing_icon.set_visible(false);
+ if (_position_num != 0) {
+ _input_icon.hide();
+ }
}
_input_icon.queue_draw();
cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height);
cairo_clip (cr);
- cairo_set_line_width (cr, 5.0);
- cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
-
Gtk::Allocation a = get_allocation();
double const width = a.get_width();
double const height = a.get_height();
cairo_rectangle (cr, 0, 0, width, height);
cairo_fill (cr);
- const double y0 = _input ? height-.5 : .5;
-
if (_ports.n_total() > 1) {
for (uint32_t i = 0; i < _ports.n_total(); ++i) {
if (i < _ports.n_midi()) {
- cairo_set_source_rgb (cr, .8, .3, .3);
+ cairo_set_source_rgb (cr,
+ UINT_RGBA_R_FLT(midi_port_color),
+ UINT_RGBA_G_FLT(midi_port_color),
+ UINT_RGBA_B_FLT(midi_port_color));
} else {
- cairo_set_source_rgb (cr, .4, .4, .8);
+ cairo_set_source_rgb (cr,
+ UINT_RGBA_R_FLT(audio_port_color),
+ UINT_RGBA_G_FLT(audio_port_color),
+ UINT_RGBA_B_FLT(audio_port_color));
}
- const float x = rintf(width * (.2f + .6f * i / (_ports.n_total() - 1.f))) + .5f;
- cairo_move_to (cr, x, y0);
- cairo_close_path(cr);
- cairo_stroke(cr);
+ const float x = rintf(width * (.2f + .6f * i / (_ports.n_total() - 1.f)));
+ cairo_rectangle (cr, x-1, 0, 3, height);
+ cairo_fill(cr);
}
} else if (_ports.n_total() == 1) {
if (_ports.n_midi() == 1) {
- cairo_set_source_rgb (cr, .8, .3, .3);
+ cairo_set_source_rgb (cr,
+ UINT_RGBA_R_FLT(midi_port_color),
+ UINT_RGBA_G_FLT(midi_port_color),
+ UINT_RGBA_B_FLT(midi_port_color));
} else {
- cairo_set_source_rgb (cr, .4, .4, .8);
+ cairo_set_source_rgb (cr,
+ UINT_RGBA_R_FLT(audio_port_color),
+ UINT_RGBA_G_FLT(audio_port_color),
+ UINT_RGBA_B_FLT(audio_port_color));
}
- cairo_move_to (cr, rintf(width * .5) + .5f, y0);
- cairo_close_path(cr);
+ const float x = rintf(width * .5);
+ cairo_rectangle (cr, x-1, 0, 3, height);
+ cairo_fill(cr);
cairo_stroke(cr);
}
cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height);
cairo_clip (cr);
- cairo_set_line_width (cr, 1.5);
+ cairo_set_line_width (cr, 1.0);
cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
Gtk::Allocation a = get_allocation();
const uint32_t sinks = _sinks.n_total();
/* MIDI */
- cairo_set_source_rgb (cr, .6, .2, .2);
const uint32_t midi_sources = _sources.n_midi();
const uint32_t midi_sinks = _sinks.n_midi();
+ cairo_set_source_rgb (cr,
+ UINT_RGBA_R_FLT(midi_port_color),
+ UINT_RGBA_G_FLT(midi_port_color),
+ UINT_RGBA_B_FLT(midi_port_color));
if (midi_sources > 0 && midi_sinks > 0 && sinks > 1 && sources > 1) {
for (uint32_t i = 0 ; i < midi_sources; ++i) {
- const float si_x = rintf(width * (.2f + .6f * i / (sinks - 1.f))) + .5f;
+ const float si_x = rintf(width * (.2f + .6f * i / (sinks - 1.f))) + .5f;
const float si_x0 = rintf(width * (.2f + .6f * i / (sources - 1.f))) + .5f;
cairo_move_to (cr, si_x, height);
cairo_curve_to (cr, si_x, 0, si_x0, height, si_x0, 0);
cairo_move_to (cr, si_x, height);
cairo_line_to (cr, si_x, 0);
cairo_stroke (cr);
+ } else if (midi_sources == 1 && midi_sinks == 1) {
+ /* unusual cases -- removed synth, midi-track w/audio plugins */
+ const float si_x = rintf(width * (sinks > 1 ? .2f : .5f)) + .5f;
+ const float si_x0 = rintf(width * (sources > 1 ? .2f : .5f)) + .5f;
+ cairo_move_to (cr, si_x, height);
+ cairo_curve_to (cr, si_x, 0, si_x0, height, si_x0, 0);
+ cairo_stroke (cr);
}
/* AUDIO */
- cairo_set_source_rgb (cr, .6, .6, .8);
const uint32_t audio_sources = _sources.n_audio();
const uint32_t audio_sinks = _sinks.n_audio();
+ cairo_set_source_rgb (cr,
+ UINT_RGBA_R_FLT(audio_port_color),
+ UINT_RGBA_G_FLT(audio_port_color),
+ UINT_RGBA_B_FLT(audio_port_color));
if (_splitting) {
+ assert(audio_sources < 2);
assert(audio_sinks > 1);
- const float si_x0 = rintf(width * .5f) + .5f;
+ /* assume there is only ever one MIDI port */
+ const float si_x0 = rintf(width * (midi_sources > 0 ? .8f : .5f)) + .5f;
for (uint32_t i = midi_sinks; i < sinks; ++i) {
const float si_x = rintf(width * (.2f + .6f * i / (sinks - 1.f))) + .5f;
cairo_move_to (cr, si_x, height);
_route->PropertyChanged.connect (
_route_connections, invalidator (*this), boost::bind (&ProcessorBox::route_property_changed, this, _1), gui_context()
);
-#ifdef ALWAYS_DISPLAY_WIRES
- /* update BlankProcessorEntry wire-count */
- _route->io_changed.connect (
- _route_connections, invalidator (*this), boost::bind (&ProcessorBox::io_changed_proxy, this), gui_context ()
- );
-#endif
redisplay_processors ();
}
`dropped on' processor */
list<ProcessorEntry*> c = processor_display.children ();
list<ProcessorEntry*>::iterator i = c.begin ();
- while (dynamic_cast<BlankProcessorEntry*> (*i)) {
- assert (i != c.end ());
- ++i;
- }
assert (i != c.end ());
p = (*i)->processor ();
}
}
+ Gtk::MenuItem* send_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/ProcessorMenu/send_options"));
+ if (send_menu_item) {
+ if (single_selection) {
+ Menu* m = single_selection->build_send_options_menu ();
+ if (m && !m->items().empty()) {
+ send_menu_item->set_submenu (*m);
+ send_menu_item->set_sensitive (true);
+ } else {
+ gtk_menu_item_set_submenu (send_menu_item->gobj(), 0);
+ send_menu_item->set_sensitive (false);
+ }
+ }
+ }
+
/* Sensitise actions as approprioate */
cut_action->set_sensitive (can_cut());
return false;
}
-void
+bool
ProcessorBox::processor_operation (ProcessorOperation op)
{
ProcSelection targets;
get_selected_processors (targets);
- if (targets.empty()) {
+/* if (targets.empty()) {
int x, y;
processor_display.get_pointer (x, y);
targets.push_back (pointer.first->processor ());
}
}
+*/
+ if ( (op == ProcessorsDelete) && targets.empty() )
+ return false; //nothing to delete. return false so the editor-mixer, because the user was probably intending to delete something in the editor
+
switch (op) {
case ProcessorsSelectAll:
processor_display.select_all ();
break;
+ case ProcessorsSelectNone:
+ processor_display.select_none ();
+ break;
+
case ProcessorsCopy:
copy_processors (targets);
break;
default:
break;
}
+
+ return true;
}
ProcessorWindowProxy*
ProcessorBox::find_window_proxy (boost::shared_ptr<Processor> processor) const
{
- for (list<ProcessorWindowProxy*>::const_iterator i = _processor_window_info.begin(); i != _processor_window_info.end(); ++i) {
- boost::shared_ptr<Processor> p = (*i)->processor().lock();
-
- if (p && p == processor) {
- return (*i);
- }
- }
-
- return 0;
+ return processor->window_proxy();
}
-
bool
ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry* child)
{
ret = true;
+ } else if (Keyboard::is_context_menu_event (ev)) {
+
+ show_processor_menu (ev->time);
+
+ ret = true;
+
} else if (processor && ev->button == 1 && selected) {
// this is purely informational but necessary for route params UI
sigc::mem_fun(*this, &ProcessorBox::idle_delete_processor),
boost::weak_ptr<Processor>(processor)));
- } else if (Keyboard::is_context_menu_event (ev)) {
-
- show_processor_menu (ev->time);
-
} else if (processor && Keyboard::is_button2_event (ev)
#ifndef GTKOSX
&& (Keyboard::no_modifier_keys_pressed (ev) && ((ev->state & Gdk::BUTTON2_MASK) == Gdk::BUTTON2_MASK))
void
ProcessorBox::choose_send ()
{
- boost::shared_ptr<Send> send (new Send (*_session, _route->pannable(), _route->mute_master()));
+ boost::shared_ptr<Pannable> sendpan(new Pannable (*_session));
+ boost::shared_ptr<Send> send (new Send (*_session, sendpan, _route->mute_master()));
/* make an educated guess at the initial number of outputs for the send */
ChanCount outs = (_session->master_out())
{
ENSURE_GUI_THREAD (*this, &ProcessorBox::redisplay_processors);
bool fader_seen;
- ChanCount amp_chan_count;
if (no_processor_redisplay) {
return;
fader_seen = false;
_route->foreach_processor (sigc::bind (sigc::mem_fun (*this, &ProcessorBox::help_count_visible_prefader_processors),
- &_visible_prefader_processors, &fader_seen, &_chan_count));
-
- if (_visible_prefader_processors == 0) { // fader only
- BlankProcessorEntry* bpe = new BlankProcessorEntry (this, _width, amp_chan_count);
- processor_display.add_child (bpe);
- }
+ &_visible_prefader_processors, &fader_seen));
_route->foreach_processor (sigc::mem_fun (*this, &ProcessorBox::add_processor_to_display));
-
- for (ProcessorWindowProxies::iterator i = _processor_window_info.begin(); i != _processor_window_info.end(); ++i) {
- (*i)->marked = false;
- }
-
_route->foreach_processor (sigc::mem_fun (*this, &ProcessorBox::maybe_add_processor_to_ui_list));
-
- /* trim dead wood from the processor window proxy list */
-
- ProcessorWindowProxies::iterator i = _processor_window_info.begin();
- while (i != _processor_window_info.end()) {
- ProcessorWindowProxies::iterator j = i;
- ++j;
-
- if (!(*i)->valid()) {
-
- WM::Manager::instance().remove (*i);
- delete *i;
- _processor_window_info.erase (i);
-
- } else if (!(*i)->marked) {
-
- /* this processor is no longer part of this processor
- * box.
- *
- * that could be because it was deleted or it could be
- * because the route being displayed in the parent
- * strip changed.
- *
- * The latter only happens with the editor mixer strip.
- */
-
- if (is_editor_mixer_strip()) {
-
- /* editor mixer strip .. DO NOTHING
- *
- * note: the processor window stays visible if
- * it is already visible
- */
- } else {
- (*i)->hide ();
- WM::Manager::instance().remove (*i);
- delete *i;
- _processor_window_info.erase (i);
- }
- }
-
- i = j;
- }
-
setup_entry_positions ();
}
-void
-ProcessorBox::io_changed_proxy ()
-{
- Glib::signal_idle().connect_once (sigc::mem_fun (*this, &ProcessorBox::redisplay_processors));
-}
-
/** Add a ProcessorWindowProxy for a processor to our list, if that processor does
* not already have one.
*/
if (!p) {
return;
}
-
- ProcessorWindowProxies::iterator i = _processor_window_info.begin ();
- while (i != _processor_window_info.end()) {
-
- boost::shared_ptr<Processor> t = (*i)->processor().lock ();
-
- if (p == t) {
- /* this processor is already on the list; done */
- (*i)->marked = true;
- return;
- }
-
- ++i;
+ if (p->window_proxy()) {
+ return;
}
/* not on the list; add it */
string loc;
+#if 0 // is this still needed? Why?
if (_parent_strip) {
if (_parent_strip->mixer_owned()) {
loc = X_("M");
} else {
loc = X_("P");
}
+#else
+ loc = X_("P");
+#endif
ProcessorWindowProxy* wp = new ProcessorWindowProxy (
string_compose ("%1-%2-%3", loc, _route->id(), p->id()),
wp->set_state (*ui_xml);
}
- wp->marked = true;
-
- /* if the processor already has an existing UI,
- note that so that we don't recreate it
- */
-
void* existing_ui = p->get_ui ();
if (existing_ui) {
wp->use_window (*(reinterpret_cast<Gtk::Window*>(existing_ui)));
}
- _processor_window_info.push_back (wp);
+ p->set_window_proxy (wp);
WM::Manager::instance().register_window (wp);
}
void
-ProcessorBox::help_count_visible_prefader_processors (boost::weak_ptr<Processor> p, uint32_t* cnt, bool* amp_seen, ChanCount *cc)
+ProcessorBox::help_count_visible_prefader_processors (boost::weak_ptr<Processor> p, uint32_t* cnt, bool* amp_seen)
{
boost::shared_ptr<Processor> processor (p.lock ());
if (boost::dynamic_pointer_cast<Amp>(processor)) {
*amp_seen = true;
- for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
- cc->set(*t, processor->input_streams().get(*t));
- }
} else {
if (!*amp_seen) {
(*cnt)++;
}
boost::shared_ptr<PluginInsert> plugin_insert = boost::dynamic_pointer_cast<PluginInsert> (processor);
+
ProcessorEntry* e = 0;
if (plugin_insert) {
e = new PluginInsertProcessorEntry (this, plugin_insert, _width);
e = new ProcessorEntry (this, processor, _width);
}
+ boost::shared_ptr<Send> send = boost::dynamic_pointer_cast<Send> (processor);
+ boost::shared_ptr<PortInsert> ext = boost::dynamic_pointer_cast<PortInsert> (processor);
+
+ //faders and meters are not deletable, copy/paste-able, so they shouldn't be selectable
+ if (!send && !plugin_insert && !ext)
+ e->set_selectable(false);
+
/* Set up this entry's state from the GUIObjectState */
XMLNode* proc = entry_gui_object_state (e);
if (proc) {
list<ProcessorEntry*> children = processor_display.children ();
bool pre_fader = true;
+ uint32_t num = 0;
for (list<ProcessorEntry*>::iterator i = children.begin(); i != children.end(); ++i) {
if (boost::dynamic_pointer_cast<Amp>((*i)->processor())) {
pre_fader = false;
- (*i)->set_position (ProcessorEntry::Fader);
+ (*i)->set_position (ProcessorEntry::Fader, num++);
} else {
if (pre_fader) {
- (*i)->set_position (ProcessorEntry::PreFader);
+ (*i)->set_position (ProcessorEntry::PreFader, num++);
} else {
- (*i)->set_position (ProcessorEntry::PostFader);
+ (*i)->set_position (ProcessorEntry::PostFader, num++);
}
}
}
continue;
}
+ boost::shared_ptr<Pannable> sendpan(new Pannable (*_session));
XMLNode n (**niter);
- InternalSend* s = new InternalSend (*_session, _route->pannable(), _route->mute_master(),
- boost::shared_ptr<Route>(), Delivery::Aux);
+ InternalSend* s = new InternalSend (*_session, sendpan, _route->mute_master(),
+ _route, boost::shared_ptr<Route>(), Delivery::Aux);
IOProcessor::prepare_for_reset (n, s->name());
} else if (type->value() == "send") {
+ boost::shared_ptr<Pannable> sendpan(new Pannable (*_session));
XMLNode n (**niter);
- Send* s = new Send (*_session, _route->pannable(), _route->mute_master());
+
+ Send* s = new Send (*_session, _route->pannable(), _route->mute_master());
IOProcessor::prepare_for_reset (n, s->name());
ActionManager::register_action (popup_act_grp, X_("newaux"), _("New Aux Send ..."));
ActionManager::register_action (popup_act_grp, X_("controls"), _("Controls"));
+ ActionManager::register_action (popup_act_grp, X_("send_options"), _("Send Options"));
ActionManager::register_action (popup_act_grp, X_("clear"), _("Clear (all)"),
sigc::ptr_fun (ProcessorBox::rb_clear));
Window *
ProcessorBox::get_processor_ui (boost::shared_ptr<Processor> p) const
{
- list<ProcessorWindowProxy*>::const_iterator i = _processor_window_info.begin ();
- while (i != _processor_window_info.end()) {
- boost::shared_ptr<Processor> t = (*i)->processor().lock ();
- if (t && t == p) {
- return (*i)->get ();
- }
-
- ++i;
+ ProcessorWindowProxy* wp = p->window_proxy();
+ if (wp) {
+ return wp->get ();
}
-
return 0;
}
void
ProcessorBox::set_processor_ui (boost::shared_ptr<Processor> p, Gtk::Window* w)
{
- list<ProcessorWindowProxy*>::iterator i = _processor_window_info.begin ();
-
+ assert (p->window_proxy());
p->set_ui (w);
-
- while (i != _processor_window_info.end()) {
- boost::shared_ptr<Processor> t = (*i)->processor().lock ();
- if (t && t == p) {
- (*i)->use_window (*w);
- return;
- }
-
- ++i;
- }
-
- /* we shouldn't get here, because the ProcessorUIList should always contain
- an entry for each processor.
- */
- assert (false);
+ p->window_proxy()->use_window (*w);
}
void
ProcessorWindowProxy::ProcessorWindowProxy (string const & name, ProcessorBox* box, boost::weak_ptr<Processor> processor)
: WM::ProxyBase (name, string())
- , marked (false)
, _processor_box (box)
, _processor (processor)
, is_custom (false)
, want_custom (false)
- , _valid (true)
{
boost::shared_ptr<Processor> p = _processor.lock ();
if (!p) {
{
delete _window;
_window = 0;
- _valid = false;
+ WM::Manager::instance().remove (this);
/* should be no real reason to do this, since the object that would
send DropReferences is about to be deleted, but lets do it anyway.
*/
return 0;
}
-bool
-ProcessorWindowProxy::valid() const
-{
- return _valid;
-}
-
XMLNode&
ProcessorWindowProxy::get_state () const
{
projects / ardour.git / blobdiff