X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fcontrols.m;h=b0aea74328193724cc1ea00ed15ccd8cb341bd40;hb=223286529bb015c350f9839b4fcdb03ea59b2c7a;hp=b59df439d11c5023db725849b8ff67615de33282;hpb=7e413aa7c9d60c30c86a7cd84862fc14f4920c83;p=vlc diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m index b59df439d1..b0aea74328 100644 --- a/modules/gui/macosx/controls.m +++ b/modules/gui/macosx/controls.m @@ -1,14 +1,14 @@ /***************************************************************************** * controls.m: MacOS X interface module ***************************************************************************** - * Copyright (C) 2002-2007 the VideoLAN team + * Copyright (C) 2002-2009 the VideoLAN team * $Id$ * * Authors: Jon Lech Johansen * Christophe Massiot * Derk-Jan Hartman * Benjamin Pracht - * Felix Kühne + * Felix Paul Kühne * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -40,6 +40,7 @@ #include #include +#pragma mark - /***************************************************************************** * VLCControls implementation *****************************************************************************/ @@ -117,98 +118,82 @@ - (IBAction)play:(id)sender { - vlc_value_t val; intf_thread_t * p_intf = VLCIntf; - playlist_t * p_playlist = pl_Yield( p_intf ); + playlist_t * p_playlist = pl_Hold( p_intf ); + bool empty; - vlc_object_lock( p_playlist ); - if( playlist_IsEmpty( p_playlist ) ) - { - vlc_object_unlock( p_playlist ); - vlc_object_release( p_playlist ); + PL_LOCK; + empty = playlist_IsEmpty( p_playlist ); + PL_UNLOCK; + + pl_Release( p_intf ); + + if( empty ) [o_main intfOpenFileGeneric: (id)sender]; - } - else - { - vlc_object_unlock( p_playlist ); - vlc_object_release( p_playlist ); - } - val.i_int = config_GetInt( p_intf, "key-play-pause" ); - var_Set( p_intf->p_libvlc, "key-pressed", val ); + var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_PLAY_PAUSE ); } -/* Small helper method */ - --(id) getVoutView +- (id)voutView { id o_window; - id o_vout_view = nil; - id o_embedded_vout_list = [[VLCMain sharedInstance] getEmbeddedList]; + id o_voutView = nil; + id o_embeddedViewList = [[VLCMain sharedInstance] embeddedList]; NSEnumerator *o_enumerator = [[NSApp orderedWindows] objectEnumerator]; - while( !o_vout_view && ( o_window = [o_enumerator nextObject] ) ) + while( !o_voutView && ( o_window = [o_enumerator nextObject] ) ) { /* We have an embedded vout */ - if( [o_embedded_vout_list windowContainsEmbedded: o_window] ) + if( [o_embeddedViewList windowContainsEmbedded: o_window] ) { - o_vout_view = [o_embedded_vout_list getViewForWindow: o_window]; + o_voutView = [o_embeddedViewList viewForWindow: o_window]; } /* We have a detached vout */ else if( [[o_window className] isEqualToString: @"VLCVoutWindow"] ) { - msg_Dbg( VLCIntf, "detached vout controls.m call getVoutView" ); - o_vout_view = [o_window getVoutView]; + o_voutView = [o_window voutView]; } } - return o_vout_view; + return [[o_voutView retain] autorelease]; } - - (IBAction)stop:(id)sender { - vlc_value_t val; intf_thread_t * p_intf = VLCIntf; - val.i_int = config_GetInt( p_intf, "key-stop" ); - var_Set( p_intf->p_libvlc, "key-pressed", val ); + 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 voutView] window] orderOut:self]; } - (IBAction)faster:(id)sender { - vlc_value_t val; intf_thread_t * p_intf = VLCIntf; - val.i_int = config_GetInt( p_intf, "key-faster" ); - var_Set( p_intf->p_libvlc, "key-pressed", val ); + var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_FASTER ); } - (IBAction)slower:(id)sender { - vlc_value_t val; intf_thread_t * p_intf = VLCIntf; - val.i_int = config_GetInt( p_intf, "key-slower" ); - var_Set( p_intf->p_libvlc, "key-pressed", val ); + var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_SLOWER ); } - (IBAction)prev:(id)sender { - vlc_value_t val; intf_thread_t * p_intf = VLCIntf; - val.i_int = config_GetInt( p_intf, "key-prev" ); - var_Set( p_intf->p_libvlc, "key-pressed", val ); + var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_PREV ); } - (IBAction)next:(id)sender { - vlc_value_t val; intf_thread_t * p_intf = VLCIntf; - val.i_int = config_GetInt( p_intf, "key-next" ); - var_Set( p_intf->p_libvlc, "key-pressed", val ); + var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_NEXT ); } - (IBAction)random:(id)sender { vlc_value_t val; intf_thread_t * p_intf = VLCIntf; - playlist_t * p_playlist = pl_Yield( p_intf ); + playlist_t * p_playlist = pl_Hold( p_intf ); var_Get( p_playlist, "random", &val ); val.b_bool = !val.b_bool; @@ -226,7 +211,7 @@ p_intf->p_sys->b_playmode_update = true; p_intf->p_sys->b_intf_update = true; - vlc_object_release( p_playlist ); + pl_Release( p_intf ); } /* three little ugly helpers */ @@ -234,31 +219,38 @@ { [o_btn_repeat setImage: o_repeat_single]; [o_btn_repeat setAlternateImage: o_repeat_all]; + [o_btn_repeat_embed setImage: [NSImage imageNamed:@"sidebarRepeatOneOn"]]; } - (void)repeatAll { [o_btn_repeat setImage: o_repeat_all]; [o_btn_repeat setAlternateImage: o_repeat_off]; + [o_btn_repeat_embed setImage: [NSImage imageNamed:@"sidebarRepeatOn"]]; } - (void)repeatOff { [o_btn_repeat setImage: o_repeat_off]; [o_btn_repeat setAlternateImage: o_repeat_single]; + [o_btn_repeat_embed setImage: [NSImage imageNamed:@"sidebarRepeat"]]; } - (void)shuffle { vlc_value_t val; - playlist_t *p_playlist = pl_Yield( VLCIntf ); + playlist_t *p_playlist = pl_Hold( VLCIntf ); var_Get( p_playlist, "random", &val ); [o_btn_shuffle setState: val.b_bool]; - vlc_object_release( p_playlist ); + if(val.b_bool) + [o_btn_shuffle_embed setImage: [NSImage imageNamed:@"sidebarShuffleOn"]]; + else + [o_btn_shuffle_embed setImage: [NSImage imageNamed:@"sidebarShuffle"]]; + pl_Release( VLCIntf ); } - (IBAction)repeatButtonAction:(id)sender { vlc_value_t looping,repeating; intf_thread_t * p_intf = VLCIntf; - playlist_t * p_playlist = pl_Yield( p_intf ); + playlist_t * p_playlist = pl_Hold( p_intf ); var_Get( p_playlist, "repeat", &repeating ); var_Get( p_playlist, "loop", &looping ); @@ -318,7 +310,7 @@ p_intf->p_sys->b_playmode_update = true; p_intf->p_sys->b_intf_update = true; - vlc_object_release( p_playlist ); + pl_Release( p_intf ); } @@ -326,7 +318,7 @@ { vlc_value_t val; intf_thread_t * p_intf = VLCIntf; - playlist_t * p_playlist = pl_Yield( p_intf ); + playlist_t * p_playlist = pl_Hold( p_intf ); var_Get( p_playlist, "repeat", &val ); if (!val.b_bool) @@ -348,14 +340,14 @@ p_intf->p_sys->b_playmode_update = true; p_intf->p_sys->b_intf_update = true; - vlc_object_release( p_playlist ); + pl_Release( p_intf ); } - (IBAction)loop:(id)sender { vlc_value_t val; intf_thread_t * p_intf = VLCIntf; - playlist_t * p_playlist = pl_Yield( p_intf ); + playlist_t * p_playlist = pl_Hold( p_intf ); var_Get( p_playlist, "loop", &val ); if (!val.b_bool) @@ -377,52 +369,43 @@ p_intf->p_sys->b_playmode_update = true; p_intf->p_sys->b_intf_update = true; - vlc_object_release( p_playlist ); + pl_Release( p_intf ); } - (IBAction)forward:(id)sender { - vlc_value_t val; intf_thread_t * p_intf = VLCIntf; - val.i_int = config_GetInt( p_intf, "key-jump+short" ); - var_Set( p_intf->p_libvlc, "key-pressed", val ); + var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_JUMP_FORWARD_SHORT ); } - (IBAction)backward:(id)sender { vlc_value_t val; intf_thread_t * p_intf = VLCIntf; - val.i_int = config_GetInt( p_intf, "key-jump-short" ); - var_Set( p_intf->p_libvlc, "key-pressed", val ); + var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_JUMP_BACKWARD_SHORT ); } - (IBAction)volumeUp:(id)sender { - vlc_value_t val; intf_thread_t * p_intf = VLCIntf; - val.i_int = config_GetInt( p_intf, "key-vol-up" ); - var_Set( p_intf->p_libvlc, "key-pressed", val ); + var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_VOL_UP ); /* Manage volume status */ [o_main manageVolumeSlider]; } - (IBAction)volumeDown:(id)sender { - vlc_value_t val; intf_thread_t * p_intf = VLCIntf; - val.i_int = config_GetInt( p_intf, "key-vol-down" ); - var_Set( p_intf->p_libvlc, "key-pressed", val ); + var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_VOL_DOWN ); /* Manage volume status */ [o_main manageVolumeSlider]; } - (IBAction)mute:(id)sender { - vlc_value_t val; intf_thread_t * p_intf = VLCIntf; - val.i_int = config_GetInt( p_intf, "key-vol-mute" ); - var_Set( p_intf->p_libvlc, "key-pressed", val ); + var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_VOL_MUTE ); /* Manage volume status */ [o_main manageVolumeSlider]; } @@ -444,10 +427,8 @@ FIND_ANYWHERE ); if( p_vout != NULL ) { - vlc_value_t val; intf_thread_t * p_intf = VLCIntf; - val.i_int = config_GetInt( p_intf, "key-position" ); - var_Set( p_intf, "key-pressed", val ); + var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_POSITION ); vlc_object_release( (vlc_object_t *)p_vout ); } } @@ -458,7 +439,7 @@ } - (BOOL) isFullscreen { - id o_vout_view = [self getVoutView]; + id o_vout_view = [self voutView]; if( o_vout_view ) { return [o_vout_view isFullscreen]; @@ -474,7 +455,7 @@ FIND_ANYWHERE ); if( p_vout != NULL ) { - id o_vout_view = [self getVoutView]; + id o_vout_view = [self voutView]; if( o_vout_view ) { if( [o_title isEqualToString: _NS("Half Size") ] ) @@ -487,7 +468,7 @@ [o_vout_view toggleFloatOnTop]; else if( [o_title isEqualToString: _NS("Fit to Screen") ] ) { - id o_window = [o_vout_view getWindow]; + id o_window = [o_vout_view voutWindow]; if( ![o_window isZoomed] ) [o_window performZoom:self]; } @@ -497,6 +478,7 @@ } else { + /* Fullscreen state for next time will be saved here too */ [o_vout_view toggleFullscreen]; } } @@ -504,7 +486,7 @@ } else { - playlist_t * p_playlist = pl_Yield( VLCIntf ); + playlist_t * p_playlist = pl_Hold( VLCIntf ); if( [o_title isEqualToString: _NS("Fullscreen")] || [sender isKindOfClass:[NSButton class]] ) @@ -514,9 +496,87 @@ var_Set( p_playlist, "fullscreen", (vlc_value_t)!val.b_bool ); } - vlc_object_release( p_playlist ); + pl_Release( VLCIntf ); + } + +} + +- (IBAction)telxTransparent:(id)sender +{ + intf_thread_t * p_intf = VLCIntf; + vlc_object_t *p_vbi; + p_vbi = (vlc_object_t *) vlc_object_find_name( p_intf, + "zvbi", FIND_ANYWHERE ); + if( p_vbi ) + { + var_SetBool( p_vbi, "vbi-opaque", [sender state] ); + [sender setState: ![sender state]]; + vlc_object_release( p_vbi ); } +} + +- (IBAction)telxNavLink:(id)sender +{ + intf_thread_t * p_intf = VLCIntf; + vlc_object_t *p_vbi; + int i_page = 0; + + if( [[sender title] isEqualToString: _NS("Index")] ) + i_page = 'i' << 16; + else if( [[sender title] isEqualToString: _NS("Red")] ) + i_page = 'r' << 16; + else if( [[sender title] isEqualToString: _NS("Green")] ) + i_page = 'g' << 16; + else if( [[sender title] isEqualToString: _NS("Yellow")] ) + i_page = 'y' << 16; + else if( [[sender title] isEqualToString: _NS("Blue")] ) + i_page = 'b' << 16; + if( i_page == 0 ) return; + + p_vbi = (vlc_object_t *) vlc_object_find_name( p_intf, + "zvbi", FIND_ANYWHERE ); + if( p_vbi ) + { + var_SetInteger( p_vbi, "vbi-page", i_page ); + vlc_object_release( p_vbi ); + } +} + +- (IBAction)addSubtitleFile:(id)sender +{ + NSInteger i_returnValue = 0; + input_thread_t * p_input = pl_CurrentInput( VLCIntf ); + if( !p_input ) return; + + input_item_t *p_item = input_GetItem( p_input ); + if( !p_item ) return; + + char *path = input_item_GetURI( p_item ); + if( !path ) path = strdup( "" ); + NSOpenPanel * openPanel = [NSOpenPanel openPanel]; + [openPanel setCanChooseFiles: YES]; + [openPanel setCanChooseDirectories: NO]; + [openPanel setAllowsMultipleSelection: YES]; + i_returnValue = [openPanel runModalForDirectory: [NSString stringWithUTF8String: path] file: nil types: [NSArray arrayWithObjects: @"cdg",@"@idx",@"srt",@"sub",@"utf",@"ass",@"ssa",@"aqt",@"jss",@"psb",@"rt",@"smi", nil]]; + free( path ); + + if( i_returnValue == NSOKButton ) + { + NSUInteger c = 0; + if( !p_input ) return; + + c = [[openPanel filenames] count]; + NSLog( @"count: %i", c ); + for (int i = 0; [[openPanel filenames] count] > i ; i++) + { + msg_Dbg( VLCIntf, "loading subs from %s", [[[openPanel filenames] objectAtIndex: i] UTF8String] ); + if( input_AddSubtitle( p_input, [[[openPanel filenames] objectAtIndex: i] UTF8String], TRUE ) ) + msg_Warn( VLCIntf, "unable to load subtitles from '%s'", + [[[openPanel filenames] objectAtIndex: i] UTF8String] ); + i++; + } + } } - (void)scrollWheel:(NSEvent *)theEvent @@ -562,7 +622,7 @@ /* Escape */ if( key == (unichar) 0x1b ) { - id o_vout_view = [self getVoutView]; + id o_vout_view = [self voutView]; if( o_vout_view && [o_vout_view isFullscreen] ) { [o_vout_view toggleFullscreen]; @@ -627,19 +687,19 @@ 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_mi setRepresentedObject: [NSValue valueWithPointer:[o_data retain]]]; + o_data = [[VLCAutoGeneratedMenuContent alloc] initWithVariableName: psz_variable ofObject: p_object + andValue: val ofType: i_type]; + [o_mi setRepresentedObject: [o_data autorelease]]; break; case VLC_VAR_BOOL: - o_data = [[VLCMenuExt alloc] initWithVar: psz_variable Object: p_object->i_object_id - Value: val ofType: i_type]; - [o_mi setRepresentedObject: [NSValue valueWithPointer:[o_data retain]]]; + o_data = [[VLCAutoGeneratedMenuContent alloc] initWithVariableName: psz_variable ofObject: p_object + andValue: val ofType: i_type]; + [o_mi setRepresentedObject: [o_data autorelease]]; if( !( i_type & VLC_VAR_ISCOMMAND ) ) [o_mi setState: val.b_bool ? TRUE : FALSE ]; break; @@ -714,12 +774,23 @@ /* make (un)sensitive */ [o_parent setEnabled: ( val_list.p_list->i_count > 1 )]; + /* special case for the subtitles items */ + if( [[o_parent title] isEqualToString: _NS("Subtitles Track")] == YES ) + { + NSMenuItem * o_lmi_tmp; + o_lmi_tmp = [o_menu addItemWithTitle: _NS("Open File...") action: @selector(addSubtitleFile:) keyEquivalent: @""]; + [o_lmi_tmp setTarget: self]; + [o_lmi_tmp setEnabled: YES]; + [o_parent setEnabled: YES]; + [o_menu addItem: [NSMenuItem separatorItem]]; + } + for( i = 0; i < val_list.p_list->i_count; i++ ) { vlc_value_t another_val; NSMenuItem * o_lmi; NSString *o_title = @""; - VLCMenuExt *o_data; + VLCAutoGeneratedMenuContent *o_data; switch( i_type & VLC_VAR_TYPE ) { @@ -731,9 +802,9 @@ 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_lmi setRepresentedObject: [NSValue valueWithPointer:[o_data retain]]]; + o_data = [[VLCAutoGeneratedMenuContent alloc] initWithVariableName: strdup(psz_variable) ofObject: p_object + andValue: another_val ofType: i_type]; + [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 ) ) @@ -748,10 +819,10 @@ [NSString stringWithFormat: @"%d", 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_lmi setRepresentedObject: [NSValue valueWithPointer:[ o_data retain]]]; + 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: [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 ) ) @@ -763,34 +834,44 @@ } } + /* special case for the subtitles sub-menu + * In case that we don't have any subs, we don't want a separator item at the end */ + if( [[o_parent title] isEqualToString: _NS("Subtitles Track")] == YES ) + { + if( [o_menu numberOfItems] == 2 ) + [o_menu removeItemAtIndex: 1]; + } + /* clean up everything */ if( (i_type & VLC_VAR_TYPE) == VLC_VAR_STRING ) free( val.psz_string ); - var_Change( p_object, psz_variable, VLC_VAR_FREELIST, &val_list, &text_list ); + var_FreeList( &val_list, &text_list ); } - (IBAction)toggleVar:(id)sender { NSMenuItem *o_mi = (NSMenuItem *)sender; - VLCMenuExt *o_data = [[o_mi representedObject] pointerValue]; + VLCAutoGeneratedMenuContent *o_data = [o_mi representedObject]; [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( [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; @@ -808,8 +889,7 @@ } else if( sender == o_specificTime_ok_btn ) { - input_thread_t * p_input = (input_thread_t *)vlc_object_find( VLCIntf, \ - VLC_OBJECT_INPUT, FIND_ANYWHERE ); + input_thread_t * p_input = pl_CurrentInput( VLCIntf ); if( p_input ) { unsigned int timeInSec = 0; @@ -838,14 +918,13 @@ input_Control( p_input, INPUT_SET_TIME, (int64_t)(timeInSec * 1000000)); vlc_object_release( p_input ); } - + [NSApp endSheet: o_specificTime_win]; [o_specificTime_win close]; } else { - input_thread_t * p_input = (input_thread_t *)vlc_object_find( VLCIntf, \ - VLC_OBJECT_INPUT, FIND_ANYWHERE ); + input_thread_t * p_input = pl_CurrentInput( VLCIntf ); if( p_input ) { /* we can obviously only do that if an input is available */ @@ -864,7 +943,7 @@ } } -- (id)getFSPanel +- (id)fspanel { if( o_fs_panel ) return o_fs_panel; @@ -884,18 +963,15 @@ BOOL bEnabled = TRUE; vlc_value_t val; intf_thread_t * p_intf = VLCIntf; - playlist_t * p_playlist = pl_Yield( p_intf ); - - vlc_object_lock( p_playlist ); - -#define p_input p_playlist->p_input + playlist_t * p_playlist = pl_Hold( p_intf ); + input_thread_t * p_input = playlist_CurrentInput( p_playlist ); if( [[o_mi title] isEqualToString: _NS("Faster")] || [[o_mi title] isEqualToString: _NS("Slower")] ) { if( p_input != NULL ) { - bEnabled = p_input->b_can_pace_control; + bEnabled = var_GetBool( p_input, "can-rate" ); } else { @@ -914,7 +990,9 @@ [[o_mi title] isEqualToString: _NS("Next")] ) { /** \todo fix i_size use */ + PL_LOCK; bEnabled = p_playlist->items.i_size > 1; + PL_UNLOCK; } else if( [[o_mi title] isEqualToString: _NS("Random")] ) { @@ -943,7 +1021,7 @@ { if( p_input != NULL ) { - var_Get( p_input, "seekable", &val); + var_Get( p_input, "can-seek", &val); bEnabled = val.b_bool; } else bEnabled = FALSE; @@ -979,16 +1057,17 @@ while( (o_window = [o_enumerator nextObject])) { if( [[o_window className] isEqualToString: @"VLCVoutWindow"] || - [[[VLCMain sharedInstance] getEmbeddedList] + [[[VLCMain sharedInstance] embeddedList] windowContainsEmbedded: o_window]) { bEnabled = TRUE; break; } } + vlc_object_release( (vlc_object_t *)p_vout ); } - else if( [[o_mi title] isEqualToString: _NS("Fullscreen")] ) + if( [[o_mi title] isEqualToString: _NS("Fullscreen")] ) { var_Get( p_playlist, "fullscreen", &val ); [o_mi setState: val.b_bool]; @@ -997,8 +1076,21 @@ [o_main setupMenus]; /* Make sure video menu is up to date */ } - vlc_object_unlock( p_playlist ); - vlc_object_release( p_playlist ); + /* Special case for telx menu */ + if( [[o_mi title] isEqualToString: _NS("Normal Size")] ) + { + NSMenuItem *item = [[o_mi menu] itemWithTitle:_NS("Teletext")]; + bool b_telx = p_input && var_GetInteger( p_input, "teletext-es" ) >= 0; + + [[item submenu] setAutoenablesItems:NO]; + for( int k=0; k < [[item submenu] numberOfItems]; k++ ) + { + [[[item submenu] itemAtIndex:k] setEnabled: b_telx]; + } + } + + if( p_input ) vlc_object_release( p_input ); + pl_Release( p_intf ); return( bEnabled ); } @@ -1006,24 +1098,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_hold( object ); value = val; - i_type = _i_type; + i_type = type; } return( self ); @@ -1031,25 +1123,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_hold( _vlc_object ); } + - (int)type { return i_type; @@ -1068,6 +1162,8 @@ - (void)mouseDown: (NSEvent *)ourEvent { if( [ourEvent clickCount] > 1 ) - [[[VLCMain sharedInstance] getControls] goToSpecificTime: nil]; + [[[VLCMain sharedInstance] controls] goToSpecificTime: nil]; + else + [[VLCMain sharedInstance] timeFieldWasClicked: self]; } @end