psz_intf_switch was read-only: remove dead code

include/vlc_interface.h

@@ -74,9 +74,6 @@ struct intf_thread_t
     vlc_mutex_t  change_lock;
     bool   b_menu_change;
     bool   b_menu;
-
-    /* Provides the ability to switch an interface on the fly */
-    char *psz_switch_intf;
 };
 
 /** \brief Arguments passed to a dialogs provider

modules/gui/qt4/components/interface_widgets.cpp

@@ -113,17 +113,9 @@ VideoWidget::~VideoWidget()
         (vout_thread_t *)vlc_object_get( i_vout ) : NULL;
 
     if( p_vout )
-    {
-        if( !p_intf->psz_switch_intf )
     {
         if( vout_Control( p_vout, VOUT_CLOSE ) != VLC_SUCCESS )
             vout_Control( p_vout, VOUT_REPARENT );
-        }
-        else
-        {
-            if( vout_Control( p_vout, VOUT_REPARENT ) != VLC_SUCCESS )
-                vout_Control( p_vout, VOUT_CLOSE );
-        }
         vlc_object_release( p_vout );
     }
 }

modules/gui/wxwidgets/video.cpp

@@ -154,18 +154,10 @@ VideoWindow::~VideoWindow()
 {
     vlc_mutex_lock( &lock );
     if( p_vout )
-    {
-        if( !p_intf->psz_switch_intf )
     {
         if( vout_Control( p_vout, VOUT_CLOSE ) != VLC_SUCCESS )
             vout_Control( p_vout, VOUT_REPARENT, 0 );
     }
-        else
-        {
-            if( vout_Control( p_vout, VOUT_REPARENT, 0 ) != VLC_SUCCESS )
-                vout_Control( p_vout, VOUT_CLOSE );
-        }
-    }
 
     p_intf->pf_request_window = NULL;
     p_intf->pf_release_window = NULL;

src/interface/interface.c

@@ -224,8 +224,6 @@ static void* RunInterface( vlc_object_t *p_this )
 
     var_AddCallback( p_intf, "intf-add", AddIntfCallback, NULL );
 
-    do
-    {
     /* Give control to the interface */
     if( p_intf->pf_run )
         p_intf->pf_run( p_intf );
@@ -237,29 +235,6 @@ static void* RunInterface( vlc_object_t *p_this )
         vlc_object_unlock( p_intf );
     }
 
-        if( !p_intf->psz_switch_intf )
-        {
-            break;
-        }
-
-        /* Make sure the old interface is completely uninitialized */
-        module_Unneed( p_intf, p_intf->p_module );
-
-        /* Provide ability to switch the main interface on the fly */
-        psz_intf = p_intf->psz_switch_intf;
-        p_intf->psz_switch_intf = NULL;
-
-        vlc_object_lock( p_intf );
-        p_intf->b_die = false; /* FIXME */
-        p_intf->b_dead = false;
-
-        vlc_object_unlock( p_intf );
-
-        p_intf->psz_intf = psz_intf;
-        p_intf->p_module = module_Need( p_intf, "interface", psz_intf, 0 );
-    }
-    while( p_intf->p_module );
-
     vlc_restorecancel (canc);
     return NULL;
 }