ALL: - changed vlc.app into VLC.app

modules/gui/macosx/vout.m: fixed a potential issue with the hiding of the
     mousecursor.

diff --git a/Makefile.am b/Makefile.am
index a86d3cd8cfd559c528db8d829be16017869a8189..0bbdfb871ef8aa1ca8d8e559ba8c4236630b076e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -474,26 +474,26 @@ install-exec-local:
 
 if HAVE_DARWIN
 # Create the MacOS X app
-vlc_app_DATA = vlc.app
+vlc_app_DATA = VLC.app
 vlc_appdir = $(bindir)
-vlc.app: vlc $(PLUGIN_FILES)
-       rm -Rf vlc.app
+VLC.app: vlc $(PLUGIN_FILES)
+       rm -Rf VLC.app
        cd extras/MacOSX ; pbxbuild | grep -v '^[ \t]' | grep -v "^$$"
-       cp -r extras/MacOSX/build/vlc.bundle ./vlc.app
-       $(INSTALL) -d vlc.app/Contents/MacOS
-       $(INSTALL) vlc vlc.app/Contents/MacOS/
-       $(INSTALL) -d vlc.app/Contents/MacOS/modules
+       cp -r extras/MacOSX/build/vlc.bundle ./VLC.app
+       $(INSTALL) -d VLC.app/Contents/MacOS
+       $(INSTALL) vlc VLC.app/Contents/MacOS/VLC
+       $(INSTALL) -d VLC.app/Contents/MacOS/modules
        for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \
-               $(INSTALL) $$i vlc.app/Contents/MacOS/modules/ ; \
+               $(INSTALL) $$i VLC.app/Contents/MacOS/modules/ ; \
        fi ; done
-       $(INSTALL) -d vlc.app/Contents/MacOS/share
-       $(INSTALL) -m 644 share/*.psf share/*.rle vlc.app/Contents/MacOS/share
-       $(INSTALL) -d vlc.app/Contents/MacOS/locale
+       $(INSTALL) -d VLC.app/Contents/MacOS/share
+       $(INSTALL) -m 644 share/*.psf share/*.rle VLC.app/Contents/MacOS/share
+       $(INSTALL) -d VLC.app/Contents/MacOS/locale
        for i in $(CATALOGS); do \
-               mkdir -p vlc.app/Contents/MacOS/locale/$${i%.gmo}/LC_MESSAGES ; \
-               cp po/$$i vlc.app/Contents/MacOS/locale/$${i%.gmo}/LC_MESSAGES/vlc.mo || true ; \
+               mkdir -p VLC.app/Contents/MacOS/locale/$${i%.gmo}/LC_MESSAGES ; \
+               cp po/$$i VLC.app/Contents/MacOS/locale/$${i%.gmo}/LC_MESSAGES/vlc.mo || true ; \
        done
-       echo -n "APPLVLC#" >| vlc.app/Contents/PkgInfo
+       echo -n "APPLVLC#" >| VLC.app/Contents/PkgInfo
 endif
 
 if HAVE_WIN32
@@ -581,7 +581,7 @@ package-macosx:
        fi
 
 # Copy relevant files 
-       cp -R vlc.app tmp/
+       cp -R VLC.app tmp/
        cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/
 
 # Create disk image 

diff --git a/extras/MacOSX/Resources/English.lproj/InfoPlist.strings b/extras/MacOSX/Resources/English.lproj/InfoPlist.strings
index f61b870b92894e68435b7a0ffa31ac2075ea4372..6dc4a598bb0b157a5dbe87551e141df6f6c6da28 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/InfoPlist.strings
+++ b/extras/MacOSX/Resources/English.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
 /* Localized versions of Info.plist keys */
 
-CFBundleName = "vlc";
+CFBundleName = "VLC";
 CFBundleShortVersionString = "VLC media player";
 CFBundleGetInfoString = "VLC 0.5.0, Copyright (c) 1996-2003 VideoLAN.";
 NSHumanReadableCopyright = "Copyright (c) 1996-2003 VideoLAN.";

