#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 "ardour/revision.h" // XXX remove after 4.5 release
#include "keyboard.h"
#include "mixer_ui.h"
#include "actions.h"
#include "gui_thread.h"
#include "mixer_group_tabs.h"
+#include "timers.h"
+#include "ui_config.h"
#include "i18n.h"
using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
using namespace PBD;
using namespace Gtk;
using namespace Glib;
Mixer_UI* Mixer_UI::_instance = 0;
Mixer_UI*
-Mixer_UI::instance ()
+Mixer_UI::instance ()
{
if (!_instance) {
_instance = new Mixer_UI;
- }
+ }
return _instance;
}
, in_group_row_change (false)
, track_menu (0)
, _monitor_section (0)
- , _strip_width (Config->get_default_narrow_ms() ? Narrow : Wide)
+ , _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)
+ , _maximised (false)
+ , _show_mixer_list (true)
{
/* allow this window to become the key focus window */
set_flags (CAN_FOCUS);
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.set_reorderable (true);
group_display.set_headers_visible (true);
group_display.set_rules_hint (true);
+ group_display.set_can_focus(false);
/* name is directly editable */
group_display_frame.set_shadow_type (Gtk::SHADOW_IN);
group_display_frame.add (group_display_vbox);
- rhs_pane1.pack1 (track_display_frame);
- rhs_pane1.pack2 (group_display_frame);
+ favorite_plugins_model = ListStore::create (favorite_plugins_columns);
+ favorite_plugins_display.set_model (favorite_plugins_model);
+ favorite_plugins_display.append_column (_("Favorite Plugins"), favorite_plugins_columns.name);
+ favorite_plugins_display.set_name ("EditGroupList");
+ favorite_plugins_display.get_selection()->set_mode (Gtk::SELECTION_MULTIPLE); // XXX needs focus/keyboard
+ favorite_plugins_display.set_reorderable (false); // ?!
+ favorite_plugins_display.set_headers_visible (true);
+ favorite_plugins_display.set_rules_hint (true);
+ favorite_plugins_display.set_can_focus (false);
+ favorite_plugins_display.add_object_drag (favorite_plugins_columns.plugin.index(), "PluginInfoPtr");
+
+ favorite_plugins_scroller.add (favorite_plugins_display);
+ favorite_plugins_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+
+ favorite_plugins_frame.set_name ("BaseFrame");
+ favorite_plugins_frame.set_shadow_type (Gtk::SHADOW_IN);
+ favorite_plugins_frame.add (favorite_plugins_scroller);
+
+ // XXX remove after 4.5 release
+ if (!strcmp (ARDOUR::revision, "4.5") || strcmp (PROGRAM_NAME, "Ardour")) {
+ rhs_pane2.pack1 (track_display_frame);
+ rhs_pane2.pack2 (group_display_frame);
+ } else {
+ rhs_pane1.pack1 (favorite_plugins_frame, false, true);
+ rhs_pane1.pack2 (track_display_frame);
+ rhs_pane2.pack1 (rhs_pane1);
+ rhs_pane2.pack2 (group_display_frame);
+ }
- list_vpacker.pack_start (rhs_pane1, true, true);
+ list_vpacker.pack_start (rhs_pane2, true, true);
global_hpacker.pack_start (scroller, true, true);
-#ifdef GTKOSX
- /* current gtk-quartz has dirty updates on borders like this one */
global_hpacker.pack_start (out_packer, false, false, 0);
-#else
- global_hpacker.pack_start (out_packer, false, false, 12);
-#endif
- list_hpane.pack1(list_vpacker, true, true);
+
+ list_hpane.pack1(list_vpacker, false, true);
list_hpane.pack2(global_hpacker, true, false);
rhs_pane1.signal_size_allocate().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::pane_allocation_handler),
static_cast<Gtk::Paned*> (&rhs_pane1)));
+ rhs_pane2.signal_size_allocate().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::pane_allocation_handler),
+ static_cast<Gtk::Paned*> (&rhs_pane2)));
list_hpane.signal_size_allocate().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::pane_allocation_handler),
static_cast<Gtk::Paned*> (&list_hpane)));
group_display_button_label.show();
group_display_button.show();
group_display_scroller.show();
+ favorite_plugins_scroller.show();
group_display_vbox.show();
group_display_frame.show();
+ favorite_plugins_frame.show();
rhs_pane1.show();
+ rhs_pane2.show();
strip_packer.show();
out_packer.show();
list_hpane.show();
group_display.show();
-
- _in_group_rebuild_or_clear = false;
+ favorite_plugins_display.show();
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 ());
+#else
+#error implement deferred Plugin-Favorite list
#endif
+ PluginManager::instance ().PluginListChanged.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::refill_favorite_plugins, this), gui_context());
+ PluginManager::instance ().PluginStatusesChanged.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::refill_favorite_plugins, this), gui_context());
+ refill_favorite_plugins();
}
Mixer_UI::~Mixer_UI ()
{
if (_monitor_section) {
+ monitor_section_detached ();
delete _monitor_section;
}
+ delete _plugin_selector;
}
void
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"));
}
}
-
+
/* force focus into main area */
scroller_base.grab_focus ();
void
Mixer_UI::add_strips (RouteList& routes)
{
+ bool from_scratch = track_model->children().size() == 0;
+ Gtk::TreeModel::Children::iterator insert_iter = track_model->children().end();
+
+ 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 (r->order_key() == (routes.front()->order_key() + routes.size())) {
+ insert_iter = it;
+ break;
+ }
+ }
+
+ if(!from_scratch) {
+ _selection.clear_routes ();
+ }
+
MixerStrip* strip;
try {
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 ();
-
+
+ _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 ();
+
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;
-
+ UIConfiguration::instance().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->append());
+
+ 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));
}
no_track_list_redisplay = false;
track_display.set_model (track_model);
-
+
sync_order_keys_from_treeview ();
redisplay_track_list ();
}
+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)
{
TreeModel::Children rows = track_model->children();
TreeModel::Children::iterator ri;
list<MixerStrip *>::iterator i;
-
+
if ((i = find (strips.begin(), strips.end(), strip)) != strips.end()) {
strips.erase (i);
}
-
+
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;
}
}
TreeModel::Children rows = track_model->children();
-
+
if (rows.empty()) {
return;
}
uint32_t invisible_key = UINT32_MAX;
for (ri = rows.begin(); ri != rows.end(); ++ri) {
+
+ /* skip two special values */
+
+ if (rid == Route::MasterBusRemoteControlID) {
+ rid++;
+ }
+
+ if (rid == Route::MonitorBusRemoteControlID) {
+ rid++;
+ }
+
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);
+ route->set_remote_control_id_explicit (new_rid);
rid_change = true;
}
-
+
if (visible) {
rid++;
}
}
TreeModel::Children rows = track_model->children();
-
+
if (rows.empty()) {
return;
}
uint32_t new_rid = (visible ? rid : invisible_key--);
if (new_rid != route->remote_control_id()) {
- route->set_remote_control_id_explicit (new_rid);
+ route->set_remote_control_id_explicit (new_rid);
rid_change = true;
}
-
+
if (visible) {
rid++;
}
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;
void
Mixer_UI::follow_editor_selection ()
{
- if (!Config->get_link_editor_and_mixer_selection() || _following_editor_selection) {
+ if (_following_editor_selection) {
return;
}
_following_editor_selection = true;
_selection.block_routes_changed (true);
-
+
TrackSelection& s (PublicEditor::instance().get_selection().tracks);
_selection.clear_routes ();
/* primary-click: toggle selection state of strip */
if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
_selection.remove (strip);
- }
+ } else if (_selection.routes.size() > 1) {
+ /* de-select others */
+ _selection.set (strip);
+ }
} else {
if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
_selection.add (strip);
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::RangeSelectModifier)) {
if (!_selection.selected(strip)) {
-
+
/* extend selection */
-
+
vector<MixerStrip*> tmp;
bool accumulate = false;
-
+ bool found_another = false;
+
tmp.push_back (strip);
for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
if ((*i) == strip) {
- /* hit clicked strip, start accumulating till we hit the first
+ /* hit clicked strip, start accumulating till we hit the first
selected strip
*/
if (accumulate) {
/* 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 {
if (_visible) {
show_window();
-
- /* Bit of a hack; if we're here, we're opening the mixer because of our
- instant XML state having a show-mixer property. Fix up the corresponding
- action state.
- */
- ActionManager::check_toggleaction ("<Actions>/Common/toggle-mixer");
}
start_updating ();
delete (*i);
}
- if (_monitor_section) {
- _monitor_section->tearoff().hide_visible ();
- }
+ if (_monitor_section) {
+ _monitor_section->tearoff().hide_visible ();
+ }
+
+ monitor_section_detached ();
strips.clear ();
{
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 ();
}
gint
Mixer_UI::start_updating ()
{
- fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (sigc::mem_fun(*this, &Mixer_UI::fast_update_strips));
+ fast_screen_update_connection = Timers::super_rapid_connect (sigc::mem_fun(*this, &Mixer_UI::fast_update_strips));
return 0;
}
{
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;
}
}
void
-Mixer_UI::set_all_audio_visibility (int tracks, bool yn)
+Mixer_UI::set_all_audio_midi_visibility (int tracks, bool yn)
{
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) {
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();
-
+ boost::shared_ptr<MidiTrack> mt = strip->midi_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 */
+ if (!at && !mt) { /* bus */
+ (*i)[track_columns.visible] = yn;
+ }
+ break;
+
+ case 3:
+ if (mt) { /* midi-track */
(*i)[track_columns.visible] = yn;
}
break;
void
Mixer_UI::show_all_audiobus ()
{
- set_all_audio_visibility (2, true);
+ set_all_audio_midi_visibility (2, true);
}
void
Mixer_UI::hide_all_audiobus ()
{
- set_all_audio_visibility (2, false);
+ set_all_audio_midi_visibility (2, false);
}
void
Mixer_UI::show_all_audiotracks()
{
- set_all_audio_visibility (1, true);
+ set_all_audio_midi_visibility (1, true);
}
void
Mixer_UI::hide_all_audiotracks ()
{
- set_all_audio_visibility (1, false);
+ set_all_audio_midi_visibility (1, false);
+}
+
+void
+Mixer_UI::show_all_miditracks()
+{
+ set_all_audio_midi_visibility (3, true);
}
+void
+Mixer_UI::hide_all_miditracks ()
+{
+ set_all_audio_midi_visibility (3, false);
+}
+
void
Mixer_UI::track_list_reorder (const TreeModel::Path&, const TreeModel::iterator&, int* /*new_order*/)
{
/* 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;
-
+
if (no_track_list_redisplay) {
return;
}
}
-struct SignalOrderRouteSorter {
- bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
- if (a->is_master() || a->is_monitor()) {
- /* "a" is a special route (master, monitor, etc), and comes
- * last in the mixer ordering
- */
- return false;
- } else if (b->is_master() || b->is_monitor()) {
- /* everything comes before b */
- return true;
- }
- return a->order_key () < b->order_key ();
-
- }
-};
-
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);
track_model->clear ();
add_strips (copy);
}
-
+
_session->sync_order_keys ();
redisplay_track_list ();
items.push_back (MenuElem (_("Hide All Audio Tracks"), sigc::mem_fun(*this, &Mixer_UI::hide_all_audiotracks)));
items.push_back (MenuElem (_("Show All Audio Busses"), sigc::mem_fun(*this, &Mixer_UI::show_all_audiobus)));
items.push_back (MenuElem (_("Hide All Audio Busses"), sigc::mem_fun(*this, &Mixer_UI::hide_all_audiobus)));
+ items.push_back (MenuElem (_("Show All Midi Tracks"), sigc::mem_fun (*this, &Mixer_UI::show_all_miditracks)));
+ items.push_back (MenuElem (_("Hide All Midi Tracks"), sigc::mem_fun (*this, &Mixer_UI::hide_all_miditracks)));
}
int celly;
if (!group_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
- return false;
+ _group_tabs->get_menu(0)->popup (1, ev->time);
+ return true;
}
TreeIter iter = group_model->get_iter (path);
if (!iter) {
- return false;
+ _group_tabs->get_menu(0)->popup (1, ev->time);
+ return true;
}
RouteGroup* group = (*iter)[group_columns.group];
group_model->clear ();
+#if 0
+ /* this is currently not used,
+ * Mixer_UI::group_display_button_press() has a case for it,
+ * and a commented edit_route_group() but that's n/a since 2011.
+ *
+ * This code is left as reminder that
+ * row[group_columns.group] = 0 has special meaning.
+ */
{
TreeModel::Row row;
row = *(group_model->append());
row[group_columns.text] = (_("-all-"));
row[group_columns.group] = 0;
}
+#endif
_session->foreach_route_group (sigc::mem_fun (*this, &Mixer_UI::add_route_group));
}
}
+void
+Mixer_UI::show_mixer_list (bool yn)
+{
+ if (yn) {
+ list_vpacker.show ();
+
+ //if user wants to show the pane, we should make sure that it is wide enough to be visible
+ int width = list_hpane.get_position();
+ if (width < 40)
+ list_hpane.set_position(40);
+ } else {
+ list_vpacker.hide ();
+ }
+
+ _show_mixer_list = yn;
+}
+
+void
+Mixer_UI::show_monitor_section (bool yn)
+{
+ if (!monitor_section()) {
+ return;
+ }
+ if (monitor_section()->tearoff().torn_off()) {
+ return;
+ }
+
+ if (yn) {
+ monitor_section()->tearoff().show();
+ } else {
+ monitor_section()->tearoff().hide();
+ }
+}
+
void
Mixer_UI::route_group_name_edit (const std::string& path, const std::string& new_text)
{
move (m_root_x, m_root_y);
}
- void
+void
Mixer_UI::get_window_pos_and_size ()
{
get_position(m_root_x, m_root_y);
get_size(m_width, m_height);
}
+struct PluginStateSorter {
+public:
+ bool operator() (PluginInfoPtr a, PluginInfoPtr b) const {
+ std::list<std::string>::const_iterator aiter = std::find(_user.begin(), _user.end(), (*a).unique_id);
+ std::list<std::string>::const_iterator biter = std::find(_user.begin(), _user.end(), (*b).unique_id);
+ if (aiter != _user.end() && biter != _user.end()) {
+ return std::distance (_user.begin(), aiter) < std::distance (_user.begin(), biter);
+ }
+ if (aiter != _user.end()) {
+ return true;
+ }
+ if (biter != _user.end()) {
+ return false;
+ }
+ printf("BITTER\n");
+ return ARDOUR::cmp_nocase((*a).name, (*b).name) == -1;
+ }
+
+ PluginStateSorter(std::list<std::string> user) : _user (user) {}
+private:
+ std::list<std::string> _user;
+};
+
int
Mixer_UI::set_state (const XMLNode& node)
{
}
}
+ 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");
+ }
+ }
+
+ if ((prop = node.property ("show-mixer-list"))) {
+ bool yn = string_is_affirmative (prop->value());
+ Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleMixerList"));
+ assert (act);
+ Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+
+ /* do it twice to force the change */
+ tact->set_active (!yn);
+ tact->set_active (yn);
+ }
+
+ XMLNode* plugin_order;
+ if ((plugin_order = find_named_node (node, "PluginOrder")) != 0) {
+ std::list<string> order;
+ const XMLNodeList& kids = plugin_order->children("PluginInfo");
+ XMLNodeConstIterator i;
+ for (i = kids.begin(); i != kids.end(); ++i) {
+ if ((prop = (*i)->property ("unique-id"))) {
+ order.push_back (prop->value());
+ }
+ }
+
+ store_current_favorite_order ();
+ PluginStateSorter cmp (order);
+ favorite_order.sort (cmp);
+ sync_treeview_from_favorite_order ();
+ }
+
return 0;
}
snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (static_cast<Paned*>(&rhs_pane1)->gobj()));
geometry->add_property(X_("mixer_rhs_pane1_pos"), string(buf));
+ snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (static_cast<Paned*>(&rhs_pane2)->gobj()));
+ geometry->add_property(X_("mixer_rhs_pane2_pos"), string(buf));
snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (static_cast<Paned*>(&list_hpane)->gobj()));
geometry->add_property(X_("mixer_list_hpane_pos"), string(buf));
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");
+
+ store_current_favorite_order ();
+ XMLNode* plugin_order = new XMLNode ("PluginOrder");
+ int 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);
+ plugin_order->add_child_nocopy (*p);
+ ;
+ }
+ node->add_child_nocopy (*plugin_order);
return *node;
}
{
int pos;
XMLProperty* prop = 0;
- char buf[32];
XMLNode* node = ARDOUR_UI::instance()->mixer_settings();
XMLNode* geometry;
int height;
if (!geometry || (prop = geometry->property("mixer-rhs-pane1-pos")) == 0) {
pos = height / 3;
- snprintf (buf, sizeof(buf), "%d", pos);
} else {
pos = atoi (prop->value());
}
rhs_pane1.set_position (pos);
}
+ } else if (which == static_cast<Gtk::Paned*> (&rhs_pane2)) {
+ if (done[1]) {
+ return;
+ }
+
+ if (!geometry || (prop = geometry->property("mixer-rhs-pane2-pos")) == 0) {
+ pos = 2 * height / 3;
+ } else {
+ pos = atoi (prop->value());
+ }
+
+ if ((done[1] = GTK_WIDGET(rhs_pane2.gobj())->allocation.height > pos)) {
+ rhs_pane2.set_position (pos);
+ }
} else if (which == static_cast<Gtk::Paned*> (&list_hpane)) {
if (done[2]) {
}
if (!geometry || (prop = geometry->property("mixer-list-hpane-pos")) == 0) {
- pos = 75;
- snprintf (buf, sizeof(buf), "%d", pos);
+ pos = std::max ((float)100, rintf ((float) 125 * UIConfiguration::instance().get_ui_scale()));
} else {
- pos = atoi (prop->value());
+ pos = max (36, atoi (prop->value ()));
}
if ((done[2] = GTK_WIDGET(list_hpane.gobj())->allocation.width > pos)) {
}
KeyboardKey k (ev->state, ev->keyval);
-
+
if (bindings.activate (k, Bindings::Release)) {
return true;
}
_group_tabs->hide ();
}
} else if (p == "default-narrow_ms") {
- bool const s = Config->get_default_narrow_ms ();
+ bool const s = UIConfiguration::instance().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 ();
+ } else if (p == "use-monitor-bus") {
+ if (!_session->monitor_out()) {
+ monitor_section_detached ();
+ }
}
}
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.get_column (0)->set_sizing (Gtk::TREE_VIEW_COLUMN_FIXED);
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_display.set_can_focus(false);
track_model->signal_row_deleted().connect (sigc::mem_fun (*this, &Mixer_UI::track_list_delete));
track_model->signal_rows_reordered().connect (sigc::mem_fun (*this, &Mixer_UI::track_list_reorder));
{
if (_session) {
string n;
-
+
if (_session->snap_name() != _session->name()) {
n = _session->snap_name ();
} else {
if (_session->dirty ()) {
n = "*" + n;
}
-
+
WindowTitle title (n);
title += S_("Window|Mixer");
title += Glib::get_application_name ();
set_title (title.get_string());
} else {
-
+
WindowTitle title (S_("Window|Mixer"));
title += Glib::get_application_name ();
set_title (title.get_string());
return;
}
- /* nothing selected ... 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
Mixer_UI::monitor_section_going_away ()
{
if (_monitor_section) {
+ monitor_section_detached ();
out_packer.remove (_monitor_section->tearoff());
_monitor_section->set_session (0);
+ delete _monitor_section;
+ _monitor_section = 0;
}
}
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;
+}
+
+void
+Mixer_UI::monitor_section_attached ()
+{
+ 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 ();
+}
+
+void
+Mixer_UI::monitor_section_detached ()
+{
+ Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMonitorSection");
+ act->set_sensitive (false);
+}
+
+void
+Mixer_UI::store_current_favorite_order ()
+{
+ typedef Gtk::TreeModel::Children type_children;
+ type_children children = favorite_plugins_model->children();
+ favorite_order.clear();
+ for(type_children::iterator iter = children.begin(); iter != children.end(); ++iter)
+ {
+ Gtk::TreeModel::Row row = *iter;
+ favorite_order.push_back (row[favorite_plugins_columns.plugin]);
+ std::string name = row[favorite_plugins_columns.name];
+ }
+}
+
+void
+Mixer_UI::refiller (PluginInfoList& result, const PluginInfoList& plugs)
+{
+ PluginManager& manager (PluginManager::instance());
+ for (PluginInfoList::const_iterator i = plugs.begin(); i != plugs.end(); ++i) {
+ if (manager.get_status (*i) != PluginManager::Favorite) {
+ continue;
+ }
+ result.push_back (*i);
+ }
+}
+
+struct PluginCustomSorter {
+public:
+ bool operator() (PluginInfoPtr a, PluginInfoPtr b) const {
+ PluginInfoList::const_iterator aiter = std::find(_user.begin(), _user.end(), a);
+ PluginInfoList::const_iterator biter = std::find(_user.begin(), _user.end(), b);
+
+ if (aiter != _user.end() && biter != _user.end()) {
+ return std::distance (_user.begin(), aiter) < std::distance (_user.begin(), biter);
+ }
+ if (aiter != _user.end()) {
+ return true;
+ }
+ if (biter != _user.end()) {
+ return false;
+ }
+ return ARDOUR::cmp_nocase((*a).name, (*b).name) == -1;
+ }
+ PluginCustomSorter(PluginInfoList user) : _user (user) {}
+private:
+ PluginInfoList _user;
+};
+
+void
+Mixer_UI::refill_favorite_plugins ()
+{
+ PluginInfoList plugs;
+ PluginManager& mgr (PluginManager::instance());
+
+#ifdef LV2_SUPPORT
+ refiller (plugs, mgr.lv2_plugin_info ());
+#endif
+#ifdef WINDOWS_VST_SUPPORT
+ refiller (plugs, mgr.windows_vst_plugin_info ());
+#endif
+#ifdef LXVST_SUPPORT
+ refiller (plugs, mgr.lxvst_plugin_info ());
+#endif
+#ifdef AUDIOUNIT_SUPPORT
+ refiller (plugs, mgr.au_plugin_info ());
+#endif
+ refiller (plugs, mgr.ladspa_plugin_info ());
+
+ store_current_favorite_order ();
+
+ PluginCustomSorter cmp (favorite_order);
+ plugs.sort (cmp);
+
+ favorite_order = plugs;
+
+ sync_treeview_from_favorite_order ();
+}
+
+void
+Mixer_UI::sync_treeview_from_favorite_order ()
+{
+ favorite_plugins_model->clear ();
+ for (PluginInfoList::const_iterator i = favorite_order.begin(); i != favorite_order.end(); ++i) {
+ TreeModel::Row newrow = *(favorite_plugins_model->append());
+ newrow[favorite_plugins_columns.name] = (*i)->name;
+ newrow[favorite_plugins_columns.plugin] = *i;
+ }
+}
projects / ardour.git / blobdiff