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 9082f37917f470b2028f4cd4c372bc8a48b64229..46b05a20f4e7dfe7929f81d11413a1c2681b7da8 100644 (file)
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -31,6 +31,9 @@
 #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"
 
@@ -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);
                        }
                }
                
@@ -213,7 +216,7 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
        }
        
        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);
        }
 
        current_mixer_strip->set_route (at->route());
@@ -363,24 +366,17 @@ Editor::session_going_away ()
 
        /* 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();
@@ -422,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()));
        }
 }