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

14
CUETools/frmCUETools.Designer.cs generated
View File

@@ -63,7 +63,6 @@ namespace JDP {
this.comboBoxEncoder = new System.Windows.Forms.ComboBox();
this.radioButtonAudioNone = 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.labelFormat = new System.Windows.Forms.Label();
this.comboBoxAudioFormat = new System.Windows.Forms.ComboBox();
@@ -466,7 +465,6 @@ namespace JDP {
this.grpAudioOutput.Controls.Add(this.comboBoxEncoder);
this.grpAudioOutput.Controls.Add(this.radioButtonAudioNone);
this.grpAudioOutput.Controls.Add(this.radioButtonAudioLossy);
this.grpAudioOutput.Controls.Add(this.radioButtonAudioHybrid);
this.grpAudioOutput.Controls.Add(this.radioButtonAudioLossless);
this.grpAudioOutput.Controls.Add(this.labelFormat);
this.grpAudioOutput.Controls.Add(this.comboBoxAudioFormat);
@@ -525,15 +523,6 @@ namespace JDP {
this.radioButtonAudioLossy.UseVisualStyleBackColor = true;
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
//
resources.ApplyResources(this.radioButtonAudioLossless, "radioButtonAudioLossless");
@@ -1149,8 +1138,7 @@ namespace JDP {
private System.Windows.Forms.GroupBox groupBoxMode;
private System.Windows.Forms.ComboBox comboBoxScript;
private System.Windows.Forms.RadioButton radioButtonAudioNone;
private System.Windows.Forms.RadioButton radioButtonAudioLossy;
private System.Windows.Forms.RadioButton radioButtonAudioHybrid;
private System.Windows.Forms.RadioButton radioButtonAudioLossy;
private System.Windows.Forms.RadioButton radioButtonAudioLossless;
private System.Windows.Forms.ComboBox comboBoxEncoder;
private System.Windows.Forms.ToolStripContainer toolStripContainer1;

17
CUETools/frmCUETools.cs
View File

@@ -1537,8 +1537,6 @@ namespace JDP
if (comboBoxAudioFormat.SelectedItem == null)
return null;
string formatName = (string)comboBoxAudioFormat.SelectedItem;
if (formatName.StartsWith("lossy."))
formatName = formatName.Substring(6);
return _profile._config.formats.TryGetValue(formatName, out fmt) ? fmt : null;
}
}
@@ -1549,7 +1547,6 @@ namespace JDP
{
return
radioButtonAudioNone.Checked ? AudioEncoderType.NoAudio :
radioButtonAudioHybrid.Checked ? AudioEncoderType.Hybrid :
radioButtonAudioLossy.Checked ? AudioEncoderType.Lossy :
AudioEncoderType.Lossless;
}
@@ -1561,10 +1558,6 @@ namespace JDP
radioButtonAudioNone.Checked = false;
radioButtonAudioNone.Checked = true;
break;
case AudioEncoderType.Hybrid:
radioButtonAudioHybrid.Checked = false;
radioButtonAudioHybrid.Checked = true;
break;
case AudioEncoderType.Lossy:
radioButtonAudioLossy.Checked = false;
radioButtonAudioLossy.Checked = true;
@@ -2408,16 +2401,6 @@ namespace JDP
//continue;
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)
{
case AudioEncoderType.Lossless:

41
CUETools/frmCUETools.resx
View File

@@ -1003,7 +1003,7 @@
<value>NoControl</value>
</data>
<data name="radioButtonAudioNone.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 70</value>
<value>10, 53</value>
</data>
<data name="radioButtonAudioNone.Size" type="System.Drawing.Size, System.Drawing">
<value>50, 17</value>
@@ -1062,39 +1062,6 @@
<data name="&gt;&gt;radioButtonAudioLossy.ZOrder" xml:space="preserve">
<value>6</value>
</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">
<value>True</value>
</data>
@@ -1126,7 +1093,7 @@
<value>grpAudioOutput</value>
</data>
<data name="&gt;&gt;radioButtonAudioLossless.ZOrder" xml:space="preserve">
<value>8</value>
<value>7</value>
</data>
<data name="labelFormat.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -1156,7 +1123,7 @@
<value>grpAudioOutput</value>
</data>
<data name="&gt;&gt;labelFormat.ZOrder" xml:space="preserve">
<value>9</value>
<value>8</value>
</data>
<data name="comboBoxAudioFormat.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -1183,7 +1150,7 @@
<value>grpAudioOutput</value>
</data>
<data name="&gt;&gt;comboBoxAudioFormat.ZOrder" xml:space="preserve">
<value>10</value>
<value>9</value>
</data>
<data name="grpAudioOutput.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<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.checkBoxFormatAllowLossy = new System.Windows.Forms.CheckBox();
this.comboFormatLosslessEncoder = new System.Windows.Forms.ComboBox();
this.checkBoxFormatSupportsLossyWAV = new System.Windows.Forms.CheckBox();
this.labelFormatLosslessEncoder = new System.Windows.Forms.Label();
this.checkBoxFormatEmbedCUESheet = new System.Windows.Forms.CheckBox();
this.comboFormatDecoder = new System.Windows.Forms.ComboBox();
@@ -163,9 +162,6 @@ namespace JDP
this.labelDecoderExtension = new System.Windows.Forms.Label();
this.listBoxDecoders = new System.Windows.Forms.ListBox();
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.chkHDCDDetect = new System.Windows.Forms.CheckBox();
this.tabPage5 = new System.Windows.Forms.TabPage();
@@ -220,8 +216,6 @@ namespace JDP
this.groupBoxExternalDecoder.SuspendLayout();
this.panel2.SuspendLayout();
this.tabPage4.SuspendLayout();
this.groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericLossyWAVQuality)).BeginInit();
this.grpHDCD.SuspendLayout();
this.tabPage5.SuspendLayout();
this.groupBoxScriptConditions.SuspendLayout();
@@ -979,7 +973,6 @@ namespace JDP
this.groupBoxFormat.Controls.Add(this.labelFormatLossyEncoder);
this.groupBoxFormat.Controls.Add(this.checkBoxFormatAllowLossy);
this.groupBoxFormat.Controls.Add(this.comboFormatLosslessEncoder);
this.groupBoxFormat.Controls.Add(this.checkBoxFormatSupportsLossyWAV);
this.groupBoxFormat.Controls.Add(this.labelFormatLosslessEncoder);
this.groupBoxFormat.Controls.Add(this.checkBoxFormatEmbedCUESheet);
this.groupBoxFormat.Controls.Add(this.comboFormatDecoder);
@@ -1016,12 +1009,6 @@ namespace JDP
resources.ApplyResources(this.comboFormatLosslessEncoder, "comboFormatLosslessEncoder");
this.comboFormatLosslessEncoder.Name = "comboFormatLosslessEncoder";
//
// checkBoxFormatSupportsLossyWAV
//
resources.ApplyResources(this.checkBoxFormatSupportsLossyWAV, "checkBoxFormatSupportsLossyWAV");
this.checkBoxFormatSupportsLossyWAV.Name = "checkBoxFormatSupportsLossyWAV";
this.checkBoxFormatSupportsLossyWAV.UseVisualStyleBackColor = true;
//
// labelFormatLosslessEncoder
//
resources.ApplyResources(this.labelFormatLosslessEncoder, "labelFormatLosslessEncoder");
@@ -1309,40 +1296,11 @@ namespace JDP
// tabPage4
//
this.tabPage4.BackColor = System.Drawing.SystemColors.Control;
this.tabPage4.Controls.Add(this.groupBox2);
this.tabPage4.Controls.Add(this.grpHDCD);
this.tabPage4.Controls.Add(this.chkHDCDDetect);
resources.ApplyResources(this.tabPage4, "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
//
this.grpHDCD.Controls.Add(this.chkHDCD24bit);
@@ -1537,9 +1495,6 @@ namespace JDP
this.panel2.PerformLayout();
this.tabPage4.ResumeLayout(false);
this.tabPage4.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericLossyWAVQuality)).EndInit();
this.grpHDCD.ResumeLayout(false);
this.grpHDCD.PerformLayout();
this.tabPage5.ResumeLayout(false);
@@ -1609,9 +1564,6 @@ namespace JDP
private System.Windows.Forms.Label labelDecoderParameters;
private System.Windows.Forms.Label labelDecoderPath;
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.Label labelFormatDefaultDecoder;
private System.Windows.Forms.Label labelFormatLosslessEncoder;
@@ -1626,7 +1578,6 @@ namespace JDP
private System.Windows.Forms.ComboBox comboBoxDecoderExtension;
private System.Windows.Forms.Label labelFormatTagger;
private System.Windows.Forms.ComboBox comboBoxFormatTagger;
private System.Windows.Forms.CheckBox checkBoxFormatSupportsLossyWAV;
private System.Windows.Forms.CheckBox checkBoxFormatEmbedCUESheet;
private System.Windows.Forms.CheckBox checkBoxFormatAllowLossless;
private System.Windows.Forms.GroupBox groupBoxFormat;

7
CUETools/frmSettings.cs
View File

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

2685
CUETools/frmSettings.resx
View File

File diff suppressed because it is too large Load Diff