Make sure that tests are rebuilt even when only their headers change.
[ardour.git] / gtk2_ardour / editor_mixer.cc
index 0903de68ff7d2706d514dba72e80c313ca85b0bb..8cffd5c64b357368045662f6486db103a8dc83a8 100644 (file)
@@ -23,8 +23,6 @@
 
 #include "pbd/enumwriter.h"
 
-#include "ardour/audioengine.h"
-
 #include "editor.h"
 #include "mixer_strip.h"
 #include "ardour_ui.h"
@@ -34,6 +32,7 @@
 #include "editor_routes.h"
 #include "editor_route_groups.h"
 #include "editor_regions.h"
+#include "gui_thread.h"
 
 #include "i18n.h"
 
@@ -61,12 +60,6 @@ Editor::editor_list_button_toggled ()
        }
 }
 
-void
-Editor::cms_deleted ()
-{
-       current_mixer_strip = 0;
-}
-
 void
 Editor::show_editor_mixer (bool yn)
 {
@@ -74,7 +67,7 @@ Editor::show_editor_mixer (bool yn)
 
        show_editor_mixer_when_tracks_arrive = false;
 
-       if (!session) {
+       if (!_session) {
                show_editor_mixer_when_tracks_arrive = yn;
                return;
        }
@@ -111,20 +104,12 @@ Editor::show_editor_mixer (bool yn)
                }
 
                if (r) {
-                       bool created;
-
                        if (current_mixer_strip == 0) {
                                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);
-                       }
+                       current_mixer_strip->set_width_enum (editor_mixer_strip_width, (void*) this);
                }
 
                if (current_mixer_strip->get_parent() == 0) {
@@ -158,26 +143,16 @@ 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 ()
 {
        current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(),
-                                             *session,
+                                             _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));
+       current_mixer_strip->Hiding.connect (sigc::mem_fun(*this, &Editor::current_mixer_strip_hidden));
+
 #ifdef GTKOSX
-       current_mixer_strip->WidthChanged.connect (mem_fun(*this, &Editor::ensure_all_elements_drawn));
+       current_mixer_strip->WidthChanged.connect (sigc::mem_fun(*this, &Editor::ensure_all_elements_drawn));
 #endif
        current_mixer_strip->set_embedded (true);
 }
@@ -186,9 +161,8 @@ void
 Editor::set_selected_mixer_strip (TimeAxisView& view)
 {
        RouteTimeAxisView* at;
-       bool created;
 
-       if (!session || (at = dynamic_cast<RouteTimeAxisView*>(&view)) == 0) {
+       if (!_session || (at = dynamic_cast<RouteTimeAxisView*>(&view)) == 0) {
                return;
        }
 
@@ -204,9 +178,6 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
 
        if (current_mixer_strip == 0) {
                create_editor_mixer ();
-               created = true;
-       } else {
-               created = false;
        }
 
        /* might be nothing to do */
@@ -215,107 +186,8 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
                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 (_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()) {
-
-               nframes64_t const 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 && 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 {
-                       if (frame != last_update_frame) {
-                               playhead_cursor->set_position (frame);
-                       }
-               }
-
-         almost_done:
-               last_update_frame = frame;
-               if (current_mixer_strip) {
-                       current_mixer_strip->fast_update ();
-               }
-
-       }
-}
-
-void
-Editor::current_mixer_strip_removed ()
-{
-       if (current_mixer_strip) {
-               /* it is being deleted elsewhere */
-               current_mixer_strip = 0;
-       }
+       current_mixer_strip->set_width_enum (editor_mixer_strip_width, (void*) this);
 }
 
 void
@@ -340,80 +212,6 @@ Editor::current_mixer_strip_hidden ()
        }
 }
 
-void
-Editor::session_going_away ()
-{
-       _have_idled = false;
-
-       for (vector<sigc::connection>::iterator i = session_connections.begin(); i != session_connections.end(); ++i) {
-               (*i).disconnect ();
-       }
-
-       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 ();
-
-       /* hide all tracks */
-
-       _routes->hide_all_tracks (false);
-
-       /* rip everything out of the list displays */
-
-       _regions->clear ();
-       _routes->clear ();
-       _route_groups->clear ();
-
-       named_selection_display.set_model (Glib::RefPtr<Gtk::TreeStore>(0));
-       named_selection_model->clear ();
-       named_selection_display.set_model (named_selection_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);
-
-       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;
-       }
-
-       WindowTitle title(Glib::get_application_name());
-       title += _("Editor");
-
-       set_title (title.get_string());
-
-       session = 0;
-}
-
 void
 Editor::maybe_add_mixer_strip_width (XMLNode& node)
 {