When doing batch file encodes, we now pick the default title to encode rather

than just the first one every time.

--HG--
branch : beta

Author: RandomEngy

VidCoder/Utilities/Utilities.cs

@@ -430,6 +430,27 @@ public static bool CanPassthrough(AudioCodec codec)
 				codec == AudioCodec.Mp3;
 		}
 
+		public static Title GetFeatureTitle(List<Title> titles, int hbFeatureTitle)
+		{
+			// If the feature title is supplied, find it in the list.
+			if (hbFeatureTitle > 0)
+			{
+				return titles.FirstOrDefault(title => title.TitleNumber == hbFeatureTitle);
+			}
+
+			// Select the first title within 80% of the duration of the longest title.
+			double maxSeconds = titles.Max(title => title.Duration.TotalSeconds);
+			foreach (Title title in titles)
+			{
+				if (title.Duration.TotalSeconds >= maxSeconds * .8)
+				{
+					return title;
+				}
+			}
+
+			return titles[0];
+		}
+
 		// Assumes the hashset has a comparer of StringComparer.OrdinalIgnoreCase
 		public static bool? FileExists(string path, HashSet<string> queuedPaths)
 		{

VidCoder/View/Panels/AdvancedPanel.xaml

@@ -100,9 +100,9 @@
 		</StackPanel>
 
 		<TextBlock 
-				Text="{x:Static res:EncodingRes.AdvancedOptionsStringLabel}" HorizontalAlignment="Left" Margin="7,117,0,0" VerticalAlignment="Top" />
+				Text="{x:Static res:EncodingRes.AdvancedOptionsStringLabel}" HorizontalAlignment="Left" Margin="9,117,0,0" VerticalAlignment="Top" />
 		<TextBox
-			Margin="0,134,0,0" VerticalAlignment="Top" Height="40"
+			Margin="6,134,6,0" VerticalAlignment="Top" Height="40"
 			Text="{Binding AdvancedOptionsString, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" />
 	</Grid>
 </UserControl>

VidCoder/ViewModel/MainViewModel.cs

@@ -2146,28 +2146,7 @@ private void UpdateFromNewVideoSource()
 
 			if (this.sourceData != null && this.sourceData.Titles != null && this.sourceData.Titles.Count > 0)
 			{
-				if (this.sourceData.FeatureTitle > 0)
-				{
-					selectTitle = this.sourceData.Titles.FirstOrDefault(title => title.TitleNumber == this.sourceData.FeatureTitle);
-				}
-				else
-				{
-					// Select the first title within 80% of the duration of the longest title.
-					double maxSeconds = this.sourceData.Titles.Max(title => title.Duration.TotalSeconds);
-					foreach (Title title in this.sourceData.Titles)
-					{
-						if (title.Duration.TotalSeconds >= maxSeconds * .8)
-						{
-							selectTitle = title;
-							break;
-						}
-					}
-
-					if (selectTitle == null)
-					{
-						selectTitle = this.sourceData.Titles[0];
-					}
-				}
+				selectTitle = Utilities.GetFeatureTitle(this.sourceData.Titles, this.sourceData.FeatureTitle);
 			}
 
 			if (selectTitle != null)

VidCoder/ViewModel/ScanMultipleDialogViewModel.cs

@@ -7,6 +7,8 @@
 
 namespace VidCoder.ViewModel
 {
+	using HandBrake.Interop.SourceData;
+
 	/// <summary>
 	/// View model for dialog that shows when scanning multiple files.
 	/// </summary>
@@ -45,17 +47,20 @@ public void ScanNextJob()
 		{
 			EncodeJobViewModel jobVM = itemsToScan[currentJobIndex];
 
-			HandBrakeInstance onDemandInstance = new HandBrakeInstance();
+			var onDemandInstance = new HandBrakeInstance();
 			onDemandInstance.Initialize(Config.LogVerbosity);
 			onDemandInstance.ScanCompleted += (o, e) =>
 			{
 				jobVM.HandBrakeInstance = onDemandInstance;
 
 				if (onDemandInstance.Titles.Count > 0)
 				{
-					jobVM.Job.Length = onDemandInstance.Titles[0].Duration;
+					Title titleToEncode = Utilities.GetFeatureTitle(onDemandInstance.Titles, onDemandInstance.FeatureTitle);
+
+					jobVM.Job.Title = titleToEncode.TitleNumber;
+					jobVM.Job.Length = titleToEncode.Duration;
 					jobVM.Job.ChapterStart = 1;
-					jobVM.Job.ChapterEnd = onDemandInstance.Titles[0].Chapters.Count;
+					jobVM.Job.ChapterEnd = titleToEncode.Chapters.Count;
 				}
 
 				lock (this.currentJobIndexLock)
@@ -77,7 +82,7 @@ public void ScanNextJob()
 				}
 			};
 
-			onDemandInstance.StartScan(jobVM.Job.SourcePath, 10, 1);
+			onDemandInstance.StartScan(jobVM.Job.SourcePath, 10, 0);
 		}
 	}
 }