X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_mixer.cc;h=42407100f058cceab5b7b5a8fc9e8827e71bbfa5;hb=5f88eeb157b061978d665efa6a7d8ac5118e6753;hp=bfbb5104b240e613e07039dd5a8471157dd2c794;hpb=cba911619631b935cf3cd316a80892fa6ea1c381;p=ardour.git diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc index bfbb5104b2..42407100f0 100644 --- a/gtk2_ardour/editor_mixer.cc +++ b/gtk2_ardour/editor_mixer.cc @@ -15,10 +15,14 @@ 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 #include "editor.h" @@ -30,6 +34,9 @@ #include "i18n.h" +using namespace Gtkmm2ext; +using namespace PBD; + void Editor::editor_mixer_button_toggled () { @@ -49,60 +56,64 @@ Editor::cms_deleted () void Editor::show_editor_mixer (bool yn) { + boost::shared_ptr r; + show_editor_mixer_when_tracks_arrive = false; + if (!session) { + return; + } + if (yn) { - if (current_mixer_strip == 0) { + if (selection->tracks.empty()) { + + if (track_views.empty()) { + show_editor_mixer_when_tracks_arrive = true; + return; + } - 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; - 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 ((atv = dynamic_cast (*i)) != 0) { + r = atv->route(); + break; } + } - } else { - for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { - AudioTimeAxisView* atv; - - if ((atv = dynamic_cast (*i)) != 0) { + } else { - 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; - } + sort_track_selection (); + + for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { + AudioTimeAxisView* atv; + + if ((atv = dynamic_cast (*i)) != 0) { + r = atv->route(); + break; } - } + } + if (r) { if (current_mixer_strip == 0) { - return; - } + + current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(), + *session, + false); + current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted)); + } + + current_mixer_strip->set_route (r); } 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); - + current_mixer_strip->set_width (editor_mixer_strip_width, (void*) this); + global_hpacker.pack_start (*current_mixer_strip, Gtk::PACK_SHRINK ); global_hpacker.reorder_child (*current_mixer_strip, 0); @@ -118,6 +129,13 @@ Editor::show_editor_mixer (bool yn) } } } + +#ifdef GTKOSX + /* XXX gtk problem here */ + ruler_label_event_box.queue_draw (); + time_button_event_box.queue_draw (); + controls_layout.queue_draw (); +#endif } void @@ -141,26 +159,31 @@ Editor::set_selected_mixer_strip (TimeAxisView& view) if (current_mixer_strip->get_parent()) { show = true; } - delete current_mixer_strip; - current_mixer_strip = 0; + + } else { + + current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(), + *session, + false); + current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted)); } - current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(), - *session, - at->route()); - current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted)); - + current_mixer_strip->set_route (at->route()); + if (show) { show_editor_mixer (true); } } +double current = 0.0; +bool currentInitialized = 0; + void Editor::update_current_screen () { - if (session && engine.running()) { + if (session && session->engine().running()) { - nframes_t frame; + nframes64_t frame; frame = session->audible_frame(); @@ -170,12 +193,15 @@ Editor::update_current_screen () /* 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) { + +#undef CONTINUOUS_SCROLL +#ifndef CONTINUOUS_SCROLL if (frame < leftmost_frame || frame > leftmost_frame + current_page_frames()) { if (session->transport_speed() < 0) { @@ -190,22 +216,41 @@ Editor::update_current_screen () } 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 (); } @@ -217,7 +262,7 @@ void Editor::current_mixer_strip_removed () { if (current_mixer_strip) { - /* it is being deleted */ + /* it is being deleted elsewhere */ current_mixer_strip = 0; } } @@ -247,6 +292,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 (); } @@ -261,32 +308,41 @@ 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; + playhead_cursor->canvas_item.hide (); + /* hide all tracks */ hide_all_tracks (false); /* rip everything out of the list displays */ - region_list_clear (); // no clear() method in gtkmm 1.2 + region_list_display.set_model (Glib::RefPtr(0)); + route_list_display.set_model (Glib::RefPtr(0)); + named_selection_display.set_model (Glib::RefPtr(0)); + edit_group_display.set_model (Glib::RefPtr(0)); + + region_list_model->clear (); route_display_model->clear (); named_selection_model->clear (); group_model->clear (); - edit_cursor_clock.set_session (0); + region_list_display.set_model (region_list_model); + route_list_display.set_model (route_display_model); + named_selection_display.set_model (named_selection_model); + edit_group_display.set_model (group_model); + + 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_mixer_button.set_active(false); - editor_mixer_button.set_sensitive(false); /* clear tempo/meter rulers */ - remove_metric_marks (); hide_measures (); clear_marker_display (); @@ -302,7 +358,18 @@ Editor::session_going_away () current_mixer_strip = 0; - set_title (_("ardour: editor")); + WindowTitle title(Glib::get_application_name()); + title += _("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())); + } +}