#include <ardour/audio_diskstream.h>
#include <ardour/panner.h>
#include <ardour/send.h>
-#include <ardour/insert.h>
+#include <ardour/processor.h>
#include <ardour/ladspa_plugin.h>
#include <ardour/bundle.h>
-#include <ardour/session_bundle.h>
#include "ardour_ui.h"
#include "ardour_dialog.h"
: AxisView(sess),
RouteUI (rt, sess, _("Mute"), _("Solo"), _("Record")),
_mixer(mx),
- pre_redirect_box (PreFader, sess, rt, mx.plugin_selector(), mx.selection(), in_mixer),
- post_redirect_box (PostFader, sess, rt, mx.plugin_selector(), mx.selection(), in_mixer),
+ pre_processor_box (PreFader, sess, rt, mx.plugin_selector(), mx.selection(), in_mixer),
+ post_processor_box (PostFader, sess, rt, mx.plugin_selector(), mx.selection(), in_mixer),
gpm (_route, sess),
panners (_route, sess),
button_table (3, 2),
comment_area = 0;
_width_owner = 0;
- width_button.add (*(manage (new Gtk::Image (::get_icon("strip_width")))));
- hide_button.add (*(manage (new Gtk::Image (::get_icon("hide")))));
+ Gtk::Image *width_icon = manage (new Gtk::Image (::get_icon("strip_width")));
+ Gtk::Image *hide_icon = manage (new Gtk::Image (::get_icon("hide")));
+ width_button.add (*width_icon);
+ hide_button.add (*hide_icon);
input_label.set_text (_("Input"));
input_button.add (input_label);
rec_enable_button->set_name ("MixerRecordEnableButton");
- AudioTrack* at = audio_track();
+ boost::shared_ptr<AudioTrack> at = audio_track();
at->FreezeChange.connect (mem_fun(*this, &MixerStrip::map_frozen));
global_vpacker.pack_start (*whvbox, Gtk::PACK_SHRINK);
global_vpacker.pack_start (button_table,Gtk::PACK_SHRINK);
- global_vpacker.pack_start (pre_redirect_box, true, true);
+ global_vpacker.pack_start (pre_processor_box, true, true);
global_vpacker.pack_start (middle_button_table,Gtk::PACK_SHRINK);
global_vpacker.pack_start (*gain_meter_alignment,Gtk::PACK_SHRINK);
global_vpacker.pack_start (bottom_button_table,Gtk::PACK_SHRINK);
- global_vpacker.pack_start (post_redirect_box, true, true);
- global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
+ global_vpacker.pack_start (post_processor_box, true, true);
+ if (!is_midi_track())
+ global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
global_vpacker.pack_start (comment_button, Gtk::PACK_SHRINK);
- if (route()->master() || route()->control()) {
+ if (route()->is_master() || route()->is_control()) {
if (scrollbar_height == 0) {
HScrollbar scrollbar;
get_diskstream()->SpeedChanged.connect (mem_fun(*this, &MixerStrip::speed_changed));
}
- _route->name_changed.connect (mem_fun(*this, &RouteUI::name_changed));
+ _route->NameChanged.connect (mem_fun(*this, &RouteUI::name_changed));
_route->comment_changed.connect (mem_fun(*this, &MixerStrip::comment_changed));
_route->gui_changed.connect (mem_fun(*this, &MixerStrip::route_gui_changed));
in update_diskstream_display().
*/
- set_name ("AudioTrackStripBase");
+ if (is_midi_track())
+ set_name ("MidiTrackStripBase");
+ else
+ set_name ("AudioTrackStripBase");
/* now force an update of all the various elements */
- pre_redirect_box.update();
- post_redirect_box.update();
+ pre_processor_box.update();
+ post_processor_box.update();
mute_changed (0);
solo_changed (0);
- name_changed (0);
+ name_changed ();
comment_changed (0);
mix_group_changed (0);
update_output_display ();
add_events (Gdk::BUTTON_RELEASE_MASK);
+
+ whvbox->show();
+ hide_icon->show();
+ width_icon->show();
+ gain_meter_alignment->show();
+
+ pre_processor_box.show();
+ hide_button.show();
+ width_button.show();
+ width_hide_box.show();
+ global_frame.show();
+ global_vpacker.show();
+ button_table.show();
+ middle_button_table.show();
+ bottom_button_table.show();
+ gain_unit_button.show();
+ gain_unit_label.show();
+ meter_point_button.show();
+ meter_point_label.show();
+ diskstream_button.show();
+ diskstream_label.show();
+ input_button.show();
+ input_label.show();
+ output_button.show();
+ output_label.show();
+ name_label.show();
+ name_button.show();
+ comment_button.show();
+ group_button.show();
+ group_label.show();
+ speed_spinner.show();
+ speed_label.show();
+ speed_frame.show();
+
+ show();
}
MixerStrip::~MixerStrip ()
gpm.set_width (w);
panners.set_width (w);
- pre_redirect_box.set_width (w);
- post_redirect_box.set_width (w);
+ pre_processor_box.set_width (w);
+ post_processor_box.set_width (w);
+
+ boost::shared_ptr<AutomationList> gain_automation = _route->gain_control()->list();
_width_owner = owner;
((Gtk::Label*)comment_button.get_child())->set_text (_("*comments*"));
}
- ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.astyle_string(_route->gain_automation_curve().automation_style()));
- ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.astate_string(_route->gain_automation_curve().automation_state()));
+ ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.astyle_string(gain_automation->automation_style()));
+ ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.astate_string(gain_automation->automation_state()));
((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (panners.astyle_string(_route->panner().automation_style()));
((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (panners.astate_string(_route->panner().automation_state()));
Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*"));
}
- ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.short_astyle_string(_route->gain_automation_curve().automation_style()));
- ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.short_astate_string(_route->gain_automation_curve().automation_state()));
+ ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.short_astyle_string(gain_automation->automation_style()));
+ ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.short_astate_string(gain_automation->automation_state()));
((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (panners.short_astyle_string(_route->panner().automation_style()));
((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (panners.short_astate_string(_route->panner().automation_state()));
Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2);
update_input_display ();
update_output_display ();
mix_group_changed (0);
- name_changed (0);
+ name_changed ();
}
citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_output)));
citems.push_back (SeparatorElem());
- _session.foreach_bundle (this, &MixerStrip::add_bundle_to_output_menu);
+ _session.foreach_bundle (
+ bind (mem_fun (*this, &MixerStrip::add_bundle_to_output_menu), _route->output_bundle ())
+ );
output_menu.popup (1, ev->time);
break;
if (output_selector->is_visible()) {
output_selector->get_toplevel()->get_window()->raise();
} else {
- output_selector->show_all ();
+ output_selector->present ();
}
}
if (input_selector->is_visible()) {
input_selector->get_toplevel()->get_window()->raise();
} else {
- input_selector->show_all ();
+ input_selector->present ();
}
}
citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_input)));
citems.push_back (SeparatorElem());
- _session.foreach_bundle (this, &MixerStrip::add_bundle_to_input_menu);
+ _session.foreach_bundle (
+ bind (mem_fun (*this, &MixerStrip::add_bundle_to_input_menu), _route->input_bundle ())
+ );
input_menu.popup (1, ev->time);
break;
}
void
-MixerStrip::bundle_input_chosen (ARDOUR::Bundle *c)
+MixerStrip::bundle_input_chosen (boost::shared_ptr<ARDOUR::Bundle> c)
{
if (!ignore_toggle) {
try {
- _route->use_input_bundle (*c, this);
+ _route->connect_input_ports_to_bundle (c, this);
}
catch (AudioEngine::PortRegistrationFailure& err) {
}
void
-MixerStrip::bundle_output_chosen (ARDOUR::Bundle *c)
+MixerStrip::bundle_output_chosen (boost::shared_ptr<ARDOUR::Bundle> c)
{
if (!ignore_toggle) {
try {
- _route->use_output_bundle (*c, this);
+ _route->connect_output_ports_to_bundle (c, this);
}
catch (AudioEngine::PortRegistrationFailure& err) {
}
void
-MixerStrip::add_bundle_to_input_menu (ARDOUR::Bundle* c)
+MixerStrip::add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, boost::shared_ptr<Bundle> current)
{
using namespace Menu_Helpers;
- if (dynamic_cast<InputBundle *> (c) == 0) {
+ /* the input menu needs to contain only output bundles (that we
+ can connect inputs to */
+ if (boost::dynamic_pointer_cast<OutputBundle, Bundle> (b) == 0) {
return;
}
MenuList& citems = input_menu.items();
- if (c->nchannels() == _route->n_inputs().n_total()) {
+ if (b->nchannels() == _route->n_inputs().n_total()) {
- citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::bundle_input_chosen), c)));
-
- ARDOUR::Bundle *current = _route->input_bundle();
+ citems.push_back (CheckMenuElem (b->name(), bind (mem_fun(*this, &MixerStrip::bundle_input_chosen), b)));
- if (current == c) {
+ if (current == b) {
ignore_toggle = true;
dynamic_cast<CheckMenuItem *> (&citems.back())->set_active (true);
ignore_toggle = false;
}
void
-MixerStrip::add_bundle_to_output_menu (ARDOUR::Bundle* c)
+MixerStrip::add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, boost::shared_ptr<Bundle> current)
{
using namespace Menu_Helpers;
- if (dynamic_cast<OutputBundle *> (c) == 0) {
+ /* the output menu needs to contain only input bundles (that we
+ can connect outputs to */
+ if (boost::dynamic_pointer_cast<InputBundle, Bundle> (b) == 0) {
return;
}
- if (c->nchannels() == _route->n_outputs().n_total()) {
+
+ if (b->nchannels() == _route->n_outputs().n_total()) {
MenuList& citems = output_menu.items();
- citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::bundle_output_chosen), c)));
-
- ARDOUR::Bundle *current = _route->output_bundle();
+ citems.push_back (CheckMenuElem (b->name(), bind (mem_fun(*this, &MixerStrip::bundle_output_chosen), b)));
- if (current == c) {
+ if (current == b) {
ignore_toggle = true;
dynamic_cast<CheckMenuItem *> (&citems.back())->set_active (true);
ignore_toggle = false;
void
MixerStrip::update_diskstream_display ()
{
- if (is_audio_track()) {
+ if (is_track()) {
map_frozen ();
if (!_route->panner().empty()) {
StreamPanner* sp = _route->panner().front();
- panstate_connection = sp->automation().automation_state_changed.connect (mem_fun(panners, &PannerUI::pan_automation_state_changed));
- panstyle_connection = sp->automation().automation_style_changed.connect (mem_fun(panners, &PannerUI::pan_automation_style_changed));
+ panstate_connection = sp->pan_control()->list()->automation_state_changed.connect (mem_fun(panners, &PannerUI::pan_automation_state_changed));
+ panstyle_connection = sp->pan_control()->list()->automation_style_changed.connect (mem_fun(panners, &PannerUI::pan_automation_style_changed));
}
panners.pan_changed (this);
void
MixerStrip::update_input_display ()
{
- ARDOUR::Bundle *c;
+ boost::shared_ptr<ARDOUR::Bundle> c;
if ((c = _route->input_bundle()) != 0) {
input_label.set_text (c->name());
void
MixerStrip::update_output_display ()
{
- ARDOUR::Bundle *c;
+ boost::shared_ptr<ARDOUR::Bundle> c;
if ((c = _route->output_bundle()) != 0) {
output_label.set_text (c->name());
items.push_back (CheckMenuElem (_("Active"), mem_fun (*this, &RouteUI::toggle_route_active)));
route_active_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
route_active_menu_item->set_active (_route->active());
+
+ items.push_back (SeparatorElem());
+
+ items.push_back (MenuElem (_("Adjust latency"), mem_fun (*this, &RouteUI::adjust_latency)));
+
items.push_back (SeparatorElem());
items.push_back (CheckMenuElem (_("Invert Polarity"), mem_fun (*this, &RouteUI::toggle_polarity)));
polarity_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
}
void
-MixerStrip::name_changed (void *src)
+MixerStrip::name_changed ()
{
switch (_width) {
case Wide:
- RouteUI::name_changed (src);
+ RouteUI::name_changed ();
break;
case Narrow:
name_label.set_text (PBD::short_version (_route->name(), 5));
{
ENSURE_GUI_THREAD (mem_fun(*this, &MixerStrip::map_frozen));
- AudioTrack* at = audio_track();
+ boost::shared_ptr<AudioTrack> at = audio_track();
if (at) {
switch (at->freeze_state()) {
case AudioTrack::Frozen:
- pre_redirect_box.set_sensitive (false);
- post_redirect_box.set_sensitive (false);
+ pre_processor_box.set_sensitive (false);
+ post_processor_box.set_sensitive (false);
speed_spinner.set_sensitive (false);
break;
default:
- pre_redirect_box.set_sensitive (true);
- post_redirect_box.set_sensitive (true);
+ pre_processor_box.set_sensitive (true);
+ post_processor_box.set_sensitive (true);
speed_spinner.set_sensitive (true);
break;
}
}
- _route->foreach_redirect (this, &MixerStrip::hide_redirect_editor);
+ _route->foreach_processor (this, &MixerStrip::hide_processor_editor);
}
void
-MixerStrip::hide_redirect_editor (boost::shared_ptr<Redirect> redirect)
+MixerStrip::hide_processor_editor (boost::shared_ptr<Processor> processor)
{
- void* gui = redirect->get_gui ();
+ void* gui = processor->get_gui ();
if (gui) {
static_cast<Gtk::Widget*>(gui)->hide ();
} else if (is_audio_track()) {
if (_route->active()) {
set_name ("AudioTrackStripBase");
- gpm.set_meter_strip_name ("AudioTrackStripBase");
+ gpm.set_meter_strip_name ("AudioTrackMetrics");
} else {
set_name ("AudioTrackStripBaseInactive");
- gpm.set_meter_strip_name ("AudioTrackStripBaseInactive");
+ gpm.set_meter_strip_name ("AudioTrackMetricsInactive");
}
gpm.set_fader_name ("AudioTrackFader");
} else {
if (_route->active()) {
set_name ("AudioBusStripBase");
- gpm.set_meter_strip_name ("AudioBusStripBase");
+ gpm.set_meter_strip_name ("AudioBusMetrics");
} else {
set_name ("AudioBusStripBaseInactive");
- gpm.set_meter_strip_name ("AudioBusStripBaseInactive");
+ gpm.set_meter_strip_name ("AudioBusMetricsInactive");
}
gpm.set_fader_name ("AudioBusFader");
projects / ardour.git / blobdiff