X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_ui.cc;h=0d3f42c1d5e2fb24f462bb55087bb09371fd7023;hb=ccf58b8de23619db9983a45f696fd97e13a15cce;hp=0e354945ac077ea50db7c47e3604a8221a120f5c;hpb=b65f8073ba306ac2d85133875746767e7c6b0eb6;p=ardour.git diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 0e354945ac..0d3f42c1d5 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2004 Paul Davis + Copyright (C) 2000-2004 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,6 +18,7 @@ */ #include +#include #include #include @@ -62,6 +63,7 @@ using PBD::atoi; Mixer_UI::Mixer_UI () : Window (Gtk::WINDOW_TOPLEVEL) + , _plugin_selector (0) { session = 0; _strip_width = Config->get_default_narrow_ms() ? Narrow : Wide; @@ -76,9 +78,9 @@ Mixer_UI::Mixer_UI () Route::SyncOrderKeys.connect (mem_fun (*this, &Mixer_UI::sync_order_keys)); - scroller_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - scroller_base.set_name ("MixerWindow"); - scroller_base.signal_button_release_event().connect (mem_fun(*this, &Mixer_UI::strip_scroller_button_release)); + scroller_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); + scroller_base.set_name ("MixerWindow"); + scroller_base.signal_button_release_event().connect (mem_fun(*this, &Mixer_UI::strip_scroller_button_release)); // add as last item of strip packer strip_packer.pack_end (scroller_base, true, true); @@ -199,16 +201,16 @@ Mixer_UI::Mixer_UI () list_hpane.add1(list_vpacker); list_hpane.add2(global_hpacker); - rhs_pane1.signal_size_allocate().connect (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler), + rhs_pane1.signal_size_allocate().connect (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler), static_cast (&rhs_pane1))); - list_hpane.signal_size_allocate().connect (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler), + list_hpane.signal_size_allocate().connect (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler), static_cast (&list_hpane))); - + global_vpacker.pack_start (list_hpane, true, true); add (global_vpacker); set_name ("MixerWindow"); - + WindowTitle title(Glib::get_application_name()); title += _("Mixer"); set_title (title.get_string()); @@ -220,8 +222,6 @@ Mixer_UI::Mixer_UI () signal_delete_event().connect (mem_fun (*this, &Mixer_UI::hide_window)); add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK); - _plugin_selector = new PluginSelector (PluginManager::the_manager()); - signal_configure_event().connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler)); _selection.RoutesChanged.connect (mem_fun(*this, &Mixer_UI::follow_strip_selection)); @@ -273,10 +273,10 @@ Mixer_UI::show_window () /* now reset each strips width so the right widgets are shown */ MixerStrip* ms; - + TreeModel::Children rows = track_model->children(); TreeModel::Children::iterator ri; - + for (ri = rows.begin(); ri != rows.end(); ++ri) { ms = (*ri)[track_columns.strip]; ms->set_width_enum (ms->get_width_enum (), ms->width_owner()); @@ -299,7 +299,7 @@ void Mixer_UI::add_strip (RouteList& routes) { ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_strip), routes)); - + MixerStrip* strip; no_track_list_redisplay = true; @@ -311,11 +311,9 @@ Mixer_UI::add_strip (RouteList& routes) if (route->is_hidden()) { return; } - + strip = new MixerStrip (*this, *session, route); strips.push_back (strip); - - Config->get_default_narrow_ms() ? _strip_width = Narrow : _strip_width = Wide; Config->get_default_narrow_ms() ? _strip_width = Narrow : _strip_width = Wide; @@ -324,7 +322,7 @@ Mixer_UI::add_strip (RouteList& routes) } show_strip (strip); - + TreeModel::Row row = *(track_model->append()); row[track_columns.text] = route->name(); row[track_columns.visible] = strip->marked_for_display(); @@ -334,7 +332,7 @@ Mixer_UI::add_strip (RouteList& routes) if (route->order_key (N_("signal")) == -1) { route->set_order_key (N_("signal"), track_model->children().size()-1); } - + route->NameChanged.connect (bind (mem_fun(*this, &Mixer_UI::strip_name_changed), strip)); strip->GoingAway.connect (bind (mem_fun(*this, &Mixer_UI::remove_strip), strip)); @@ -345,7 +343,7 @@ Mixer_UI::add_strip (RouteList& routes) no_track_list_redisplay = false; redisplay_track_list (); - + strip_redisplay_does_not_sync_order_keys = false; } @@ -374,48 +372,40 @@ Mixer_UI::remove_strip (MixerStrip* strip) strip_redisplay_does_not_sync_order_keys = false; } -string -Mixer_UI::get_order_key() -{ - return X_("signal"); -#if 0 - if (Config->get_sync_all_route_ordering()) { - return X_("editor"); - } else { - return X_("signal"); - } -#endif -} - void Mixer_UI::sync_order_keys (string const & src) { - vector neworder; TreeModel::Children rows = track_model->children(); TreeModel::Children::iterator ri; - if (src != get_order_key() || !session || (session->state_of_the_state() & Session::Loading) || rows.empty()) { + if (src == N_("signal") || !session || (session->state_of_the_state() & Session::Loading) || rows.empty()) { return; } - for (ri = rows.begin(); ri != rows.end(); ++ri) { - neworder.push_back (0); - } + std::map keys; bool changed = false; - int order; - for (order = 0, ri = rows.begin(); ri != rows.end(); ++ri, ++order) { + unsigned order = 0; + for (ri = rows.begin(); ri != rows.end(); ++ri, ++order) { boost::shared_ptr route = (*ri)[track_columns.route]; - int old_key = order; - int new_key = route->order_key (get_order_key()); + unsigned int old_key = order; + unsigned int new_key = route->order_key (N_("signal")); - neworder[new_key] = old_key; + keys[new_key] = old_key; if (new_key != old_key) { changed = true; } } + assert(keys.size() == rows.size()); + + // Remove any gaps in keys caused by automation children tracks + vector neworder; + for (std::map::const_iterator i = keys.begin(); i != keys.end(); ++i) { + neworder.push_back(i->second); + } + assert(neworder.size() == rows.size()); if (changed) { strip_redisplay_does_not_reset_order_keys = true; @@ -441,7 +431,7 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip) editing. XXX it needs improving so that we don't select the strip at the same time. */ - + if (_selection.selected (strip->route())) { _selection.remove (strip->route()); } else { @@ -479,8 +469,9 @@ Mixer_UI::connect_to_session (Session* sess) session->config.ParameterChanged.connect (mem_fun (*this, &Mixer_UI::parameter_changed)); route_groups_changed (); - - _plugin_selector->set_session (session); + + if (_plugin_selector) + _plugin_selector->set_session (session); if (_visible) { show_window(); @@ -495,14 +486,14 @@ void Mixer_UI::disconnect_from_session () { ENSURE_GUI_THREAD(mem_fun(*this, &Mixer_UI::disconnect_from_session)); - + group_model->clear (); _selection.clear (); WindowTitle title(Glib::get_application_name()); title += _("Mixer"); set_title (title.get_string()); - + stop_updating (); } @@ -511,9 +502,9 @@ Mixer_UI::show_strip (MixerStrip* ms) { TreeModel::Children rows = track_model->children(); TreeModel::Children::iterator i; - + for (i = rows.begin(); i != rows.end(); ++i) { - + MixerStrip* strip = (*i)[track_columns.strip]; if (strip == ms) { (*i)[track_columns.visible] = true; @@ -527,9 +518,9 @@ Mixer_UI::hide_strip (MixerStrip* ms) { TreeModel::Children rows = track_model->children(); TreeModel::Children::iterator i; - + for (i = rows.begin(); i != rows.end(); ++i) { - + MixerStrip* strip = (*i)[track_columns.strip]; if (strip == ms) { (*i)[track_columns.visible] = false; @@ -574,11 +565,11 @@ Mixer_UI::set_all_strips_visibility (bool yn) TreeModel::Row row = (*i); MixerStrip* strip = row[track_columns.strip]; - + if (strip == 0) { continue; } - + if (strip->route()->is_master() || strip->route()->is_control()) { continue; } @@ -592,9 +583,9 @@ Mixer_UI::set_all_strips_visibility (bool yn) void -Mixer_UI::set_all_audio_visibility (int tracks, bool yn) +Mixer_UI::set_all_audio_visibility (int tracks, bool yn) { - TreeModel::Children rows = track_model->children(); + TreeModel::Children rows = track_model->children(); TreeModel::Children::iterator i; no_track_list_redisplay = true; @@ -617,13 +608,13 @@ Mixer_UI::set_all_audio_visibility (int tracks, bool yn) 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; @@ -683,7 +674,7 @@ 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; + strip_redisplay_does_not_reset_order_keys = true; session->set_remote_control_ids(); redisplay_track_list (); strip_redisplay_does_not_reset_order_keys = false; @@ -723,8 +714,8 @@ Mixer_UI::redisplay_track_list () strip->route()->set_order_key (N_("signal"), order); if (!strip_redisplay_does_not_reset_order_keys) { - strip->route()->set_order_key (get_order_key(), order); - } + strip->route()->set_order_key (N_("signal"), order); + } if (strip->packed()) { @@ -759,13 +750,13 @@ Mixer_UI::redisplay_track_list () } } } - + if (!strip_redisplay_does_not_reset_order_keys && !strip_redisplay_does_not_sync_order_keys) { - session->sync_order_keys (get_order_key()); + session->sync_order_keys (N_("signal")); } // Rebind all of the midi controls automatically - + if (auto_rebinding) auto_rebind_midi_controls (); @@ -776,7 +767,7 @@ void Mixer_UI::strip_width_changed () { _group_tabs->set_dirty (); - + #ifdef GTKOSX TreeModel::Children rows = track_model->children(); TreeModel::Children::iterator i; @@ -790,13 +781,13 @@ Mixer_UI::strip_width_changed () } bool visible = (*i)[track_columns.visible]; - + if (visible) { strip->queue_draw(); } } #endif - + } void @@ -814,14 +805,14 @@ Mixer_UI::set_auto_rebinding( bool val ) } } -void -Mixer_UI::toggle_auto_rebinding() +void +Mixer_UI::toggle_auto_rebinding() { if (auto_rebinding) { set_auto_rebinding( FALSE ); } - + else { set_auto_rebinding( TRUE ); @@ -830,8 +821,8 @@ Mixer_UI::toggle_auto_rebinding() auto_rebind_midi_controls(); } -void -Mixer_UI::auto_rebind_midi_controls () +void +Mixer_UI::auto_rebind_midi_controls () { TreeModel::Children rows = track_model->children(); TreeModel::Children::iterator i; @@ -841,7 +832,7 @@ Mixer_UI::auto_rebind_midi_controls () pos = 1; // 0 is reserved for the master strip for (i = rows.begin(); i != rows.end(); ++i) { MixerStrip* strip = (*i)[track_columns.strip]; - + if ( (*i)[track_columns.visible] == true ) { // add bindings for // make the actual binding //cout<<"Auto Binding: Visible Strip Found: "<name()< a, boost::shared_ptr b) { /* use of ">" forces the correct sort order */ - return a->order_key (Mixer_UI::get_order_key()) < b->order_key (Mixer_UI::get_order_key()); + return a->order_key (N_("signal")) < b->order_key (N_("signal")); } }; @@ -896,7 +887,7 @@ Mixer_UI::initial_track_display () SignalOrderRouteSorter sorter; copy.sort (sorter); - + no_track_list_redisplay = true; track_model->clear (); @@ -931,7 +922,7 @@ Mixer_UI::track_display_button_press (GdkEventButton* ev) 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; } @@ -975,7 +966,7 @@ Mixer_UI::build_track_menu () track_menu = new Menu; track_menu->set_name ("ArdourContextMenu"); MenuList& items = track_menu->items(); - + items.push_back (MenuElem (_("Show All"), mem_fun(*this, &Mixer_UI::show_all_routes))); items.push_back (MenuElem (_("Hide All"), mem_fun(*this, &Mixer_UI::hide_all_routes))); items.push_back (MenuElem (_("Show All Audio Tracks"), mem_fun(*this, &Mixer_UI::show_all_audiotracks))); @@ -989,16 +980,16 @@ void Mixer_UI::strip_name_changed (MixerStrip* mx) { ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::strip_name_changed), mx)); - + TreeModel::Children rows = track_model->children(); TreeModel::Children::iterator i; - + for (i = rows.begin(); i != rows.end(); ++i) { if ((*i)[track_columns.strip] == mx) { (*i)[track_columns.text] = mx->route()->name(); return; } - } + } error << _("track display list item for renamed strip not found!") << endmsg; } @@ -1017,7 +1008,7 @@ Mixer_UI::build_route_group_context_menu () items.push_back (MenuElem (_("Disable All"), mem_fun(*this, &Mixer_UI::disable_all_route_groups))); items.push_back (SeparatorElem()); items.push_back (MenuElem (_("Add group"), mem_fun(*this, &Mixer_UI::new_route_group))); - + } bool @@ -1055,8 +1046,8 @@ Mixer_UI::group_display_button_press (GdkEventButton* ev) return true; } } - - } + + } break; case 1: @@ -1073,7 +1064,7 @@ Mixer_UI::group_display_button_press (GdkEventButton* ev) default: break; } - + return false; } @@ -1127,7 +1118,7 @@ Mixer_UI::remove_selected_route_group () TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); TreeIter iter; - + /* selection mode is single, so rows.begin() is it */ if ((iter = group_model->get_iter (*i))) { @@ -1150,7 +1141,7 @@ Mixer_UI::group_flags_changed (void* src, RouteGroup* group) ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::group_flags_changed), src, group)); /* force an update of any mixer strips that are using this group, - otherwise mix group names don't change in mixer strips + otherwise mix group names don't change in mixer strips */ for (list::iterator i = strips.begin(); i != strips.end(); ++i) { @@ -1158,13 +1149,13 @@ Mixer_UI::group_flags_changed (void* src, RouteGroup* group) (*i)->route_group_changed(0); } } - + TreeModel::iterator i; TreeModel::Children rows = group_model->children(); Glib::RefPtr selection = group_display.get_selection(); in_group_row_change = true; - + for (i = rows.begin(); i != rows.end(); ++i) { if ((*i)[group_columns.group] == group) { (*i)[group_columns.visible] = !group->is_hidden (); @@ -1185,18 +1176,18 @@ Mixer_UI::route_group_name_edit (const Glib::ustring& path, const Glib::ustring& TreeIter iter; if ((iter = group_model->get_iter (path))) { - + if ((group = (*iter)[group_columns.group]) == 0) { return; } - + if (new_text != group->name()) { group->set_name (new_text); } } } -void +void Mixer_UI::route_group_row_change (const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator& iter) { RouteGroup* group; @@ -1221,7 +1212,7 @@ Mixer_UI::route_group_row_change (const Gtk::TreeModel::Path&, const Gtk::TreeMo hide_strip (*i); } } - } + } Glib::ustring name = (*iter)[group_columns.text]; @@ -1250,7 +1241,7 @@ Mixer_UI::add_route_group (RouteGroup* group) } group->FlagsChanged.connect (bind (mem_fun(*this, &Mixer_UI::group_flags_changed), group)); - + if (focus) { TreeViewColumn* col = group_display.get_column (0); CellRendererText* name_cell = dynamic_cast(group_display.get_column_cell_renderer (0)); @@ -1302,12 +1293,12 @@ Mixer_UI::set_state (const XMLNode& node) { const XMLProperty* prop; XMLNode* geometry; - + m_width = default_width; m_height = default_height; m_root_x = 1; m_root_y = 1; - + if ((geometry = find_named_node (node, "geometry")) != 0) { XMLProperty* prop; @@ -1330,7 +1321,7 @@ Mixer_UI::set_state (const XMLNode& node) } if (prop) { m_root_x = atoi (prop->value()); - + } if ((prop = geometry->property ("y_pos")) == 0) { prop = geometry->property ("y-pos"); @@ -1343,7 +1334,7 @@ Mixer_UI::set_state (const XMLNode& node) set_window_pos_and_size (); if ((prop = node.property ("narrow-strips"))) { - if (prop->value() == "yes") { + if (string_is_affirmative (prop->value())) { set_strip_width (Narrow); } else { set_strip_width (Wide); @@ -1351,7 +1342,7 @@ Mixer_UI::set_state (const XMLNode& node) } if ((prop = node.property ("show-mixer"))) { - if (prop->value() == "yes") { + if (string_is_affirmative (prop->value())) { _visible = true; } } @@ -1366,7 +1357,7 @@ Mixer_UI::get_state (void) if (is_realized()) { Glib::RefPtr win = get_window(); - + get_window_pos_and_size (); XMLNode* geometry = new XMLNode ("geometry"); @@ -1379,7 +1370,7 @@ Mixer_UI::get_state (void) geometry->add_property(X_("x_pos"), string(buf)); snprintf(buf, sizeof(buf), "%d", m_root_y); geometry->add_property(X_("y_pos"), string(buf)); - + // written only for compatibility, they are not used. snprintf(buf, sizeof(buf), "%d", 0); geometry->add_property(X_("x_off"), string(buf)); @@ -1402,7 +1393,7 @@ Mixer_UI::get_state (void) } -void +void Mixer_UI::pane_allocation_handler (Allocation&, Gtk::Paned* which) { int pos; @@ -1468,10 +1459,38 @@ Mixer_UI::pane_allocation_handler (Allocation&, Gtk::Paned* which) } } } +void +Mixer_UI::scroll_left () +{ + 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 () +{ + 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())); +} bool Mixer_UI::on_key_press_event (GdkEventKey* ev) { + switch (ev->keyval) { + case GDK_Left: + scroll_left (); + return true; + + case GDK_Right: + scroll_right (); + return true; + + default: + break; + } + return key_press_focus_accelerator_handler (*this, ev); } @@ -1482,6 +1501,37 @@ Mixer_UI::on_key_release_event (GdkEventKey* ev) // return key_press_focus_accelerator_handler (*this, ev); } + +bool +Mixer_UI::on_scroll_event (GdkEventScroll* ev) +{ + switch (ev->direction) { + case GDK_SCROLL_LEFT: + scroll_left (); + return true; + case GDK_SCROLL_UP: + if (ev->state & Keyboard::TertiaryModifier) { + scroll_left (); + return true; + } + return false; + + case GDK_SCROLL_RIGHT: + scroll_right (); + return true; + + case GDK_SCROLL_DOWN: + if (ev->state & Keyboard::TertiaryModifier) { + scroll_right (); + return true; + } + return false; + } + + return false; +} + + void Mixer_UI::parameter_changed (string const & p) { @@ -1494,10 +1544,19 @@ Mixer_UI::parameter_changed (string const & p) } } } - + void Mixer_UI::set_route_group_activation (RouteGroup* g, bool a) { g->set_active (a, this); } - + +PluginSelector* +Mixer_UI::plugin_selector() +{ + if (!_plugin_selector) { + _plugin_selector = new PluginSelector (PluginManager::the_manager()); + _plugin_selector->set_session (session); + } + return _plugin_selector; +}