X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_ui.cc;h=1a4a897a72de5924e289a668bed814bed495bcf2;hb=1f5ebc54853446a786925941bd014666e75221d2;hp=282c68798b055b3aa4d71e22773db4af2e63051a;hpb=7e5e95d7dbaba4d1280d68b3880a736351a5280d;p=ardour.git diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 282c68798b..1a4a897a72 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -27,31 +27,34 @@ #include +#include + #include +#include #include "pbd/convert.h" #include "pbd/stacktrace.h" #include "pbd/unwind.h" -#include - -#include -#include -#include -#include -#include -#include - #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/selection.h" #include "ardour/session.h" #include "ardour/vca.h" #include "ardour/vca_manager.h" +#include "gtkmm2ext/gtk_ui.h" +#include "gtkmm2ext/keyboard.h" +#include "gtkmm2ext/utils.h" +#include "gtkmm2ext/window_title.h" +#include "gtkmm2ext/doi.h" + +#include "widgets/tearoff.h" + #include "keyboard.h" #include "mixer_ui.h" #include "mixer_strip.h" @@ -60,7 +63,6 @@ #include "public_editor.h" #include "mouse_cursors.h" #include "ardour_ui.h" -#include "prompter.h" #include "utils.h" #include "route_sorter.h" #include "actions.h" @@ -105,18 +107,18 @@ Mixer_UI::Mixer_UI () , _plugin_selector (0) , _strip_width (UIConfiguration::instance().get_default_narrow_ms() ? Narrow : Wide) , ignore_reorder (false) - , _in_group_rebuild_or_clear (false) - , _route_deletion_in_progress (false) - , _following_editor_selection (false) + , _in_group_rebuild_or_clear (false) + , _route_deletion_in_progress (false) , _maximised (false) , _show_mixer_list (true) , myactions (X_("mixer")) + , _selection (*this, *this) { 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()); + PresentationInfo::Change.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::presentation_info_changed, this, _1), gui_context()); scroller.set_can_default (true); // set_default (scroller); @@ -137,9 +139,12 @@ Mixer_UI::Mixer_UI () _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); @@ -251,17 +256,7 @@ Mixer_UI::Mixer_UI () 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); @@ -284,36 +279,30 @@ Mixer_UI::Mixer_UI () 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(); - XMLProperty const * prop; float fract; - { - LocaleGuard lg; + if (!settings || !settings->get_property ("mixer-rhs-pane1-pos", fract) || fract > 1.0) { + fract = 0.6f; + } + rhs_pane1.set_divider (0, fract); - 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())); - } + if (!settings || !settings->get_property ("mixer-rhs-pane2-pos", fract) || fract > 1.0) { + fract = 0.7f; + } + rhs_pane2.set_divider (0, fract); + + if (!settings || !settings->get_property ("mixer-list-hpane-pos", fract) || fract > 1.0) { + fract = 0.2f; + } + list_hpane.set_divider (0, fract); + + if (!settings || !settings->get_property ("mixer-inner-pane-pos", fract) || fract > 1.0) { + fract = 0.8f; } + inner_pane.set_divider (0, fract); rhs_pane1.set_drag_cursor (*PublicEditor::instance().cursors()->expand_up_down); rhs_pane2.set_drag_cursor (*PublicEditor::instance().cursors()->expand_up_down); @@ -348,7 +337,6 @@ Mixer_UI::Mixer_UI () rhs_pane2.show(); strip_packer.show(); inner_pane.show(); - vca_top_padding->show (); vca_scroller.show(); vca_vpacker.show(); vca_hpacker.show(); @@ -383,6 +371,7 @@ Mixer_UI::~Mixer_UI () delete _monitor_section; } delete _plugin_selector; + delete track_menu; } void @@ -391,12 +380,6 @@ Mixer_UI::escape () select_none (); } -void -Mixer_UI::track_editor_selection () -{ - PublicEditor::instance().get_selection().TracksChanged.connect (sigc::mem_fun (*this, &Mixer_UI::follow_editor_selection)); -} - Gtk::Window* Mixer_UI::use_own_window (bool and_fill_it) { @@ -404,14 +387,16 @@ Mixer_UI::use_own_window (bool and_fill_it) Gtk::Window* win = Tabbable::use_own_window (and_fill_it); - 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 (); + if (!win->get_focus()) { + /* set focus widget to something, anything */ + win->set_focus (scroller); + } } return win; @@ -458,7 +443,7 @@ Mixer_UI::remove_master (VCAMasterStrip* vms) for (ri = rows.begin(); ri != rows.end(); ++ri) { if ((*ri)[stripable_columns.strip] == vms) { - PBD::Unwinder uw (_route_deletion_in_progress, true); + PBD::Unwinder uw (_route_deletion_in_progress, true); track_model->erase (ri); break; } @@ -509,7 +494,7 @@ Mixer_UI::add_stripables (StripableList& slist) bool from_scratch = (track_model->children().size() == 0); uint32_t nroutes = 0; - slist.sort (StripablePresentationInfoSorter()); + slist.sort (Stripable::Sorter()); for (Gtk::TreeModel::Children::iterator it = track_model->children().begin(); it != track_model->children().end(); ++it) { boost::shared_ptr s = (*it)[stripable_columns.stripable]; @@ -520,6 +505,7 @@ Mixer_UI::add_stripables (StripableList& slist) nroutes++; + // XXX what does this special case do? if (s->presentation_info().order() == (slist.front()->presentation_info().order() + slist.size())) { insert_iter = it; break; @@ -528,7 +514,6 @@ Mixer_UI::add_stripables (StripableList& slist) MixerStrip* strip; - try { PBD::Unwinder uw (no_track_list_redisplay, true); @@ -576,7 +561,11 @@ Mixer_UI::add_stripables (StripableList& slist) _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)); - monitor_section_attached (); + if (_monitor_section->tearoff().torn_off()) { + monitor_section_detached (); + } else { + monitor_section_attached (); + } route->DropReferences.connect (*this, invalidator(*this), boost::bind (&Mixer_UI::monitor_section_going_away, this), gui_context()); @@ -605,10 +594,6 @@ Mixer_UI::add_stripables (StripableList& slist) row[stripable_columns.stripable] = route; row[stripable_columns.strip] = strip; - if (nroutes != 0) { - _selection.add (strip); - } - } else { out_packer.pack_start (*strip, false, false); @@ -621,7 +606,7 @@ Mixer_UI::add_stripables (StripableList& slist) (*s)->presentation_info().PropertyChanged.connect (*this, invalidator(*this), boost::bind (&Mixer_UI::stripable_property_changed, this, _1, boost::weak_ptr(*s)), gui_context()); (*s)->PropertyChanged.connect (*this, invalidator(*this), boost::bind (&Mixer_UI::stripable_property_changed, this, _1, boost::weak_ptr(*s)), gui_context()); - } + } } catch (const std::exception& e) { error << string_compose (_("Error adding GUI elements for new tracks/busses %1"), e.what()) << endmsg; @@ -629,6 +614,9 @@ Mixer_UI::add_stripables (StripableList& slist) track_display.set_model (track_model); + /* catch up on selection state, which we left to the editor to set */ + sync_treeview_from_presentation_info (PropertyChange (Properties::selected)); + if (!from_scratch) { sync_presentation_info_from_treeview (); } @@ -645,13 +633,9 @@ Mixer_UI::deselect_all_strip_processors () } void -Mixer_UI::select_strip (MixerStrip& ms, bool add) +Mixer_UI::select_all_tracks () { - if (add) { - _selection.add (&ms); - } else { - _selection.set (&ms); - } + PublicEditor::instance().select_all_tracks (); } void @@ -686,15 +670,34 @@ Mixer_UI::remove_strip (MixerStrip* strip) strips.erase (i); } + PBD::Unwinder uwi (ignore_reorder, true); + for (ri = rows.begin(); ri != rows.end(); ++ri) { if ((*ri)[stripable_columns.strip] == strip) { - PBD::Unwinder uw (_route_deletion_in_progress, true); + PBD::Unwinder uw (_route_deletion_in_progress, true); track_model->erase (ri); break; } } } +void +Mixer_UI::presentation_info_changed (PropertyChange const & what_changed) +{ + if (what_changed.contains (Properties::selected)) { + _selection.presentation_info_changed (what_changed); + } + + PropertyChange soh; + soh.add (Properties::selected); + soh.add (Properties::order); + soh.add (Properties::hidden); + + if (what_changed.contains (soh)) { + sync_treeview_from_presentation_info (what_changed); + } +} + void Mixer_UI::sync_presentation_info_from_treeview () { @@ -712,46 +715,55 @@ Mixer_UI::sync_presentation_info_from_treeview () TreeModel::Children::iterator ri; bool change = false; - uint32_t order = 0; + + PresentationInfo::order_t master_key = _session->master_order_key (); + PresentationInfo::order_t order = 0; + + PresentationInfo::ChangeSuspender cs; for (ri = rows.begin(); ri != rows.end(); ++ri) { bool visible = (*ri)[stripable_columns.visible]; boost::shared_ptr stripable = (*ri)[stripable_columns.stripable]; +#ifndef NDEBUG // these should not exist in the mixer's treeview if (!stripable) { + assert (0); continue; } - - /* Monitor and Auditioner do not get their presentation - * info reset here. - */ - if (stripable->is_monitor() || stripable->is_auditioner()) { + assert (0); continue; } - - /* Master also doesn't get set here but since the editor allows - * it to be reordered, we need to preserve its ordering. - */ + if (stripable->is_master()) { + assert (0); + continue; + } +#endif stripable->presentation_info().set_hidden (!visible); + // leave master where it is. + if (order == master_key) { + ++order; + } + if (order != stripable->presentation_info().order()) { - stripable->set_presentation_order (order, false); + stripable->set_presentation_order (order); change = true; } - ++order; } + change |= _session->ensure_stripable_sort_order (); + if (change) { DEBUG_TRACE (DEBUG::OrderKeys, "... notify PI change from mixer GUI\n"); - _session->notify_presentation_info_change (); + _session->set_dirty(); } } void -Mixer_UI::sync_treeview_from_presentation_info () +Mixer_UI::sync_treeview_from_presentation_info (PropertyChange const & what_changed) { if (!_session || _session->deletion_in_progress()) { return; @@ -773,21 +785,20 @@ Mixer_UI::sync_treeview_from_presentation_info () return; } - OrderingKeys sorted; - + TreeOrderKeys sorted; for (TreeModel::Children::iterator ri = rows.begin(); ri != rows.end(); ++ri, ++old_order) { boost::shared_ptr stripable = (*ri)[stripable_columns.stripable]; - sorted.push_back (OrderKeys (old_order, stripable->presentation_info().order())); + sorted.push_back (TreeOrderKey (old_order, stripable)); } - SortByNewDisplayOrder cmp; + TreeOrderKeySorter cmp; sort (sorted.begin(), sorted.end(), cmp); neworder.assign (sorted.size(), 0); uint32_t n = 0; - for (OrderingKeys::iterator sr = sorted.begin(); sr != sorted.end(); ++sr, ++n) { + for (TreeOrderKeys::iterator sr = sorted.begin(); sr != sorted.end(); ++sr, ++n) { neworder[n] = sr->old_display_order; @@ -801,35 +812,25 @@ Mixer_UI::sync_treeview_from_presentation_info () track_model->reorder (neworder); } - redisplay_track_list (); -} - -void -Mixer_UI::follow_editor_selection () -{ - if (_following_editor_selection) { - return; - } - - _following_editor_selection = true; - _selection.block_routes_changed (true); - - TrackSelection& s (PublicEditor::instance().get_selection().tracks); + if (what_changed.contains (Properties::selected)) { - _selection.clear_routes (); + PresentationInfo::ChangeSuspender cs; - for (TrackViewList::iterator i = s.begin(); i != s.end(); ++i) { - TimeAxisView* tav = dynamic_cast (*i); - if (tav) { - AxisView* axis = axis_by_stripable (tav->stripable()); - if (axis) { - _selection.add (axis); + for (list::const_iterator i = strips.begin(); i != strips.end(); ++i) { + boost::shared_ptr stripable = (*i)->stripable(); + if (stripable && stripable->is_selected()) { + _selection.add (*i); + } else { + _selection.remove (*i); } } + + if (!_selection.axes.empty() && !PublicEditor::instance().track_selection_change_without_scroll ()) { + move_stripable_into_view ((*_selection.axes.begin())->stripable()); + } } - _following_editor_selection = false; - _selection.block_routes_changed (false); + redisplay_track_list (); } @@ -845,8 +846,20 @@ Mixer_UI::strip_by_route (boost::shared_ptr r) const return 0; } +MixerStrip* +Mixer_UI::strip_by_stripable (boost::shared_ptr s) const +{ + for (list::const_iterator i = strips.begin(); i != strips.end(); ++i) { + if ((*i)->stripable() == s) { + return (*i); + } + } + + return 0; +} + AxisView* -Mixer_UI::axis_by_stripable (boost::shared_ptr s) const +Mixer_UI::axis_view_by_stripable (boost::shared_ptr s) const { for (list::const_iterator i = strips.begin(); i != strips.end(); ++i) { if ((*i)->stripable() == s) { @@ -857,6 +870,27 @@ Mixer_UI::axis_by_stripable (boost::shared_ptr s) const return 0; } +AxisView* +Mixer_UI::axis_view_by_control (boost::shared_ptr c) const +{ + for (list::const_iterator i = strips.begin(); i != strips.end(); ++i) { + if ((*i)->control() == c) { + return (*i); + } + } + + return 0; +} + +struct MixerStripSorter { + bool operator() (const MixerStrip* ms_a, const MixerStrip* ms_b) + { + boost::shared_ptr const& a = ms_a->stripable (); + boost::shared_ptr const& b = ms_b->stripable (); + return ARDOUR::Stripable::Sorter(true)(a, b); + } +}; + bool Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip) { @@ -864,14 +898,14 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip) if (_selection.selected (strip)) { /* primary-click: toggle selection state of strip */ if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - _selection.remove (strip); + _selection.remove (strip, true); } else if (_selection.axes.size() > 1) { /* de-select others */ _selection.set (strip); } } else { if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - _selection.add (strip); + _selection.add (strip, true); } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::RangeSelectModifier)) { /* extend selection */ @@ -880,10 +914,13 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip) bool accumulate = false; bool found_another = false; - tmp.push_back (strip); + strips.sort (MixerStripSorter()); for (list::iterator i = strips.begin(); i != strips.end(); ++i) { - if ((*i) == strip) { + MixerStrip* ms = *i; + assert (ms); + + if (ms == strip) { /* hit clicked strip, start accumulating till we hit the first selected strip */ @@ -893,7 +930,7 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip) } else { accumulate = true; } - } else if (_selection.selected (*i)) { + } else if (_selection.selected (ms)) { /* hit selected strip. if currently accumulating others, we're done. if not accumulating others, start doing so. */ @@ -906,17 +943,21 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip) } } else { if (accumulate) { - tmp.push_back (*i); + tmp.push_back (ms); } } } + tmp.push_back (strip); + if (found_another) { + PresentationInfo::ChangeSuspender cs; for (vector::iterator i = tmp.begin(); i != tmp.end(); ++i) { - _selection.add (*i); + _selection.add (*i, true); } - } else + } else { _selection.set (strip); //user wants to start a range selection, but there aren't any others selected yet + } } else { _selection.set (strip); } @@ -937,7 +978,12 @@ Mixer_UI::set_session (Session* sess) _group_tabs->set_session (sess); + if (_monitor_section) { + _monitor_section->set_session (_session); + } + if (!_session) { + _selection.clear (); return; } @@ -967,6 +1013,13 @@ Mixer_UI::set_session (Session* sess) if (_visible) { show_window(); } + + /* catch up on selection state, etc. */ + + PropertyChange sc; + sc.add (Properties::selected); + _selection.presentation_info_changed (sc); + start_updating (); } @@ -1086,15 +1139,15 @@ Mixer_UI::hide_strip (MixerStrip* ms) gint Mixer_UI::start_updating () { - fast_screen_update_connection = Timers::super_rapid_connect (sigc::mem_fun(*this, &Mixer_UI::fast_update_strips)); - return 0; + fast_screen_update_connection = Timers::super_rapid_connect (sigc::mem_fun(*this, &Mixer_UI::fast_update_strips)); + return 0; } gint Mixer_UI::stop_updating () { - fast_screen_update_connection.disconnect(); - return 0; + fast_screen_update_connection.disconnect(); + return 0; } void @@ -1256,20 +1309,31 @@ Mixer_UI::track_list_delete (const Gtk::TreeModel::Path&) DEBUG_TRACE (DEBUG::OrderKeys, "mixer UI treeview row deleted\n"); sync_presentation_info_from_treeview (); - if (_route_deletion_in_progress) { - redisplay_track_list (); - } + if (_route_deletion_in_progress) { + redisplay_track_list (); + } } void Mixer_UI::spill_redisplay (boost::shared_ptr vca) { TreeModel::Children rows = track_model->children(); + std::list > vcas; + vcas.push_back (vca); + + for (TreeModel::Children::const_iterator i = rows.begin(); i != rows.end(); ++i) { + AxisView* av = (*i)[stripable_columns.strip]; + VCAMasterStrip* vms = dynamic_cast (av); + if (vms && vms->vca()->slaved_to (vca)) { + vcas.push_back (vms->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]; MixerStrip* strip = dynamic_cast (av); + bool const visible = (*i)[stripable_columns.visible]; if (!strip) { /* we're in the middle of changing a row, don't worry */ @@ -1285,7 +1349,15 @@ Mixer_UI::spill_redisplay (boost::shared_ptr vca) continue; } - if (strip->route()->slaved_to (vca)) { + bool slaved = false; + for (std::list >::const_iterator m = vcas.begin(); m != vcas.end(); ++m) { + if (strip->route()->slaved_to (*m)) { + slaved = true; + break; + } + } + + if (slaved && visible) { if (strip->packed()) { strip_packer.reorder_child (*strip, -1); /* put at end */ @@ -1311,11 +1383,13 @@ Mixer_UI::redisplay_track_list () return; } - boost::shared_ptr sv = spilled_vca.lock (); - - if (sv) { - spill_redisplay (sv); - return; + boost::shared_ptr ss = spilled_strip.lock (); + if (ss) { + boost::shared_ptr sv = boost::dynamic_pointer_cast (ss); + if (sv) { + spill_redisplay (sv); + return; + } } TreeModel::Children rows = track_model->children(); @@ -1460,24 +1534,17 @@ Mixer_UI::initial_track_display () add_stripables (sl); } - redisplay_track_list (); -} - -void -Mixer_UI::show_track_list_menu () -{ - if (track_menu == 0) { - build_track_menu (); - } - - track_menu->popup (1, gtk_get_current_event_time()); + sync_treeview_from_presentation_info (Properties::order); } bool Mixer_UI::track_display_button_press (GdkEventButton* ev) { if (Keyboard::is_context_menu_event (ev)) { - show_track_list_menu (); + if (track_menu == 0) { + build_track_menu (); + } + track_menu->popup (ev->button, ev->time); return true; } if ((ev->type == GDK_BUTTON_PRESS) && (ev->button == 1)) { @@ -1502,13 +1569,23 @@ Mixer_UI::move_stripable_into_view (boost::shared_ptr 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; + Gtk::Allocation alloc; for (list::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); + alloc = (*i)->get_allocation (); break; } } @@ -1517,9 +1594,13 @@ Mixer_UI::move_stripable_into_view (boost::shared_ptr s) } Adjustment* adj = scroller.get_hscrollbar()->get_adjustment(); - int sl = adj->get_value(); - int sr = sl + scroller.get_width(); - scroller.get_hscrollbar()->set_value (max (adj->get_lower(), min (adj->get_upper(), x0 - 1.0))); + + if (x0 < adj->get_value()) { + adj->set_value (max (adj->get_lower(), min (adj->get_upper(), (double) x0))); + } else if (x0 + alloc.get_width() >= adj->get_value() + adj->get_page_size()) { + int x1 = x0 + alloc.get_width() - adj->get_page_size(); + adj->set_value (max (adj->get_lower(), min (adj->get_upper(), (double) x1))); + } } void @@ -1577,6 +1658,10 @@ Mixer_UI::stripable_property_changed (const PropertyChange& what_changed, boost: } } + if (s->is_master ()) { + return; + } + error << _("track display list item for renamed strip not found!") << endmsg; } @@ -1589,13 +1674,17 @@ Mixer_UI::group_display_button_press (GdkEventButton* ev) int celly; if (!group_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) { - _group_tabs->get_menu(0)->popup (1, ev->time); + if (ev->button == 3) { + _group_tabs->get_menu(0)->popup (ev->button, ev->time); + } return true; } TreeIter iter = group_model->get_iter (path); if (!iter) { - _group_tabs->get_menu(0)->popup (1, ev->time); + if (ev->button == 3) { + _group_tabs->get_menu(0)->popup (ev->button, ev->time); + } return true; } @@ -1973,27 +2062,21 @@ private: int Mixer_UI::set_state (const XMLNode& node, int version) { - XMLProperty const * prop; - LocaleGuard lg; + bool yn; Tabbable::set_state (node, version); - if ((prop = node.property ("narrow-strips"))) { - if (string_is_affirmative (prop->value())) { + if (node.get_property ("narrow-strips", yn)) { + if (yn) { set_strip_width (Narrow); } else { set_strip_width (Wide); } } - if ((prop = node.property ("show-mixer"))) { - if (string_is_affirmative (prop->value())) { - _visible = true; - } - } + node.get_property ("show-mixer", _visible); - if ((prop = node.property ("maximised"))) { - bool yn = string_is_affirmative (prop->value()); + if (node.get_property ("maximised", yn)) { Glib::RefPtr act = ActionManager::get_action (X_("Common"), X_("ToggleMaximalMixer")); assert (act); Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); @@ -2003,8 +2086,7 @@ Mixer_UI::set_state (const XMLNode& node, int version) } } - if ((prop = node.property ("show-mixer-list"))) { - bool yn = string_is_affirmative (prop->value()); + if (node.get_property ("show-mixer-list", yn)) { Glib::RefPtr act = ActionManager::get_action (X_("Common"), X_("ToggleMixerList")); assert (act); Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); @@ -2014,6 +2096,14 @@ Mixer_UI::set_state (const XMLNode& node, int version) tact->set_active (yn); } + if (node.get_property ("monitor-section-visible", yn)) { + Glib::RefPtr act = ActionManager::get_action ("Common", "ToggleMonitorSection"); + Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); + /* do it twice to force the change */ + tact->set_active (yn); + show_monitor_section (yn); + } + XMLNode* plugin_order; if ((plugin_order = find_named_node (node, "PluginOrder")) != 0) { @@ -2022,11 +2112,11 @@ Mixer_UI::set_state (const XMLNode& node, int version) const XMLNodeList& kids = plugin_order->children("PluginInfo"); XMLNodeConstIterator i; for (i = kids.begin(); i != kids.end(); ++i) { - if ((prop = (*i)->property ("unique-id"))) { - std::string unique_id = prop->value(); + std::string unique_id; + if ((*i)->get_property ("unique-id", unique_id)) { order.push_back (unique_id); - if ((prop = (*i)->property ("expanded"))) { - favorite_ui_state[unique_id] = string_is_affirmative (prop->value()); + if ((*i)->get_property ("expanded", yn)) { + favorite_ui_state[unique_id] = yn; } } } @@ -2041,34 +2131,33 @@ XMLNode& Mixer_UI::get_state () { XMLNode* node = new XMLNode (X_("Mixer")); - char buf[128]; - LocaleGuard lg; node->add_child_nocopy (Tabbable::get_state()); - snprintf(buf,sizeof(buf), "%f", rhs_pane1.get_divider()); - node->add_property(X_("mixer-rhs-pane1-pos"), string(buf)); - snprintf(buf,sizeof(buf), "%f", rhs_pane2.get_divider()); - node->add_property(X_("mixer-rhs_pane2-pos"), string(buf)); - snprintf(buf,sizeof(buf), "%f", list_hpane.get_divider()); - node->add_property(X_("mixer-list-hpane-pos"), string(buf)); - snprintf(buf,sizeof(buf), "%f", inner_pane.get_divider()); - node->add_property(X_("mixer-inner-pane-pos"), string(buf)); + node->set_property (X_("mixer-rhs-pane1-pos"), rhs_pane1.get_divider()); + node->set_property (X_("mixer-rhs_pane2-pos"), rhs_pane2.get_divider()); + node->set_property (X_("mixer-list-hpane-pos"), list_hpane.get_divider()); + node->set_property (X_("mixer-inner-pane-pos"), inner_pane.get_divider()); - node->add_property ("narrow-strips", _strip_width == Narrow ? "yes" : "no"); - node->add_property ("show-mixer", _visible ? "yes" : "no"); - node->add_property ("show-mixer-list", _show_mixer_list ? "yes" : "no"); - node->add_property ("maximised", _maximised ? "yes" : "no"); + node->set_property ("narrow-strips", (_strip_width == Narrow)); + node->set_property ("show-mixer", _visible); + node->set_property ("show-mixer-list", _show_mixer_list); + node->set_property ("maximised", _maximised); + + Glib::RefPtr act = ActionManager::get_action ("Common", "ToggleMonitorSection"); + Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); + assert (tact); + node->set_property ("monitor-section-visible", tact->get_active ()); store_current_favorite_order (); XMLNode* plugin_order = new XMLNode ("PluginOrder"); - int cnt = 0; + uint32_t cnt = 0; for (PluginInfoList::const_iterator i = favorite_order.begin(); i != favorite_order.end(); ++i, ++cnt) { XMLNode* p = new XMLNode ("PluginInfo"); - p->add_property ("sort", cnt); - p->add_property ("unique-id", (*i)->unique_id); + p->set_property ("sort", cnt); + p->set_property ("unique-id", (*i)->unique_id); if (favorite_ui_state.find ((*i)->unique_id) != favorite_ui_state.end ()) { - p->add_property ("expanded", favorite_ui_state[(*i)->unique_id]); + p->set_property ("expanded", favorite_ui_state[(*i)->unique_id]); } plugin_order->add_child_nocopy (*p); } @@ -2169,10 +2258,6 @@ Mixer_UI::parameter_changed (string const & p) for (list::iterator i = strips.begin(); i != strips.end(); ++i) { (*i)->set_width_enum (s ? Narrow : Wide, this); } - } else if (p == "use-monitor-bus") { - if (_session && !_session->monitor_out()) { - monitor_section_detached (); - } } } @@ -2321,6 +2406,22 @@ void Mixer_UI::monitor_section_going_away () { if (_monitor_section) { + XMLNode* ui_node = Config->extra_xml(X_("UI")); + /* immediate state save. + * + * Tearoff settings are otherwise only stored during + * save_ardour_state(). The mon-section may or may not + * exist at that point. + * */ + if (ui_node) { + XMLNode* tearoff_node = ui_node->child (X_("Tearoffs")); + if (tearoff_node) { + tearoff_node->remove_nodes_and_delete (X_("monitor-section")); + XMLNode* t = new XMLNode (X_("monitor-section")); + _monitor_section->tearoff().add_state (*t); + tearoff_node->add_child_nocopy (*t); + } + } monitor_section_detached (); out_packer.remove (_monitor_section->tearoff()); _monitor_section->set_session (0); @@ -2385,7 +2486,7 @@ Mixer_UI::monitor_section_attached () Glib::RefPtr act = ActionManager::get_action ("Common", "ToggleMonitorSection"); Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); act->set_sensitive (true); - tact->set_active (); + show_monitor_section (tact->get_active ()); } void @@ -2471,6 +2572,9 @@ Mixer_UI::refill_favorite_plugins () #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 @@ -2777,13 +2881,13 @@ Mixer_UI::do_vca_unassign (boost::shared_ptr vca) } void -Mixer_UI::show_vca_slaves (boost::shared_ptr vca) +Mixer_UI::show_spill (boost::shared_ptr s) { - boost::shared_ptr v = spilled_vca.lock(); - if (v != vca) { - spilled_vca = vca; - show_vca_change (vca); /* EMIT SIGNAL */ - if (vca) { + boost::shared_ptr 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 (); @@ -2793,9 +2897,15 @@ Mixer_UI::show_vca_slaves (boost::shared_ptr vca) } bool -Mixer_UI::showing_vca_slaves_for (boost::shared_ptr vca) const +Mixer_UI::showing_spill_for (boost::shared_ptr s) const +{ + return s == spilled_strip.lock(); +} + +void +Mixer_UI::show_editor_window () const { - return vca == spilled_vca.lock(); + PublicEditor::instance().make_visible (); } void @@ -2803,6 +2913,8 @@ Mixer_UI::register_actions () { Glib::RefPtr group = myactions.create_action_group (X_("Mixer")); + myactions.register_action (group, "show-editor", _("Show Editor"), sigc::mem_fun (*this, &Mixer_UI::show_editor_window)); + 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)); @@ -2819,9 +2931,10 @@ Mixer_UI::register_actions () 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, "select-all-tracks", _("Select All Tracks"), sigc::mem_fun (*this, &Mixer_UI::select_all_tracks)); 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)); @@ -2878,29 +2991,44 @@ Mixer_UI::rec_enable_action () control_action (&Stripable::rec_enable_control); } -void -Mixer_UI::step_gain_up_action () +AutomationControlSet +Mixer_UI::selected_gaincontrols () { set_axis_targets_for_operation (); - + AutomationControlSet rv; BOOST_FOREACH(AxisView* r, _axis_targets) { MixerStrip* ms = dynamic_cast (r); if (ms) { - ms->step_gain_up (); + boost::shared_ptr ac (ms->route()->gain_control()); + ControlList cl (ac->grouped_controls()); + for (ControlList::const_iterator c = cl.begin(); c != cl.end (); ++c) { + rv.insert (*c); + } + rv.insert (ac); } } + return rv; } void -Mixer_UI::step_gain_down_action () +Mixer_UI::step_gain_up_action () { - set_axis_targets_for_operation (); + AutomationControlSet acs = selected_gaincontrols (); + for (AutomationControlSet::const_iterator i = acs.begin(); i != acs.end (); ++i) { + boost::shared_ptr ac = boost::dynamic_pointer_cast (*i); + assert (ac); + ac->set_value (dB_to_coefficient (accurate_coefficient_to_dB (ac->get_value()) + 0.1), Controllable::NoGroup); + } +} - BOOST_FOREACH(AxisView* r, _axis_targets) { - MixerStrip* ms = dynamic_cast (r); - if (ms) { - ms->step_gain_down (); - } +void +Mixer_UI::step_gain_down_action () +{ + AutomationControlSet acs = selected_gaincontrols (); + for (AutomationControlSet::const_iterator i = acs.begin(); i != acs.end (); ++i) { + boost::shared_ptr ac = boost::dynamic_pointer_cast (*i); + assert (ac); + ac->set_value (dB_to_coefficient (accurate_coefficient_to_dB (ac->get_value()) - 0.1), Controllable::NoGroup); } } @@ -2997,26 +3125,22 @@ void Mixer_UI::vca_assign (boost::shared_ptr vca) { set_axis_targets_for_operation (); -#if 0 BOOST_FOREACH(AxisView* r, _axis_targets) { MixerStrip* ms = dynamic_cast (r); if (ms) { ms->vca_assign (vca); } } -#endif } void Mixer_UI::vca_unassign (boost::shared_ptr vca) { set_axis_targets_for_operation (); -#if 0 BOOST_FOREACH(AxisView* r, _axis_targets) { MixerStrip* ms = dynamic_cast (r); if (ms) { ms->vca_unassign (vca); } } -#endif }