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

Removed lossyWAV support from CUETools - it was outdated anyway

Browse Source
This commit is contained in:
Grigory Chudov
2013-04-12 22:40:56 -04:00
parent 19a0e99a00
commit ff8fd22fdf
11 changed files with 773 additions and 2124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
CUETools.Processor/AudioReadWrite.cs
View File

@@ -2,7 +2,6 @@ using System;
using System.IO; using System.IO;
using CUETools.CDImage; using CUETools.CDImage;
using CUETools.Codecs; using CUETools.Codecs;
using CUETools.Codecs.LossyWAV;
namespace CUETools.Processor namespace CUETools.Processor
{ {
@@ -49,35 +48,14 @@ namespace CUETools.Processor
public static IAudioSource GetAudioSource(string path, Stream IO, CUEConfig config) public static IAudioSource GetAudioSource(string path, Stream IO, CUEConfig config)
{ {
string extension = Path.GetExtension(path).ToLower(); string extension = Path.GetExtension(path).ToLower();
string filename = Path.GetFileNameWithoutExtension(path); return GetAudioSource(path, IO, extension, config);
string secondExtension = Path.GetExtension(filename).ToLower();
if (secondExtension != ".lossy" && secondExtension != ".lwcdf")
return GetAudioSource(path, IO, extension, config);
string lossyPath = Path.Combine(Path.GetDirectoryName(path), Path.GetFileNameWithoutExtension(filename) + ".lossy" + extension);
string lwcdfPath = Path.Combine(Path.GetDirectoryName(path), Path.GetFileNameWithoutExtension(filename) + ".lwcdf" + extension);
IAudioSource lossySource = GetAudioSource(lossyPath, null, extension, config);
IAudioSource lwcdfSource = null;
try
{
lwcdfSource = GetAudioSource(lwcdfPath, null, extension, config);
}
catch
{
return lossySource;
}
return new LossyWAVReader(lossySource, lwcdfSource);
} }
public static IAudioDest GetAudioDest(AudioEncoderType audioEncoderType, string path, AudioPCMConfig pcm, long finalSampleCount, int padding, string extension, CUEConfig config) public static IAudioDest GetAudioDest(AudioEncoderType audioEncoderType, string path, AudioPCMConfig pcm, long finalSampleCount, int padding, string extension, CUEConfig config)
{ {
IAudioDest dest; IAudioDest dest;
if (audioEncoderType == AudioEncoderType.NoAudio || extension == ".dummy") if (audioEncoderType == AudioEncoderType.NoAudio || extension == ".dummy")
{ return new DummyWriter(path, new AudioEncoderSettings(pcm)) { FinalSampleCount = finalSampleCount };
dest = new DummyWriter(path, new AudioEncoderSettings(pcm));
dest.FinalSampleCount = finalSampleCount;
return dest;
}
CUEToolsFormat fmt; CUEToolsFormat fmt;
if (!extension.StartsWith(".") || !config.formats.TryGetValue(extension.Substring(1), out fmt)) if (!extension.StartsWith(".") || !config.formats.TryGetValue(extension.Substring(1), out fmt))
throw new Exception("Unsupported audio type: " + path); throw new Exception("Unsupported audio type: " + path);
@@ -97,19 +75,5 @@ namespace CUETools.Processor
dest.FinalSampleCount = finalSampleCount; dest.FinalSampleCount = finalSampleCount;
return dest; return dest;
} }
public static IAudioDest GetAudioDest(AudioEncoderType audioEncoderType, string path, long finalSampleCount, int padding, AudioPCMConfig pcm, CUEConfig config)
{
string extension = Path.GetExtension(path).ToLower();
string filename = Path.GetFileNameWithoutExtension(path);
if (audioEncoderType == AudioEncoderType.NoAudio || audioEncoderType == AudioEncoderType.Lossless || Path.GetExtension(filename).ToLower() != ".lossy")
return GetAudioDest(audioEncoderType, path, pcm, finalSampleCount, padding, extension, config);
string lwcdfPath = Path.Combine(Path.GetDirectoryName(path), Path.GetFileNameWithoutExtension(filename) + ".lwcdf" + extension);
AudioPCMConfig lossypcm = new AudioPCMConfig((config.detectHDCD && config.decodeHDCD && !config.decodeHDCDtoLW16) ? 24 : 16, pcm.ChannelCount, pcm.SampleRate);
IAudioDest lossyDest = GetAudioDest(AudioEncoderType.Lossless, path, lossypcm, finalSampleCount, padding, extension, config);
IAudioDest lwcdfDest = audioEncoderType == AudioEncoderType.Hybrid ? GetAudioDest(AudioEncoderType.Lossless, lwcdfPath, lossypcm, finalSampleCount, padding, extension, config) : null;
return new LossyWAVWriter(lossyDest, lwcdfDest, config.lossyWAVQuality, new AudioEncoderSettings(pcm));
}
} }
} }

29
CUETools.Processor/CUEConfig.cs
View File

