Prepare generic spill ([mix]busses)

[ardour.git] / gtk2_ardour / mixer_ui.cc

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 340a5a55ec96ea28f920afc3cfd1ff93a5e32456..4f87e04c7a1fd90cfd62d5351b6d2796c330c5e1 100644 (file)
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -142,6 +142,7 @@ Mixer_UI::Mixer_UI ()
        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);
@@ -253,15 +254,7 @@ Mixer_UI::Mixer_UI ()
 
        list_vpacker.pack_start (rhs_pane2, true, true);
 
-       string vca_text = _("Control Masters");
-       vca_label.set_text (vca_text);
        vca_label_bar.set_size_request (-1, 16 + 1); /* must match height in GroupTabs::set_size_request()  + 1 border px*/
-
-#ifndef MIXBUS
-       vca_label_bar.set_name (X_("VCALabelBar"));
-       vca_label_bar.add (vca_label);
-#endif
-
        vca_vpacker.pack_start (vca_label_bar, false, false);
 
        vca_scroller_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
@@ -284,6 +277,7 @@ 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();
@@ -407,7 +401,6 @@ Mixer_UI::use_own_window (bool 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 ();
@@ -713,6 +706,9 @@ Mixer_UI::sync_presentation_info_from_treeview ()
        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++;
@@ -750,9 +746,23 @@ Mixer_UI::sync_presentation_info_from_treeview ()
                        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 ();
@@ -784,10 +794,11 @@ Mixer_UI::sync_treeview_from_presentation_info ()
        }
 
        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;
@@ -1279,8 +1290,18 @@ void
 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);
@@ -1299,7 +1320,15 @@ Mixer_UI::spill_redisplay (boost::shared_ptr<VCA> vca)
                        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 */
@@ -1325,11 +1354,13 @@ Mixer_UI::redisplay_track_list ()
                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();
@@ -1475,6 +1506,7 @@ Mixer_UI::initial_track_display ()
        }
 
        redisplay_track_list ();
+       sync_treeview_from_presentation_info ();
 }
 
 void
@@ -2800,13 +2832,13 @@ Mixer_UI::do_vca_unassign (boost::shared_ptr<VCA> vca)
 }
 
 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 ();
@@ -2816,9 +2848,9 @@ Mixer_UI::show_vca_slaves (boost::shared_ptr<VCA> vca)
 }
 
 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