#include <map>
#include <sigc++/bind.h>
+#include <boost/foreach.hpp>
+
#include <gtkmm/accelmap.h>
#include "pbd/convert.h"
#include "ardour/amp.h"
#include "ardour/debug.h"
+#include "ardour/audio_track.h"
#include "ardour/midi_track.h"
#include "ardour/plugin_manager.h"
#include "ardour/route_group.h"
-#include "ardour/route_sorters.h"
#include "ardour/session.h"
#include "ardour/vca.h"
#include "ardour/vca_manager.h"
#include "monitor_section.h"
#include "plugin_selector.h"
#include "public_editor.h"
+#include "mouse_cursors.h"
#include "ardour_ui.h"
#include "prompter.h"
#include "utils.h"
#include "actions.h"
#include "gui_thread.h"
#include "mixer_group_tabs.h"
+#include "route_sorter.h"
#include "timers.h"
#include "ui_config.h"
#include "vca_master_strip.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace ARDOUR;
using namespace ARDOUR_UI_UTILS;
, _following_editor_selection (false)
, _maximised (false)
, _show_mixer_list (true)
+ , myactions (X_("mixer"))
{
- Route::SyncOrderKeys.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::sync_treeview_from_order_keys, this), gui_context());
-
- /* bindings was already set in MixerActor constructor */
-
+ register_actions ();
+ load_bindings ();
_content.set_data ("ardour-bindings", bindings);
+ PresentationInfo::Change.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::sync_treeview_from_presentation_info, this), gui_context());
+
scroller.set_can_default (true);
// set_default (scroller);
group_model = ListStore::create (group_columns);
group_display.set_model (group_model);
- group_display.append_column (_("Group"), group_columns.text);
group_display.append_column (_("Show"), group_columns.visible);
+ group_display.append_column (_("Group"), group_columns.text);
group_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0));
group_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
- group_display.get_column (0)->set_expand(true);
- group_display.get_column (1)->set_expand(false);
+ group_display.get_column (0)->set_expand(false);
+ group_display.get_column (1)->set_expand(true);
+ group_display.get_column (1)->set_sizing (Gtk::TREE_VIEW_COLUMN_FIXED);
group_display.set_name ("EditGroupList");
group_display.get_selection()->set_mode (Gtk::SELECTION_SINGLE);
group_display.set_reorderable (true);
/* name is directly editable */
- CellRendererText* name_cell = dynamic_cast<CellRendererText*>(group_display.get_column_cell_renderer (0));
+ CellRendererText* name_cell = dynamic_cast<CellRendererText*>(group_display.get_column_cell_renderer (1));
name_cell->property_editable() = true;
name_cell->signal_edited().connect (sigc::mem_fun (*this, &Mixer_UI::route_group_name_edit));
/* use checkbox for the active column */
- CellRendererToggle* active_cell = dynamic_cast<CellRendererToggle*>(group_display.get_column_cell_renderer (1));
+ CellRendererToggle* active_cell = dynamic_cast<CellRendererToggle*>(group_display.get_column_cell_renderer (0));
active_cell->property_activatable() = true;
active_cell->property_radio() = false;
favorite_plugins_display.set_headers_visible (true);
favorite_plugins_display.set_rules_hint (true);
favorite_plugins_display.set_can_focus (false);
+ favorite_plugins_display.set_tooltip_column (0);
favorite_plugins_display.add_object_drag (favorite_plugins_columns.plugin.index(), "PluginFavoritePtr");
favorite_plugins_display.set_drag_column (favorite_plugins_columns.name.index());
favorite_plugins_display.add_drop_targets (target_list);
favorite_plugins_frame.set_shadow_type (Gtk::SHADOW_IN);
favorite_plugins_frame.add (favorite_plugins_scroller);
- rhs_pane1.pack1 (favorite_plugins_frame, false, true);
- rhs_pane1.pack2 (track_display_frame);
- rhs_pane2.pack1 (rhs_pane1);
- rhs_pane2.pack2 (group_display_frame);
+ rhs_pane1.add (favorite_plugins_frame);
+ rhs_pane1.add (track_display_frame);
+
+ rhs_pane2.add (rhs_pane1);
+ rhs_pane2.add (group_display_frame);
list_vpacker.pack_start (rhs_pane2, true, true);
- vca_scroller.add (vca_packer);
+ string vca_text = _("Control Masters");
+ Gtk::HBox* vca_top_padding = manage (new Gtk::HBox);
+ vca_top_padding->set_size_request (-1, 2);
+ vca_vpacker.pack_start (*vca_top_padding, false, false);
+
+ vca_label.set_text (vca_text);
+ vca_label_bar.set_size_request (-1, 16); /* must match height in GroupTabs::set_size_request() */
+
+ vca_label_bar.set_name (X_("VCALabelBar"));
+ vca_label_bar.add (vca_label);
+
+ vca_vpacker.pack_start (vca_label_bar, false, false);
+
+ vca_scroller_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+ vca_scroller_base.set_name (X_("MixerWindow"));
+ vca_scroller_base.signal_button_release_event().connect (sigc::mem_fun(*this, &Mixer_UI::masters_scroller_button_release), false);
+ vca_hpacker.pack_end (vca_scroller_base, true, true);
+
+ vca_scroller.add (vca_hpacker);
vca_scroller.set_policy (Gtk::POLICY_ALWAYS, Gtk::POLICY_AUTOMATIC);
+ vca_scroller.signal_button_release_event().connect (sigc::mem_fun(*this, &Mixer_UI::strip_scroller_button_release));
+
+ vca_vpacker.pack_start (vca_scroller, true, true);
- inner_pane.pack1 (scroller);
- inner_pane.pack2 (vca_scroller);
+ inner_pane.add (scroller);
+ inner_pane.add (vca_vpacker);
global_hpacker.pack_start (inner_pane, true, true);
global_hpacker.pack_start (out_packer, false, false);
- list_hpane.pack1(list_vpacker, false, true);
- list_hpane.pack2(global_hpacker, true, false);
+ list_hpane.set_check_divider_position (true);
+ list_hpane.add (list_vpacker);
+ list_hpane.add (global_hpacker);
- rhs_pane1.signal_size_allocate().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::pane_allocation_handler),
- static_cast<Gtk::Paned*> (&rhs_pane1)));
- rhs_pane2.signal_size_allocate().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::pane_allocation_handler),
- static_cast<Gtk::Paned*> (&rhs_pane2)));
- list_hpane.signal_size_allocate().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::pane_allocation_handler),
- static_cast<Gtk::Paned*> (&list_hpane)));
- inner_pane.signal_size_allocate().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::pane_allocation_handler),
- static_cast<Gtk::Paned*> (&inner_pane)));
+
+ XMLNode const * settings = ARDOUR_UI::instance()->mixer_settings();
+ XMLProperty const * prop;
+ float fract;
+
+ {
+ LocaleGuard lg;
+
+ if (!settings || ((prop = settings->property ("mixer-rhs-pane1-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) {
+ rhs_pane1.set_divider (0, 0.6f);
+ } else {
+ rhs_pane1.set_divider (0, fract);
+ }
+ if (!settings || ((prop = settings->property ("mixer-rhs-pane2-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) {
+ rhs_pane2.set_divider (0, 0.7f);
+ } else {
+ rhs_pane2.set_divider (0, fract);
+ }
+ if (!settings || ((prop = settings->property ("mixer-list-hpane-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) {
+ list_hpane.set_divider (0, 0.2f);
+ } else {
+ list_hpane.set_divider (0, fract);
+ }
+ if (!settings || ((prop = settings->property ("mixer-inner-pane-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) {
+ inner_pane.set_divider (0, 0.8f);
+ } else {
+ inner_pane.set_divider (0, atof (prop->value()));
+ }
+ }
+
+ rhs_pane1.set_drag_cursor (*PublicEditor::instance().cursors()->expand_up_down);
+ rhs_pane2.set_drag_cursor (*PublicEditor::instance().cursors()->expand_up_down);
+ list_hpane.set_drag_cursor (*PublicEditor::instance().cursors()->expand_left_right);
+ inner_pane.set_drag_cursor (*PublicEditor::instance().cursors()->expand_left_right);
_content.pack_start (list_hpane, true, true);
rhs_pane1.show();
rhs_pane2.show();
strip_packer.show();
- inner_pane.show ();
+ inner_pane.show();
+ vca_top_padding->show ();
vca_scroller.show();
- vca_packer.show();
+ vca_vpacker.show();
+ vca_hpacker.show();
+ vca_label_bar.show();
+ vca_label.show();
+ vca_scroller_base.show();
out_packer.show();
list_hpane.show();
group_display.show();
MixerStrip::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::remove_strip, this, _1), gui_context());
+ /* handle escape */
+
+ ARDOUR_UI::instance()->Escape.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::escape, this), gui_context());
+
#ifndef DEFER_PLUGIN_SELECTOR_LOAD
_plugin_selector = new PluginSelector (PluginManager::instance ());
#else
delete _plugin_selector;
}
+void
+Mixer_UI::escape ()
+{
+ select_none ();
+}
+
void
Mixer_UI::track_editor_selection ()
{
parameter_changed ("show-group-tabs");
/* now reset each strips width so the right widgets are shown */
- MixerStrip* ms;
TreeModel::Children rows = track_model->children();
TreeModel::Children::iterator ri;
for (ri = rows.begin(); ri != rows.end(); ++ri) {
- ms = (*ri)[track_columns.strip];
+ AxisView* av = (*ri)[stripable_columns.strip];
+ MixerStrip* ms = dynamic_cast<MixerStrip*> (av);
if (!ms) {
continue;
}
}
void
-Mixer_UI::add_masters (VCAList& vcas)
+Mixer_UI::remove_master (VCAMasterStrip* vms)
{
- for (VCAList::iterator v = vcas.begin(); v != vcas.end(); ++v) {
+ if (_session && _session->deletion_in_progress()) {
+ /* its all being taken care of */
+ return;
+ }
+
+ TreeModel::Children rows = track_model->children();
+ TreeModel::Children::iterator ri;
+
+ for (ri = rows.begin(); ri != rows.end(); ++ri) {
+ if ((*ri)[stripable_columns.strip] == vms) {
+ PBD::Unwinder<bool> uw (_route_deletion_in_progress, true);
+ track_model->erase (ri);
+ break;
+ }
+ }
+}
- VCAMasterStrip* vms = new VCAMasterStrip (_session, *v);
+bool
+Mixer_UI::masters_scroller_button_release (GdkEventButton* ev)
+{
+ using namespace Menu_Helpers;
- TreeModel::Row row = *(track_model->append());
- row[track_columns.text] = (*v)->name();
- row[track_columns.visible] = true;
- row[track_columns.vca] = vms;
+ if (Keyboard::is_context_menu_event (ev)) {
+ ARDOUR_UI::instance()->add_route ();
+ return true;
}
- redisplay_track_list ();
+ return false;
}
void
-Mixer_UI::remove_master (VCAMasterStrip* vms)
+Mixer_UI::add_masters (VCAList& vlist)
{
+ StripableList sl;
+
+ for (VCAList::iterator v = vlist.begin(); v != vlist.end(); ++v) {
+ sl.push_back (boost::dynamic_pointer_cast<Stripable> (*v));
+ }
+
+ add_stripables (sl);
}
void
-Mixer_UI::add_strips (RouteList& routes)
+Mixer_UI::add_routes (RouteList& rlist)
+{
+ StripableList sl;
+
+ for (RouteList::iterator r = rlist.begin(); r != rlist.end(); ++r) {
+ sl.push_back (*r);
+ }
+
+ add_stripables (sl);
+}
+
+void
+Mixer_UI::add_stripables (StripableList& slist)
{
Gtk::TreeModel::Children::iterator insert_iter = track_model->children().end();
+ bool from_scratch = (track_model->children().size() == 0);
uint32_t nroutes = 0;
+ slist.sort (StripablePresentationInfoSorter());
+
for (Gtk::TreeModel::Children::iterator it = track_model->children().begin(); it != track_model->children().end(); ++it) {
- boost::shared_ptr<Route> r = (*it)[track_columns.route];
+ boost::shared_ptr<Stripable> s = (*it)[stripable_columns.stripable];
- if (!r) {
+ if (!s) {
continue;
}
nroutes++;
- if (r->order_key() == (routes.front()->order_key() + routes.size())) {
+ if (s->presentation_info().order() == (slist.front()->presentation_info().order() + slist.size())) {
insert_iter = it;
break;
}
}
- if (nroutes) {
- _selection.clear_routes ();
- }
-
MixerStrip* strip;
+
try {
- no_track_list_redisplay = true;
+ PBD::Unwinder<bool> uw (no_track_list_redisplay, true);
+
track_display.set_model (Glib::RefPtr<ListStore>());
- for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
- boost::shared_ptr<Route> route = (*x);
+ for (StripableList::iterator s = slist.begin(); s != slist.end(); ++s) {
- if (route->is_auditioner()) {
- continue;
- }
+ boost::shared_ptr<Route> route;
+ boost::shared_ptr<VCA> vca;
- if (route->is_monitor()) {
+ if ((vca = boost::dynamic_pointer_cast<VCA> (*s))) {
- if (!_monitor_section) {
- _monitor_section = new MonitorSection (_session);
+ VCAMasterStrip* vms = new VCAMasterStrip (_session, vca);
- XMLNode* mnode = ARDOUR_UI::instance()->tearoff_settings (X_("monitor-section"));
- if (mnode) {
- _monitor_section->tearoff().set_state (*mnode);
- }
+ TreeModel::Row row = *(track_model->append());
+
+ row[stripable_columns.text] = vca->name();
+ row[stripable_columns.visible] = vms->marked_for_display ();
+ row[stripable_columns.strip] = vms;
+ row[stripable_columns.stripable] = vca;
+
+ vms->CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::remove_master, this, _1), gui_context());
+
+ } else if ((route = boost::dynamic_pointer_cast<Route> (*s))) {
+
+ if (route->is_auditioner()) {
+ continue;
}
- out_packer.pack_end (_monitor_section->tearoff(), false, false);
- _monitor_section->set_session (_session);
- _monitor_section->tearoff().show_all ();
+ if (route->is_monitor()) {
- _monitor_section->tearoff().Detach.connect (sigc::mem_fun(*this, &Mixer_UI::monitor_section_detached));
- _monitor_section->tearoff().Attach.connect (sigc::mem_fun(*this, &Mixer_UI::monitor_section_attached));
+ if (!_monitor_section) {
+ _monitor_section = new MonitorSection (_session);
- monitor_section_attached ();
+ XMLNode* mnode = ARDOUR_UI::instance()->tearoff_settings (X_("monitor-section"));
+ if (mnode) {
+ _monitor_section->tearoff().set_state (*mnode);
+ }
+ }
- route->DropReferences.connect (*this, invalidator(*this), boost::bind (&Mixer_UI::monitor_section_going_away, this), gui_context());
+ out_packer.pack_end (_monitor_section->tearoff(), false, false);
+ _monitor_section->set_session (_session);
+ _monitor_section->tearoff().show_all ();
- /* no regular strip shown for control out */
+ _monitor_section->tearoff().Detach.connect (sigc::mem_fun(*this, &Mixer_UI::monitor_section_detached));
+ _monitor_section->tearoff().Attach.connect (sigc::mem_fun(*this, &Mixer_UI::monitor_section_attached));
- continue;
- }
+ monitor_section_attached ();
- strip = new MixerStrip (*this, _session, route);
- strips.push_back (strip);
+ route->DropReferences.connect (*this, invalidator(*this), boost::bind (&Mixer_UI::monitor_section_going_away, this), gui_context());
- UIConfiguration::instance().get_default_narrow_ms() ? _strip_width = Narrow : _strip_width = Wide;
+ /* no regular strip shown for control out */
- if (strip->width_owner() != strip) {
- strip->set_width_enum (_strip_width, this);
- }
+ continue;
+ }
- show_strip (strip);
+ strip = new MixerStrip (*this, _session, route);
+ strips.push_back (strip);
- TreeModel::Row row = *(track_model->insert(insert_iter));
- row[track_columns.text] = route->name();
- row[track_columns.visible] = strip->route()->is_master() ? true : strip->marked_for_display();
- row[track_columns.route] = route;
- row[track_columns.strip] = strip;
- row[track_columns.vca] = 0;
+ UIConfiguration::instance().get_default_narrow_ms() ? _strip_width = Narrow : _strip_width = Wide;
- if (nroutes != 0) {
- _selection.add (strip);
- }
+ if (strip->width_owner() != strip) {
+ strip->set_width_enum (_strip_width, this);
+ }
- route->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::strip_property_changed, this, _1, strip), gui_context());
+ show_strip (strip);
- strip->WidthChanged.connect (sigc::mem_fun(*this, &Mixer_UI::strip_width_changed));
- strip->signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
- }
+ if (!route->is_master()) {
+
+ TreeModel::Row row = *(track_model->insert (insert_iter));
+
+ row[stripable_columns.text] = route->name();
+ row[stripable_columns.visible] = strip->marked_for_display();
+ row[stripable_columns.stripable] = route;
+ row[stripable_columns.strip] = strip;
+
+ if (nroutes != 0) {
+ _selection.add (strip);
+ }
+
+ } else {
+
+ out_packer.pack_start (*strip, false, false);
+ strip->set_packed (true);
+ }
+
+ strip->WidthChanged.connect (sigc::mem_fun(*this, &Mixer_UI::strip_width_changed));
+ strip->signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
+ }
+
+ (*s)->presentation_info().PropertyChanged.connect (*this, invalidator(*this), boost::bind (&Mixer_UI::stripable_property_changed, this, _1, boost::weak_ptr<Stripable>(*s)), gui_context());
+ (*s)->PropertyChanged.connect (*this, invalidator(*this), boost::bind (&Mixer_UI::stripable_property_changed, this, _1, boost::weak_ptr<Stripable>(*s)), gui_context());
+ }
} catch (const std::exception& e) {
error << string_compose (_("Error adding GUI elements for new tracks/busses %1"), e.what()) << endmsg;
}
- no_track_list_redisplay = false;
track_display.set_model (track_model);
- sync_order_keys_from_treeview ();
+ if (!from_scratch) {
+ sync_presentation_info_from_treeview ();
+ }
+
redisplay_track_list ();
}
}
for (ri = rows.begin(); ri != rows.end(); ++ri) {
- if ((*ri)[track_columns.strip] == strip) {
+ if ((*ri)[stripable_columns.strip] == strip) {
PBD::Unwinder<bool> uw (_route_deletion_in_progress, true);
track_model->erase (ri);
break;
}
void
-Mixer_UI::reset_remote_control_ids ()
-{
- if (Config->get_remote_model() == UserOrdered || !_session || _session->deletion_in_progress()) {
- return;
- }
-
- TreeModel::Children rows = track_model->children();
-
- if (rows.empty()) {
- return;
- }
-
- DEBUG_TRACE (DEBUG::OrderKeys, "mixer resets remote control ids after remote model change\n");
-
- TreeModel::Children::iterator ri;
- bool rid_change = false;
- uint32_t rid = 1;
- uint32_t invisible_key = UINT32_MAX;
-
- for (ri = rows.begin(); ri != rows.end(); ++ri) {
-
- /* skip two special values */
-
- if (rid == Route::MasterBusRemoteControlID) {
- rid++;
- }
-
- if (rid == Route::MonitorBusRemoteControlID) {
- rid++;
- }
-
- boost::shared_ptr<Route> route = (*ri)[track_columns.route];
- bool visible = (*ri)[track_columns.visible];
-
- if (!route) {
- continue;
- }
-
- if (!route->is_master() && !route->is_monitor()) {
-
- uint32_t new_rid = (visible ? rid : invisible_key--);
-
- if (new_rid != route->remote_control_id()) {
- route->set_remote_control_id_explicit (new_rid);
- rid_change = true;
- }
-
- if (visible) {
- rid++;
- }
- }
- }
-
- if (rid_change) {
- /* tell the world that we changed the remote control IDs */
- _session->notify_remote_id_change ();
- }
-}
-
-void
-Mixer_UI::sync_order_keys_from_treeview ()
+Mixer_UI::sync_presentation_info_from_treeview ()
{
if (ignore_reorder || !_session || _session->deletion_in_progress()) {
return;
return;
}
- DEBUG_TRACE (DEBUG::OrderKeys, "mixer sync order keys from model\n");
+ DEBUG_TRACE (DEBUG::OrderKeys, "mixer sync presentation info from treeview\n");
TreeModel::Children::iterator ri;
- bool changed = false;
- bool rid_change = false;
+ bool change = false;
uint32_t order = 0;
- uint32_t rid = 1;
- uint32_t invisible_key = UINT32_MAX;
for (ri = rows.begin(); ri != rows.end(); ++ri) {
- boost::shared_ptr<Route> route = (*ri)[track_columns.route];
- bool visible = (*ri)[track_columns.visible];
+ bool visible = (*ri)[stripable_columns.visible];
+ boost::shared_ptr<Stripable> stripable = (*ri)[stripable_columns.stripable];
- if (!route) {
+ if (!stripable) {
continue;
}
- uint32_t old_key = route->order_key ();
+ /* Monitor and Auditioner do not get their presentation
+ * info reset here.
+ */
- if (order != old_key) {
- route->set_order_key (order);
- changed = true;
+ if (stripable->is_monitor() || stripable->is_auditioner()) {
+ continue;
}
- if ((Config->get_remote_model() == MixerOrdered) && !route->is_master() && !route->is_monitor()) {
-
- uint32_t new_rid = (visible ? rid : invisible_key--);
-
- if (new_rid != route->remote_control_id()) {
- route->set_remote_control_id_explicit (new_rid);
- rid_change = true;
- }
+ /* Master also doesn't get set here but since the editor allows
+ * it to be reordered, we need to preserve its ordering.
+ */
- if (visible) {
- rid++;
- }
+ stripable->presentation_info().set_hidden (!visible);
+ if (order != stripable->presentation_info().order()) {
+ stripable->set_presentation_order (order, false);
+ change = true;
}
++order;
}
- if (changed) {
- /* tell everyone that we changed the mixer sort keys */
- _session->sync_order_keys ();
- }
-
- if (rid_change) {
- /* tell the world that we changed the remote control IDs */
- _session->notify_remote_id_change ();
+ if (change) {
+ DEBUG_TRACE (DEBUG::OrderKeys, "... notify PI change from mixer GUI\n");
+ _session->notify_presentation_info_change ();
}
}
void
-Mixer_UI::sync_treeview_from_order_keys ()
+Mixer_UI::sync_treeview_from_presentation_info ()
{
if (!_session || _session->deletion_in_progress()) {
return;
}
- DEBUG_TRACE (DEBUG::OrderKeys, "mixer sync model from order keys.\n");
+ DEBUG_TRACE (DEBUG::OrderKeys, "mixer sync model from presentation info.\n");
/* we could get here after either a change in the Mixer or Editor sort
* order, but either way, the mixer order keys reflect the intended
}
OrderingKeys sorted;
- uint32_t vca_cnt = 0;
- uint32_t max_route_order_key = 0;
-
- /* count number of Routes in track_model (there may be some odd reason
- why this is not the same as the number in the session, but here we
- care about the track model.
- */
-
- for (TreeModel::Children::iterator ri = rows.begin(); ri != rows.end(); ++ri) {
- boost::shared_ptr<Route> route = (*ri)[track_columns.route];
- if (route) {
- max_route_order_key = max (route->order_key(), max_route_order_key);
- }
- }
for (TreeModel::Children::iterator ri = rows.begin(); ri != rows.end(); ++ri, ++old_order) {
- boost::shared_ptr<Route> route = (*ri)[track_columns.route];
- if (!route) {
- /* VCAs need to sort after all routes. We don't display
- * them in the same place (March 2016), but we don't
- * want them intermixed in the track_model
- */
- sorted.push_back (OrderKeys (old_order, max_route_order_key + ++vca_cnt));
- } else {
- sorted.push_back (OrderKeys (old_order, route->order_key ()));
- }
+ boost::shared_ptr<Stripable> stripable = (*ri)[stripable_columns.stripable];
+ sorted.push_back (OrderKeys (old_order, stripable->presentation_info().order()));
}
SortByNewDisplayOrder cmp;
if (sr->old_display_order != n) {
changed = true;
}
-
- DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("MIXER change order from %1 to %2\n",
- sr->old_display_order, n));
}
if (changed) {
_selection.clear_routes ();
for (TrackViewList::iterator i = s.begin(); i != s.end(); ++i) {
- RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (*i);
- if (rtav) {
- MixerStrip* ms = strip_by_route (rtav->route());
- if (ms) {
- _selection.add (ms);
+ TimeAxisView* tav = dynamic_cast<TimeAxisView*> (*i);
+ if (tav) {
+ AxisView* axis = axis_by_stripable (tav->stripable());
+ if (axis) {
+ _selection.add (axis);
}
}
}
MixerStrip*
-Mixer_UI::strip_by_route (boost::shared_ptr<Route> r)
+Mixer_UI::strip_by_route (boost::shared_ptr<Route> r) const
{
- for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
+ for (list<MixerStrip *>::const_iterator i = strips.begin(); i != strips.end(); ++i) {
if ((*i)->route() == r) {
return (*i);
}
return 0;
}
+AxisView*
+Mixer_UI::axis_by_stripable (boost::shared_ptr<Stripable> s) const
+{
+ for (list<MixerStrip *>::const_iterator i = strips.begin(); i != strips.end(); ++i) {
+ if ((*i)->stripable() == s) {
+ return (*i);
+ }
+ }
+
+ return 0;
+}
+
bool
Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
{
/* primary-click: toggle selection state of strip */
if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
_selection.remove (strip);
- } else if (_selection.routes.size() > 1) {
+ } else if (_selection.axes.size() > 1) {
/* de-select others */
_selection.set (strip);
}
_selection.add (strip);
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::RangeSelectModifier)) {
- if (!_selection.selected(strip)) {
-
- /* extend selection */
-
- vector<MixerStrip*> tmp;
- bool accumulate = false;
- bool found_another = false;
-
- tmp.push_back (strip);
-
- for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
- if ((*i) == strip) {
- /* hit clicked strip, start accumulating till we hit the first
- selected strip
- */
- if (accumulate) {
- /* done */
- break;
- } else {
- accumulate = true;
- }
- } else if (_selection.selected (*i)) {
- /* hit selected strip. if currently accumulating others,
- we're done. if not accumulating others, start doing so.
- */
- found_another = true;
- if (accumulate) {
- /* done */
- break;
- } else {
- accumulate = true;
- }
+ /* extend selection */
+
+ vector<MixerStrip*> tmp;
+ bool accumulate = false;
+ bool found_another = false;
+
+ tmp.push_back (strip);
+
+ for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
+ if ((*i) == strip) {
+ /* hit clicked strip, start accumulating till we hit the first
+ selected strip
+ */
+ if (accumulate) {
+ /* done */
+ break;
} else {
- if (accumulate) {
- tmp.push_back (*i);
- }
+ accumulate = true;
}
- }
-
- if (found_another) {
- for (vector<MixerStrip*>::iterator i = tmp.begin(); i != tmp.end(); ++i) {
- _selection.add (*i);
+ } else if (_selection.selected (*i)) {
+ /* hit selected strip. if currently accumulating others,
+ we're done. if not accumulating others, start doing so.
+ */
+ found_another = true;
+ if (accumulate) {
+ /* done */
+ break;
+ } else {
+ accumulate = true;
}
- } else
- _selection.set (strip); //user wants to start a range selection, but there aren't any others selected yet
+ } else {
+ if (accumulate) {
+ tmp.push_back (*i);
+ }
+ }
}
+ if (found_another) {
+ for (vector<MixerStrip*>::iterator i = tmp.begin(); i != tmp.end(); ++i) {
+ _selection.add (*i);
+ }
+ } else
+ _selection.set (strip); //user wants to start a range selection, but there aren't any others selected yet
} else {
_selection.set (strip);
}
initial_track_display ();
- _session->RouteAdded.connect (_session_connections, invalidator (*this), boost::bind (&Mixer_UI::add_strips, this, _1), gui_context());
+ _session->RouteAdded.connect (_session_connections, invalidator (*this), boost::bind (&Mixer_UI::add_routes, this, _1), gui_context());
_session->route_group_added.connect (_session_connections, invalidator (*this), boost::bind (&Mixer_UI::add_route_group, this, _1), gui_context());
_session->route_group_removed.connect (_session_connections, invalidator (*this), boost::bind (&Mixer_UI::route_groups_changed, this), gui_context());
_session->route_groups_reordered.connect (_session_connections, invalidator (*this), boost::bind (&Mixer_UI::route_groups_changed, this), gui_context());
TreeIter iter;
if ((iter = track_model->get_iter (path))) {
- MixerStrip* strip = (*iter)[track_columns.strip];
- if (strip) {
- bool visible = (*iter)[track_columns.visible];
- if (strip->set_marked_for_display (!visible)) {
- update_track_visibility ();
- }
+ AxisView* av = (*iter)[stripable_columns.strip];
+ bool visible = (*iter)[stripable_columns.visible];
+
+ if (av->set_marked_for_display (!visible)) {
+ update_track_visibility ();
}
}
}
Unwinder<bool> uw (no_track_list_redisplay, true);
for (i = rows.begin(); i != rows.end(); ++i) {
- MixerStrip *strip = (*i)[track_columns.strip];
- if (strip) {
- (*i)[track_columns.visible] = strip->marked_for_display ();
- }
+ AxisView* av = (*i)[stripable_columns.strip];
+ (*i)[stripable_columns.visible] = av->marked_for_display ();
}
- /* force route order keys catch up with visibility changes
+ /* force presentation catch up with visibility changes
*/
- sync_order_keys_from_treeview ();
+ sync_presentation_info_from_treeview ();
}
redisplay_track_list ();
for (i = rows.begin(); i != rows.end(); ++i) {
- MixerStrip* strip = (*i)[track_columns.strip];
+ AxisView* av = (*i)[stripable_columns.strip];
+ MixerStrip* strip = dynamic_cast<MixerStrip*> (av);
if (strip == ms) {
- (*i)[track_columns.visible] = true;
- redisplay_track_list ();
+ (*i)[stripable_columns.visible] = true;
+ av->set_marked_for_display (true);
+ update_track_visibility ();
break;
}
}
for (i = rows.begin(); i != rows.end(); ++i) {
- MixerStrip* strip = (*i)[track_columns.strip];
+ AxisView* av = (*i)[stripable_columns.strip];
+ MixerStrip* strip = dynamic_cast<MixerStrip*> (av);
if (strip == ms) {
- (*i)[track_columns.visible] = false;
- redisplay_track_list ();
+ (*i)[stripable_columns.visible] = false;
+ av->set_marked_for_display (false);
+ update_track_visibility ();
break;
}
}
for (i = rows.begin(); i != rows.end(); ++i) {
- TreeModel::Row row = (*i);
- MixerStrip* strip = row[track_columns.strip];
+ AxisView* av = (*i)[stripable_columns.strip];
+ MixerStrip* strip = dynamic_cast<MixerStrip*> (av);
if (!strip) {
continue;
continue;
}
- (*i)[track_columns.visible] = yn;
+ (*i)[stripable_columns.visible] = yn;
}
}
Unwinder<bool> uw (no_track_list_redisplay, true);
for (i = rows.begin(); i != rows.end(); ++i) {
- TreeModel::Row row = (*i);
- MixerStrip* strip = row[track_columns.strip];
+
+ AxisView* av = (*i)[stripable_columns.strip];
+ MixerStrip* strip = dynamic_cast<MixerStrip*> (av);
if (!strip) {
continue;
switch (tracks) {
case 0:
- (*i)[track_columns.visible] = yn;
+ (*i)[stripable_columns.visible] = yn;
break;
case 1:
if (at) { /* track */
- (*i)[track_columns.visible] = yn;
+ (*i)[stripable_columns.visible] = yn;
}
break;
case 2:
if (!at && !mt) { /* bus */
- (*i)[track_columns.visible] = yn;
+ (*i)[stripable_columns.visible] = yn;
}
break;
case 3:
if (mt) { /* midi-track */
- (*i)[track_columns.visible] = yn;
+ (*i)[stripable_columns.visible] = yn;
}
break;
}
set_all_audio_midi_visibility (3, false);
}
-
void
Mixer_UI::track_list_reorder (const TreeModel::Path&, const TreeModel::iterator&, int* /*new_order*/)
{
DEBUG_TRACE (DEBUG::OrderKeys, "mixer UI treeview reordered\n");
- sync_order_keys_from_treeview ();
+ sync_presentation_info_from_treeview ();
}
void
*/
DEBUG_TRACE (DEBUG::OrderKeys, "mixer UI treeview row deleted\n");
- sync_order_keys_from_treeview ();
+ sync_presentation_info_from_treeview ();
if (_route_deletion_in_progress) {
redisplay_track_list ();
}
void
-Mixer_UI::redisplay_track_list ()
+Mixer_UI::spill_redisplay (boost::shared_ptr<VCA> vca)
{
TreeModel::Children rows = track_model->children();
- TreeModel::Children::iterator i;
+ for (TreeModel::Children::iterator i = rows.begin(); i != rows.end(); ++i) {
+
+ AxisView* av = (*i)[stripable_columns.strip];
+ MixerStrip* strip = dynamic_cast<MixerStrip*> (av);
+
+ if (!strip) {
+ /* we're in the middle of changing a row, don't worry */
+ continue;
+ }
+
+ if (!strip->route()) {
+ /* non-route element */
+ continue;
+ }
+
+ if (strip->route()->is_master() || strip->route()->is_monitor()) {
+ continue;
+ }
+
+ if (strip->route()->slaved_to (vca)) {
+
+ if (strip->packed()) {
+ strip_packer.reorder_child (*strip, -1); /* put at end */
+ } else {
+ strip_packer.pack_start (*strip, false, false);
+ strip->set_packed (true);
+ }
+
+ } else {
+
+ if (strip->packed()) {
+ strip_packer.remove (*strip);
+ strip->set_packed (false);
+ }
+ }
+ }
+}
+
+void
+Mixer_UI::redisplay_track_list ()
+{
if (no_track_list_redisplay) {
return;
}
- container_clear (vca_packer);
+ boost::shared_ptr<VCA> sv = spilled_vca.lock ();
+
+ if (sv) {
+ spill_redisplay (sv);
+ return;
+ }
+
+ TreeModel::Children rows = track_model->children();
+ TreeModel::Children::iterator i;
+ uint32_t n_masters = 0;
+
+ container_clear (vca_hpacker);
+ vca_hpacker.pack_end (vca_scroller_base, true, true);
for (i = rows.begin(); i != rows.end(); ++i) {
- VCAMasterStrip* vms = (*i)[track_columns.vca];
+ AxisView* s = (*i)[stripable_columns.strip];
+ bool const visible = (*i)[stripable_columns.visible];
+ boost::shared_ptr<Stripable> stripable = (*i)[stripable_columns.stripable];
- if (vms) {
- vca_packer.pack_start (*vms, false, false);
- vms->show ();
+ if (!s) {
+ /* we're in the middle of changing a row, don't worry */
continue;
}
- MixerStrip* strip = (*i)[track_columns.strip];
+ VCAMasterStrip* vms;
- if (!strip) {
- /* we're in the middle of changing a row, don't worry */
+ if ((vms = dynamic_cast<VCAMasterStrip*> (s))) {
+ if (visible) {
+ vca_hpacker.pack_start (*vms, false, false);
+ vms->show ();
+ n_masters++;
+ }
continue;
}
- bool const visible = (*i)[track_columns.visible];
+ MixerStrip* strip = dynamic_cast<MixerStrip*> (s);
+
+ if (!strip) {
+ continue;
+ }
if (visible) {
- strip->set_gui_property ("visible", true);
if (strip->packed()) {
-
- if (strip->route()->is_master() || strip->route()->is_monitor()) {
- out_packer.reorder_child (*strip, -1);
-
- } else {
- strip_packer.reorder_child (*strip, -1); /* put at end */
- }
-
+ strip_packer.reorder_child (*strip, -1); /* put at end */
} else {
-
- if (strip->route()->is_master() || strip->route()->is_monitor()) {
- out_packer.pack_start (*strip, false, false);
- } else {
- strip_packer.pack_start (*strip, false, false);
- }
+ strip_packer.pack_start (*strip, false, false);
strip->set_packed (true);
}
} else {
- strip->set_gui_property ("visible", false);
-
- if (strip->route()->is_master() || strip->route()->is_monitor()) {
+ if (stripable->is_master() || stripable->is_monitor()) {
/* do nothing, these cannot be hidden */
} else {
if (strip->packed()) {
}
}
+ /* update visibility of VCA assign buttons */
+
+ if (n_masters == 0) {
+ UIConfiguration::instance().set_mixer_strip_visibility (VisibilityGroup::remove_element (UIConfiguration::instance().get_mixer_strip_visibility(), X_("VCA")));
+ vca_vpacker.hide ();
+ } else {
+ UIConfiguration::instance().set_mixer_strip_visibility (VisibilityGroup::add_element (UIConfiguration::instance().get_mixer_strip_visibility(), X_("VCA")));
+ vca_vpacker.show ();
+ }
+
_group_tabs->set_dirty ();
}
long order;
for (order = 0, i = rows.begin(); i != rows.end(); ++i, ++order) {
- MixerStrip* strip = (*i)[track_columns.strip];
+ AxisView* av = (*i)[stripable_columns.strip];
+ MixerStrip* strip = dynamic_cast<MixerStrip*> (av);
if (strip == 0) {
continue;
}
- bool visible = (*i)[track_columns.visible];
+ bool visible = (*i)[stripable_columns.visible];
if (visible) {
strip->queue_draw();
}
+struct PresentationInfoMixerSorter
+{
+ bool operator() (boost::shared_ptr<Stripable> a, boost::shared_ptr<Stripable> b) {
+ if (a->is_master()) {
+ /* master after everything else */
+ return false;
+ } else if (b->is_master()) {
+ /* everything else before master */
+ return true;
+ }
+ return a->presentation_info().order () < b->presentation_info().order ();
+ }
+};
+
void
Mixer_UI::initial_track_display ()
{
+ StripableList sl;
+
boost::shared_ptr<RouteList> routes = _session->get_routes();
- RouteList copy (*routes);
- ARDOUR::SignalOrderRouteSorter sorter;
- copy.sort (sorter);
+ for (RouteList::iterator r = routes->begin(); r != routes->end(); ++r) {
+ sl.push_back (*r);
+ }
+
+ VCAList vcas = _session->vca_manager().vcas();
+
+ for (VCAList::iterator v = vcas.begin(); v != vcas.end(); ++v) {
+ sl.push_back (boost::dynamic_pointer_cast<Stripable> (*v));
+ }
+
+ sl.sort (PresentationInfoMixerSorter());
{
+ /* These are also used inside ::add_stripables() but we need
+ * them here because we're going to clear the track_model also.
+ */
Unwinder<bool> uw1 (no_track_list_redisplay, true);
Unwinder<bool> uw2 (ignore_reorder, true);
track_model->clear ();
- VCAList vcas = _session->vca_manager().vcas();
- add_masters (vcas);
- add_strips (copy);
+ add_stripables (sl);
}
- _session->sync_order_keys ();
-
redisplay_track_list ();
}
}
void
-Mixer_UI::strip_property_changed (const PropertyChange& what_changed, MixerStrip* mx)
+Mixer_UI::stripable_property_changed (const PropertyChange& what_changed, boost::weak_ptr<Stripable> ws)
{
- if (!what_changed.contains (ARDOUR::Properties::name)) {
+ if (!what_changed.contains (ARDOUR::Properties::hidden) && !what_changed.contains (ARDOUR::Properties::name)) {
return;
}
- ENSURE_GUI_THREAD (*this, &Mixer_UI::strip_name_changed, what_changed, mx)
+ boost::shared_ptr<Stripable> s = ws.lock ();
+
+ if (!s) {
+ return;
+ }
TreeModel::Children rows = track_model->children();
TreeModel::Children::iterator i;
for (i = rows.begin(); i != rows.end(); ++i) {
- if ((*i)[track_columns.strip] == mx) {
- (*i)[track_columns.text] = mx->route()->name();
+ boost::shared_ptr<Stripable> ss = (*i)[stripable_columns.stripable];
+
+ if (s == ss) {
+
+ if (what_changed.contains (ARDOUR::Properties::name)) {
+ (*i)[stripable_columns.text] = s->name();
+ }
+
+ if (what_changed.contains (ARDOUR::Properties::hidden)) {
+ (*i)[stripable_columns.visible] = !s->presentation_info().hidden();
+ redisplay_track_list ();
+ }
+
return;
}
}
}
switch (GPOINTER_TO_UINT (column->get_data (X_("colnum")))) {
- case 0:
+ case 1:
if (Keyboard::is_edit_event (ev)) {
if (group) {
// edit_route_group (group);
}
break;
- case 1:
+ case 0:
{
bool visible = (*iter)[group_columns.visible];
(*iter)[group_columns.visible] = !visible;
void
Mixer_UI::new_route_group ()
{
- RouteList rl;
-
- _group_tabs->run_new_group_dialog (rl);
+ _group_tabs->run_new_group_dialog (0, false);
}
void
{
if (yn) {
list_vpacker.show ();
-
- //if user wants to show the pane, we should make sure that it is wide enough to be visible
- int width = list_hpane.get_position();
- if (width < 40) {
- list_hpane.set_position(40);
- }
} else {
list_vpacker.hide ();
}
if (focus) {
TreeViewColumn* col = group_display.get_column (0);
- CellRendererText* name_cell = dynamic_cast<CellRendererText*>(group_display.get_column_cell_renderer (0));
+ CellRendererText* name_cell = dynamic_cast<CellRendererText*>(group_display.get_column_cell_renderer (1));
group_display.set_cursor (group_model->get_path (row), *col, *name_cell, true);
}
}
const void * d = data.get_data();
- const Gtkmm2ext::DnDTreeView<ARDOUR::PluginPresetPtr>* tv = reinterpret_cast<const Gtkmm2ext::DnDTreeView<ARDOUR::PluginPresetPtr>*>(d);
+ const Gtkmm2ext::DnDTreeView<ARDOUR::PluginPresetPtr>* tv = reinterpret_cast<const Gtkmm2ext::DnDTreeView<ARDOUR::PluginPresetPtr>*>(d);
PluginPresetList nfos;
TreeView* source;
if (!pip->is_instrument ()) {
continue;
}
- ARDOUR_UI::instance()->session_add_midi_track (NULL, 1, _("MIDI"), Config->get_strict_io (), pip, ppp->_preset.valid ? &ppp->_preset : 0);
+ ARDOUR_UI::instance()->session_add_midi_track ((RouteGroup*) 0, 1, _("MIDI"), Config->get_strict_io (), pip, ppp->_preset.valid ? &ppp->_preset : 0, PresentationInfo::max_order);
ok = true;
}
Mixer_UI::set_state (const XMLNode& node, int version)
{
XMLProperty const * prop;
+ LocaleGuard lg;
Tabbable::set_state (node, version);
{
XMLNode* node = new XMLNode (X_("Mixer"));
char buf[128];
+ LocaleGuard lg;
node->add_child_nocopy (Tabbable::get_state());
- snprintf(buf,sizeof(buf), "%f", paned_position_as_fraction (rhs_pane1, true));
+ snprintf(buf,sizeof(buf), "%f", rhs_pane1.get_divider());
node->add_property(X_("mixer-rhs-pane1-pos"), string(buf));
- snprintf(buf,sizeof(buf), "%f", paned_position_as_fraction (rhs_pane2, true));
+ snprintf(buf,sizeof(buf), "%f", rhs_pane2.get_divider());
node->add_property(X_("mixer-rhs_pane2-pos"), string(buf));
- snprintf(buf,sizeof(buf), "%f", paned_position_as_fraction (list_hpane, false));
+ snprintf(buf,sizeof(buf), "%f", list_hpane.get_divider());
node->add_property(X_("mixer-list-hpane-pos"), string(buf));
- snprintf(buf,sizeof(buf), "%f", paned_position_as_fraction (inner_pane, false));
+ snprintf(buf,sizeof(buf), "%f", inner_pane.get_divider());
node->add_property(X_("mixer-inner-pane-pos"), string(buf));
node->add_property ("narrow-strips", _strip_width == Narrow ? "yes" : "no");
return *node;
}
-void
-Mixer_UI::pane_allocation_handler (Allocation& allocation, Gtk::Paned* which)
-{
- float pos;
- XMLProperty* prop = 0;
- XMLNode* geometry = ARDOUR_UI::instance()->mixer_settings();
- int height = default_height;
- static bool done[4] = { false, false, false, false };
-
- /* Gtk::Paned behaves very oddly and rather undesirably. Setting the
- * position is a crapshoot if you time it incorrectly with the overall
- * sizing of the Paned. For example, if you might retrieve the size with
- * ::get_position() and then later call ::set_position() on a Paned at
- * a time when its allocation is different than it was when you retrieved
- * the position. The position will be interpreted as the size of the
- * first (top or left) child widget. If packing/size allocation later
- * resizes the Paned to a (final) smaller size, the position will be
- * used in ways that mean that the Paned ends up NOT in the same state
- * that it was in when you originally saved the position.
- *
- * Concrete example: Paned is 800 pixels wide, position is 400
- * (halfway). Save position as 400. During program restart, set
- * position to 400, before Paned has been allocated any space. Paned
- * ends up initially sized to 1200 pixels. Position is now 1/3 of the
- * way across/down. Subsequent resizes will leave the position 1/3 of
- * the way across, rather than leaving it as a fixed pixel
- * position. Eventually, the Paned ends up 800 pixels wide/high again,
- * but the position is now 267, not 400.
- *
- * So ...
- *
- * We deal with this by using two strategies:
- *
- * 1) only set the position if the allocated size of the Paned is at
- * least as big as it needs to be for the position to make sense.
- *
- * 2) in recent versions of Ardour, save the position as a fraction,
- * and restore it using that fraction.
- *
- * So, we will only call ::set_position() AFTER the Paned is of a
- * sensible size, and then in addition, we will set the position in a
- * way that will be maintained as/when/if the Paned is resized.
- *
- * Once we've called ::set_position() on a Paned, we don't do it
- * again.
- */
-
- if (which == static_cast<Gtk::Paned*> (&rhs_pane1)) {
-
- if (done[0]) {
- return;
- }
-
- if (!geometry || (prop = geometry->property("mixer-rhs-pane1-pos")) == 0) {
- pos = height / 3;
- } else {
- pos = atof (prop->value());
- }
-
- if (pos > 1.0f) {
- /* older versions of Ardour stored absolute position */
- if ((done[0] = (allocation.get_height() > pos))) {
- rhs_pane1.set_position (pos);
- }
- } else {
- if ((done[0] = (allocation.get_height() > 1.0/pos))) {
- paned_set_position_as_fraction (rhs_pane1, pos, true);
- }
- }
- }
-
- if (which == static_cast<Gtk::Paned*> (&rhs_pane2)) {
-
- if (done[1]) {
- return;
- }
-
- if (!geometry || (prop = geometry->property("mixer-rhs-pane2-pos")) == 0) {
- pos = 2 * height / 3;
- } else {
- pos = atof (prop->value());
- }
-
- if (pos > 1.0f) {
- /* older versions of Ardour stored absolute position */
- if ((done[1] = (allocation.get_height() > pos))) {
- rhs_pane2.set_position (pos);
- }
- } else {
- if ((done[1] = (allocation.get_height() > 1.0/pos))) {
- paned_set_position_as_fraction (rhs_pane2, pos, true);
- }
- }
- }
-
- if (which == static_cast<Gtk::Paned*> (&list_hpane)) {
-
- if (done[2]) {
- return;
- }
-
- if (!geometry || (prop = geometry->property("mixer-list-hpane-pos")) == 0) {
- pos = std::max ((float)100, rintf ((float) 125 * UIConfiguration::instance().get_ui_scale()));
- } else {
- pos = max (0.1, atof (prop->value ()));
- }
-
- if (pos > 1.0f) {
- if ((done[2] = (allocation.get_width() > pos))) {
- list_hpane.set_position (pos);
- }
- } else {
- if ((done[2] = (allocation.get_width() > 1.0/pos))) {
- paned_set_position_as_fraction (list_hpane, pos, false);
- }
- }
- }
-
- if (which == static_cast<Gtk::Paned*> (&inner_pane)) {
-
- if (done[3]) {
- return;
- }
-
- if (!geometry || (prop = geometry->property("mixer-inner-pane-pos")) == 0) {
- pos = std::max ((float)100, rintf ((float) 125 * UIConfiguration::instance().get_ui_scale()));
- } else {
- pos = max (0.1, atof (prop->value ()));
- }
-
- if (pos > 1.0f) {
- /* older versions of Ardour stored absolute position */
- if ((done[3] = (allocation.get_width() > pos))) {
- inner_pane.set_position (pos);
- }
- } else {
- if ((done[3] = (allocation.get_width() > 1.0/pos))) {
- paned_set_position_as_fraction (inner_pane, pos, false);
- }
- }
- }
-}
-
void
Mixer_UI::scroll_left ()
{
for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
(*i)->set_width_enum (s ? Narrow : Wide, this);
}
- } else if (p == "remote-model") {
- reset_remote_control_ids ();
} else if (p == "use-monitor-bus") {
if (_session && !_session->monitor_out()) {
monitor_section_detached ();
void
Mixer_UI::setup_track_display ()
{
- track_model = ListStore::create (track_columns);
+ track_model = ListStore::create (stripable_columns);
track_display.set_model (track_model);
- track_display.append_column (_("Strips"), track_columns.text);
- track_display.append_column (_("Show"), track_columns.visible);
+ track_display.append_column (_("Show"), stripable_columns.visible);
+ track_display.append_column (_("Strips"), stripable_columns.text);
track_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0));
track_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
- track_display.get_column (0)->set_expand(true);
- track_display.get_column (1)->set_expand(false);
- track_display.get_column (0)->set_sizing (Gtk::TREE_VIEW_COLUMN_FIXED);
+ track_display.get_column (0)->set_expand(false);
+ track_display.get_column (1)->set_expand(true);
+ track_display.get_column (1)->set_sizing (Gtk::TREE_VIEW_COLUMN_FIXED);
track_display.set_name (X_("EditGroupList"));
track_display.get_selection()->set_mode (Gtk::SELECTION_NONE);
track_display.set_reorderable (true);
track_model->signal_row_deleted().connect (sigc::mem_fun (*this, &Mixer_UI::track_list_delete));
track_model->signal_rows_reordered().connect (sigc::mem_fun (*this, &Mixer_UI::track_list_reorder));
- CellRendererToggle* track_list_visible_cell = dynamic_cast<CellRendererToggle*>(track_display.get_column_cell_renderer (1));
+ CellRendererToggle* track_list_visible_cell = dynamic_cast<CellRendererToggle*>(track_display.get_column_cell_renderer (0));
track_list_visible_cell->property_activatable() = true;
track_list_visible_cell->property_radio() = false;
track_list_visible_cell->signal_toggled().connect (sigc::mem_fun (*this, &Mixer_UI::track_visibility_changed));
}
void
-Mixer_UI::set_route_targets_for_operation ()
+Mixer_UI::set_axis_targets_for_operation ()
{
- _route_targets.clear ();
+ _axis_targets.clear ();
if (!_selection.empty()) {
- _route_targets = _selection.routes;
+ _axis_targets = _selection.axes;
return;
}
boost::shared_ptr<RouteList> rl (new RouteList);
bool onoff = false;
- set_route_targets_for_operation ();
+ set_axis_targets_for_operation ();
- for (RouteUISelection::iterator r = _route_targets.begin(); r != _route_targets.end(); ++r) {
- boost::shared_ptr<MidiTrack> mt = (*r)->midi_track();
+ for (AxisViewSelection::iterator r = _axis_targets.begin(); r != _axis_targets.end(); ++r) {
+ boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> ((*r)->stripable());
if (mt) {
- rl->push_back ((*r)->route());
+ rl->push_back (mt);
onoff = !mt->input_active();
}
}
Gtk::Menu* m = manage (new Menu);
MenuList& items = m->items ();
- if (_selection.routes.empty()) {
+ if (_selection.axes.empty()) {
items.push_back (MenuElem (_("No Track/Bus is selected.")));
} else {
items.push_back (MenuElem (_("Add at the top"),
void
Mixer_UI::add_favorite_processor (ARDOUR::PluginPresetPtr ppp, ProcessorPosition pos)
{
- if (!_session || _selection.routes.empty()) {
+ if (!_session || _selection.axes.empty()) {
return;
}
PluginInfoPtr pip = ppp->_pip;
- for (RouteUISelection::iterator i = _selection.routes.begin(); i != _selection.routes.end(); ++i) {
- boost::shared_ptr<ARDOUR::Route> rt = (*i)->route();
- if (!rt) { continue; }
+ for (AxisViewSelection::iterator i = _selection.axes.begin(); i != _selection.axes.end(); ++i) {
+ boost::shared_ptr<ARDOUR::Route> rt = boost::dynamic_pointer_cast<ARDOUR::Route> ((*i)->stripable());
+
+ if (!rt) {
+ continue;
+ }
PluginPtr p = pip->load (*_session);
- if (!p) { continue; }
+
+ if (!p) {
+ continue;
+ }
if (ppp->_preset.valid) {
p->load_preset (ppp->_preset);
/* call protected MixerActor:: method */
vca_unassign (vca);
}
+
+void
+Mixer_UI::show_vca_slaves (boost::shared_ptr<VCA> vca)
+{
+ boost::shared_ptr<VCA> v = spilled_vca.lock();
+ if (v != vca) {
+ spilled_vca = vca;
+ show_vca_change (vca); /* EMIT SIGNAL */
+ if (vca) {
+ _group_tabs->hide ();
+ } else {
+ _group_tabs->show ();
+ }
+ redisplay_track_list ();
+ }
+}
+
+bool
+Mixer_UI::showing_vca_slaves_for (boost::shared_ptr<VCA> vca) const
+{
+ return vca == spilled_vca.lock();
+}
+
+void
+Mixer_UI::register_actions ()
+{
+ Glib::RefPtr<ActionGroup> group = myactions.create_action_group (X_("Mixer"));
+
+ myactions.register_action (group, "solo", _("Toggle Solo on Mixer-Selected Tracks/Busses"), sigc::mem_fun (*this, &Mixer_UI::solo_action));
+ myactions.register_action (group, "mute", _("Toggle Mute on Mixer-Selected Tracks/Busses"), sigc::mem_fun (*this, &Mixer_UI::mute_action));
+ myactions.register_action (group, "recenable", _("Toggle Rec-enable on Mixer-Selected Tracks/Busses"), sigc::mem_fun (*this, &Mixer_UI::rec_enable_action));
+ myactions.register_action (group, "increment-gain", _("Decrease Gain on Mixer-Selected Tracks/Busses"), sigc::mem_fun (*this, &Mixer_UI::step_gain_up_action));
+ myactions.register_action (group, "decrement-gain", _("Increase Gain on Mixer-Selected Tracks/Busses"), sigc::mem_fun (*this, &Mixer_UI::step_gain_down_action));
+ myactions.register_action (group, "unity-gain", _("Set Gain to 0dB on Mixer-Selected Tracks/Busses"), sigc::mem_fun (*this, &Mixer_UI::unity_gain_action));
+
+
+ myactions.register_action (group, "copy-processors", _("Copy Selected Processors"), sigc::mem_fun (*this, &Mixer_UI::copy_processors));
+ myactions.register_action (group, "cut-processors", _("Cut Selected Processors"), sigc::mem_fun (*this, &Mixer_UI::cut_processors));
+ myactions.register_action (group, "paste-processors", _("Paste Selected Processors"), sigc::mem_fun (*this, &Mixer_UI::paste_processors));
+ myactions.register_action (group, "delete-processors", _("Delete Selected Processors"), sigc::mem_fun (*this, &Mixer_UI::delete_processors));
+ myactions.register_action (group, "select-all-processors", _("Select All (visible) Processors"), sigc::mem_fun (*this, &Mixer_UI::select_all_processors));
+ myactions.register_action (group, "toggle-processors", _("Toggle Selected Processors"), sigc::mem_fun (*this, &Mixer_UI::toggle_processors));
+ myactions.register_action (group, "ab-plugins", _("Toggle Selected Plugins"), sigc::mem_fun (*this, &Mixer_UI::ab_plugins));
+ myactions.register_action (group, "select-none", _("Deselect all strips and processors"), sigc::mem_fun (*this, &Mixer_UI::select_none));
+
+ myactions.register_action (group, "scroll-left", _("Scroll Mixer Window to the left"), sigc::mem_fun (*this, &Mixer_UI::scroll_left));
+ myactions.register_action (group, "scroll-right", _("Scroll Mixer Window to the left"), sigc::mem_fun (*this, &Mixer_UI::scroll_right));
+
+ myactions.register_action (group, "toggle-midi-input-active", _("Toggle MIDI Input Active for Mixer-Selected Tracks/Busses"),
+ sigc::bind (sigc::mem_fun (*this, &Mixer_UI::toggle_midi_input_active), false));
+}
+
+void
+Mixer_UI::load_bindings ()
+{
+ bindings = Bindings::get_bindings (X_("Mixer"), myactions);
+}
+
+template<class T> void
+Mixer_UI::control_action (boost::shared_ptr<T> (Stripable::*get_control)() const)
+{
+ boost::shared_ptr<ControlList> cl (new ControlList);
+ boost::shared_ptr<AutomationControl> ac;
+ bool val = false;
+ bool have_val = false;
+
+ set_axis_targets_for_operation ();
+
+ BOOST_FOREACH(AxisView* r, _axis_targets) {
+ boost::shared_ptr<Stripable> s = r->stripable();
+ if (s) {
+ ac = (s.get()->*get_control)();
+ if (ac) {
+ cl->push_back (ac);
+ if (!have_val) {
+ val = !ac->get_value();
+ have_val = true;
+ }
+ }
+ }
+ }
+
+ _session->set_controls (cl, val, Controllable::UseGroup);
+}
+
+void
+Mixer_UI::solo_action ()
+{
+ control_action (&Stripable::solo_control);
+}
+
+void
+Mixer_UI::mute_action ()
+{
+ control_action (&Stripable::mute_control);
+}
+
+void
+Mixer_UI::rec_enable_action ()
+{
+ control_action (&Stripable::rec_enable_control);
+}
+
+void
+Mixer_UI::step_gain_up_action ()
+{
+ set_axis_targets_for_operation ();
+
+ BOOST_FOREACH(AxisView* r, _axis_targets) {
+ MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+ if (ms) {
+ ms->step_gain_up ();
+ }
+ }
+}
+
+void
+Mixer_UI::step_gain_down_action ()
+{
+ set_axis_targets_for_operation ();
+
+ BOOST_FOREACH(AxisView* r, _axis_targets) {
+ MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+ if (ms) {
+ ms->step_gain_down ();
+ }
+ }
+}
+
+void
+Mixer_UI::unity_gain_action ()
+{
+ set_axis_targets_for_operation ();
+
+ BOOST_FOREACH(AxisView* r, _axis_targets) {
+ boost::shared_ptr<Stripable> s = r->stripable();
+ if (s) {
+ boost::shared_ptr<AutomationControl> ac = s->gain_control();
+ if (ac) {
+ ac->set_value (1.0, Controllable::UseGroup);
+ }
+ }
+ }
+}
+
+void
+Mixer_UI::copy_processors ()
+{
+ set_axis_targets_for_operation ();
+
+ BOOST_FOREACH(AxisView* r, _axis_targets) {
+ MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+ if (ms) {
+ ms->copy_processors ();
+ }
+ }
+}
+void
+Mixer_UI::cut_processors ()
+{
+ set_axis_targets_for_operation ();
+
+ BOOST_FOREACH(AxisView* r, _axis_targets) {
+ MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+ if (ms) {
+ ms->cut_processors ();
+ }
+ }
+}
+void
+Mixer_UI::paste_processors ()
+{
+ set_axis_targets_for_operation ();
+
+ BOOST_FOREACH(AxisView* r, _axis_targets) {
+ MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+ if (ms) {
+ ms->paste_processors ();
+ }
+ }
+}
+void
+Mixer_UI::select_all_processors ()
+{
+ set_axis_targets_for_operation ();
+
+ BOOST_FOREACH(AxisView* r, _axis_targets) {
+ MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+ if (ms) {
+ ms->select_all_processors ();
+ }
+ }
+}
+void
+Mixer_UI::toggle_processors ()
+{
+ set_axis_targets_for_operation ();
+
+ BOOST_FOREACH(AxisView* r, _axis_targets) {
+ MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+ if (ms) {
+ ms->toggle_processors ();
+ }
+ }
+}
+void
+Mixer_UI::ab_plugins ()
+{
+ set_axis_targets_for_operation ();
+
+ BOOST_FOREACH(AxisView* r, _axis_targets) {
+ MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+ if (ms) {
+ ms->ab_plugins ();
+ }
+ }
+}
+
+void
+Mixer_UI::vca_assign (boost::shared_ptr<VCA> vca)
+{
+ set_axis_targets_for_operation ();
+#if 0
+ BOOST_FOREACH(AxisView* r, _axis_targets) {
+ MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+ if (ms) {
+ ms->vca_assign (vca);
+ }
+ }
+#endif
+}
+
+void
+Mixer_UI::vca_unassign (boost::shared_ptr<VCA> vca)
+{
+ set_axis_targets_for_operation ();
+#if 0
+ BOOST_FOREACH(AxisView* r, _axis_targets) {
+ MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+ if (ms) {
+ ms->vca_unassign (vca);
+ }
+ }
+#endif
+}
projects / ardour.git / blobdiff