#include <boost/foreach.hpp>
+#include <glibmm/threads.h>
+
#include <gtkmm/accelmap.h>
+#include <gtkmm/stock.h>
#include "pbd/convert.h"
#include "pbd/stacktrace.h"
#include "pbd/unwind.h"
-#include <glibmm/threads.h>
-
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/keyboard.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/tearoff.h>
-#include <gtkmm2ext/window_title.h>
-#include <gtkmm2ext/doi.h>
-
#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"
#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"
, _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)
+ , _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 ();
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);
favorite_plugins_display.show();
MixerStrip::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::remove_strip, this, _1), gui_context());
+ VCAMasterStrip::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::remove_master, this, _1), gui_context());
/* handle escape */
delete _monitor_section;
}
delete _plugin_selector;
+ delete track_menu;
}
void
for (ri = rows.begin(); ri != rows.end(); ++ri) {
if ((*ri)[stripable_columns.strip] == vms) {
- PBD::Unwinder<bool> uw (_route_deletion_in_progress, true);
+ PBD::Unwinder<bool> uw (_route_deletion_in_progress, true);
track_model->erase (ri);
break;
}
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;
MixerStrip* strip;
-
try {
PBD::Unwinder<bool> uw (no_track_list_redisplay, true);
row[stripable_columns.strip] = vms;
row[stripable_columns.stripable] = vca;
- vms->CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::remove_master, this, _1), gui_context());
+ vms->signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::vca_button_release_event), vms));
} else if ((route = boost::dynamic_pointer_cast<Route> (*s))) {
_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());
row[stripable_columns.stripable] = route;
row[stripable_columns.strip] = strip;
- if (nroutes != 0) {
- _selection.add (strip);
- }
-
} else {
out_packer.pack_start (*strip, false, false);
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 ();
}
}
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
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);
+ PBD::Unwinder<bool> 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);
TreeModel::Children::iterator ri;
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++;
- }
+ PresentationInfo::order_t master_key = _session->master_order_key ();
+ PresentationInfo::order_t order = 0;
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()) {
stripable->set_presentation_order (order);
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 (_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);
if (!_selection.axes.empty() && !PublicEditor::instance().track_selection_change_without_scroll ()) {
move_stripable_into_view ((*_selection.axes.begin())->stripable());
}
+
+ TreeModel::Children rows = track_model->children();
+ 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) {
+ continue;
+ }
+ if (vms->vca() && vms->vca()->is_selected()) {
+ _selection.add (vms);
+ } else {
+ _selection.remove (vms);
+ }
+ }
}
redisplay_track_list ();
}
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) {
}
}
+ TreeModel::Children rows = track_model->children();
+ 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->stripable () == s) {
+ return av;
+ }
+ }
+
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)
{
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);
}
+ PublicEditor& pe = PublicEditor::instance();
+ TimeAxisView* tav = pe.time_axis_view_from_stripable (strip->stripable());
+ if (tav) {
+ pe.set_selected_mixer_strip (*tav);
+ }
} 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 */
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 (found_another) {
PresentationInfo::ChangeSuspender cs;
for (vector<MixerStrip*>::iterator i = tmp.begin(); i != tmp.end(); ++i) {
- _selection.add (*i);
+ _selection.add (*i, true);
}
} else {
_selection.set (strip); //user wants to start a range selection, but there aren't any others selected yet
return true;
}
+bool
+Mixer_UI::vca_button_release_event (GdkEventButton *ev, VCAMasterStrip *strip)
+{
+ _selection.set (strip);
+ return true;
+}
+
void
Mixer_UI::set_session (Session* sess)
{
}
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 ();
}
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
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
sync_treeview_from_presentation_info (Properties::order);
}
-void
-Mixer_UI::show_track_list_menu ()
-{
- if (track_menu == 0) {
- build_track_menu ();
- }
-
- track_menu->popup (1, gtk_get_current_event_time());
-}
-
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)) {
}
}
+ if (s->is_master ()) {
+ return;
+ }
+
error << _("track display list item for renamed strip not found!") << endmsg;
}
if (!pip->is_instrument ()) {
continue;
}
- ARDOUR_UI::instance()->session_add_midi_track ((RouteGroup*) 0, 1, _("MIDI"), Config->get_strict_io (), pip, ppp->_preset.valid ? &ppp->_preset : 0, PresentationInfo::max_order);
+ ARDOUR_UI::instance()->session_add_midi_route (true, (RouteGroup*) 0, 1, _("MIDI"), Config->get_strict_io (), pip, ppp->_preset.valid ? &ppp->_preset : 0, PresentationInfo::max_order);
ok = true;
}
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<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleMaximalMixer"));
assert (act);
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
}
}
- if ((prop = node.property ("show-mixer-list"))) {
- bool yn = string_is_affirmative (prop->value());
+ if (node.get_property ("show-mixer-list", yn)) {
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleMixerList"));
assert (act);
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
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) {
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;
}
}
}
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<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");
- 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);
}
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
return s == spilled_strip.lock();
}
+void
+Mixer_UI::show_editor_window () const
+{
+ PublicEditor::instance().make_visible ();
+}
+
void
Mixer_UI::register_actions ()
{
Glib::RefPtr<ActionGroup> 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));
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 right"), sigc::mem_fun (*this, &Mixer_UI::scroll_right));
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<MixerStrip*> (r);
if (ms) {
- ms->step_gain_up ();
+ boost::shared_ptr<GainControl> 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<GainControl> ac = boost::dynamic_pointer_cast<GainControl> (*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<MixerStrip*> (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<GainControl> ac = boost::dynamic_pointer_cast<GainControl> (*i);
+ assert (ac);
+ ac->set_value (dB_to_coefficient (accurate_coefficient_to_dB (ac->get_value()) - 0.1), Controllable::NoGroup);
}
}
projects / ardour.git / blobdiff