Skip to content

V
vlc-1.1
Commit c521391d authored by Juho Vähä-Herttua's avatar Juho Vähä-Herttua Committed by Ilkka Ollakka
Browse files
Options

os x: fix preferences to leave x264 preset/tune empty 

Signed-off-by: default avatarIlkka Ollakka <ileoo@videolan.org>
parent 3ab102eb
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 2 deletions
modules/gui/macosx/prefs_widgets.m
View file @ c521391d
...@@ -1074,9 +1074,13 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ ...@@ -1074,9 +1074,13 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
-2, 0, o_textfieldTooltip ) -2, 0, o_textfieldTooltip )
[o_combo setAutoresizingMask:NSViewWidthSizable ]; [o_combo setAutoresizingMask:NSViewWidthSizable ];
for( i_index = 0; i_index < p_item->i_list; i_index++ ) for( i_index = 0; i_index < p_item->i_list; i_index++ )
if( p_item->value.psz && p_item->ppsz_list[i_index] && {
if( !p_item->value.psz && !p_item->ppsz_list[i_index] )
[o_combo selectItemAtIndex: i_index];
else if( p_item->value.psz && p_item->ppsz_list[i_index] &&
!strcmp( p_item->value.psz, p_item->ppsz_list[i_index] ) ) !strcmp( p_item->value.psz, p_item->ppsz_list[i_index] ) )
[o_combo selectItemAtIndex: i_index]; [o_combo selectItemAtIndex: i_index];
}
[self addSubview: o_combo]; [self addSubview: o_combo];
} }
return self; return self;
...@@ -1118,9 +1122,13 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ ...@@ -1118,9 +1122,13 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
char *psz_value = config_GetPsz( VLCIntf, p_item->psz_name ); char *psz_value = config_GetPsz( VLCIntf, p_item->psz_name );
for( i_index = 0; i_index < p_item->i_list; i_index++ ) for( i_index = 0; i_index < p_item->i_list; i_index++ )
if( psz_value && p_item->ppsz_list[i_index] && {
if( !psz_value && !p_item->ppsz_list[i_index] )
[o_combo selectItemAtIndex: i_index];
else if( psz_value && p_item->ppsz_list[i_index] &&
!strcmp( psz_value, p_item->ppsz_list[i_index] ) ) !strcmp( psz_value, p_item->ppsz_list[i_index] ) )
[o_combo selectItemAtIndex: i_index]; [o_combo selectItemAtIndex: i_index];
}
free( psz_value ); free( psz_value );
[super resetValues]; [super resetValues];
......
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