Skip to content

V
vlc
Commit e2fd56a1 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

macosx: remove NSValue around VLCAutogeneratedMenu

parent 8bfec18d
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
modules/gui/macosx/controls.m
View file @ e2fd56a1
......@@ -710,13 +710,13 @@
case VLC_VAR_VOID:
o_data = [[VLCAutoGeneratedMenuContent alloc] initWithVariableName: psz_variable ofObject: p_object
andValue: val ofType: i_type];
[o_mi setRepresentedObject: [NSValue valueWithPointer:[o_data autorelease]]];
[o_mi setRepresentedObject: [o_data autorelease]];
break;
case VLC_VAR_BOOL:
o_data = [[VLCAutoGeneratedMenuContent alloc] initWithVariableName: psz_variable ofObject: p_object
andValue: val ofType: i_type];
[o_mi setRepresentedObject: [NSValue valueWithPointer:[o_data autorelease]]];
[o_mi setRepresentedObject: [o_data autorelease]];
if( !( i_type & VLC_VAR_ISCOMMAND ) )
[o_mi setState: val.b_bool ? TRUE : FALSE ];
break;
......@@ -821,7 +821,7 @@
o_lmi = [o_menu addItemWithTitle: o_title action: pf_callback keyEquivalent: @""];
o_data = [[VLCAutoGeneratedMenuContent alloc] initWithVariableName: strdup(psz_variable) ofObject: p_object
andValue: another_val ofType: i_type];
[o_lmi setRepresentedObject: [NSValue valueWithPointer:[o_data autorelease]]];
[o_lmi setRepresentedObject: [o_data autorelease]];
[o_lmi setTarget: self];
if( !strcmp( val.psz_string, val_list.p_list->p_values[i].psz_string ) && !( i_type & VLC_VAR_ISCOMMAND ) )
......@@ -839,7 +839,7 @@
o_lmi = [o_menu addItemWithTitle: o_title action: pf_callback keyEquivalent: @""];
o_data = [[VLCAutoGeneratedMenuContent alloc] initWithVariableName: strdup(psz_variable) ofObject: p_object
andValue: val_list.p_list->p_values[i] ofType: i_type];
[o_lmi setRepresentedObject: [NSValue valueWithPointer:[ o_data autorelease]]];
[o_lmi setRepresentedObject: [o_data autorelease]];
[o_lmi setTarget: self];
if( val_list.p_list->p_values[i].i_int == val.i_int && !( i_type & VLC_VAR_ISCOMMAND ) )
......@@ -867,7 +867,7 @@
- (IBAction)toggleVar:(id)sender
{
NSMenuItem *o_mi = (NSMenuItem *)sender;
VLCAutoGeneratedMenuContent *o_data = [[o_mi representedObject] pointerValue];
VLCAutoGeneratedMenuContent *o_data = [o_mi representedObject];
[NSThread detachNewThreadSelector: @selector(toggleVarThread:)
toTarget: self withObject: o_data];
......
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