X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=gtk2_ardour%2Feditor_mixer.cc;h=0903de68ff7d2706d514dba72e80c313ca85b0bb;hb=41b8a010da914eace2e300ef0a3c0800ff6183e1;hp=8b100afae59988a6a6b3b2bf6ab29d84fadb4fd3;hpb=ef6b25432d9c46d71b08c0f7d5f2686df428c4e8;p=ardour.git diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc index 8b100afae5..0903de68ff 100644 --- a/gtk2_ardour/editor_mixer.cc +++ b/gtk2_ardour/editor_mixer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2003-2004 Paul Davis + Copyright (C) 2003-2004 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,11 +15,15 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ +#include #include -#include +#include + +#include "pbd/enumwriter.h" + +#include "ardour/audioengine.h" #include "editor.h" #include "mixer_strip.h" @@ -27,9 +31,16 @@ #include "selection.h" #include "audio_time_axis.h" #include "actions.h" +#include "editor_routes.h" +#include "editor_route_groups.h" +#include "editor_regions.h" #include "i18n.h" +using namespace std; +using namespace Gtkmm2ext; +using namespace PBD; + void Editor::editor_mixer_button_toggled () { @@ -40,6 +51,16 @@ Editor::editor_mixer_button_toggled () } } +void +Editor::editor_list_button_toggled () +{ + Glib::RefPtr act = ActionManager::get_action (X_("Editor"), X_("show-editor-list")); + if (act) { + Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); + show_editor_list (tact->get_active()); + } +} + void Editor::cms_deleted () { @@ -49,168 +70,238 @@ Editor::cms_deleted () void Editor::show_editor_mixer (bool yn) { + boost::shared_ptr r; + show_editor_mixer_when_tracks_arrive = false; + if (!session) { + show_editor_mixer_when_tracks_arrive = yn; + return; + } + if (yn) { - if (current_mixer_strip == 0) { - - if (selection->tracks.empty()) { - - if (track_views.empty()) { - show_editor_mixer_when_tracks_arrive = true; - return; - } - - for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { - AudioTimeAxisView* atv; - - if ((atv = dynamic_cast (*i)) != 0) { - - current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(), - *session, - atv->route(), false); - - current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted)); - break; - } - } + if (selection->tracks.empty()) { - } else { - for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { - AudioTimeAxisView* atv; + if (track_views.empty()) { + show_editor_mixer_when_tracks_arrive = true; + return; + } - if ((atv = dynamic_cast (*i)) != 0) { + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + RouteTimeAxisView* atv; - current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(), - *session, - atv->route(), false); - current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted)); - break; - } + if ((atv = dynamic_cast (*i)) != 0) { + r = atv->route(); + break; } + } + + } else { + sort_track_selection (); + + for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { + RouteTimeAxisView* atv; + if ((atv = dynamic_cast (*i)) != 0) { + r = atv->route(); + break; + } } + } + + if (r) { + bool created; if (current_mixer_strip == 0) { - return; - } + create_editor_mixer (); + created = true; + } else { + created = false; + } + + current_mixer_strip->set_route (r); + + if (created) { + current_mixer_strip->set_width_enum (editor_mixer_strip_width, (void*) this); + } } - + if (current_mixer_strip->get_parent() == 0) { - current_mixer_strip->set_embedded (true); - current_mixer_strip->Hiding.connect (mem_fun(*this, &Editor::current_mixer_strip_hidden)); - current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::current_mixer_strip_removed)); - current_mixer_strip->set_width (editor_mixer_strip_width); - global_hpacker.pack_start (*current_mixer_strip, Gtk::PACK_SHRINK ); global_hpacker.reorder_child (*current_mixer_strip, 0); - current_mixer_strip->show_all (); } } else { if (current_mixer_strip) { - editor_mixer_strip_width = current_mixer_strip->get_width (); if (current_mixer_strip->get_parent() != 0) { global_hpacker.remove (*current_mixer_strip); } } } + +#ifdef GTKOSX + /* XXX gtk problem here */ + ensure_all_elements_drawn(); +#endif +} + +#ifdef GTKOSX +void +Editor::ensure_all_elements_drawn () +{ + controls_layout.queue_draw (); + ruler_label_event_box.queue_draw (); + time_button_event_box.queue_draw (); +} +#endif + +void +Editor::show_editor_list (bool yn) +{ + if (yn) { + the_notebook.show(); + } else { + the_notebook.hide(); + } +} + +void +Editor::create_editor_mixer () +{ + current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(), + *session, + false); + current_mixer_strip->Hiding.connect (mem_fun(*this, &Editor::current_mixer_strip_hidden)); + current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::current_mixer_strip_removed)); +#ifdef GTKOSX + current_mixer_strip->WidthChanged.connect (mem_fun(*this, &Editor::ensure_all_elements_drawn)); +#endif + current_mixer_strip->set_embedded (true); } void Editor::set_selected_mixer_strip (TimeAxisView& view) { - AudioTimeAxisView* at; - bool show = false; + RouteTimeAxisView* at; + bool created; - if (!session || (at = dynamic_cast(&view)) == 0) { + if (!session || (at = dynamic_cast(&view)) == 0) { return; } - - if (current_mixer_strip) { - /* might be nothing to do */ + Glib::RefPtr act = ActionManager::get_action (X_("Editor"), X_("show-editor-mixer")); - if (current_mixer_strip->route() == at->route()) { + if (act) { + Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); + if (!tact || !tact->get_active()) { + /* not showing mixer strip presently */ return; } + } - if (current_mixer_strip->get_parent()) { - show = true; - } - delete current_mixer_strip; - current_mixer_strip = 0; + if (current_mixer_strip == 0) { + create_editor_mixer (); + created = true; + } else { + created = false; } - current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(), - *session, - at->route()); - current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted)); - - if (show) { - show_editor_mixer (true); + /* might be nothing to do */ + + if (current_mixer_strip->route() == at->route()) { + return; + } + + if (created) { + current_mixer_strip->set_width_enum (editor_mixer_strip_width, (void*) this); } + + current_mixer_strip->set_route (at->route()); } +double current = 0.0; + void Editor::update_current_screen () { - if (session && engine.running()) { + 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 (session && session->engine().running()) { - nframes_t frame; + nframes64_t const frame = session->audible_frame(); - frame = session->audible_frame(); + if (_dragging_playhead) { + goto almost_done; + } /* only update if the playhead is on screen or we are following it */ - if (_follow_playhead) { + if (_follow_playhead && session->requested_return_frame() < 0) { + //playhead_cursor->canvas_item.show(); - playhead_cursor->canvas_item.show(); if (frame != last_update_frame) { - const jack_nframes_t page_width = current_page_frames(); - - // Percentage width of the visible range to use as a scroll interval - // Idea: snap this to the nearest bar/beat/tick/etc, would make scrolling much - // less jarring when zoomed in.. and it would be fun to watch :) - static const double scroll_pct = 3.0/4.0; - const jack_nframes_t rightmost_frame = leftmost_frame + page_width; - const jack_nframes_t scroll_interval = (jack_nframes_t)(page_width * scroll_pct); - const jack_nframes_t padding = (jack_nframes_t)floor((page_width-scroll_interval) / 2.0); - if (frame < leftmost_frame + padding || frame > rightmost_frame - padding) { +#undef CONTINUOUS_SCROLL +#ifndef CONTINUOUS_SCROLL + if (frame < leftmost_frame || frame > leftmost_frame + current_page_frames()) { if (session->transport_speed() < 0) { - if (frame > scroll_interval) { - center_screen (frame - scroll_interval/2); + if (frame > (current_page_frames()/2)) { + center_screen (frame-(current_page_frames()/2)); } else { - center_screen (scroll_interval); + center_screen (current_page_frames()/2); } } else { - center_screen(frame + scroll_interval/2); + 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 { - if (frame != last_update_frame) { - if (frame < leftmost_frame || frame > leftmost_frame + current_page_frames()) { - playhead_cursor->canvas_item.hide(); - } else { - playhead_cursor->set_position (frame); - } + playhead_cursor->set_position (frame); } } + almost_done: last_update_frame = frame; - if (current_mixer_strip) { current_mixer_strip->fast_update (); } @@ -222,7 +313,7 @@ void Editor::current_mixer_strip_removed () { if (current_mixer_strip) { - /* it is being deleted */ + /* it is being deleted elsewhere */ current_mixer_strip = 0; } } @@ -231,10 +322,10 @@ void Editor::current_mixer_strip_hidden () { for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { - - AudioTimeAxisView* tmp; - - if ((tmp = dynamic_cast(*i)) != 0) { + + RouteTimeAxisView* tmp; + + if ((tmp = dynamic_cast(*i)) != 0) { if (tmp->route() == current_mixer_strip->route()) { (*i)->set_selected (false); break; @@ -252,6 +343,8 @@ Editor::current_mixer_strip_hidden () void Editor::session_going_away () { + _have_idled = false; + for (vector::iterator i = session_connections.begin(); i != session_connections.end(); ++i) { (*i).disconnect (); } @@ -266,48 +359,66 @@ Editor::session_going_away () clicked_crossfadeview = 0; entered_regionview = 0; entered_track = 0; - latest_regionview = 0; last_update_frame = 0; - drag_info.item = 0; - last_canvas_frame = 0; + _drag = 0; + + playhead_cursor->canvas_item.hide (); /* hide all tracks */ - hide_all_tracks (false); + _routes->hide_all_tracks (false); /* rip everything out of the list displays */ - region_list_clear (); // no clear() method in gtkmm 1.2 - route_display_model->clear (); + _regions->clear (); + _routes->clear (); + _route_groups->clear (); + + named_selection_display.set_model (Glib::RefPtr(0)); named_selection_model->clear (); - group_model->clear (); + named_selection_display.set_model (named_selection_model); - edit_cursor_clock.set_session (0); + edit_point_clock_connection_a.disconnect(); + edit_point_clock_connection_b.disconnect(); + + edit_point_clock.set_session (0); zoom_range_clock.set_session (0); nudge_clock.set_session (0); - /* put editor/mixer toggle button in off position and disable until a new session is loaded */ + editor_list_button.set_active(false); + editor_list_button.set_sensitive(false); - editor_mixer_button.set_active(false); - editor_mixer_button.set_sensitive(false); /* clear tempo/meter rulers */ - remove_metric_marks (); hide_measures (); clear_marker_display (); - if (current_bbt_points) { - delete current_bbt_points; - current_bbt_points = 0; - } + delete current_bbt_points; + current_bbt_points = 0; - /* mixer strip will be deleted all by itself - when its route is deleted. - */ + /* get rid of any existing editor mixer strip */ - current_mixer_strip = 0; + 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; + } + + WindowTitle title(Glib::get_application_name()); + title += _("Editor"); - set_title (_("ardour: editor")); + set_title (title.get_string()); session = 0; } + +void +Editor::maybe_add_mixer_strip_width (XMLNode& node) +{ + if (current_mixer_strip) { + node.add_property ("mixer-width", enum_2_string (current_mixer_strip->get_width_enum())); + } +} +