@@ -49,7 +49,6 @@ namespace CUETools.Processor
public bool createM3U; public bool createM3U;
public bool createCUEFileWhenEmbedded; public bool createCUEFileWhenEmbedded;
public bool truncate4608ExtraSamples; public bool truncate4608ExtraSamples;
public int lossyWAVQuality;
public bool decodeHDCDtoLW16; public bool decodeHDCDtoLW16;
public bool decodeHDCDto24bit; public bool decodeHDCDto24bit;
public bool oneInstance; public bool oneInstance;
@@ -122,7 +121,6 @@ namespace CUETools.Processor
createM3U = false; createM3U = false;
createCUEFileWhenEmbedded = true; createCUEFileWhenEmbedded = true;
truncate4608ExtraSamples = true; truncate4608ExtraSamples = true;
lossyWAVQuality = 5;
decodeHDCDtoLW16 = false; decodeHDCDtoLW16 = false;
decodeHDCDto24bit = true; decodeHDCDto24bit = true;
@@ -187,16 +185,16 @@ namespace CUETools.Processor
} }
formats = new Dictionary<string, CUEToolsFormat>(); formats = new Dictionary<string, CUEToolsFormat>();
formats.Add("flac", new CUEToolsFormat("flac", CUEToolsTagger.TagLibSharp, true, false, true, true, true, encoders.GetDefault("flac", true), null, decoders.GetDefault("flac", true))); formats.Add("flac", new CUEToolsFormat("flac", CUEToolsTagger.TagLibSharp, true, false, true, true, encoders.GetDefault("flac", true), null, decoders.GetDefault("flac", true)));
formats.Add("wv", new CUEToolsFormat("wv", CUEToolsTagger.TagLibSharp, true, false, true, true, true, encoders.GetDefault("wv", true), null, decoders.GetDefault("wv", true))); formats.Add("wv", new CUEToolsFormat("wv", CUEToolsTagger.TagLibSharp, true, false, true, true, encoders.GetDefault("wv", true), null, decoders.GetDefault("wv", true)));
formats.Add("ape", new CUEToolsFormat("ape", CUEToolsTagger.TagLibSharp, true, false, false, true, true, encoders.GetDefault("ape", true), null, decoders.GetDefault("ape", true))); formats.Add("ape", new CUEToolsFormat("ape", CUEToolsTagger.TagLibSharp, true, false, true, true, encoders.GetDefault("ape", true), null, decoders.GetDefault("ape", true)));
formats.Add("tta", new CUEToolsFormat("tta", CUEToolsTagger.APEv2, true, false, false, false, true, encoders.GetDefault("tta", true), null, decoders.GetDefault("tta", true))); formats.Add("tta", new CUEToolsFormat("tta", CUEToolsTagger.APEv2, true, false, false, true, encoders.GetDefault("tta", true), null, decoders.GetDefault("tta", true)));
formats.Add("wav", new CUEToolsFormat("wav", CUEToolsTagger.TagLibSharp, true, false, true, false, true, encoders.GetDefault("wav", true), null, decoders.GetDefault("wav", true))); formats.Add("wav", new CUEToolsFormat("wav", CUEToolsTagger.TagLibSharp, true, false, false, true, encoders.GetDefault("wav", true), null, decoders.GetDefault("wav", true)));
formats.Add("m4a", new CUEToolsFormat("m4a", CUEToolsTagger.TagLibSharp, true, true, false, false, true, encoders.GetDefault("m4a", true), encoders.GetDefault("m4a", false), decoders.GetDefault("m4a", true))); formats.Add("m4a", new CUEToolsFormat("m4a", CUEToolsTagger.TagLibSharp, true, true, false, true, encoders.GetDefault("m4a", true), encoders.GetDefault("m4a", false), decoders.GetDefault("m4a", true)));
formats.Add("tak", new CUEToolsFormat("tak", CUEToolsTagger.APEv2, true, false, true, true, true, encoders.GetDefault("tak", true), null, decoders.GetDefault("tak", true))); formats.Add("tak", new CUEToolsFormat("tak", CUEToolsTagger.APEv2, true, false, true, true, encoders.GetDefault("tak", true), null, decoders.GetDefault("tak", true)));
formats.Add("wma", new CUEToolsFormat("wma", CUEToolsTagger.TagLibSharp, true, true, false, false, true, encoders.GetDefault("wma", true), encoders.GetDefault("wma", false), decoders.GetDefault("wma", true))); formats.Add("wma", new CUEToolsFormat("wma", CUEToolsTagger.TagLibSharp, true, true, false, true, encoders.GetDefault("wma", true), encoders.GetDefault("wma", false), decoders.GetDefault("wma", true)));
formats.Add("mp3", new CUEToolsFormat("mp3", CUEToolsTagger.TagLibSharp, false, true, false, false, true, null, encoders.GetDefault("mp3", false), null)); formats.Add("mp3", new CUEToolsFormat("mp3", CUEToolsTagger.TagLibSharp, false, true, false, true, null, encoders.GetDefault("mp3", false), null));
formats.Add("ogg", new CUEToolsFormat("ogg", CUEToolsTagger.TagLibSharp, false, true, false, false, true, null, encoders.GetDefault("ogg", false), null)); formats.Add("ogg", new CUEToolsFormat("ogg", CUEToolsTagger.TagLibSharp, false, true, false, true, null, encoders.GetDefault("ogg", false), null));
scripts = new Dictionary<string, CUEToolsScript>(); scripts = new Dictionary<string, CUEToolsScript>();
scripts.Add("default", new CUEToolsScript("default", true, scripts.Add("default", new CUEToolsScript("default", true,
@@ -296,7 +294,6 @@ return processor.Go();
sw.Save("CreateM3U", createM3U); sw.Save("CreateM3U", createM3U);
sw.Save("CreateCUEFileWhenEmbedded", createCUEFileWhenEmbedded); sw.Save("CreateCUEFileWhenEmbedded", createCUEFileWhenEmbedded);
sw.Save("Truncate4608ExtraSamples", truncate4608ExtraSamples); sw.Save("Truncate4608ExtraSamples", truncate4608ExtraSamples);
sw.Save("LossyWAVQuality", lossyWAVQuality);
sw.Save("DecodeHDCDToLossyWAV16", decodeHDCDtoLW16); sw.Save("DecodeHDCDToLossyWAV16", decodeHDCDtoLW16);
sw.Save("DecodeHDCDTo24bit", decodeHDCDto24bit); sw.Save("DecodeHDCDTo24bit", decodeHDCDto24bit);
sw.Save("OneInstance", oneInstance); sw.Save("OneInstance", oneInstance);
@@ -365,7 +362,6 @@ return processor.Go();
sw.Save(string.Format("CustomFormat{0}Tagger", nFormats), (int)format.Value.tagger); sw.Save(string.Format("CustomFormat{0}Tagger", nFormats), (int)format.Value.tagger);
sw.Save(string.Format("CustomFormat{0}AllowLossless", nFormats), format.Value.allowLossless); sw.Save(string.Format("CustomFormat{0}AllowLossless", nFormats), format.Value.allowLossless);
sw.Save(string.Format("CustomFormat{0}AllowLossy", nFormats), format.Value.allowLossy); sw.Save(string.Format("CustomFormat{0}AllowLossy", nFormats), format.Value.allowLossy);
sw.Save(string.Format("CustomFormat{0}AllowLossyWAV", nFormats), format.Value.allowLossyWAV);
sw.Save(string.Format("CustomFormat{0}AllowEmbed", nFormats), format.Value.allowEmbed); sw.Save(string.Format("CustomFormat{0}AllowEmbed", nFormats), format.Value.allowEmbed);
nFormats++; nFormats++;
} }
@@ -427,7 +423,6 @@ return processor.Go();
createM3U = sr.LoadBoolean("CreateM3U") ?? false; createM3U = sr.LoadBoolean("CreateM3U") ?? false;
createCUEFileWhenEmbedded = sr.LoadBoolean("CreateCUEFileWhenEmbedded") ?? true; createCUEFileWhenEmbedded = sr.LoadBoolean("CreateCUEFileWhenEmbedded") ?? true;
truncate4608ExtraSamples = sr.LoadBoolean("Truncate4608ExtraSamples") ?? true; truncate4608ExtraSamples = sr.LoadBoolean("Truncate4608ExtraSamples") ?? true;
lossyWAVQuality = sr.LoadInt32("LossyWAVQuality", 0, 10) ?? 5;
decodeHDCDtoLW16 = sr.LoadBoolean("DecodeHDCDToLossyWAV16") ?? false; decodeHDCDtoLW16 = sr.LoadBoolean("DecodeHDCDToLossyWAV16") ?? false;
decodeHDCDto24bit = sr.LoadBoolean("DecodeHDCDTo24bit") ?? true; decodeHDCDto24bit = sr.LoadBoolean("DecodeHDCDTo24bit") ?? true;
@@ -512,7 +507,6 @@ return processor.Go();
CUEToolsTagger tagger = (CUEToolsTagger)(sr.LoadInt32(string.Format("CustomFormat{0}Tagger", nFormats), 0, 2) ?? 0); CUEToolsTagger tagger = (CUEToolsTagger)(sr.LoadInt32(string.Format("CustomFormat{0}Tagger", nFormats), 0, 2) ?? 0);
bool allowLossless = sr.LoadBoolean(string.Format("CustomFormat{0}AllowLossless", nFormats)) ?? false; bool allowLossless = sr.LoadBoolean(string.Format("CustomFormat{0}AllowLossless", nFormats)) ?? false;
bool allowLossy = sr.LoadBoolean(string.Format("CustomFormat{0}AllowLossy", nFormats)) ?? false; bool allowLossy = sr.LoadBoolean(string.Format("CustomFormat{0}AllowLossy", nFormats)) ?? false;
bool allowLossyWav = sr.LoadBoolean(string.Format("CustomFormat{0}AllowLossyWAV", nFormats)) ?? false;
bool allowEmbed = sr.LoadBoolean(string.Format("CustomFormat{0}AllowEmbed", nFormats)) ?? false; bool allowEmbed = sr.LoadBoolean(string.Format("CustomFormat{0}AllowEmbed", nFormats)) ?? false;
CUEToolsFormat format; CUEToolsFormat format;
CUEToolsUDC udcLossless, udcLossy, udcDecoder; CUEToolsUDC udcLossless, udcLossy, udcDecoder;
@@ -523,7 +517,7 @@ return processor.Go();
if (decoder == "" || !decoders.TryGetValue(extension, true, decoder, out udcDecoder)) if (decoder == "" || !decoders.TryGetValue(extension, true, decoder, out udcDecoder))
udcDecoder = decoders.GetDefault(extension, true); udcDecoder = decoders.GetDefault(extension, true);
if (!formats.TryGetValue(extension, out format)) if (!formats.TryGetValue(extension, out format))
formats.Add(extension, new CUEToolsFormat(extension, tagger, allowLossless, allowLossy, allowLossyWav, allowEmbed, false, udcLossless, udcLossy, udcDecoder)); formats.Add(extension, new CUEToolsFormat(extension, tagger, allowLossless, allowLossy, allowEmbed, false, udcLossless, udcLossy, udcDecoder));
else else
{ {
format.encoderLossless = udcLossless; format.encoderLossless = udcLossless;
@@ -534,7 +528,6 @@ return processor.Go();
format.tagger = tagger; format.tagger = tagger;
format.allowLossless = allowLossless; format.allowLossless = allowLossless;
format.allowLossy = allowLossy; format.allowLossy = allowLossy;
format.allowLossyWAV = allowLossyWav;
format.allowEmbed = allowEmbed; format.allowEmbed = allowEmbed;
} }
} }

