Commit aa2280f6 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* 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)
parent a2d849a5
...@@ -54,7 +54,9 @@ ...@@ -54,7 +54,9 @@
"o_btn_slower" = id; "o_btn_slower" = id;
"o_btn_stop" = id; "o_btn_stop" = id;
"o_controls" = id; "o_controls" = id;
"o_dmi_next" = id;
"o_dmi_play" = id; "o_dmi_play" = id;
"o_dmi_previous" = id;
"o_dmi_stop" = id; "o_dmi_stop" = id;
"o_err_btn_dismiss" = id; "o_err_btn_dismiss" = id;
"o_err_btn_msgs" = id; "o_err_btn_msgs" = id;
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
<key>IBEditorPositions</key> <key>IBEditorPositions</key>
<dict> <dict>
<key>29</key> <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> <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> <key>909</key>
<string>72 297 430 172 0 0 1152 746 </string> <string>72 297 430 172 0 0 1152 746 </string>
<key>915</key> <key>915</key>
...@@ -23,8 +23,9 @@ ...@@ -23,8 +23,9 @@
</array> </array>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>29</integer>
<integer>21</integer> <integer>21</integer>
<integer>29</integer>
<integer>303</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>6G30</string> <string>6G30</string>
......
...@@ -355,6 +355,49 @@ ...@@ -355,6 +355,49 @@
<string>BNDL</string> <string>BNDL</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>VLC#</string> <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> <key>CFBundleVersion</key>
<string>0.5.0</string> <string>0.5.0</string>
<key>NSMainNibFile</key> <key>NSMainNibFile</key>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf.h: MacOS X interface plugin * intf.h: MacOS X interface plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * 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> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr> * Christophe Massiot <massiot@via.ecp.fr>
...@@ -192,6 +192,8 @@ struct intf_sys_t ...@@ -192,6 +192,8 @@ struct intf_sys_t
/* dock menu */ /* dock menu */
IBOutlet id o_dmi_play; IBOutlet id o_dmi_play;
IBOutlet id o_dmi_stop; IBOutlet id o_dmi_stop;
IBOutlet id o_dmi_next;
IBOutlet id o_dmi_previous;
} }
- (void)terminate; - (void)terminate;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf.m: MacOS X interface plugin * intf.m: MacOS X interface plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2003 VideoLAN * 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> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr> * Christophe Massiot <massiot@via.ecp.fr>
...@@ -330,6 +330,8 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) ...@@ -330,6 +330,8 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
/* dock menu */ /* dock menu */
[o_dmi_play setTitle: _NS("Play")]; [o_dmi_play setTitle: _NS("Play")];
[o_dmi_stop setTitle: _NS("Stop")]; [o_dmi_stop setTitle: _NS("Stop")];
[o_dmi_next setTitle: _NS("Next")];
[o_dmi_previous setTitle: _NS("Previous")];
/* error panel */ /* error panel */
[o_error setTitle: _NS("Error")]; [o_error setTitle: _NS("Error")];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment