This commit is contained in:
chudov
2009-08-06 13:03:02 +00:00
parent f0c0167ef0
commit 8f9a7b9e1e
25 changed files with 6067 additions and 3775 deletions

View File

@@ -27,6 +27,7 @@ using System.Drawing;
using System.Data;
using System.Text;
using System.Windows.Forms;
using System.Windows.Forms.Design;
using System.IO;
namespace CUEControls
@@ -402,4 +403,19 @@ namespace CUEControls
public TreeNode node;
public FileSystemInfo[] files;
}
[ToolStripItemDesignerAvailability(ToolStripItemDesignerAvailability.ToolStrip | ToolStripItemDesignerAvailability.StatusStrip)]
public partial class ToolStripCheckedBox : ToolStripControlHost
{
public ToolStripCheckedBox()
: base(new CheckBox())
{
}
[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
public CheckBox MyCheckBox
{
get { return (CheckBox)this.Control; }
}
}
}

View File

@@ -736,16 +736,16 @@ namespace CUERipper
if (SelectedOutputAudioFmt == null)
return;
foreach (KeyValuePair<string, CUEToolsUDC> encoder in _config.encoders)
if (encoder.Value.extension == SelectedOutputAudioFmt.extension)
foreach (CUEToolsUDC encoder in _config.encoders)
if (encoder.extension == SelectedOutputAudioFmt.extension)
{
if (SelectedOutputAudioFormat.StartsWith("lossy.") && !encoder.Value.lossless)
if (SelectedOutputAudioFormat.StartsWith("lossy.") && !encoder.lossless)
continue;
else if (SelectedOutputAudioType == AudioEncoderType.Lossless && !encoder.Value.lossless)
else if (SelectedOutputAudioType == AudioEncoderType.Lossless && !encoder.lossless)
continue;
else if (SelectedOutputAudioType == AudioEncoderType.Lossy && encoder.Value.lossless)
else if (SelectedOutputAudioType == AudioEncoderType.Lossy && encoder.lossless)
continue;
comboBoxEncoder.Items.Add(encoder.Key);
comboBoxEncoder.Items.Add(encoder);
}
comboBoxEncoder.SelectedItem = SelectedOutputAudioFormat.StartsWith("lossy.") ? SelectedOutputAudioFmt.encoderLossless
: SelectedOutputAudioType == AudioEncoderType.Lossless ? SelectedOutputAudioFmt.encoderLossless
@@ -757,12 +757,13 @@ namespace CUERipper
{
if (SelectedOutputAudioFormat == null)
return;
CUEToolsUDC encoder = comboBoxEncoder.SelectedItem as CUEToolsUDC;
if (SelectedOutputAudioFormat.StartsWith("lossy."))
SelectedOutputAudioFmt.encoderLossless = (string)comboBoxEncoder.SelectedItem;
SelectedOutputAudioFmt.encoderLossless = encoder;
else if (SelectedOutputAudioType == AudioEncoderType.Lossless)
SelectedOutputAudioFmt.encoderLossless = (string)comboBoxEncoder.SelectedItem;
SelectedOutputAudioFmt.encoderLossless = encoder;
else
SelectedOutputAudioFmt.encoderLossy = (string)comboBoxEncoder.SelectedItem;
SelectedOutputAudioFmt.encoderLossy = encoder;
}
}

View File

@@ -148,7 +148,7 @@
<value>0, 443</value>
</metadata>
<data name="toolStripStatusLabel1.Size" type="System.Drawing.Size, System.Drawing">
<value>260, 17</value>
<value>229, 17</value>
</data>
<data name="toolStripStatusLabel1.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
@@ -230,27 +230,6 @@
<data name="listTracks.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="listTracks.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 60</value>
</data>
<data name="listTracks.Size" type="System.Drawing.Size, System.Drawing">
<value>487, 272</value>
</data>
<data name="listTracks.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;listTracks.Name" xml:space="preserve">
<value>listTracks</value>
</data>
<data name="&gt;&gt;listTracks.Type" xml:space="preserve">
<value>System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;listTracks.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;listTracks.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="Title.DisplayIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
@@ -281,6 +260,27 @@
<data name="Length.Width" type="System.Int32, mscorlib">
<value>70</value>
</data>
<data name="listTracks.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 60</value>
</data>
<data name="listTracks.Size" type="System.Drawing.Size, System.Drawing">
<value>487, 272</value>
</data>
<data name="listTracks.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;listTracks.Name" xml:space="preserve">
<value>listTracks</value>
</data>
<data name="&gt;&gt;listTracks.Type" xml:space="preserve">
<value>System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;listTracks.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;listTracks.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="buttonGo.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
@@ -446,6 +446,12 @@
<metadata name="contextMenuStripRelease.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>285, 58</value>
</metadata>
<data name="editToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>94, 22</value>
</data>
<data name="editToolStripMenuItem.Text" xml:space="preserve">
<value>Edit</value>
</data>
<data name="contextMenuStripRelease.Size" type="System.Drawing.Size, System.Drawing">
<value>95, 26</value>
</data>
@@ -476,12 +482,6 @@
<data name="&gt;&gt;comboRelease.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="editToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>94, 22</value>
</data>
<data name="editToolStripMenuItem.Text" xml:space="preserve">
<value>Edit</value>
</data>
<data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>181, 22</value>
</data>

View File

@@ -478,30 +478,18 @@ All the other CRC's in this offset range are calculated by consequently adding s
uint count = 0;
uint partials = 0;
uint conf = 0;
string pressings = "";
string partpressings = "";
for (int di = 0; di < (int)AccDisks.Count; di++)
{
count += AccDisks[di].tracks[iTrack].count;
if (CRC(iTrack, oi) == AccDisks[di].tracks[iTrack].CRC)
{
conf += AccDisks[di].tracks[iTrack].count;
if (pressings != "")
pressings = pressings + ",";
pressings = pressings + (di + 1).ToString();
}
if (CRC450(iTrack, oi) == AccDisks[di].tracks[iTrack].Frame450CRC)
{
partials += AccDisks[di].tracks[iTrack].count;
if (partpressings != "")
partpressings = partpressings + ",";
partpressings = partpressings + (di + 1).ToString();
}
}
if (conf > 0)
sw.WriteLine(String.Format(" {0:00}\t[{1:x8}] ({3:00}/{2:00}) Accurately ripped as in pressing(s) #{4}", iTrack + 1, CRC(iTrack, oi), count, conf, pressings));
sw.WriteLine(String.Format(" {0:00}\t[{1:x8}] ({3:00}/{2:00}) Accurately ripped", iTrack + 1, CRC(iTrack, oi), count, conf));
else if (partials > 0)
sw.WriteLine(String.Format(" {0:00}\t[{1:x8}] ({3:00}/{2:00}) Partial match to pressing(s) #{4} ", iTrack + 1, CRC(iTrack, oi), count, partials, partpressings));
sw.WriteLine(String.Format(" {0:00}\t[{1:x8}] ({3:00}/{2:00}) Partial match", iTrack + 1, CRC(iTrack, oi), count, partials));
else
sw.WriteLine(String.Format(" {0:00}\t[{1:x8}] (00/{2:00}) No matches", iTrack + 1, CRC(iTrack, oi), count));
}
@@ -533,14 +521,42 @@ All the other CRC's in this offset range are calculated by consequently adding s
uint matches = 0;
for (int iTrack = 0; iTrack < _toc.AudioTracks; iTrack++)
for (int di = 0; di < (int)AccDisks.Count; di++)
if ((CRC(iTrack, oi) == AccDisks[di].tracks[iTrack].CRC && AccDisks[di].tracks[iTrack].CRC != 0) ||
(CRC450(iTrack, oi) == AccDisks[di].tracks[iTrack].Frame450CRC && AccDisks[di].tracks[iTrack].Frame450CRC != 0))
if ((CRC(iTrack, oi) == AccDisks[di].tracks[iTrack].CRC && AccDisks[di].tracks[iTrack].CRC != 0))
{
matches++;
if (matches != 0 && oi != 0)
break;
}
if (matches == _toc.AudioTracks && oi != 0)
{
if (offsets_match++ > 10)
if (offsets_match++ > 16)
{
sw.WriteLine("More than 10 offsets match!");
sw.WriteLine("More than 16 offsets match!");
break;
}
sw.WriteLine("Offsetted by {0}:", oi);
GenerateLog(sw, oi);
}
}
offsets_match = 0;
for (int oi = -_arOffsetRange; oi <= _arOffsetRange; oi++)
{
uint matches = 0, partials = 0;
for (int iTrack = 0; iTrack < _toc.AudioTracks; iTrack++)
for (int di = 0; di < (int)AccDisks.Count; di++)
{
if ((CRC(iTrack, oi) == AccDisks[di].tracks[iTrack].CRC && AccDisks[di].tracks[iTrack].CRC != 0))
{
matches ++;
break;
}
if ((CRC450(iTrack, oi) == AccDisks[di].tracks[iTrack].Frame450CRC && AccDisks[di].tracks[iTrack].Frame450CRC != 0))
partials++;
}
if (matches != _toc.AudioTracks && oi != 0 && matches + partials != 0)
{
if (offsets_match++ > 16)
{
sw.WriteLine("More than 16 offsets match!");
break;
}
sw.WriteLine("Offsetted by {0}:", oi);
@@ -554,9 +570,8 @@ All the other CRC's in this offset range are calculated by consequently adding s
for (int iTrack = 0; iTrack < _toc.AudioTracks; iTrack++)
{
uint total = Total(iTrack);
uint conf = 0, part = 0;
uint conf = 0;
bool zeroOffset = false;
//string pressings = "";
StringBuilder pressings = new StringBuilder();
for (int oi = -_arOffsetRange; oi <= _arOffsetRange; oi++)
for (int iDisk = 0; iDisk < AccDisks.Count; iDisk++)
@@ -568,20 +583,15 @@ All the other CRC's in this offset range are calculated by consequently adding s
zeroOffset = true;
pressings.AppendFormat("{0}{1}({2})", pressings.Length > 0 ? "," : "", oi, AccDisks[iDisk].tracks[iTrack].count);
}
else if (CRC450(iTrack, oi) == AccDisks[iDisk].tracks[iTrack].Frame450CRC && (AccDisks[iDisk].tracks[iTrack].Frame450CRC != 0 || oi == 0))
{
part += AccDisks[iDisk].tracks[iTrack].count;
pressings.AppendFormat("{0}{1}({2})", pressings.Length > 0 ? "," : "", oi, AccDisks[iDisk].tracks[iTrack].count);
}
}
if (conf > 0 && zeroOffset)
if (conf > 0 && zeroOffset && pressings.Length == 0)
sw.WriteLine(String.Format(" {0:00}\t ({2:00}/{1:00}) Accurately ripped", iTrack + 1, total, conf));
else if (conf > 0 && zeroOffset)
sw.WriteLine(String.Format(" {0:00}\t ({2:00}/{1:00}) Accurately ripped, all offset(s) {3}", iTrack + 1, total, conf, pressings));
else if (conf > 0)
sw.WriteLine(String.Format(" {0:00}\t ({2:00}/{1:00}) Accurately ripped with offset(s) {3}", iTrack + 1, total, conf, pressings));
else if (part > 0)
sw.WriteLine(String.Format(" {0:00}\t ({2:00}/{1:00}) NOT ACCURATE even with offset(s) {3}", iTrack + 1, total, part, pressings));
else if (total > 0)
sw.WriteLine(String.Format(" {0:00}\t (00/{1:00}) No matches", iTrack + 1, total));
sw.WriteLine(String.Format(" {0:00}\t (00/{1:00}) NOT ACCURATE", iTrack + 1, total));
else
sw.WriteLine(String.Format(" {0:00}\t (00/00) Track not present in database", iTrack + 1));
}

View File

