Commit 4632a220 authored by Eric Petit's avatar Eric Petit

+ macosx/equalizer.m: missing vlc_object_release()

 + macosx/vout*: --macosx-vout and --macosx-opengl-effect
                 no longer exist
parent d4ac5770
...@@ -120,6 +120,8 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf, ...@@ -120,6 +120,8 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
psz_string = var_GetString( p_object, "audio-filter" ); psz_string = var_GetString( p_object, "audio-filter" );
vlc_object_release( p_object );
if( !psz_string ) return VLC_FALSE; if( !psz_string ) return VLC_FALSE;
psz_parser = strstr( psz_string, psz_name ); psz_parser = strstr( psz_string, psz_name );
...@@ -186,8 +188,6 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf, ...@@ -186,8 +188,6 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
psz_bands = var_GetString( p_object, "equalizer-bands" ); psz_bands = var_GetString( p_object, "equalizer-bands" );
if( !psz_bands ) if( !psz_bands )
psz_bands = strdup( "0 0 0 0 0 0 0 0 0 0" ); 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" ); b_2p = var_GetBool( p_object, "equalizer-2pass" );
......
...@@ -117,12 +117,10 @@ int E_(OpenVideoGL) ( vlc_object_t * p_this ) ...@@ -117,12 +117,10 @@ int E_(OpenVideoGL) ( vlc_object_t * p_this )
p_vout->p_sys->o_pool = [[NSAutoreleasePool alloc] init]; 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-vdev", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_vout, "macosx-fill", VLC_VAR_BOOL | 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-stretch", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Create( p_vout, "macosx-opaqueness", VLC_VAR_FLOAT | 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 */ /* Setup the menuitem for the multiple displays. Read the vlc preference (macosx-vdev) for the primary display */
NSArray * o_screens = [NSScreen screens]; NSArray * o_screens = [NSScreen screens];
......
...@@ -141,12 +141,10 @@ int E_(OpenVideoQT) ( vlc_object_t *p_this ) ...@@ -141,12 +141,10 @@ int E_(OpenVideoQT) ( vlc_object_t *p_this )
p_vout->p_sys->o_pool = [[NSAutoreleasePool alloc] init]; 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-vdev", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_vout, "macosx-fill", VLC_VAR_BOOL | 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-stretch", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Create( p_vout, "macosx-opaqueness", VLC_VAR_FLOAT | 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 */ /* Initialize QuickTime */
p_vout->p_sys->h_img_descr = p_vout->p_sys->h_img_descr =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment