* Added a Next and Previous item to the dockmenu

* Prelimanary support for making VLC the handler of ftp http mms and udp
  URLs (on a systemwide level)

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
index 91f40bb3b7be5bd6099471a2ec8f5b72cd9f4c4a..b18099000e92a17e94f903f7898e8189909b7c5b 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
@@ -54,7 +54,9 @@
                 "o_btn_slower" = id; 
                 "o_btn_stop" = id; 
                 "o_controls" = id; 
+                "o_dmi_next" = id; 
                 "o_dmi_play" = id; 
+                "o_dmi_previous" = id; 
                 "o_dmi_stop" = id; 
                 "o_err_btn_dismiss" = id; 
                 "o_err_btn_msgs" = id; 

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index dbc2dfb4ffdfe283e3edec441bcd8cfaa60fcbbc..3eb73cf353c3883b2a3403533b568fa0de14c5c4 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
@@ -7,9 +7,9 @@
        <key>IBEditorPositions</key>
        <dict>
                <key>29</key>
-               <string>22 973 419 44 0 0 1600 1178 </string>
+               <string>16 822 419 44 0 0 1280 1002 </string>
                <key>303</key>
-               <string>60 509 104 66 0 0 1280 1002 </string>
+               <string>60 509 104 114 0 0 1280 1002 </string>
                <key>909</key>
                <string>72 297 430 172 0 0 1152 746 </string>
                <key>915</key>
@@ -23,8 +23,9 @@
        </array>
        <key>IBOpenObjects</key>
        <array>
-               <integer>29</integer>
                <integer>21</integer>
+               <integer>29</integer>
+               <integer>303</integer>
        </array>
        <key>IBSystem Version</key>
        <string>6G30</string>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
index f292144ef59b252c1092bafa3618404c83894921..67709c7b3f56524fb2325554636a88c9c85ebc89 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib differ

diff --git a/extras/MacOSX/vlc.pbproj/project.pbxproj b/extras/MacOSX/vlc.pbproj/project.pbxproj
index da0fac3ceec6cc4f7406029a4782b0daf9974287..5dbc67fe3d0e48794e6aa00c4d5e4f8786ca6339 100644 (file)
--- a/extras/MacOSX/vlc.pbproj/project.pbxproj
+++ b/extras/MacOSX/vlc.pbproj/project.pbxproj
@@ -355,6 +355,49 @@
        <string>BNDL</string>
        <key>CFBundleSignature</key>
        <string>VLC#</string>
+       <key>CFBundleURLTypes</key>
+       <array>
+               <dict>
+                       <key>CFBundleURLIconFile</key>
+                       <string>generic</string>
+                       <key>CFBundleURLName</key>
+                       <string>http url</string>
+                       <key>CFBundleURLSchemes</key>
+                       <array>
+                               <string>http</string>
+                       </array>
+               </dict>
+               <dict>
+                       <key>CFBundleURLIconFile</key>
+                       <string>generic</string>
+                       <key>CFBundleURLName</key>
+                       <string>ftp url</string>
+                       <key>CFBundleURLSchemes</key>
+                       <array>
+                               <string>ftp</string>
+                       </array>
+               </dict>
+               <dict>
+                       <key>CFBundleURLIconFile</key>
+                       <string>generic</string>
+                       <key>CFBundleURLName</key>
+                       <string>Multimedia Stream URL</string>
+                       <key>CFBundleURLSchemes</key>
+                       <array>
+                               <string>mms</string>
+                       </array>
+               </dict>
+               <dict>
+                       <key>CFBundleURLIconFile</key>
+                       <string>generic</string>
+                       <key>CFBundleURLName</key>
+                       <string>udp url</string>
+                       <key>CFBundleURLSchemes</key>
+                       <array>
+                               <string>udp</string>
+                       </array>
+               </dict>
+       </array>
        <key>CFBundleVersion</key>
        <string>0.5.0</string>
        <key>NSMainNibFile</key>

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index a7c207a4fc725f34992cc1b46c5071c481981f4e..9e4e060dae3cfe6de957d716855d38b6e9543633 100644 (file)
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -2,7 +2,7 @@
  * intf.h: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: intf.h,v 1.20 2003/01/31 02:53:52 jlj Exp $
+ * $Id: intf.h,v 1.21 2003/02/05 01:36:00 hartman Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -192,6 +192,8 @@ struct intf_sys_t
     /* dock menu */
     IBOutlet id o_dmi_play;
     IBOutlet id o_dmi_stop;
+    IBOutlet id o_dmi_next;
+    IBOutlet id o_dmi_previous;
 }
 
 - (void)terminate;

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index df688e9620e95e791f290fa53911448d8047cfff..7d9854fb94c41aa8affad6eb7ec88073689319dc 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -2,7 +2,7 @@
  * intf.m: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: intf.m,v 1.44 2003/02/02 23:11:17 massiot Exp $
+ * $Id: intf.m,v 1.45 2003/02/05 01:36:00 hartman Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -330,6 +330,8 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
     /* dock menu */
     [o_dmi_play setTitle: _NS("Play")];
     [o_dmi_stop setTitle: _NS("Stop")];
+    [o_dmi_next setTitle: _NS("Next")];
+    [o_dmi_previous setTitle: _NS("Previous")];
 
     /* error panel */
     [o_error setTitle: _NS("Error")];