XMLNode const * settings = ARDOUR_UI::instance()->mixer_settings();
- XMLProperty const * prop;
float fract;
{
LocaleGuard lg;
- 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 || !settings->get_property ("mixer-rhs-pane1-pos", fract) || fract > 1.0) {
+ fract = 0.6f;
}
- 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);
+ rhs_pane1.set_divider (0, fract);
+
+ if (!settings || !settings->get_property ("mixer-rhs-pane2-pos", fract) || fract > 1.0) {
+ fract = 0.7f;
}
- 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);
+ rhs_pane2.set_divider (0, fract);
+
+ if (!settings || !settings->get_property ("mixer-list-hpane-pos", fract) || fract > 1.0) {
+ fract = 0.2f;
}
- 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()));
+ 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);
delete _monitor_section;
}
delete _plugin_selector;
+ delete track_menu;
}
void
Gtk::Window* win = Tabbable::use_own_window (and_fill_it);
-
if (win && new_window) {
win->set_name ("MixerWindow");
ARDOUR_UI::instance()->setup_toplevel_window (*win, _("Mixer"), this);
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 ();
+ if (!win->get_focus()) {
+ /* set focus widget to something, anything */
+ win->set_focus (scroller);
+ }
}
return win;
MixerStrip* strip;
-
try {
PBD::Unwinder<bool> uw (no_track_list_redisplay, true);
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 ();
}
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);
}
}
}
- if (!_selection.axes.empty()) {
+ if (!_selection.axes.empty() && !PublicEditor::instance().track_selection_change_without_scroll ()) {
move_stripable_into_view ((*_selection.axes.begin())->stripable());
}
}
bool accumulate = false;
bool found_another = false;
- tmp.push_back (strip);
-
OrderingKeys sorted;
const size_t cmp_max = strips.size ();
for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
}
}
+ tmp.push_back (strip);
+
if (found_another) {
+ PresentationInfo::ChangeSuspender cs;
for (vector<MixerStrip*>::iterator i = tmp.begin(); i != tmp.end(); ++i) {
_selection.add (*i);
}
- } else
+ } else {
_selection.set (strip); //user wants to start a range selection, but there aren't any others selected yet
+ }
} else {
_selection.set (strip);
}
AxisView* av = (*i)[stripable_columns.strip];
MixerStrip* strip = dynamic_cast<MixerStrip*> (av);
+ bool const visible = (*i)[stripable_columns.visible];
if (!strip) {
/* we're in the middle of changing a row, don't worry */
}
}
- if (slaved) {
+ if (slaved && visible) {
if (strip->packed()) {
strip_packer.reorder_child (*strip, -1); /* put at end */
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)) {
Adjustment* adj = scroller.get_hscrollbar()->get_adjustment();
- if ((x0 < adj->get_value()) || (x0 + alloc.get_width()) >= (adj->get_value() + adj->get_page_size())) {
- /* try to put left edge of strip in the middle */
- double half_page = adj->get_page_size() / 2.0;
- if (x0 >= half_page) {
- x0 -= half_page;
- }
+ if (x0 < adj->get_value()) {
adj->set_value (max (adj->get_lower(), min (adj->get_upper(), (double) x0)));
+ } else if (x0 + alloc.get_width() >= adj->get_value() + adj->get_page_size()) {
+ int x1 = x0 + alloc.get_width() - adj->get_page_size();
+ adj->set_value (max (adj->get_lower(), min (adj->get_upper(), (double) x1)));
}
}
int celly;
if (!group_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
- _group_tabs->get_menu(0)->popup (1, ev->time);
+ if (ev->button == 3) {
+ _group_tabs->get_menu(0)->popup (ev->button, ev->time);
+ }
return true;
}
TreeIter iter = group_model->get_iter (path);
if (!iter) {
- _group_tabs->get_menu(0)->popup (1, ev->time);
+ if (ev->button == 3) {
+ _group_tabs->get_menu(0)->popup (ev->button, ev->time);
+ }
return 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);
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);
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);
}
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));
Mixer_UI::vca_assign (boost::shared_ptr<VCA> vca)
{
set_axis_targets_for_operation ();
-#if 0
BOOST_FOREACH(AxisView* r, _axis_targets) {
MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
if (ms) {
ms->vca_assign (vca);
}
}
-#endif
}
void
Mixer_UI::vca_unassign (boost::shared_ptr<VCA> vca)
{
set_axis_targets_for_operation ();
-#if 0
BOOST_FOREACH(AxisView* r, _axis_targets) {
MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
if (ms) {
ms->vca_unassign (vca);
}
}
-#endif
}
projects / ardour.git / blobdiff