#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"
, _maximised (false)
, _show_mixer_list (true)
, myactions (X_("mixer"))
+ , _selection (*this, *this)
{
register_actions ();
load_bindings ();
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<Stripable> s = (*it)[stripable_columns.stripable];
nroutes++;
+ // XXX what does this special case do?
if (s->presentation_info().order() == (slist.front()->presentation_info().order() + slist.size())) {
insert_iter = it;
break;
_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());
}
}
-void
-Mixer_UI::select_strip (MixerStrip& ms, bool add)
-{
- if (add) {
- _selection.add (&ms);
- } else {
- _selection.set (&ms);
- }
-}
-
void
Mixer_UI::select_none ()
{
strips.erase (i);
}
+ PBD::Unwinder<bool> uwi (ignore_reorder, true);
+
for (ri = rows.begin(); ri != rows.end(); ++ri) {
if ((*ri)[stripable_columns.strip] == strip) {
PBD::Unwinder<bool> uw (_route_deletion_in_progress, true);
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);
TreeModel::Children::iterator ri;
bool change = false;
- uint32_t order = 0;
- OrderingKeys sorted;
- const size_t cmp_max = rows.size ();
+ PresentationInfo::order_t master_key = _session->master_order_key ();
+ PresentationInfo::order_t order = 0;
+ uint32_t count = 0;
- // 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++;
- }
+ TreeOrderKeys sorted;
PresentationInfo::ChangeSuspender cs;
bool visible = (*ri)[stripable_columns.visible];
boost::shared_ptr<Stripable> 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);
- // master may not get set here, but if it is zero keep it there
- if (stripable->is_master() && (stripable->presentation_info().order() == 0)) {
- continue;
+ // leave master where it is.
+ if (order == master_key) {
+ ++order;
}
if (order != stripable->presentation_info().order()) {
change = true;
}
- sorted.push_back (OrderKeys (order, stripable, cmp_max));
-
+ sorted.push_back (TreeOrderKey (count, stripable));
++order;
+ ++count;
}
- 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 (_session->master_out() && (_session->master_out()->presentation_info().order() == n)) {
- ++n;
- }
- if (sr->old_display_order != n) {
- change = true;
- break;
- }
- }
- if (change) {
- n = 0;
- for (OrderingKeys::iterator sr = sorted.begin(); sr != sorted.end(); ++sr, ++n) {
- if (_session->master_out() && (_session->master_out()->presentation_info().order() == n)) {
- ++n;
- }
- if (sr->stripable->presentation_info().order() != n) {
- sr->stripable->set_presentation_order (n);
- }
- }
- }
- }
+ change |= _session->ensure_stripable_sort_order ();
if (change) {
DEBUG_TRACE (DEBUG::OrderKeys, "... notify PI change from mixer GUI\n");
return;
}
- OrderingKeys sorted;
- const size_t cmp_max = rows.size ();
-
+ TreeOrderKeys sorted;
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, cmp_max));
+ 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;
for (list<MixerStrip *>::const_iterator i = strips.begin(); i != strips.end(); ++i) {
boost::shared_ptr<Stripable> stripable = (*i)->stripable();
- if (stripable && stripable->presentation_info().selected()) {
+ if (stripable && stripable->is_selected()) {
_selection.add (*i);
} else {
_selection.remove (*i);
}
AxisView*
-Mixer_UI::axis_by_stripable (boost::shared_ptr<Stripable> s) const
+Mixer_UI::axis_view_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 0;
}
+AxisView*
+Mixer_UI::axis_view_by_control (boost::shared_ptr<AutomationControl> c) const
+{
+ for (list<MixerStrip *>::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<ARDOUR::Stripable> const& a = ms_a->stripable ();
+ boost::shared_ptr<ARDOUR::Stripable> const& b = ms_b->stripable ();
+ return ARDOUR::Stripable::Sorter(true)(a, b);
+ }
+};
+
bool
Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
{
bool accumulate = false;
bool found_another = false;
- OrderingKeys sorted;
- const size_t cmp_max = strips.size ();
- for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
- sorted.push_back (OrderKeys (-1, (*i)->stripable(), cmp_max));
- }
- SortByNewDisplayOrder cmp;
- sort (sorted.begin(), sorted.end(), cmp);
+ strips.sort (MixerStripSorter());
- for (OrderingKeys::iterator sr = sorted.begin(); sr != sorted.end(); ++sr) {
- MixerStrip* ms = strip_by_stripable (sr->stripable);
+ for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
+ MixerStrip* ms = *i;
assert (ms);
if (ms == strip) {
}
if (!_session) {
+ _selection.clear ();
return;
}
if (_visible) {
show_window();
}
+
+ /* catch up on selection state, etc. */
+
+ PropertyChange sc;
+ sc.add (Properties::selected);
+ _selection.presentation_info_changed (sc);
+
start_updating ();
}
}
}
+ if (s->is_master ()) {
+ return;
+ }
+
error << _("track display list item for renamed strip not found!") << endmsg;
}
tact->set_active (yn);
}
+ if (node.get_property ("monitor-section-visible", yn)) {
+ Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMonitorSection");
+ Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::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) {
node->set_property ("show-mixer-list", _show_mixer_list);
node->set_property ("maximised", _maximised);
+ Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMonitorSection");
+ Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+ assert (tact);
+ node->set_property ("monitor-section-visible", tact->get_active ());
+
store_current_favorite_order ();
XMLNode* plugin_order = new XMLNode ("PluginOrder");
uint32_t cnt = 0;
for (list<MixerStrip*>::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 ();
- }
}
}
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);
Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMonitorSection");
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
act->set_sensitive (true);
- tact->set_active ();
+ show_monitor_section (tact->get_active ());
}
void
projects / ardour.git / blobdiff