5
CUETools.Processor/CUESheet.cs
View File

@@ -3876,9 +3876,8 @@ namespace CUETools.Processor
private IAudioDest GetAudioDest(string path, int finalSampleCount, int bps, int padding, bool noOutput) private IAudioDest GetAudioDest(string path, int finalSampleCount, int bps, int padding, bool noOutput)
{ {
var pcm = new AudioPCMConfig(bps, 2, 44100); var pcm = new AudioPCMConfig(bps, 2, 44100);
if (noOutput) string extension = Path.GetExtension(path).ToLower();
return new DummyWriter(path, new AudioEncoderSettings(pcm)); return AudioReadWrite.GetAudioDest(noOutput ? AudioEncoderType.NoAudio : _audioEncoderType, path, pcm, finalSampleCount, padding, extension, _config);
return AudioReadWrite.GetAudioDest(_audioEncoderType, path, finalSampleCount, padding, pcm, _config);
} }
internal IAudioSource GetAudioSource(int sourceIndex, bool pipe) internal IAudioSource GetAudioSource(int sourceIndex, bool pipe)

4
CUETools.Processor/CUETools.Processor.csproj
View File

@@ -140,10 +140,6 @@
<Project>{5ADCFD6D-BFEA-4B10-BB45-9083BBB56AF4}</Project> <Project>{5ADCFD6D-BFEA-4B10-BB45-9083BBB56AF4}</Project>
<Name>Freedb</Name> <Name>Freedb</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\CUETools.Codecs.LossyWAV\CUETools.Codecs.LossyWAV.csproj">
<Project>{8A0426FA-0BC2-4C49-A6E5-1F9A68156F19}</Project>
<Name>CUETools.Codecs.LossyWAV</Name>
</ProjectReference>
<ProjectReference Include="..\taglib-sharp\src\taglib-sharp.csproj"> <ProjectReference Include="..\taglib-sharp\src\taglib-sharp.csproj">
<Project>{6B143A39-C7B2-4743-9917-92262C60E9A6}</Project> <Project>{6B143A39-C7B2-4743-9917-92262C60E9A6}</Project>
<Name>taglib-sharp</Name> <Name>taglib-sharp</Name>

