summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrake.ApplicationServices/Services
diff options
context:
space:
mode:
authorsr55 <[email protected]>2015-05-26 20:30:10 +0000
committersr55 <[email protected]>2015-05-26 20:30:10 +0000
commit3ca17e6454929d52b65a6e712cb6a99d9e26c2de (patch)
tree52a4d8aafeffb787f6f17881a900687e61f88de7 /win/CS/HandBrake.ApplicationServices/Services
parent6f6f447ca0b5453964d9f6c94cffed4a81e8d184 (diff)
WinGui: Adding new dropdown to the Configure Audio Options. The new "Track Setting Default Behaviour" allows the choice of what settings are used for automatically added tracks.
1. All Preset tracks are cloned for each of the added languages tracks. 2. The first preset track is cloned for each of the added languages tracks. 3. Default 160kbit DPL2 AAC audio track for each of the added languages tracks. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7228 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.ApplicationServices/Services')
-rw-r--r--win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs2
-rw-r--r--win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AudioTrack.cs10
2 files changed, 9 insertions, 3 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs
index 2117565e5..8d34d230b 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs
@@ -66,7 +66,7 @@ namespace HandBrake.ApplicationServices.Services.Encode.Model
this.AudioTracks = new ObservableCollection<AudioTrack>();
foreach (AudioTrack track in task.AudioTracks)
{
- this.AudioTracks.Add(new AudioTrack(track));
+ this.AudioTracks.Add(new AudioTrack(track, true));
}
this.ChapterNames = new ObservableCollection<ChapterMarker>();
diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AudioTrack.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AudioTrack.cs
index f2a454729..4a020365d 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AudioTrack.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AudioTrack.cs
@@ -94,7 +94,10 @@ namespace HandBrake.ApplicationServices.Services.Encode.Model.Models
/// <param name="track">
/// The track.
/// </param>
- public AudioTrack(AudioTrack track)
+ /// <param name="setScannedTrack">
+ /// The set Scanned Track.
+ /// </param>
+ public AudioTrack(AudioTrack track, bool setScannedTrack)
{
this.bitrate = track.Bitrate;
this.drc = track.DRC;
@@ -102,7 +105,10 @@ namespace HandBrake.ApplicationServices.Services.Encode.Model.Models
this.gain = track.Gain;
this.mixDown = track.MixDown;
this.sampleRate = track.SampleRate;
- this.scannedTrack = track.ScannedTrack ?? new Audio();
+ if (setScannedTrack)
+ {
+ this.scannedTrack = track.ScannedTrack ?? new Audio();
+ }
this.TrackName = track.TrackName;
}