vlc_object_get(): removes unused parameter

[vlc] / modules / gui / beos / PreferencesWindow.cpp

diff --git a/modules/gui/beos/PreferencesWindow.cpp b/modules/gui/beos/PreferencesWindow.cpp
index 71a326cf25633237afecc550bcc4fb9a407221ba..2d780294b6600314854477abc39ae9a496cc6d27 100644 (file)
--- a/modules/gui/beos/PreferencesWindow.cpp
+++ b/modules/gui/beos/PreferencesWindow.cpp
@@ -21,12 +21,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <stdlib.h> /* atoi(), strtod() */
 
 #include <String.h>
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
-#include <vlc/intf.h>
+#include <vlc_interface.h>
 #include <vlc_keys.h>
 #include <vlc_config_cat.h>
 
@@ -422,7 +425,7 @@ ConfigItem::ConfigItem( intf_thread_t * _p_intf, char * name,
     module_t * p_module = NULL;
     if( fType == TYPE_MODULE )
     {
-        p_module = (module_t *) vlc_object_get( p_intf, fObjectId );
+        p_module = (module_t *) vlc_object_get( fObjectId );
     }
     else
     {
@@ -615,12 +618,6 @@ ConfigWidget::ConfigWidget( intf_thread_t * _p_intf, BRect rect,
 
     BRect r;
     BMenuItem * menuItem;
-    /* Skip deprecated options */
-    if( p_item->psz_current )
-    {
-        fInitOK = false;
-        return;
-    }
 
     fInitOK = true;
 
@@ -766,7 +763,7 @@ void ConfigWidget::Apply( bool doIt )
                     {
                         val.i_int |= KEY_MODIFIER_SHIFT;
                     }
-                    var_Set( p_intf->p_vlc, fName, val );
+                    var_Set( p_intf->p_libvlc, fName, val );
                 }
             }
             else
@@ -775,7 +772,7 @@ void ConfigWidget::Apply( bool doIt )
                 fAltCheck->SetValue( val.i_int & KEY_MODIFIER_ALT );
                 fCtrlCheck->SetValue( val.i_int & KEY_MODIFIER_CTRL );
                 fShiftCheck->SetValue( val.i_int & KEY_MODIFIER_SHIFT );
-        
+ 
                 for( unsigned i = 0;
                      i < sizeof( vlc_keys ) / sizeof( key_descriptor_t ); i++ )
                 {