Another similar fix for use of an uninitialized variable.

[ardour.git] / gtk2_ardour / editor_mixer.cc

diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index 7f6031ed92fa6fabb8444f0c55a2bf1af24f15d2..46b05a20f4e7dfe7929f81d11413a1c2681b7da8 100644 (file)
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -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"
@@ -31,9 +31,13 @@
 #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()) {      
                                show_editor_mixer_when_tracks_arrive = true;
                                return;
                        } 
 
                        for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
-                               AudioTimeAxisView* atv;
+                               RouteTimeAxisView* atv;
                                
-                               if ((atv = dynamic_cast<AudioTimeAxisView*> (*i)) != 0) {
+                               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;
+                               RouteTimeAxisView* atv;
                                
-                               if ((atv = dynamic_cast<AudioTimeAxisView*> (*i)) != 0) {
+                               if ((atv = dynamic_cast<RouteTimeAxisView*> (*i)) != 0) {
                                        r = atv->route();
                                        break;
                                }
@@ -120,7 +123,7 @@ 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);
                        }
                }
                
@@ -182,15 +185,15 @@ Editor::create_editor_mixer ()
 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()) {
@@ -212,19 +215,11 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
                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;
@@ -232,11 +227,17 @@ 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 frame;
-
-               frame = session->audible_frame();
+               nframes64_t const frame = session->audible_frame();
 
                if (_dragging_playhead) {
                        goto almost_done;
@@ -294,7 +295,6 @@ Editor::update_current_screen ()
                        }
 
                } else {
-                       
                        if (frame != last_update_frame) {
                                playhead_cursor->set_position (frame);
                        }
@@ -323,9 +323,9 @@ Editor::current_mixer_strip_hidden ()
 {
        for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
                
-               AudioTimeAxisView* tmp;
+               RouteTimeAxisView* tmp;
                
-               if ((tmp = dynamic_cast<AudioTimeAxisView*>(*i)) != 0) {
+               if ((tmp = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {
                        if (tmp->route() == current_mixer_strip->route()) {
                                (*i)->set_selected (false);
                                break;
@@ -360,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();
@@ -402,12 +395,16 @@ Editor::session_going_away ()
 
        delete current_bbt_points;
        current_bbt_points = 0;
-
-       /* mixer strip will be deleted all by itself 
-          when its route is deleted.
-       */
-
-       current_mixer_strip = 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");
@@ -421,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()));
        }
 }