X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_mixer.cc;h=ae045d7a45fbcf5648acadea81b82ff5e7983ca2;hb=62168b674d90831a66799686ee09c343b77de1d8;hp=56c5662690f51b35d8b3577e862d1e5a5beaa91e;hpb=c83389b8ec5fef9553a401e6123b7e55702af9e2;p=ardour.git diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc index 56c5662690..ae045d7a45 100644 --- a/gtk2_ardour/editor_mixer.cc +++ b/gtk2_ardour/editor_mixer.cc @@ -17,25 +17,28 @@ */ +#ifdef WAF_BUILD +#include "gtk2ardour-config.h" +#endif + #include #include #include #include "pbd/enumwriter.h" -#include "ardour/audioengine.h" -#include "ardour/session.h" - -#include "editor.h" -#include "mixer_strip.h" +#include "actions.h" #include "ardour_ui.h" -#include "selection.h" #include "audio_time_axis.h" -#include "actions.h" +#include "automation_time_axis.h" +#include "editor.h" #include "editor_routes.h" #include "editor_route_groups.h" #include "editor_regions.h" #include "gui_thread.h" +#include "midi_time_axis.h" +#include "mixer_strip.h" +#include "selection.h" #include "i18n.h" @@ -63,12 +66,6 @@ Editor::editor_list_button_toggled () } } -void -Editor::cms_deleted () -{ - current_mixer_strip = 0; -} - void Editor::show_editor_mixer (bool yn) { @@ -124,7 +121,7 @@ Editor::show_editor_mixer (bool yn) if (current_mixer_strip->get_parent() == 0) { global_hpacker.pack_start (*current_mixer_strip, Gtk::PACK_SHRINK ); global_hpacker.reorder_child (*current_mixer_strip, 0); - current_mixer_strip->show_all (); + current_mixer_strip->show (); } } else { @@ -152,16 +149,6 @@ Editor::ensure_all_elements_drawn () } #endif -void -Editor::show_editor_list (bool yn) -{ - if (yn) { - the_notebook.show(); - } else { - the_notebook.hide(); - } -} - void Editor::create_editor_mixer () { @@ -169,7 +156,8 @@ Editor::create_editor_mixer () _session, false); current_mixer_strip->Hiding.connect (sigc::mem_fun(*this, &Editor::current_mixer_strip_hidden)); - current_mixer_strip->CatchDeletion.connect (*this, boost::bind (&Editor::current_mixer_strip_removed, this), gui_context()); + current_mixer_strip->WidthChanged.connect (sigc::mem_fun (*this, &Editor::mixer_strip_width_changed)); + #ifdef GTKOSX current_mixer_strip->WidthChanged.connect (sigc::mem_fun(*this, &Editor::ensure_all_elements_drawn)); #endif @@ -179,9 +167,7 @@ Editor::create_editor_mixer () void Editor::set_selected_mixer_strip (TimeAxisView& view) { - RouteTimeAxisView* at; - - if (!_session || (at = dynamic_cast(&view)) == 0) { + if (!_session) { return; } @@ -199,127 +185,48 @@ Editor::set_selected_mixer_strip (TimeAxisView& view) create_editor_mixer (); } - /* might be nothing to do */ - - if (current_mixer_strip->route() == at->route()) { - return; - } - current_mixer_strip->set_route (at->route()); - current_mixer_strip->set_width_enum (editor_mixer_strip_width, (void*) this); -} - -double current = 0.0; - -void -Editor::update_current_screen () -{ - if (_pending_locate_request) { - /* we don't update things when there's a pending locate request, otherwise - when the editor requests a locate there is a chance that this method - will move the playhead before the locate request is processed, causing - a visual glitch. */ - return; - } + // if this is an automation track, then we shold the mixer strip should + // show the parent - if (_session && _session->engine().running()) { + boost::shared_ptr route; + AutomationTimeAxisView* atv; + + if ((atv = dynamic_cast(&view)) != 0) { - nframes64_t const frame = _session->audible_frame(); + AudioTimeAxisView *parent = dynamic_cast(view.get_parent()); - if (_dragging_playhead) { - goto almost_done; + if (parent) { + route = parent->route (); } - /* only update if the playhead is on screen or we are following it */ - - if (_follow_playhead && _session->requested_return_frame() < 0) { - - //playhead_cursor->canvas_item.show(); - - if (frame != last_update_frame) { - - -#undef CONTINUOUS_SCROLL -#ifndef CONTINUOUS_SCROLL - if (frame < leftmost_frame || frame > leftmost_frame + current_page_frames()) { - - if (_session->transport_speed() < 0) { - if (frame > (current_page_frames()/2)) { - center_screen (frame-(current_page_frames()/2)); - } else { - center_screen (current_page_frames()/2); - } - } else { - center_screen (frame+(current_page_frames()/2)); - } - } - - playhead_cursor->set_position (frame); - -#else // CONTINUOUS_SCROLL - - /* don't do continuous scroll till the new position is in the rightmost quarter of the - editor canvas - */ - - if (_session->transport_speed()) { - double target = ((double)frame - (double)current_page_frames()/2.0) / frames_per_unit; - if (target <= 0.0) target = 0.0; - if ( fabs(target - current) < current_page_frames()/frames_per_unit ) { - target = (target * 0.15) + (current * 0.85); - } else { - /* relax */ - } - //printf("frame: %d, cpf: %d, fpu: %6.6f, current: %6.6f, target : %6.6f\n", frame, current_page_frames(), frames_per_unit, current, target ); - current = target; - horizontal_adjustment.set_value ( current ); - } - - playhead_cursor->set_position (frame); - -#endif // CONTINUOUS_SCROLL + } else { - } + AudioTimeAxisView* at = dynamic_cast (&view); + if (at) { + route = at->route(); } else { - if (frame != last_update_frame) { - playhead_cursor->set_position (frame); + MidiTimeAxisView* mt = dynamic_cast (&view); + if (mt) { + route = mt->route(); } } - - almost_done: - last_update_frame = frame; - if (current_mixer_strip) { - current_mixer_strip->fast_update (); - } - } -} + + if (current_mixer_strip->route() == route) { + return; + } -void -Editor::current_mixer_strip_removed () -{ - if (current_mixer_strip) { - /* it is being deleted elsewhere */ - current_mixer_strip = 0; + if (route) { + current_mixer_strip->set_route (route); + current_mixer_strip->set_width_enum (editor_mixer_strip_width, (void*) this); } } void Editor::current_mixer_strip_hidden () { - for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { - - RouteTimeAxisView* tmp; - - if ((tmp = dynamic_cast(*i)) != 0) { - if (tmp->route() == current_mixer_strip->route()) { - (*i)->set_selected (false); - break; - } - } - } - Glib::RefPtr act = ActionManager::get_action (X_("Editor"), X_("show-editor-mixer")); if (act) { Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); @@ -328,75 +235,19 @@ Editor::current_mixer_strip_hidden () } void -Editor::session_going_away () +Editor::maybe_add_mixer_strip_width (XMLNode& node) { - _have_idled = false; - - _session_connections.drop_connections (); - - stop_scrolling (); - selection->clear (); - cut_buffer->clear (); - - clicked_regionview = 0; - clicked_axisview = 0; - clicked_routeview = 0; - clicked_crossfadeview = 0; - entered_regionview = 0; - entered_track = 0; - last_update_frame = 0; - _drag = 0; - - playhead_cursor->canvas_item.hide (); - - /* rip everything out of the list displays */ - - _regions->clear (); - _routes->clear (); - _route_groups->clear (); - - for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { - delete *i; - } - track_views.clear (); - - zoom_range_clock.set_session (0); - nudge_clock.set_session (0); - - editor_list_button.set_active(false); - editor_list_button.set_sensitive(false); - - /* clear tempo/meter rulers */ - remove_metric_marks (); - hide_measures (); - clear_marker_display (); - - delete current_bbt_points; - current_bbt_points = 0; - - /* get rid of any existing editor mixer strip */ - if (current_mixer_strip) { - if (current_mixer_strip->get_parent() != 0) { - global_hpacker.remove (*current_mixer_strip); - } - delete current_mixer_strip; - current_mixer_strip = 0; + node.add_property ("mixer-width", enum_2_string (editor_mixer_strip_width)); } - - WindowTitle title(Glib::get_application_name()); - title += _("Editor"); - - set_title (title.get_string()); - - SessionHandlePtr::session_going_away (); } void -Editor::maybe_add_mixer_strip_width (XMLNode& node) +Editor::mixer_strip_width_changed () { - if (current_mixer_strip) { - node.add_property ("mixer-width", enum_2_string (current_mixer_strip->get_width_enum())); - } -} +#ifdef GTKOSX + ensure_all_elements_drawn (); +#endif + editor_mixer_strip_width = current_mixer_strip->get_width_enum (); +}