Skip to content

V
vlc-1.1
Commit f5321d75 authored by Jérome Decoodt's avatar Jérome Decoodt
Browse files
Options

project.pbxproj: correct to relatives paths 

*.nib: presets disabled on startup
equalizer.*: add property Id
             we prefer to change playlist variables instead of config
             coding style
parent 5b630376
Show whitespace changes
Inline Side-by-side
Showing with 213 additions and 180 deletions
extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
View file @ f5321d75
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>IBDocumentLocation</key> <key>IBDocumentLocation</key>
<string>614 71 505 517 0 0 1024 746 </string> <string>799 152 505 517 0 0 1280 1002 </string>
<key>IBEditorPositions</key> <key>IBEditorPositions</key>
<dict> <dict>
<key>1617</key> <key>1617</key>
<string>542 480 104 149 0 0 1024 746 </string> <string>542 480 104 149 0 0 1024 746 </string>
<key>29</key> <key>29</key>
<string>366 655 419 44 0 0 1024 746 </string> <string>521 894 419 44 0 0 1280 1002 </string>
<key>915</key> <key>915</key>
<string>54 452 185 199 0 0 1024 746 </string> <string>54 452 185 199 0 0 1024 746 </string>
</dict> </dict>
...@@ -21,8 +21,9 @@ ...@@ -21,8 +21,9 @@
</array> </array>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>29</integer>
<integer>21</integer> <integer>21</integer>
<integer>2029</integer>
<integer>29</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>7H63</string> <string>7H63</string>
......
extras/MacOSX/vlc.pbproj/project.pbxproj
View file @ f5321d75
...@@ -874,18 +874,18 @@ ...@@ -874,18 +874,18 @@
isa = PBXFileReference; isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h; lastKnownFileType = sourcecode.c.h;
name = equalizer.h; name = equalizer.h;
path = "../../modules/gui/macosx/equalizer.h"; path = ../../modules/gui/macosx/equalizer.h;
refType = 0; refType = 2;
sourceTree = "<absolute>"; sourceTree = SOURCE_ROOT;
}; };
2A16E04006C4F08700C87B09 = { 2A16E04006C4F08700C87B09 = {
fileEncoding = 30; fileEncoding = 30;
isa = PBXFileReference; isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc; lastKnownFileType = sourcecode.c.objc;
name = equalizer.m; name = equalizer.m;
path = "../../modules/gui/macosx/equalizer.m"; path = ../../modules/gui/macosx/equalizer.m;
refType = 0; refType = 2;
sourceTree = "<absolute>"; sourceTree = SOURCE_ROOT;
}; };
2A16E04106C4F08700C87B09 = { 2A16E04106C4F08700C87B09 = {
fileRef = 2A16E03F06C4F08700C87B09; fileRef = 2A16E03F06C4F08700C87B09;
......
modules/gui/macosx/equalizer.m
View file @ f5321d75
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* equalizer.m: MacOS X interface module * equalizer.m: MacOS X interface module
***************************************************************************** *****************************************************************************
* Copyright (C) 2004 VideoLAN * Copyright (C) 2004 VideoLAN
* $Id: equalizer.m 1 2004-08-07 23:50:00Z djc $ * $Id$
* *
* Authors: Jrme Decoodt <djc@videolan.org> * Authors: Jrme Decoodt <djc@videolan.org>
* *
...@@ -39,22 +39,24 @@ ...@@ -39,22 +39,24 @@
*****************************************************************************/ *****************************************************************************/
@implementation VLCEqualizer @implementation VLCEqualizer
static void ChangeFiltersString( intf_thread_t *p_intf, static void ChangeFiltersString( playlist_t *p_playlist,
aout_instance_t * p_aout, aout_instance_t *p_aout,
char *psz_name, vlc_bool_t b_add ) char *psz_name, vlc_bool_t b_add )
{ {
char *psz_parser, *psz_string; char *psz_parser, *psz_string;
vlc_object_t *p_object = NULL;
int i;
if( p_aout ) if( p_playlist != NULL )
{ p_object = ( vlc_object_t* )p_playlist;
psz_string = var_GetString( p_aout, "audio-filter" ); if( p_aout != NULL )
} p_object = ( vlc_object_t* )p_aout;
else if( p_object == NULL )
{ return;
psz_string = config_GetPsz( p_intf, "audio-filter" );
}
if( !psz_string ) psz_string = strdup(""); psz_string = var_GetString( p_object, "audio-filter" );
if( !psz_string ) psz_string = strdup( "" );
psz_parser = strstr( psz_string, psz_name ); psz_parser = strstr( psz_string, psz_name );
...@@ -63,7 +65,7 @@ static void ChangeFiltersString( intf_thread_t *p_intf, ...@@ -63,7 +65,7 @@ static void ChangeFiltersString( intf_thread_t *p_intf,
if( !psz_parser ) if( !psz_parser )
{ {
psz_parser = psz_string; psz_parser = psz_string;
asprintf( &psz_string, (*psz_string) ? "%s,%s" : "%s%s", asprintf( &psz_string, ( *psz_string ) ? "%s,%s" : "%s%s",
psz_string, psz_name ); psz_string, psz_name );
free( psz_parser ); free( psz_parser );
} }
...@@ -76,13 +78,13 @@ static void ChangeFiltersString( intf_thread_t *p_intf, ...@@ -76,13 +78,13 @@ static void ChangeFiltersString( intf_thread_t *p_intf,
{ {
if( psz_parser ) if( psz_parser )
{ {
memmove( psz_parser, psz_parser + strlen(psz_name) + memmove( psz_parser, psz_parser + strlen( psz_name ) +
(*(psz_parser + strlen(psz_name)) == ',' ? 1 : 0 ), ( *( psz_parser + strlen( psz_name ) ) == ',' ? 1 : 0 ),
strlen(psz_parser + strlen(psz_name)) + 1 ); strlen( psz_parser + strlen( psz_name ) ) + 1 );
if( *(psz_string+strlen(psz_string ) -1 ) == ',' ) if( *( psz_string+strlen( psz_string ) - 1 ) == ',' )
{ {
*(psz_string+strlen(psz_string ) -1 ) = '\0'; *( psz_string+strlen( psz_string ) - 1 ) = '\0';
} }
} }
else else
...@@ -92,14 +94,9 @@ static void ChangeFiltersString( intf_thread_t *p_intf, ...@@ -92,14 +94,9 @@ static void ChangeFiltersString( intf_thread_t *p_intf,
} }
} }
if( p_aout == NULL ) var_SetString( p_object, "audio-filter", psz_string );
{ if( p_aout )
config_PutPsz( p_intf, "audio-filter", psz_string );
}
else
{ {
int i;
var_SetString( p_aout, "audio-filter", psz_string );
for( i = 0; i < p_aout->i_nb_inputs; i++ ) for( i = 0; i < p_aout->i_nb_inputs; i++ )
{ {
p_aout->pp_inputs[i]->b_restart = VLC_TRUE; p_aout->pp_inputs[i]->b_restart = VLC_TRUE;
...@@ -108,20 +105,21 @@ static void ChangeFiltersString( intf_thread_t *p_intf, ...@@ -108,20 +105,21 @@ static void ChangeFiltersString( intf_thread_t *p_intf,
free( psz_string ); free( psz_string );
} }
static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf, static vlc_bool_t GetFiltersStatus( playlist_t *p_playlist,
aout_instance_t * p_aout, aout_instance_t *p_aout,
char *psz_name ) char *psz_name )
{ {
char *psz_parser, *psz_string; char *psz_parser, *psz_string;
vlc_object_t *p_object = NULL;
if( p_aout ) if( p_playlist != NULL )
{ p_object = ( vlc_object_t* )p_playlist;
psz_string = var_GetString( p_aout, "audio-filter" ); if( p_aout != NULL )
} p_object = ( vlc_object_t* )p_aout;
else if( p_object == NULL )
{ return VLC_FALSE;
psz_string = config_GetPsz( p_intf, "audio-filter" );
} psz_string = var_GetString( p_object, "audio-filter" );
if( !psz_string ) psz_string = strdup(""); if( !psz_string ) psz_string = strdup("");
...@@ -129,7 +127,7 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf, ...@@ -129,7 +127,7 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
free( psz_string ); free( psz_string );
if (psz_parser) if ( psz_parser )
return VLC_TRUE; return VLC_TRUE;
else else
return VLC_FALSE; return VLC_FALSE;
...@@ -137,12 +135,23 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf, ...@@ -137,12 +135,23 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
- (IBAction)bandSliderUpdated:(id)sender - (IBAction)bandSliderUpdated:(id)sender
{ {
intf_thread_t * p_intf = VLCIntf; intf_thread_t *p_intf = VLCIntf;
aout_instance_t *p_aout= (aout_instance_t *)vlc_object_find(p_intf, aout_instance_t *p_aout = ( aout_instance_t * )vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE); VLC_OBJECT_AOUT, FIND_ANYWHERE );
playlist_t *p_playlist = ( playlist_t * )vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
vlc_object_t *p_object = NULL;
char psz_values[102]; char psz_values[102];
memset( psz_values, 0, 102 ); memset( psz_values, 0, 102 );
if( p_playlist != NULL )
p_object = ( vlc_object_t* )p_playlist;
if( p_aout != NULL )
p_object = ( vlc_object_t* )p_aout;
if( p_object == NULL )
return;
/* Write the new bands values */ /* Write the new bands values */
/* TODO: write a generic code instead of ten times the same thing */ /* TODO: write a generic code instead of ten times the same thing */
...@@ -157,126 +166,130 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf, ...@@ -157,126 +166,130 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band9 floatValue] ); sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band9 floatValue] );
sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band10 floatValue] ); sprintf( psz_values, "%s %.1f", psz_values, [o_slider_band10 floatValue] );
if( p_aout == NULL ) var_SetString( p_object, "equalizer-bands", psz_values );
{ if( p_aout )
config_PutPsz( p_intf, "equalizer-bands", psz_values );
msg_Dbg( p_intf, "equalizer settings set to %s", psz_values);
}
else
{
var_SetString( p_aout, "equalizer-bands", psz_values );
msg_Dbg( p_intf, "equalizer settings changed to %s", psz_values);
vlc_object_release( p_aout ); vlc_object_release( p_aout );
} if( p_playlist )
vlc_object_release( p_playlist );
} }
- (IBAction)changePreset:(id)sender - (IBAction)changePreset:(id)sender
{ {
intf_thread_t * p_intf = VLCIntf; intf_thread_t *p_intf = VLCIntf;
float preamp, band[10]; float f_preamp, f_band[10];
char *p, *p_next; char *psz_bands, *p_next;
int b_2p; vlc_bool_t b_2p;
int i; int i;
aout_instance_t *p_aout= (aout_instance_t *)vlc_object_find(p_intf, aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE); VLC_OBJECT_AOUT, FIND_ANYWHERE );
playlist_t *p_playlist = ( playlist_t * )vlc_object_find( p_intf,
vlc_bool_t enabled = GetFiltersStatus( p_intf, p_aout, "equalizer" ); VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
vlc_object_t *p_object = NULL;
static char *preset_list[] = { vlc_bool_t b_enabled = GetFiltersStatus( p_playlist, p_aout, "equalizer" );
"flat", "classical", "club", "dance", "fullbass", "fullbasstreeble",
"fulltreeble", "headphones","largehall", "live", "party", "pop", "reggae", static char *preset_list[] = {
"flat", "classical", "club", "dance", "fullbass", "fullbasstreble",
"fulltreble", "headphones","largehall", "live", "party", "pop", "reggae",
"rock", "ska", "soft", "softrock", "techno" "rock", "ska", "soft", "softrock", "techno"
}; };
if( p_aout == NULL ) if( p_playlist != NULL )
{ p_object = ( vlc_object_t* )p_playlist;
config_PutPsz( p_intf, "equalizer-preset",preset_list[[sender indexOfSelectedItem]] ); if( p_aout != NULL )
} p_object = ( vlc_object_t* )p_aout;
else if( p_object == NULL )
{ {
var_SetString( p_aout , "equalizer-preset" ,preset_list[[sender indexOfSelectedItem]] ); msg_Dbg( p_intf, "equalizer settings not set: no playlist nor aout found");
vlc_object_release( p_aout ); return;
} }
var_SetString( p_object , "equalizer-preset" , preset_list[[sender indexOfSelectedItem]] );
if( ( p_aout == NULL ) || ( enabled == VLC_FALSE ) ) f_preamp = var_GetFloat( p_object, "equalizer-preamp" );
{ psz_bands = var_GetString( p_object, "equalizer-bands" );
preamp = config_GetFloat( p_intf, "equalizer-preamp" ); b_2p = var_GetBool( p_object, "equalizer-2pass" );
p = config_GetPsz( p_intf, "equalizer-bands"); vlc_object_release( p_object );
b_2p = config_GetInt( p_intf, "equalizer-2pass" );
}
else
{
preamp = var_GetFloat( p_aout, "equalizer-preamp" );
p = var_GetString( p_aout, "equalizer-bands" );
b_2p = var_GetBool( p_aout, "equalizer-2pass" );
vlc_object_release( p_aout );
}
/* Set the preamp slider */ /* Set the preamp slider */
[o_slider_preamp setFloatValue: preamp]; [o_slider_preamp setFloatValue: f_preamp];
/* Set the bands slider */ /* Set the bands slider */
for( i = 0; i < 10; i++ ) for( i = 0; i < 10; i++ )
{ {
/* Read dB -20/20 */ /* Read dB -20/20 */
#ifdef HAVE_STRTOF #ifdef HAVE_STRTOF
band[i] = strtof( p, &p_next ); f_band[i] = strtof( psz_bands, &p_next );
#else #else
band[i] = (float) strtod( p, &p_next ); f_band[i] = (float)strtod( psz_bands, &p_next );
#endif #endif
if( !p_next || p_next == p ) break; /* strtof() failed */ if( !p_next || p_next == psz_bands ) break; /* strtof() failed */
if( !*p ) break; /* end of line */ if( !*psz_bands ) break; /* end of line */
p=p_next+1; psz_bands = p_next+1;
} }
[o_slider_band1 setFloatValue: band[0]]; [o_slider_band1 setFloatValue: f_band[0]];
[o_slider_band2 setFloatValue: band[1]]; [o_slider_band2 setFloatValue: f_band[1]];
[o_slider_band3 setFloatValue: band[2]]; [o_slider_band3 setFloatValue: f_band[2]];
[o_slider_band4 setFloatValue: band[3]]; [o_slider_band4 setFloatValue: f_band[3]];
[o_slider_band5 setFloatValue: band[4]]; [o_slider_band5 setFloatValue: f_band[4]];
[o_slider_band6 setFloatValue: band[5]]; [o_slider_band6 setFloatValue: f_band[5]];
[o_slider_band7 setFloatValue: band[6]]; [o_slider_band7 setFloatValue: f_band[6]];
[o_slider_band8 setFloatValue: band[7]]; [o_slider_band8 setFloatValue: f_band[7]];
[o_slider_band9 setFloatValue: band[8]]; [o_slider_band9 setFloatValue: f_band[8]];
[o_slider_band10 setFloatValue: band[9]]; [o_slider_band10 setFloatValue: f_band[9]];
if( enabled == VLC_TRUE ) if( b_enabled == VLC_TRUE )
[o_btn_enable setState:NSOnState]; [o_btn_enable setState:NSOnState];
else else
[o_btn_enable setState:NSOffState]; [o_btn_enable setState:NSOffState];
[o_btn_2pass setState:( ( b_2p == VLC_TRUE )?NSOnState:NSOffState )]; [o_btn_2pass setState:( ( b_2p == VLC_TRUE ) ? NSOnState : NSOffState )];
} }
- (IBAction)enable:(id)sender - (IBAction)enable:(id)sender
{ {
intf_thread_t * p_intf = VLCIntf; intf_thread_t *p_intf = VLCIntf;
aout_instance_t *p_aout= (aout_instance_t *)vlc_object_find(p_intf, aout_instance_t *p_aout= (aout_instance_t *)vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE); VLC_OBJECT_AOUT, FIND_ANYWHERE );
ChangeFiltersString( p_intf,p_aout, "equalizer", [sender state]); playlist_t *p_playlist = ( playlist_t * )vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
ChangeFiltersString( p_playlist, p_aout, "equalizer", [sender state] );
[o_popup_presets setEnabled: [sender state]];
if( p_aout != NULL ) if( p_aout != NULL )
vlc_object_release( p_aout ); vlc_object_release( p_aout );
if( p_playlist != NULL )
vlc_object_release( p_playlist );
} }
- (IBAction)preampSliderUpdated:(id)sender - (IBAction)preampSliderUpdated:(id)sender
{ {
intf_thread_t * p_intf = VLCIntf; intf_thread_t *p_intf = VLCIntf;
float f= [sender floatValue] ; float f_preamp= [sender floatValue] ;
aout_instance_t *p_aout= (aout_instance_t *)vlc_object_find(p_intf, aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE); VLC_OBJECT_AOUT, FIND_ANYWHERE );
playlist_t *p_playlist = ( playlist_t * )vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_aout == NULL ) vlc_object_t *p_object = NULL;
if( p_playlist != NULL )
p_object = ( vlc_object_t* )p_playlist;
if( p_aout != NULL )
p_object = ( vlc_object_t* )p_aout;
if( p_object == NULL )
{ {
config_PutFloat( p_intf, "equalizer-preamp", f ); msg_Dbg( p_intf, "equalizer settings not set: no playlist nor aout found");
return;
} }
else
{ var_SetFloat( p_object, "equalizer-preamp", f_preamp );
var_SetFloat( p_aout, "equalizer-preamp", f );
if( p_aout != NULL )
vlc_object_release( p_aout ); vlc_object_release( p_aout );
} if( p_playlist != NULL )
vlc_object_release( p_playlist );
} }
- (IBAction)toggleWindow:(id)sender - (IBAction)toggleWindow:(id)sender
...@@ -288,66 +301,76 @@ static char *preset_list[] = { ...@@ -288,66 +301,76 @@ static char *preset_list[] = {
} }
else else
{ {
intf_thread_t * p_intf = VLCIntf; intf_thread_t *p_intf = VLCIntf;
float preamp, band[10]; float f_preamp, f_band[10];
char *p, *p_next; char *psz_bands, *p_next;
int b_2p; vlc_bool_t b_2p;
int i; int i;
aout_instance_t *p_aout= (aout_instance_t *)vlc_object_find(p_intf, aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE); VLC_OBJECT_AOUT, FIND_ANYWHERE );
playlist_t *p_playlist = ( playlist_t * )vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
vlc_object_t *p_object = NULL;
vlc_bool_t enabled = GetFiltersStatus( p_intf, p_aout, "equalizer" ); vlc_bool_t b_enabled = GetFiltersStatus( p_playlist, p_aout, "equalizer" );
if( ( p_aout == NULL ) || ( enabled == VLC_FALSE ) ) if( p_playlist != NULL )
p_object = ( vlc_object_t* )p_playlist;
if( p_aout != NULL )
p_object = ( vlc_object_t* )p_aout;
if( p_object == NULL )
{ {
preamp = config_GetFloat( p_intf, "equalizer-preamp" ); msg_Dbg( p_intf, "equalizer settings not set: no playlist nor aout found");
p = config_GetPsz( p_intf, "equalizer-bands"); return;
b_2p = config_GetInt( p_intf, "equalizer-2pass" );
} }
else
{ f_preamp = var_GetFloat( p_object, "equalizer-preamp" );
preamp = var_GetFloat( p_aout, "equalizer-preamp" ); psz_bands = var_GetString( p_object, "equalizer-bands" );
p = var_GetString( p_aout, "equalizer-bands" ); b_2p = var_GetBool( p_object, "equalizer-2pass" );
b_2p = var_GetBool( p_aout, "equalizer-2pass" );
if( p_aout != NULL )
vlc_object_release( p_aout ); vlc_object_release( p_aout );
} if( p_playlist != NULL )
if( !p ) vlc_object_release( p_playlist );
p = "0 0 0 0 0 0 0 0 0 0";
if( !psz_bands )
psz_bands = "0 0 0 0 0 0 0 0 0 0";
/* Set the preamp slider */ /* Set the preamp slider */
[o_slider_preamp setFloatValue: preamp]; [o_slider_preamp setFloatValue: f_preamp];
/* Set the bands slider */ /* Set the bands slider */
for( i = 0; i < 10; i++ ) for( i = 0; i < 10; i++ )
{ {
/* Read dB -20/20 */ /* Read dB -20/20 */
#ifdef HAVE_STRTOF #ifdef HAVE_STRTOF
band[i] = strtof( p, &p_next ); f_band[i] = strtof( psz_bands, &p_next );
#else #else
band[i] = (float) strtod( p, &p_next ); f_band[i] = (float)strtod( psz_bands, &p_next );
#endif #endif
if( !p_next || p_next == p ) break; /* strtof() failed */ if( !p_next || p_next == psz_bands ) break; /* strtof() failed */
if( !*p ) break; /* end of line */ if( !*psz_bands ) break; /* end of line */
p=p_next+1; psz_bands = p_next+1;
} }
[o_slider_band1 setFloatValue: band[0]]; [o_slider_band1 setFloatValue: f_band[0]];
[o_slider_band2 setFloatValue: band[1]]; [o_slider_band2 setFloatValue: f_band[1]];
[o_slider_band3 setFloatValue: band[2]]; [o_slider_band3 setFloatValue: f_band[2]];
[o_slider_band4 setFloatValue: band[3]]; [o_slider_band4 setFloatValue: f_band[3]];
[o_slider_band5 setFloatValue: band[4]]; [o_slider_band5 setFloatValue: f_band[4]];
[o_slider_band6 setFloatValue: band[5]]; [o_slider_band6 setFloatValue: f_band[5]];
[o_slider_band7 setFloatValue: band[6]]; [o_slider_band7 setFloatValue: f_band[6]];
[o_slider_band8 setFloatValue: band[7]]; [o_slider_band8 setFloatValue: f_band[7]];
[o_slider_band9 setFloatValue: band[8]]; [o_slider_band9 setFloatValue: f_band[8]];
[o_slider_band10 setFloatValue: band[9]]; [o_slider_band10 setFloatValue: f_band[9]];
if( enabled == VLC_TRUE ) if( b_enabled == VLC_TRUE )
[o_btn_enable setState:NSOnState]; [o_btn_enable setState:NSOnState];
else else
[o_btn_enable setState:NSOffState]; [o_btn_enable setState:NSOffState];
[o_btn_2pass setState:( ( b_2p == VLC_TRUE )?NSOnState:NSOffState )]; [o_btn_2pass setState:( ( b_2p == VLC_TRUE ) ? NSOnState : NSOffState )];
[o_window makeKeyAndOrderFront:sender]; [o_window makeKeyAndOrderFront:sender];
[o_btn_equalizer setState:NSOnState]; [o_btn_equalizer setState:NSOnState];
...@@ -356,20 +379,27 @@ static char *preset_list[] = { ...@@ -356,20 +379,27 @@ static char *preset_list[] = {
- (IBAction)twopass:(id)sender - (IBAction)twopass:(id)sender
{ {
intf_thread_t * p_intf = VLCIntf; intf_thread_t *p_intf = VLCIntf;
aout_instance_t *p_aout= (aout_instance_t *)vlc_object_find(p_intf, aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE); VLC_OBJECT_AOUT, FIND_ANYWHERE );
playlist_t *p_playlist = ( playlist_t * )vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
vlc_object_t *p_object = NULL;
vlc_bool_t b_2p = [sender state] ? VLC_TRUE : VLC_FALSE; vlc_bool_t b_2p = [sender state] ? VLC_TRUE : VLC_FALSE;
if( p_aout == NULL ) if( p_playlist != NULL )
p_object = ( vlc_object_t* )p_playlist;
if( p_aout != NULL )
p_object = ( vlc_object_t* )p_aout;
if( p_object == NULL )
{ {
config_PutInt( p_intf, "equalizer-2pass", b_2p ); msg_Dbg( p_intf, "equalizer settings not set: no playlist nor aout found");
return;
} }
else
{ var_SetBool( p_object, "equalizer-2pass", b_2p );
var_SetBool( p_aout, "equalizer-2pass", b_2p ); if( ( [o_btn_enable state] ) && ( p_aout != NULL ) )
if( [o_btn_enable state] )
{ {
int i; int i;
for( i = 0; i < p_aout->i_nb_inputs; i++ ) for( i = 0; i < p_aout->i_nb_inputs; i++ )
...@@ -377,9 +407,11 @@ static char *preset_list[] = { ...@@ -377,9 +407,11 @@ static char *preset_list[] = {
p_aout->pp_inputs[i]->b_restart = VLC_TRUE; p_aout->pp_inputs[i]->b_restart = VLC_TRUE;
} }
} }
vlc_object_release( p_aout );
}
if( p_aout != NULL )
vlc_object_release( p_aout );
if( p_playlist != NULL )
vlc_object_release( p_playlist );
} }
@end @end
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