Cosmetics

Based on eb4ea2b

src/main/java/net/pms/configuration/FormatConfiguration.java

@@ -316,7 +316,7 @@ public String match(DLNAMediaInfo media) {
 			return match(media.getContainer(), media.getCodecV(), null, 0, 0, media.getBitrate(), media.getWidth(), media.getHeight(), media.getExtras());
 		} else {
 			String finalMimeType = null;
-			for (DLNAMediaAudio audio : media.getAudioCodes()) {
+			for (DLNAMediaAudio audio : media.getAudioTracksList()) {
 				String mimeType = match(media.getContainer(), media.getCodecV(), audio.getCodecA(), audio.getNrAudioChannels(), audio.getSampleRate(), media.getBitrate(), media.getWidth(), media.getHeight(), media.getExtras());
 				finalMimeType = mimeType;
 				if (mimeType == null) // if at least one audio track is not compatible, the file must be transcoded.

src/main/java/net/pms/dlna/DLNAMediaDatabase.java

@@ -336,7 +336,7 @@ public ArrayList<DLNAMediaInfo> getData(String name, long modified) {
 					audio.setDelay(subrs.getInt("DELAY"));
 					audio.setMuxingModeAudio(subrs.getString("MUXINGMODE"));
 					audio.setBitRate(subrs.getInt("BITRATE"));
-					media.getAudioCodes().add(audio);
+					media.getAudioTracksList().add(audio);
 				}
 				subrs.close();
 				audios.close();
@@ -439,10 +439,10 @@ public synchronized void insertData(String name, long modified, int type, DLNAMe
 			rs.close();
 			if (media != null && id > -1) {
 				PreparedStatement insert = null;
-				if (media.getAudioCodes().size() > 0) {
+				if (media.getAudioTracksList().size() > 0) {
 					insert = conn.prepareStatement("INSERT INTO AUDIOTRACKS VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
 				}
-				for (DLNAMediaAudio audio : media.getAudioCodes()) {
+				for (DLNAMediaAudio audio : media.getAudioTracksList()) {
 					insert.clearParameters();
 					insert.setInt(1, id);
 					insert.setInt(2, audio.getId());

src/main/java/net/pms/dlna/DLNAMediaInfo.java

@@ -130,17 +130,8 @@ public class DLNAMediaInfo implements Cloneable {
 	@Deprecated
 	public int bitsPerPixel;
 
-	/**
-	 * @deprecated Use standard getter and setter to access this variable.
-	 */
-	@Deprecated
-	public ArrayList<DLNAMediaAudio> audioCodes = new ArrayList<DLNAMediaAudio>();
-
-	/**
-	 * @deprecated Use standard getter and setter to access this variable.
-	 */
-	@Deprecated
-	public ArrayList<DLNAMediaSubtitle> subtitlesCodes = new ArrayList<DLNAMediaSubtitle>();
+	private ArrayList<DLNAMediaAudio> audioTracks = new ArrayList<DLNAMediaAudio>();
+	private ArrayList<DLNAMediaSubtitle> subtitleTracks = new ArrayList<DLNAMediaSubtitle>();
 
 	/**
 	 * @deprecated Use standard getter and setter to access this variable.
@@ -555,7 +546,7 @@ public void parse(InputFile f, Format ext, int type, boolean thumbOnly) {
 						audio.setSongname(f.getFile().getName());
 					}
 					if (!ffmpeg_parsing) {
-						getAudioCodes().add(audio);
+						getAudioTracksList().add(audio);
 					}
 				}
 			}
@@ -763,7 +754,7 @@ public void parse(InputFile f, Format ext, int type, boolean thumbOnly) {
 										}
 									}
 								}
-								getAudioCodes().add(audio);
+								getAudioTracksList().add(audio);
 							} else if (line.indexOf("Video:") > -1) {
 								StringTokenizer st = new StringTokenizer(line, ",");
 								while (st.hasMoreTokens()) {
@@ -1078,7 +1069,7 @@ public boolean isLossless(String codecA) {
 
 	public String toString() {
 		String s = "container: " + getContainer() + " / bitrate: " + getBitrate() + " / size: " + getSize() + " / codecV: " + getCodecV() + " / duration: " + getDurationString() + " / width: " + getWidth() + " / height: " + getHeight() + " / frameRate: " + getFrameRate() + " / thumb size : " + (getThumb() != null ? getThumb().length : 0) + " / muxingMode: " + getMuxingMode();
-		for (DLNAMediaAudio audio : getAudioCodes()) {
+		for (DLNAMediaAudio audio : getAudioTracksList()) {
 			s += "\n\taudio: id=" + audio.getId() + " / lang: " + audio.getLang() + " / flavor: " + audio.getFlavor() + " / codec: " + audio.getCodecA() + " / sf:" + audio.getSampleFrequency() + " / na: " + audio.getNrAudioChannels() + " / bs: " + audio.getBitsperSample();
 			if (audio.getArtist() != null) {
 				s += " / " + audio.getArtist() + "|" + audio.getAlbum() + "|" + audio.getSongname() + "|" + audio.getYear() + "|" + audio.getTrack();
@@ -1129,8 +1120,8 @@ public String getValidFps(boolean ratios) {
 	}
 
 	public DLNAMediaAudio getFirstAudioTrack() {
-		if (getAudioCodes().size() > 0) {
-			return getAudioCodes().get(0);
+		if (getAudioTracksList().size() > 0) {
+			return getAudioTracksList().get(0);
 		}
 		return null;
 	}
@@ -1276,11 +1267,11 @@ protected Object clone() throws CloneNotSupportedException {
 		Object cloned = super.clone();
 		if (cloned instanceof DLNAMediaInfo) {
 			DLNAMediaInfo mediaCloned = ((DLNAMediaInfo) cloned);
-			mediaCloned.setAudioCodes(new ArrayList<DLNAMediaAudio>());
-			for (DLNAMediaAudio audio : getAudioCodes()) {
-				mediaCloned.getAudioCodes().add((DLNAMediaAudio) audio.clone());
+			mediaCloned.setAudioTracksList(new ArrayList<DLNAMediaAudio>());
+			for (DLNAMediaAudio audio : getAudioTracksList()) {
+				mediaCloned.getAudioTracksList().add((DLNAMediaAudio) audio.clone());
 			}
-			mediaCloned.setSubtitlesCodes(new ArrayList<DLNAMediaSubtitle>());
+			mediaCloned.setSubtitleTracksList(new ArrayList<DLNAMediaSubtitle>());
 			for (DLNAMediaSubtitle sub : getSubtitleTracksList()) {
 				mediaCloned.getSubtitleTracksList().add((DLNAMediaSubtitle) sub.clone());
 			}
@@ -1466,35 +1457,35 @@ public void setBitsPerPixel(int bitsPerPixel) {
 	}
 
 	/**
-	 * @return the audioCodes
+	 * @return the audioTracks
 	 * @since 1.50
 	 */
-	public ArrayList<DLNAMediaAudio> getAudioCodes() {
-		return audioCodes;
+	public ArrayList<DLNAMediaAudio> getAudioTracksList() {
+		return audioTracks;
 	}
 
 	/**
-	 * @param audioCodes the audioCodes to set
+	 * @param audioCodes the audioTracks to set
 	 * @since 1.50
 	 */
-	public void setAudioCodes(ArrayList<DLNAMediaAudio> audioCodes) {
-		this.audioCodes = audioCodes;
+	public void setAudioTracksList(ArrayList<DLNAMediaAudio> audioCodes) {
+		this.audioTracks = audioCodes;
 	}
 
 	/**
-	 * @return the subtitlesCodes
+	 * @return the subtitleTracks
 	 * @since 1.50
 	 */
 	public ArrayList<DLNAMediaSubtitle> getSubtitleTracksList() {
-		return subtitlesCodes;
+		return subtitleTracks;
 	}
 
 	/**
-	 * @param subtitlesCodes the subtitlesCodes to set
+	 * @param subtitlesCodes the subtitleTracks to set
 	 * @since 1.50
 	 */
-	public void setSubtitlesCodes(ArrayList<DLNAMediaSubtitle> subtitlesCodes) {
-		this.subtitlesCodes = subtitlesCodes;
+	public void setSubtitleTracksList(ArrayList<DLNAMediaSubtitle> subtitlesCodes) {
+		this.subtitleTracks = subtitlesCodes;
 	}
 
 	/**

src/main/java/net/pms/dlna/DVDISOTitle.java

@@ -186,8 +186,8 @@ public void run() {
 			d = Double.parseDouble(duration);
 		}
 
-		getMedia().setAudioCodes(audio);
-		getMedia().setSubtitlesCodes(subs);
+		getMedia().setAudioTracksList(audio);
+		getMedia().setSubtitleTracksList(subs);
 
 		if (duration != null) {
 			getMedia().setDuration(d);

src/main/java/net/pms/dlna/FileTranscodeVirtualFolder.java

@@ -62,12 +62,12 @@ public void resolve() {
 						addChapterFile(avisnewChild);
 					}
 				}
-				for (int i = 0; i < child.getMedia().getAudioCodes().size(); i++) {
+				for (int i = 0; i < child.getMedia().getAudioTracksList().size(); i++) {
 					DLNAResource newChildNoSub = ref.clone();
 					newChildNoSub.setPlayer(ref.getPlayer());
 					newChildNoSub.setMedia(ref.getMedia());
 					newChildNoSub.setNoName(true);
-					newChildNoSub.setMediaAudio(ref.getMedia().getAudioCodes().get(i));
+					newChildNoSub.setMediaAudio(ref.getMedia().getAudioTracksList().get(i));
 					newChildNoSub.setMediaSubtitle(new DLNAMediaSubtitle());
 					newChildNoSub.getMediaSubtitle().setId(-1);
 					addChildInternal(newChildNoSub);
@@ -79,7 +79,7 @@ public void resolve() {
 						newChild.setPlayer(ref.getPlayer());
 						newChild.setMedia(ref.getMedia());
 						newChild.setNoName(true);
-						newChild.setMediaAudio(ref.getMedia().getAudioCodes().get(i));
+						newChild.setMediaAudio(ref.getMedia().getAudioTracksList().get(i));
 						newChild.setMediaSubtitle(ref.getMedia().getSubtitleTracksList().get(j));
 						addChildInternal(newChild);
 						addChapterFile(newChild);
@@ -89,12 +89,12 @@ public void resolve() {
 				}
 
 				if (tsMuxer != null) {
-					for (int i = 0; i < child.getMedia().getAudioCodes().size(); i++) {
+					for (int i = 0; i < child.getMedia().getAudioTracksList().size(); i++) {
 						DLNAResource newChildNoSub = ref.clone();
 						newChildNoSub.setPlayer(tsMuxer);
 						newChildNoSub.setMedia(ref.getMedia());
 						newChildNoSub.setNoName(true);
-						newChildNoSub.setMediaAudio(ref.getMedia().getAudioCodes().get(i));
+						newChildNoSub.setMediaAudio(ref.getMedia().getAudioTracksList().get(i));
 						addChildInternal(newChildNoSub);
 						addChapterFile(newChildNoSub);
 					}

src/main/java/net/pms/dlna/LibMediaInfoParser.java

@@ -147,7 +147,7 @@ public synchronized static void parse(DLNAMediaInfo media, InputFile file, int t
 									}
 								} else {
 									if (step == MediaInfo.StreamKind.Audio) {
-										currentAudioTrack.setId(media.getAudioCodes().size());
+										currentAudioTrack.setId(media.getAudioTracksList().size());
 										if (media.getContainer() != null && (media.getContainer().equals(FormatConfiguration.AVI) || media.getContainer().equals(FormatConfiguration.FLV) || media.getContainer().equals(FormatConfiguration.MOV) || media.getContainer().equals(FormatConfiguration.MP4))) {
 											currentAudioTrack.setId(currentAudioTrack.getId() + 1);
 										}
@@ -225,7 +225,7 @@ public static void addAudio(DLNAMediaAudio currentAudioTrack, DLNAMediaInfo medi
 		if (currentAudioTrack.getNrAudioChannels() == 0) {
 			currentAudioTrack.setNrAudioChannels(2); //stereo by default
 		}
-		media.getAudioCodes().add(currentAudioTrack);
+		media.getAudioTracksList().add(currentAudioTrack);
 	}
 
 	public static void addSub(DLNAMediaSubtitle currentSubTrack, DLNAMediaInfo media) {

src/main/java/net/pms/dlna/virtual/VirtualVideoAction.java

@@ -64,7 +64,7 @@ public VirtualVideoAction(String name, boolean enabled) {
 		DLNAMediaInfo mediaInfo = new DLNAMediaInfo();
 		mediaInfo.setContainer("mpegps");
 		ArrayList<DLNAMediaAudio> audioCodes = new ArrayList<DLNAMediaAudio>();
-		mediaInfo.setAudioCodes(audioCodes);
+		mediaInfo.setAudioTracksList(audioCodes);
 		mediaInfo.setMimeType("video/mpeg");
 		mediaInfo.setCodecV("mpeg2");
 		mediaInfo.setMediaparsed(true);

src/main/java/net/pms/encoders/MEncoderVideo.java

@@ -293,7 +293,7 @@ public void itemStateChanged(ItemEvent e) {
 					fakemedia.setHeight(720);
 					audio.setSampleFrequency("48000");
 					fakemedia.setFrameRate("23.976");
-					fakemedia.getAudioCodes().add(audio);
+					fakemedia.getAudioTracksList().add(audio);
 					String result[] = getSpecificCodecOptions(newCodecparam, fakemedia, new OutputParams(configuration), "dummy.mpg", "dummy.srt", false, true);
 
 					if (result.length > 0 && result[0].startsWith("@@")) {
@@ -1720,7 +1720,7 @@ public ProcessWrapper launchTranscode(
 		cmdArray[cmdArray.length - 10] = "-quiet";
 		cmdArray[cmdArray.length - 9] = "-quiet";
 
-		if (!dts && !pcm && !avisynth() && params.aid != null && media.getAudioCodes().size() > 1) {
+		if (!dts && !pcm && !avisynth() && params.aid != null && media.getAudioTracksList().size() > 1) {
 			cmdArray[cmdArray.length - 12] = "-aid";
 			boolean lavf = false; // Need to add support for LAVF demuxing
 			cmdArray[cmdArray.length - 11] = "" + (lavf ? params.aid.getId() + 1 : params.aid.getId());
@@ -2238,7 +2238,7 @@ public ProcessWrapper launchTranscode(
 				ffVideo.runInNewThread();
 
 				String aid = null;
-				if (media != null && media.getAudioCodes().size() > 1 && params.aid != null) {
+				if (media != null && media.getAudioTracksList().size() > 1 && params.aid != null) {
 					aid = params.aid.getId() + "";
 				}
 

src/main/java/net/pms/encoders/Player.java

@@ -148,7 +148,7 @@ public void setAudioAndSubs(String fileName, DLNAMediaInfo media, OutputParams p
 				String lang = st.nextToken();
 				lang = lang.trim();
 				LOGGER.trace("Looking for an audio track with lang: " + lang);
-				for (DLNAMediaAudio audio : media.getAudioCodes()) {
+				for (DLNAMediaAudio audio : media.getAudioTracksList()) {
 					if (audio.matchCode(lang)) {
 						params.aid = audio;
 						LOGGER.trace("Matched audio track: " + audio);
@@ -159,9 +159,9 @@ public void setAudioAndSubs(String fileName, DLNAMediaInfo media, OutputParams p
 			}
 		}
 
-		if (params.aid == null && media.getAudioCodes().size() > 0) {
-			// take a default audio track, dts first if possible
-			for (DLNAMediaAudio audio : media.getAudioCodes()) {
+		if (params.aid == null && media.getAudioTracksList().size() > 0) {
+			// Take a default audio track, dts first if possible
+			for (DLNAMediaAudio audio : media.getAudioTracksList()) {
 				if (audio.isDTS()) {
 					params.aid = audio;
 					LOGGER.trace("Found priority audio track with DTS: " + audio);
@@ -170,8 +170,8 @@ public void setAudioAndSubs(String fileName, DLNAMediaInfo media, OutputParams p
 			}
 
 			if (params.aid == null) {
-				params.aid = media.getAudioCodes().get(0);
-				LOGGER.trace("Choosed a default audio track: " + params.aid);
+				params.aid = media.getAudioTracksList().get(0);
+				LOGGER.trace("Chose a default audio track: " + params.aid);
 			}
 		}
 

src/main/java/net/pms/encoders/TSMuxerVideo.java

@@ -213,11 +213,11 @@ public ProcessWrapper launchTranscode(
 
 			int numAudioTracks = 1;
 
-			if (media != null && media.getAudioCodes() != null && media.getAudioCodes().size() > 1 && configuration.isMuxAllAudioTracks()) {
-				numAudioTracks = media.getAudioCodes().size();
+			if (media != null && media.getAudioTracksList() != null && media.getAudioTracksList().size() > 1 && configuration.isMuxAllAudioTracks()) {
+				numAudioTracks = media.getAudioTracksList().size();
 			}
 
-			boolean singleMediaAudio = media != null && media.getAudioCodes().size() <= 1;
+			boolean singleMediaAudio = media != null && media.getAudioTracksList().size() <= 1;
 
 			if (params.aid != null) {
 				boolean ac3Remux;
@@ -332,8 +332,8 @@ public ProcessWrapper launchTranscode(
 				} else {
 					ffAudioPipe = new PipeIPCProcess[numAudioTracks];
 					ffAudio = new ProcessWrapperImpl[numAudioTracks];
-					for (int i = 0; i < media.getAudioCodes().size(); i++) {
-						DLNAMediaAudio audio = media.getAudioCodes().get(i);
+					for (int i = 0; i < media.getAudioTracksList().size(); i++) {
+						DLNAMediaAudio audio = media.getAudioTracksList().get(i);
 						ffAudioPipe[i] = new PipeIPCProcess(System.currentTimeMillis() + "ffmpeg" + i, System.currentTimeMillis() + "audioout" + i, false, true);
 
 						// disable AC3 remux for stereo tracks with 384 kbits bitrate and PS3 renderer (PS3 FW bug?)
@@ -504,8 +504,8 @@ public ProcessWrapper launchTranscode(
 			}
 			pw.println(type + ", \"" + ffAudioPipe[0].getOutputPipe() + "\", " + timeshift + "track=2");
 		} else if (ffAudioPipe != null) {
-			for (int i = 0; i < media.getAudioCodes().size(); i++) {
-				DLNAMediaAudio lang = media.getAudioCodes().get(i);
+			for (int i = 0; i < media.getAudioTracksList().size(); i++) {
+				DLNAMediaAudio lang = media.getAudioTracksList().get(i);
 				String timeshift = "";
 				boolean ac3Remux;
 				boolean dtsRemux;

src/test/java/net/pms/dlna/DLNAMediaSubtitleTest.java

@@ -19,12 +19,10 @@
 package net.pms.dlna;
 
 import net.pms.formats.SubtitleType;
-import org.junit.Test;
-
 import static org.fest.assertions.Assertions.assertThat;
+import org.junit.Test;
 
 public class DLNAMediaSubtitleTest {
-
 	@Test
 	public void testDefaultSubtitleType() {
 		DLNAMediaSubtitle dlnaMediaSubtitle = new DLNAMediaSubtitle();

src/test/java/net/pms/formats/SubtitleTypeTest.java

@@ -18,14 +18,12 @@
  */
 package net.pms.formats;
 
+import static org.fest.assertions.Assertions.assertThat;
 import org.junit.Test;
-
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 public class SubtitleTypeTest {
 	@Test
 	public void testGetSubtitleTypeByFileExtension_matchingExtensions() throws Exception {

src/test/java/net/pms/test/Issue1278.java

@@ -18,17 +18,13 @@
  */
 package net.pms.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import ch.qos.logback.classic.LoggerContext;
 import net.pms.dlna.DLNAMediaInfo;
-
+import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.LoggerFactory;
 
-import ch.qos.logback.classic.LoggerContext;
-
 public class Issue1278 {
 	@Before
     public void setUp() {

src/test/java/net/pms/test/TaskRunnerTest.java

@@ -19,18 +19,14 @@
 
 package net.pms.test;
 
-import static org.junit.Assert.*;
-
+import ch.qos.logback.classic.LoggerContext;
 import java.util.concurrent.TimeUnit;
-
 import net.pms.util.TaskRunner;
-
+import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.LoggerFactory;
 
-import ch.qos.logback.classic.LoggerContext;
-
 public class TaskRunnerTest {
 	@Before
     public void setUp() {