4
CUETools.Processor/CUEToolsFormat.cs
View File

@@ -7,7 +7,6 @@
CUEToolsTagger _tagger, CUEToolsTagger _tagger,
bool _allowLossless, bool _allowLossless,
bool _allowLossy, bool _allowLossy,
bool _allowLossyWAV,
bool _allowEmbed, bool _allowEmbed,
bool _builtin, bool _builtin,
CUEToolsUDC _encoderLossless, CUEToolsUDC _encoderLossless,
@@ -18,7 +17,6 @@
tagger = _tagger; tagger = _tagger;
allowLossless = _allowLossless; allowLossless = _allowLossless;
allowLossy = _allowLossy; allowLossy = _allowLossy;
allowLossyWAV = _allowLossyWAV;
allowEmbed = _allowEmbed; allowEmbed = _allowEmbed;
builtin = _builtin; builtin = _builtin;
encoderLossless = _encoderLossless; encoderLossless = _encoderLossless;
@@ -41,6 +39,6 @@
public CUEToolsUDC encoderLossy; public CUEToolsUDC encoderLossy;
public CUEToolsUDC decoder; public CUEToolsUDC decoder;
public CUEToolsTagger tagger; public CUEToolsTagger tagger;
public bool allowLossless, allowLossy, allowLossyWAV, allowEmbed, builtin; public bool allowLossless, allowLossy, allowEmbed, builtin;
} }
} }

14
CUETools/frmCUETools.Designer.cs generated
View File

