[vlc-commits] macosx: fix subtitles opening for the applescript bindings

[Felix Paul Kühne]

vlc/vlc-2.1 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Nov 24 20:56:53 2013 +0100| [ae82a0b8f9f3118b710dccc7dab9b650f3f1a981] | committer: Felix Paul Kühne

macosx: fix subtitles opening for the applescript bindings

(cherry picked from commit e374892046ecc55f510e0595e472a5251ac957e4)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=ae82a0b8f9f3118b710dccc7dab9b650f3f1a981
---

 modules/gui/macosx/applescript.m |   26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/applescript.m b/modules/gui/macosx/applescript.m
index 947dbc8..d570568 100644
--- a/modules/gui/macosx/applescript.m
+++ b/modules/gui/macosx/applescript.m
@@ -29,6 +29,7 @@
 #import "applescript.h"
 #import "CoreInteraction.h"
 #import "playlist.h"
+#import <vlc_url.h>
 
 /*****************************************************************************
  * VLGetURLScriptCommand implementation
@@ -46,12 +47,31 @@
             if (o_url != nil)
                 [[NSDocumentController sharedDocumentController] noteNewRecentDocumentURL: o_url];
 
-            NSArray *o_result = [NSArray arrayWithObject:[NSDictionary dictionaryWithObject:o_urlString forKey: @"ITEM_URL"]];
+            input_thread_t * p_input = pl_CurrentInput(VLCIntf);
+            BOOL b_returned = NO;
+
+            if (p_input) {
+                b_returned = input_AddSubtitle(p_input, [o_urlString UTF8String], true);
+                vlc_object_release(p_input);
+                if (!b_returned)
+                    return nil;
+            }
+
+            char *psz_uri = vlc_path2uri([o_urlString UTF8String], NULL);
+            if (!psz_uri)
+                return nil;
+
+            NSDictionary *o_dic;
+            NSArray *o_array;
+            o_dic = [NSDictionary dictionaryWithObject:[NSString stringWithCString:psz_uri encoding:NSUTF8StringEncoding] forKey:@"ITEM_URL"];
+            free(psz_uri);
+
+            o_array = [NSArray arrayWithObject: o_dic];
 
             if (b_autoplay)
-                [[[VLCMain sharedInstance] playlist] appendArray: o_result atPos: -1 enqueue: NO];
+                [[[VLCMain sharedInstance] playlist] appendArray: o_array atPos: -1 enqueue: NO];
             else
-                [[[VLCMain sharedInstance] playlist] appendArray: o_result atPos: -1 enqueue: YES];
+                [[[VLCMain sharedInstance] playlist] appendArray: o_array atPos: -1 enqueue: YES];
         }
     }
     return nil;