diff --git a/extras/MacOSX/vlc.pbproj/project.pbxproj b/extras/MacOSX/vlc.pbproj/project.pbxproj
index 1b8d87339299adc4e0dcedfe77ced82f5e24ba38..68126ebe126642ddabce2aab039c0736c3133ba9 100644 (file)
--- a/extras/MacOSX/vlc.pbproj/project.pbxproj
+++ b/extras/MacOSX/vlc.pbproj/project.pbxproj
@@ -7,7 +7,7 @@
        objects = {
                014CEA410018CDE011CA2923 = {
                        isa = PBXBundleReference;
-                       path = vlc.bundle;
+                       path = VLC.bundle;
                        refType = 3;
                };
                014CEA420018CDE011CA2923 = {
@@ -88,11 +88,11 @@
                                FRAMEWORK_SEARCH_PATHS = "";
                                HEADER_SEARCH_PATHS = "";
                                INSTALL_PATH = "$(HOME)/Library/Bundles";
-                               LIBRARY_SEARCH_PATHS = "/Volumes/Users/pjotr/Development/vlc-old/vlc/lib /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/access/dvd /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/access /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/access/mms /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/access/vcd /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/access_output /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/audio_filter/channel_mixer /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/audio_filter/converter /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/audio_filter/resampler /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/audio_mixer /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/audio_output /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/codec/cinepak /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/codec /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/codec/mpeg_audio /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/codec/mpeg_video/idct /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/codec/mpeg_video /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/codec/mpeg_video/motion /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/codec/spudec /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/control/rc /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/demux/aac /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/demux/asf /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/demux/avi /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/demux /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/demux/mp4 /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/demux/mpeg /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/demux/util /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/demux/wav /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/gui/macosx /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/misc/dummy /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/misc /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/misc/logger /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/misc/memcpy /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/misc/network /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/mux /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/mux/mpeg /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/packetizer /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/video_chroma /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/video_filter/deinterlace /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/video_filter";
+                               LIBRARY_SEARCH_PATHS = "";
                                OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
-                               PRODUCT_NAME = vlc;
+                               PRODUCT_NAME = VLC;
                                SECTORDER_FLAGS = "";
                                WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
                                WRAPPER_EXTENSION = bundle;
@@ -342,7 +342,7 @@
                </dict>
        </array>
        <key>CFBundleExecutable</key>
-       <string>vlc</string>
+       <string>VLC</string>
        <key>CFBundleIconFile</key>
        <string>vlc.icns</string>
        <key>CFBundleIdentifier</key>
@@ -352,7 +352,7 @@
        <key>CFBundleName</key>
        <string>VLC media player</string>
        <key>CFBundlePackageType</key>
-       <string>BNDL</string>
+       <string>APPL</string>
        <key>CFBundleSignature</key>
        <string>VLC#</string>
        <key>CFBundleURLTypes</key>

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 5cae5eeb58292f26fca335d4d5f7a81f00d93c8d..c9a87c594da7c5096ec677201472e42309067a07 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.53 2003/02/09 19:28:43 massiot Exp $
+ * $Id: intf.m,v 1.54 2003/02/11 15:35:29 hartman Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -1406,7 +1406,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
 
 - (IBAction)openCrashLog:(id)sender
 {
-    NSString * o_path = [@"~/Library/Logs/CrashReporter/vlc.crash.log"
+    NSString * o_path = [@"~/Library/Logs/CrashReporter/VLC.crash.log"
                                     stringByExpandingTildeInPath]; 
 
     

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index 15a04030e46612541de029acd7ba74524789c4f6..5038c52b8b9dba315252c067e58efea867856bfd 100644 (file)
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -2,7 +2,7 @@
  * vout.m: MacOS X video output plugin
  *****************************************************************************
  * Copyright (C) 2001-2003 VideoLAN
- * $Id: vout.m,v 1.30 2003/02/10 23:04:40 hartman Exp $
+ * $Id: vout.m,v 1.31 2003/02/11 15:35:29 hartman Exp $
  *
  * Authors: Colin Delacroix <colin@zoy.org>
  *          Florian G. Pflug <fgp@phlo.org>
@@ -914,10 +914,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
         p_vout->p_sys->i_time_mouse_last_moved = mdate();
         p_vout->p_sys->b_mouse_moved = 1;
     }
-    else
-    {
-        [super mouseMoved: o_event];
-    }
+    [super mouseMoved: o_event];
 }
 
 @end