{\r
if (this.SourceTracks != null)\r
{\r
- Audio track = sourceTrack ?? this.SourceTracks.FirstOrDefault();\r
+ Audio track = sourceTrack ?? this.GetPreferredAudioTrack();\r
if (track != null)\r
{\r
this.Task.AudioTracks.Add(new AudioTrack { ScannedTrack = track });\r
/// </summary>\r
private void AddAllRemainingTracks()\r
{\r
+ // For all the source audio tracks\r
foreach (Audio sourceTrack in this.SourceTracks)\r
{\r
- bool found = this.Task.AudioTracks.Any(audioTrack => audioTrack.ScannedTrack == sourceTrack);\r
+ // Step 1: If "Add only One per language" is turned on, check to see if this language is already added.\r
+ if (this.CanSkipSourceTrack(sourceTrack))\r
+ {\r
+ continue;\r
+ }\r
+\r
+ // Step 2: Check if the track list already contrains this track\r
+ bool found = this.Task.AudioTracks.Any(audioTrack => Equals(audioTrack.ScannedTrack, sourceTrack));\r
if (!found)\r
{\r
+ // If it doesn't, add it.\r
this.Add(sourceTrack);\r
}\r
}\r
/// </summary>\r
public void AddAllRemainingForSelectedLanguages()\r
{\r
- // Figure out the source tracks we want to add\r
- List<Audio> trackList = new List<Audio>();\r
- foreach (\r
- string language in\r
- this.UserSettingService.GetUserSetting<StringCollection>(\r
- UserSettingConstants.SelectedLanguages))\r
- {\r
- // TODO add support for "Add only 1 per language"\r
- trackList.AddRange(this.SourceTracks.Where(source => source.Language.Trim() == language));\r
- }\r
-\r
// Add them if they are not already added.\r
- foreach (Audio sourceTrack in trackList)\r
+ foreach (Audio sourceTrack in this.GetSelectedLanguagesTracks())\r
{\r
- bool found = this.Task.AudioTracks.Any(audioTrack => audioTrack.ScannedTrack == sourceTrack);\r
+ // Step 1: If "Add only One per language" is turned on, check to see if this language is already added.\r
+ if (this.CanSkipSourceTrack(sourceTrack))\r
+ {\r
+ continue;\r
+ }\r
\r
+ // Step 2: Check if the track list already contrains this track\r
+ bool found = this.Task.AudioTracks.Any(audioTrack => Equals(audioTrack.ScannedTrack, sourceTrack));\r
if (!found)\r
{\r
+ // If it doesn't, add it.\r
this.Add(sourceTrack);\r
}\r
}\r
// Clear out the old tracks\r
this.Task.AudioTracks.Clear();\r
\r
- // Get the preferred Language\r
- IEnumerable<Audio> preferredAudioTracks =\r
- this.SourceTracks.Where(\r
- item =>\r
- item.Language.Contains(\r
- this.UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguage)));\r
- Audio preferred = preferredAudioTracks.FirstOrDefault() ?? this.SourceTracks.FirstOrDefault();\r
-\r
// Add the preset audio tracks with the preferred language\r
foreach (AudioTrack track in preset.Task.AudioTracks)\r
{\r
- this.Task.AudioTracks.Add(new AudioTrack(track) { ScannedTrack = preferred });\r
+ this.Task.AudioTracks.Add(new AudioTrack(track) { ScannedTrack = this.GetPreferredAudioTrack() });\r
}\r
}\r
\r
/// </summary>\r
private void AutomaticTrackSelection()\r
{\r
- List<Audio> trackList = new List<Audio>();\r
if (!this.SourceTracks.Any())\r
{\r
+ // Clear out the old tracks\r
+ this.Task.AudioTracks.Clear();\r
+\r
return;\r
}\r
\r
- // Step 1: Fetch all the Preferred Language settings\r
- if (this.UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguage) == "Any")\r
+ // Default all the language tracks to the preferred or first language of this source.\r
+ foreach (AudioTrack track in this.Task.AudioTracks)\r
{\r
- // If we have Any as the preferred Language, just set the first track to all audio tracks.\r
- trackList.Add(this.SourceTracks.FirstOrDefault());\r
- }\r
- else\r
- {\r
- // Otherwise, fetch the preferred language.\r
- foreach (\r
- Audio item in\r
- this.SourceTracks.Where(\r
- item =>\r
- item.Language.Contains(\r
- this.UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguage))))\r
- {\r
- trackList.Add(item);\r
- break;\r
- }\r
+ track.ScannedTrack = this.GetPreferredAudioTrack();\r
}\r
\r
- // Step 2: Handle "All Remaining Tracks" and "All for Selected Languages" or use the default behaviour\r
+ // Handle the default selection behaviour.\r
int mode = this.UserSettingService.GetUserSetting<int>(UserSettingConstants.DubModeAudio);\r
-\r
switch (mode)\r
{\r
- default: // Default by setting all existing tracks to a preferred or first source track.\r
- foreach (AudioTrack track in this.Task.AudioTracks)\r
- {\r
- track.ScannedTrack = trackList.FirstOrDefault() ?? this.SourceTracks.FirstOrDefault();\r
- }\r
- break;\r
case 1: // Adding all remaining audio tracks\r
this.AddAllRemaining();\r
break;\r
}\r
\r
/// <summary>\r
- /// The get language tracks.\r
+ /// The get preferred audio track, or the first if none available.\r
/// </summary>\r
/// <returns>\r
- /// The Users desired audio tracks\r
+ /// The users preferred language, or the first if none available.\r
/// </returns>\r
- private List<Audio> GetLanguageTracks()\r
+ private Audio GetPreferredAudioTrack()\r
+ {\r
+ // Get the preferred Language\r
+ IEnumerable<Audio> preferredAudioTracks =\r
+ this.SourceTracks.Where(\r
+ item =>\r
+ item.Language.Contains(\r
+ this.UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguage)));\r
+ return preferredAudioTracks.FirstOrDefault() ?? this.SourceTracks.FirstOrDefault();\r
+ }\r
+\r
+ /// <summary>\r
+ /// Gets a list of source tracks for the users selected languages.\r
+ /// </summary>\r
+ /// <returns>\r
+ /// A list of source audio tracks.\r
+ /// </returns>\r
+ private IEnumerable<Audio> GetSelectedLanguagesTracks()\r
{\r
List<Audio> trackList = new List<Audio>();\r
- if (this.UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguage) == "Any")\r
+ foreach (string language in this.UserSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages))\r
{\r
- // If we have Any as the preferred Language, just set the first track to all audio tracks.\r
- trackList.Add(this.SourceTracks.FirstOrDefault());\r
+ trackList.AddRange(this.SourceTracks.Where(source => source.Language.Trim() == language));\r
}\r
- else\r
+\r
+ return trackList;\r
+ }\r
+\r
+ /// <summary>\r
+ /// Checks to see if we can skip over the given source audio track.\r
+ /// True when the user has set "Add only one per language" feature AND the language is contained in the track list.\r
+ /// </summary>\r
+ /// <param name="sourceTrack">\r
+ /// The source track.\r
+ /// </param>\r
+ /// <returns>\r
+ /// True when the user has set "Add only one per language" feature AND the language is contained in the track list\r
+ /// </returns>\r
+ private bool CanSkipSourceTrack(Audio sourceTrack)\r
+ {\r
+ bool addOnlyOnePerLanguage = this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.AddOnlyOneAudioPerLanguage);\r
+ bool sourceTrackLanguageFound = this.Task.AudioTracks.Any(audioTrack => audioTrack.ScannedTrack != null && sourceTrack.Language == audioTrack.ScannedTrack.Language);\r
+ if (addOnlyOnePerLanguage && sourceTrackLanguageFound)\r
{\r
- // Otherwise, fetch the preferred language.\r
- foreach (\r
- Audio item in\r
- this.SourceTracks.Where(\r
- item =>\r
- item.Language.Contains(\r
- this.UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguage))))\r
- {\r
- trackList.Add(item);\r
- break;\r
- }\r
+ return true; // This track can be skipped.\r
}\r
\r
- return trackList;\r
+ return false;\r
}\r
\r
#endregion\r
/// </summary>\r
public void AddAllClosedCaptions()\r
{\r
- if (this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.UseClosedCaption))\r
+\r
+ foreach (Subtitle subtitle in this.SourceTitlesSubset(null).Where(s => s.SubtitleType == SubtitleType.CC))\r
{\r
- foreach (\r
- Subtitle subtitle in this.SourceTitlesSubset(null).Where(s => s.SubtitleType == SubtitleType.CC))\r
- {\r
- this.Add(subtitle);\r
- }\r
+ this.Add(subtitle);\r
}\r
}\r
\r
}\r
}\r
\r
- /// <summary>\r
- /// Automatic Subtitle Selection based on user preferences.\r
- /// </summary>\r
- public void AutomaticSubtitleSelection()\r
- {\r
- this.Task.SubtitleTracks.Clear();\r
-\r
- // New DUB Settings\r
- int mode = this.UserSettingService.GetUserSetting<int>(UserSettingConstants.DubModeSubtitle);\r
- switch (mode)\r
- {\r
- case 1: // Adding all remaining subtitle tracks\r
- this.AddAllRemaining();\r
- break;\r
- case 2: // Adding only the first or preferred first subtitle track.\r
- this.Add();\r
- break;\r
- case 3: // Selected Languages Only\r
- this.AddAllRemainingForSelectedLanguages();\r
- break;\r
- case 4: // Prefered Only\r
- this.AddForPreferredLanaguages(true);\r
- break;\r
- case 5: // Prefered Only All\r
- this.AddForPreferredLanaguages(false);\r
- break;\r
- }\r
-\r
- // Add all closed captions if enabled.\r
- this.AddAllClosedCaptions();\r
- }\r
-\r
/// <summary>\r
/// Import an SRT File.\r
/// </summary>\r
this.NotifyOfPropertyChange(() => this.Task);\r
}\r
\r
+ /// <summary>\r
+ /// Automatic Subtitle Selection based on user preferences.\r
+ /// </summary>\r
+ public void AutomaticSubtitleSelection()\r
+ {\r
+ this.Task.SubtitleTracks.Clear();\r
+\r
+ // New DUB Settings\r
+ int mode = this.UserSettingService.GetUserSetting<int>(UserSettingConstants.DubModeSubtitle);\r
+ switch (mode)\r
+ {\r
+ case 1: // Adding all remaining subtitle tracks\r
+ this.AddAllRemaining();\r
+ break;\r
+ case 2: // Adding only the first or preferred first subtitle track.\r
+ this.Add();\r
+ break;\r
+ case 3: // Selected Languages Only\r
+ this.AddAllRemainingForSelectedLanguages();\r
+ break;\r
+ case 4: // Prefered Only\r
+ this.AddForPreferredLanaguages(true);\r
+ break;\r
+ case 5: // Prefered Only All\r
+ this.AddForPreferredLanaguages(false);\r
+ break;\r
+ }\r
+\r
+ // Add all closed captions if enabled.\r
+ if (this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.UseClosedCaption))\r
+ {\r
+ this.AddAllClosedCaptions();\r
+ }\r
+ }\r
+\r
#endregion\r
\r
#region Implemented Interfaces\r
private IEnumerable<Subtitle> SourceTitlesSubset(IEnumerable<Subtitle> subtitles)\r
{\r
return subtitles != null\r
- ? subtitles.Where(\r
- subtitle => !this.Task.SubtitleTracks.Any(track => track.SourceTrack == subtitle)).ToList()\r
- : this.SourceTracks.Where(\r
- subtitle => !this.Task.SubtitleTracks.Any(track => track.SourceTrack == subtitle)).ToList();\r
+ ? subtitles.Where(subtitle => !this.Task.SubtitleTracks.Any(track => Equals(track.SourceTrack, subtitle))).ToList()\r
+ : this.SourceTracks.Where(subtitle => !this.Task.SubtitleTracks.Any(track => Equals(track.SourceTrack, subtitle))).ToList();\r
}\r
\r
#endregion\r
projects / handbrake / commitdiff