Use module_IsCapable

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index b57cc709ea3042ea01014a50d69856556ce9aafb..2ee3ffa422f7df71a67d7e129a35c4e29fab4d44 100644 (file)
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -216,15 +216,15 @@ void ExtVideo::ChangeVFiltersString( char *psz_name, vlc_bool_t b_add )
         return;
     }
 
-    if( !strcmp( ((module_t*)p_obj)->psz_capability, "video filter2" ) )
+    if( module_IsCapable( (module_t*)p_obj, "video filter2" ) )
     {
         psz_filter_type = "video-filter";
     }
-    else if( !strcmp( ((module_t*)p_obj)->psz_capability, "video filter" ) )
+    else if( module_IsCapable( (module_t*)p_obj, "video filter" ) )
     {
         psz_filter_type = "vout-filter";
     }
-    else if( !strcmp( ((module_t*)p_obj)->psz_capability, "sub filter" ) )
+    else if( module_IsCapable( (module_t*)p_obj, "sub filter" ) )
     {
         psz_filter_type = "sub-filter";
     }

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 5abd99e5b23e8931c94d67897feee57f93f4f8c1..2df114a4c0c9792701eff1a58051dbe797118b24 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -452,7 +452,7 @@ void ModuleConfigControl::finish( bool bycat )
                     combo->setCurrentIndex( combo->count() - 1 );
             }
         }
-        else if( !strcmp( p_parser->psz_capability, p_item->psz_type ) )
+        else if( module_IsCapable( p_parser, p_item->psz_type ) )
         {
             combo->addItem( qtr(p_parser->psz_longname),
                             QVariant( p_parser->psz_object_name ) );
@@ -572,7 +572,7 @@ void ModuleListConfigControl::finish( bool bycat )
                 }
             }
         }
-        else if( !strcmp( p_parser->psz_capability, p_item->psz_type ) )
+        else if( module_IsCapable( p_parser, p_item->psz_type ) )
         {
             CHECKBOX_LISTS;
         }

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index c39d95f86f052a2a6338b478bcb208f7f72f24a7..39fec7c2105e4b5ed1ae59f635f66f0d8049be6c 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -428,31 +428,29 @@ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf )
     for( int i_index = 0 ; i_index < p_list->i_count; i_index++ )
     {
         module_t * p_parser = (module_t *)p_list->p_values[i_index].p_object ;
-        if( !strcmp( p_parser->psz_capability, "services_discovery" ) )
+        if( module_IsCapable( p_parser, "services_discovery" ) )
             i_num++;
     }
     for( int i_index = 0 ; i_index < p_list->i_count; i_index++ )
     {
         module_t * p_parser = (module_t *)p_list->p_values[i_index].p_object;
-        if( !strcmp( p_parser->psz_capability, "services_discovery" ) )
-        {
-            QAction *a = new QAction( qfu( p_parser->psz_longname ), menu );
-            a->setCheckable( true );
-            /* hack to handle submodules properly */
-            int i = -1;
-            while( p_parser->pp_shortcuts[++i] != NULL );
-            i--;
-            if( playlist_IsServicesDiscoveryLoaded( THEPL,
-                        i>=0?p_parser->pp_shortcuts[i]
-                        : p_parser->psz_object_name ) )
-            {
-                a->setChecked( true );
-            }
-            CONNECT( a , triggered(), THEDP->SDMapper, map() );
-            THEDP->SDMapper->setMapping( a, i>=0? p_parser->pp_shortcuts[i] :
-                    p_parser->psz_object_name );
-            menu->addAction( a );
-        }
+        if( !module_IsCapable( p_parser, "services_discovery" ) )
+            continue;
+
+        QAction *a = new QAction( qfu( p_parser->psz_longname ), menu );
+        a->setCheckable( true );
+        /* hack to handle submodules properly */
+        int i = -1;
+        while( p_parser->pp_shortcuts[++i] != NULL );
+        i--;
+        if( playlist_IsServicesDiscoveryLoaded( THEPL,
+                    i>=0?p_parser->pp_shortcuts[i]
+                    : p_parser->psz_object_name ) )
+            a->setChecked( true );
+        CONNECT( a , triggered(), THEDP->SDMapper, map() );
+        THEDP->SDMapper->setMapping( a, i>=0? p_parser->pp_shortcuts[i] :
+                                              p_parser->psz_object_name );
+        menu->addAction( a );
     }
     vlc_list_release( p_list );
     return menu;