macosx: let the about window show whether VLC runs in 32 or 64 bit mode

diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
index a0a6d771bcf64a39781bfc6c8729eb170086564d..3f28442857ef7f1b5f0ccba00e6f1bb7bc786f94 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
+++ b/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
@@ -23,215 +23,6 @@
             CLASS = VLCHotkeyChangeWindow;
             LANGUAGE = ObjC;
             SUPERCLASS = NSWindow;
-        },
-                {
-            ACTIONS =             {
-                checkForUpdate = id;
-                clearRecentItems = id;
-                crashReporterAction = id;
-                intfOpenCapture = id;
-                intfOpenDisc = id;
-                intfOpenFile = id;
-                intfOpenFileGeneric = id;
-                intfOpenNet = id;
-                openCrashLog = id;
-                openDocumentation = id;
-                openDonate = id;
-                openForum = id;
-                openReadMe = id;
-                openRecentItem = id;
-                openWebsite = id;
-                saveDebugLog = id;
-                showBookmarks = id;
-                showExtended = id;
-                showInformationPanel = id;
-                showLicense = id;
-                showMessagesPanel = id;
-                showVLM = id;
-                showWizard = id;
-                timeFieldWasClicked = id;
-                timesliderUpdate = id;
-                togglePlaylist = id;
-                viewAbout = id;
-                viewErrorsAndWarnings = id;
-                viewHelp = id;
-                viewPreferences = id;
-            };
-            CLASS = VLCMain;
-            LANGUAGE = ObjC;
-            OUTLETS =             {
-                "o_about" = id;
-                "o_bookmarks" = id;
-                "o_btn_equalizer" = NSButton;
-                "o_btn_ff" = NSButton;
-                "o_btn_fullscreen" = NSButton;
-                "o_btn_next" = NSButton;
-                "o_btn_play" = NSButton;
-                "o_btn_playlist" = NSButton;
-                "o_btn_prev" = NSButton;
-                "o_btn_rewind" = NSButton;
-                "o_btn_stop" = NSButton;
-                "o_controls" = VLCControls;
-                "o_coredialogs" = id;
-                "o_crashrep_desc_txt" = NSTextField;
-                "o_crashrep_dontSend_btn" = NSButton;
-                "o_crashrep_fld" = NSTextView;
-                "o_crashrep_includeEmail_ckb" = NSButton;
-                "o_crashrep_includeEmail_txt" = NSTextField;
-                "o_crashrep_send_btn" = NSButton;
-                "o_crashrep_title_txt" = NSTextField;
-                "o_crashrep_win" = NSWindow;
-                "o_dmi_mute" = NSMenuItem;
-                "o_dmi_next" = NSMenuItem;
-                "o_dmi_play" = NSMenuItem;
-                "o_dmi_previous" = NSMenuItem;
-                "o_dmi_stop" = NSMenuItem;
-                "o_embedded_list" = id;
-                "o_embedded_window" = VLCEmbeddedWindow;
-                "o_extended" = id;
-                "o_eyetv" = id;
-                "o_main_pgbar" = NSProgressIndicator;
-                "o_messages" = NSTextView;
-                "o_mi_about" = NSMenuItem;
-                "o_mi_addSub" = NSMenuItem;
-                "o_mi_add_intf" = NSMenuItem;
-                "o_mi_aspect_ratio" = NSMenuItem;
-                "o_mi_audiotrack" = NSMenuItem;
-                "o_mi_bookmarks" = NSMenuItem;
-                "o_mi_bring_atf" = NSMenuItem;
-                "o_mi_bwd" = NSMenuItem;
-                "o_mi_bwd1m" = NSMenuItem;
-                "o_mi_bwd5m" = NSMenuItem;
-                "o_mi_channels" = NSMenuItem;
-                "o_mi_chapter" = NSMenuItem;
-                "o_mi_checkForUpdate" = NSMenuItem;
-                "o_mi_clear" = NSMenuItem;
-                "o_mi_close_window" = NSMenuItem;
-                "o_mi_controller" = NSMenuItem;
-                "o_mi_copy" = NSMenuItem;
-                "o_mi_crop" = NSMenuItem;
-                "o_mi_cut" = NSMenuItem;
-                "o_mi_deinterlace" = NSMenuItem;
-                "o_mi_device" = NSMenuItem;
-                "o_mi_documentation" = NSMenuItem;
-                "o_mi_donation" = NSMenuItem;
-                "o_mi_double_window" = NSMenuItem;
-                "o_mi_equalizer" = NSMenuItem;
-                "o_mi_errorsAndWarnings" = NSMenuItem;
-                "o_mi_extended" = NSMenuItem;
-                "o_mi_faster" = NSMenuItem;
-                "o_mi_ffmpeg_pp" = NSMenuItem;
-                "o_mi_fittoscreen" = NSMenuItem;
-                "o_mi_floatontop" = NSMenuItem;
-                "o_mi_forum" = NSMenuItem;
-                "o_mi_fullscreen" = NSMenuItem;
-                "o_mi_fwd" = NSMenuItem;
-                "o_mi_fwd1m" = NSMenuItem;
-                "o_mi_fwd5m" = NSMenuItem;
-                "o_mi_half_window" = NSMenuItem;
-                "o_mi_help" = NSMenuItem;
-                "o_mi_hide" = NSMenuItem;
-                "o_mi_hide_others" = NSMenuItem;
-                "o_mi_info" = NSMenuItem;
-                "o_mi_license" = NSMenuItem;
-                "o_mi_loop" = NSMenuItem;
-                "o_mi_messages" = NSMenuItem;
-                "o_mi_minimize" = NSMenuItem;
-                "o_mi_mute" = NSMenuItem;
-                "o_mi_next" = NSMenuItem;
-                "o_mi_normal_window" = NSMenuItem;
-                "o_mi_open_capture" = NSMenuItem;
-                "o_mi_open_disc" = NSMenuItem;
-                "o_mi_open_file" = NSMenuItem;
-                "o_mi_open_generic" = NSMenuItem;
-                "o_mi_open_net" = NSMenuItem;
-                "o_mi_open_recent" = NSMenuItem;
-                "o_mi_open_recent_cm" = NSMenuItem;
-                "o_mi_open_vlm" = NSMenuItem;
-                "o_mi_open_wizard" = NSMenuItem;
-                "o_mi_paste" = NSMenuItem;
-                "o_mi_play" = NSMenuItem;
-                "o_mi_playlist" = NSMenuItem;
-                "o_mi_prefs" = NSMenuItem;
-                "o_mi_previous" = NSMenuItem;
-                "o_mi_program" = NSMenuItem;
-                "o_mi_quit" = NSMenuItem;
-                "o_mi_random" = NSMenuItem;
-                "o_mi_readme" = NSMenuItem;
-                "o_mi_repeat" = NSMenuItem;
-                "o_mi_screen" = NSMenuItem;
-                "o_mi_select_all" = NSMenuItem;
-                "o_mi_services" = NSMenuItem;
-                "o_mi_show_all" = NSMenuItem;
-                "o_mi_slower" = NSMenuItem;
-                "o_mi_snapshot" = NSMenuItem;
-                "o_mi_sprefs" = NSMenuItem;
-                "o_mi_stop" = NSMenuItem;
-                "o_mi_subtitle" = NSMenuItem;
-                "o_mi_teletext" = NSMenuItem;
-                "o_mi_teletext_blue" = NSMenuItem;
-                "o_mi_teletext_green" = NSMenuItem;
-                "o_mi_teletext_index" = NSMenuItem;
-                "o_mi_teletext_red" = NSMenuItem;
-                "o_mi_teletext_transparent" = NSMenuItem;
-                "o_mi_teletext_yellow" = NSMenuItem;
-                "o_mi_title" = NSMenuItem;
-                "o_mi_videotrack" = NSMenuItem;
-                "o_mi_visual" = NSMenuItem;
-                "o_mi_vol_down" = NSMenuItem;
-                "o_mi_vol_up" = NSMenuItem;
-                "o_mi_website" = NSMenuItem;
-                "o_msgs_crashlog_btn" = NSButton;
-                "o_msgs_panel" = NSWindow;
-                "o_msgs_save_btn" = NSButton;
-                "o_mu_add_intf" = NSMenu;
-                "o_mu_aspect_ratio" = NSMenu;
-                "o_mu_audio" = NSMenu;
-                "o_mu_audiotrack" = NSMenu;
-                "o_mu_channels" = NSMenu;
-                "o_mu_chapter" = NSMenu;
-                "o_mu_controls" = NSMenu;
-                "o_mu_crop" = NSMenu;
-                "o_mu_deinterlace" = NSMenu;
-                "o_mu_device" = NSMenu;
-                "o_mu_edit" = NSMenu;
-                "o_mu_ffmpeg_pp" = NSMenu;
-                "o_mu_file" = NSMenu;
-                "o_mu_help" = NSMenu;
-                "o_mu_program" = NSMenu;
-                "o_mu_screen" = NSMenu;
-                "o_mu_subtitle" = NSMenu;
-                "o_mu_title" = NSMenu;
-                "o_mu_video" = NSMenu;
-                "o_mu_videotrack" = NSMenu;
-                "o_mu_visual" = NSMenu;
-                "o_mu_window" = NSMenu;
-                "o_open" = id;
-                "o_playlist" = VLCPlaylist;
-                "o_playlist_view" = NSView;
-                "o_prefs" = id;
-                "o_scrollfield" = id;
-                "o_sprefs" = id;
-                "o_timefield" = NSTextField;
-                "o_timeslider" = NSSlider;
-                "o_update" = id;
-                "o_vlm" = id;
-                "o_vmi_fullscreen" = NSMenuItem;
-                "o_vmi_mute" = NSMenuItem;
-                "o_vmi_next" = NSMenuItem;
-                "o_vmi_play" = NSMenuItem;
-                "o_vmi_prev" = NSMenuItem;
-                "o_vmi_snapshot" = NSMenuItem;
-                "o_vmi_stop" = NSMenuItem;
-                "o_vmi_voldown" = NSMenuItem;
-                "o_vmi_volup" = NSMenuItem;
-                "o_volumeslider" = NSSlider;
-                "o_vout_menu" = NSMenu;
-                "o_window" = VLCControllerWindow;
-                "o_wizard" = id;
-                toolbarMediaControl = NSView;
-            };
-            SUPERCLASS = NSObject;
         },
                 {
             ACTIONS =             {

diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib
index 7283603be99811dcbe2d786030f7bc89b9b27f7d..fe9382b2a6ea7d0337e8c2861db00eef0843156f 100644 (file)
Binary files a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib differ

diff --git a/modules/gui/macosx/about.m b/modules/gui/macosx/about.m
index a6b42bc9edddb83c949cbdb4b4f567ef2fb835b8..dc0ef540d7745ef432cf48cc9c48c0384e37c34a 100644 (file)
--- a/modules/gui/macosx/about.m
+++ b/modules/gui/macosx/about.m
@@ -31,11 +31,11 @@
 #import <vlc_about.h>
 
 #ifdef __x86_64__
-#define PLATFORM "Intel"
+#define PLATFORM "Intel 64bit"
 #elif __i386__
-#define PLATFORM "Intel"
+#define PLATFORM "Intel 32bit"
 #else
-#define PLATFORM "PowerPC"
+#define PLATFORM "PowerPC 32bit"
 #endif
 
 /*****************************************************************************