#include <gtkmm/accelmap.h>
#include "pbd/convert.h"
-#include "pbd/stacktrace.h"
-#include <glibmm/thread.h>
+#include "pbd/unwind.h"
+
+#include <glibmm/threads.h>
#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/tearoff.h>
#include <gtkmm2ext/window_title.h>
+#include "ardour/debug.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 "keyboard.h"
#include "ardour_ui.h"
#include "prompter.h"
#include "utils.h"
+#include "route_sorter.h"
#include "actions.h"
#include "gui_thread.h"
#include "mixer_group_tabs.h"
#include "i18n.h"
using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
using namespace PBD;
using namespace Gtk;
using namespace Glib;
using namespace std;
using PBD::atoi;
+using PBD::Unwinder;
Mixer_UI* Mixer_UI::_instance = 0;
Mixer_UI::Mixer_UI ()
: Window (Gtk::WINDOW_TOPLEVEL)
+ , VisibilityTracker (*((Gtk::Window*) this))
+ , _visible (false)
+ , no_track_list_redisplay (false)
+ , in_group_row_change (false)
+ , track_menu (0)
+ , _monitor_section (0)
+ , _strip_width (ARDOUR_UI::config()->get_default_narrow_ms() ? Narrow : Wide)
+ , ignore_reorder (false)
+ , _in_group_rebuild_or_clear (false)
+ , _route_deletion_in_progress (false)
, _following_editor_selection (false)
+ , _maximised (false)
{
/* allow this window to become the key focus window */
set_flags (CAN_FOCUS);
- _strip_width = Config->get_default_narrow_ms() ? Narrow : Wide;
- track_menu = 0;
- _monitor_section = 0;
- no_track_list_redisplay = false;
- in_group_row_change = false;
- _visible = false;
- strip_redisplay_does_not_reset_order_keys = false;
- strip_redisplay_does_not_sync_order_keys = false;
- ignore_sync = false;
+ Route::SyncOrderKeys.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::sync_treeview_from_order_keys, this), gui_context());
- Route::SyncOrderKeys.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::sync_order_keys, this, _1), gui_context());
+ scroller.set_can_default (true);
+ set_default (scroller);
scroller_base.set_flags (Gtk::CAN_FOCUS);
scroller_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
b->show_all ();
scroller.add (*b);
- scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ scroller.set_policy (Gtk::POLICY_ALWAYS, Gtk::POLICY_AUTOMATIC);
setup_track_display ();
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.set_name ("MixerGroupList");
+ group_display.set_name ("EditGroupList");
group_display.get_selection()->set_mode (Gtk::SELECTION_SINGLE);
group_display.set_reorderable (true);
group_display.set_headers_visible (true);
list_hpane.show();
group_display.show();
- _in_group_rebuild_or_clear = false;
-
MixerStrip::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::remove_strip, this, _1), gui_context());
- MonitorSection::setup_knob_images ();
-
#ifndef DEFER_PLUGIN_SELECTOR_LOAD
_plugin_selector = new PluginSelector (PluginManager::instance ());
#endif
ms = (*ri)[track_columns.strip];
ms->set_width_enum (ms->get_width_enum (), ms->width_owner());
/* Fix visibility of mixer strip stuff */
- ms->parameter_changed (X_("mixer-strip-visibility"));
+ ms->parameter_changed (X_("mixer-element-visibility"));
}
}
void
-Mixer_UI::add_strip (RouteList& routes)
+Mixer_UI::add_strips (RouteList& routes)
{
- ENSURE_GUI_THREAD (*this, &Mixer_UI::add_strip, routes)
-
- MixerStrip* strip;
-
- no_track_list_redisplay = true;
- strip_redisplay_does_not_sync_order_keys = true;
+ bool from_scratch = track_model->children().size() == 0;
+ Gtk::TreeModel::Children::iterator insert_iter = track_model->children().end();
- for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
- boost::shared_ptr<Route> route = (*x);
+ 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];
- if (route->is_hidden()) {
- continue;
+ if (r->order_key() == (routes.front()->order_key() + routes.size())) {
+ insert_iter = it;
+ break;
}
+ }
- if (route->is_monitor()) {
-
- if (!_monitor_section) {
- _monitor_section = new MonitorSection (_session);
-
- XMLNode* mnode = ARDOUR_UI::instance()->tearoff_settings (X_("monitor-section"));
- if (mnode) {
- _monitor_section->tearoff().set_state (*mnode);
- }
- }
-
- out_packer.pack_end (_monitor_section->tearoff(), false, false);
- _monitor_section->set_session (_session);
- _monitor_section->tearoff().show_all ();
-
- route->DropReferences.connect (*this, invalidator(*this), boost::bind (&Mixer_UI::monitor_section_going_away, this), gui_context());
-
- /* no regular strip shown for control out */
-
- continue;
- }
-
- strip = new MixerStrip (*this, _session, route);
- strips.push_back (strip);
-
- Config->get_default_narrow_ms() ? _strip_width = Narrow : _strip_width = Wide;
-
- if (strip->width_owner() != strip) {
- strip->set_width_enum (_strip_width, this);
- }
+ if(!from_scratch) {
+ _selection.clear_routes ();
+ }
- show_strip (strip);
+ MixerStrip* strip;
- TreeModel::Row row = *(track_model->append());
- 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;
+ try {
+ no_track_list_redisplay = true;
+ track_display.set_model (Glib::RefPtr<ListStore>());
- if (route->order_key (N_("signal")) == -1) {
- route->set_order_key (N_("signal"), track_model->children().size()-1);
+ for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
+ boost::shared_ptr<Route> route = (*x);
+
+ if (route->is_auditioner()) {
+ continue;
+ }
+
+ if (route->is_monitor()) {
+
+ if (!_monitor_section) {
+ _monitor_section = new MonitorSection (_session);
+
+ XMLNode* mnode = ARDOUR_UI::instance()->tearoff_settings (X_("monitor-section"));
+ if (mnode) {
+ _monitor_section->tearoff().set_state (*mnode);
+ }
+ }
+
+ out_packer.pack_end (_monitor_section->tearoff(), false, false);
+ _monitor_section->set_session (_session);
+ _monitor_section->tearoff().show_all ();
+
+ route->DropReferences.connect (*this, invalidator(*this), boost::bind (&Mixer_UI::monitor_section_going_away, this), gui_context());
+
+ /* no regular strip shown for control out */
+
+ continue;
+ }
+
+ strip = new MixerStrip (*this, _session, route);
+ strips.push_back (strip);
+
+ ARDOUR_UI::config()->get_default_narrow_ms() ? _strip_width = Narrow : _strip_width = Wide;
+
+ if (strip->width_owner() != strip) {
+ strip->set_width_enum (_strip_width, this);
+ }
+
+ show_strip (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;
+
+ if (!from_scratch) {
+ _selection.add (strip);
+ }
+
+ route->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::strip_property_changed, this, _1, strip), gui_context());
+
+ 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));
}
- route->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::strip_property_changed, this, _1, strip), gui_context());
-
- 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));
+ } catch (...) {
}
no_track_list_redisplay = false;
-
+ track_display.set_model (track_model);
+
+ sync_order_keys_from_treeview ();
redisplay_track_list ();
+}
- strip_redisplay_does_not_sync_order_keys = false;
+void
+Mixer_UI::deselect_all_strip_processors ()
+{
+ for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
+ (*i)->deselect_all_processors();
+ }
+}
+
+void
+Mixer_UI::select_none ()
+{
+ _selection.clear_routes();
+ deselect_all_strip_processors();
+}
+
+void
+Mixer_UI::delete_processors ()
+{
+ for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
+ (*i)->delete_processors();
+ }
}
+
void
Mixer_UI::remove_strip (MixerStrip* strip)
{
strips.erase (i);
}
- strip_redisplay_does_not_sync_order_keys = true;
-
for (ri = rows.begin(); ri != rows.end(); ++ri) {
if ((*ri)[track_columns.strip] == strip) {
+ PBD::Unwinder<bool> uw (_route_deletion_in_progress, true);
track_model->erase (ri);
break;
}
}
-
- strip_redisplay_does_not_sync_order_keys = false;
}
void
-Mixer_UI::sync_order_keys (string const & src)
+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) {
+ boost::shared_ptr<Route> route = (*ri)[track_columns.route];
+ bool visible = (*ri)[track_columns.visible];
+
+ 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 (src == N_("signal") || !_session || (_session->state_of_the_state() & (Session::Loading|Session::Deletion)) || rows.empty()) {
+ 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 ()
+{
+ if (ignore_reorder || !_session || _session->deletion_in_progress()) {
return;
}
- std::map<int,int> keys;
+ TreeModel::Children rows = track_model->children();
+
+ if (rows.empty()) {
+ return;
+ }
+ DEBUG_TRACE (DEBUG::OrderKeys, "mixer sync order keys from model\n");
+
+ TreeModel::Children::iterator ri;
bool changed = false;
+ bool rid_change = false;
+ uint32_t order = 0;
+ uint32_t rid = 1;
+ uint32_t invisible_key = UINT32_MAX;
- unsigned order = 0;
- for (ri = rows.begin(); ri != rows.end(); ++ri, ++order) {
+ for (ri = rows.begin(); ri != rows.end(); ++ri) {
boost::shared_ptr<Route> route = (*ri)[track_columns.route];
- unsigned int old_key = order;
- unsigned int new_key = route->order_key (N_("signal"));
+ bool visible = (*ri)[track_columns.visible];
- keys[new_key] = old_key;
+ uint32_t old_key = route->order_key ();
- if (new_key != old_key) {
+ if (order != old_key) {
+ route->set_order_key (order);
changed = true;
}
+
+ 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;
+ }
+
+ if (visible) {
+ rid++;
+ }
+
+ }
+
+ ++order;
+ }
+
+ if (changed) {
+ /* tell everyone that we changed the mixer sort keys */
+ _session->sync_order_keys ();
}
- if (keys.size() != rows.size()) {
- PBD::stacktrace (cerr, 20);
+ if (rid_change) {
+ /* tell the world that we changed the remote control IDs */
+ _session->notify_remote_id_change ();
}
- assert(keys.size() == rows.size());
+}
+
+void
+Mixer_UI::sync_treeview_from_order_keys ()
+{
+ if (!_session || _session->deletion_in_progress()) {
+ return;
+ }
+
+ DEBUG_TRACE (DEBUG::OrderKeys, "mixer sync model from order keys.\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
+ * order for the GUI, so reorder the treeview model to match it.
+ */
- // Remove any gaps in keys caused by automation children tracks
vector<int> neworder;
- for (std::map<int,int>::const_iterator i = keys.begin(); i != keys.end(); ++i) {
- neworder.push_back(i->second);
+ TreeModel::Children rows = track_model->children();
+ uint32_t old_order = 0;
+ bool changed = false;
+
+ if (rows.empty()) {
+ return;
+ }
+
+ OrderKeySortedRoutes sorted_routes;
+
+ for (TreeModel::Children::iterator ri = rows.begin(); ri != rows.end(); ++ri, ++old_order) {
+ boost::shared_ptr<Route> route = (*ri)[track_columns.route];
+ sorted_routes.push_back (RoutePlusOrderKey (route, old_order, route->order_key ()));
+ }
+
+ SortByNewDisplayOrder cmp;
+
+ sort (sorted_routes.begin(), sorted_routes.end(), cmp);
+ neworder.assign (sorted_routes.size(), 0);
+
+ uint32_t n = 0;
+
+ for (OrderKeySortedRoutes::iterator sr = sorted_routes.begin(); sr != sorted_routes.end(); ++sr, ++n) {
+
+ neworder[n] = sr->old_display_order;
+
+ if (sr->old_display_order != n) {
+ changed = true;
+ }
+
+ DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("MIXER change order for %1 from %2 to %3\n",
+ sr->route->name(), sr->old_display_order, n));
}
- assert(neworder.size() == rows.size());
if (changed) {
- strip_redisplay_does_not_reset_order_keys = true;
+ Unwinder<bool> uw (ignore_reorder, true);
track_model->reorder (neworder);
- strip_redisplay_does_not_reset_order_keys = false;
}
+
+ redisplay_track_list ();
}
void
Mixer_UI::follow_editor_selection ()
{
- if (!Config->get_link_editor_and_mixer_selection() || _following_editor_selection) {
+ if (!ARDOUR_UI::config()->get_link_editor_and_mixer_selection() || _following_editor_selection) {
return;
}
vector<MixerStrip*> tmp;
bool accumulate = false;
+ bool found_another = false;
tmp.push_back (strip);
/* hit selected strip. if currently accumulating others,
we're done. if not accumulating others, start doing so.
*/
+ found_another = true;
if (accumulate) {
/* done */
break;
}
}
- for (vector<MixerStrip*>::iterator i = tmp.begin(); i != tmp.end(); ++i) {
- _selection.add (*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 {
initial_track_display ();
- _session->RouteAdded.connect (_session_connections, invalidator (*this), boost::bind (&Mixer_UI::add_strip, this, _1), gui_context());
+ _session->RouteAdded.connect (_session_connections, invalidator (*this), boost::bind (&Mixer_UI::add_strips, 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());
update_title ();
}
+void
+Mixer_UI::track_visibility_changed (std::string const & path)
+{
+ if (_session && _session->deletion_in_progress()) {
+ return;
+ }
+
+ 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 ();
+ }
+ }
+ }
+}
+
+void
+Mixer_UI::update_track_visibility ()
+{
+ TreeModel::Children rows = track_model->children();
+ TreeModel::Children::iterator i;
+
+ {
+ Unwinder<bool> uw (no_track_list_redisplay, true);
+
+ for (i = rows.begin(); i != rows.end(); ++i) {
+ MixerStrip *strip = (*i)[track_columns.strip];
+ (*i)[track_columns.visible] = strip->marked_for_display ();
+ }
+
+ /* force route order keys catch up with visibility changes
+ */
+
+ sync_order_keys_from_treeview ();
+ }
+
+ redisplay_track_list ();
+}
+
void
Mixer_UI::show_strip (MixerStrip* ms)
{
MixerStrip* strip = (*i)[track_columns.strip];
if (strip == ms) {
(*i)[track_columns.visible] = true;
+ redisplay_track_list ();
break;
}
}
MixerStrip* strip = (*i)[track_columns.strip];
if (strip == ms) {
(*i)[track_columns.visible] = false;
+ redisplay_track_list ();
break;
}
}
TreeModel::Children rows = track_model->children();
TreeModel::Children::iterator i;
- no_track_list_redisplay = true;
-
- for (i = rows.begin(); i != rows.end(); ++i) {
-
- TreeModel::Row row = (*i);
- MixerStrip* strip = row[track_columns.strip];
-
- if (strip == 0) {
- continue;
- }
-
- if (strip->route()->is_master() || strip->route()->is_monitor()) {
- continue;
+ {
+ 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];
+
+ if (strip == 0) {
+ continue;
+ }
+
+ if (strip->route()->is_master() || strip->route()->is_monitor()) {
+ continue;
+ }
+
+ (*i)[track_columns.visible] = yn;
}
-
- (*i)[track_columns.visible] = yn;
}
- no_track_list_redisplay = false;
redisplay_track_list ();
}
TreeModel::Children rows = track_model->children();
TreeModel::Children::iterator i;
- no_track_list_redisplay = true;
-
- for (i = rows.begin(); i != rows.end(); ++i) {
- TreeModel::Row row = (*i);
- MixerStrip* strip = row[track_columns.strip];
-
- if (strip == 0) {
- continue;
- }
-
- if (strip->route()->is_master() || strip->route()->is_monitor()) {
- continue;
- }
-
- boost::shared_ptr<AudioTrack> at = strip->audio_track();
-
- switch (tracks) {
- case 0:
- (*i)[track_columns.visible] = yn;
- break;
-
- case 1:
- if (at) { /* track */
- (*i)[track_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];
+
+ if (strip == 0) {
+ continue;
}
- break;
-
- case 2:
- if (!at) { /* bus */
+
+ if (strip->route()->is_master() || strip->route()->is_monitor()) {
+ continue;
+ }
+
+ boost::shared_ptr<AudioTrack> at = strip->audio_track();
+
+ switch (tracks) {
+ case 0:
(*i)[track_columns.visible] = yn;
+ break;
+
+ case 1:
+ if (at) { /* track */
+ (*i)[track_columns.visible] = yn;
+ }
+ break;
+
+ case 2:
+ if (!at) { /* bus */
+ (*i)[track_columns.visible] = yn;
+ }
+ break;
}
- break;
}
}
- no_track_list_redisplay = false;
redisplay_track_list ();
}
void
Mixer_UI::track_list_reorder (const TreeModel::Path&, const TreeModel::iterator&, int* /*new_order*/)
{
- strip_redisplay_does_not_sync_order_keys = true;
- _session->set_remote_control_ids();
- redisplay_track_list ();
- strip_redisplay_does_not_sync_order_keys = false;
-}
-
-void
-Mixer_UI::track_list_change (const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator&)
-{
- // never reset order keys because of a property change
- strip_redisplay_does_not_reset_order_keys = true;
- _session->set_remote_control_ids();
- redisplay_track_list ();
- strip_redisplay_does_not_reset_order_keys = false;
+ DEBUG_TRACE (DEBUG::OrderKeys, "mixer UI treeview reordered\n");
+ sync_order_keys_from_treeview ();
}
void
Mixer_UI::track_list_delete (const Gtk::TreeModel::Path&)
{
- /* this could require an order sync */
- if (_session && !_session->deletion_in_progress()) {
- _session->set_remote_control_ids();
- redisplay_track_list ();
- }
+ /* this happens as the second step of a DnD within the treeview as well
+ as when a row/route is actually deleted.
+
+ if it was a deletion then we have to force a redisplay because
+ order keys may not have changed.
+ */
+
+ DEBUG_TRACE (DEBUG::OrderKeys, "mixer UI treeview row deleted\n");
+ sync_order_keys_from_treeview ();
+
+ if (_route_deletion_in_progress) {
+ redisplay_track_list ();
+ }
}
void
{
TreeModel::Children rows = track_model->children();
TreeModel::Children::iterator i;
- long order;
-
+
if (no_track_list_redisplay) {
return;
}
- for (order = 0, i = rows.begin(); i != rows.end(); ++i, ++order) {
+ for (i = rows.begin(); i != rows.end(); ++i) {
+
MixerStrip* strip = (*i)[track_columns.strip];
if (strip == 0) {
continue;
}
- if (!strip_redisplay_does_not_reset_order_keys) {
- strip->route()->set_order_key (N_("signal"), order);
- }
-
bool const visible = (*i)[track_columns.visible];
if (visible) {
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 */
}
}
}
- if (!strip_redisplay_does_not_reset_order_keys && !strip_redisplay_does_not_sync_order_keys) {
- _session->sync_order_keys (N_("signal"));
- }
-
_group_tabs->set_dirty ();
}
}
-struct SignalOrderRouteSorter {
- bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
- /* use of ">" forces the correct sort order */
- return a->order_key (N_("signal")) < b->order_key (N_("signal"));
- }
-};
-
void
Mixer_UI::initial_track_display ()
{
boost::shared_ptr<RouteList> routes = _session->get_routes();
RouteList copy (*routes);
- SignalOrderRouteSorter sorter;
+ ARDOUR::SignalOrderRouteSorter sorter;
copy.sort (sorter);
- no_track_list_redisplay = true;
-
- track_model->clear ();
-
- add_strip (copy);
+ {
+ Unwinder<bool> uw1 (no_track_list_redisplay, true);
+ Unwinder<bool> uw2 (ignore_reorder, true);
- no_track_list_redisplay = false;
+ track_model->clear ();
+ add_strips (copy);
+ }
+
+ _session->sync_order_keys ();
redisplay_track_list ();
}
return true;
}
- TreeIter iter;
- TreeModel::Path path;
- TreeViewColumn* column;
- int cellx;
- int celly;
-
- if (!track_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
- return false;
- }
-
- switch (GPOINTER_TO_UINT (column->get_data (X_("colnum")))) {
- case 0:
- /* allow normal processing to occur */
- return false;
-
- case 1: /* visibility */
-
- if ((iter = track_model->get_iter (path))) {
- MixerStrip* strip = (*iter)[track_columns.strip];
- if (strip) {
-
- if (!strip->route()->is_master() && !strip->route()->is_monitor()) {
- bool visible = (*iter)[track_columns.visible];
- (*iter)[track_columns.visible] = !visible;
- }
-#ifdef GTKOSX
- track_display.queue_draw();
-#endif
- }
- }
- return true;
-
- default:
- break;
- }
-
return false;
}
-
void
Mixer_UI::build_track_menu ()
{
}
void
-Mixer_UI::set_strip_width (Width w)
+Mixer_UI::set_strip_width (Width w, bool save)
{
_strip_width = w;
for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
- (*i)->set_width_enum (w, this);
+ (*i)->set_width_enum (w, save ? (*i)->width_owner() : this);
}
}
}
}
+ if ((prop = node.property ("maximised"))) {
+ bool yn = string_is_affirmative (prop->value());
+ Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleMaximalMixer"));
+ assert (act);
+ Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+ bool fs = tact && tact->get_active();
+ if (yn ^ fs) {
+ ActionManager::do_action ("Common",
+ "ToggleMaximalMixer");
+ }
+ }
+
+
return 0;
}
node->add_property ("show-mixer", _visible ? "yes" : "no");
+ node->add_property ("maximised", _maximised ? "yes" : "no");
+
return *node;
}
void
Mixer_UI::scroll_left ()
{
+ if (!scroller.get_hscrollbar()) return;
Adjustment* adj = scroller.get_hscrollbar()->get_adjustment();
/* stupid GTK: can't rely on clamping across versions */
scroller.get_hscrollbar()->set_value (max (adj->get_lower(), adj->get_value() - adj->get_step_increment()));
void
Mixer_UI::scroll_right ()
{
+ if (!scroller.get_hscrollbar()) return;
Adjustment* adj = scroller.get_hscrollbar()->get_adjustment();
/* stupid GTK: can't rely on clamping across versions */
scroller.get_hscrollbar()->set_value (min (adj->get_upper(), adj->get_value() + adj->get_step_increment()));
if (gtk_window_propagate_key_event (GTK_WINDOW(gobj()), ev)) {
return true;
}
-
+
KeyboardKey k (ev->state, ev->keyval);
-
+
if (bindings.activate (k, Bindings::Press)) {
return true;
}
-
+
return forward_key_press (ev);
}
_group_tabs->hide ();
}
} else if (p == "default-narrow_ms") {
- bool const s = Config->get_default_narrow_ms ();
+ bool const s = ARDOUR_UI::config()->get_default_narrow_ms ();
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 ();
}
}
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.set_name (X_("MixerTrackDisplayList"));
+ track_display.set_name (X_("EditGroupList"));
track_display.get_selection()->set_mode (Gtk::SELECTION_NONE);
track_display.set_reorderable (true);
track_display.set_headers_visible (true);
track_model->signal_row_deleted().connect (sigc::mem_fun (*this, &Mixer_UI::track_list_delete));
- track_model->signal_row_changed().connect (sigc::mem_fun (*this, &Mixer_UI::track_list_change));
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));
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));
track_display.signal_button_press_event().connect (sigc::mem_fun (*this, &Mixer_UI::track_display_button_press), false);
return;
}
- /* try to get mixer strip at mouse */
+// removed "implicit" selections of strips, after discussion on IRC
- int x, y;
- get_pointer (x, y);
-
- MixerStrip* ms = strip_by_x (x);
-
- if (ms) {
- _route_targets.insert (ms);
- }
}
void
_monitor_section->set_session (0);
}
}
+
+void
+Mixer_UI::toggle_midi_input_active (bool flip_others)
+{
+ boost::shared_ptr<RouteList> rl (new RouteList);
+ bool onoff = false;
+
+ set_route_targets_for_operation ();
+
+ for (RouteUISelection::iterator r = _route_targets.begin(); r != _route_targets.end(); ++r) {
+ boost::shared_ptr<MidiTrack> mt = (*r)->midi_track();
+
+ if (mt) {
+ rl->push_back ((*r)->route());
+ onoff = !mt->input_active();
+ }
+ }
+
+ _session->set_exclusive_input_active (rl, onoff, flip_others);
+}
+
+void
+Mixer_UI::maximise_mixer_space ()
+{
+ if (_maximised) {
+ return;
+ }
+
+ fullscreen ();
+
+ _maximised = true;
+}
+
+void
+Mixer_UI::restore_mixer_space ()
+{
+ if (!_maximised) {
+ return;
+ }
+
+ unfullscreen();
+
+ _maximised = false;
+}
projects / ardour.git / blobdiff