/*****************************************************************************
* applescript.m: MacOS X AppleScript support
*****************************************************************************
- * Copyright (C) 2002-2003 the VideoLAN team
+ * Copyright (C) 2002-2003, 2005, 2007-2008 the VideoLAN team
* $Id$
*
* Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#include "open.h"
/*****************************************************************************
- * VLGetURLScriptCommand implementation
+ * VLGetURLScriptCommand implementation
*****************************************************************************/
@implementation VLGetURLScriptCommand
if ( [o_command isEqualToString:@"GetURL"] || [o_command isEqualToString:@"OpenURL"] )
{
intf_thread_t * p_intf = VLCIntf;
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t * p_playlist = pl_Hold( p_intf );
if( p_playlist == NULL )
{
return nil;
NSURL * o_url;
input_item_t *p_input;
- p_input = input_ItemNew( p_playlist,
+ p_input = input_item_New( p_playlist,
[o_urlString fileSystemRepresentation],
[[[NSFileManager defaultManager]
displayNameAtPath: o_urlString] UTF8String] );
+ /* FIXME: playlist_AddInput() can fail */
playlist_AddInput( p_playlist, p_input, PLAYLIST_INSERT,
- PLAYLIST_END, VLC_TRUE );
+ PLAYLIST_END, true, pl_Unlocked );
+ vlc_gc_decref( p_input );
o_url = [NSURL fileURLWithPath: o_urlString];
if( o_url != nil )
/*****************************************************************************
- * VLControlScriptCommand implementation
+ * VLControlScriptCommand implementation
*****************************************************************************/
/*
* This entire control command needs a better design. more object oriented.
NSString *o_command = [[self commandDescription] commandName];
intf_thread_t * p_intf = VLCIntf;
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t * p_playlist = pl_Hold( p_intf );
if( p_playlist == NULL )
{
return nil;
}
-
+
VLCControls * o_controls = (VLCControls *)[[NSApp delegate] getControls];
-
+
if ( o_controls )
{
if ( [o_command isEqualToString:@"play"] )
*****************************************************************************/
@implementation NSApplication(ScriptSupport)
-- (BOOL) scriptFullscreenMode {
+- (BOOL) scriptFullscreenMode {
VLCControls * o_controls = (VLCControls *)[[self delegate] getControls];
return [o_controls isFullscreen];
[o_controls toogleFullscreen: self];
}
-@end
\ No newline at end of file
+@end