Stop ardour exiting in the case where you have a loaded session, then select New...
[ardour.git] / gtk2_ardour / editor_mixer.cc
index e6b30232cd4cd1c5fa4926880dedaa021931ba0e..0903de68ff7d2706d514dba72e80c313ca85b0bb 100644 (file)
@@ -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
@@ -21,9 +21,9 @@
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/window_title.h>
 
-#include <pbd/enumwriter.h>
+#include "pbd/enumwriter.h"
 
-#include <ardour/audioengine.h>
+#include "ardour/audioengine.h"
 
 #include "editor.h"
 #include "mixer_strip.h"
 #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;
 
@@ -78,29 +82,28 @@ Editor::show_editor_mixer (bool yn)
        if (yn) {
 
                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;
-                               
-                               if ((atv = dynamic_cast<AudioTimeAxisView*> (*i)) != 0) {
+                               RouteTimeAxisView* atv;
+
+                               if ((atv = dynamic_cast<RouteTimeAxisView*> (*i)) != 0) {
                                        r = atv->route();
                                        break;
                                }
                        }
 
                } else {
-
                        sort_track_selection ();
-                       
+
                        for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
-                               AudioTimeAxisView* atv;
-                               
-                               if ((atv = dynamic_cast<AudioTimeAxisView*> (*i)) != 0) {
+                               RouteTimeAxisView* atv;
+
+                               if ((atv = dynamic_cast<RouteTimeAxisView*> (*i)) != 0) {
                                        r = atv->route();
                                        break;
                                }
@@ -120,10 +123,10 @@ Editor::show_editor_mixer (bool yn)
                        current_mixer_strip->set_route (r);
 
                        if (created) {
-                               current_mixer_strip->set_width (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) {
                        global_hpacker.pack_start (*current_mixer_strip, Gtk::PACK_SHRINK );
                        global_hpacker.reorder_child (*current_mixer_strip, 0);
@@ -155,6 +158,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 ()
 {
@@ -167,30 +180,20 @@ Editor::create_editor_mixer ()
        current_mixer_strip->WidthChanged.connect (mem_fun(*this, &Editor::ensure_all_elements_drawn));
 #endif
        current_mixer_strip->set_embedded (true);
-}      
-
-void
-Editor::show_editor_list (bool yn)
-{
-       if (yn) {
-               the_notebook.show();
-       } else {
-               the_notebook.hide();
-       }
 }
 
 void
 Editor::set_selected_mixer_strip (TimeAxisView& view)
 {
-       AudioTimeAxisView* at;
-       bool show = false;
+       RouteTimeAxisView* at;
        bool created;
 
-       if (!session || (at = dynamic_cast<AudioTimeAxisView*>(&view)) == 0) {
+       if (!session || (at = dynamic_cast<RouteTimeAxisView*>(&view)) == 0) {
                return;
        }
 
        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);
                if (!tact || !tact->get_active()) {
@@ -207,37 +210,34 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
        }
 
        /* might be nothing to do */
-       
+
        if (current_mixer_strip->route() == at->route()) {
                return;
        }
-       
-       if (current_mixer_strip->get_parent()) {
-               show = true;
-       }
-
-       current_mixer_strip->set_route (at->route());
 
        if (created) {
-               current_mixer_strip->set_width (editor_mixer_strip_width, (void*) this);
+               current_mixer_strip->set_width_enum (editor_mixer_strip_width, (void*) this);
        }
 
-       if (show) {
-               show_editor_mixer (true);
-       }
+       current_mixer_strip->set_route (at->route());
 }
 
 double current = 0.0;
-bool currentInitialized = 0;
 
 void
 Editor::update_current_screen ()
 {
-       if (session && 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;
+       }
 
-               nframes64_t frame;
+       if (session && session->engine().running()) {
 
-               frame = session->audible_frame();
+               nframes64_t const frame = session->audible_frame();
 
                if (_dragging_playhead) {
                        goto almost_done;
@@ -255,7 +255,7 @@ Editor::update_current_screen ()
 #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));
@@ -270,11 +270,11 @@ 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 
+
+                               /* 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;
@@ -287,7 +287,7 @@ Editor::update_current_screen ()
                                        current = target;
                                        horizontal_adjustment.set_value ( current );
                                }
-                               
+
                                playhead_cursor->set_position (frame);
 
 #endif // CONTINUOUS_SCROLL
@@ -295,7 +295,6 @@ Editor::update_current_screen ()
                        }
 
                } else {
-                       
                        if (frame != last_update_frame) {
                                playhead_cursor->set_position (frame);
                        }
@@ -306,7 +305,7 @@ Editor::update_current_screen ()
                if (current_mixer_strip) {
                        current_mixer_strip->fast_update ();
                }
-               
+
        }
 }
 
@@ -323,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<AudioTimeAxisView*>(*i)) != 0) {
+
+               RouteTimeAxisView* tmp;
+
+               if ((tmp = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {
                        if (tmp->route() == current_mixer_strip->route()) {
                                (*i)->set_selected (false);
                                break;
@@ -345,7 +344,7 @@ void
 Editor::session_going_away ()
 {
        _have_idled = false;
-       
+
        for (vector<sigc::connection>::iterator i = session_connections.begin(); i != session_connections.end(); ++i) {
                (*i).disconnect ();
        }
@@ -361,30 +360,23 @@ Editor::session_going_away ()
        entered_regionview = 0;
        entered_track = 0;
        last_update_frame = 0;
-       drag_info.item = 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_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));
+       _regions->clear ();
+       _routes->clear ();
+       _route_groups->clear ();
 
-       region_list_model->clear ();
-       route_display_model->clear ();
+       named_selection_display.set_model (Glib::RefPtr<Gtk::TreeStore>(0));
        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_point_clock_connection_a.disconnect();
        edit_point_clock_connection_b.disconnect();
@@ -395,22 +387,24 @@ Editor::session_going_away ()
 
        editor_list_button.set_active(false);
        editor_list_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");
@@ -424,7 +418,7 @@ 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()));
+               node.add_property ("mixer-width", enum_2_string (current_mixer_strip->get_width_enum()));
        }
 }