From 7617bc4c41c7d79e1676e7edadd0ba71579c7ce3 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sun, 5 Aug 2012 15:02:10 +0000 Subject: WinGui: Add Audio Track Name option back in. For now, I've used a toggle button on the audio track to expand the row to show hidden audio options. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4890 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- .../Utilities/QueryGeneratorUtility.cs | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'win/CS/HandBrake.ApplicationServices/Utilities') diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs index a3c84f089..c22ef6926 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs @@ -494,6 +494,7 @@ namespace HandBrake.ApplicationServices.Utilities List bitrates = new List(); List drcs = new List(); List gains = new List(); + List trackNames = new List(); // No Audio if (audioTracks.Count == 0) @@ -526,6 +527,9 @@ namespace HandBrake.ApplicationServices.Utilities // Gain (--gain) gains.Add(track.IsPassthru ? 0 : track.Gain); + + // Audio Track Name (--aname) + trackNames.Add(track.TrackName); } // Audio Track (-a) @@ -645,6 +649,29 @@ namespace HandBrake.ApplicationServices.Utilities if (audioItems.Trim() != String.Empty) query += " --gain " + audioItems; + audioItems = string.Empty; // Reset for another pass. + firstLoop = true; + + // Audio Track Names (--aname) + bool foundTrackName = false; + foreach (string trackName in trackNames) + { + if (!string.IsNullOrEmpty(trackName)) + { + foundTrackName = true; + } + + if (firstLoop) + { + audioItems = string.IsNullOrEmpty(trackName) ? "\"\"" : string.Format("\"{0}\"", trackName.Trim()); + firstLoop = false; + } + else + audioItems += "," + (string.IsNullOrEmpty(trackName) ? "\"\"" : string.Format("\"{0}\"", trackName.Trim())); + } + if (foundTrackName) + query += string.Format(" --aname={0}", audioItems); + // Passthru Settings if (task.AllowedPassthruOptions != null) { -- cgit v1.2.3