claunia/cuetools.net
1
0
Fork 0
mirror of https://github.com/claunia/cuetools.net.git synced 2025-12-16 18:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

More vestiges of lossywav removed

Browse Source
This commit is contained in:
Grigory Chudov
2013-04-12 23:07:36 -04:00
parent 769949f178
commit 8ea3d0b544
1 changed files with 33 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
CUETools/frmCUETools.cs
View File

@@ -437,7 +437,7 @@ namespace JDP
int _batchProcessed; int _batchProcessed;
bool _usePregapForFirstTrackInSingleFile; bool _usePregapForFirstTrackInSingleFile;
bool _reducePriority; bool _reducePriority;
string _defaultLosslessFormat, _defaultLossyFormat, _defaultHybridFormat, _defaultNoAudioFormat; string _defaultLosslessFormat, _defaultLossyFormat, _defaultNoAudioFormat;
int _choiceWidth, _choiceHeight; int _choiceWidth, _choiceHeight;
bool _choiceMaxed; bool _choiceMaxed;
Thread _workThread; Thread _workThread;
@@ -1414,7 +1414,6 @@ namespace JDP
_choiceMaxed = sr.LoadBoolean("ChoiceMaxed") ?? false; _choiceMaxed = sr.LoadBoolean("ChoiceMaxed") ?? false;
_defaultLosslessFormat = sr.Load("DefaultLosslessFormat") ?? "flac"; _defaultLosslessFormat = sr.Load("DefaultLosslessFormat") ?? "flac";
_defaultLossyFormat = sr.Load("DefaultLossyFormat") ?? "mp3"; _defaultLossyFormat = sr.Load("DefaultLossyFormat") ?? "mp3";
_defaultHybridFormat = sr.Load("DefaultHybridFormat") ?? "lossy.flac";
_defaultNoAudioFormat = sr.Load("DefaultNoAudioFormat") ?? "wav"; _defaultNoAudioFormat = sr.Load("DefaultNoAudioFormat") ?? "wav";
int iFormat, nFormats = sr.LoadInt32("OutputPathUseTemplates", 0, 10) ?? 0; int iFormat, nFormats = sr.LoadInt32("OutputPathUseTemplates", 0, 10) ?? 0;
for (iFormat = 0; iFormat < OutputPathUseTemplates.Length; iFormat++) for (iFormat = 0; iFormat < OutputPathUseTemplates.Length; iFormat++)
@@ -1473,7 +1472,6 @@ namespace JDP
sw.Save("InputPath", InputPath); sw.Save("InputPath", InputPath);
sw.Save("DefaultLosslessFormat", _defaultLosslessFormat); sw.Save("DefaultLosslessFormat", _defaultLosslessFormat);
sw.Save("DefaultLossyFormat", _defaultLossyFormat); sw.Save("DefaultLossyFormat", _defaultLossyFormat);
sw.Save("DefaultHybridFormat", _defaultHybridFormat);
sw.Save("DefaultNoAudioFormat", _defaultNoAudioFormat); sw.Save("DefaultNoAudioFormat", _defaultNoAudioFormat);
sw.Save("DontGenerate", !_outputPathUseTemplate); sw.Save("DontGenerate", !_outputPathUseTemplate);
sw.Save("OutputPathUseTemplates", comboBoxOutputFormat.Items.Count - OutputPathUseTemplates.Length); sw.Save("OutputPathUseTemplates", comboBoxOutputFormat.Items.Count - OutputPathUseTemplates.Length);
@@ -2340,50 +2338,40 @@ namespace JDP
if (SelectedOutputAudioFmt == null) if (SelectedOutputAudioFmt == null)
return; return;
if (SelectedOutputAudioType == AudioEncoderType.NoAudio)
{
comboBoxEncoder.Enabled = false;
trackBarEncoderMode.Visible = false;
labelEncoderMode.Visible = false;
labelEncoderMinMode.Visible = false;
labelEncoderMaxMode.Visible = false;
}
else
{
foreach (CUEToolsUDC encoder in _profile._config.encoders)
if (encoder.extension == SelectedOutputAudioFmt.extension)
{
if (SelectedOutputAudioFormat.StartsWith("lossy."))
{
if (!encoder.lossless)
continue;
}
else if (SelectedOutputAudioType == AudioEncoderType.Lossless && !encoder.lossless)
continue;
else if (SelectedOutputAudioType == AudioEncoderType.Lossy && encoder.lossless)
continue;
comboBoxEncoder.Items.Add(encoder);
}
comboBoxEncoder.SelectedItem = SelectedOutputAudioFormat.StartsWith("lossy.") ? SelectedOutputAudioFmt.encoderLossless
: SelectedOutputAudioType == AudioEncoderType.Lossless ? SelectedOutputAudioFmt.encoderLossless
: SelectedOutputAudioFmt.encoderLossy;
comboBoxEncoder.Enabled = true;
}
switch (SelectedOutputAudioType) switch (SelectedOutputAudioType)
{ {
case AudioEncoderType.Lossless:
_defaultLosslessFormat = SelectedOutputAudioFormat;
break;
case AudioEncoderType.Lossy:
_defaultLossyFormat = SelectedOutputAudioFormat;
break;
case AudioEncoderType.Hybrid:
_defaultHybridFormat = SelectedOutputAudioFormat;
break;
case AudioEncoderType.NoAudio: case AudioEncoderType.NoAudio:
_defaultNoAudioFormat = SelectedOutputAudioFormat; {
break; comboBoxEncoder.Enabled = false;
trackBarEncoderMode.Visible = false;
labelEncoderMode.Visible = false;
labelEncoderMinMode.Visible = false;
labelEncoderMaxMode.Visible = false;
_defaultNoAudioFormat = SelectedOutputAudioFormat;
break;
}
case AudioEncoderType.Lossless:
{
foreach (CUEToolsUDC encoder in _profile._config.encoders)
if (encoder.extension == SelectedOutputAudioFmt.extension)
if (encoder.lossless)
comboBoxEncoder.Items.Add(encoder);
comboBoxEncoder.SelectedItem = SelectedOutputAudioFmt.encoderLossless;
comboBoxEncoder.Enabled = true;
_defaultLosslessFormat = SelectedOutputAudioFormat;
break;
}
case AudioEncoderType.Lossy:
{
foreach (CUEToolsUDC encoder in _profile._config.encoders)
if (encoder.extension == SelectedOutputAudioFmt.extension)
if (!encoder.lossless)
comboBoxEncoder.Items.Add(encoder);
comboBoxEncoder.SelectedItem = SelectedOutputAudioFmt.encoderLossy;
comboBoxEncoder.Enabled = true;
_defaultLossyFormat = SelectedOutputAudioFormat;
break;
}
} }
} }
@@ -2397,8 +2385,6 @@ namespace JDP
{ {
if (SelectedOutputAudioType == AudioEncoderType.Lossless && !format.Value.allowLossless) if (SelectedOutputAudioType == AudioEncoderType.Lossless && !format.Value.allowLossless)
continue; continue;
if (SelectedOutputAudioType == AudioEncoderType.Hybrid) // && format.Key != "wv") TODO!!!!!
continue;
if (SelectedOutputAudioType == AudioEncoderType.Lossy && !format.Value.allowLossy) if (SelectedOutputAudioType == AudioEncoderType.Lossy && !format.Value.allowLossy)
continue; continue;
//if (SelectedOutputAudioType == AudioEncoderType.NoAudio) //if (SelectedOutputAudioType == AudioEncoderType.NoAudio)
@@ -2413,9 +2399,6 @@ namespace JDP
case AudioEncoderType.Lossy: case AudioEncoderType.Lossy:
SelectedOutputAudioFormat = _defaultLossyFormat; SelectedOutputAudioFormat = _defaultLossyFormat;
break; break;
case AudioEncoderType.Hybrid:
SelectedOutputAudioFormat = _defaultHybridFormat;
break;
case AudioEncoderType.NoAudio: case AudioEncoderType.NoAudio:
SelectedOutputAudioFormat = _defaultNoAudioFormat; SelectedOutputAudioFormat = _defaultNoAudioFormat;
break; break;
@@ -2434,9 +2417,7 @@ namespace JDP
if (SelectedOutputAudioFormat == null) if (SelectedOutputAudioFormat == null)
return; return;
CUEToolsUDC encoder = comboBoxEncoder.SelectedItem as CUEToolsUDC; CUEToolsUDC encoder = comboBoxEncoder.SelectedItem as CUEToolsUDC;
if (SelectedOutputAudioFormat.StartsWith("lossy.")) if (SelectedOutputAudioType == AudioEncoderType.Lossless)
SelectedOutputAudioFmt.encoderLossless = encoder;
else if (SelectedOutputAudioType == AudioEncoderType.Lossless)
SelectedOutputAudioFmt.encoderLossless = encoder; SelectedOutputAudioFmt.encoderLossless = encoder;
else else
SelectedOutputAudioFmt.encoderLossy = encoder; SelectedOutputAudioFmt.encoderLossy = encoder;