MacOSX/VLC_app/VLC.xcodeproj: Fix copy phase.
authorPierre d'Herbemont <pdherbemont@videolan.org>
Sun, 6 Jan 2008 23:03:04 +0000 (23:03 +0000)
committerPierre d'Herbemont <pdherbemont@videolan.org>
Sun, 6 Jan 2008 23:03:04 +0000 (23:03 +0000)
MacOSX/Framework/Sources/VLCVideoCommon.m: Minor typo in previous commit.

extras/MacOSX/Framework/Sources/VLCVideoCommon.m
extras/MacOSX/VLC_app/VLC.xcodeproj/project.pbxproj

index f233593..e3fb8d1 100644 (file)
@@ -50,7 +50,7 @@
         
         CGFloat xRatio = CGRectGetWidth(bounds)/originalVideoSize.width;
         CGFloat yRatio = CGRectGetHeight(bounds)/originalVideoSize.height;
-        CGFloat ratio = fillScreenEntirely ? MAX(xRatio, yRatio) : MIX(xRatio, yRatio);
+        CGFloat ratio = fillScreenEntirely ? MAX(xRatio, yRatio) : MIN(xRatio, yRatio);
         
         videoRect.size.width = ratio*originalVideoSize.width;
         videoRect.size.height = ratio*originalVideoSize.height;
index 45ac57d..4aaf51b 100644 (file)
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "if test \"$SYMROOT\" == \"$PROJECT_DIR/build\"\nthen\n\tVLCFRAMEWORK=\"$SRCROOT/../Framework/build/$CONFIGURATION/VLCKit.framework\"\nelse\n\tVLCFRAMEWORK=\"$SYMROOT/VLCKit.framework\"\nfi\n/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp -exclude .DS_Store -exclude CVS -exclude .svn -resolve-src-symlinks $VLCFRAMEWORK $BUILT_PRODUCTS_DIR/$FRAMEWORKS_FOLDER_PATH\n\n\n";
-                       showEnvVarsInLog = 0;
+                       shellScript = "if test \"$SYMROOT\" == \"$PROJECT_DIR/build\"\nthen\n\tVLCFRAMEWORK=\"$SRCROOT/../Framework/build/$CONFIGURATION/VLCKit.framework\"\nelse\n\tVLCFRAMEWORK=\"$SYMROOT/$CONFIGURATION/VLCKit.framework\"\nfi\n/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp -exclude .DS_Store -exclude CVS -exclude .svn -resolve-src-symlinks $VLCFRAMEWORK $BUILT_PRODUCTS_DIR/$FRAMEWORKS_FOLDER_PATH\n\n\n";
                };
 /* End PBXShellScriptBuildPhase section */