[vlc-commits] qt: always enable subtitle selection menu

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Feb 23 15:18:09 2018 +0100| [be89546fd049d16360f1cf97b434ad1c70d3f5a5] | committer: Thomas Guillem

qt: always enable subtitle selection menu

This was incoherent with audio/video selection menus. Indeed, audio/video
selection menus are always visible (regardless of vout/aout state).

This allows users to change the spu track when using a sout (and a renderer).

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=be89546fd049d16360f1cf97b434ad1c70d3f5a5
---

 modules/gui/qt/menus.cpp | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/modules/gui/qt/menus.cpp b/modules/gui/qt/menus.cpp
index 549e30913b..f83bc232e9 100644
--- a/modules/gui/qt/menus.cpp
+++ b/modules/gui/qt/menus.cpp
@@ -1309,16 +1309,6 @@ void VLCMenuBar::UpdateItem( intf_thread_t *p_intf, QMenu *menu,
         action->setData( psz_var );
     }
 
-    /* Some specific stuff */
-    bool forceDisabled = false;
-    if( !strcmp( psz_var, "spu-es" ) )
-    {
-        vout_thread_t *p_vout = THEMIM->getVout();
-        forceDisabled = ( p_vout == NULL );
-        if( p_vout )
-            vlc_object_release( p_vout );
-    }
-
     if( i_type & VLC_VAR_HASCHOICE )
     {
         /* Append choices menu */
@@ -1334,8 +1324,6 @@ void VLCMenuBar::UpdateItem( intf_thread_t *p_intf, QMenu *menu,
 
             action->setEnabled(
                 CreateChoicesMenu( submenu, psz_var, p_object ) == 0 );
-            if( forceDisabled )
-                action->setEnabled( false );
         }
         else
         {