@@ -63,7 +63,6 @@ namespace JDP {
this.comboBoxEncoder = new System.Windows.Forms.ComboBox(); this.comboBoxEncoder = new System.Windows.Forms.ComboBox();
this.radioButtonAudioNone = new System.Windows.Forms.RadioButton(); this.radioButtonAudioNone = new System.Windows.Forms.RadioButton();
this.radioButtonAudioLossy = new System.Windows.Forms.RadioButton(); this.radioButtonAudioLossy = new System.Windows.Forms.RadioButton();
this.radioButtonAudioHybrid = new System.Windows.Forms.RadioButton();
this.radioButtonAudioLossless = new System.Windows.Forms.RadioButton(); this.radioButtonAudioLossless = new System.Windows.Forms.RadioButton();
this.labelFormat = new System.Windows.Forms.Label(); this.labelFormat = new System.Windows.Forms.Label();
this.comboBoxAudioFormat = new System.Windows.Forms.ComboBox(); this.comboBoxAudioFormat = new System.Windows.Forms.ComboBox();
@@ -466,7 +465,6 @@ namespace JDP {
this.grpAudioOutput.Controls.Add(this.comboBoxEncoder); this.grpAudioOutput.Controls.Add(this.comboBoxEncoder);
this.grpAudioOutput.Controls.Add(this.radioButtonAudioNone); this.grpAudioOutput.Controls.Add(this.radioButtonAudioNone);
this.grpAudioOutput.Controls.Add(this.radioButtonAudioLossy); this.grpAudioOutput.Controls.Add(this.radioButtonAudioLossy);
this.grpAudioOutput.Controls.Add(this.radioButtonAudioHybrid);
this.grpAudioOutput.Controls.Add(this.radioButtonAudioLossless); this.grpAudioOutput.Controls.Add(this.radioButtonAudioLossless);
this.grpAudioOutput.Controls.Add(this.labelFormat); this.grpAudioOutput.Controls.Add(this.labelFormat);
this.grpAudioOutput.Controls.Add(this.comboBoxAudioFormat); this.grpAudioOutput.Controls.Add(this.comboBoxAudioFormat);
@@ -525,15 +523,6 @@ namespace JDP {
this.radioButtonAudioLossy.UseVisualStyleBackColor = true; this.radioButtonAudioLossy.UseVisualStyleBackColor = true;
this.radioButtonAudioLossy.CheckedChanged += new System.EventHandler(this.radioButtonAudioLossless_CheckedChanged); this.radioButtonAudioLossy.CheckedChanged += new System.EventHandler(this.radioButtonAudioLossless_CheckedChanged);
// //
// radioButtonAudioHybrid
//
resources.ApplyResources(this.radioButtonAudioHybrid, "radioButtonAudioHybrid");
this.radioButtonAudioHybrid.Name = "radioButtonAudioHybrid";
this.radioButtonAudioHybrid.TabStop = true;
this.toolTip1.SetToolTip(this.radioButtonAudioHybrid, resources.GetString("radioButtonAudioHybrid.ToolTip"));
this.radioButtonAudioHybrid.UseVisualStyleBackColor = true;
this.radioButtonAudioHybrid.CheckedChanged += new System.EventHandler(this.radioButtonAudioLossless_CheckedChanged);
//
// radioButtonAudioLossless // radioButtonAudioLossless
// //
resources.ApplyResources(this.radioButtonAudioLossless, "radioButtonAudioLossless"); resources.ApplyResources(this.radioButtonAudioLossless, "radioButtonAudioLossless");
@@ -1149,8 +1138,7 @@ namespace JDP {
private System.Windows.Forms.GroupBox groupBoxMode; private System.Windows.Forms.GroupBox groupBoxMode;
private System.Windows.Forms.ComboBox comboBoxScript; private System.Windows.Forms.ComboBox comboBoxScript;
private System.Windows.Forms.RadioButton radioButtonAudioNone; private System.Windows.Forms.RadioButton radioButtonAudioNone;
private System.Windows.Forms.RadioButton radioButtonAudioLossy; private System.Windows.Forms.RadioButton radioButtonAudioLossy;
private System.Windows.Forms.RadioButton radioButtonAudioHybrid;
private System.Windows.Forms.RadioButton radioButtonAudioLossless; private System.Windows.Forms.RadioButton radioButtonAudioLossless;
private System.Windows.Forms.ComboBox comboBoxEncoder; private System.Windows.Forms.ComboBox comboBoxEncoder;
private System.Windows.Forms.ToolStripContainer toolStripContainer1; private System.Windows.Forms.ToolStripContainer toolStripContainer1;

17
CUETools/frmCUETools.cs
View File

@@ -1537,8 +1537,6 @@ namespace JDP
if (comboBoxAudioFormat.SelectedItem == null) if (comboBoxAudioFormat.SelectedItem == null)
return null; return null;
string formatName = (string)comboBoxAudioFormat.SelectedItem; string formatName = (string)comboBoxAudioFormat.SelectedItem;
if (formatName.StartsWith("lossy."))
formatName = formatName.Substring(6);
return _profile._config.formats.TryGetValue(formatName, out fmt) ? fmt : null; return _profile._config.formats.TryGetValue(formatName, out fmt) ? fmt : null;
} }
} }
@@ -1549,7 +1547,6 @@ namespace JDP
{ {
return return
radioButtonAudioNone.Checked ? AudioEncoderType.NoAudio : radioButtonAudioNone.Checked ? AudioEncoderType.NoAudio :
radioButtonAudioHybrid.Checked ? AudioEncoderType.Hybrid :
radioButtonAudioLossy.Checked ? AudioEncoderType.Lossy : radioButtonAudioLossy.Checked ? AudioEncoderType.Lossy :
AudioEncoderType.Lossless; AudioEncoderType.Lossless;
} }
@@ -1561,10 +1558,6 @@ namespace JDP
radioButtonAudioNone.Checked = false; radioButtonAudioNone.Checked = false;
radioButtonAudioNone.Checked = true; radioButtonAudioNone.Checked = true;
break; break;
case AudioEncoderType.Hybrid:
radioButtonAudioHybrid.Checked = false;
radioButtonAudioHybrid.Checked = true;
break;
case AudioEncoderType.Lossy: case AudioEncoderType.Lossy:
radioButtonAudioLossy.Checked = false; radioButtonAudioLossy.Checked = false;
radioButtonAudioLossy.Checked = true; radioButtonAudioLossy.Checked = true;
@@ -2408,16 +2401,6 @@ namespace JDP
//continue; //continue;
comboBoxAudioFormat.Items.Add(format.Key); comboBoxAudioFormat.Items.Add(format.Key);
} }
foreach (KeyValuePair<string, CUEToolsFormat> format in _profile._config.formats)
{
if (!format.Value.allowLossyWAV)
continue;
if (SelectedOutputAudioType == AudioEncoderType.Lossless)
continue;
if (SelectedOutputAudioType == AudioEncoderType.NoAudio)
continue;
comboBoxAudioFormat.Items.Add("lossy." + format.Key);
}
switch (SelectedOutputAudioType) switch (SelectedOutputAudioType)
{ {
case AudioEncoderType.Lossless: case AudioEncoderType.Lossless:

41
CUETools/frmCUETools.resx
View File

@@ -1003,7 +1003,7 @@
<value>NoControl</value> <value>NoControl</value>
</data> </data>
<data name="radioButtonAudioNone.Location" type="System.Drawing.Point, System.Drawing"> <data name="radioButtonAudioNone.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 70</value> <value>10, 53</value>
</data> </data>
<data name="radioButtonAudioNone.Size" type="System.Drawing.Size, System.Drawing"> <data name="radioButtonAudioNone.Size" type="System.Drawing.Size, System.Drawing">
<value>50, 17</value> <value>50, 17</value>
@@ -1062,39 +1062,6 @@
<data name="&gt;&gt;radioButtonAudioLossy.ZOrder" xml:space="preserve"> <data name="&gt;&gt;radioButtonAudioLossy.ZOrder" xml:space="preserve">
<value>6</value> <value>6</value>
</data> </data>
<data name="radioButtonAudioHybrid.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="radioButtonAudioHybrid.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="radioButtonAudioHybrid.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 53</value>
</data>
<data name="radioButtonAudioHybrid.Size" type="System.Drawing.Size, System.Drawing">
<value>56, 17</value>
</data>
<data name="radioButtonAudioHybrid.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
</data>
<data name="radioButtonAudioHybrid.Text" xml:space="preserve">
<value>Hybrid</value>
</data>
<data name="radioButtonAudioHybrid.ToolTip" xml:space="preserve">
<value>Hybrid codecs</value>
</data>
<data name="&gt;&gt;radioButtonAudioHybrid.Name" xml:space="preserve">
<value>radioButtonAudioHybrid</value>
</data>
<data name="&gt;&gt;radioButtonAudioHybrid.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;radioButtonAudioHybrid.Parent" xml:space="preserve">
<value>grpAudioOutput</value>
</data>
<data name="&gt;&gt;radioButtonAudioHybrid.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="radioButtonAudioLossless.AutoSize" type="System.Boolean, mscorlib"> <data name="radioButtonAudioLossless.AutoSize" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</data> </data>
@@ -1126,7 +1093,7 @@
<value>grpAudioOutput</value> <value>grpAudioOutput</value>
</data> </data>
<data name="&gt;&gt;radioButtonAudioLossless.ZOrder" xml:space="preserve"> <data name="&gt;&gt;radioButtonAudioLossless.ZOrder" xml:space="preserve">
<value>8</value> <value>7</value>
</data> </data>
<data name="labelFormat.AutoSize" type="System.Boolean, mscorlib"> <data name="labelFormat.AutoSize" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
@@ -1156,7 +1123,7 @@
<value>grpAudioOutput</value> <value>grpAudioOutput</value>
</data> </data>
<data name="&gt;&gt;labelFormat.ZOrder" xml:space="preserve"> <data name="&gt;&gt;labelFormat.ZOrder" xml:space="preserve">
<value>9</value> <value>8</value>
</data> </data>
<data name="comboBoxAudioFormat.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> <data name="comboBoxAudioFormat.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value> <value>Top, Left, Right</value>
@@ -1183,7 +1150,7 @@
<value>grpAudioOutput</value> <value>grpAudioOutput</value>
</data> </data>
<data name="&gt;&gt;comboBoxAudioFormat.ZOrder" xml:space="preserve"> <data name="&gt;&gt;comboBoxAudioFormat.ZOrder" xml:space="preserve">
<value>10</value> <value>9</value>
</data> </data>
<data name="grpAudioOutput.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="grpAudioOutput.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>

49
CUETools/frmSettings.Designer.cs generated
View File

@@ -123,7 +123,6 @@ namespace JDP
this.labelFormatLossyEncoder = new System.Windows.Forms.Label(); this.labelFormatLossyEncoder = new System.Windows.Forms.Label();
this.checkBoxFormatAllowLossy = new System.Windows.Forms.CheckBox(); this.checkBoxFormatAllowLossy = new System.Windows.Forms.CheckBox();
this.comboFormatLosslessEncoder = new System.Windows.Forms.ComboBox(); this.comboFormatLosslessEncoder = new System.Windows.Forms.ComboBox();
this.checkBoxFormatSupportsLossyWAV = new System.Windows.Forms.CheckBox();
this.labelFormatLosslessEncoder = new System.Windows.Forms.Label(); this.labelFormatLosslessEncoder = new System.Windows.Forms.Label();
this.checkBoxFormatEmbedCUESheet = new System.Windows.Forms.CheckBox(); this.checkBoxFormatEmbedCUESheet = new System.Windows.Forms.CheckBox();
this.comboFormatDecoder = new System.Windows.Forms.ComboBox(); this.comboFormatDecoder = new System.Windows.Forms.ComboBox();
@@ -163,9 +162,6 @@ namespace JDP
this.labelDecoderExtension = new System.Windows.Forms.Label(); this.labelDecoderExtension = new System.Windows.Forms.Label();
this.listBoxDecoders = new System.Windows.Forms.ListBox(); this.listBoxDecoders = new System.Windows.Forms.ListBox();
this.tabPage4 = new System.Windows.Forms.TabPage(); this.tabPage4 = new System.Windows.Forms.TabPage();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.label1 = new System.Windows.Forms.Label();
this.numericLossyWAVQuality = new System.Windows.Forms.NumericUpDown();
this.grpHDCD = new System.Windows.Forms.GroupBox(); this.grpHDCD = new System.Windows.Forms.GroupBox();
this.chkHDCDDetect = new System.Windows.Forms.CheckBox(); this.chkHDCDDetect = new System.Windows.Forms.CheckBox();
this.tabPage5 = new System.Windows.Forms.TabPage(); this.tabPage5 = new System.Windows.Forms.TabPage();
@@ -220,8 +216,6 @@ namespace JDP
this.groupBoxExternalDecoder.SuspendLayout(); this.groupBoxExternalDecoder.SuspendLayout();
this.panel2.SuspendLayout(); this.panel2.SuspendLayout();
this.tabPage4.SuspendLayout(); this.tabPage4.SuspendLayout();
this.groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericLossyWAVQuality)).BeginInit();
this.grpHDCD.SuspendLayout(); this.grpHDCD.SuspendLayout();
this.tabPage5.SuspendLayout(); this.tabPage5.SuspendLayout();
this.groupBoxScriptConditions.SuspendLayout(); this.groupBoxScriptConditions.SuspendLayout();
@@ -979,7 +973,6 @@ namespace JDP
this.groupBoxFormat.Controls.Add(this.labelFormatLossyEncoder); this.groupBoxFormat.Controls.Add(this.labelFormatLossyEncoder);
this.groupBoxFormat.Controls.Add(this.checkBoxFormatAllowLossy); this.groupBoxFormat.Controls.Add(this.checkBoxFormatAllowLossy);
this.groupBoxFormat.Controls.Add(this.comboFormatLosslessEncoder); this.groupBoxFormat.Controls.Add(this.comboFormatLosslessEncoder);
this.groupBoxFormat.Controls.Add(this.checkBoxFormatSupportsLossyWAV);
this.groupBoxFormat.Controls.Add(this.labelFormatLosslessEncoder); this.groupBoxFormat.Controls.Add(this.labelFormatLosslessEncoder);
this.groupBoxFormat.Controls.Add(this.checkBoxFormatEmbedCUESheet); this.groupBoxFormat.Controls.Add(this.checkBoxFormatEmbedCUESheet);
this.groupBoxFormat.Controls.Add(this.comboFormatDecoder); this.groupBoxFormat.Controls.Add(this.comboFormatDecoder);
@@ -1016,12 +1009,6 @@ namespace JDP
resources.ApplyResources(this.comboFormatLosslessEncoder, "comboFormatLosslessEncoder"); resources.ApplyResources(this.comboFormatLosslessEncoder, "comboFormatLosslessEncoder");
this.comboFormatLosslessEncoder.Name = "comboFormatLosslessEncoder"; this.comboFormatLosslessEncoder.Name = "comboFormatLosslessEncoder";
// //
// checkBoxFormatSupportsLossyWAV
//
resources.ApplyResources(this.checkBoxFormatSupportsLossyWAV, "checkBoxFormatSupportsLossyWAV");
this.checkBoxFormatSupportsLossyWAV.Name = "checkBoxFormatSupportsLossyWAV";
this.checkBoxFormatSupportsLossyWAV.UseVisualStyleBackColor = true;
//
// labelFormatLosslessEncoder // labelFormatLosslessEncoder
// //
resources.ApplyResources(this.labelFormatLosslessEncoder, "labelFormatLosslessEncoder"); resources.ApplyResources(this.labelFormatLosslessEncoder, "labelFormatLosslessEncoder");
@@ -1309,40 +1296,11 @@ namespace JDP
// tabPage4 // tabPage4
// //
this.tabPage4.BackColor = System.Drawing.SystemColors.Control; this.tabPage4.BackColor = System.Drawing.SystemColors.Control;
this.tabPage4.Controls.Add(this.groupBox2);
this.tabPage4.Controls.Add(this.grpHDCD); this.tabPage4.Controls.Add(this.grpHDCD);
this.tabPage4.Controls.Add(this.chkHDCDDetect); this.tabPage4.Controls.Add(this.chkHDCDDetect);
resources.ApplyResources(this.tabPage4, "tabPage4"); resources.ApplyResources(this.tabPage4, "tabPage4");
this.tabPage4.Name = "tabPage4"; this.tabPage4.Name = "tabPage4";
// //
// groupBox2
//
this.groupBox2.Controls.Add(this.label1);
this.groupBox2.Controls.Add(this.numericLossyWAVQuality);
resources.ApplyResources(this.groupBox2, "groupBox2");
this.groupBox2.Name = "groupBox2";
this.groupBox2.TabStop = false;
//
// label1
//
resources.ApplyResources(this.label1, "label1");
this.label1.Name = "label1";
//
// numericLossyWAVQuality
//
resources.ApplyResources(this.numericLossyWAVQuality, "numericLossyWAVQuality");
this.numericLossyWAVQuality.Maximum = new decimal(new int[] {
10,
0,
0,
0});
this.numericLossyWAVQuality.Name = "numericLossyWAVQuality";
this.numericLossyWAVQuality.Value = new decimal(new int[] {
5,
0,
0,
0});
//
// grpHDCD // grpHDCD
// //
this.grpHDCD.Controls.Add(this.chkHDCD24bit); this.grpHDCD.Controls.Add(this.chkHDCD24bit);
@@ -1537,9 +1495,6 @@ namespace JDP
this.panel2.PerformLayout(); this.panel2.PerformLayout();
this.tabPage4.ResumeLayout(false); this.tabPage4.ResumeLayout(false);
this.tabPage4.PerformLayout(); this.tabPage4.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericLossyWAVQuality)).EndInit();
this.grpHDCD.ResumeLayout(false); this.grpHDCD.ResumeLayout(false);
this.grpHDCD.PerformLayout(); this.grpHDCD.PerformLayout();
this.tabPage5.ResumeLayout(false); this.tabPage5.ResumeLayout(false);
@@ -1609,9 +1564,6 @@ namespace JDP
private System.Windows.Forms.Label labelDecoderParameters; private System.Windows.Forms.Label labelDecoderParameters;
private System.Windows.Forms.Label labelDecoderPath; private System.Windows.Forms.Label labelDecoderPath;
private System.Windows.Forms.Label labelDecoderExtension; private System.Windows.Forms.Label labelDecoderExtension;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.NumericUpDown numericLossyWAVQuality;
private System.Windows.Forms.ColumnHeader columnHeader2; private System.Windows.Forms.ColumnHeader columnHeader2;
private System.Windows.Forms.Label labelFormatDefaultDecoder; private System.Windows.Forms.Label labelFormatDefaultDecoder;
private System.Windows.Forms.Label labelFormatLosslessEncoder; private System.Windows.Forms.Label labelFormatLosslessEncoder;
@@ -1626,7 +1578,6 @@ namespace JDP
private System.Windows.Forms.ComboBox comboBoxDecoderExtension; private System.Windows.Forms.ComboBox comboBoxDecoderExtension;
private System.Windows.Forms.Label labelFormatTagger; private System.Windows.Forms.Label labelFormatTagger;
private System.Windows.Forms.ComboBox comboBoxFormatTagger; private System.Windows.Forms.ComboBox comboBoxFormatTagger;
private System.Windows.Forms.CheckBox checkBoxFormatSupportsLossyWAV;
private System.Windows.Forms.CheckBox checkBoxFormatEmbedCUESheet; private System.Windows.Forms.CheckBox checkBoxFormatEmbedCUESheet;
private System.Windows.Forms.CheckBox checkBoxFormatAllowLossless; private System.Windows.Forms.CheckBox checkBoxFormatAllowLossless;
private System.Windows.Forms.GroupBox groupBoxFormat; private System.Windows.Forms.GroupBox groupBoxFormat;

