X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_ui.cc;h=06b30c700c3e972ce5d89b979d691d64e85001a3;hb=f6f3769ae11e3a9e888abdf8c3ed92f08d3c9a5b;hp=202a55ee1d9298e3eb1a109ee70c581a016bfa3e;hpb=b1c48972f2914b49d45a7cef2b38a0a125bd731e;p=ardour.git diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 202a55ee1d..06b30c700c 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -68,7 +68,8 @@ Mixer_UI::Mixer_UI () no_track_list_redisplay = false; in_group_row_change = false; _visible = false; - ignore_route_reorder = false; + strip_redisplay_does_not_reset_order_keys = false; + strip_redisplay_does_not_sync_order_keys = false; ignore_sync = false; Route::SyncOrderKeys.connect (mem_fun (*this, &Mixer_UI::sync_order_keys)); @@ -190,8 +191,12 @@ Mixer_UI::Mixer_UI () list_vpacker.pack_start (rhs_pane1, true, true); global_hpacker.pack_start (scroller, true, true); +#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); @@ -266,7 +271,7 @@ Mixer_UI::show_window () present (); if (!_visible) { set_window_pos_and_size (); - + /* now reset each strips width so the right widgets are shown */ MixerStrip* ms; @@ -298,6 +303,9 @@ Mixer_UI::add_strip (Session::RouteList& routes) MixerStrip* strip; + no_track_list_redisplay = true; + strip_redisplay_does_not_sync_order_keys = true; + for (Session::RouteList::iterator x = routes.begin(); x != routes.end(); ++x) { boost::shared_ptr route = (*x); @@ -318,25 +326,30 @@ Mixer_UI::add_strip (Session::RouteList& routes) show_strip (strip); - no_track_list_redisplay = true; - 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; - - strip->set_old_order_key (track_model->children().size() - 1); - no_track_list_redisplay = false; - redisplay_track_list (); + 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)); - +#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)); } + + no_track_list_redisplay = false; + + redisplay_track_list (); + + strip_redisplay_does_not_sync_order_keys = false; } void @@ -352,13 +365,7 @@ Mixer_UI::remove_strip (MixerStrip* strip) strips.erase (i); } - /* Decrement old order keys for strips `above' the one that is being removed */ - for (ri = rows.begin(); ri != rows.end(); ++ri) { - MixerStrip* s = (*ri)[track_columns.strip]; - if (s->old_order_key() > strip->old_order_key()) { - s->set_old_order_key (s->old_order_key() - 1); - } - } + strip_redisplay_does_not_sync_order_keys = true; for (ri = rows.begin(); ri != rows.end(); ++ri) { if ((*ri)[track_columns.strip] == strip) { @@ -366,26 +373,31 @@ Mixer_UI::remove_strip (MixerStrip* strip) 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 () +Mixer_UI::sync_order_keys (const char *src) { vector neworder; TreeModel::Children rows = track_model->children(); TreeModel::Children::iterator ri; - if (ignore_sync || !session || (session->state_of_the_state() & Session::Loading) || rows.empty()) { + if ((strcmp (src, get_order_key()) == 0) || !session || (session->state_of_the_state() & Session::Loading) || rows.empty()) { return; } @@ -393,15 +405,26 @@ Mixer_UI::sync_order_keys () neworder.push_back (0); } - for (ri = rows.begin(); ri != rows.end(); ++ri) { + bool changed = false; + int order; + + for (order = 0, ri = rows.begin(); ri != rows.end(); ++ri, ++order) { boost::shared_ptr route = (*ri)[track_columns.route]; - MixerStrip* strip = (*ri)[track_columns.strip]; - neworder[route->order_key (get_order_key())] = strip->old_order_key (); + 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; + } } - ignore_route_reorder = true; - track_model->reorder (neworder); - ignore_route_reorder = false; + if (changed) { + strip_redisplay_does_not_reset_order_keys = true; + track_model->reorder (neworder); + strip_redisplay_does_not_reset_order_keys = false; + } } void @@ -651,24 +674,28 @@ Mixer_UI::hide_all_audiotracks () 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(); - ignore_route_reorder = true; redisplay_track_list (); - ignore_route_reorder = false; } void @@ -696,7 +723,7 @@ Mixer_UI::redisplay_track_list () strip->set_marked_for_display (true); strip->route()->set_order_key (N_("signal"), order); - if (!ignore_route_reorder) { + if (!strip_redisplay_does_not_reset_order_keys) { strip->route()->set_order_key (get_order_key(), order); } @@ -732,18 +759,39 @@ Mixer_UI::redisplay_track_list () } } - if (Config->get_sync_all_route_ordering() && !ignore_route_reorder) { - ignore_sync = true; - Route::SyncOrderKeys (); // EMIT SIGNAL - ignore_sync = 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 ) @@ -897,6 +945,9 @@ Mixer_UI::track_display_button_press (GdkEventButton* ev) bool visible = (*iter)[track_columns.visible]; (*iter)[track_columns.visible] = !visible; } +#ifdef GTKOSX + track_display.queue_draw(); +#endif } } return true; @@ -992,6 +1043,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; } } @@ -1003,6 +1057,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; @@ -1011,6 +1068,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; @@ -1259,19 +1319,41 @@ Mixer_UI::set_state (const XMLNode& node) const XMLProperty* prop; XMLNode* geometry; - 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) { - m_width = default_width; - m_height = default_height; - m_root_x = 1; - m_root_y = 1; + 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()); + } - m_width = atoi(geometry->property("x-size")->value().c_str()); - m_height = atoi(geometry->property("y-size")->value().c_str()); - m_root_x = atoi(geometry->property("x-pos")->value().c_str()); - m_root_y = atoi(geometry->property("y-pos")->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_window_pos_and_size (); @@ -1347,12 +1429,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)) {