Merge branch 'master' of github.com:ps3mediaserver/ps3mediaserver

ps3mediaserver · Jun 17, 2012 · 0ed8926 · 0ed8926
2 parents 0de2621 + 685a95d
commit 0ed8926
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 37 deletions.
diff --git a/contrib/binaries-deps-versions b/contrib/binaries-deps-versions
@@ -41,6 +41,6 @@ VERSION_PS3MEDIASERVER=release-1.50.0
 VERSION_TSMUXER=1.10.6
 VERSION_X264=r2197
 VERSION_XVID=1.3.2
-VERSION_ZLIB=1.2.5
+VERSION_ZLIB=1.2.7
 VERSION_YASM=1.2.0
 
diff --git a/contrib/build-pms-binaries.sh b/contrib/build-pms-binaries.sh
@@ -410,7 +410,7 @@ YASM=`check_binary yasm`
 UNZIP=`check_binary unzip`
 
 if is_osx; then
-    GCC2=$GCC
+    GCC2=`check_binary gcc`
     HDID=`check_binary hdid`
     HDIUTIL=`check_binary hdiutil`
 else
@@ -1330,8 +1330,8 @@ build_mplayer() {
         # OSX
 
         # Flags for compiling mplayer
-        export CFLAGS="-O4 -fomit-frame-pointer -pipe -mmacosx-version-min=${OSX_VERSION} -arch $ARCHITECTURE -I$TARGET/include"
-        export CXXFLAGS="-O4 -fomit-frame-pointer -pipe mmacosx-version-min=${OSX_VERSION} -arch $ARCHITECTURE -I$TARGET/include"
+        export CFLAGS="-O1 -fomit-frame-pointer -pipe -mmacosx-version-min=${OSX_VERSION} -arch $ARCHITECTURE -I$TARGET/include"
+        export CXXFLAGS="-O1 -fomit-frame-pointer -pipe mmacosx-version-min=${OSX_VERSION} -arch $ARCHITECTURE -I$TARGET/include"
         export LDFLAGS="-mmacosx-version-min=${OSX_VERSION} -arch $ARCHITECTURE -L$TARGET/lib"
 
         # /usr/bin/gcc gives compile errors for MPlayer on OSX Lion.

diff --git a/contrib/download-pms-binaries-source.sh b/contrib/download-pms-binaries-source.sh
@@ -156,7 +156,7 @@ download() {
     FILENAME=`echo $URL | $SED "s/.*\///g"`
 
     if is_osx; then
-        $CURL -L $URL > $FILENAME
+        $CURL -L -O $URL
     else
         $WGET $URL
     fi

diff --git a/contrib/mplayer.patch b/contrib/mplayer.patch
@@ -373,8 +373,8 @@ Index: libmpcodecs/vd_dsnative.c
 +        return 0;
 +    }
 +
-+    if (sh->ds->demuxer->filename)
-+        GetFullPathNameA(sh->ds->demuxer->filename, MAX_PATH, fname, NULL);
++//    if (sh->ds->demuxer->filename)
++//        GetFullPathNameA(sh->ds->demuxer->filename, MAX_PATH, fname, NULL);
 +
 +    if (!(dsn.codec = dsn.DSOpenVideoCodec(sh->codec->dll, sh->codec->guid, sh->bih,
 +                                           sh->codec->outfmt[sh->outfmtidx], sh->fps, fname, &err)))

diff --git a/src/main/java/net/pms/PMS.java b/src/main/java/net/pms/PMS.java
@@ -555,7 +555,6 @@ public MediaLibrary getLibrary() {
 		return mediaLibrary;
 	}
 
-	// FIXME this is duplicated in net/pms/encoders/PlayerFactory.java
 	private SystemUtils createSystemUtils() {
 		if (Platform.isWindows()) {
 			return new WinUtils();

diff --git a/src/main/java/net/pms/encoders/PlayerFactory.java b/src/main/java/net/pms/encoders/PlayerFactory.java
@@ -22,15 +22,11 @@
 import java.io.File;
 import java.util.ArrayList;
 
+import net.pms.PMS;
 import net.pms.configuration.PmsConfiguration;
 import net.pms.formats.Format;
 import net.pms.formats.FormatFactory;
-import net.pms.io.BasicSystemUtils;
-import net.pms.io.MacSystemUtils;
-import net.pms.io.SolarisUtils;
 import net.pms.io.SystemUtils;
-import net.pms.io.WinUtils;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -78,33 +74,10 @@ private PlayerFactory() {
 	 * @param configuration The PMS configuration.
 	 */
 	public static void initialize(final PmsConfiguration configuration) {
-		utils = createSystemUtils();
+		utils = PMS.get().getRegistry();
 		registerPlayers(configuration);
 	}
 
-	/**
-	 * Creates system utilities. These are needed to determine isAvis() in
-	 * {@link #registerPlayer(Player)}.
-	 *
-	 * @return The system utilities.
-	 */
-	// FIXME this is duplicated in PMS.java
-	private static SystemUtils createSystemUtils() {
-		if (Platform.isWindows()) {
-			return new WinUtils();
-		} else {
-			if (Platform.isMac()) {
-				return new MacSystemUtils();
-			} else {
-				if (Platform.isSolaris()) {
-					return new SolarisUtils();
-				} else {
-					return new BasicSystemUtils();
-				}
-			}
-		}
-	}
-
 	/**
 	 * Register a known set of audio or video transcoders.
 	 *