7
CUETools/frmSettings.cs
View File

@@ -65,7 +65,6 @@ namespace JDP
chkCreateM3U.Checked = _config.createM3U; chkCreateM3U.Checked = _config.createM3U;
chkCreateCUEFileWhenEmbedded.Checked = _config.createCUEFileWhenEmbedded; chkCreateCUEFileWhenEmbedded.Checked = _config.createCUEFileWhenEmbedded;
chkTruncateExtra4206Samples.Checked = _config.truncate4608ExtraSamples; chkTruncateExtra4206Samples.Checked = _config.truncate4608ExtraSamples;
numericLossyWAVQuality.Value = _config.lossyWAVQuality;
chkHDCDLW16.Checked = _config.decodeHDCDtoLW16; chkHDCDLW16.Checked = _config.decodeHDCDtoLW16;
chkHDCD24bit.Checked = _config.decodeHDCDto24bit; chkHDCD24bit.Checked = _config.decodeHDCDto24bit;
chkOverwriteTags.Checked = _config.overwriteCUEData; chkOverwriteTags.Checked = _config.overwriteCUEData;
@@ -188,7 +187,6 @@ namespace JDP
rbGapsLeftOut.Checked ? CUEStyle.GapsLeftOut : rbGapsLeftOut.Checked ? CUEStyle.GapsLeftOut :
CUEStyle.GapsAppended; CUEStyle.GapsAppended;
_config.autoCorrectFilenames = chkAutoCorrectFilenames.Checked; _config.autoCorrectFilenames = chkAutoCorrectFilenames.Checked;
_config.lossyWAVQuality = (int)numericLossyWAVQuality.Value;
_config.fixOffsetMinimumTracksPercent = (uint)numFixWhenPercent.Value; _config.fixOffsetMinimumTracksPercent = (uint)numFixWhenPercent.Value;
_config.fixOffsetMinimumConfidence = (uint)numFixWhenConfidence.Value; _config.fixOffsetMinimumConfidence = (uint)numFixWhenConfidence.Value;
_config.encodeWhenPercent = (uint)numEncodeWhenPercent.Value; _config.encodeWhenPercent = (uint)numEncodeWhenPercent.Value;
@@ -341,7 +339,7 @@ namespace JDP
CUEToolsFormat format; CUEToolsFormat format;
if (_config.formats.TryGetValue("new", out format)) if (_config.formats.TryGetValue("new", out format))
return; return;
format = new CUEToolsFormat("new", CUEToolsTagger.TagLibSharp, true, true, false, false, false, null, null, null); format = new CUEToolsFormat("new", CUEToolsTagger.TagLibSharp, true, true, false, false, null, null, null);
_config.formats.Add("new", format); _config.formats.Add("new", format);
ListViewItem item = new ListViewItem(format.extension, "." + format.extension); ListViewItem item = new ListViewItem(format.extension, "." + format.extension);
item.Tag = format; item.Tag = format;
@@ -413,11 +411,9 @@ namespace JDP
checkBoxFormatEmbedCUESheet.Checked = format.allowEmbed; checkBoxFormatEmbedCUESheet.Checked = format.allowEmbed;
checkBoxFormatAllowLossless.Checked = format.allowLossless; checkBoxFormatAllowLossless.Checked = format.allowLossless;
checkBoxFormatAllowLossy.Checked = format.allowLossy; checkBoxFormatAllowLossy.Checked = format.allowLossy;
checkBoxFormatSupportsLossyWAV.Checked = format.allowLossyWAV;
comboBoxFormatTagger.Enabled = comboBoxFormatTagger.Enabled =
checkBoxFormatEmbedCUESheet.Enabled = checkBoxFormatEmbedCUESheet.Enabled =
checkBoxFormatSupportsLossyWAV.Enabled =
checkBoxFormatAllowLossless.Enabled = checkBoxFormatAllowLossless.Enabled =
checkBoxFormatAllowLossy.Enabled = checkBoxFormatAllowLossy.Enabled =
!format.builtin; !format.builtin;
@@ -439,7 +435,6 @@ namespace JDP
{ {
format.tagger = (CUEToolsTagger)comboBoxFormatTagger.SelectedItem; format.tagger = (CUEToolsTagger)comboBoxFormatTagger.SelectedItem;
format.allowEmbed = checkBoxFormatEmbedCUESheet.Checked; format.allowEmbed = checkBoxFormatEmbedCUESheet.Checked;
format.allowLossyWAV = checkBoxFormatSupportsLossyWAV.Checked;
format.allowLossless = checkBoxFormatAllowLossless.Checked; format.allowLossless = checkBoxFormatAllowLossless.Checked;
format.allowLossy = checkBoxFormatAllowLossy.Checked; format.allowLossy = checkBoxFormatAllowLossy.Checked;
} }

2685
CUETools/frmSettings.resx
View File

File diff suppressed because it is too large Load Diff