@@ -81,11 +81,10 @@ namespace CUETools.Processor
CUEToolsFormat fmt;
if (!extension.StartsWith(".") || !config.formats.TryGetValue(extension.Substring(1), out fmt))
throw new Exception("Unsupported audio type: " + path);
string encoderName = audioEncoderType == AudioEncoderType.Lossless ? fmt.encoderLossless :
CUEToolsUDC encoder = audioEncoderType == AudioEncoderType.Lossless ? fmt.encoderLossless :
audioEncoderType == AudioEncoderType.Lossy ? fmt.encoderLossy :
null;
CUEToolsUDC encoder;
if (encoderName == null || !config.encoders.TryGetValue(encoderName, out encoder))
if (encoder == null)
throw new Exception("Unsupported audio type: " + path);
switch (encoder.className)
{

File diff suppressed because it is too large Load Diff

View File

@@ -41,6 +41,10 @@ namespace CUETools.Processor
this.textCatalog = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.labelCD = new System.Windows.Forms.Label();
this.textBoxDiscNumber = new System.Windows.Forms.TextBox();
this.textBoxTotalDiscs = new System.Windows.Forms.TextBox();
this.labelSlash = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// textArtist
@@ -108,12 +112,36 @@ namespace CUETools.Processor
resources.ApplyResources(this.label5, "label5");
this.label5.Name = "label5";
//
// labelCD
//
resources.ApplyResources(this.labelCD, "labelCD");
this.labelCD.Name = "labelCD";
//
// textBoxDiscNumber
//
resources.ApplyResources(this.textBoxDiscNumber, "textBoxDiscNumber");
this.textBoxDiscNumber.Name = "textBoxDiscNumber";
//
// textBoxTotalDiscs
//
resources.ApplyResources(this.textBoxTotalDiscs, "textBoxTotalDiscs");
this.textBoxTotalDiscs.Name = "textBoxTotalDiscs";
//
// labelSlash
//
resources.ApplyResources(this.labelSlash, "labelSlash");
this.labelSlash.Name = "labelSlash";
//
// frmProperties
//
this.AcceptButton = this.button1;
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.button2;
this.Controls.Add(this.labelSlash);
this.Controls.Add(this.textBoxTotalDiscs);
this.Controls.Add(this.textBoxDiscNumber);
this.Controls.Add(this.labelCD);
this.Controls.Add(this.label5);
this.Controls.Add(this.label4);
this.Controls.Add(this.textCatalog);
@@ -148,5 +176,9 @@ namespace CUETools.Processor
private System.Windows.Forms.TextBox textCatalog;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label labelCD;
private System.Windows.Forms.TextBox textBoxDiscNumber;
private System.Windows.Forms.TextBox textBoxTotalDiscs;
private System.Windows.Forms.Label labelSlash;
}
}

View File

@@ -23,6 +23,8 @@ namespace CUETools.Processor
textYear.Text = _cueSheet.Year;
textGenre.Text = _cueSheet.Genre;
textCatalog.Text = _cueSheet.Catalog;
textBoxDiscNumber.Text = _cueSheet.DiscNumber;
textBoxTotalDiscs.Text = _cueSheet.TotalDiscs;
}
public CUESheet CUE
@@ -41,11 +43,16 @@ namespace CUETools.Processor
private void button1_Click(object sender, EventArgs e)
{
foreach (TrackInfo track in _cueSheet.Tracks)
if (track.Artist == _cueSheet.Artist)
track.Artist = textArtist.Text;
_cueSheet.Artist = textArtist.Text;
_cueSheet.Title = textTitle.Text;
_cueSheet.Year = textYear.Text;
_cueSheet.Genre = textGenre.Text;
_cueSheet.Catalog = textCatalog.Text;
_cueSheet.DiscNumber = textBoxDiscNumber.Text;
_cueSheet.TotalDiscs = textBoxTotalDiscs.Text;
}
}
}

View File

@@ -126,7 +126,7 @@
<value>48, 12</value>
</data>
<data name="textArtist.Size" type="System.Drawing.Size, System.Drawing">
<value>374, 20</value>
<value>375, 20</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="textArtist.TabIndex" type="System.Int32, mscorlib">
@@ -142,7 +142,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;textArtist.ZOrder" xml:space="preserve">
<value>11</value>
<value>15</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -169,7 +169,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
<value>10</value>
<value>14</value>
</data>
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -199,7 +199,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
<value>8</value>
<value>12</value>
</data>
<data name="textTitle.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -208,7 +208,7 @@
<value>48, 38</value>
</data>
<data name="textTitle.Size" type="System.Drawing.Size, System.Drawing">
<value>374, 20</value>
<value>375, 20</value>
</data>
<data name="textTitle.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -223,7 +223,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;textTitle.ZOrder" xml:space="preserve">
<value>9</value>
<value>13</value>
</data>
<data name="button1.Location" type="System.Drawing.Point, System.Drawing">
<value>347, 90</value>
@@ -247,7 +247,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;button1.ZOrder" xml:space="preserve">
<value>7</value>
<value>11</value>
</data>
<data name="button2.Location" type="System.Drawing.Point, System.Drawing">
<value>266, 90</value>
@@ -271,7 +271,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;button2.ZOrder" xml:space="preserve">
<value>6</value>
<value>10</value>
</data>
<data name="label3.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -298,7 +298,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
<value>5</value>
<value>9</value>
</data>
<data name="textYear.Location" type="System.Drawing.Point, System.Drawing">
<value>48, 64</value>
@@ -319,7 +319,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;textYear.ZOrder" xml:space="preserve">
<value>4</value>
<value>8</value>
</data>
<data name="textGenre.Location" type="System.Drawing.Point, System.Drawing">
<value>163, 64</value>
@@ -340,7 +340,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;textGenre.ZOrder" xml:space="preserve">
<value>3</value>
<value>7</value>
</data>
<data name="textCatalog.Location" type="System.Drawing.Point, System.Drawing">
<value>318, 64</value>
@@ -361,7 +361,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;textCatalog.ZOrder" xml:space="preserve">
<value>2</value>
<value>6</value>
</data>
<data name="label4.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -388,7 +388,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
<value>1</value>
<value>5</value>
</data>
<data name="label5.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -415,6 +415,102 @@
<value>$this</value>
</data>
<data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="labelCD.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="labelCD.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 95</value>
</data>
<data name="labelCD.Size" type="System.Drawing.Size, System.Drawing">
<value>22, 13</value>
</data>
<data name="labelCD.TabIndex" type="System.Int32, mscorlib">
<value>16</value>
</data>
<data name="labelCD.Text" xml:space="preserve">
<value>CD</value>
</data>
<data name="&gt;&gt;labelCD.Name" xml:space="preserve">
<value>labelCD</value>
</data>
<data name="&gt;&gt;labelCD.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;labelCD.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;labelCD.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="textBoxDiscNumber.Location" type="System.Drawing.Point, System.Drawing">
<value>48, 92</value>
</data>
<data name="textBoxDiscNumber.Size" type="System.Drawing.Size, System.Drawing">
<value>50, 20</value>
</data>
<data name="textBoxDiscNumber.TabIndex" type="System.Int32, mscorlib">
<value>17</value>
</data>
<data name="&gt;&gt;textBoxDiscNumber.Name" xml:space="preserve">
<value>textBoxDiscNumber</value>
</data>
<data name="&gt;&gt;textBoxDiscNumber.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBoxDiscNumber.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;textBoxDiscNumber.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="textBoxTotalDiscs.Location" type="System.Drawing.Point, System.Drawing">
<value>125, 92</value>
</data>
<data name="textBoxTotalDiscs.Size" type="System.Drawing.Size, System.Drawing">
<value>50, 20</value>
</data>
<data name="textBoxTotalDiscs.TabIndex" type="System.Int32, mscorlib">
<value>18</value>
</data>
<data name="&gt;&gt;textBoxTotalDiscs.Name" xml:space="preserve">
<value>textBoxTotalDiscs</value>
</data>
<data name="&gt;&gt;textBoxTotalDiscs.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBoxTotalDiscs.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;textBoxTotalDiscs.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="labelSlash.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="labelSlash.Location" type="System.Drawing.Point, System.Drawing">
<value>107, 95</value>
</data>
<data name="labelSlash.Size" type="System.Drawing.Size, System.Drawing">
<value>12, 13</value>
</data>
<data name="labelSlash.TabIndex" type="System.Int32, mscorlib">
<value>19</value>
</data>
<data name="labelSlash.Text" xml:space="preserve">
<value>/</value>
</data>
<data name="&gt;&gt;labelSlash.Name" xml:space="preserve">
<value>labelSlash</value>
</data>
<data name="&gt;&gt;labelSlash.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;labelSlash.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;labelSlash.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -424,7 +520,7 @@
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>434, 120</value>
<value>435, 127</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterParent</value>

View File

@@ -279,10 +279,21 @@
</ItemGroup>
<ItemGroup>
<None Include="CUETools_TemporaryKey.pfx" />
<None Include="Properties\DataSources\CUETools.Processor.CUEConfig.datasource" />
<None Include="Resources\accuraterip.jpg" />
<Content Include="cue2.ico" />
<Content Include="hdcd.dll">
</Content>
<None Include="Resources\freedb16.png" />
<None Include="Resources\more\icons\report.png" />
<None Include="Resources\report.png" />
<None Include="Resources\more\icons\world_go.png" />
<None Include="Resources\world_go.png" />
<None Include="Resources\disk.png" />
<None Include="Resources\find.png" />
<None Include="Resources\link_go.png" />
<None Include="Resources\basket.png" />
<None Include="Resources\delete.png" />
<Content Include="unrar.dll">
</Content>
<Content Include="Resources\accuraterip_16.bmp" />

View File

