X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_ui.cc;h=474cef239517fe67881710697fc72154448e82cf;hb=430b2c44d15e20015d8cab53904cc7684371d407;hp=c1dc4aff9f00e3fad1fc7ed68a50bdbbc6596461;hpb=b68256a8ff670d0f9206858daa69e1bdf7810684;p=ardour.git diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index c1dc4aff9f..474cef2395 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -17,6 +17,10 @@ */ +#ifdef WAF_BUILD +#include "gtk2ardour-config.h" +#endif + #include #include #include @@ -29,11 +33,9 @@ #include #include -#include #include #include -#include "ardour/audio_diskstream.h" #include "ardour/audio_track.h" #include "ardour/plugin_manager.h" #include "ardour/route_group.h" @@ -45,6 +47,7 @@ #include "mixer_strip.h" #include "monitor_section.h" #include "plugin_selector.h" +#include "public_editor.h" #include "ardour_ui.h" #include "prompter.h" #include "utils.h" @@ -63,13 +66,28 @@ using namespace std; using PBD::atoi; +Mixer_UI* Mixer_UI::_instance = 0; + +Mixer_UI* +Mixer_UI::instance () +{ + if (!_instance) { + _instance = new Mixer_UI; + } + + return _instance; +} + Mixer_UI::Mixer_UI () : Window (Gtk::WINDOW_TOPLEVEL) + , _following_editor_selection (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; - route_group_context_menu = 0; no_track_list_redisplay = false; in_group_row_change = false; _visible = false; @@ -79,6 +97,7 @@ Mixer_UI::Mixer_UI () Route::SyncOrderKeys.connect (*this, invalidator (*this), ui_bind (&Mixer_UI::sync_order_keys, this, _1), gui_context()); + scroller_base.set_flags (Gtk::CAN_FOCUS); scroller_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); scroller_base.set_name ("MixerWindow"); scroller_base.signal_button_release_event().connect (sigc::mem_fun(*this, &Mixer_UI::strip_scroller_button_release)); @@ -92,33 +111,9 @@ Mixer_UI::Mixer_UI () b->show_all (); scroller.add (*b); - scroller.set_policy (Gtk::POLICY_ALWAYS, Gtk::POLICY_AUTOMATIC); - - track_model = ListStore::create (track_columns); - track_display.set_model (track_model); - track_display.append_column (_("Strips"), track_columns.text); - track_display.append_column (_("Show"), track_columns.visible); - track_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0)); - 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.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(track_display.get_column_cell_renderer (1)); - track_list_visible_cell->property_activatable() = true; - track_list_visible_cell->property_radio() = false; - - track_display.signal_button_press_event().connect (sigc::mem_fun (*this, &Mixer_UI::track_display_button_press), false); + scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); - track_display_scroller.add (track_display); - track_display_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); + setup_track_display (); group_model = ListStore::create (group_columns); group_display.set_model (group_model); @@ -147,7 +142,8 @@ Mixer_UI::Mixer_UI () active_cell->property_radio() = false; group_model->signal_row_changed().connect (sigc::mem_fun (*this, &Mixer_UI::route_group_row_change)); - + /* We use this to notice drag-and-drop reorders of the group list */ + group_model->signal_row_deleted().connect (sigc::mem_fun (*this, &Mixer_UI::route_group_row_deleted)); group_display.signal_button_press_event().connect (sigc::mem_fun (*this, &Mixer_UI::group_display_button_press), false); group_display_scroller.add (group_display); @@ -173,16 +169,12 @@ Mixer_UI::Mixer_UI () route_group_add_button->signal_clicked().connect (sigc::mem_fun (*this, &Mixer_UI::new_route_group)); route_group_remove_button->signal_clicked().connect (sigc::mem_fun (*this, &Mixer_UI::remove_selected_route_group)); - route_group_display_button_box->add (*route_group_remove_button); route_group_display_button_box->add (*route_group_add_button); + route_group_display_button_box->add (*route_group_remove_button); group_display_vbox.pack_start (group_display_scroller, true, true); group_display_vbox.pack_start (*route_group_display_button_box, false, false); - track_display_frame.set_name("BaseFrame"); - track_display_frame.set_shadow_type (Gtk::SHADOW_IN); - track_display_frame.add(track_display_scroller); - group_display_frame.set_name ("BaseFrame"); group_display_frame.set_shadow_type (Gtk::SHADOW_IN); group_display_frame.add (group_display_vbox); @@ -199,8 +191,8 @@ Mixer_UI::Mixer_UI () #else global_hpacker.pack_start (out_packer, false, false, 12); #endif - list_hpane.add1(list_vpacker); - list_hpane.add2(global_hpacker); + list_hpane.pack1(list_vpacker, true, 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 (&rhs_pane1))); @@ -212,21 +204,15 @@ Mixer_UI::Mixer_UI () add (global_vpacker); set_name ("MixerWindow"); - WindowTitle title(Glib::get_application_name()); - title += _("Mixer"); - set_title (title.get_string()); - - set_wmclass (X_("ardour_mixer"), "Ardour"); + update_title (); - add_accel_group (ActionManager::ui_manager->get_accel_group()); + set_wmclass (X_("ardour_mixer"), PROGRAM_NAME); signal_delete_event().connect (sigc::mem_fun (*this, &Mixer_UI::hide_window)); add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK); signal_configure_event().connect (sigc::mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler)); - _selection.RoutesChanged.connect (sigc::mem_fun(*this, &Mixer_UI::follow_strip_selection)); - route_group_display_button_box->show(); route_group_add_button->show(); route_group_remove_button->show(); @@ -240,26 +226,25 @@ Mixer_UI::Mixer_UI () list_vpacker.show(); group_display_button_label.show(); group_display_button.show(); - track_display_scroller.show(); group_display_scroller.show(); group_display_vbox.show(); - track_display_frame.show(); group_display_frame.show(); rhs_pane1.show(); strip_packer.show(); out_packer.show(); list_hpane.show(); - track_display.show(); group_display.show(); auto_rebinding = FALSE; + _in_group_rebuild_or_clear = false; + MixerStrip::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&Mixer_UI::remove_strip, this, _1), gui_context()); MonitorSection::setup_knob_images (); #ifndef DEFER_PLUGIN_SELECTOR_LOAD - _plugin_selector = new PluginSelector (PluginManager::the_manager ()); + _plugin_selector = new PluginSelector (PluginManager::instance ()); #endif } @@ -267,6 +252,13 @@ Mixer_UI::~Mixer_UI () { } +void +Mixer_UI::track_editor_selection () +{ + PublicEditor::instance().get_selection().TracksChanged.connect (sigc::mem_fun (*this, &Mixer_UI::follow_editor_selection)); +} + + void Mixer_UI::ensure_float (Window& win) { @@ -280,6 +272,9 @@ Mixer_UI::show_window () if (!_visible) { set_window_pos_and_size (); + /* show/hide group tabs as required */ + parameter_changed ("show-group-tabs"); + /* now reset each strips width so the right widgets are shown */ MixerStrip* ms; @@ -289,8 +284,14 @@ Mixer_UI::show_window () for (ri = rows.begin(); ri != rows.end(); ++ri) { 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")); } } + + /* force focus into main area */ + scroller_base.grab_focus (); + _visible = true; } @@ -354,7 +355,7 @@ Mixer_UI::add_strip (RouteList& routes) TreeModel::Row row = *(track_model->append()); row[track_columns.text] = route->name(); - row[track_columns.visible] = strip->marked_for_display(); + row[track_columns.visible] = strip->route()->is_master() ? true : strip->marked_for_display(); row[track_columns.route] = route; row[track_columns.strip] = strip; @@ -385,8 +386,6 @@ Mixer_UI::remove_strip (MixerStrip* strip) ENSURE_GUI_THREAD (*this, &Mixer_UI::remove_strip, strip); - cerr << "Mixer UI removing strip for " << strip << endl; - TreeModel::Children rows = track_model->children(); TreeModel::Children::iterator ri; list::iterator i; @@ -454,30 +453,104 @@ Mixer_UI::sync_order_keys (string const & src) } void -Mixer_UI::follow_strip_selection () +Mixer_UI::follow_editor_selection () +{ + if (!Config->get_link_editor_and_mixer_selection() || _following_editor_selection) { + return; + } + + _following_editor_selection = true; + _selection.block_routes_changed (true); + + TrackSelection& s (PublicEditor::instance().get_selection().tracks); + + _selection.clear_routes (); + + for (TrackViewList::iterator i = s.begin(); i != s.end(); ++i) { + RouteTimeAxisView* rtav = dynamic_cast (*i); + if (rtav) { + MixerStrip* ms = strip_by_route (rtav->route()); + if (ms) { + _selection.add (ms); + } + } + } + + _following_editor_selection = false; + _selection.block_routes_changed (false); +} + + +MixerStrip* +Mixer_UI::strip_by_route (boost::shared_ptr r) { for (list::iterator i = strips.begin(); i != strips.end(); ++i) { - (*i)->set_selected (_selection.selected ((*i)->route())); + if ((*i)->route() == r) { + return (*i); + } } + + return 0; } bool Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip) { if (ev->button == 1) { - - /* this allows the user to click on the strip to terminate comment - 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()); + if (_selection.selected (strip)) { + /* primary-click: toggle selection state of strip */ + if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { + _selection.remove (strip); + } } else { - if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { - _selection.add (strip->route()); + 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 tmp; + bool accumulate = false; + + tmp.push_back (strip); + + for (list::iterator i = strips.begin(); i != strips.end(); ++i) { + if ((*i) == strip) { + /* hit clicked strip, start accumulating till we hit the first + selected strip + */ + if (accumulate) { + /* done */ + break; + } else { + accumulate = true; + } + } else if (_selection.selected (*i)) { + /* hit selected strip. if currently accumulating others, + we're done. if not accumulating others, start doing so. + */ + if (accumulate) { + /* done */ + break; + } else { + accumulate = true; + } + } else { + if (accumulate) { + tmp.push_back (*i); + } + } + } + + for (vector::iterator i = tmp.begin(); i != tmp.end(); ++i) { + _selection.add (*i); + } + } + } else { - _selection.set (strip->route()); + _selection.set (strip); } } } @@ -503,18 +576,19 @@ Mixer_UI::set_session (Session* sess) XMLNode* node = ARDOUR_UI::instance()->mixer_settings(); set_state (*node); - WindowTitle title(_session->name()); - title += _("Mixer"); - title += Glib::get_application_name(); - - set_title (title.get_string()); + update_title (); initial_track_display (); _session->RouteAdded.connect (_session_connections, invalidator (*this), ui_bind (&Mixer_UI::add_strip, this, _1), gui_context()); _session->route_group_added.connect (_session_connections, invalidator (*this), ui_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()); _session->config.ParameterChanged.connect (_session_connections, invalidator (*this), ui_bind (&Mixer_UI::parameter_changed, this, _1), gui_context()); + _session->DirtyChanged.connect (_session_connections, invalidator (*this), boost::bind (&Mixer_UI::update_title, this), gui_context()); + _session->StateSaved.connect (_session_connections, invalidator (*this), ui_bind (&Mixer_UI::update_title, this), gui_context()); + + Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&Mixer_UI::parameter_changed, this, _1), gui_context ()); route_groups_changed (); @@ -528,9 +602,12 @@ Mixer_UI::set_session (Session* sess) void Mixer_UI::session_going_away () { - ENSURE_GUI_THREAD (*this, &Mixer_UI::session_going_away) + ENSURE_GUI_THREAD (*this, &Mixer_UI::session_going_away); + _in_group_rebuild_or_clear = true; group_model->clear (); + _in_group_rebuild_or_clear = false; + _selection.clear (); track_model->clear (); @@ -544,13 +621,12 @@ Mixer_UI::session_going_away () strips.clear (); - WindowTitle title(Glib::get_application_name()); - title += _("Mixer"); - set_title (title.get_string()); - stop_updating (); SessionHandlePtr::session_going_away (); + + _session = 0; + update_title (); } void @@ -765,15 +841,14 @@ Mixer_UI::redisplay_track_list () continue; } - bool visible = (*i)[track_columns.visible]; - - if (visible) { - strip->set_marked_for_display (true); + if (!strip_redisplay_does_not_reset_order_keys) { strip->route()->set_order_key (N_("signal"), order); + } - 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) { + strip->set_gui_property ("visible", true); if (strip->packed()) { @@ -791,12 +866,11 @@ Mixer_UI::redisplay_track_list () strip_packer.pack_start (*strip, false, false); } strip->set_packed (true); - //strip->show(); } } else { - strip->set_marked_for_display (false); + strip->set_gui_property ("visible", false); if (strip->route()->is_master() || strip->route()->is_monitor()) { /* do nothing, these cannot be hidden */ @@ -815,8 +889,9 @@ Mixer_UI::redisplay_track_list () // Resigc::bind all of the midi controls automatically - if (auto_rebinding) + if (auto_rebinding) { auto_rebind_midi_controls (); + } _group_tabs->set_dirty (); } @@ -1056,37 +1131,9 @@ Mixer_UI::strip_property_changed (const PropertyChange& what_changed, MixerStrip error << _("track display list item for renamed strip not found!") << endmsg; } - -void -Mixer_UI::build_route_group_context_menu () -{ - using namespace Gtk::Menu_Helpers; - - route_group_context_menu = new Menu; - route_group_context_menu->set_name ("ArdourContextMenu"); - MenuList& items = route_group_context_menu->items(); - - items.push_back (MenuElem (_("Activate All"), sigc::mem_fun(*this, &Mixer_UI::activate_all_route_groups))); - items.push_back (MenuElem (_("Disable All"), sigc::mem_fun(*this, &Mixer_UI::disable_all_route_groups))); - items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Add group"), sigc::mem_fun(*this, &Mixer_UI::new_route_group))); - -} - bool Mixer_UI::group_display_button_press (GdkEventButton* ev) { - if (Keyboard::is_context_menu_event (ev)) { - if (route_group_context_menu == 0) { - build_route_group_context_menu (); - } - route_group_context_menu->popup (1, ev->time); - return true; - } - - - RouteGroup* group; - TreeIter iter; TreeModel::Path path; TreeViewColumn* column; int cellx; @@ -1096,32 +1143,40 @@ Mixer_UI::group_display_button_press (GdkEventButton* ev) return false; } + TreeIter iter = group_model->get_iter (path); + if (!iter) { + return false; + } + + RouteGroup* group = (*iter)[group_columns.group]; + + if (Keyboard::is_context_menu_event (ev)) { + _group_tabs->get_menu(group)->popup (1, ev->time); + return true; + } + switch (GPOINTER_TO_UINT (column->get_data (X_("colnum")))) { case 0: if (Keyboard::is_edit_event (ev)) { - if ((iter = group_model->get_iter (path))) { - if ((group = (*iter)[group_columns.group]) != 0) { - // edit_route_group (group); + if (group) { + // edit_route_group (group); #ifdef GTKOSX - group_display.queue_draw(); + group_display.queue_draw(); #endif - return true; - } + return true; } - } break; case 1: - if ((iter = group_model->get_iter (path))) { - bool visible = (*iter)[group_columns.visible]; - (*iter)[group_columns.visible] = !visible; + { + bool visible = (*iter)[group_columns.visible]; + (*iter)[group_columns.visible] = !visible; #ifdef GTKOSX - group_display.queue_draw(); + group_display.queue_draw(); #endif - return true; - } - break; + return true; + } default: break; @@ -1145,7 +1200,9 @@ Mixer_UI::disable_all_route_groups () void Mixer_UI::route_groups_changed () { - ENSURE_GUI_THREAD (*this, &Mixer_UI::route_groups_changed) + ENSURE_GUI_THREAD (*this, &Mixer_UI::route_groups_changed); + + _in_group_rebuild_or_clear = true; /* just rebuild the while thing */ @@ -1160,22 +1217,17 @@ Mixer_UI::route_groups_changed () } _session->foreach_route_group (sigc::mem_fun (*this, &Mixer_UI::add_route_group)); + + _group_tabs->set_dirty (); + _in_group_rebuild_or_clear = false; } void Mixer_UI::new_route_group () { - PropertyList plist; - - plist.add (Properties::active, true); - plist.add (Properties::gain, true); - plist.add (Properties::mute, true); - plist.add (Properties::solo, true); + RouteList rl; - RouteGroup* g = new RouteGroup (*_session, ""); - g->set_properties (plist); - - _session->add_route_group (g); + _group_tabs->run_new_group_dialog (rl); } void @@ -1239,10 +1291,20 @@ Mixer_UI::route_group_property_changed (RouteGroup* group, const PropertyChange& if (change.contains (Properties::name)) { _group_tabs->set_dirty (); } + + for (list::iterator j = strips.begin(); j != strips.end(); ++j) { + if ((*j)->route_group() == group) { + if (group->is_hidden ()) { + hide_strip (*j); + } else { + show_strip (*j); + } + } + } } void -Mixer_UI::route_group_name_edit (const Glib::ustring& path, const Glib::ustring& new_text) +Mixer_UI::route_group_name_edit (const std::string& path, const std::string& new_text) { RouteGroup* group; TreeIter iter; @@ -1272,28 +1334,46 @@ Mixer_UI::route_group_row_change (const Gtk::TreeModel::Path&, const Gtk::TreeMo return; } - if ((*iter)[group_columns.visible]) { - for (list::iterator i = strips.begin(); i != strips.end(); ++i) { - if ((*i)->route_group() == group) { - show_strip (*i); - } - } - } else { - for (list::iterator i = strips.begin(); i != strips.end(); ++i) { - if ((*i)->route_group() == group) { - hide_strip (*i); - } - } - } - - Glib::ustring name = (*iter)[group_columns.text]; + std::string name = (*iter)[group_columns.text]; if (name != group->name()) { group->set_name (name); } + bool hidden = !(*iter)[group_columns.visible]; + + if (hidden != group->is_hidden ()) { + group->set_hidden (hidden, this); + } +} + +/** Called when a group model row is deleted, but also when the model is + * reordered by a user drag-and-drop; the latter is what we are + * interested in here. + */ +void +Mixer_UI::route_group_row_deleted (Gtk::TreeModel::Path const &) +{ + if (_in_group_rebuild_or_clear) { + return; + } + + /* Re-write the session's route group list so that the new order is preserved */ + + list new_list; + + Gtk::TreeModel::Children children = group_model->children(); + for (Gtk::TreeModel::Children::iterator i = children.begin(); i != children.end(); ++i) { + RouteGroup* g = (*i)[group_columns.group]; + if (g) { + new_list.push_back (g); + } + } + + _session->reorder_route_groups (new_list); } + void Mixer_UI::add_route_group (RouteGroup* group) { @@ -1303,7 +1383,7 @@ Mixer_UI::add_route_group (RouteGroup* group) in_group_row_change = true; TreeModel::Row row = *(group_model->append()); - row[group_columns.visible] = true; + row[group_columns.visible] = !group->is_hidden (); row[group_columns.group] = group; if (!group->name().empty()) { row[group_columns.text] = group->name(); @@ -1320,6 +1400,8 @@ Mixer_UI::add_route_group (RouteGroup* group) group_display.set_cursor (group_model->get_path (row), *col, *name_cell, true); } + _group_tabs->set_dirty (); + in_group_row_change = false; } @@ -1473,21 +1555,13 @@ Mixer_UI::pane_allocation_handler (Allocation&, Gtk::Paned* which) char buf[32]; XMLNode* node = ARDOUR_UI::instance()->mixer_settings(); XMLNode* geometry; - int width, height; + int height; static int32_t done[3] = { 0, 0, 0 }; - width = default_width; height = default_height; if ((geometry = find_named_node (*node, "geometry")) != 0) { - - if ((prop = geometry->property ("x_size")) == 0) { - prop = geometry->property ("x-size"); - } - if (prop) { - width = atoi (prop->value()); - } if ((prop = geometry->property ("y_size")) == 0) { prop = geometry->property ("y-size"); } @@ -1532,7 +1606,7 @@ Mixer_UI::pane_allocation_handler (Allocation&, Gtk::Paned* which) } } void -Mixer_UI::scroll_left () +Mixer_UI::scroll_left () { Adjustment* adj = scroller.get_hscrollbar()->get_adjustment(); /* stupid GTK: can't rely on clamping across versions */ @@ -1550,29 +1624,40 @@ Mixer_UI::scroll_right () bool Mixer_UI::on_key_press_event (GdkEventKey* ev) { - switch (ev->keyval) { - case GDK_Left: - scroll_left (); - return true; + /* focus widget gets first shot, then bindings, otherwise + forward to main window + */ - case GDK_Right: - scroll_right (); + if (gtk_window_propagate_key_event (GTK_WINDOW(gobj()), ev)) { return true; - - default: - break; } - - return key_press_focus_accelerator_handler (*this, ev); + + KeyboardKey k (ev->state, ev->keyval); + + if (bindings.activate (k, Bindings::Press)) { + return true; + } + + return forward_key_press (ev); } bool Mixer_UI::on_key_release_event (GdkEventKey* ev) { - return Gtk::Window::on_key_release_event (ev); - // return key_press_focus_accelerator_handler (*this, ev); -} + if (gtk_window_propagate_key_event (GTK_WINDOW(gobj()), ev)) { + return true; + } + KeyboardKey k (ev->state, ev->keyval); + + if (bindings.activate (k, Bindings::Release)) { + return true; + } + + /* don't forward releases */ + + return true; +} bool Mixer_UI::on_scroll_event (GdkEventScroll* ev) @@ -1614,6 +1699,11 @@ Mixer_UI::parameter_changed (string const & p) } else { _group_tabs->hide (); } + } else if (p == "default-narrow_ms") { + bool const s = Config->get_default_narrow_ms (); + for (list::iterator i = strips.begin(); i != strips.end(); ++i) { + (*i)->set_width_enum (s ? Narrow : Wide, this); + } } } @@ -1628,8 +1718,135 @@ Mixer_UI::plugin_selector() { #ifdef DEFER_PLUGIN_SELECTOR_LOAD if (!_plugin_selector) - _plugin_selector = new PluginSelector (PluginManager::the_manager ()); + _plugin_selector = new PluginSelector (PluginManager::instance()); #endif return _plugin_selector; } + +void +Mixer_UI::setup_track_display () +{ + track_model = ListStore::create (track_columns); + track_display.set_model (track_model); + track_display.append_column (_("Strips"), track_columns.text); + track_display.append_column (_("Show"), track_columns.visible); + track_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0)); + 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.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(track_display.get_column_cell_renderer (1)); + track_list_visible_cell->property_activatable() = true; + track_list_visible_cell->property_radio() = false; + + track_display.signal_button_press_event().connect (sigc::mem_fun (*this, &Mixer_UI::track_display_button_press), false); + + track_display_scroller.add (track_display); + track_display_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); + + VBox* v = manage (new VBox); + v->show (); + v->pack_start (track_display_scroller, true, true); + + Button* b = manage (new Button); + b->show (); + Widget* w = manage (new Image (Stock::ADD, ICON_SIZE_BUTTON)); + w->show (); + b->add (*w); + + b->signal_clicked().connect (sigc::mem_fun (*this, &Mixer_UI::new_track_or_bus)); + + v->pack_start (*b, false, false); + + track_display_frame.set_name("BaseFrame"); + track_display_frame.set_shadow_type (Gtk::SHADOW_IN); + track_display_frame.add (*v); + + track_display_scroller.show(); + track_display_frame.show(); + track_display.show(); +} + +void +Mixer_UI::new_track_or_bus () +{ + ARDOUR_UI::instance()->add_route (this); +} + + +void +Mixer_UI::update_title () +{ + if (_session) { + string n; + + if (_session->snap_name() != _session->name()) { + n = _session->snap_name (); + } else { + n = _session->name (); + } + + 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()); + } +} + +MixerStrip* +Mixer_UI::strip_by_x (int x) +{ + for (list::iterator i = strips.begin(); i != strips.end(); ++i) { + int x1, x2, y; + + (*i)->translate_coordinates (*this, 0, 0, x1, y); + x2 = x1 + (*i)->get_width(); + + if (x >= x1 && x <= x2) { + return (*i); + } + } + + return 0; +} + +void +Mixer_UI::set_route_targets_for_operation () +{ + _route_targets.clear (); + + if (!_selection.empty()) { + _route_targets = _selection.routes; + return; + } + + /* try to get mixer strip at mouse */ + + int x, y; + get_pointer (x, y); + + MixerStrip* ms = strip_by_x (x); + + if (ms) { + _route_targets.insert (ms); + } +}