Fixed audio track names in Encoding Settings not being applied.

Author: RandomEngy

VidCoder/Services/ProcessingService.cs

@@ -3143,8 +3143,14 @@ private void AutoResumeEncoding(object sender, EventArgs e)
 		});
 	}
 
-	// Automatically pick the correct audio on the given job.
-	// Only relies on input from settings and the current title.
+	/// <summary>
+	/// Automatically pick the correct audio on the given job.
+	/// Only relies on input from settings and the current title.
+	/// </summary>
+	/// <param name="job">The current encoding job.</param>
+	/// <param name="title">The source title.</param>
+	/// <param name="useCurrentContext">True to use the currently selected tracks to influence the choice.</param>
+	/// <param name="picker">The Picker to use.</param>
 	private void AutoPickAudio(VCJob job, SourceTitle title, bool useCurrentContext = false, Picker picker = null)
 	{
 		if (picker == null)

VidCoder/ViewModel/MainViewModel.cs

@@ -1287,13 +1287,35 @@ private void BuildAudioViewModelList()
 			// Fill in rest of unselected audio tracks
 			this.FillInUnselectedAudioTracks(audioTracksInnerList);
 
-			// Apply subtitle names from the Picker.
+			// Apply audio names from the Picker and Audio Encoding settings.
 			int outputIndex = 0;
 			foreach (AudioTrackViewModel audioTrackViewModel in audioTracksInnerList)
 			{
-				if (audioTrackViewModel.Selected)
+				audioTrackViewModel.Name = ProcessingService.GetPickerAudioName(picker, outputIndex++);
+			}
+
+			VCProfile profile = this.PresetsService.SelectedPreset.Preset.EncodingProfile;
+			if (profile.AudioEncodings != null)
+			{
+				foreach (AudioEncoding audioEncoding in profile.AudioEncodings)
 				{
-					audioTrackViewModel.Name = ProcessingService.GetPickerAudioName(picker, outputIndex++);
+					if (string.IsNullOrEmpty(audioEncoding.Name))
+					{
+						continue;
+					}
+
+					if (audioEncoding.InputNumber == 0)
+					{
+						foreach (AudioTrackViewModel audioTrackViewModel in audioTracksInnerList)
+						{
+							audioTrackViewModel.Name = audioEncoding.Name;
+						}
+					}
+					else if (audioEncoding.InputNumber <= audioTracksInnerList.Count)
+					{
+						AudioTrackViewModel audioTrackViewModel = audioTracksInnerList[audioEncoding.InputNumber - 1];
+						audioTrackViewModel.Name = audioEncoding.Name;
+					}
 				}
 			}
 		});

VidCoderCommon/Model/JsonEncodeFactory.cs

@@ -291,9 +291,17 @@ private static List<ResolvedAudioTrack> ResolveAudioTracks(List<PairedAudioTrack
 				Encoder = HandBrakeEncoderHelpers.GetAudioEncoder((int)outputCodec).ShortName,
 			};
 
+			// First priority: Chosen track name in the UI
 			string trackName = chosenTrack.Name;
 
-			if (trackName == null)
+			// Second priority name set in Audio Encoding
+			if (string.IsNullOrEmpty(trackName) && !string.IsNullOrEmpty(encoding.Name))
+			{
+				trackName = encoding.Name;
+			}
+
+			// Last priority: Source track name
+			if (string.IsNullOrEmpty(trackName) && !string.IsNullOrEmpty(sourceTrack.Name))
 			{
 				trackName = sourceTrack.Name;
 			}