@@ -227,8 +227,8 @@ Global
{4911BD82-49EF-4858-8B51-5394F86739A4}.Release|Any CPU.Build.0 = Release|Any CPU
{4911BD82-49EF-4858-8B51-5394F86739A4}.Release|Mixed Platforms.ActiveCfg = Release|x64
{4911BD82-49EF-4858-8B51-5394F86739A4}.Release|Mixed Platforms.Build.0 = Release|x64
{4911BD82-49EF-4858-8B51-5394F86739A4}.Release|x64.ActiveCfg = Release|x64
{4911BD82-49EF-4858-8B51-5394F86739A4}.Release|x64.Build.0 = Release|x64
{4911BD82-49EF-4858-8B51-5394F86739A4}.Release|x64.ActiveCfg = Release|Any CPU
{4911BD82-49EF-4858-8B51-5394F86739A4}.Release|x64.Build.0 = Release|Any CPU
{4911BD82-49EF-4858-8B51-5394F86739A4}.Release|x86.ActiveCfg = Release|x86
{4911BD82-49EF-4858-8B51-5394F86739A4}.Release|x86.Build.0 = Release|x86
{32338A04-5B6B-4C63-8EE7-C6400F73B5D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

View File

@@ -14,14 +14,12 @@ namespace JDP {
[STAThread]
static void Main(string[] args)
{
if (args.Length > 1 && (args[0] == "/verify" || args[0] == "/convert"))
if (args.Length > 1 && args[0].Length > 1 && args[0][0] == '/')
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
frmBatch batch = new frmBatch();
batch.AccurateRip =
args[0] == "/convert" ? CUEAction.VerifyAndConvert :
CUEAction.Verify;
batch.Profile = args[0].Substring(1);
if (args.Length == 2 && args[1][0] != '@')
batch.InputPath = args[1];

View File

@@ -60,13 +60,6 @@ namespace JDP.Properties {
}
}
internal static System.Drawing.Bitmap accuraterip {
get {
object obj = ResourceManager.GetObject("accuraterip", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap accuraterip16 {
get {
object obj = ResourceManager.GetObject("accuraterip16", resourceCulture);
@@ -88,6 +81,13 @@ namespace JDP.Properties {
}
}
internal static System.Drawing.Bitmap basket {
get {
object obj = ResourceManager.GetObject("basket", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap cog {
get {
object obj = ResourceManager.GetObject("cog", resourceCulture);
@@ -116,6 +116,27 @@ namespace JDP.Properties {
}
}
internal static System.Drawing.Bitmap delete {
get {
object obj = ResourceManager.GetObject("delete", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap disk {
get {
object obj = ResourceManager.GetObject("disk", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap find {
get {
object obj = ResourceManager.GetObject("find", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap flac {
get {
object obj = ResourceManager.GetObject("flac", resourceCulture);
@@ -179,6 +200,13 @@ namespace JDP.Properties {
}
}
internal static System.Drawing.Bitmap freedb16 {
get {
object obj = ResourceManager.GetObject("freedb16", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized string similar to &amp;Go.
/// </summary>
@@ -209,6 +237,13 @@ namespace JDP.Properties {
}
}
internal static System.Drawing.Bitmap link_go {
get {
object obj = ResourceManager.GetObject("link_go", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Icon mp3 {
get {
object obj = ResourceManager.GetObject("mp3", resourceCulture);
@@ -237,6 +272,13 @@ namespace JDP.Properties {
}
}
internal static System.Drawing.Bitmap report {
get {
object obj = ResourceManager.GetObject("report", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap settings {
get {
object obj = ResourceManager.GetObject("settings", resourceCulture);
@@ -283,6 +325,13 @@ namespace JDP.Properties {
}
}
internal static System.Drawing.Bitmap world_go {
get {
object obj = ResourceManager.GetObject("world_go", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap wv {
get {
object obj = ResourceManager.GetObject("wv", resourceCulture);

View File

@@ -118,103 +118,124 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="accuraterip16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\accuraterip_16.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ipod_sound" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ipod_sound.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="wv1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wv.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Stop" xml:space="preserve">
<value>Stop</value>
</data>
<data name="musicbrainz" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\musicbrainz.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Go" xml:space="preserve">
<value>&amp;Go</value>
</data>
<data name="Verify" xml:space="preserve">
<value>Verify</value>
</data>
<data name="cog" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cog.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="wav" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wav.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="settings" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\settings.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="wave" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wave.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="freedb1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\freedb.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="cue" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cue.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="AR" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\AR.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="freedb16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\freedb16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="wv" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon-wv.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="accuraterip" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\accuraterip.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="flac1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\flac.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="AR" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\AR.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="info2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\info2.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ape" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ape.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="find" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\find.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="musicbrainz1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\musicbrainz.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="tta" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\tta.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="cog" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cog.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="flac" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\flac.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="flac1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\flac.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="freedb" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\freedb.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="information" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="cue2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cue2.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="cue3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cue3.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="mp3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\mp3.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ogg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ogg.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\more\icons\folder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Verify" xml:space="preserve">
<value>Verify</value>
</data>
<data name="folder_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\more\icons\folder_add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="folder_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\more\icons\folder_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="musicbrainz1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\musicbrainz.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="folder_feed" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\more\icons\folder_feed.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="settings" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\settings.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Stop" xml:space="preserve">
<value>Stop</value>
</data>
<data name="world_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\world_go.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="freedb" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\freedb.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="folder_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\more\icons\folder_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="freedb1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\freedb.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Go" xml:space="preserve">
<value>&amp;Go</value>
</data>
<data name="wav" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wav.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="mp3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\mp3.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="wv1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wv.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="cue" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cue.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ape" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ape.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="musicbrainz" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\musicbrainz.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="link_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\link_go.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="basket" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\basket.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="information" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="tta" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\tta.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ogg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ogg.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="cue2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cue2.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="wave" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wave.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ipod_sound" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ipod_sound.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="cue3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cue3.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="report" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\report.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="folder_page" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\more\icons\folder_page.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\more\icons\folder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="disk" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\disk.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="accuraterip16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\accuraterip_16.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
using System.Drawing;
using System.Text;
@@ -17,9 +18,6 @@ namespace JDP
{
InitializeComponent();
_config = new CUEConfig();
_cueStyle = CUEStyle.SingleFile;
_audioFormat = "wav";
_accurateRip = CUEAction.Verify;
_batchPaths = new List<string>();
}
@@ -34,20 +32,19 @@ namespace JDP
set { pathIn = value; }
}
public CUEAction AccurateRip
public string Profile
{
get { return _accurateRip; }
set { _accurateRip = value; }
get { return _profileName; }
set { _profileName = value; }
}
CUEConfig _config;
CUEToolsProfile _profile = null;
string _profileName = "verify";
Thread _workThread;
CUESheet _workClass;
CUEConfig _config;
CUEStyle _cueStyle;
string _audioFormat;
string pathIn;
string pathOut;
CUEAction _accurateRip;
bool _reducePriority;
DateTime _startedAt;
List<string> _batchPaths;
@@ -107,6 +104,7 @@ namespace JDP
private void WriteAudioFilesThread(object o)
{
CUESheet cueSheet = (CUESheet)o;
CUEToolsScript script = _profile._script == null || !_config.scripts.ContainsKey(_profile._script) ? null : _config.scripts[_profile._script];
try
{
@@ -119,51 +117,34 @@ namespace JDP
textBox1.Text += "Processing " + pathIn + ":\r\n";
textBox1.Select(0, 0);
string cueName;
if (!File.Exists(pathIn))
{
if (!Directory.Exists(pathIn))
if (!File.Exists(pathIn) && !Directory.Exists(pathIn))
throw new Exception("Input CUE Sheet not found.");
if (!pathIn.EndsWith(new string(Path.DirectorySeparatorChar, 1)))
pathIn = pathIn + Path.DirectorySeparatorChar;
cueName = Path.GetFileNameWithoutExtension(Path.GetDirectoryName(pathIn) ?? pathIn) + ".cue";
}
else
cueName = Path.GetFileNameWithoutExtension(pathIn) + ".cue";
bool outputAudio = _accurateRip != CUEAction.Verify;
cueSheet.Action = _accurateRip;
cueSheet.OutputStyle = _cueStyle;
cueSheet.Action = _profile._action;
cueSheet.OutputStyle = _profile._CUEStyle;
cueSheet.WriteOffset = _profile._writeOffset;
cueSheet.Open(pathIn);
cueSheet.Lookup();
if (outputAudio)
{
bool pathFound = false;
for (int i = 0; i < 20; i++)
{
string outDir = Path.Combine(Path.GetDirectoryName(pathIn) ?? pathIn, "CUEToolsOutput" + (i > 0 ? String.Format("({0})", i) : ""));
if (!Directory.Exists(outDir))
{
Directory.CreateDirectory(outDir);
pathOut = Path.Combine(outDir, cueName);
pathFound = true;
break;
}
}
if (!pathFound)
throw new Exception("Could not create a folder.");
}
else
pathOut = Path.Combine(Path.GetDirectoryName(pathIn) ?? pathIn, cueName);
cueSheet.GenerateFilenames(AudioEncoderType.Lossless, _audioFormat, pathOut);
if (outputAudio)
{
if (_cueStyle == CUEStyle.SingleFileWithCUE)
cueSheet.SingleFilename = Path.ChangeExtension(Path.GetFileName(pathOut), "." + _audioFormat);
}
pathOut = CUESheet.GenerateUniqueOutputPath(_config,
_profile._outputTemplate,
_profile._CUEStyle == CUEStyle.SingleFileWithCUE ? "." + _profile._outputAudioFormat : ".cue",
_profile._action,
new NameValueCollection(),
pathIn,
cueSheet);
if (pathOut == "" || (_profile._action != CUEAction.Verify && File.Exists(pathOut)))
throw new Exception("Could not generate output path.");
cueSheet.GenerateFilenames(_profile._outputAudioType, _profile._outputAudioFormat, pathOut);
if (_profile._action != CUEAction.Verify && _profile._CUEStyle == CUEStyle.SingleFileWithCUE)
cueSheet.SingleFilename = Path.ChangeExtension(Path.GetFileName(pathOut), "." + _profile._outputAudioFormat);
cueSheet.UsePregapForFirstTrackInSingleFile = false;
if (script == null)
cueSheet.Go();
else
/* status = */ cueSheet.ExecuteScript(script);
this.Invoke((MethodInvoker)delegate()
{
if (_batchPaths.Count == 0)
@@ -261,17 +242,17 @@ namespace JDP
{
textBox1.Hide();
SettingsReader sr = new SettingsReader("CUE Tools", "settings.txt", Application.ExecutablePath);
_config.Load(sr);
_reducePriority = sr.LoadBoolean("ReducePriority") ?? true;
_cueStyle = (CUEStyle?)sr.LoadInt32("CUEStyle", null, null) ?? CUEStyle.SingleFileWithCUE;
_audioFormat = sr.Load("OutputAudioFmt") ?? "flac";
//_lossyWAV = sr.LoadBoolean("LossyWav") ?? false;
_profile = new CUEToolsProfile(_profileName);
sr = new SettingsReader("CUE Tools", string.Format("profile-{0}.txt", _profileName), Application.ExecutablePath);
_profile.Load(sr);
if (_reducePriority)
Process.GetCurrentProcess().PriorityClass = System.Diagnostics.ProcessPriorityClass.Idle;
if (_accurateRip != CUEAction.Verify)
if (_profile._action != CUEAction.Verify)
txtOutputFile.Show();
StartConvert();

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -117,40 +117,19 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="grpInput.Text" xml:space="preserve">
<value>Eingabe</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="labelInput.Size" type="System.Drawing.Size, System.Drawing">
<value>49, 13</value>
</data>
<data name="labelInput.Text" xml:space="preserve">
<value>E&amp;ingabe:</value>
</data>
<data name="checkBoxDontGenerate.Size" type="System.Drawing.Size, System.Drawing">
<value>62, 17</value>
</data>
<data name="checkBoxDontGenerate.Text" xml:space="preserve">
<value>&amp;Manuell</value>
</data>
<data name="txtInputPath.ToolTip" xml:space="preserve">
<value />
</data>
<data name="btnBrowseOutput.Text" xml:space="preserve">
<value>...</value>
</data>
<data name="btnBrowseOutput.ToolTip" xml:space="preserve">
<value />
</data>
<data name="txtOutputPath.ToolTip" xml:space="preserve">
<value />
</data>
<data name="labelOutput.Text" xml:space="preserve">
<value>Output:</value>
</data>
<data name="labelOutputTemplate.Text" xml:space="preserve">
<value>Vorlage:</value>
</data>
<data name="radioButtonAudioNone.Size" type="System.Drawing.Size, System.Drawing">
<value>51, 17</value>
</data>
@@ -196,21 +175,12 @@
<data name="rbCorrectorLocateFiles.Size" type="System.Drawing.Size, System.Drawing">
<value>99, 17</value>
</data>
<data name="rbCorrectorLocateFiles.Text" xml:space="preserve">
<value>Dateien suchen</value>
</data>
<data name="rbCorrectorChangeExtension.Size" type="System.Drawing.Size, System.Drawing">
<value>111, 17</value>
</data>
<data name="rbCorrectorChangeExtension.Text" xml:space="preserve">
<value>Neue Erweiterung</value>
</data>
<data name="checkBoxCorrectorOverwrite.Size" type="System.Drawing.Size, System.Drawing">
<value>95, 17</value>
</data>
<data name="checkBoxCorrectorOverwrite.Text" xml:space="preserve">
<value>CUE überschr.</value>
</data>
<data name="groupBoxCorrector.Text" xml:space="preserve">
<value>Korrektur</value>
</data>
@@ -235,12 +205,6 @@
<data name="rbActionVerifyAndEncode.Size" type="System.Drawing.Size, System.Drawing">
<value>116, 17</value>
</data>
<data name="rbActionVerifyAndEncode.Text" xml:space="preserve">
<value>Verif. und kodieren</value>
</data>
<data name="rbActionVerifyAndEncode.ToolTip" xml:space="preserve">
<value />
</data>
<data name="rbActionVerify.Size" type="System.Drawing.Size, System.Drawing">
<value>95, 17</value>
</data>
@@ -254,17 +218,14 @@
<value>126, 17</value>
</data>
<data name="rbActionEncode.Text" xml:space="preserve">
<value>&amp;Nicht verif., kodieren</value>
<value>&amp;Kodieren</value>
</data>
<data name="rbActionEncode.ToolTip" xml:space="preserve">
<value>Kodiert, ohne die AccurateRip-Datenbank zu kontaktieren.</value>
<value>Verif. und kodieren</value>
</data>
<data name="comboBoxScript.ToolTip" xml:space="preserve">
<value>Eigenes Script ausführen</value>
</data>
<data name="btnAbout.Text" xml:space="preserve">
<value>Über</value>
</data>
<data name="btnConvert.Text" xml:space="preserve">
<value>&amp;Los</value>
</data>
@@ -283,24 +244,12 @@
<data name="rbFreedbAlways.Size" type="System.Drawing.Size, System.Drawing">
<value>55, 17</value>
</data>
<data name="rbFreedbAlways.Text" xml:space="preserve">
<value>Immer</value>
</data>
<data name="rbFreedbIf.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 17</value>
</data>
<data name="rbFreedbIf.Text" xml:space="preserve">
<value>Wenn nötig</value>
</data>
<data name="rbFreedbNever.Size" type="System.Drawing.Size, System.Drawing">
<value>40, 17</value>
</data>
<data name="rbFreedbNever.Text" xml:space="preserve">
<value>Nie</value>
</data>
<data name="grpFreedb.Text" xml:space="preserve">
<value>FreeDB-Abfrage</value>
</data>
<data name="btnResume.Text" xml:space="preserve">
<value>&amp;Fortsetzen</value>
</data>
@@ -331,27 +280,9 @@
<data name="grpOutputStyle.Text" xml:space="preserve">
<value>CUE-Stil</value>
</data>
<data name="btnSettings.Text" xml:space="preserve">
<value>Einstellungen</value>
</data>
<data name="btnStop.Text" xml:space="preserve">
<value>&amp;Stopp</value>
</data>
<data name="toolStripButton1.Text" xml:space="preserve">
<value>Dateiauswahl</value>
</data>
<data name="toolStripButton2.Text" xml:space="preserve">
<value>Mehrfache Dateiauswahl</value>
</data>
<data name="toolStripButton3.Text" xml:space="preserve">
<value>Drag'n'drop-Modus</value>
</data>
<data name="toolStripButton4.Text" xml:space="preserve">
<value>Logdatei</value>
</data>
<data name="toolStripButton5.Text" xml:space="preserve">
<value>Ausblenden</value>
</data>
<data name="SelectedNodeName.Text" xml:space="preserve">
<value>Ausgewählte Datei</value>
</data>
@@ -383,4 +314,70 @@
AAAAAAAAAAAAAIABAADAAwAA4AcAAPAPAAA=
</value>
</data>
<data name="checkBoxUseAccurateRip.ToolTip" xml:space="preserve">
<value>AccurateRip-Abfrage</value>
</data>
<data name="checkBoxUseFreeDb.ToolTip" xml:space="preserve">
<value>FreeDB-Abfrage</value>
</data>
<data name="checkBoxUseMusicBrainz.ToolTip" xml:space="preserve">
<value>MusicBrainz-Abfrage</value>
</data>
<data name="grpOutputPathGeneration.Text" xml:space="preserve">
<value>CUE-Path</value>
</data>
<data name="toolStripButtonAbout.Text" xml:space="preserve">
<value>Über</value>
</data>
<data name="toolStripButtonCorrectorOverwrite.Text" xml:space="preserve">
<value>CUE überschr.</value>
</data>
<data name="toolStripButtonHelp.Text" xml:space="preserve">
<value />
</data>
<data name="toolStripButtonSettings.Text" xml:space="preserve">
<value>Einstellungen</value>
</data>
<data name="toolStripButtonShowLog.Text" xml:space="preserve">
<value>Logdatei</value>
</data>
<data name="toolStripLabelInput.Text" xml:space="preserve">
<value>E&amp;ingabe:</value>
</data>
<data name="toolStripLabelOutput.Text" xml:space="preserve">
<value>Output:</value>
</data>
<data name="toolStripMenuItemCorrectorModeChangeExtension.Text" xml:space="preserve">
<value>Neue Erweiterung</value>
</data>
<data name="toolStripMenuItemCorrectorModeChangeExtension.ToolTipText" xml:space="preserve">
<value />
</data>
<data name="toolStripMenuItemCorrectorModeLocateFiles.Text" xml:space="preserve">
<value>Dateien suchen</value>
</data>
<data name="toolStripMenuItemCorrectorModeLocateFiles.ToolTipText" xml:space="preserve">
<value />
</data>
<data name="toolStripMenuItemInputBrowserDrag.Text" xml:space="preserve">
<value>Drag'n'drop-Modus</value>
</data>
<data name="toolStripMenuItemInputBrowserFiles.Text" xml:space="preserve">
<value>Dateiauswahl</value>
</data>
<data name="toolStripMenuItemInputBrowserHide.Text" xml:space="preserve">
<value>Ausblenden</value>
</data>
<data name="toolStripMenuItemInputBrowserMulti.Text" xml:space="preserve">
<value>Mehrfache Dateiauswahl</value>
</data>
<data name="toolStripMenuItemOutputBrowse.Text" xml:space="preserve">
<value>Ausblenden</value>
</data>
<data name="toolStripMenuItemOutputManual.Text" xml:space="preserve">
<value>Manuell</value>
</data>
<data name="toolStripMenuItemOutputTemplate.Text" xml:space="preserve">
<value>Vorlage</value>
</data>
</root>

File diff suppressed because it is too large Load Diff

View File

@@ -151,39 +151,18 @@
<data name="labelOutput.Size" type="System.Drawing.Size, System.Drawing">
<value>44, 13</value>
</data>
<data name="labelOutput.Text" xml:space="preserve">
<value>Выход:</value>
</data>
<data name="labelOutput.ToolTip" xml:space="preserve">
<value />
</data>
<data name="labelInput.Size" type="System.Drawing.Size, System.Drawing">
<value>36, 13</value>
</data>
<data name="labelInput.Text" xml:space="preserve">
<value>Вход:</value>
</data>
<data name="labelInput.ToolTip" xml:space="preserve">
<value />
</data>
<data name="checkBoxDontGenerate.Size" type="System.Drawing.Size, System.Drawing">
<value>71, 17</value>
</data>
<data name="checkBoxDontGenerate.Text" xml:space="preserve">
<value>Вручную</value>
</data>
<data name="checkBoxDontGenerate.ToolTip" xml:space="preserve">
<value />
</data>
<data name="comboBoxOutputFormat.ToolTip" xml:space="preserve">
<value />
</data>
<data name="txtInputPath.ToolTip" xml:space="preserve">
<value />
</data>
<data name="btnBrowseOutput.Text" xml:space="preserve">
<value>Выбор...</value>
</data>
<data name="btnBrowseOutput.ToolTip" xml:space="preserve">
<value />
</data>
@@ -250,21 +229,9 @@
<data name="rbCorrectorLocateFiles.Size" type="System.Drawing.Size, System.Drawing">
<value>96, 17</value>
</data>
<data name="rbCorrectorLocateFiles.Text" xml:space="preserve">
<value>Поиск файлов</value>
</data>
<data name="rbCorrectorLocateFiles.ToolTip" xml:space="preserve">
<value>Автоматический поиск переименованных файлов</value>
</data>
<data name="rbCorrectorChangeExtension.Size" type="System.Drawing.Size, System.Drawing">
<value>86, 17</value>
</data>
<data name="rbCorrectorChangeExtension.Text" xml:space="preserve">
<value>Расширение</value>
</data>
<data name="rbCorrectorChangeExtension.ToolTip" xml:space="preserve">
<value>Заменить расширение аудио-файлов</value>
</data>
<data name="checkBoxCorrectorOverwrite.Text" xml:space="preserve">
<value>Заменить CUE</value>
</data>
@@ -340,12 +307,6 @@
<data name="grpAction.ToolTip" xml:space="preserve">
<value />
</data>
<data name="btnAbout.Text" xml:space="preserve">
<value>О программе</value>
</data>
<data name="btnAbout.ToolTip" xml:space="preserve">
<value />
</data>
<data name="btnConvert.Text" xml:space="preserve">
<value>Поехали</value>
</data>
@@ -470,12 +431,6 @@
<data name="grpOutputStyle.ToolTip" xml:space="preserve">
<value />
</data>
<data name="btnSettings.Text" xml:space="preserve">
<value>Настройки...</value>
</data>
<data name="btnSettings.ToolTip" xml:space="preserve">
<value />
</data>
<data name="btnStop.Text" xml:space="preserve">
<value>Стоп</value>
</data>
@@ -491,21 +446,6 @@
<data name="toolStripContainer1.ContentPanel.ToolTip" xml:space="preserve">
<value />
</data>
<data name="toolStripButton1.Text" xml:space="preserve">
<value>Проводник</value>
</data>
<data name="toolStripButton2.Text" xml:space="preserve">
<value>Проводник (пакетный режим)</value>
</data>
<data name="toolStripButton3.Text" xml:space="preserve">
<value>Режим drag'n'drop</value>
</data>
<data name="toolStripButton4.Text" xml:space="preserve">
<value>Журнал работы</value>
</data>
<data name="toolStripButton5.Text" xml:space="preserve">
<value>Скрыть</value>
</data>
<data name="toolStrip1.ToolTip" xml:space="preserve">
<value />
</data>
@@ -924,4 +864,67 @@
<data name="$this.ToolTip" xml:space="preserve">
<value />
</data>
<data name="checkBoxUseAccurateRip.ToolTip" xml:space="preserve">
<value>Использовать AccurateRip</value>
</data>
<data name="checkBoxUseFreeDb.ToolTip" xml:space="preserve">
<value>Использовать FreeDb</value>
</data>
<data name="checkBoxUseMusicBrainz.ToolTip" xml:space="preserve">
<value>Использовать MusicBrainz</value>
</data>
<data name="toolStripButtonAbout.Text" xml:space="preserve">
<value>О программе</value>
</data>
<data name="toolStripButtonHelp.Text" xml:space="preserve">
<value>Сайт</value>
</data>
<data name="toolStripButtonSettings.Text" xml:space="preserve">
<value>Настройки...</value>
</data>
<data name="toolStripButtonShowLog.Text" xml:space="preserve">
<value>Журнал работы</value>
</data>
<data name="toolStripMenuItemInputBrowserDrag.Text" xml:space="preserve">
<value>Режим drag'n'drop</value>
</data>
<data name="toolStripMenuItemInputBrowserFiles.Text" xml:space="preserve">
<value>Проводник</value>
</data>
<data name="toolStripMenuItemInputBrowserHide.Text" xml:space="preserve">
<value>Скрыть проводник</value>
</data>
<data name="toolStripMenuItemInputBrowserMulti.Text" xml:space="preserve">
<value>Проводник (пакетный режим)</value>
</data>
<data name="toolStripMenuItemOutputBrowse.Text" xml:space="preserve">
<value>Проводник</value>
</data>
<data name="toolStripMenuItemOutputManual.Text" xml:space="preserve">
<value>Вручную</value>
</data>
<data name="toolStripMenuItemOutputTemplate.Text" xml:space="preserve">
<value>По шаблону</value>
</data>
<data name="toolStripButtonCorrectorOverwrite.Text" xml:space="preserve">
<value>Заменить CUE</value>
</data>
<data name="toolStripLabelInput.Text" xml:space="preserve">
<value>Вход:</value>
</data>
<data name="toolStripLabelOutput.Text" xml:space="preserve">
<value>Выход:</value>
</data>
<data name="toolStripMenuItemCorrectorModeChangeExtension.Text" xml:space="preserve">
<value>Расширение</value>
</data>
<data name="toolStripMenuItemCorrectorModeChangeExtension.ToolTipText" xml:space="preserve">
<value>Заменить расширение аудио-файлов</value>
</data>
<data name="toolStripMenuItemCorrectorModeLocateFiles.Text" xml:space="preserve">
<value>Поиск файлов</value>
</data>
<data name="toolStripMenuItemCorrectorModeLocateFiles.ToolTipText" xml:space="preserve">
<value>Автоматический поиск переименованных файлов</value>
</data>
</root>

View File

@@ -27,6 +27,7 @@ namespace JDP {
System.Windows.Forms.Button btnCancel;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmSettings));
this.grpGeneral = new System.Windows.Forms.GroupBox();
this.checkBoxCheckForUpdates = new System.Windows.Forms.CheckBox();
this.chkAllowMultipleInstances = new System.Windows.Forms.CheckBox();
this.chkReducePriority = new System.Windows.Forms.CheckBox();
this.chkTruncateExtra4206Samples = new System.Windows.Forms.CheckBox();
@@ -58,6 +59,8 @@ namespace JDP {
this.txtTrackFilenameFormat = new System.Windows.Forms.TextBox();
this.txtSingleFilenameFormat = new System.Windows.Forms.TextBox();
this.textBoxEncoderModes = new System.Windows.Forms.TextBox();
this.encodersBindingSource = new System.Windows.Forms.BindingSource(this.components);
this.cUEConfigBindingSource = new System.Windows.Forms.BindingSource(this.components);
this.checkBoxEncoderLossless = new System.Windows.Forms.CheckBox();
this.textBoxEncoderPath = new System.Windows.Forms.TextBox();
this.textBoxEncoderParameters = new System.Windows.Forms.TextBox();
@@ -65,6 +68,7 @@ namespace JDP {
this.rbGapsPrepended = new System.Windows.Forms.RadioButton();
this.rbGapsAppended = new System.Windows.Forms.RadioButton();
this.rbGapsPlusHTOA = new System.Windows.Forms.RadioButton();
this.textBoxEncoderName = new System.Windows.Forms.TextBox();
this.grpAudioFilenames = new System.Windows.Forms.GroupBox();
this.txtSpecialExceptions = new System.Windows.Forms.TextBox();
this.chkRemoveSpecial = new System.Windows.Forms.CheckBox();
@@ -76,11 +80,13 @@ namespace JDP {
this.groupBoxGaps = new System.Windows.Forms.GroupBox();
this.tabPage6 = new System.Windows.Forms.TabPage();
this.groupBoxAlbumArt = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
this.checkBoxCopyAlbumArt = new System.Windows.Forms.CheckBox();
this.checkBoxExtractAlbumArt = new System.Windows.Forms.CheckBox();
this.checkBoxEmbedAlbumArt = new System.Windows.Forms.CheckBox();
this.labelAlbumArtMaximumResolution = new System.Windows.Forms.Label();
this.numericUpDownMaxResolution = new System.Windows.Forms.NumericUpDown();
this.checkBoxEmbedAlbumArt = new System.Windows.Forms.CheckBox();
this.checkBoxCopyAlbumArt = new System.Windows.Forms.CheckBox();
this.textBoxAlArtFilenameFormat = new System.Windows.Forms.TextBox();
this.groupBoxTagging = new System.Windows.Forms.GroupBox();
this.chkExtractLog = new System.Windows.Forms.CheckBox();
this.checkBoxCopyBasicTags = new System.Windows.Forms.CheckBox();
@@ -94,8 +100,10 @@ namespace JDP {
this.labelLogFileExtension = new System.Windows.Forms.Label();
this.checkBoxARLogVerbose = new System.Windows.Forms.CheckBox();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.label2 = new System.Windows.Forms.Label();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.checkBoxFixToNearest = new System.Windows.Forms.CheckBox();
this.label3 = new System.Windows.Forms.Label();
this.groupBoxVerify = new System.Windows.Forms.GroupBox();
@@ -118,13 +126,15 @@ namespace JDP {
this.listViewFormats = new System.Windows.Forms.ListView();
this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
this.tabPage10 = new System.Windows.Forms.TabPage();
this.buttonEncoderDelete = new System.Windows.Forms.Button();
this.buttonEncoderAdd = new System.Windows.Forms.Button();
this.listBoxEncoders = new System.Windows.Forms.ListBox();
this.groupBoxExternalEncoder = new System.Windows.Forms.GroupBox();
this.labelEncoderName = new System.Windows.Forms.Label();
this.labelEncoderModes = new System.Windows.Forms.Label();
this.labelEncoderPath = new System.Windows.Forms.Label();
this.labelEncoderParameters = new System.Windows.Forms.Label();
this.comboBoxEncoderExtension = new System.Windows.Forms.ComboBox();
this.listViewEncoders = new System.Windows.Forms.ListView();
this.columnHeader3 = new System.Windows.Forms.ColumnHeader();
this.groupBoxLibMAC_SDK = new System.Windows.Forms.GroupBox();
this.groupBoxLibWavpack = new System.Windows.Forms.GroupBox();
this.chkWVStoreMD5 = new System.Windows.Forms.CheckBox();
@@ -160,7 +170,6 @@ namespace JDP {
this.labelFormatDecoder = new System.Windows.Forms.Label();
this.labelFormatEncoder = new System.Windows.Forms.Label();
this.columnHeader2 = new System.Windows.Forms.ColumnHeader();
this.checkBoxCheckForUpdates = new System.Windows.Forms.CheckBox();
btnCancel = new System.Windows.Forms.Button();
this.grpGeneral.SuspendLayout();
this.groupBox1.SuspendLayout();
@@ -168,18 +177,23 @@ namespace JDP {
((System.ComponentModel.ISupportInitialize)(this.numEncodeWhenConfidence)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numFixWhenConfidence)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numFixWhenPercent)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.encodersBindingSource)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.cUEConfigBindingSource)).BeginInit();
this.grpAudioFilenames.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.groupBoxGaps.SuspendLayout();
this.tabPage6.SuspendLayout();
this.groupBoxAlbumArt.SuspendLayout();
this.tableLayoutPanel3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownMaxResolution)).BeginInit();
this.groupBoxTagging.SuspendLayout();
this.tabPage2.SuspendLayout();
this.groupBoxARLog.SuspendLayout();
this.groupBox5.SuspendLayout();
this.tableLayoutPanel2.SuspendLayout();
this.groupBox4.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.groupBoxVerify.SuspendLayout();
this.tabPage3.SuspendLayout();
this.groupBoxFormat.SuspendLayout();
@@ -218,6 +232,13 @@ namespace JDP {
this.grpGeneral.Name = "grpGeneral";
this.grpGeneral.TabStop = false;
//
// checkBoxCheckForUpdates
//
resources.ApplyResources(this.checkBoxCheckForUpdates, "checkBoxCheckForUpdates");
this.checkBoxCheckForUpdates.Name = "checkBoxCheckForUpdates";
this.toolTip1.SetToolTip(this.checkBoxCheckForUpdates, resources.GetString("checkBoxCheckForUpdates.ToolTip"));
this.checkBoxCheckForUpdates.UseVisualStyleBackColor = true;
//
// chkAllowMultipleInstances
//
resources.ApplyResources(this.chkAllowMultipleInstances, "chkAllowMultipleInstances");
@@ -309,9 +330,9 @@ namespace JDP {
//
// chkEncodeWhenZeroOffset
//
this.tableLayoutPanel2.SetColumnSpan(this.chkEncodeWhenZeroOffset, 2);
resources.ApplyResources(this.chkEncodeWhenZeroOffset, "chkEncodeWhenZeroOffset");
this.chkEncodeWhenZeroOffset.Name = "chkEncodeWhenZeroOffset";
this.chkEncodeWhenZeroOffset.UseVisualStyleBackColor = true;
//
// numEncodeWhenPercent
//
@@ -463,6 +484,13 @@ namespace JDP {
//
// txtTrackFilenameFormat
//
this.txtTrackFilenameFormat.AutoCompleteCustomSource.AddRange(new string[] {
resources.GetString("txtTrackFilenameFormat.AutoCompleteCustomSource"),
resources.GetString("txtTrackFilenameFormat.AutoCompleteCustomSource1"),
resources.GetString("txtTrackFilenameFormat.AutoCompleteCustomSource2"),
resources.GetString("txtTrackFilenameFormat.AutoCompleteCustomSource3")});
this.txtTrackFilenameFormat.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.txtTrackFilenameFormat.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
resources.ApplyResources(this.txtTrackFilenameFormat, "txtTrackFilenameFormat");
this.txtTrackFilenameFormat.Name = "txtTrackFilenameFormat";
this.toolTip1.SetToolTip(this.txtTrackFilenameFormat, resources.GetString("txtTrackFilenameFormat.ToolTip"));
@@ -475,25 +503,40 @@ namespace JDP {
//
// textBoxEncoderModes
//
this.textBoxEncoderModes.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.encodersBindingSource, "SupportedModesStr", true));
resources.ApplyResources(this.textBoxEncoderModes, "textBoxEncoderModes");
this.textBoxEncoderModes.Name = "textBoxEncoderModes";
this.toolTip1.SetToolTip(this.textBoxEncoderModes, resources.GetString("textBoxEncoderModes.ToolTip"));
//
// encodersBindingSource
//
this.encodersBindingSource.AllowNew = true;
this.encodersBindingSource.DataMember = "Encoders";
this.encodersBindingSource.DataSource = this.cUEConfigBindingSource;
this.encodersBindingSource.CurrentItemChanged += new System.EventHandler(this.encodersBindingSource_CurrentItemChanged);
//
// cUEConfigBindingSource
//
this.cUEConfigBindingSource.DataSource = typeof(CUETools.Processor.CUEConfig);
//
// checkBoxEncoderLossless
//
resources.ApplyResources(this.checkBoxEncoderLossless, "checkBoxEncoderLossless");
this.checkBoxEncoderLossless.DataBindings.Add(new System.Windows.Forms.Binding("CheckState", this.encodersBindingSource, "Lossless", true));
this.checkBoxEncoderLossless.Name = "checkBoxEncoderLossless";
this.toolTip1.SetToolTip(this.checkBoxEncoderLossless, resources.GetString("checkBoxEncoderLossless.ToolTip"));
this.checkBoxEncoderLossless.UseVisualStyleBackColor = true;
//
// textBoxEncoderPath
//
this.textBoxEncoderPath.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.encodersBindingSource, "Path", true));
resources.ApplyResources(this.textBoxEncoderPath, "textBoxEncoderPath");
this.textBoxEncoderPath.Name = "textBoxEncoderPath";
this.toolTip1.SetToolTip(this.textBoxEncoderPath, resources.GetString("textBoxEncoderPath.ToolTip"));
//
// textBoxEncoderParameters
//
this.textBoxEncoderParameters.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.encodersBindingSource, "Parameters", true));
resources.ApplyResources(this.textBoxEncoderParameters, "textBoxEncoderParameters");
this.textBoxEncoderParameters.Name = "textBoxEncoderParameters";
this.toolTip1.SetToolTip(this.textBoxEncoderParameters, resources.GetString("textBoxEncoderParameters.ToolTip"));
@@ -527,6 +570,13 @@ namespace JDP {
this.toolTip1.SetToolTip(this.rbGapsPlusHTOA, resources.GetString("rbGapsPlusHTOA.ToolTip"));
this.rbGapsPlusHTOA.UseVisualStyleBackColor = true;
//
// textBoxEncoderName
//
this.textBoxEncoderName.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.encodersBindingSource, "Name", true));
resources.ApplyResources(this.textBoxEncoderName, "textBoxEncoderName");
this.textBoxEncoderName.Name = "textBoxEncoderName";
this.toolTip1.SetToolTip(this.textBoxEncoderName, resources.GetString("textBoxEncoderName.ToolTip"));
//
// grpAudioFilenames
//
this.grpAudioFilenames.Controls.Add(this.chkFilenamesANSISafe);
@@ -622,34 +672,55 @@ namespace JDP {
//
// groupBoxAlbumArt
//
this.groupBoxAlbumArt.Controls.Add(this.checkBoxExtractAlbumArt);
this.groupBoxAlbumArt.Controls.Add(this.labelAlbumArtMaximumResolution);
this.groupBoxAlbumArt.Controls.Add(this.numericUpDownMaxResolution);
this.groupBoxAlbumArt.Controls.Add(this.checkBoxEmbedAlbumArt);
this.groupBoxAlbumArt.Controls.Add(this.checkBoxCopyAlbumArt);
this.groupBoxAlbumArt.Controls.Add(this.tableLayoutPanel3);
resources.ApplyResources(this.groupBoxAlbumArt, "groupBoxAlbumArt");
this.groupBoxAlbumArt.Name = "groupBoxAlbumArt";
this.groupBoxAlbumArt.TabStop = false;
//
// tableLayoutPanel3
//
resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3");
this.tableLayoutPanel3.Controls.Add(this.checkBoxCopyAlbumArt, 0, 0);
this.tableLayoutPanel3.Controls.Add(this.checkBoxExtractAlbumArt, 0, 2);
this.tableLayoutPanel3.Controls.Add(this.checkBoxEmbedAlbumArt, 0, 1);
this.tableLayoutPanel3.Controls.Add(this.labelAlbumArtMaximumResolution, 0, 3);
this.tableLayoutPanel3.Controls.Add(this.numericUpDownMaxResolution, 2, 3);
this.tableLayoutPanel3.Controls.Add(this.textBoxAlArtFilenameFormat, 1, 2);
this.tableLayoutPanel3.Name = "tableLayoutPanel3";
//
// checkBoxCopyAlbumArt
//
resources.ApplyResources(this.checkBoxCopyAlbumArt, "checkBoxCopyAlbumArt");
this.checkBoxCopyAlbumArt.DataBindings.Add(new System.Windows.Forms.Binding("CheckState", this.cUEConfigBindingSource, "CopyAlbumArt", true));
this.checkBoxCopyAlbumArt.Name = "checkBoxCopyAlbumArt";
this.checkBoxCopyAlbumArt.UseVisualStyleBackColor = true;
//
// checkBoxExtractAlbumArt
//
resources.ApplyResources(this.checkBoxExtractAlbumArt, "checkBoxExtractAlbumArt");
this.checkBoxExtractAlbumArt.Name = "checkBoxExtractAlbumArt";
this.checkBoxExtractAlbumArt.UseVisualStyleBackColor = true;
//
// checkBoxEmbedAlbumArt
//
resources.ApplyResources(this.checkBoxEmbedAlbumArt, "checkBoxEmbedAlbumArt");
this.checkBoxEmbedAlbumArt.Name = "checkBoxEmbedAlbumArt";
this.checkBoxEmbedAlbumArt.UseVisualStyleBackColor = true;
//
// labelAlbumArtMaximumResolution
//
this.tableLayoutPanel3.SetColumnSpan(this.labelAlbumArtMaximumResolution, 2);
resources.ApplyResources(this.labelAlbumArtMaximumResolution, "labelAlbumArtMaximumResolution");
this.labelAlbumArtMaximumResolution.Name = "labelAlbumArtMaximumResolution";
//
// numericUpDownMaxResolution
//
resources.ApplyResources(this.numericUpDownMaxResolution, "numericUpDownMaxResolution");
this.numericUpDownMaxResolution.Increment = new decimal(new int[] {
100,
0,
0,
0});
resources.ApplyResources(this.numericUpDownMaxResolution, "numericUpDownMaxResolution");
this.numericUpDownMaxResolution.Maximum = new decimal(new int[] {
10000,
0,
@@ -667,17 +738,19 @@ namespace JDP {
0,
0});
//
// checkBoxEmbedAlbumArt
// textBoxAlArtFilenameFormat
//
resources.ApplyResources(this.checkBoxEmbedAlbumArt, "checkBoxEmbedAlbumArt");
this.checkBoxEmbedAlbumArt.Name = "checkBoxEmbedAlbumArt";
this.checkBoxEmbedAlbumArt.UseVisualStyleBackColor = true;
//
// checkBoxCopyAlbumArt
//
resources.ApplyResources(this.checkBoxCopyAlbumArt, "checkBoxCopyAlbumArt");
this.checkBoxCopyAlbumArt.Name = "checkBoxCopyAlbumArt";
this.checkBoxCopyAlbumArt.UseVisualStyleBackColor = true;
this.textBoxAlArtFilenameFormat.AutoCompleteCustomSource.AddRange(new string[] {
resources.GetString("textBoxAlArtFilenameFormat.AutoCompleteCustomSource"),
resources.GetString("textBoxAlArtFilenameFormat.AutoCompleteCustomSource1"),
resources.GetString("textBoxAlArtFilenameFormat.AutoCompleteCustomSource2"),
resources.GetString("textBoxAlArtFilenameFormat.AutoCompleteCustomSource3")});
this.textBoxAlArtFilenameFormat.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.textBoxAlArtFilenameFormat.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
this.tableLayoutPanel3.SetColumnSpan(this.textBoxAlArtFilenameFormat, 2);
this.textBoxAlArtFilenameFormat.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.cUEConfigBindingSource, "AlArtFilenameFormat", true));
resources.ApplyResources(this.textBoxAlArtFilenameFormat, "textBoxAlArtFilenameFormat");
this.textBoxAlArtFilenameFormat.Name = "textBoxAlArtFilenameFormat";
//
// groupBoxTagging
//
@@ -750,6 +823,13 @@ namespace JDP {
//
// textBoxARLogExtension
//
this.textBoxARLogExtension.AutoCompleteCustomSource.AddRange(new string[] {
resources.GetString("textBoxARLogExtension.AutoCompleteCustomSource"),
resources.GetString("textBoxARLogExtension.AutoCompleteCustomSource1"),
resources.GetString("textBoxARLogExtension.AutoCompleteCustomSource2")});
this.textBoxARLogExtension.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.textBoxARLogExtension.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
this.textBoxARLogExtension.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.cUEConfigBindingSource, "ArLogFilenameFormat", true));
resources.ApplyResources(this.textBoxARLogExtension, "textBoxARLogExtension");
this.textBoxARLogExtension.Name = "textBoxARLogExtension";
//
@@ -766,15 +846,21 @@ namespace JDP {
//
// groupBox5
//
this.groupBox5.Controls.Add(this.label2);
this.groupBox5.Controls.Add(this.chkEncodeWhenZeroOffset);
this.groupBox5.Controls.Add(this.numEncodeWhenConfidence);
this.groupBox5.Controls.Add(this.labelEncodeWhenConfidence);
this.groupBox5.Controls.Add(this.numEncodeWhenPercent);
this.groupBox5.Controls.Add(this.tableLayoutPanel2);
resources.ApplyResources(this.groupBox5, "groupBox5");
this.groupBox5.Name = "groupBox5";
this.groupBox5.TabStop = false;
//
// tableLayoutPanel2
//
resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2");
this.tableLayoutPanel2.Controls.Add(this.label2, 0, 0);
this.tableLayoutPanel2.Controls.Add(this.chkEncodeWhenZeroOffset, 0, 2);
this.tableLayoutPanel2.Controls.Add(this.numEncodeWhenPercent, 1, 0);
this.tableLayoutPanel2.Controls.Add(this.labelEncodeWhenConfidence, 0, 1);
this.tableLayoutPanel2.Controls.Add(this.numEncodeWhenConfidence, 1, 1);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
//
// label2
//
resources.ApplyResources(this.label2, "label2");
@@ -782,18 +868,25 @@ namespace JDP {
//
// groupBox4
//
this.groupBox4.Controls.Add(this.checkBoxFixToNearest);
this.groupBox4.Controls.Add(this.label3);
this.groupBox4.Controls.Add(this.labelFixWhenConfidence);
this.groupBox4.Controls.Add(this.numFixWhenConfidence);
this.groupBox4.Controls.Add(this.numFixWhenPercent);
this.groupBox4.Controls.Add(this.tableLayoutPanel1);
resources.ApplyResources(this.groupBox4, "groupBox4");
this.groupBox4.Name = "groupBox4";
this.groupBox4.TabStop = false;
//
// tableLayoutPanel1
//
resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
this.tableLayoutPanel1.Controls.Add(this.checkBoxFixToNearest, 0, 2);
this.tableLayoutPanel1.Controls.Add(this.label3, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.numFixWhenConfidence, 1, 1);
this.tableLayoutPanel1.Controls.Add(this.labelFixWhenConfidence, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.numFixWhenPercent, 1, 0);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
//
// checkBoxFixToNearest
//
resources.ApplyResources(this.checkBoxFixToNearest, "checkBoxFixToNearest");
this.tableLayoutPanel1.SetColumnSpan(this.checkBoxFixToNearest, 2);
this.checkBoxFixToNearest.Name = "checkBoxFixToNearest";
this.checkBoxFixToNearest.UseVisualStyleBackColor = true;
//
@@ -949,30 +1042,65 @@ namespace JDP {
//
// tabPage10
//
resources.ApplyResources(this.tabPage10, "tabPage10");
this.tabPage10.BackColor = System.Drawing.SystemColors.Control;
this.tabPage10.Controls.Add(this.buttonEncoderDelete);
this.tabPage10.Controls.Add(this.buttonEncoderAdd);
this.tabPage10.Controls.Add(this.listBoxEncoders);
this.tabPage10.Controls.Add(this.groupBoxExternalEncoder);
this.tabPage10.Controls.Add(this.comboBoxEncoderExtension);
this.tabPage10.Controls.Add(this.listViewEncoders);
this.tabPage10.Controls.Add(this.groupBoxLibMAC_SDK);
this.tabPage10.Controls.Add(this.groupBoxLibWavpack);
this.tabPage10.Controls.Add(this.groupBoxLibFLAC);
this.tabPage10.Controls.Add(this.labelEncoderExtension);
resources.ApplyResources(this.tabPage10, "tabPage10");
this.tabPage10.Name = "tabPage10";
//
// buttonEncoderDelete
//
this.buttonEncoderDelete.DataBindings.Add(new System.Windows.Forms.Binding("Enabled", this.encodersBindingSource, "CanBeDeleted", true));
resources.ApplyResources(this.buttonEncoderDelete, "buttonEncoderDelete");
this.buttonEncoderDelete.Name = "buttonEncoderDelete";
this.buttonEncoderDelete.UseVisualStyleBackColor = true;
this.buttonEncoderDelete.Click += new System.EventHandler(this.buttonEncoderDelete_Click);
//
// buttonEncoderAdd
//
resources.ApplyResources(this.buttonEncoderAdd, "buttonEncoderAdd");
this.buttonEncoderAdd.Name = "buttonEncoderAdd";
this.buttonEncoderAdd.UseVisualStyleBackColor = true;
this.buttonEncoderAdd.Click += new System.EventHandler(this.buttonEncoderAdd_Click);
//
// listBoxEncoders
//
this.listBoxEncoders.BackColor = System.Drawing.SystemColors.Control;
this.listBoxEncoders.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.listBoxEncoders.DataSource = this.encodersBindingSource;
this.listBoxEncoders.DisplayMember = "Name";
this.listBoxEncoders.FormattingEnabled = true;
resources.ApplyResources(this.listBoxEncoders, "listBoxEncoders");
this.listBoxEncoders.Name = "listBoxEncoders";
this.listBoxEncoders.KeyDown += new System.Windows.Forms.KeyEventHandler(this.listBoxEncoders_KeyDown);
//
// groupBoxExternalEncoder
//
resources.ApplyResources(this.groupBoxExternalEncoder, "groupBoxExternalEncoder");
this.groupBoxExternalEncoder.Controls.Add(this.labelEncoderName);
this.groupBoxExternalEncoder.Controls.Add(this.textBoxEncoderName);
this.groupBoxExternalEncoder.Controls.Add(this.textBoxEncoderPath);
this.groupBoxExternalEncoder.Controls.Add(this.labelEncoderModes);
this.groupBoxExternalEncoder.Controls.Add(this.textBoxEncoderModes);
this.groupBoxExternalEncoder.Controls.Add(this.checkBoxEncoderLossless);
this.groupBoxExternalEncoder.Controls.Add(this.textBoxEncoderPath);
this.groupBoxExternalEncoder.Controls.Add(this.textBoxEncoderParameters);
this.groupBoxExternalEncoder.Controls.Add(this.labelEncoderPath);
this.groupBoxExternalEncoder.Controls.Add(this.labelEncoderParameters);
this.groupBoxExternalEncoder.Name = "groupBoxExternalEncoder";
this.groupBoxExternalEncoder.TabStop = false;
//
// labelEncoderName
//
resources.ApplyResources(this.labelEncoderName, "labelEncoderName");
this.labelEncoderName.Name = "labelEncoderName";
//
// labelEncoderModes
//
resources.ApplyResources(this.labelEncoderModes, "labelEncoderModes");
@@ -990,36 +1118,13 @@ namespace JDP {
//
// comboBoxEncoderExtension
//
this.comboBoxEncoderExtension.DataBindings.Add(new System.Windows.Forms.Binding("SelectedItem", this.encodersBindingSource, "Extension", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.comboBoxEncoderExtension.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxEncoderExtension.FormattingEnabled = true;
resources.ApplyResources(this.comboBoxEncoderExtension, "comboBoxEncoderExtension");
this.comboBoxEncoderExtension.Name = "comboBoxEncoderExtension";
this.comboBoxEncoderExtension.SelectedIndexChanged += new System.EventHandler(this.comboBoxEncoderExtension_SelectedIndexChanged);
//
// listViewEncoders
//
this.listViewEncoders.BackColor = System.Drawing.SystemColors.Control;
this.listViewEncoders.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.listViewEncoders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.columnHeader3});
this.listViewEncoders.FullRowSelect = true;
this.listViewEncoders.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
this.listViewEncoders.HideSelection = false;
this.listViewEncoders.LabelEdit = true;
resources.ApplyResources(this.listViewEncoders, "listViewEncoders");
this.listViewEncoders.MultiSelect = false;
this.listViewEncoders.Name = "listViewEncoders";
this.listViewEncoders.UseCompatibleStateImageBehavior = false;
this.listViewEncoders.View = System.Windows.Forms.View.Details;
this.listViewEncoders.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listViewEncoders_AfterLabelEdit);
this.listViewEncoders.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.listViewEncoders_ItemSelectionChanged);
this.listViewEncoders.BeforeLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listViewEncoders_BeforeLabelEdit);
this.listViewEncoders.KeyDown += new System.Windows.Forms.KeyEventHandler(this.listViewEncoders_KeyDown);
//
// columnHeader3
//
resources.ApplyResources(this.columnHeader3, "columnHeader3");
//
// groupBoxLibMAC_SDK
//
resources.ApplyResources(this.groupBoxLibMAC_SDK, "groupBoxLibMAC_SDK");
@@ -1083,6 +1188,7 @@ namespace JDP {
// labelEncoderExtension
//
resources.ApplyResources(this.labelEncoderExtension, "labelEncoderExtension");
this.labelEncoderExtension.DataBindings.Add(new System.Windows.Forms.Binding("ImageKey", this.encodersBindingSource, "DotExtension", true, System.Windows.Forms.DataSourceUpdateMode.Never));
this.labelEncoderExtension.MinimumSize = new System.Drawing.Size(100, 16);
this.labelEncoderExtension.Name = "labelEncoderExtension";
//
@@ -1306,13 +1412,6 @@ namespace JDP {
//
resources.ApplyResources(this.columnHeader2, "columnHeader2");
//
// checkBoxCheckForUpdates
//
resources.ApplyResources(this.checkBoxCheckForUpdates, "checkBoxCheckForUpdates");
this.checkBoxCheckForUpdates.Name = "checkBoxCheckForUpdates";
this.toolTip1.SetToolTip(this.checkBoxCheckForUpdates, resources.GetString("checkBoxCheckForUpdates.ToolTip"));
this.checkBoxCheckForUpdates.UseVisualStyleBackColor = true;
//
// frmSettings
//
this.AcceptButton = this.btnOK;
@@ -1338,6 +1437,8 @@ namespace JDP {
((System.ComponentModel.ISupportInitialize)(this.numEncodeWhenConfidence)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numFixWhenConfidence)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numFixWhenPercent)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.encodersBindingSource)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.cUEConfigBindingSource)).EndInit();
this.grpAudioFilenames.ResumeLayout(false);
this.grpAudioFilenames.PerformLayout();
this.tabControl1.ResumeLayout(false);
@@ -1347,7 +1448,8 @@ namespace JDP {
this.groupBoxGaps.PerformLayout();
this.tabPage6.ResumeLayout(false);
this.groupBoxAlbumArt.ResumeLayout(false);
this.groupBoxAlbumArt.PerformLayout();
this.tableLayoutPanel3.ResumeLayout(false);
this.tableLayoutPanel3.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownMaxResolution)).EndInit();
this.groupBoxTagging.ResumeLayout(false);
this.groupBoxTagging.PerformLayout();
@@ -1355,9 +1457,10 @@ namespace JDP {
this.groupBoxARLog.ResumeLayout(false);
this.groupBoxARLog.PerformLayout();
this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout();
this.tableLayoutPanel2.ResumeLayout(false);
this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout();
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
this.groupBoxVerify.ResumeLayout(false);
this.groupBoxVerify.PerformLayout();
this.tabPage3.ResumeLayout(false);
@@ -1468,8 +1571,6 @@ namespace JDP {
private System.Windows.Forms.Label labelFormatDecoder;
private System.Windows.Forms.ComboBox comboFormatLosslessEncoder;
private System.Windows.Forms.Label labelFormatEncoder;
private System.Windows.Forms.ListView listViewEncoders;
private System.Windows.Forms.ColumnHeader columnHeader3;
private System.Windows.Forms.ListView listViewDecoders;
private System.Windows.Forms.ColumnHeader columnHeader4;
private System.Windows.Forms.ComboBox comboBoxEncoderExtension;
@@ -1526,6 +1627,17 @@ namespace JDP {
private System.Windows.Forms.RadioButton rbGapsLeftOut;
private System.Windows.Forms.RadioButton rbGapsPrepended;
private System.Windows.Forms.CheckBox checkBoxCheckForUpdates;
private System.Windows.Forms.BindingSource cUEConfigBindingSource;
private System.Windows.Forms.BindingSource encodersBindingSource;
private System.Windows.Forms.ListBox listBoxEncoders;
private System.Windows.Forms.TextBox textBoxEncoderName;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
private System.Windows.Forms.Button buttonEncoderDelete;
private System.Windows.Forms.Button buttonEncoderAdd;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
private System.Windows.Forms.TextBox textBoxAlArtFilenameFormat;
private System.Windows.Forms.Label labelEncoderName;
}
}

View File

@@ -32,7 +32,10 @@ namespace JDP {
}
}
private void frmSettings_Load(object sender, EventArgs e) {
private void frmSettings_Load(object sender, EventArgs e)
{
cUEConfigBindingSource.DataSource = _config;
chkReducePriority.Checked = _reducePriority;
checkBoxCheckForUpdates.Checked = _config.checkForUpdates;
chkAutoCorrectFilenames.Checked = _config.autoCorrectFilenames;
@@ -73,13 +76,13 @@ namespace JDP {
checkBoxWriteCUETags.Checked = _config.writeBasicTagsFromCUEData;
checkBoxCopyBasicTags.Checked = _config.copyBasicTags;
checkBoxCopyUnknownTags.Checked = _config.copyUnknownTags;
checkBoxCopyAlbumArt.Checked = _config.copyAlbumArt;
//checkBoxCopyAlbumArt.Checked = _config.copyAlbumArt;
checkBoxExtractAlbumArt.Checked = _config.extractAlbumArt;
checkBoxEmbedAlbumArt.Checked = _config.embedAlbumArt;
checkBoxARVerifyUseSourceFolder.Checked = _config.arLogToSourceFolder;
checkBoxARLogVerbose.Checked = _config.arLogVerbose;
checkBoxFixToNearest.Checked = _config.fixOffsetToNearest;
textBoxARLogExtension.Text = _config.arLogExtension;
//textBoxARLogExtension.Text = _config.arLogFilenameFormat;
numericUpDownMaxResolution.Value = _config.maxAlbumArtSize;
switch (_config.gapsHandling)
@@ -115,13 +118,6 @@ namespace JDP {
if (comboLanguage.SelectedItem == null)
comboLanguage.SelectedItem = comboLanguage.Items[0];
foreach (KeyValuePair<string, CUEToolsUDC> encoder in _config.encoders)
{
ListViewItem item = new ListViewItem(encoder.Key);
item.Tag = encoder.Value;
listViewEncoders.Items.Add(item);
}
//listViewEncoders.Items[0].Selected = true;
foreach (KeyValuePair<string, CUEToolsUDC> decoder in _config.decoders)
if (decoder.Value.path != null)
{
@@ -153,11 +149,9 @@ namespace JDP {
}
ComponentResourceManager resources = new ComponentResourceManager(typeof(frmCUETools));
listViewScriptConditions.Items.Add(resources.GetString("rbActionVerify.Text").Replace("&", ""));
listViewScriptConditions.Items.Add(resources.GetString("rbActionVerifyAndEncode.Text").Replace("&", ""));
listViewScriptConditions.Items.Add(resources.GetString("rbActionEncode.Text").Replace("&", ""));
listViewScriptConditions.Items[0].Tag = CUEAction.Verify;
listViewScriptConditions.Items[1].Tag = CUEAction.VerifyAndConvert;
listViewScriptConditions.Items[2].Tag = CUEAction.Convert;
EnableDisable();
}
@@ -194,8 +188,6 @@ namespace JDP {
{
if (listViewFormats.SelectedIndices.Count > 0)
listViewFormats.Items[listViewFormats.SelectedIndices[0]].Selected = false;
if (listViewEncoders.SelectedIndices.Count > 0)
listViewEncoders.Items[listViewEncoders.SelectedIndices[0]].Selected = false;
if (listViewDecoders.SelectedIndices.Count > 0)
listViewDecoders.Items[listViewDecoders.SelectedIndices[0]].Selected = false;
if (listViewScripts.SelectedItems.Count > 0)
@@ -245,14 +237,14 @@ namespace JDP {
_config.writeBasicTagsFromCUEData = checkBoxWriteCUETags.Checked ;
_config.copyBasicTags = checkBoxCopyBasicTags.Checked;
_config.copyUnknownTags = checkBoxCopyUnknownTags.Checked;
_config.copyAlbumArt = checkBoxCopyAlbumArt.Checked;
//_config.copyAlbumArt = checkBoxCopyAlbumArt.Checked;
_config.extractAlbumArt = checkBoxExtractAlbumArt.Checked;
_config.embedAlbumArt = checkBoxEmbedAlbumArt.Checked;
_config.arLogToSourceFolder = checkBoxARVerifyUseSourceFolder.Checked;
_config.arLogVerbose = checkBoxARLogVerbose.Checked;
_config.fixOffsetToNearest = checkBoxFixToNearest.Checked;
_config.arLogExtension = textBoxARLogExtension.Text;
//_config.arLogFilenameFormat = textBoxARLogExtension.Text;
_config.maxAlbumArtSize = (int) numericUpDownMaxResolution.Value;
_config.language = ((CultureInfo)comboLanguage.SelectedItem).Name;
@@ -313,8 +305,6 @@ namespace JDP {
{
if (listViewFormats.SelectedItems.Count > 0)
listViewFormats.SelectedItems[0].Selected = false;
if (listViewEncoders.SelectedItems.Count > 0)
listViewEncoders.SelectedItems[0].Selected = false;
if (listViewDecoders.SelectedItems.Count > 0)
listViewDecoders.SelectedItems[0].Selected = false;
if (listViewScripts.SelectedItems.Count > 0)
@@ -343,9 +333,9 @@ namespace JDP {
return;
}
foreach (KeyValuePair<string, CUEToolsUDC> encoder in _config.encoders)
if (encoder.Value.extension == format.extension)
encoder.Value.extension = e.Label;
foreach (CUEToolsUDC encoder in _config.encoders)
if (encoder.extension == format.extension)
encoder.extension = e.Label;
foreach (KeyValuePair<string, CUEToolsUDC> decoder in _config.decoders)
if (decoder.Value.extension == format.extension)
@@ -402,19 +392,13 @@ namespace JDP {
}
}
List<string> encodersToRemove = new List<string>();
foreach (KeyValuePair<string, CUEToolsUDC> encoder in _config.encoders)
if (encoder.Value.extension == format.extension)
encodersToRemove.Add(encoder.Key);
foreach (CUEToolsUDC encoder in _config.encoders)
if (encoder.extension == format.extension)
encodersToRemove.Add(encoder.name);
foreach (string encoder in encodersToRemove)
{
_config.encoders.Remove(encoder);
foreach (ListViewItem item in listViewEncoders.Items)
if (item.Text == encoder)
{
item.Remove();
break;
}
}
_config.encoders.Remove(_config.encoders[encoder]);
comboBoxEncoderExtension.Items.Remove(format.extension);
comboBoxDecoderExtension.Items.Remove(format.extension);
_config.formats.Remove(format.extension);
listViewFormats.SelectedItems[0].Remove();
break;
@@ -431,16 +415,16 @@ namespace JDP {
return;
comboFormatLosslessEncoder.Items.Clear();
foreach (KeyValuePair<string, CUEToolsUDC> encoder in _config.encoders)
if (encoder.Value.extension == format.extension && encoder.Value.lossless)
comboFormatLosslessEncoder.Items.Add(encoder.Key);
foreach (CUEToolsUDC encoder in _config.encoders)
if (encoder.extension == format.extension && encoder.lossless)
comboFormatLosslessEncoder.Items.Add(encoder);
comboFormatLosslessEncoder.SelectedItem = format.encoderLossless;
comboFormatLosslessEncoder.Enabled = format.allowLossless;
comboFormatLossyEncoder.Items.Clear();
foreach (KeyValuePair<string, CUEToolsUDC> encoder in _config.encoders)
if (encoder.Value.extension == format.extension && !encoder.Value.lossless)
comboFormatLossyEncoder.Items.Add(encoder.Key);
foreach (CUEToolsUDC encoder in _config.encoders)
if (encoder.extension == format.extension && !encoder.lossless)
comboFormatLossyEncoder.Items.Add(encoder);
comboFormatLossyEncoder.SelectedItem = format.encoderLossy;
comboFormatLossyEncoder.Enabled = format.allowLossy;
@@ -475,8 +459,8 @@ namespace JDP {
if (format == null)
return;
format.encoderLossless = (string)comboFormatLosslessEncoder.SelectedItem;
format.encoderLossy = (string)comboFormatLossyEncoder.SelectedItem;
format.encoderLossless = (CUEToolsUDC)comboFormatLosslessEncoder.SelectedItem;
format.encoderLossy = (CUEToolsUDC)comboFormatLossyEncoder.SelectedItem;
format.decoder = (string)comboFormatDecoder.SelectedItem;
if (!format.builtin)
{
@@ -491,151 +475,49 @@ namespace JDP {
private void comboBoxEncoderExtension_SelectedIndexChanged(object sender, EventArgs e)
{
labelEncoderExtension.ImageKey = "." + (string)comboBoxEncoderExtension.SelectedItem;
CUEToolsFormat format;
if (_config.formats.TryGetValue((string)comboBoxEncoderExtension.SelectedItem, out format))
// Setting DataSourceUpdateMode to OnPropertyChanged doesn't seem
// to do the trick, so updating manually
comboBoxEncoderExtension.DataBindings["SelectedItem"].WriteValue();
}
private void encodersBindingSource_CurrentItemChanged(object sender, EventArgs e)
{
checkBoxEncoderLossless.Enabled = format.allowLossless && format.allowLossy;
if (!checkBoxEncoderLossless.Enabled)
checkBoxEncoderLossless.Checked = format.allowLossless;
CUEToolsUDC encoder = encodersBindingSource.Current as CUEToolsUDC;
CUEToolsFormat format = _config.formats[encoder.extension]; // _config.formats.TryGetValue(encoder.extension, out format)
labelEncoderExtension.Visible = encoder != null;
comboBoxEncoderExtension.Visible = encoder != null;
comboBoxEncoderExtension.Enabled = encoder != null && encoder.path != null;
groupBoxExternalEncoder.Visible = encoder != null && encoder.path != null;
groupBoxLibFLAC.Visible = encoder != null && encoder.path == null && encoder.className == "FLACWriter";
groupBoxLibWavpack.Visible = encoder != null && encoder.path == null && encoder.className == "WavPackWriter";
groupBoxLibMAC_SDK.Visible = encoder != null && encoder.path == null && encoder.className == "APEWriter";
checkBoxEncoderLossless.Enabled = encoder != null && format != null && format.allowLossless && format.allowLossy;
if (!checkBoxEncoderLossless.Enabled && encoder != null && format != null && encoder.Lossless != format.allowLossless)
encoder.Lossless = format.allowLossless;
foreach (KeyValuePair<string, CUEToolsFormat> fmtEntry in _config.formats)
{
CUEToolsFormat fmt = fmtEntry.Value;
if (fmt.encoderLossless == encoder && (fmt.extension != encoder.extension || !encoder.Lossless))
fmt.encoderLossless = null;
if (fmt.encoderLossy == encoder && (fmt.extension != encoder.extension || encoder.Lossless))
fmt.encoderLossy = null;
}
}
private void listViewEncoders_ItemSelectionChanged(object sender, ListViewItemSelectionChangedEventArgs e)
{
if (e.IsSelected)
{
CUEToolsUDC encoder = (CUEToolsUDC)e.Item.Tag;
if (encoder == null) return;
comboBoxEncoderExtension.Visible = true;
comboBoxEncoderExtension.SelectedItem = encoder.extension;
labelEncoderExtension.Visible = true;
if (encoder.path != null)
{
CUEToolsFormat format;
comboBoxEncoderExtension.Enabled = true;
groupBoxExternalEncoder.Visible = true;
textBoxEncoderPath.Text = encoder.path;
textBoxEncoderParameters.Text = encoder.parameters;
textBoxEncoderModes.Text = encoder.supported_modes;
checkBoxEncoderLossless.Checked = encoder.lossless;
checkBoxEncoderLossless.Enabled = _config.formats.TryGetValue(encoder.extension, out format) && format.allowLossless && format.allowLossy;
}
else
{
comboBoxEncoderExtension.Enabled = false;
switch (encoder.className)
{
case "FLACWriter":
groupBoxLibFLAC.Visible = true;
break;
case "WavPackWriter":
groupBoxLibWavpack.Visible = true;
break;
case "APEWriter":
groupBoxLibMAC_SDK.Visible = true;
break;
}
}
}
else
{
CUEToolsUDC encoder = (CUEToolsUDC)e.Item.Tag;
if (encoder == null) return;
if (encoder.path != null)
{
if (encoder.extension != (string)comboBoxEncoderExtension.SelectedItem || encoder.lossless != checkBoxEncoderLossless.Checked)
{
if (listViewFormats.SelectedItems.Count > 0)
listViewFormats.SelectedItems[0].Selected = false;
CUEToolsFormat format;
if (_config.formats.TryGetValue(encoder.extension, out format))
{
if (format.encoderLossless == encoder.name)
format.encoderLossless = null;
if (format.encoderLossy == encoder.name)
format.encoderLossy = null;
}
encoder.extension = (string)comboBoxEncoderExtension.SelectedItem;
}
encoder.path = textBoxEncoderPath.Text;
encoder.parameters = textBoxEncoderParameters.Text;
encoder.supported_modes = textBoxEncoderModes.Text;
encoder.lossless = checkBoxEncoderLossless.Checked;
}
comboBoxEncoderExtension.Visible = false;
labelEncoderExtension.Visible = false;
groupBoxExternalEncoder.Visible = false;
groupBoxLibFLAC.Visible = false;
groupBoxLibWavpack.Visible = false;
groupBoxLibMAC_SDK.Visible = false;
}
}
private void listViewEncoders_BeforeLabelEdit(object sender, LabelEditEventArgs e)
{
CUEToolsUDC encoder = (CUEToolsUDC)listViewEncoders.Items[e.Item].Tag;
if (encoder.path == null)
e.CancelEdit = true;
}
private void listViewEncoders_AfterLabelEdit(object sender, LabelEditEventArgs e)
{
CUEToolsUDC encoder;
if (e.Label == null || _config.encoders.TryGetValue(e.Label, out encoder))
{
e.CancelEdit = true;
return;
}
encoder = (CUEToolsUDC) listViewEncoders.Items[e.Item].Tag;
if (listViewFormats.SelectedItems.Count > 0)
listViewFormats.SelectedItems[0].Selected = false;
if (_config.formats[encoder.extension].encoderLossless == encoder.name)
_config.formats[encoder.extension].encoderLossless = e.Label;
if (_config.formats[encoder.extension].encoderLossy == encoder.name)
_config.formats[encoder.extension].encoderLossy = e.Label;
_config.encoders.Remove(encoder.name);
encoder.name = e.Label;
_config.encoders.Add(encoder.name, encoder);
}
private void listViewEncoders_KeyDown(object sender, KeyEventArgs e)
private void listBoxEncoders_KeyDown(object sender, KeyEventArgs e)
{
switch (e.KeyCode)
{
case Keys.Insert:
{
CUEToolsUDC encoder;
if (_config.encoders.TryGetValue("new", out encoder))
return;
encoder = new CUEToolsUDC("new", "wav", true, "", "", "", "");
_config.encoders.Add("new", encoder);
ListViewItem item = new ListViewItem(encoder.name);
item.Tag = encoder;
listViewEncoders.Items.Add(item);
item.BeginEdit();
buttonEncoderAdd_Click(sender, e);
break;
}
case Keys.Delete:
{
if (listViewEncoders.SelectedItems.Count <= 0)
return;
CUEToolsUDC encoder = (CUEToolsUDC)listViewEncoders.SelectedItems[0].Tag;
if (encoder.path == null)
return;
if (_config.formats[encoder.extension].encoderLossless == encoder.name)
_config.formats[encoder.extension].encoderLossless = null;
if (_config.formats[encoder.extension].encoderLossy == encoder.name)
_config.formats[encoder.extension].encoderLossy = null;
_config.encoders.Remove(encoder.name);
listViewEncoders.Items.Remove(listViewEncoders.SelectedItems[0]);
buttonEncoderDelete_Click(sender, e);
break;
}
}
}
private void listViewDecoders_ItemSelectionChanged(object sender, ListViewItemSelectionChangedEventArgs e)
{
@@ -912,5 +794,22 @@ namespace JDP {
}
MessageBox.Show(this, "Script compiled successfully.", "Ok", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
private void buttonEncoderAdd_Click(object sender, EventArgs e)
{
encodersBindingSource.AddNew();
}
private void buttonEncoderDelete_Click(object sender, EventArgs e)
{
CUEToolsUDC encoder = encodersBindingSource.Current as CUEToolsUDC;
if (encoder == null || !encoder.CanBeDeleted)
return;
if (_config.formats[encoder.extension].encoderLossless == encoder)
_config.formats[encoder.extension].encoderLossless = null;
if (_config.formats[encoder.extension].encoderLossy == encoder)
_config.formats[encoder.extension].encoderLossy = null;
encodersBindingSource.RemoveCurrent();
}
}
}

File diff suppressed because it is too large Load Diff