_group_tabs = new MixerGroupTabs (this);
VBox* b = manage (new VBox);
+ b->set_spacing (0);
+ b->set_border_width (0);
b->pack_start (*_group_tabs, PACK_SHRINK);
b->pack_start (strip_packer);
b->show_all ();
+ b->signal_scroll_event().connect (sigc::mem_fun (*this, &Mixer_UI::on_scroll_event), false);
scroller.add (*b);
scroller.set_policy (Gtk::POLICY_ALWAYS, Gtk::POLICY_AUTOMATIC);
list_vpacker.pack_start (rhs_pane2, true, true);
- 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_label_bar.set_size_request (-1, 16 + 1); /* must match height in GroupTabs::set_size_request() + 1 border px*/
vca_vpacker.pack_start (vca_label_bar, false, false);
vca_scroller_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
list_hpane.set_check_divider_position (true);
list_hpane.add (list_vpacker);
list_hpane.add (global_hpacker);
+ list_hpane.set_child_minsize (list_vpacker, 1);
XMLNode const * settings = ARDOUR_UI::instance()->mixer_settings();
rhs_pane2.show();
strip_packer.show();
inner_pane.show();
- vca_top_padding->show ();
vca_scroller.show();
vca_vpacker.show();
vca_hpacker.show();
if (win && new_window) {
win->set_name ("MixerWindow");
ARDOUR_UI::instance()->setup_toplevel_window (*win, _("Mixer"), this);
- win->signal_scroll_event().connect (sigc::mem_fun (*this, &Mixer_UI::on_scroll_event), false);
win->signal_event().connect (sigc::bind (sigc::ptr_fun (&Keyboard::catch_user_event_for_pre_dialog_focus), win));
win->set_data ("ardour-bindings", bindings);
update_title ();
(*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;
bool change = false;
uint32_t order = 0;
+ OrderingKeys sorted;
+ const size_t cmp_max = rows.size ();
+
+ // special case master if it's got PI order 0 lets keep it there
+ if (_session->master_out() && (_session->master_out()->presentation_info().order() == 0)) {
+ order++;
+ }
+
for (ri = rows.begin(); ri != rows.end(); ++ri) {
bool visible = (*ri)[stripable_columns.visible];
boost::shared_ptr<Stripable> stripable = (*ri)[stripable_columns.stripable];
stripable->presentation_info().set_hidden (!visible);
+ // master may not get set here, but if it is zero keep it there
+ if (stripable->is_master() && (stripable->presentation_info().order() == 0)) {
+ continue;
+ }
+
if (order != stripable->presentation_info().order()) {
stripable->set_presentation_order (order, false);
change = true;
}
+ sorted.push_back (OrderKeys (order, stripable, cmp_max));
+
++order;
}
+ if (!change) {
+ // VCA (and Mixbus) special cases according to SortByNewDisplayOrder
+ uint32_t n = 0;
+ SortByNewDisplayOrder cmp;
+ sort (sorted.begin(), sorted.end(), cmp);
+ for (OrderingKeys::iterator sr = sorted.begin(); sr != sorted.end(); ++sr, ++n) {
+ if (sr->old_display_order != n) {
+ change = true;
+ }
+ }
+ }
+
if (change) {
DEBUG_TRACE (DEBUG::OrderKeys, "... notify PI change from mixer GUI\n");
_session->notify_presentation_info_change ();
+ _session->set_dirty();
}
}
}
OrderingKeys sorted;
+ const size_t cmp_max = rows.size ();
for (TreeModel::Children::iterator ri = rows.begin(); ri != rows.end(); ++ri, ++old_order) {
boost::shared_ptr<Stripable> stripable = (*ri)[stripable_columns.stripable];
- sorted.push_back (OrderKeys (old_order, stripable->presentation_info().order()));
+ sorted.push_back (OrderKeys (old_order, stripable, cmp_max));
}
SortByNewDisplayOrder cmp;
_group_tabs->set_session (sess);
+ if (_monitor_section) {
+ _monitor_section->set_session (_session);
+ }
+
if (!_session) {
return;
}
Mixer_UI::spill_redisplay (boost::shared_ptr<VCA> vca)
{
TreeModel::Children rows = track_model->children();
+ std::list<boost::shared_ptr<VCA> > vcas;
+ vcas.push_back (vca);
- for (TreeModel::Children::iterator i = rows.begin(); i != rows.end(); ++i) {
+ for (TreeModel::Children::const_iterator i = rows.begin(); i != rows.end(); ++i) {
+ AxisView* av = (*i)[stripable_columns.strip];
+ VCAMasterStrip* vms = dynamic_cast<VCAMasterStrip*> (av);
+ if (vms && vms->vca()->slaved_to (vca)) {
+ vcas.push_back (vms->vca());
+ }
+ }
+
+ for (TreeModel::Children::const_iterator i = rows.begin(); i != rows.end(); ++i) {
AxisView* av = (*i)[stripable_columns.strip];
MixerStrip* strip = dynamic_cast<MixerStrip*> (av);
continue;
}
- if (strip->route()->slaved_to (vca)) {
+ bool slaved = false;
+ for (std::list<boost::shared_ptr<VCA> >::const_iterator m = vcas.begin(); m != vcas.end(); ++m) {
+ if (strip->route()->slaved_to (*m)) {
+ slaved = true;
+ break;
+ }
+ }
+
+ if (slaved) {
if (strip->packed()) {
strip_packer.reorder_child (*strip, -1); /* put at end */
return;
}
- boost::shared_ptr<VCA> sv = spilled_vca.lock ();
-
- if (sv) {
- spill_redisplay (sv);
- return;
+ boost::shared_ptr<Stripable> ss = spilled_strip.lock ();
+ if (ss) {
+ boost::shared_ptr<VCA> sv = boost::dynamic_pointer_cast<VCA> (ss);
+ if (sv) {
+ spill_redisplay (sv);
+ return;
+ }
}
TreeModel::Children rows = track_model->children();
}
redisplay_track_list ();
+ sync_treeview_from_presentation_info ();
}
void
show_track_list_menu ();
return true;
}
+ if ((ev->type == GDK_BUTTON_PRESS) && (ev->button == 1)) {
+ TreeModel::Path path;
+ TreeViewColumn* column;
+ int cellx, celly;
+ if (track_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
+ TreeIter iter = track_model->get_iter (path);
+ if ((*iter)[stripable_columns.visible]) {
+ boost::shared_ptr<ARDOUR::Stripable> s = (*iter)[stripable_columns.stripable];
+ move_stripable_into_view (s);
+ }
+ }
+ }
return false;
}
+void
+Mixer_UI::move_stripable_into_view (boost::shared_ptr<ARDOUR::Stripable> s)
+{
+ if (!scroller.get_hscrollbar()) {
+ return;
+ }
+ if (s->presentation_info().special () || s->presentation_info().flag_match (PresentationInfo::VCA)) {
+ return;
+ }
+#ifdef MIXBUS
+ if (s->mixbus ()) {
+ return;
+ }
+#endif
+ bool found = false;
+ int x0 = 0;
+ for (list<MixerStrip *>::const_iterator i = strips.begin(); i != strips.end(); ++i) {
+ if ((*i)->route() == s) {
+ int y;
+ found = true;
+ (*i)->translate_coordinates (strip_packer, 0, 0, x0, y);
+ break;
+ }
+ }
+ if (!found) {
+ return;
+ }
+
+ Adjustment* adj = scroller.get_hscrollbar()->get_adjustment();
+ scroller.get_hscrollbar()->set_value (max (adj->get_lower(), min (adj->get_upper(), x0 - 1.0)));
+}
+
void
Mixer_UI::build_track_menu ()
{
#ifdef LXVST_SUPPORT
refiller (plugs, mgr.lxvst_plugin_info ());
#endif
+#ifdef MACVST_SUPPORT
+ refiller (plugs, mgr.mac_vst_plugin_info ());
+#endif
#ifdef AUDIOUNIT_SUPPORT
refiller (plugs, mgr.au_plugin_info ());
#endif
}
void
-Mixer_UI::show_vca_slaves (boost::shared_ptr<VCA> vca)
+Mixer_UI::show_spill (boost::shared_ptr<Stripable> s)
{
- boost::shared_ptr<VCA> v = spilled_vca.lock();
- if (v != vca) {
- spilled_vca = vca;
- show_vca_change (vca); /* EMIT SIGNAL */
- if (vca) {
+ boost::shared_ptr<Stripable> ss = spilled_strip.lock();
+ if (ss != s) {
+ spilled_strip = s;
+ show_spill_change (s); /* EMIT SIGNAL */
+ if (s) {
_group_tabs->hide ();
} else {
_group_tabs->show ();
}
bool
-Mixer_UI::showing_vca_slaves_for (boost::shared_ptr<VCA> vca) const
+Mixer_UI::showing_spill_for (boost::shared_ptr<Stripable> s) const
{
- return vca == spilled_vca.lock();
+ return s == spilled_strip.lock();
}
void
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, "scroll-right", _("Scroll Mixer Window to the right"), 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));
projects / ardour.git / blobdiff