macosx: Ignore attachment:// in Art uri for now.

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

diff --git a/modules/gui/macosx/applescript.m b/modules/gui/macosx/applescript.m
index 0099954b0a99abdb327cd2a374cd6d739312dd05..4935d3f71db4a4ffce94f076e2b039285fa72b26 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>
@@ -69,7 +69,7 @@
                     noteNewRecentDocumentURL: o_url];
             }
         }
-        vlc_object_release( p_playlist );
+        pl_Release( p_intf );
     }
     return nil;
 }
@@ -96,52 +96,44 @@
         return nil;
     }
  
-    VLCControls * o_controls = (VLCControls *)[[NSApp delegate] getControls];
+    VLCControls * o_controls = (VLCControls *)[[NSApp delegate] 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 );
+    pl_Release( p_intf );
     return nil;
 }
 
@@ -153,12 +145,12 @@
 @implementation NSApplication(ScriptSupport)
 
 - (BOOL) scriptFullscreenMode {    
-    VLCControls * o_controls = (VLCControls *)[[self delegate] getControls];
+    VLCControls * o_controls = (VLCControls *)[[self delegate] controls];
 
     return [o_controls isFullscreen];
 }
 - (void) setScriptFullscreenMode: (BOOL) mode {
-    VLCControls * o_controls = (VLCControls *)[[self delegate] getControls];
+    VLCControls * o_controls = (VLCControls *)[[self delegate] controls];
     if (mode == [o_controls isFullscreen]) return;
     [o_controls toogleFullscreen: self];
 }