[o_mi setTitle: [[VLCMain sharedInstance] localizedString: text.psz_string ?
text.psz_string : psz_variable ]];
- var_Get( p_object, psz_variable, &val );
if( i_type & VLC_VAR_HASCHOICE )
{
NSMenu *o_menu = [o_mi submenu];
free( text.psz_string );
return;
}
+ if( var_Get( p_object, psz_variable, &val ) < 0 )
+ {
+ return;
+ }
VLCAutoGeneratedMenuContent *o_data;
switch( i_type & VLC_VAR_TYPE )
break;
default:
- free( text.psz_string );
- return;
+ break;
}
if( ( i_type & VLC_VAR_TYPE ) == VLC_VAR_STRING ) free( val.psz_string );
for( i = 0; i < val_list.p_list->i_count; i++ )
{
- vlc_value_t another_val;
NSMenuItem * o_lmi;
NSString *o_title = @"";
VLCAutoGeneratedMenuContent *o_data;
switch( i_type & VLC_VAR_TYPE )
{
case VLC_VAR_STRING:
- another_val.psz_string =
- strdup(val_list.p_list->p_values[i].psz_string);
o_title = [[VLCMain sharedInstance] localizedString: text_list.p_list->p_values[i].psz_string ?
text_list.p_list->p_values[i].psz_string : val_list.p_list->p_values[i].psz_string ];
o_lmi = [o_menu addItemWithTitle: o_title action: pf_callback keyEquivalent: @""];
o_data = [[VLCAutoGeneratedMenuContent alloc] initWithVariableName: psz_variable ofObject: p_object
- andValue: another_val ofType: i_type];
+ andValue: val_list.p_list->p_values[i] ofType: i_type];
[o_lmi setRepresentedObject: [o_data autorelease]];
[o_lmi setTarget: self];
if( self != nil )
{
- psz_name = strdup( name );
_vlc_object = vlc_object_hold( object );
- value = val;
+ psz_name = strdup( name );
i_type = type;
+ value = val;
+ if( (i_type & VLC_VAR_TYPE) == VLC_VAR_STRING )
+ value.psz_string = strdup( val.psz_string );
}
return( self );
- (void)dealloc
{
vlc_object_release( _vlc_object );
+ if( (i_type & VLC_VAR_TYPE) == VLC_VAR_STRING )
+ free( value.psz_string );
free( psz_name );
[super dealloc];
}