X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_ui.cc;h=8da14e2f469e7b46b0a9d1d9e9e1df2c725d16d2;hb=b857756f6034f1d9baf4181e824a5166dfd1acc8;hp=983903d6dd04da5e56ad802564ce46a122f13c32;hpb=912da52a539981193941d8739fa6f103b5e406db;p=ardour.git diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 983903d6dd..8da14e2f46 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #include @@ -29,14 +28,16 @@ #include #include #include +#include -#include -#include -#include -#include #include +#include #include +#include +#include +#include +#include "keyboard.h" #include "mixer_ui.h" #include "mixer_strip.h" #include "plugin_selector.h" @@ -58,18 +59,21 @@ using namespace std; using PBD::atoi; -Mixer_UI::Mixer_UI (AudioEngine& eng) - : Window (Gtk::WINDOW_TOPLEVEL), - engine (eng) +Mixer_UI::Mixer_UI () + : Window (Gtk::WINDOW_TOPLEVEL) { - _strip_width = Wide; + session = 0; + _strip_width = Config->get_default_narrow_ms() ? Narrow : Wide; track_menu = 0; mix_group_context_menu = 0; no_track_list_redisplay = false; in_group_row_change = false; + _visible = false; + strip_redisplay_does_not_reset_order_keys = false; + strip_redisplay_does_not_sync_order_keys = false; + ignore_sync = false; - XMLNode* node = ARDOUR_UI::instance()->mixer_settings(); - set_state (*node); + 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"); @@ -78,12 +82,12 @@ Mixer_UI::Mixer_UI (AudioEngine& eng) strip_packer.pack_end (scroller_base, true, true); scroller.add (strip_packer); - scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); + 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 (_("Visible"), track_columns.visible); + 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); @@ -95,6 +99,7 @@ Mixer_UI::Mixer_UI (AudioEngine& eng) track_model->signal_row_deleted().connect (mem_fun (*this, &Mixer_UI::track_list_delete)); track_model->signal_row_changed().connect (mem_fun (*this, &Mixer_UI::track_list_change)); + track_model->signal_rows_reordered().connect (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; @@ -109,7 +114,7 @@ Mixer_UI::Mixer_UI (AudioEngine& eng) group_display.set_model (group_model); group_display.append_column (_("Group"), group_columns.text); group_display.append_column (_("Active"), group_columns.active); - group_display.append_column (_("Visible"), group_columns.visible); + group_display.append_column (_("Show"), group_columns.visible); group_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0)); group_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1)); group_display.get_column (2)->set_data (X_("colnum"), GUINT_TO_POINTER(2)); @@ -187,8 +192,12 @@ Mixer_UI::Mixer_UI (AudioEngine& eng) list_vpacker.pack_start (rhs_pane1, true, true); global_hpacker.pack_start (scroller, true, true); - global_hpacker.pack_start (out_packer, false, false); - +#ifdef GTKOSX + /* current gtk-quartz has dirty updates on borders like this one */ + global_hpacker.pack_start (out_packer, false, false, 0); +#else + global_hpacker.pack_start (out_packer, false, false, 12); +#endif list_hpane.add1(list_vpacker); list_hpane.add2(global_hpacker); @@ -197,23 +206,20 @@ Mixer_UI::Mixer_UI (AudioEngine& eng) list_hpane.signal_size_allocate().connect (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler), static_cast (&list_hpane))); - - rhs_pane1.set_data ("collapse-direction", (gpointer) 0); - list_hpane.set_data ("collapse-direction", (gpointer) 1); - - rhs_pane1.signal_button_release_event().connect (bind (sigc::ptr_fun (pane_handler), static_cast(&rhs_pane1))); - list_hpane.signal_button_release_event().connect (bind (sigc::ptr_fun (pane_handler), static_cast(&list_hpane))); - global_vpacker.pack_start (list_hpane, true, true); add (global_vpacker); set_name ("MixerWindow"); - set_title (_("ardour: mixer")); - set_wmclass (_("ardour_mixer"), "Ardour"); + + WindowTitle title(Glib::get_application_name()); + title += _("Mixer"); + set_title (title.get_string()); + + set_wmclass (X_("ardour_mixer"), "Ardour"); add_accel_group (ActionManager::ui_manager->get_accel_group()); - signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), static_cast(this))); + 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()); @@ -221,6 +227,33 @@ Mixer_UI::Mixer_UI (AudioEngine& eng) signal_configure_event().connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler)); _selection.RoutesChanged.connect (mem_fun(*this, &Mixer_UI::follow_strip_selection)); + + mix_group_display_button_box->show(); + mix_group_add_button->show(); + mix_group_remove_button->show(); + + global_hpacker.show(); + global_vpacker.show(); + scroller.show(); + scroller_base.show(); + scroller_hpacker.show(); + mixer_scroller_vpacker.show(); + 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; } Mixer_UI::~Mixer_UI () @@ -236,60 +269,95 @@ Mixer_UI::ensure_float (Window& win) void Mixer_UI::show_window () { - show_all (); + present (); + if (!_visible) { + set_window_pos_and_size (); - /* now reset each strips width so the right widgets are shown */ - MixerStrip* ms; + /* 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 (ms->get_width(), ms->width_owner()); + } + } + _visible = true; +} - TreeModel::Children rows = track_model->children(); - TreeModel::Children::iterator ri; +bool +Mixer_UI::hide_window (GdkEventAny *ev) +{ + get_window_pos_and_size (); - for (ri = rows.begin(); ri != rows.end(); ++ri) { - ms = (*ri)[track_columns.strip]; - ms->set_width (ms->get_width()); - } + _visible = false; + return just_hide_it(ev, static_cast(this)); } + void -Mixer_UI::add_strip (Route* route) +Mixer_UI::add_strip (RouteList& routes) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_strip), route)); + ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_strip), routes)); MixerStrip* strip; - if (route->hidden()) { - return; - } + no_track_list_redisplay = true; + strip_redisplay_does_not_sync_order_keys = true; - strip = new MixerStrip (*this, *session, *route); - strips.push_back (strip); + for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) { + boost::shared_ptr route = (*x); - strip->set_width (_strip_width); - show_strip (strip); + 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; - no_track_list_redisplay = true; + Config->get_default_narrow_ms() ? _strip_width = Narrow : _strip_width = Wide; - TreeModel::Row row = *(track_model->append()); - row[track_columns.text] = route->name(); + if (strip->width_owner() != strip) { + strip->set_width (_strip_width, this); + } - row[track_columns.visible] = true; - row[track_columns.route] = route; - row[track_columns.strip] = strip; + show_strip (strip); + + TreeModel::Row row = *(track_model->append()); + row[track_columns.text] = route->name(); + row[track_columns.visible] = strip->marked_for_display(); + row[track_columns.route] = route; + row[track_columns.strip] = strip; + + 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)); - no_track_list_redisplay = false; - redisplay_track_list (); + strip->GoingAway.connect (bind (mem_fun(*this, &Mixer_UI::remove_strip), strip)); +#ifdef GTKOSX + strip->WidthChanged.connect (mem_fun(*this, &Mixer_UI::queue_draw_all_strips)); +#endif + strip->signal_button_release_event().connect (bind (mem_fun(*this, &Mixer_UI::strip_button_release_event), strip)); + } - route->name_changed.connect (bind (mem_fun(*this, &Mixer_UI::strip_name_changed), strip)); - strip->GoingAway.connect (bind (mem_fun(*this, &Mixer_UI::remove_strip), strip)); + no_track_list_redisplay = false; - strip->signal_button_release_event().connect (bind (mem_fun(*this, &Mixer_UI::strip_button_release_event), strip)); + redisplay_track_list (); + + strip_redisplay_does_not_sync_order_keys = false; } void Mixer_UI::remove_strip (MixerStrip* strip) { ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::remove_strip), strip)); - + TreeModel::Children rows = track_model->children(); TreeModel::Children::iterator ri; list::iterator i; @@ -298,19 +366,73 @@ Mixer_UI::remove_strip (MixerStrip* strip) strips.erase (i); } + strip_redisplay_does_not_sync_order_keys = true; + for (ri = rows.begin(); ri != rows.end(); ++ri) { if ((*ri)[track_columns.strip] == strip) { track_model->erase (ri); break; } } + + strip_redisplay_does_not_sync_order_keys = false; +} + +const char* +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 (const char *src) +{ + vector neworder; + TreeModel::Children rows = track_model->children(); + TreeModel::Children::iterator ri; + + if ((strcmp (src, get_order_key()) == 0) || !session || (session->state_of_the_state() & Session::Loading) || rows.empty()) { + return; + } + + for (ri = rows.begin(); ri != rows.end(); ++ri) { + neworder.push_back (0); + } + + bool changed = false; + int order; + + for (order = 0, 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()); + + neworder[new_key] = old_key; + + if (new_key != old_key) { + changed = true; + } + } + + if (changed) { + strip_redisplay_does_not_reset_order_keys = true; + track_model->reorder (neworder); + strip_redisplay_does_not_reset_order_keys = false; + } } void Mixer_UI::follow_strip_selection () { for (list::iterator i = strips.begin(); i != strips.end(); ++i) { - (*i)->set_selected (_selection.selected (&(*i)->route())); + (*i)->set_selected (_selection.selected ((*i)->route())); } } @@ -324,13 +446,13 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip) at the same time. */ - if (_selection.selected (&strip->route())) { - _selection.remove (&strip->route()); + if (_selection.selected (strip->route())) { + _selection.remove (strip->route()); } else { - if (Keyboard::modifier_state_equals (ev->state, Keyboard::Shift)) { - _selection.add (&strip->route()); + if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { + _selection.add (strip->route()); } else { - _selection.set (&strip->route()); + _selection.set (strip->route()); } } } @@ -341,15 +463,21 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip) void Mixer_UI::connect_to_session (Session* sess) { + session = sess; - string wintitle = _("ardour: mixer: "); - wintitle += session->name(); - set_title (wintitle); + 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()); initial_track_display (); - session->going_away.connect (mem_fun(*this, &Mixer_UI::disconnect_from_session)); + session->GoingAway.connect (mem_fun(*this, &Mixer_UI::disconnect_from_session)); session->RouteAdded.connect (mem_fun(*this, &Mixer_UI::add_strip)); session->mix_group_added.connect (mem_fun(*this, &Mixer_UI::add_mix_group)); session->mix_group_removed.connect (mem_fun(*this, &Mixer_UI::mix_groups_changed)); @@ -358,6 +486,10 @@ Mixer_UI::connect_to_session (Session* sess) _plugin_selector->set_session (session); + if (_visible) { + show_window(); + } + start_updating (); } @@ -367,18 +499,23 @@ Mixer_UI::disconnect_from_session () ENSURE_GUI_THREAD(mem_fun(*this, &Mixer_UI::disconnect_from_session)); group_model->clear (); - set_title (_("ardour: mixer")); + _selection.clear (); + + WindowTitle title(Glib::get_application_name()); + title += _("Mixer"); + set_title (title.get_string()); + stop_updating (); } void Mixer_UI::show_strip (MixerStrip* ms) { - TreeModel::Children rows = track_model->children(); + 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; @@ -390,7 +527,7 @@ Mixer_UI::show_strip (MixerStrip* ms) void Mixer_UI::hide_strip (MixerStrip* ms) { - TreeModel::Children rows = track_model->children(); + TreeModel::Children rows = track_model->children(); TreeModel::Children::iterator i; for (i = rows.begin(); i != rows.end(); ++i) { @@ -400,37 +537,37 @@ Mixer_UI::hide_strip (MixerStrip* ms) (*i)[track_columns.visible] = false; break; } - } - } + } +} - gint - Mixer_UI::start_updating () - { - fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun(*this, &Mixer_UI::fast_update_strips)); - return 0; - } +gint +Mixer_UI::start_updating () +{ + fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun(*this, &Mixer_UI::fast_update_strips)); + return 0; +} - gint - Mixer_UI::stop_updating () - { - fast_screen_update_connection.disconnect(); - return 0; - } +gint +Mixer_UI::stop_updating () +{ + fast_screen_update_connection.disconnect(); + return 0; +} - void - Mixer_UI::fast_update_strips () - { - if (is_mapped () && session) { - for (list::iterator i = strips.begin(); i != strips.end(); ++i) { - (*i)->fast_update (); - } - } - } +void +Mixer_UI::fast_update_strips () +{ + if (is_mapped () && session) { + for (list::iterator i = strips.begin(); i != strips.end(); ++i) { + (*i)->fast_update (); + } + } +} void Mixer_UI::set_all_strips_visibility (bool yn) { - TreeModel::Children rows = track_model->children(); + TreeModel::Children rows = track_model->children(); TreeModel::Children::iterator i; no_track_list_redisplay = true; @@ -444,7 +581,7 @@ Mixer_UI::set_all_strips_visibility (bool yn) continue; } - if (strip->route().master() || strip->route().control()) { + if (strip->route()->is_master() || strip->route()->is_control()) { continue; } @@ -472,11 +609,11 @@ Mixer_UI::set_all_audio_visibility (int tracks, bool yn) continue; } - if (strip->route().master() || strip->route().control()) { + if (strip->route()->is_master() || strip->route()->is_control()) { continue; } - AudioTrack* at = dynamic_cast (&strip->route()); + boost::shared_ptr at = strip->audio_track(); switch (tracks) { case 0: @@ -535,15 +672,30 @@ Mixer_UI::hide_all_audiotracks () set_all_audio_visibility (1, false); } +void +Mixer_UI::track_list_reorder (const TreeModel::Path& path, const TreeModel::iterator& iter, int* new_order) +{ + strip_redisplay_does_not_sync_order_keys = true; + session->set_remote_control_ids(); + redisplay_track_list (); + strip_redisplay_does_not_sync_order_keys = false; +} + void Mixer_UI::track_list_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter) { + // never reset order keys because of a property change + strip_redisplay_does_not_reset_order_keys = true; + session->set_remote_control_ids(); redisplay_track_list (); + strip_redisplay_does_not_reset_order_keys = false; } void Mixer_UI::track_list_delete (const Gtk::TreeModel::Path& path) { + /* this could require an order sync */ + session->set_remote_control_ids(); redisplay_track_list (); } @@ -570,11 +722,15 @@ Mixer_UI::redisplay_track_list () if (visible) { strip->set_marked_for_display (true); - strip->route().set_order_key (N_("signal"), order); + 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); + } if (strip->packed()) { - if (strip->route().master() || strip->route().control()) { + if (strip->route()->is_master() || strip->route()->is_control()) { out_packer.reorder_child (*strip, -1); } else { strip_packer.reorder_child (*strip, -1); /* put at end */ @@ -582,49 +738,165 @@ Mixer_UI::redisplay_track_list () } else { - if (strip->route().master() || strip->route().control()) { + if (strip->route()->is_master() || strip->route()->is_control()) { out_packer.pack_start (*strip, false, false); } else { strip_packer.pack_start (*strip, false, false); } strip->set_packed (true); - strip->show_all (); + //strip->show(); } } else { - if (strip->route().master() || strip->route().control()) { + if (strip->route()->is_master() || strip->route()->is_control()) { /* do nothing, these cannot be hidden */ } else { - strip_packer.remove (*strip); - strip->set_packed (false); + if (strip->packed()) { + strip_packer.remove (*strip); + strip->set_packed (false); + } } } } + + if (!strip_redisplay_does_not_reset_order_keys && !strip_redisplay_does_not_sync_order_keys) { + session->sync_order_keys (get_order_key()); + } + + // Rebind all of the midi controls automatically + + if (auto_rebinding) + auto_rebind_midi_controls (); +} + +#ifdef GTKOSX +void +Mixer_UI::queue_draw_all_strips () +{ + TreeModel::Children rows = track_model->children(); + TreeModel::Children::iterator i; + long order; + + for (order = 0, i = rows.begin(); i != rows.end(); ++i, ++order) { + MixerStrip* strip = (*i)[track_columns.strip]; + + if (strip == 0) { + continue; + } + + bool visible = (*i)[track_columns.visible]; + + if (visible) { + strip->queue_draw(); + } + } +} +#endif + +void +Mixer_UI::set_auto_rebinding( bool val ) +{ + if( val == TRUE ) + { + auto_rebinding = TRUE; + Session::AutoBindingOff(); + } + else + { + auto_rebinding = FALSE; + Session::AutoBindingOn(); + } +} + +void +Mixer_UI::toggle_auto_rebinding() +{ + if (auto_rebinding) + { + set_auto_rebinding( FALSE ); + } + + else + { + set_auto_rebinding( TRUE ); + } + + auto_rebind_midi_controls(); +} + +void +Mixer_UI::auto_rebind_midi_controls () +{ + TreeModel::Children rows = track_model->children(); + TreeModel::Children::iterator i; + int pos; + + // Create bindings for all visible strips and remove those that are not visible + 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()<route()->is_master() ) { + controlValue = 0; + } + else { + pos++; + } + + PBD::Controllable::CreateBinding ( strip->solo_button->get_controllable().get(), controlValue, 0); + PBD::Controllable::CreateBinding ( strip->mute_button->get_controllable().get(), controlValue, 1); + + if( strip->is_audio_track() ) { + PBD::Controllable::CreateBinding ( strip->rec_enable_button->get_controllable().get(), controlValue, 2); + } + + PBD::Controllable::CreateBinding ( strip->gpm.get_controllable().get(), controlValue, 3); + PBD::Controllable::CreateBinding ( strip->panners.get_controllable().get(), controlValue, 4); + + } + else { // Remove any existing binding + PBD::Controllable::DeleteBinding ( strip->solo_button->get_controllable().get() ); + PBD::Controllable::DeleteBinding ( strip->mute_button->get_controllable().get() ); + + if( strip->is_audio_track() ) { + PBD::Controllable::DeleteBinding ( strip->rec_enable_button->get_controllable().get() ); + } + + PBD::Controllable::DeleteBinding ( strip->gpm.get_controllable().get() ); + PBD::Controllable::DeleteBinding ( strip->panners.get_controllable().get() ); // This only takes the first panner if there are multiples... + } + + } // for + } struct SignalOrderRouteSorter { - bool operator() (Route* a, Route* b) { + bool operator() (boost::shared_ptr a, boost::shared_ptr b) { /* use of ">" forces the correct sort order */ - return a->order_key ("signal") < b->order_key ("signal"); + return a->order_key (Mixer_UI::get_order_key()) < b->order_key (Mixer_UI::get_order_key()); } }; void Mixer_UI::initial_track_display () { - Session::RouteList routes = session->get_routes(); + boost::shared_ptr routes = session->get_routes(); + RouteList copy (*routes); SignalOrderRouteSorter sorter; - routes.sort (sorter); + copy.sort (sorter); no_track_list_redisplay = true; track_model->clear (); - for (Session::RouteList::iterator i = routes.begin(); i != routes.end(); ++i) { - add_strip (*i); - } + add_strip (copy); no_track_list_redisplay = false; @@ -638,7 +910,7 @@ Mixer_UI::show_track_list_menu () build_track_menu (); } - track_menu->popup (1, 0); + track_menu->popup (1, gtk_get_current_event_time()); } bool @@ -670,10 +942,13 @@ Mixer_UI::track_display_button_press (GdkEventButton* ev) MixerStrip* strip = (*iter)[track_columns.strip]; if (strip) { - if (!strip->route().master() && !strip->route().control()) { + if (!strip->route()->is_master() && !strip->route()->is_control()) { bool visible = (*iter)[track_columns.visible]; (*iter)[track_columns.visible] = !visible; } +#ifdef GTKOSX + track_display.queue_draw(); +#endif } } return true; @@ -706,16 +981,16 @@ Mixer_UI::build_track_menu () } void -Mixer_UI::strip_name_changed (void* src, MixerStrip* mx) +Mixer_UI::strip_name_changed (MixerStrip* mx) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::strip_name_changed), src, 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(); + (*i)[track_columns.text] = mx->route()->name(); return; } } @@ -747,7 +1022,7 @@ Mixer_UI::group_display_button_press (GdkEventButton* ev) if (mix_group_context_menu == 0) { build_mix_group_context_menu (); } - mix_group_context_menu->popup (1, 0); + mix_group_context_menu->popup (1, ev->time); return true; } @@ -769,6 +1044,9 @@ Mixer_UI::group_display_button_press (GdkEventButton* ev) if ((iter = group_model->get_iter (path))) { if ((group = (*iter)[group_columns.group]) != 0) { // edit_mix_group (group); +#ifdef GTKOSX + group_display.queue_draw(); +#endif return true; } } @@ -780,6 +1058,9 @@ Mixer_UI::group_display_button_press (GdkEventButton* ev) if ((iter = group_model->get_iter (path))) { bool active = (*iter)[group_columns.active]; (*iter)[group_columns.active] = !active; +#ifdef GTKOSX + group_display.queue_draw(); +#endif return true; } break; @@ -788,6 +1069,9 @@ Mixer_UI::group_display_button_press (GdkEventButton* ev) if ((iter = group_model->get_iter (path))) { bool visible = (*iter)[group_columns.visible]; (*iter)[group_columns.visible] = !visible; +#ifdef GTKOSX + group_display.queue_draw(); +#endif return true; } break; @@ -877,6 +1161,16 @@ 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 + */ + + for (list::iterator i = strips.begin(); i != strips.end(); ++i) { + if ((*i)->mix_group() == group) { + (*i)->mix_group_changed(0); + } + } TreeModel::iterator i; TreeModel::Children rows = group_model->children(); @@ -949,6 +1243,7 @@ Mixer_UI::mix_group_row_change (const Gtk::TreeModel::Path& path,const Gtk::Tree if (name != group->name()) { group->set_name (name); } + } void @@ -988,7 +1283,7 @@ Mixer_UI::strip_scroller_button_release (GdkEventButton* ev) using namespace Menu_Helpers; if (Keyboard::is_context_menu_event (ev)) { - ARDOUR_UI::instance()->add_route(); + ARDOUR_UI::instance()->add_route (this); return true; } @@ -1001,41 +1296,68 @@ Mixer_UI::set_strip_width (Width w) _strip_width = w; for (list::iterator i = strips.begin(); i != strips.end(); ++i) { - (*i)->set_width (w); + (*i)->set_width (w, this); } } +void +Mixer_UI::set_window_pos_and_size () +{ + resize (m_width, m_height); + move (m_root_x, m_root_y); +} + + void +Mixer_UI::get_window_pos_and_size () +{ + get_position(m_root_x, m_root_y); + get_size(m_width, m_height); +} int Mixer_UI::set_state (const XMLNode& node) { const XMLProperty* prop; XMLNode* geometry; - Gdk::Geometry g; - int x, y, xoff, yoff; - if ((geometry = find_named_node (node, "geometry")) == 0) { + m_width = default_width; + m_height = default_height; + m_root_x = 1; + m_root_y = 1; + + if ((geometry = find_named_node (node, "geometry")) != 0) { - g.base_width = default_width; - g.base_height = default_height; - x = 1; - y = 1; - xoff = 0; - yoff = 21; + XMLProperty* prop; - } else { + if ((prop = geometry->property("x_size")) == 0) { + prop = geometry->property ("x-size"); + } + if (prop) { + m_width = atoi(prop->value()); + } + if ((prop = geometry->property("y_size")) == 0) { + prop = geometry->property ("y-size"); + } + if (prop) { + m_height = atoi(prop->value()); + } - g.base_width = atoi(geometry->property("x_size")->value().c_str()); - g.base_height = atoi(geometry->property("y_size")->value().c_str()); - x = atoi(geometry->property("x_pos")->value().c_str()); - y = atoi(geometry->property("y_pos")->value().c_str()); - xoff = atoi(geometry->property("x_off")->value().c_str()); - yoff = atoi(geometry->property("y_off")->value().c_str()); + if ((prop = geometry->property ("x_pos")) == 0) { + prop = geometry->property ("x-pos"); + } + if (prop) { + m_root_x = atoi (prop->value()); + + } + if ((prop = geometry->property ("y_pos")) == 0) { + prop = geometry->property ("y-pos"); + } + if (prop) { + m_root_y = atoi (prop->value()); + } } - set_geometry_hints (global_vpacker, g, Gdk::HINT_BASE_SIZE); - set_default_size(g.base_width, g.base_height); - move (x, y); + set_window_pos_and_size (); if ((prop = node.property ("narrow-strips"))) { if (prop->value() == "yes") { @@ -1045,6 +1367,12 @@ Mixer_UI::set_state (const XMLNode& node) } } + if ((prop = node.property ("show-mixer"))) { + if (prop->value() == "yes") { + _visible = true; + } + } + return 0; } @@ -1055,25 +1383,24 @@ Mixer_UI::get_state (void) if (is_realized()) { Glib::RefPtr win = get_window(); - - int x, y, xoff, yoff, width, height; - win->get_root_origin(x, y); - win->get_position(xoff, yoff); - win->get_size(width, height); + + get_window_pos_and_size (); XMLNode* geometry = new XMLNode ("geometry"); char buf[32]; - snprintf(buf, sizeof(buf), "%d", width); + snprintf(buf, sizeof(buf), "%d", m_width); geometry->add_property(X_("x_size"), string(buf)); - snprintf(buf, sizeof(buf), "%d", height); + snprintf(buf, sizeof(buf), "%d", m_height); geometry->add_property(X_("y_size"), string(buf)); - snprintf(buf, sizeof(buf), "%d", x); + snprintf(buf, sizeof(buf), "%d", m_root_x); geometry->add_property(X_("x_pos"), string(buf)); - snprintf(buf, sizeof(buf), "%d", y); + snprintf(buf, sizeof(buf), "%d", m_root_y); geometry->add_property(X_("y_pos"), string(buf)); - snprintf(buf, sizeof(buf), "%d", xoff); + + // written only for compatibility, they are not used. + snprintf(buf, sizeof(buf), "%d", 0); geometry->add_property(X_("x_off"), string(buf)); - snprintf(buf, sizeof(buf), "%d", yoff); + snprintf(buf, sizeof(buf), "%d", 0); geometry->add_property(X_("y_off"), string(buf)); snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (static_cast(&rhs_pane1)->gobj())); @@ -1086,6 +1413,8 @@ Mixer_UI::get_state (void) node->add_property ("narrow-strips", _strip_width == Narrow ? "yes" : "no"); + node->add_property ("show-mixer", _visible ? "yes" : "no"); + return *node; } @@ -1101,12 +1430,24 @@ Mixer_UI::pane_allocation_handler (Allocation& alloc, Gtk::Paned* which) int width, height; static int32_t done[3] = { 0, 0, 0 }; - if ((geometry = find_named_node (*node, "geometry")) == 0) { - width = default_width; - height = default_height; - } else { - width = atoi(geometry->property("x_size")->value()); - height = atoi(geometry->property("y_size")->value()); + 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"); + } + if (prop) { + height = atoi (prop->value()); + } } if (which == static_cast (&rhs_pane1)) { @@ -1115,7 +1456,7 @@ Mixer_UI::pane_allocation_handler (Allocation& alloc, Gtk::Paned* which) return; } - if (!geometry || (prop = geometry->property("mixer_rhs_pane1_pos")) == 0) { + if (!geometry || (prop = geometry->property("mixer-rhs-pane1-pos")) == 0) { pos = height / 3; snprintf (buf, sizeof(buf), "%d", pos); } else { @@ -1132,7 +1473,7 @@ Mixer_UI::pane_allocation_handler (Allocation& alloc, Gtk::Paned* which) return; } - if (!geometry || (prop = geometry->property("mixer_list_hpane_pos")) == 0) { + if (!geometry || (prop = geometry->property("mixer-list-hpane-pos")) == 0) { pos = 75; snprintf (buf, sizeof(buf), "%d", pos); } else {