show() widgets explicitly in the MixerUI window, fix UI::just_hide_it(), so that...

[ardour.git] / gtk2_ardour / mixer_ui.cc

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 766db2938f3f4f9de99cc64cbbc840c6569071f8..85c5ebce1817f77c0e94afff8322e524abae66f5 100644 (file)
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -219,6 +219,31 @@ Mixer_UI::Mixer_UI ()
        signal_configure_event().connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
 
        _selection.RoutesChanged.connect (mem_fun(*this, &Mixer_UI::follow_strip_selection));
+       
+       mix_group_display_button_box->show();
+       mix_group_add_button->show();
+       mix_group_remove_button->show();
+
+       global_hpacker.show();
+       global_vpacker.show();
+       scroller.show();
+       scroller_base.show();
+       scroller_hpacker.show();
+       mixer_scroller_vpacker.show();
+       list_vpacker.show();
+       group_display_button_label.show();
+       group_display_button.show();
+       track_display_scroller.show();
+       group_display_scroller.show();
+       group_display_vbox.show();
+       track_display_frame.show();
+       group_display_frame.show();
+       rhs_pane1.show();
+       strip_packer.show();
+       out_packer.show();
+       list_hpane.show();
+       track_display.show();
+       group_display.show();
 }
 
 Mixer_UI::~Mixer_UI ()
@@ -234,7 +259,7 @@ Mixer_UI::ensure_float (Window& win)
 void
 Mixer_UI::show_window ()
 {
-       show_all ();
+       present ();
 
        /* now reset each strips width so the right widgets are shown */
        MixerStrip* ms;
@@ -267,7 +292,7 @@ Mixer_UI::add_strip (Session::RouteList& routes)
        for (Session::RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
                boost::shared_ptr<Route> route = (*x);
 
-               if (route->hidden()) {
+               if (route->is_hidden()) {
                        return;
                }
                
@@ -292,7 +317,7 @@ Mixer_UI::add_strip (Session::RouteList& routes)
                no_track_list_redisplay = false;
                redisplay_track_list ();
                
-               route->name_changed.connect (bind (mem_fun(*this, &Mixer_UI::strip_name_changed), strip));
+               route->NameChanged.connect (bind (mem_fun(*this, &Mixer_UI::strip_name_changed), strip));
                strip->GoingAway.connect (bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
                
                strip->signal_button_release_event().connect (bind (mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
@@ -473,7 +498,7 @@ Mixer_UI::set_all_strips_visibility (bool yn)
                        continue;
                }
                
-               if (strip->route()->master() || strip->route()->control()) {
+               if (strip->route()->is_master() || strip->route()->is_control()) {
                        continue;
                }
 
@@ -501,11 +526,11 @@ Mixer_UI::set_all_audio_visibility (int tracks, bool yn)
                        continue;
                }
 
-               if (strip->route()->master() || strip->route()->control()) {
+               if (strip->route()->is_master() || strip->route()->is_control()) {
                        continue;
                }
 
-               AudioTrack* at = strip->audio_track();
+               boost::shared_ptr<AudioTrack> at = strip->audio_track();
 
                switch (tracks) {
                case 0:
@@ -605,7 +630,7 @@ Mixer_UI::redisplay_track_list ()
 
                        if (strip->packed()) {
 
-                               if (strip->route()->master() || strip->route()->control()) {
+                               if (strip->route()->is_master() || strip->route()->is_control()) {
                                        out_packer.reorder_child (*strip, -1);
                                } else {
                                        strip_packer.reorder_child (*strip, -1); /* put at end */
@@ -613,18 +638,18 @@ Mixer_UI::redisplay_track_list ()
 
                        } else {
 
-                               if (strip->route()->master() || strip->route()->control()) {
+                               if (strip->route()->is_master() || strip->route()->is_control()) {
                                        out_packer.pack_start (*strip, false, false);
                                } else {
                                        strip_packer.pack_start (*strip, false, false);
                                }
                                strip->set_packed (true);
-                               strip->show_all ();
+                               //strip->show();
                        }
 
                } else {
 
-                       if (strip->route()->master() || strip->route()->control()) {
+                       if (strip->route()->is_master() || strip->route()->is_control()) {
                                /* do nothing, these cannot be hidden */
                        } else {
                                if (strip->packed()) {
@@ -702,7 +727,7 @@ Mixer_UI::track_display_button_press (GdkEventButton* ev)
                        MixerStrip* strip = (*iter)[track_columns.strip];
                        if (strip) {
 
-                               if (!strip->route()->master() && !strip->route()->control()) {
+                               if (!strip->route()->is_master() && !strip->route()->is_control()) {
                                        bool visible = (*iter)[track_columns.visible];
                                        (*iter)[track_columns.visible] = !visible;
                                }
@@ -738,9 +763,9 @@ Mixer_UI::build_track_menu ()
 }
 
 void
-Mixer_UI::strip_name_changed (void* src, MixerStrip* mx)
+Mixer_UI::strip_name_changed (MixerStrip* mx)
 {
-       ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::strip_name_changed), src, mx));
+       ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::strip_name_changed), mx));
        
        TreeModel::Children rows = track_model->children();
        TreeModel::Children::iterator i;