Commit 9e3078ae authored by Christophe Massiot's avatar Christophe Massiot

* modules/gui/macosx: Fixed crashes with the new submenus when used on a

  localized system
* Removed the "EXPERIMENTAL" in "DVD menus (EXPERIMENTAL)", and enabled
  the DVD menus by default.
parent 4ee99a96
...@@ -145,14 +145,24 @@ ...@@ -145,14 +145,24 @@
"o_msgs_btn_crashlog" = id; "o_msgs_btn_crashlog" = id;
"o_msgs_panel" = id; "o_msgs_panel" = id;
"o_mu_audio" = id; "o_mu_audio" = id;
"o_mu_audiotrack" = id;
"o_mu_channels" = id;
"o_mu_chapter" = id;
"o_mu_controls" = id; "o_mu_controls" = id;
"o_mu_deinterlace" = id; "o_mu_deinterlace" = id;
"o_mu_device" = id;
"o_mu_edit" = id; "o_mu_edit" = id;
"o_mu_file" = id; "o_mu_file" = id;
"o_mu_help" = id; "o_mu_help" = id;
"o_mu_program" = id;
"o_mu_screen" = id;
"o_mu_subtitle" = id;
"o_mu_title" = id;
"o_mu_video" = id; "o_mu_video" = id;
"o_mu_videotrack" = id;
"o_mu_window" = id; "o_mu_window" = id;
"o_playlist" = id; "o_playlist" = id;
"o_prefs" = id;
"o_timefield" = id; "o_timefield" = id;
"o_timeslider" = id; "o_timeslider" = id;
"o_volumeslider" = id; "o_volumeslider" = id;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<key>IBEditorPositions</key> <key>IBEditorPositions</key>
<dict> <dict>
<key>29</key> <key>29</key>
<string>16 822 419 44 0 0 1280 1002 </string> <string>374 542 419 44 0 0 1152 746 </string>
<key>303</key> <key>303</key>
<string>60 509 104 114 0 0 1280 1002 </string> <string>60 509 104 114 0 0 1280 1002 </string>
<key>909</key> <key>909</key>
...@@ -26,6 +26,6 @@ ...@@ -26,6 +26,6 @@
<integer>29</integer> <integer>29</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>6L29</string> <string>6L60</string>
</dict> </dict>
</plist> </plist>
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf.h: MacOS X interface plugin * intf.h: MacOS X interface plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2003 VideoLAN * Copyright (C) 2002-2003 VideoLAN
* $Id: intf.h,v 1.35 2003/05/08 01:16:57 hartman Exp $ * $Id: intf.h,v 1.36 2003/05/08 17:13:22 massiot 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>
...@@ -172,16 +172,22 @@ struct intf_sys_t ...@@ -172,16 +172,22 @@ struct intf_sys_t
IBOutlet id o_mi_fwd; IBOutlet id o_mi_fwd;
IBOutlet id o_mi_bwd; IBOutlet id o_mi_bwd;
IBOutlet id o_mi_program; IBOutlet id o_mi_program;
IBOutlet id o_mu_program;
IBOutlet id o_mi_title; IBOutlet id o_mi_title;
IBOutlet id o_mu_title;
IBOutlet id o_mi_chapter; IBOutlet id o_mi_chapter;
IBOutlet id o_mu_chapter;
IBOutlet id o_mu_audio; IBOutlet id o_mu_audio;
IBOutlet id o_mi_vol_up; IBOutlet id o_mi_vol_up;
IBOutlet id o_mi_vol_down; IBOutlet id o_mi_vol_down;
IBOutlet id o_mi_mute; IBOutlet id o_mi_mute;
IBOutlet id o_mi_audiotrack; IBOutlet id o_mi_audiotrack;
IBOutlet id o_mu_audiotrack;
IBOutlet id o_mi_channels; IBOutlet id o_mi_channels;
IBOutlet id o_mu_channels;
IBOutlet id o_mi_device; IBOutlet id o_mi_device;
IBOutlet id o_mu_device;
IBOutlet id o_mu_video; IBOutlet id o_mu_video;
IBOutlet id o_mi_half_window; IBOutlet id o_mi_half_window;
...@@ -191,8 +197,11 @@ struct intf_sys_t ...@@ -191,8 +197,11 @@ struct intf_sys_t
IBOutlet id o_mi_fullscreen; IBOutlet id o_mi_fullscreen;
IBOutlet id o_mi_floatontop; IBOutlet id o_mi_floatontop;
IBOutlet id o_mi_videotrack; IBOutlet id o_mi_videotrack;
IBOutlet id o_mu_videotrack;
IBOutlet id o_mi_screen; IBOutlet id o_mi_screen;
IBOutlet id o_mu_screen;
IBOutlet id o_mi_subtitle; IBOutlet id o_mi_subtitle;
IBOutlet id o_mu_subtitle;
IBOutlet id o_mi_deinterlace; IBOutlet id o_mi_deinterlace;
IBOutlet id o_mu_deinterlace; IBOutlet id o_mu_deinterlace;
......
...@@ -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.76 2003/05/08 01:16:57 hartman Exp $ * $Id: intf.m,v 1.77 2003/05/08 17:13:22 massiot 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>
...@@ -329,16 +329,22 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) ...@@ -329,16 +329,22 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
[o_mi_fwd setTitle: _NS("Step Forward")]; [o_mi_fwd setTitle: _NS("Step Forward")];
[o_mi_bwd setTitle: _NS("Step Backward")]; [o_mi_bwd setTitle: _NS("Step Backward")];
[o_mi_program setTitle: _NS("Program")]; [o_mi_program setTitle: _NS("Program")];
[o_mu_program setTitle: _NS("Program")];
[o_mi_title setTitle: _NS("Title")]; [o_mi_title setTitle: _NS("Title")];
[o_mu_title setTitle: _NS("Title")];
[o_mi_chapter setTitle: _NS("Chapter")]; [o_mi_chapter setTitle: _NS("Chapter")];
[o_mu_chapter setTitle: _NS("Chapter")];
[o_mu_audio setTitle: _NS("Audio")]; [o_mu_audio setTitle: _NS("Audio")];
[o_mi_vol_up setTitle: _NS("Volume Up")]; [o_mi_vol_up setTitle: _NS("Volume Up")];
[o_mi_vol_down setTitle: _NS("Volume Down")]; [o_mi_vol_down setTitle: _NS("Volume Down")];
[o_mi_mute setTitle: _NS("Mute")]; [o_mi_mute setTitle: _NS("Mute")];
[o_mi_audiotrack setTitle: _NS("Audio Track")]; [o_mi_audiotrack setTitle: _NS("Audio Track")];
[o_mu_audiotrack setTitle: _NS("Audio Track")];
[o_mi_channels setTitle: _NS("Channels")]; [o_mi_channels setTitle: _NS("Channels")];
[o_mu_channels setTitle: _NS("Channels")];
[o_mi_device setTitle: _NS("Device")]; [o_mi_device setTitle: _NS("Device")];
[o_mu_device setTitle: _NS("Device")];
[o_mu_video setTitle: _NS("Video")]; [o_mu_video setTitle: _NS("Video")];
[o_mi_half_window setTitle: _NS("Half Size")]; [o_mi_half_window setTitle: _NS("Half Size")];
...@@ -348,8 +354,11 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) ...@@ -348,8 +354,11 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
[o_mi_fullscreen setTitle: _NS("Fullscreen")]; [o_mi_fullscreen setTitle: _NS("Fullscreen")];
[o_mi_floatontop setTitle: _NS("Float On Top")]; [o_mi_floatontop setTitle: _NS("Float On Top")];
[o_mi_videotrack setTitle: _NS("Video Track")]; [o_mi_videotrack setTitle: _NS("Video Track")];
[o_mu_videotrack setTitle: _NS("Video Track")];
[o_mi_screen setTitle: _NS("Screen")]; [o_mi_screen setTitle: _NS("Screen")];
[o_mu_screen setTitle: _NS("Screen")];
[o_mi_subtitle setTitle: _NS("Subtitles")]; [o_mi_subtitle setTitle: _NS("Subtitles")];
[o_mu_subtitle setTitle: _NS("Subtitles")];
[o_mi_deinterlace setTitle: _NS("Deinterlace")]; [o_mi_deinterlace setTitle: _NS("Deinterlace")];
[o_mu_deinterlace setTitle: _NS("Deinterlace")]; [o_mu_deinterlace setTitle: _NS("Deinterlace")];
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* open.m: MacOS X plugin for vlc * open.m: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2003 VideoLAN * Copyright (C) 2002-2003 VideoLAN
* $Id: open.m,v 1.31 2003/05/05 16:09:39 gbazin Exp $ * $Id: open.m,v 1.32 2003/05/08 17:13:22 massiot 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>
...@@ -149,7 +149,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) ...@@ -149,7 +149,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
[o_disc_title_lbl setStringValue: _NS("Title")]; [o_disc_title_lbl setStringValue: _NS("Title")];
[o_disc_chapter_lbl setStringValue: _NS("Chapter")]; [o_disc_chapter_lbl setStringValue: _NS("Chapter")];
[o_disc_videots_btn_browse setTitle: _NS("Browse...")]; [o_disc_videots_btn_browse setTitle: _NS("Browse...")];
[o_disc_dvd_menus setTitle: _NS("Use DVD menus (EXPERIMENTAL)")]; [o_disc_dvd_menus setTitle: _NS("Use DVD menus")];
[[o_disc_type cellAtRow:0 column:0] setTitle: _NS("VIDEO_TS folder")]; [[o_disc_type cellAtRow:0 column:0] setTitle: _NS("VIDEO_TS folder")];
[[o_disc_type cellAtRow:1 column:0] setTitle: _NS("DVD")]; [[o_disc_type cellAtRow:1 column:0] setTitle: _NS("DVD")];
......
...@@ -213,13 +213,13 @@ modules/packetizer/mpeg4video.c ...@@ -213,13 +213,13 @@ modules/packetizer/mpeg4video.c
modules/packetizer/mpegaudio.c modules/packetizer/mpegaudio.c
modules/packetizer/mpegvideo.c modules/packetizer/mpegvideo.c
# stream_output plugins # stream_out plugins
modules/stream_output/display.c modules/stream_out/display.c
modules/stream_output/dummy.c modules/stream_out/dummy.c
modules/stream_output/duplicate.c modules/stream_out/duplicate.c
modules/stream_output/es.c modules/stream_out/es.c
modules/stream_output/standard.c modules/stream_out/standard.c
modules/stream_output/transcode.c modules/stream_out/transcode.c
# video_chroma modules # video_chroma modules
modules/video_chroma/i420_rgb.c modules/video_chroma/i420_rgb.c
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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