* vlc.scriptSuite: updated to the plist-xml-format and fixed a bug in the prev-method

* vlc.scriptTerminology: updated to the plist-xml-format and removed the 'localisable'-flag for the terminology in Xcode since we don't localise it and Apple won't support any other AS-dialects than English in the future --> moved out of English.lproj
* vlc.pbproj: removed localisable-flag for vlc.scriptTerminology

diff --git a/extras/MacOSX/Resources/vlc.scriptSuite b/extras/MacOSX/Resources/vlc.scriptSuite
index 6cd19ca3b8e9456b7f64d7cc18cfe27ec2fca758..fbea7a66a72c5ef0d34a7eff0a5856c5733dcb23 100644 (file)
--- a/extras/MacOSX/Resources/vlc.scriptSuite
+++ b/extras/MacOSX/Resources/vlc.scriptSuite
@@ -1,49 +1,87 @@
-{
-    "Name" = "vlc";
-    "AppleEventCode" = "VLC#";
-    
-    "Commands" = {
-        "OpenURL" = {
-            AppleEventClassCode = "WWW!"; 
-            AppleEventCode = "OURL"; 
-            CommandClass = "VLGetURLScriptCommand"; 
-        };
-        "GetURL" = {
-            AppleEventClassCode = "GURL";
-            AppleEventCode = "GURL";
-            CommandClass = "VLGetURLScriptCommand";
-        };
-        "play" = {
-            AppleEventCode = "VLC1";
-            CommandClass = "VLControlScriptCommand";
-        };
-        "stop" = {
-            AppleEventCode = "VLC2";
-            CommandClass = "VLControlScriptCommand";
-        };
-        "previous" = {
-            AppleEventCode = "GURL";
-            CommandClass = "VLControlScriptCommand";
-        };
-        "next" = {
-            AppleEventCode = "VLC3";
-            CommandClass = "VLControlScriptCommand";
-        };
-        "fullscreen" = {
-            AppleEventCode = "VLC4";
-            CommandClass = "VLControlScriptCommand";
-        };
-        "mute" = {
-            AppleEventCode = "VLC5";
-            CommandClass = "VLControlScriptCommand";
-        };
-        "volumeUp" = {
-            AppleEventCode = "VLC6";
-            CommandClass = "VLControlScriptCommand";
-        };
-        "volumeDown" = {
-            AppleEventCode = "VLC7";
-            CommandClass = "VLControlScriptCommand";
-        };
-    };
-}
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Name</key>
+    <string>vlc</string>
+    <key>AppleEventCode</key>
+    <string>VLC#</string>
+    <key>Commands</key>
+    <dict>
+        <key>OpenURL</key>
+        <dict>
+            <key>AppleEventClassCode</key>
+            <string>WWW!</string>
+            <key>AppleEventCode</key>
+            <string>OURL</string>
+            <key>CommandClass</key>
+            <string>VLGetURLScriptCommand</string>
+        </dict>
+        <key>GetURL</key>
+        <dict>
+            <key>AppleEventClassCode</key>
+            <string>GURL</string>
+            <key>AppleEventCode</key>
+            <string>GURL</string>
+            <key>CommandClass</key>
+            <string>VLGetURLScriptCommand</string>
+        </dict>
+        <key>play</key>
+        <dict>
+            <key>AppleEventCode</key>
+            <string>VLC1</string>
+            <key>CommandClass</key>
+            <string>VLControlScriptCommand</string>
+        </dict>
+        <key>stop</key>
+        <dict>
+            <key>AppleEventCode</key>
+            <string>VLC2</string>
+            <key>CommandClass</key>
+            <string>VLControlScriptCommand</string>
+        </dict>
+        <key>previous</key>
+        <dict>
+            <key>AppleEventCode</key>
+            <string>VLC3</string>
+            <key>CommandClass</key>
+            <string>VLControlScriptCommand</string>
+        </dict>
+        <key>next</key>
+        <dict>
+            <key>AppleEventCode</key>
+            <string>VLC4</string>
+            <key>CommandClass</key>
+            <string>VLControlScriptCommand</string>
+        </dict>
+        <key>fullscreen</key>
+        <dict>
+            <key>AppleEventCode</key>
+            <string>VLC5</string>
+            <key>CommandClass</key>
+            <string>VLControlScriptCommand</string>
+        </dict>
+        <key>mute</key>
+        <dict>
+            <key>AppleEventCode</key>
+            <string>VLC6</string>
+            <key>CommandClass</key>
+            <string>VLControlScriptCommand</string>
+        </dict>
+        <key>volumeUp</key>
+        <dict>
+            <key>AppleEventCode</key>
+            <string>VLC7</string>
+            <key>CommandClass</key>
+            <string>VLControlScriptCommand</string>
+        </dict>
+        <key>volumeDown</key>
+        <dict>
+            <key>AppleEventCode</key>
+            <string>VLC8</string>
+            <key>CommandClass</key>
+            <string>VLControlScriptCommand</string>
+        </dict>
+    </dict>
+</dict>
+</plist>
\ No newline at end of file

diff --git a/extras/MacOSX/Resources/vlc.scriptTerminology b/extras/MacOSX/Resources/vlc.scriptTerminology
new file mode 100644 (file)
index 0000000..489d327
--- /dev/null
+++ b/extras/MacOSX/Resources/vlc.scriptTerminology
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Name</key>
+    <string>VLC suite</string>
+    <key>Description</key>
+    <string>VLC commands.</string>
+    <key>Commands</key>
+    <dict>
+        <key>OpenURL</key>
+        <dict>
+            <key>Name</key>
+            <string>OpenURL</string>
+            <key>Description</key>
+            <string>Open a URL</string>
+        </dict>
+        <key>GetURL</key>
+        <dict>
+            <key>Name</key>
+            <string>GetURL</string>
+            <key>Description</key>
+            <string>Get a URL</string>
+        </dict>
+        <key>play</key>
+        <dict>
+            <key>Name</key>
+            <string>play</string>
+            <key>Description</key>
+            <string>Start playing the current playlistitem or pause it when it is already playing.</string>
+        </dict>
+        <key>stop</key>
+        <dict>
+            <key>Name</key>
+            <string>stop</string>
+            <key>Description</key>
+            <string>Stop playing the current playlistitem</string>
+        </dict>
+        <key>previous</key>
+        <dict>
+            <key>Name</key>
+            <string>previous</string>
+            <key>Description</key>
+            <string>Go to the previous item in the playlist or the previous chapter in the DVD/VCD.</string>
+        </dict>
+        <key>next</key>
+        <dict>
+            <key>Name</key>
+            <string>next</string>
+            <key>Description</key>
+            <string>Go to the next item in the playlist or the next chapter in the DVD/VCD.</string>
+        </dict>
+        <key>fullscreen</key>
+        <dict>
+            <key>Name</key>
+            <string>fullscreen</string>
+            <key>Description</key>
+            <string>Toggle between fullscreen and windowed mode.</string>
+        </dict>
+        <key>mute</key>
+        <dict>
+            <key>Name</key>
+            <string>mute</string>
+            <key>Description</key>
+            <string>Mute the audio</string>
+        </dict>
+        <key>volumeUp</key>
+        <dict>
+            <key>Name</key>
+            <string>volumeUp</string>
+            <key>Description</key>
+            <string>Bring the volume up by one step. There are 32 steps from 0 to 100% volume.</string>
+        </dict>
+        <key>volumeDown</key>
+        <dict>
+            <key>Name</key>
+            <string>volumeDown</string>
+            <key>Description</key>
+            <string>Bring the volume down by one step. There are 32 steps from 0 to 100% volume.</string>
+        </dict>
+    </dict>
+</dict>
+</plist>

diff --git a/extras/MacOSX/vlc.pbproj/project.pbxproj b/extras/MacOSX/vlc.pbproj/project.pbxproj
index c2ff3aec8141fbc6830a9de93c762d24b2e9ca46..69987a1b461af424bdd1fb2338b2da7bea869fc0 100644 (file)
--- a/extras/MacOSX/vlc.pbproj/project.pbxproj
+++ b/extras/MacOSX/vlc.pbproj/project.pbxproj
@@ -709,7 +709,7 @@
                        <string>RTSP</string>
                        <key>CFBundleURLSchemes</key>
                        <array>
-                               <string>rtsp</string>
+                               <string>rtsp,rts</string>
                        </array>
                </dict>
                <dict>
@@ -750,7 +750,7 @@
                                8ED6C29F03E2F32E0059A3A7,
                                8ED6C2A003E2F32E0059A3A7,
                                8EBF3FA403F13FFB0059A3A7,
-                               8EBF3FA803F140A80059A3A7,
+                               DCC9AE9507F77DE600394C42,
                                A0E6B59904407FBD0080DD97,
                                8EDAC3440440F72D0059A3A7,
                                8EE1AFA40444660F0059A3A7,
@@ -839,7 +839,7 @@
                                8ED6C29E03E2F32E0059A3A7,
                                A0E6B59804407FBD0080DD97,
                                8EBF3FA303F13FFB0059A3A7,
-                               8EBF3FA703F140A80059A3A7,
+                               8EBF3FA503F140960059A3A7,
                                8EDAC3430440F72D0059A3A7,
                        );
                        isa = PBXGroup;
@@ -1862,27 +1862,12 @@
                };
                8EBF3FA503F140960059A3A7 = {
                        isa = PBXFileReference;
-                       lastKnownFileType = text;
+                       lastKnownFileType = text.xml;
                        name = vlc.scriptTerminology;
-                       path = Resources/English.lproj/vlc.scriptTerminology;
+                       path = Resources/vlc.scriptTerminology;
                        refType = 2;
                        sourceTree = SOURCE_ROOT;
                };
-               8EBF3FA703F140A80059A3A7 = {
-                       children = (
-                               8EBF3FA503F140960059A3A7,
-                       );
-                       isa = PBXVariantGroup;
-                       name = vlc.scriptTerminology;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               8EBF3FA803F140A80059A3A7 = {
-                       fileRef = 8EBF3FA703F140A80059A3A7;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };
                8ECA7E520563CD9500DFC000 = {
                        children = (
                                2A16E07E06C5074F00C87B09,
@@ -2213,6 +2198,12 @@
                        settings = {
                        };
                };
+               DCC9AE9507F77DE600394C42 = {
+                       fileRef = 8EBF3FA503F140960059A3A7;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
                DCF358B9077F10BA007DB450 = {
                        children = (
                                DCF358BA077F10BA007DB450,