X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_ui.cc;h=46458d889f3e372ab4db704efb282665f9a7a577;hb=b78d036aa056af0ef4f5821c45dae5f70bc69231;hp=c98d0028e97d86162c6ffd8bddf1ba4ac1e13006;hpb=325671e20afa56f5c796d14ce9bb76146a232f0b;p=ardour.git diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index c98d0028e9..46458d889f 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,10 +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" @@ -67,8 +70,7 @@ Mixer_UI::Mixer_UI () { _strip_width = Config->get_default_narrow_ms() ? Narrow : Wide; track_menu = 0; - monitor_section = 0; - route_group_context_menu = 0; + _monitor_section = 0; no_track_list_redisplay = false; in_group_row_change = false; _visible = false; @@ -76,7 +78,7 @@ Mixer_UI::Mixer_UI () strip_redisplay_does_not_sync_order_keys = false; ignore_sync = false; - Route::SyncOrderKeys.connect (*this, ui_bind (&Mixer_UI::sync_order_keys, this, _1), gui_context()); + Route::SyncOrderKeys.connect (*this, invalidator (*this), ui_bind (&Mixer_UI::sync_order_keys, this, _1), gui_context()); scroller_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); scroller_base.set_name ("MixerWindow"); @@ -93,31 +95,7 @@ Mixer_UI::Mixer_UI () 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); - - 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); @@ -172,16 +150,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); @@ -215,7 +189,7 @@ Mixer_UI::Mixer_UI () title += _("Mixer"); set_title (title.get_string()); - set_wmclass (X_("ardour_mixer"), "Ardour"); + set_wmclass (X_("ardour_mixer"), PROGRAM_NAME); add_accel_group (ActionManager::ui_manager->get_accel_group()); @@ -239,21 +213,18 @@ 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; - MixerStrip::CatchDeletion.connect (*this, ui_bind (&Mixer_UI::remove_strip, this, _1), gui_context()); + MixerStrip::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&Mixer_UI::remove_strip, this, _1), gui_context()); MonitorSection::setup_knob_images (); @@ -320,15 +291,26 @@ Mixer_UI::add_strip (RouteList& routes) continue; } - if (route->is_control()) { - monitor_section = new MonitorSection (_session); - out_packer.pack_end (monitor_section->pack_widget(), false, false); - monitor_section->pack_widget().show_all (); - /* no regular strip */ + if (route->is_monitor()) { + if (!_monitor_section) { + _monitor_section = new MonitorSection (_session); + out_packer.pack_end (_monitor_section->tearoff(), false, false); + } else { + _monitor_section->set_session (_session); + } + + _monitor_section->tearoff().show_all (); + + XMLNode* mnode = ARDOUR_UI::instance()->tearoff_settings (X_("monitor-section")); + if (mnode) { + _monitor_section->tearoff().set_state (*mnode); + } + + /* no regular strip shown for control out */ + continue; } - strip = new MixerStrip (*this, _session, route); strips.push_back (strip); @@ -350,7 +332,7 @@ Mixer_UI::add_strip (RouteList& routes) route->set_order_key (N_("signal"), track_model->children().size()-1); } - route->PropertyChanged.connect (*this, ui_bind (&Mixer_UI::strip_property_changed, this, _1, strip), gui_context()); + route->PropertyChanged.connect (*this, invalidator (*this), ui_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)); @@ -499,10 +481,12 @@ Mixer_UI::set_session (Session* sess) initial_track_display (); - _session->RouteAdded.connect (_session_connections, ui_bind (&Mixer_UI::add_strip, this, _1), gui_context()); - _session->route_group_added.connect (_session_connections, ui_bind (&Mixer_UI::add_route_group, this, _1), gui_context()); - _session->route_group_removed.connect (_session_connections, boost::bind (&Mixer_UI::route_groups_changed, this), gui_context()); - _session->config.ParameterChanged.connect (_session_connections, ui_bind (&Mixer_UI::parameter_changed, this, _1), gui_context()); + _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->config.ParameterChanged.connect (_session_connections, invalidator (*this), ui_bind (&Mixer_UI::parameter_changed, this, _1), gui_context()); + + Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&Mixer_UI::parameter_changed, this, _1), gui_context ()); route_groups_changed (); @@ -521,14 +505,15 @@ Mixer_UI::session_going_away () group_model->clear (); _selection.clear (); track_model->clear (); - - delete monitor_section; - monitor_section = 0; for (list::iterator i = strips.begin(); i != strips.end(); ++i) { delete (*i); } + if (_monitor_section) { + _monitor_section->tearoff().hide_visible (); + } + strips.clear (); WindowTitle title(Glib::get_application_name()); @@ -593,10 +578,6 @@ Mixer_UI::fast_update_strips () for (list::iterator i = strips.begin(); i != strips.end(); ++i) { (*i)->fast_update (); } - - if (monitor_section) { - monitor_section->fast_update (); - } } } @@ -617,7 +598,7 @@ Mixer_UI::set_all_strips_visibility (bool yn) continue; } - if (strip->route()->is_master() || strip->route()->is_control()) { + if (strip->route()->is_master() || strip->route()->is_monitor()) { continue; } @@ -645,7 +626,7 @@ Mixer_UI::set_all_audio_visibility (int tracks, bool yn) continue; } - if (strip->route()->is_master() || strip->route()->is_control()) { + if (strip->route()->is_master() || strip->route()->is_monitor()) { continue; } @@ -768,7 +749,7 @@ Mixer_UI::redisplay_track_list () if (strip->packed()) { - if (strip->route()->is_master() || strip->route()->is_control()) { + if (strip->route()->is_master() || strip->route()->is_monitor()) { out_packer.reorder_child (*strip, -1); } else { strip_packer.reorder_child (*strip, -1); /* put at end */ @@ -776,7 +757,7 @@ Mixer_UI::redisplay_track_list () } else { - if (strip->route()->is_master() || strip->route()->is_control()) { + if (strip->route()->is_master() || strip->route()->is_monitor()) { out_packer.pack_start (*strip, false, false); } else { strip_packer.pack_start (*strip, false, false); @@ -789,7 +770,7 @@ Mixer_UI::redisplay_track_list () strip->set_marked_for_display (false); - if (strip->route()->is_master() || strip->route()->is_control()) { + if (strip->route()->is_master() || strip->route()->is_monitor()) { /* do nothing, these cannot be hidden */ } else { if (strip->packed()) { @@ -987,7 +968,7 @@ Mixer_UI::track_display_button_press (GdkEventButton* ev) MixerStrip* strip = (*iter)[track_columns.strip]; if (strip) { - if (!strip->route()->is_master() && !strip->route()->is_control()) { + if (!strip->route()->is_master() && !strip->route()->is_monitor()) { bool visible = (*iter)[track_columns.visible]; (*iter)[track_columns.visible] = !visible; } @@ -1047,37 +1028,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; @@ -1087,32 +1040,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; @@ -1151,22 +1112,16 @@ Mixer_UI::route_groups_changed () } _session->foreach_route_group (sigc::mem_fun (*this, &Mixer_UI::add_route_group)); + + _group_tabs->set_dirty (); } 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); - - RouteGroup* g = new RouteGroup (*_session, ""); - g->set_properties (plist); - - _session->add_route_group (g); + RouteList rl; + + _group_tabs->run_new_group_dialog (rl); } void @@ -1195,14 +1150,12 @@ Mixer_UI::remove_selected_route_group () } void -Mixer_UI::group_flags_changed (void* src, RouteGroup* group) +Mixer_UI::route_group_property_changed (RouteGroup* group, const PropertyChange& change) { if (in_group_row_change) { return; } - ENSURE_GUI_THREAD (*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 */ @@ -1229,11 +1182,13 @@ Mixer_UI::group_flags_changed (void* src, RouteGroup* group) in_group_row_change = false; - _group_tabs->set_dirty (); + if (change.contains (Properties::name)) { + _group_tabs->set_dirty (); + } } 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; @@ -1277,7 +1232,7 @@ Mixer_UI::route_group_row_change (const Gtk::TreeModel::Path&, const Gtk::TreeMo } } - Glib::ustring name = (*iter)[group_columns.text]; + std::string name = (*iter)[group_columns.text]; if (name != group->name()) { group->set_name (name); @@ -1303,7 +1258,7 @@ Mixer_UI::add_route_group (RouteGroup* group) focus = true; } - group->FlagsChanged.connect (*this, ui_bind (&Mixer_UI::group_flags_changed, this, _1, group), gui_context()); + group->PropertyChanged.connect (*this, invalidator (*this), ui_bind (&Mixer_UI::route_group_property_changed, this, group, _1), gui_context()); if (focus) { TreeViewColumn* col = group_display.get_column (0); @@ -1311,6 +1266,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; } @@ -1605,6 +1562,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); + } } } @@ -1624,3 +1586,61 @@ Mixer_UI::plugin_selector() 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); +}