some fixes/improvements for track selection; add upload target to manual makefile...

[ardour.git] / gtk2_ardour / editor_mixer.cc

diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index 410474114a0c7c8fe38f378327edbea62d4363cd..d1dd8be7faa711d3893f1bcc29b538cbac1207f0 100644 (file)
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -36,8 +36,6 @@ Editor::editor_mixer_button_toggled ()
        Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (X_("Editor"), X_("show-editor-mixer"));
        if (act) {
                Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic(act);
-               bool yn = tact->get_active();
-               cerr << "button toggled, state = " << yn << endl;
                show_editor_mixer (tact->get_active());
        }
 }
@@ -51,15 +49,18 @@ Editor::cms_deleted ()
 void
 Editor::show_editor_mixer (bool yn)
 {
+       show_editor_mixer_when_tracks_arrive = false;
+
        if (yn) {
 
                if (current_mixer_strip == 0) {
 
                        if (selection->tracks.empty()) {
                                
-                               if (track_views.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;
@@ -76,6 +77,9 @@ Editor::show_editor_mixer (bool yn)
                                }
 
                        } else {
+
+                               sort_track_selection ();
+
                                for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
                                        AudioTimeAxisView* atv;
 
@@ -133,7 +137,7 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
 
                /* might be nothing to do */
 
-               if (&current_mixer_strip->route() == &at->route()) {
+               if (current_mixer_strip->route() == at->route()) {
                        return;
                }
 
@@ -159,15 +163,20 @@ Editor::update_current_screen ()
 {
        if (session && engine.running()) {
 
-               jack_nframes_t frame;
+               nframes_t 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) {
 
-                 playhead_cursor->canvas_item.show();
+                       playhead_cursor->canvas_item.show();
+
                        if (frame != last_update_frame) {
 
                                if (frame < leftmost_frame || frame > leftmost_frame + current_page_frames()) {
@@ -184,6 +193,31 @@ Editor::update_current_screen ()
                                }
 
                                playhead_cursor->set_position (frame);
+
+#undef CONTINUOUS_SCROLL
+#ifdef  CONTINUOUS_SCROLL
+
+                               /* don't do continuous scroll till the new position is in the rightmost quarter of the 
+                                  editor canvas
+                               */
+                               
+#if 0
+                               if (frame > leftmost_frame + (3 * current_page_frames() / 4)) {
+                               
+                                       if (frame > playhead_cursor->current_frame) {
+                                               nframes_t delta = frame - playhead_cursor->current_frame;
+                                               horizontal_adjustment.set_value (horizontal_adjustment.get_value() + (delta/frames_per_unit));
+                                       } else {
+                                               nframes_t delta = playhead_cursor->current_frame - frame;
+                                               horizontal_adjustment.set_value (horizontal_adjustment.get_value() - (delta/frames_per_unit));
+                                       }
+                               }
+#else
+                               horizontal_adjustment.set_value (frame / frames_per_unit);
+#endif
+
+#endif // CONTINUOUS_SCROLL
+
                        }
 
                } else {
@@ -197,6 +231,7 @@ Editor::update_current_screen ()
                        }
                }
 
+         almost_done:
                last_update_frame = frame;
 
                if (current_mixer_strip) {
@@ -223,7 +258,7 @@ Editor::current_mixer_strip_hidden ()
                AudioTimeAxisView* tmp;
                
                if ((tmp = dynamic_cast<AudioTimeAxisView*>(*i)) != 0) {
-                       if (&(tmp->route()) == &(current_mixer_strip->route())) {
+                       if (tmp->route() == current_mixer_strip->route()) {
                                (*i)->set_selected (false);
                                break;
                        }
@@ -257,7 +292,7 @@ Editor::session_going_away ()
        latest_regionview = 0;
        last_update_frame = 0;
        drag_info.item = 0;
-       last_audition_region = 0;
+       last_canvas_frame = 0;
 
        /* hide all tracks */
 
@@ -265,14 +300,22 @@ Editor::session_going_away ()
 
        /* rip everything out of the list displays */
 
-       region_list_clear (); // no clear() method in gtkmm 1.2 
+       region_list_display.set_model (Glib::RefPtr<Gtk::TreeStore>(0));
+       route_list_display.set_model (Glib::RefPtr<Gtk::TreeStore>(0));
+       named_selection_display.set_model (Glib::RefPtr<Gtk::TreeStore>(0));
+       edit_group_display.set_model (Glib::RefPtr<Gtk::TreeStore>(0));
+
+       region_list_model->clear ();
        route_display_model->clear ();
        named_selection_model->clear ();
        group_model->clear ();
 
+       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_cursor_clock.set_session (0);
-       selection_start_clock.set_session (0);
-       selection_end_clock.set_session (0);
        zoom_range_clock.set_session (0);
        nudge_clock.set_session (0);