+ macosx/equalizer.m: missing vlc_object_release()

 + macosx/vout*: --macosx-vout and --macosx-opengl-effect
                 no longer exist

diff --git a/modules/gui/macosx/equalizer.m b/modules/gui/macosx/equalizer.m
index 93391c773914ed352a775e944139460c7904481f..c8a2cb55643c3b9a1209b58865ec7f0c18ac61e5 100644 (file)
--- a/modules/gui/macosx/equalizer.m
+++ b/modules/gui/macosx/equalizer.m
@@ -120,6 +120,8 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
 
     psz_string = var_GetString( p_object, "audio-filter" );
 
+    vlc_object_release( p_object );
+
     if( !psz_string ) return VLC_FALSE;
 
     psz_parser = strstr( psz_string, psz_name );
@@ -186,8 +188,6 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
     psz_bands = var_GetString( p_object, "equalizer-bands" );
     if( !psz_bands )
         psz_bands = strdup( "0 0 0 0 0 0 0 0 0 0" );
-    if ( !psz_bands )
-        return;
 
     b_2p = var_GetBool( p_object, "equalizer-2pass" );
 

diff --git a/modules/gui/macosx/voutgl.m b/modules/gui/macosx/voutgl.m
index dcd6228517a6b76bc528c978211d6dc5c4794339..e279aa504f077e6faf0744afa591e28d5aaa3210 100644 (file)
--- a/modules/gui/macosx/voutgl.m
+++ b/modules/gui/macosx/voutgl.m
@@ -117,12 +117,10 @@ int E_(OpenVideoGL)  ( vlc_object_t * p_this )
 
     p_vout->p_sys->o_pool = [[NSAutoreleasePool alloc] init];
 
-    var_Create( p_vout, "macosx-vout", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
     var_Create( p_vout, "macosx-vdev", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
     var_Create( p_vout, "macosx-fill", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
     var_Create( p_vout, "macosx-stretch", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
     var_Create( p_vout, "macosx-opaqueness", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
-    var_Create( p_vout, "macosx-opengl-effect", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
 
     /* Setup the menuitem for the multiple displays. Read the vlc preference (macosx-vdev) for the primary display */
     NSArray * o_screens = [NSScreen screens];

diff --git a/modules/gui/macosx/voutqt.m b/modules/gui/macosx/voutqt.m
index 49ce4ead395dbbe3c826363166d9be2023c2a742..f67ded19a822af9f8ec32eb7bda52285a7f12611 100644 (file)
--- a/modules/gui/macosx/voutqt.m
+++ b/modules/gui/macosx/voutqt.m
@@ -141,12 +141,10 @@ int E_(OpenVideoQT) ( vlc_object_t *p_this )
 
     p_vout->p_sys->o_pool = [[NSAutoreleasePool alloc] init];
 
-    var_Create( p_vout, "macosx-vout", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
     var_Create( p_vout, "macosx-vdev", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
     var_Create( p_vout, "macosx-fill", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
     var_Create( p_vout, "macosx-stretch", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
     var_Create( p_vout, "macosx-opaqueness", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
-    var_Create( p_vout, "macosx-opengl-effect", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
     
     /* Initialize QuickTime */
     p_vout->p_sys->h_img_descr =