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

trooperryan · Apr 3, 2012 · 03f2ebd · 03f2ebd
2 parents 9c659f4 + b4a4659
commit 03f2ebd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/net/pms/dlna/MapFile.java b/src/main/java/net/pms/dlna/MapFile.java
@@ -208,15 +208,15 @@ public int compare(File f1, File f2) {
 				Collections.sort(files, new Comparator<File>() {
 
 					public int compare(File f1, File f2) {
-						return new Long(f1.lastModified()).compareTo(new Long(f2.lastModified()));
+						return Long.valueOf(f1.lastModified()).compareTo(Long.valueOf(f2.lastModified()));
 					}
 				});
 				break;
 			case 1: // Sort by modified date, newest first
 				Collections.sort(files, new Comparator<File>() {
 
 					public int compare(File f1, File f2) {
-						return new Long(f2.lastModified()).compareTo(new Long(f1.lastModified()));
+						return Long.valueOf(f2.lastModified()).compareTo(Long.valueOf(f1.lastModified()));
 					}
 				});
 				break;

diff --git a/src/main/java/net/pms/encoders/MEncoderVideo.java b/src/main/java/net/pms/encoders/MEncoderVideo.java
@@ -1412,9 +1412,9 @@ public ProcessWrapper launchTranscode(
 					}
 					subtitleMargin = subtitleMargin + userMargin;
 
-					sb.append(",MarginV=").append(Math.round(subtitleMargin)).append(" ");
+					sb.append(",MarginV=").append(subtitleMargin).append(" ");
 				} else if (intOCH > 0) {
-					sb.append("-ass-force-style MarginV=").append(Math.round(subtitleMargin)).append(" ");
+					sb.append("-ass-force-style MarginV=").append(subtitleMargin).append(" ");
 				}
 
 				if (params.sid.getType() != DLNAMediaSubtitle.EMBEDDED) {
@@ -1450,7 +1450,7 @@ public ProcessWrapper launchTranscode(
 				}
 				subtitleMargin = subtitleMargin + userMargin;
 
-				sb.append(" -subpos ").append(100 - Math.round(subtitleMargin)).append(" ");
+				sb.append(" -subpos ").append(100 - subtitleMargin).append(" ");
 			}
 
 			// Common subtitle options
@@ -1668,7 +1668,7 @@ public ProcessWrapper launchTranscode(
 					}
 				}
 
-				vfValueOverscanPrepend.append("softskip,expand=-").append(Math.round(intOCWPixels)).append(":-").append(Math.round(intOCHPixels));
+				vfValueOverscanPrepend.append("softskip,expand=-").append(intOCWPixels).append(":-").append(intOCHPixels);
 				vfValueOverscanMiddle.append(",scale=").append(scaleWidth).append(":").append(scaleHeight);
 			}
 
@@ -1777,8 +1777,8 @@ public ProcessWrapper launchTranscode(
 			int newWidth;
 			int newHeight;
 
-			newWidth  = Math.round(media.getWidth() / 4) * 4;
-			newHeight = Math.round(media.getHeight() / 4) * 4;
+			newWidth  = (media.getWidth() / 4) * 4;
+			newHeight = (media.getHeight() / 4) * 4;
 
 			cmdArray = Arrays.copyOf(cmdArray, cmdArray.length + 2);
 			cmdArray[cmdArray.length - 4] = "-vf";

diff --git a/src/main/java/net/pms/newgui/TracesTab.java b/src/main/java/net/pms/newgui/TracesTab.java
@@ -97,7 +97,7 @@ public JComponent build() {
 		jList = new JTextArea();
 		jList.setEditable(false);
 		jList.setBackground(Color.WHITE);
-		jList.setFont(new Font("Courier New", Font.PLAIN, 12));
+		jList.setFont(new Font(Font.MONOSPACED, Font.PLAIN, 12));
 		final JPopupMenu popup = new JPopupMenu();
 		JMenuItem defaultItem = new JMenuItem(Messages.getString("TracesTab.3"));
 

diff --git a/src/main/java/net/pms/util/MpegUtil.java b/src/main/java/net/pms/util/MpegUtil.java
@@ -68,7 +68,7 @@ private static Map<Integer, Integer> checkRange(RandomAccessFile raf, long start
 				// check pts
 				if ((buffer[diff] & 128) == 128 && (buffer[diff + 2] & 32) == 32
 						&& (pts.get(id) == null || (pts.get(id) != null && end))) {
-					pts.put(id, new Integer(getTS(buffer, diff + 3)));
+					pts.put(id, Integer.valueOf(getTS(buffer, diff + 3)));
 				}
 			}
 		}