macosx: fixed playlist/video toggling and some memory leaks

[vlc] / modules / gui / macosx / applescript.m

diff --git a/modules/gui/macosx/applescript.m b/modules/gui/macosx/applescript.m
index 0099954b0a99abdb327cd2a374cd6d739312dd05..530557a52509df22e88983cfadecfac167f3470d 100644 (file)
--- a/modules/gui/macosx/applescript.m
+++ b/modules/gui/macosx/applescript.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * applescript.m: MacOS X AppleScript support
  *****************************************************************************
- * Copyright (C) 2002-2003, 2005, 2007-2008 the VideoLAN team
+ * Copyright (C) 2002-2009 the VideoLAN team
  * $Id$
  *
  * Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
@@ -41,7 +41,7 @@
     if ( [o_command isEqualToString:@"GetURL"] || [o_command isEqualToString:@"OpenURL"] )
     {
         intf_thread_t * p_intf = VLCIntf;
-        playlist_t * p_playlist = pl_Hold( p_intf );
+        playlist_t * p_playlist = pl_Get( p_intf );
         if( p_playlist == NULL )
         {
             return nil;
@@ -52,8 +52,7 @@
             NSURL * o_url;
             input_item_t *p_input;
 
-            p_input = input_item_New( p_playlist,
-                                    [o_urlString fileSystemRepresentation],
+            p_input = input_item_New( [o_urlString fileSystemRepresentation],
                                     [[[NSFileManager defaultManager]
                                     displayNameAtPath: o_urlString] UTF8String] );
             /* FIXME: playlist_AddInput() can fail */
@@ -69,7 +68,6 @@
                     noteNewRecentDocumentURL: o_url];
             }
         }
-        vlc_object_release( p_playlist );
     }
     return nil;
 }
@@ -90,58 +88,49 @@
     NSString *o_command = [[self commandDescription] commandName];
 
     intf_thread_t * p_intf = VLCIntf;
-    playlist_t * p_playlist = pl_Hold( p_intf );
+    playlist_t * p_playlist = pl_Get( p_intf );
     if( p_playlist == NULL )
     {
         return nil;
     }
  
-    VLCControls * o_controls = (VLCControls *)[[NSApp delegate] getControls];
+    VLCControls * o_controls = [[VLCMain sharedInstance] controls];
  
     if ( o_controls )
     {
         if ( [o_command isEqualToString:@"play"] )
         {
             [o_controls play:self];
-            return nil;
         }
         else if ( [o_command isEqualToString:@"stop"] )
         {
             [o_controls stop:self];
-            return nil;
         }
         else if ( [o_command isEqualToString:@"previous"] )
         {
             [o_controls prev:self];
-            return nil;
         }
         else if ( [o_command isEqualToString:@"next"] )
         {
             [o_controls next:self];
-            return nil;
         }
         else if ( [o_command isEqualToString:@"fullscreen"] )
         {
             [o_controls toogleFullscreen: self];
-            return nil;
         }
         else if ( [o_command isEqualToString:@"mute"] )
         {
             [o_controls mute:self];
-            return nil;
         }
         else if ( [o_command isEqualToString:@"volumeUp"] )
         {
             [o_controls volumeUp:self];
-            return nil;
         }
         else if ( [o_command isEqualToString:@"volumeDown"] )
         {
             [o_controls volumeDown:self];
-            return nil;
         }
     }
-    vlc_object_release( p_playlist );
     return nil;
 }
 
@@ -153,12 +142,10 @@
 @implementation NSApplication(ScriptSupport)
 
 - (BOOL) scriptFullscreenMode {    
-    VLCControls * o_controls = (VLCControls *)[[self delegate] getControls];
-
-    return [o_controls isFullscreen];
+    return [[[VLCMain sharedInstance] controls] isFullscreen];
 }
 - (void) setScriptFullscreenMode: (BOOL) mode {
-    VLCControls * o_controls = (VLCControls *)[[self delegate] getControls];
+    VLCControls * o_controls = [[VLCMain sharedInstance] controls];
     if (mode == [o_controls isFullscreen]) return;
     [o_controls toogleFullscreen: self];
 }