Commit ad018626 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

macosx: Don't use object_id in controls.

parent 77e71008
......@@ -77,8 +77,6 @@
- (IBAction)forward:(id)sender;
- (IBAction)backward:(id)sender;
- (id)getVoutView;
- (IBAction)volumeUp:(id)sender;
- (IBAction)volumeDown:(id)sender;
- (IBAction)mute:(id)sender;
......@@ -113,30 +111,6 @@
@end
/*****************************************************************************
* VLCMenuExt interface
*****************************************************************************
* This holds our data for autogenerated menus
*****************************************************************************/
@interface VLCMenuExt : NSObject
{
char *psz_name;
int i_object_id;
vlc_value_t value;
int i_type;
}
- (id)initWithVar: (const char *)_psz_name
Object: (int)i_id
Value: (vlc_value_t)val
ofType: (int)_i_type;
- (char *)name;
- (int)objectID;
- (vlc_value_t)value;
- (int)type;
@end
/*****************************************************************************
* VLCTimeField interface
*****************************************************************************
......
......@@ -40,6 +40,31 @@
#include <vlc_osd.h>
#include <vlc_keys.h>
/*****************************************************************************
* VLCAutoGeneratedMenuContent interface
*****************************************************************************
* This holds our data for autogenerated menus
*****************************************************************************/
@interface VLCAutoGeneratedMenuContent : NSObject
{
char *psz_name;
vlc_object_t * _vlc_object;
vlc_value_t value;
int i_type;
}
- (id)initWithVariableName: (const char *)name
ofObject: (vlc_object_t *)object
andValue: (vlc_value_t)value
ofType: (int)type;
- (const char *)name;
- (vlc_value_t)value;
- (vlc_object_t *)vlcObject;
- (int)type;
@end
#pragma mark -
/*****************************************************************************
* VLCControls implementation
*****************************************************************************/
......@@ -124,7 +149,8 @@
PL_LOCK;
empty = playlist_IsEmpty( p_playlist );
PL_UNLOCK;
vlc_object_release( p_playlist );
pl_Release( p_intf );
if( empty )
[o_main intfOpenFileGeneric: (id)sender];
......@@ -132,29 +158,29 @@
var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_PLAY_PAUSE );
}
/* Small helper method */
/* Small helper method (Private) */
-(id) getVoutView
- (id)_voutView
{
id o_window;
id o_vout_view = nil;
id o_embedded_vout_list = [[VLCMain sharedInstance] getEmbeddedList];
NSEnumerator *o_enumerator = [[NSApp orderedWindows] objectEnumerator];
while( !o_vout_view && ( o_window = [o_enumerator nextObject] ) )
id window;
id voutView = nil;
id embeddedViewList = [[VLCMain sharedInstance] getEmbeddedList];
NSEnumerator *enumerator = [[NSApp orderedWindows] objectEnumerator];
while( !voutView && ( window = [enumerator nextObject] ) )
{
/* We have an embedded vout */
if( [o_embedded_vout_list windowContainsEmbedded: o_window] )
if( [embeddedViewList windowContainsEmbedded: window] )
{
o_vout_view = [o_embedded_vout_list getViewForWindow: o_window];
voutView = [embeddedViewList getViewForWindow: window];
}
/* We have a detached vout */
else if( [[o_window className] isEqualToString: @"VLCVoutWindow"] )
else if( [[window className] isEqualToString: @"VLCVoutWindow"] )
{
msg_Dbg( VLCIntf, "detached vout controls.m call getVoutView" );
o_vout_view = [o_window getVoutView];
voutView = [window getVoutView];
}
}
return o_vout_view;
return [[voutView retain] autorelease];
}
- (IBAction)stop:(id)sender
......@@ -163,7 +189,7 @@
var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_STOP );
/* Close the window directly, because we do know that there
* won't be anymore video. It's currently waiting a bit. */
[[[self getVoutView] window] orderOut:self];
[[[self _voutView] window] orderOut:self];
}
- (IBAction)faster:(id)sender
......@@ -644,18 +670,18 @@
return;
}
VLCMenuExt *o_data;
VLCAutoGeneratedMenuContent *o_data;
switch( i_type & VLC_VAR_TYPE )
{
case VLC_VAR_VOID:
o_data = [[VLCMenuExt alloc] initWithVar: psz_variable Object: p_object->i_object_id
Value: val ofType: i_type];
o_data = [[VLCAutoGeneratedMenuContent alloc] initWithVariableName: psz_variable ofObject: p_object
andValue: val ofType: i_type];
[o_mi setRepresentedObject: [NSValue valueWithPointer:[o_data retain]]];
break;
case VLC_VAR_BOOL:
o_data = [[VLCMenuExt alloc] initWithVar: psz_variable Object: p_object->i_object_id
Value: val ofType: i_type];
o_data = [[VLCAutoGeneratedMenuContent alloc] initWithVariableName: psz_variable ofObject: p_object
andValue: val ofType: i_type];
[o_mi setRepresentedObject: [NSValue valueWithPointer:[o_data retain]]];
if( !( i_type & VLC_VAR_ISCOMMAND ) )
[o_mi setState: val.b_bool ? TRUE : FALSE ];
......@@ -736,7 +762,7 @@
vlc_value_t another_val;
NSMenuItem * o_lmi;
NSString *o_title = @"";
VLCMenuExt *o_data;
VLCAutoGeneratedMenuContent *o_data;
switch( i_type & VLC_VAR_TYPE )
{
......@@ -748,8 +774,8 @@
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 = [[VLCMenuExt alloc] initWithVar: strdup(psz_variable) Object: p_object->i_object_id
Value: another_val ofType: i_type];
o_data = [[VLCAutoGeneratedMenuContent alloc] initWithVariableName: strdup(psz_variable) ofObject: p_object
andValue: another_val ofType: i_type];
[o_lmi setRepresentedObject: [NSValue valueWithPointer:[o_data retain]]];
[o_lmi setTarget: self];
......@@ -766,8 +792,8 @@
val_list.p_list->p_values[i].i_int];
o_lmi = [[o_menu addItemWithTitle: o_title action: pf_callback keyEquivalent: @""] retain ];
o_data = [[VLCMenuExt alloc] initWithVar: strdup(psz_variable) Object: p_object->i_object_id
Value: val_list.p_list->p_values[i] ofType: i_type];
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 retain]]];
[o_lmi setTarget: self];
......@@ -788,26 +814,28 @@
- (IBAction)toggleVar:(id)sender
{
NSMenuItem *o_mi = (NSMenuItem *)sender;
VLCMenuExt *o_data = [[o_mi representedObject] pointerValue];
VLCAutoGeneratedMenuContent *o_data = [[o_mi representedObject] pointerValue];
[NSThread detachNewThreadSelector: @selector(toggleVarThread:)
toTarget: self withObject: o_data];
return;
}
- (int)toggleVarThread: (id)_o_data
- (int)toggleVarThread: (id)data
{
vlc_object_t *p_object;
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
VLCMenuExt *o_data = (VLCMenuExt *)_o_data;
assert([data isKindOfClass:[VLCAutoGeneratedMenuContent class]]);
VLCAutoGeneratedMenuContent *menuContent = (VLCAutoGeneratedMenuContent *)data;
vlc_thread_set_priority( VLCIntf , VLC_THREAD_PRIORITY_LOW );
p_object = (vlc_object_t *)vlc_object_get( VLCIntf->p_libvlc, [o_data objectID] );
p_object = [menuContent vlcObject];
if( p_object != NULL )
{
var_Set( p_object, strdup([o_data name]), [o_data value] );
var_Set( p_object, [menuContent name], [menuContent value] );
vlc_object_release( p_object );
[o_pool release];
return true;
......@@ -1041,24 +1069,24 @@
@end
/*****************************************************************************
* VLCMenuExt implementation
* VLCAutoGeneratedMenuContent implementation
*****************************************************************************
* Object connected to a playlistitem which remembers the data belonging to
* the variable of the autogenerated menu
*****************************************************************************/
@implementation VLCMenuExt
@implementation VLCAutoGeneratedMenuContent
- (id)initWithVar: (const char *)_psz_name Object: (int)i_id
Value: (vlc_value_t)val ofType: (int)_i_type
-(id) initWithVariableName:(const char *)name ofObject:(vlc_object_t *)object
andValue:(vlc_value_t)val ofType:(int)type
{
self = [super init];
if( self != nil )
{
psz_name = strdup( _psz_name );
i_object_id = i_id;
psz_name = strdup( name );
_vlc_object = vlc_object_yield( object );
value = val;
i_type = _i_type;
i_type = type;
}
return( self );
......@@ -1066,25 +1094,27 @@
- (void)dealloc
{
vlc_object_release( _vlc_object );
free( psz_name );
[super dealloc];
}
- (char *)name
- (const char *)name
{
return psz_name;
}
- (int)objectID
- (vlc_value_t)value
{
return i_object_id;
return value;
}
- (vlc_value_t)value
- (vlc_object_t *)vlcObject
{
return value;
return vlc_object_yield( _vlc_object );
}
- (int)type
{
return i_type;
......
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