diff --git a/ArCueDotNet/ArCueDotNet.csproj b/ArCueDotNet/ArCueDotNet.csproj index ff203bc..d2d818d 100644 --- a/ArCueDotNet/ArCueDotNet.csproj +++ b/ArCueDotNet/ArCueDotNet.csproj @@ -39,7 +39,7 @@ prompt - bin\x64\Release\ + ..\bin\x64\Release\ TRACE true pdbonly diff --git a/CUETools/CUETools.csproj b/CUETools/CUETools.csproj index 231aaf9..d1748b2 100644 --- a/CUETools/CUETools.csproj +++ b/CUETools/CUETools.csproj @@ -48,6 +48,8 @@ pdbonly x86 prompt + + true @@ -155,6 +157,7 @@ Settings.settings True + diff --git a/CUETools/Properties/Resources.Designer.cs b/CUETools/Properties/Resources.Designer.cs index 3164933..da22fe0 100644 --- a/CUETools/Properties/Resources.Designer.cs +++ b/CUETools/Properties/Resources.Designer.cs @@ -60,6 +60,24 @@ namespace JDP.Properties { } } + /// + /// Looks up a localized string similar to &Go. + /// + internal static string Go { + get { + return ResourceManager.GetString("Go", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Stop. + /// + internal static string Stop { + get { + return ResourceManager.GetString("Stop", resourceCulture); + } + } + /// /// Looks up a localized string similar to Verify. /// diff --git a/CUETools/Properties/Resources.resx b/CUETools/Properties/Resources.resx index a6953b8..e43aef8 100644 --- a/CUETools/Properties/Resources.resx +++ b/CUETools/Properties/Resources.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + &Go + + + Stop + Verify diff --git a/CUETools/Properties/Settings.Designer.cs b/CUETools/Properties/Settings.Designer.cs index 7ae0902..01969ef 100644 --- a/CUETools/Properties/Settings.Designer.cs +++ b/CUETools/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.832 +// Runtime Version:2.0.50727.1434 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/CUETools/frmCUETools.Designer.cs b/CUETools/frmCUETools.Designer.cs index 5459ff7..388837d 100644 --- a/CUETools/frmCUETools.Designer.cs +++ b/CUETools/frmCUETools.Designer.cs @@ -69,6 +69,8 @@ namespace JDP { this.toolStripProgressBar2 = new System.Windows.Forms.ToolStripProgressBar(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.btnCUECreator = new System.Windows.Forms.Button(); + this.btnStop = new System.Windows.Forms.Button(); + this.btnPause = new System.Windows.Forms.Button(); this.grpCUEPaths.SuspendLayout(); this.grpOutputStyle.SuspendLayout(); this.grpOutputPathGeneration.SuspendLayout(); @@ -79,125 +81,78 @@ namespace JDP { // // btnConvert // - this.btnConvert.AccessibleDescription = null; - this.btnConvert.AccessibleName = null; resources.ApplyResources(this.btnConvert, "btnConvert"); - this.btnConvert.BackgroundImage = null; - this.btnConvert.Font = null; this.btnConvert.Name = "btnConvert"; - this.toolTip1.SetToolTip(this.btnConvert, resources.GetString("btnConvert.ToolTip")); this.btnConvert.UseVisualStyleBackColor = true; this.btnConvert.Click += new System.EventHandler(this.btnConvert_Click); // // grpCUEPaths // - this.grpCUEPaths.AccessibleDescription = null; - this.grpCUEPaths.AccessibleName = null; - resources.ApplyResources(this.grpCUEPaths, "grpCUEPaths"); - this.grpCUEPaths.BackgroundImage = null; this.grpCUEPaths.Controls.Add(this.btnBrowseOutput); this.grpCUEPaths.Controls.Add(this.btnBrowseInput); this.grpCUEPaths.Controls.Add(this.lblOutput); this.grpCUEPaths.Controls.Add(this.lblInput); this.grpCUEPaths.Controls.Add(this.txtOutputPath); this.grpCUEPaths.Controls.Add(this.txtInputPath); - this.grpCUEPaths.Font = null; + resources.ApplyResources(this.grpCUEPaths, "grpCUEPaths"); this.grpCUEPaths.Name = "grpCUEPaths"; this.grpCUEPaths.TabStop = false; - this.toolTip1.SetToolTip(this.grpCUEPaths, resources.GetString("grpCUEPaths.ToolTip")); // // btnBrowseOutput // - this.btnBrowseOutput.AccessibleDescription = null; - this.btnBrowseOutput.AccessibleName = null; resources.ApplyResources(this.btnBrowseOutput, "btnBrowseOutput"); - this.btnBrowseOutput.BackgroundImage = null; - this.btnBrowseOutput.Font = null; this.btnBrowseOutput.Name = "btnBrowseOutput"; - this.toolTip1.SetToolTip(this.btnBrowseOutput, resources.GetString("btnBrowseOutput.ToolTip")); this.btnBrowseOutput.UseVisualStyleBackColor = true; this.btnBrowseOutput.Click += new System.EventHandler(this.btnBrowseOutput_Click); // // btnBrowseInput // - this.btnBrowseInput.AccessibleDescription = null; - this.btnBrowseInput.AccessibleName = null; resources.ApplyResources(this.btnBrowseInput, "btnBrowseInput"); - this.btnBrowseInput.BackgroundImage = null; - this.btnBrowseInput.Font = null; this.btnBrowseInput.Name = "btnBrowseInput"; - this.toolTip1.SetToolTip(this.btnBrowseInput, resources.GetString("btnBrowseInput.ToolTip")); this.btnBrowseInput.UseVisualStyleBackColor = true; this.btnBrowseInput.Click += new System.EventHandler(this.btnBrowseInput_Click); // // lblOutput // - this.lblOutput.AccessibleDescription = null; - this.lblOutput.AccessibleName = null; resources.ApplyResources(this.lblOutput, "lblOutput"); - this.lblOutput.Font = null; this.lblOutput.Name = "lblOutput"; - this.toolTip1.SetToolTip(this.lblOutput, resources.GetString("lblOutput.ToolTip")); // // lblInput // - this.lblInput.AccessibleDescription = null; - this.lblInput.AccessibleName = null; resources.ApplyResources(this.lblInput, "lblInput"); - this.lblInput.Font = null; this.lblInput.Name = "lblInput"; - this.toolTip1.SetToolTip(this.lblInput, resources.GetString("lblInput.ToolTip")); // // txtOutputPath // - this.txtOutputPath.AccessibleDescription = null; - this.txtOutputPath.AccessibleName = null; this.txtOutputPath.AllowDrop = true; resources.ApplyResources(this.txtOutputPath, "txtOutputPath"); - this.txtOutputPath.BackgroundImage = null; - this.txtOutputPath.Font = null; this.txtOutputPath.Name = "txtOutputPath"; - this.toolTip1.SetToolTip(this.txtOutputPath, resources.GetString("txtOutputPath.ToolTip")); this.txtOutputPath.DragDrop += new System.Windows.Forms.DragEventHandler(this.PathTextBox_DragDrop); this.txtOutputPath.DragEnter += new System.Windows.Forms.DragEventHandler(this.PathTextBox_DragEnter); // // txtInputPath // - this.txtInputPath.AccessibleDescription = null; - this.txtInputPath.AccessibleName = null; this.txtInputPath.AllowDrop = true; resources.ApplyResources(this.txtInputPath, "txtInputPath"); - this.txtInputPath.BackgroundImage = null; - this.txtInputPath.Font = null; this.txtInputPath.Name = "txtInputPath"; - this.toolTip1.SetToolTip(this.txtInputPath, resources.GetString("txtInputPath.ToolTip")); this.txtInputPath.TextChanged += new System.EventHandler(this.txtInputPath_TextChanged); this.txtInputPath.DragDrop += new System.Windows.Forms.DragEventHandler(this.PathTextBox_DragDrop); this.txtInputPath.DragEnter += new System.Windows.Forms.DragEventHandler(this.PathTextBox_DragEnter); // // grpOutputStyle // - this.grpOutputStyle.AccessibleDescription = null; - this.grpOutputStyle.AccessibleName = null; - resources.ApplyResources(this.grpOutputStyle, "grpOutputStyle"); - this.grpOutputStyle.BackgroundImage = null; this.grpOutputStyle.Controls.Add(this.rbEmbedCUE); this.grpOutputStyle.Controls.Add(this.rbGapsLeftOut); this.grpOutputStyle.Controls.Add(this.rbGapsPrepended); this.grpOutputStyle.Controls.Add(this.rbGapsAppended); this.grpOutputStyle.Controls.Add(this.rbSingleFile); - this.grpOutputStyle.Font = null; + resources.ApplyResources(this.grpOutputStyle, "grpOutputStyle"); this.grpOutputStyle.Name = "grpOutputStyle"; this.grpOutputStyle.TabStop = false; - this.toolTip1.SetToolTip(this.grpOutputStyle, resources.GetString("grpOutputStyle.ToolTip")); // // rbEmbedCUE // - this.rbEmbedCUE.AccessibleDescription = null; - this.rbEmbedCUE.AccessibleName = null; resources.ApplyResources(this.rbEmbedCUE, "rbEmbedCUE"); - this.rbEmbedCUE.BackgroundImage = null; - this.rbEmbedCUE.Font = null; this.rbEmbedCUE.Name = "rbEmbedCUE"; this.rbEmbedCUE.TabStop = true; this.toolTip1.SetToolTip(this.rbEmbedCUE, resources.GetString("rbEmbedCUE.ToolTip")); @@ -206,45 +161,29 @@ namespace JDP { // // rbGapsLeftOut // - this.rbGapsLeftOut.AccessibleDescription = null; - this.rbGapsLeftOut.AccessibleName = null; resources.ApplyResources(this.rbGapsLeftOut, "rbGapsLeftOut"); - this.rbGapsLeftOut.BackgroundImage = null; - this.rbGapsLeftOut.Font = null; this.rbGapsLeftOut.Name = "rbGapsLeftOut"; this.toolTip1.SetToolTip(this.rbGapsLeftOut, resources.GetString("rbGapsLeftOut.ToolTip")); this.rbGapsLeftOut.UseVisualStyleBackColor = true; // // rbGapsPrepended // - this.rbGapsPrepended.AccessibleDescription = null; - this.rbGapsPrepended.AccessibleName = null; resources.ApplyResources(this.rbGapsPrepended, "rbGapsPrepended"); - this.rbGapsPrepended.BackgroundImage = null; - this.rbGapsPrepended.Font = null; this.rbGapsPrepended.Name = "rbGapsPrepended"; this.toolTip1.SetToolTip(this.rbGapsPrepended, resources.GetString("rbGapsPrepended.ToolTip")); this.rbGapsPrepended.UseVisualStyleBackColor = true; // // rbGapsAppended // - this.rbGapsAppended.AccessibleDescription = null; - this.rbGapsAppended.AccessibleName = null; resources.ApplyResources(this.rbGapsAppended, "rbGapsAppended"); - this.rbGapsAppended.BackgroundImage = null; - this.rbGapsAppended.Font = null; this.rbGapsAppended.Name = "rbGapsAppended"; this.toolTip1.SetToolTip(this.rbGapsAppended, resources.GetString("rbGapsAppended.ToolTip")); this.rbGapsAppended.UseVisualStyleBackColor = true; // // rbSingleFile // - this.rbSingleFile.AccessibleDescription = null; - this.rbSingleFile.AccessibleName = null; resources.ApplyResources(this.rbSingleFile, "rbSingleFile"); - this.rbSingleFile.BackgroundImage = null; this.rbSingleFile.Checked = true; - this.rbSingleFile.Font = null; this.rbSingleFile.Name = "rbSingleFile"; this.rbSingleFile.TabStop = true; this.toolTip1.SetToolTip(this.rbSingleFile, resources.GetString("rbSingleFile.ToolTip")); @@ -252,22 +191,13 @@ namespace JDP { // // btnAbout // - this.btnAbout.AccessibleDescription = null; - this.btnAbout.AccessibleName = null; resources.ApplyResources(this.btnAbout, "btnAbout"); - this.btnAbout.BackgroundImage = null; - this.btnAbout.Font = null; this.btnAbout.Name = "btnAbout"; - this.toolTip1.SetToolTip(this.btnAbout, resources.GetString("btnAbout.ToolTip")); this.btnAbout.UseVisualStyleBackColor = true; this.btnAbout.Click += new System.EventHandler(this.btnAbout_Click); // // grpOutputPathGeneration // - this.grpOutputPathGeneration.AccessibleDescription = null; - this.grpOutputPathGeneration.AccessibleName = null; - resources.ApplyResources(this.grpOutputPathGeneration, "grpOutputPathGeneration"); - this.grpOutputPathGeneration.BackgroundImage = null; this.grpOutputPathGeneration.Controls.Add(this.txtCustomFormat); this.grpOutputPathGeneration.Controls.Add(this.rbCustomFormat); this.grpOutputPathGeneration.Controls.Add(this.txtCreateSubdirectory); @@ -275,130 +205,80 @@ namespace JDP { this.grpOutputPathGeneration.Controls.Add(this.rbCreateSubdirectory); this.grpOutputPathGeneration.Controls.Add(this.rbAppendFilename); this.grpOutputPathGeneration.Controls.Add(this.txtAppendFilename); - this.grpOutputPathGeneration.Font = null; + resources.ApplyResources(this.grpOutputPathGeneration, "grpOutputPathGeneration"); this.grpOutputPathGeneration.Name = "grpOutputPathGeneration"; this.grpOutputPathGeneration.TabStop = false; - this.toolTip1.SetToolTip(this.grpOutputPathGeneration, resources.GetString("grpOutputPathGeneration.ToolTip")); // // txtCustomFormat // - this.txtCustomFormat.AccessibleDescription = null; - this.txtCustomFormat.AccessibleName = null; resources.ApplyResources(this.txtCustomFormat, "txtCustomFormat"); - this.txtCustomFormat.BackgroundImage = null; - this.txtCustomFormat.Font = null; this.txtCustomFormat.Name = "txtCustomFormat"; - this.toolTip1.SetToolTip(this.txtCustomFormat, resources.GetString("txtCustomFormat.ToolTip")); this.txtCustomFormat.TextChanged += new System.EventHandler(this.txtCustomFormat_TextChanged); // // rbCustomFormat // - this.rbCustomFormat.AccessibleDescription = null; - this.rbCustomFormat.AccessibleName = null; resources.ApplyResources(this.rbCustomFormat, "rbCustomFormat"); - this.rbCustomFormat.BackgroundImage = null; - this.rbCustomFormat.Font = null; this.rbCustomFormat.Name = "rbCustomFormat"; this.rbCustomFormat.TabStop = true; - this.toolTip1.SetToolTip(this.rbCustomFormat, resources.GetString("rbCustomFormat.ToolTip")); this.rbCustomFormat.UseVisualStyleBackColor = true; this.rbCustomFormat.CheckedChanged += new System.EventHandler(this.rbCustomFormat_CheckedChanged); // // txtCreateSubdirectory // - this.txtCreateSubdirectory.AccessibleDescription = null; - this.txtCreateSubdirectory.AccessibleName = null; resources.ApplyResources(this.txtCreateSubdirectory, "txtCreateSubdirectory"); - this.txtCreateSubdirectory.BackgroundImage = null; - this.txtCreateSubdirectory.Font = null; this.txtCreateSubdirectory.Name = "txtCreateSubdirectory"; - this.toolTip1.SetToolTip(this.txtCreateSubdirectory, resources.GetString("txtCreateSubdirectory.ToolTip")); this.txtCreateSubdirectory.TextChanged += new System.EventHandler(this.txtCreateSubdirectory_TextChanged); // // rbDontGenerate // - this.rbDontGenerate.AccessibleDescription = null; - this.rbDontGenerate.AccessibleName = null; resources.ApplyResources(this.rbDontGenerate, "rbDontGenerate"); - this.rbDontGenerate.BackgroundImage = null; - this.rbDontGenerate.Font = null; this.rbDontGenerate.Name = "rbDontGenerate"; - this.toolTip1.SetToolTip(this.rbDontGenerate, resources.GetString("rbDontGenerate.ToolTip")); this.rbDontGenerate.UseVisualStyleBackColor = true; // // rbCreateSubdirectory // - this.rbCreateSubdirectory.AccessibleDescription = null; - this.rbCreateSubdirectory.AccessibleName = null; resources.ApplyResources(this.rbCreateSubdirectory, "rbCreateSubdirectory"); - this.rbCreateSubdirectory.BackgroundImage = null; this.rbCreateSubdirectory.Checked = true; - this.rbCreateSubdirectory.Font = null; this.rbCreateSubdirectory.Name = "rbCreateSubdirectory"; this.rbCreateSubdirectory.TabStop = true; - this.toolTip1.SetToolTip(this.rbCreateSubdirectory, resources.GetString("rbCreateSubdirectory.ToolTip")); this.rbCreateSubdirectory.UseVisualStyleBackColor = true; this.rbCreateSubdirectory.CheckedChanged += new System.EventHandler(this.rbCreateSubdirectory_CheckedChanged); // // rbAppendFilename // - this.rbAppendFilename.AccessibleDescription = null; - this.rbAppendFilename.AccessibleName = null; resources.ApplyResources(this.rbAppendFilename, "rbAppendFilename"); - this.rbAppendFilename.BackgroundImage = null; - this.rbAppendFilename.Font = null; this.rbAppendFilename.Name = "rbAppendFilename"; - this.toolTip1.SetToolTip(this.rbAppendFilename, resources.GetString("rbAppendFilename.ToolTip")); this.rbAppendFilename.UseVisualStyleBackColor = true; this.rbAppendFilename.CheckedChanged += new System.EventHandler(this.rbAppendFilename_CheckedChanged); // // txtAppendFilename // - this.txtAppendFilename.AccessibleDescription = null; - this.txtAppendFilename.AccessibleName = null; resources.ApplyResources(this.txtAppendFilename, "txtAppendFilename"); - this.txtAppendFilename.BackgroundImage = null; - this.txtAppendFilename.Font = null; this.txtAppendFilename.Name = "txtAppendFilename"; - this.toolTip1.SetToolTip(this.txtAppendFilename, resources.GetString("txtAppendFilename.ToolTip")); this.txtAppendFilename.TextChanged += new System.EventHandler(this.txtAppendFilename_TextChanged); // // grpAudioOutput // - this.grpAudioOutput.AccessibleDescription = null; - this.grpAudioOutput.AccessibleName = null; - resources.ApplyResources(this.grpAudioOutput, "grpAudioOutput"); - this.grpAudioOutput.BackgroundImage = null; this.grpAudioOutput.Controls.Add(this.rbAPE); this.grpAudioOutput.Controls.Add(this.rbNoAudio); this.grpAudioOutput.Controls.Add(this.rbWavPack); this.grpAudioOutput.Controls.Add(this.rbFLAC); this.grpAudioOutput.Controls.Add(this.rbWAV); - this.grpAudioOutput.Font = null; + resources.ApplyResources(this.grpAudioOutput, "grpAudioOutput"); this.grpAudioOutput.Name = "grpAudioOutput"; this.grpAudioOutput.TabStop = false; - this.toolTip1.SetToolTip(this.grpAudioOutput, resources.GetString("grpAudioOutput.ToolTip")); // // rbAPE // - this.rbAPE.AccessibleDescription = null; - this.rbAPE.AccessibleName = null; resources.ApplyResources(this.rbAPE, "rbAPE"); - this.rbAPE.BackgroundImage = null; - this.rbAPE.Font = null; this.rbAPE.Name = "rbAPE"; this.rbAPE.TabStop = true; - this.toolTip1.SetToolTip(this.rbAPE, resources.GetString("rbAPE.ToolTip")); this.rbAPE.UseVisualStyleBackColor = true; this.rbAPE.CheckedChanged += new System.EventHandler(this.rbAPE_CheckedChanged); // // rbNoAudio // - this.rbNoAudio.AccessibleDescription = null; - this.rbNoAudio.AccessibleName = null; resources.ApplyResources(this.rbNoAudio, "rbNoAudio"); - this.rbNoAudio.BackgroundImage = null; - this.rbNoAudio.Font = null; this.rbNoAudio.Name = "rbNoAudio"; this.toolTip1.SetToolTip(this.rbNoAudio, resources.GetString("rbNoAudio.ToolTip")); this.rbNoAudio.UseVisualStyleBackColor = true; @@ -406,135 +286,84 @@ namespace JDP { // // rbWavPack // - this.rbWavPack.AccessibleDescription = null; - this.rbWavPack.AccessibleName = null; resources.ApplyResources(this.rbWavPack, "rbWavPack"); - this.rbWavPack.BackgroundImage = null; - this.rbWavPack.Font = null; this.rbWavPack.Name = "rbWavPack"; - this.toolTip1.SetToolTip(this.rbWavPack, resources.GetString("rbWavPack.ToolTip")); this.rbWavPack.UseVisualStyleBackColor = true; this.rbWavPack.CheckedChanged += new System.EventHandler(this.rbWavPack_CheckedChanged); // // rbFLAC // - this.rbFLAC.AccessibleDescription = null; - this.rbFLAC.AccessibleName = null; resources.ApplyResources(this.rbFLAC, "rbFLAC"); - this.rbFLAC.BackgroundImage = null; - this.rbFLAC.Font = null; this.rbFLAC.Name = "rbFLAC"; - this.toolTip1.SetToolTip(this.rbFLAC, resources.GetString("rbFLAC.ToolTip")); this.rbFLAC.UseVisualStyleBackColor = true; this.rbFLAC.CheckedChanged += new System.EventHandler(this.rbFLAC_CheckedChanged); // // rbWAV // - this.rbWAV.AccessibleDescription = null; - this.rbWAV.AccessibleName = null; resources.ApplyResources(this.rbWAV, "rbWAV"); - this.rbWAV.BackgroundImage = null; this.rbWAV.Checked = true; - this.rbWAV.Font = null; this.rbWAV.Name = "rbWAV"; this.rbWAV.TabStop = true; - this.toolTip1.SetToolTip(this.rbWAV, resources.GetString("rbWAV.ToolTip")); this.rbWAV.UseVisualStyleBackColor = true; this.rbWAV.CheckedChanged += new System.EventHandler(this.rbWAV_CheckedChanged); // // btnBatch // - this.btnBatch.AccessibleDescription = null; - this.btnBatch.AccessibleName = null; resources.ApplyResources(this.btnBatch, "btnBatch"); - this.btnBatch.BackgroundImage = null; - this.btnBatch.Font = null; this.btnBatch.Name = "btnBatch"; - this.toolTip1.SetToolTip(this.btnBatch, resources.GetString("btnBatch.ToolTip")); this.btnBatch.UseVisualStyleBackColor = true; this.btnBatch.Click += new System.EventHandler(this.btnBatch_Click); // // btnFilenameCorrector // - this.btnFilenameCorrector.AccessibleDescription = null; - this.btnFilenameCorrector.AccessibleName = null; resources.ApplyResources(this.btnFilenameCorrector, "btnFilenameCorrector"); - this.btnFilenameCorrector.BackgroundImage = null; - this.btnFilenameCorrector.Font = null; this.btnFilenameCorrector.Name = "btnFilenameCorrector"; - this.toolTip1.SetToolTip(this.btnFilenameCorrector, resources.GetString("btnFilenameCorrector.ToolTip")); this.btnFilenameCorrector.UseVisualStyleBackColor = true; this.btnFilenameCorrector.Click += new System.EventHandler(this.btnFilenameCorrector_Click); // // btnSettings // - this.btnSettings.AccessibleDescription = null; - this.btnSettings.AccessibleName = null; resources.ApplyResources(this.btnSettings, "btnSettings"); - this.btnSettings.BackgroundImage = null; - this.btnSettings.Font = null; this.btnSettings.Name = "btnSettings"; - this.toolTip1.SetToolTip(this.btnSettings, resources.GetString("btnSettings.ToolTip")); this.btnSettings.UseVisualStyleBackColor = true; this.btnSettings.Click += new System.EventHandler(this.btnSettings_Click); // // grpAccurateRip // - this.grpAccurateRip.AccessibleDescription = null; - this.grpAccurateRip.AccessibleName = null; - resources.ApplyResources(this.grpAccurateRip, "grpAccurateRip"); - this.grpAccurateRip.BackgroundImage = null; this.grpAccurateRip.Controls.Add(this.label1); this.grpAccurateRip.Controls.Add(this.txtDataTrackLength); this.grpAccurateRip.Controls.Add(this.rbArApplyOffset); this.grpAccurateRip.Controls.Add(this.rbArVerify); this.grpAccurateRip.Controls.Add(this.rbArNone); - this.grpAccurateRip.Font = null; + resources.ApplyResources(this.grpAccurateRip, "grpAccurateRip"); this.grpAccurateRip.Name = "grpAccurateRip"; this.grpAccurateRip.TabStop = false; - this.toolTip1.SetToolTip(this.grpAccurateRip, resources.GetString("grpAccurateRip.ToolTip")); // // label1 // - this.label1.AccessibleDescription = null; - this.label1.AccessibleName = null; resources.ApplyResources(this.label1, "label1"); - this.label1.Font = null; this.label1.Name = "label1"; - this.toolTip1.SetToolTip(this.label1, resources.GetString("label1.ToolTip")); // // txtDataTrackLength // - this.txtDataTrackLength.AccessibleDescription = null; - this.txtDataTrackLength.AccessibleName = null; - resources.ApplyResources(this.txtDataTrackLength, "txtDataTrackLength"); - this.txtDataTrackLength.BackgroundImage = null; this.txtDataTrackLength.Culture = new System.Globalization.CultureInfo(""); this.txtDataTrackLength.CutCopyMaskFormat = System.Windows.Forms.MaskFormat.IncludePromptAndLiterals; - this.txtDataTrackLength.Font = null; this.txtDataTrackLength.InsertKeyMode = System.Windows.Forms.InsertKeyMode.Overwrite; + resources.ApplyResources(this.txtDataTrackLength, "txtDataTrackLength"); this.txtDataTrackLength.Name = "txtDataTrackLength"; this.txtDataTrackLength.TextMaskFormat = System.Windows.Forms.MaskFormat.IncludePromptAndLiterals; this.toolTip1.SetToolTip(this.txtDataTrackLength, resources.GetString("txtDataTrackLength.ToolTip")); // // rbArApplyOffset // - this.rbArApplyOffset.AccessibleDescription = null; - this.rbArApplyOffset.AccessibleName = null; resources.ApplyResources(this.rbArApplyOffset, "rbArApplyOffset"); - this.rbArApplyOffset.BackgroundImage = null; - this.rbArApplyOffset.Font = null; this.rbArApplyOffset.Name = "rbArApplyOffset"; this.toolTip1.SetToolTip(this.rbArApplyOffset, resources.GetString("rbArApplyOffset.ToolTip")); this.rbArApplyOffset.UseVisualStyleBackColor = true; // // rbArVerify // - this.rbArVerify.AccessibleDescription = null; - this.rbArVerify.AccessibleName = null; resources.ApplyResources(this.rbArVerify, "rbArVerify"); - this.rbArVerify.BackgroundImage = null; - this.rbArVerify.Font = null; this.rbArVerify.Name = "rbArVerify"; this.toolTip1.SetToolTip(this.rbArVerify, resources.GetString("rbArVerify.ToolTip")); this.rbArVerify.UseVisualStyleBackColor = true; @@ -542,12 +371,8 @@ namespace JDP { // // rbArNone // - this.rbArNone.AccessibleDescription = null; - this.rbArNone.AccessibleName = null; resources.ApplyResources(this.rbArNone, "rbArNone"); - this.rbArNone.BackgroundImage = null; this.rbArNone.Checked = true; - this.rbArNone.Font = null; this.rbArNone.Name = "rbArNone"; this.rbArNone.TabStop = true; this.toolTip1.SetToolTip(this.rbArNone, resources.GetString("rbArNone.ToolTip")); @@ -555,44 +380,32 @@ namespace JDP { // // statusStrip1 // - this.statusStrip1.AccessibleDescription = null; - this.statusStrip1.AccessibleName = null; - resources.ApplyResources(this.statusStrip1, "statusStrip1"); - this.statusStrip1.BackgroundImage = null; - this.statusStrip1.Font = null; this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripStatusLabel1, this.toolStripProgressBar1, this.toolStripProgressBar2}); + resources.ApplyResources(this.statusStrip1, "statusStrip1"); this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.SizingGrip = false; - this.toolTip1.SetToolTip(this.statusStrip1, resources.GetString("statusStrip1.ToolTip")); // // toolStripStatusLabel1 // - this.toolStripStatusLabel1.AccessibleDescription = null; - this.toolStripStatusLabel1.AccessibleName = null; - resources.ApplyResources(this.toolStripStatusLabel1, "toolStripStatusLabel1"); - this.toolStripStatusLabel1.BackgroundImage = null; this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; + resources.ApplyResources(this.toolStripStatusLabel1, "toolStripStatusLabel1"); this.toolStripStatusLabel1.Spring = true; // // toolStripProgressBar1 // - this.toolStripProgressBar1.AccessibleDescription = null; - this.toolStripProgressBar1.AccessibleName = null; - resources.ApplyResources(this.toolStripProgressBar1, "toolStripProgressBar1"); this.toolStripProgressBar1.AutoToolTip = true; this.toolStripProgressBar1.Name = "toolStripProgressBar1"; + resources.ApplyResources(this.toolStripProgressBar1, "toolStripProgressBar1"); this.toolStripProgressBar1.Style = System.Windows.Forms.ProgressBarStyle.Continuous; // // toolStripProgressBar2 // - this.toolStripProgressBar2.AccessibleDescription = null; - this.toolStripProgressBar2.AccessibleName = null; - resources.ApplyResources(this.toolStripProgressBar2, "toolStripProgressBar2"); this.toolStripProgressBar2.AutoToolTip = true; this.toolStripProgressBar2.Name = "toolStripProgressBar2"; + resources.ApplyResources(this.toolStripProgressBar2, "toolStripProgressBar2"); this.toolStripProgressBar2.Style = System.Windows.Forms.ProgressBarStyle.Continuous; // // toolTip1 @@ -603,23 +416,31 @@ namespace JDP { // // btnCUECreator // - this.btnCUECreator.AccessibleDescription = null; - this.btnCUECreator.AccessibleName = null; resources.ApplyResources(this.btnCUECreator, "btnCUECreator"); - this.btnCUECreator.BackgroundImage = null; - this.btnCUECreator.Font = null; this.btnCUECreator.Name = "btnCUECreator"; - this.toolTip1.SetToolTip(this.btnCUECreator, resources.GetString("btnCUECreator.ToolTip")); this.btnCUECreator.UseVisualStyleBackColor = true; this.btnCUECreator.Click += new System.EventHandler(this.btnCUECreator_Click); // + // btnStop + // + resources.ApplyResources(this.btnStop, "btnStop"); + this.btnStop.Name = "btnStop"; + this.btnStop.UseVisualStyleBackColor = true; + this.btnStop.Click += new System.EventHandler(this.btnStop_Click); + // + // btnPause + // + resources.ApplyResources(this.btnPause, "btnPause"); + this.btnPause.Name = "btnPause"; + this.btnPause.UseVisualStyleBackColor = true; + this.btnPause.Click += new System.EventHandler(this.btnPause_Click); + // // frmCUETools // - this.AccessibleDescription = null; - this.AccessibleName = null; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackgroundImage = null; + this.Controls.Add(this.btnPause); + this.Controls.Add(this.btnStop); this.Controls.Add(this.btnCUECreator); this.Controls.Add(this.statusStrip1); this.Controls.Add(this.grpAccurateRip); @@ -633,10 +454,8 @@ namespace JDP { this.Controls.Add(this.grpCUEPaths); this.Controls.Add(this.btnConvert); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Icon = null; this.MaximizeBox = false; this.Name = "frmCUETools"; - this.toolTip1.SetToolTip(this, resources.GetString("$this.ToolTip")); this.Load += new System.EventHandler(this.frmCUETools_Load); this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.frmCUETools_FormClosed); this.grpCUEPaths.ResumeLayout(false); @@ -702,6 +521,8 @@ namespace JDP { private System.Windows.Forms.MaskedTextBox txtDataTrackLength; private System.Windows.Forms.Label label1; private System.Windows.Forms.RadioButton rbAPE; + private System.Windows.Forms.Button btnStop; + private System.Windows.Forms.Button btnPause; } } diff --git a/CUETools/frmCUETools.cs b/CUETools/frmCUETools.cs index 6c62d3c..dc2e690 100644 --- a/CUETools/frmCUETools.cs +++ b/CUETools/frmCUETools.cs @@ -74,13 +74,10 @@ namespace JDP { } private void btnConvert_Click(object sender, EventArgs e) { - if ((_workThread != null) && (_workThread.IsAlive)) { - _workClass.Stop(); - } - else { - if (!CheckWriteOffset()) return; - StartConvert(); - } + if ((_workThread != null) && (_workThread.IsAlive)) + return; + if (!CheckWriteOffset()) return; + StartConvert(); } private void btnBatch_Click(object sender, EventArgs e) { @@ -409,7 +406,10 @@ namespace JDP { btnFilenameCorrector.Enabled = !running; btnCUECreator.Enabled = !running; btnBatch.Enabled = !running; - btnConvert.Text = running ? "&Stop" : "&Go"; + btnConvert.Enabled = !running; + btnConvert.Visible = !running; + btnStop.Enabled = btnPause.Enabled = running; + btnStop.Visible = btnPause.Visible = running; toolStripStatusLabel1.Text = String.Empty; toolStripProgressBar1.Value = 0; toolStripProgressBar2.Value = 0; @@ -909,6 +909,18 @@ namespace JDP { { updateOutputStyles(); } + + private void btnStop_Click(object sender, EventArgs e) + { + if ((_workThread != null) && (_workThread.IsAlive)) + _workClass.Stop(); + } + + private void btnPause_Click(object sender, EventArgs e) + { + if ((_workThread != null) && (_workThread.IsAlive)) + _workClass.Pause(); + } } enum OutputPathGeneration { diff --git a/CUETools/frmCUETools.resx b/CUETools/frmCUETools.resx index 24f86c2..2b3ca51 100644 --- a/CUETools/frmCUETools.resx +++ b/CUETools/frmCUETools.resx @@ -117,1225 +117,1192 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - - - 54, 21 - - - - - - 00:00:00 - - - 178, 21 - - - 178, 21 - - - - - - - 4 - - - rbGapsLeftOut - - - 0 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - CUE Style - - - - NoControl - - - 1 - - - grpOutputPathGeneration - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 5 - - - grpCUEPaths - - - Gaps Left Out - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpOutputStyle - - - %1:-2\New\%-1\%F.cue - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpOutputPathGeneration - - - 4 - - - 4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 78, 86 - - - 10 - - - 0 - - - 0 - - - 330, 115 - - - grpAccurateRip - - - System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - CenterScreen - - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 551, 361 - - - 0 - - - btnAbout - - - rbEmbedCUE - - - - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - lblInput - - - 1 - - - - - - 3 - - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - btnBrowseInput - - - True - - - txtCreateSubdirectory - - - 5 - - - frmCUETools - - - 6 - - - - - - rbWavPack - - - Browse... - - - btnConvert - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - - - - Batch... - - - 3 - - - Verify, &then encode - - - 11 - - - rbArVerify - - - 1 - - - Create single file with embedded CUE sheet. - - - 535, 84 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 7 - - - rbAPE - - - Append to filename: - - - $this - - - rbGapsPrepended - - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - rbGapsAppended - - - grpAccurateRip - - - 244, 211 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 123, 17 - - - 1 - - - 551, 22 - - - NoControl - - - 3 - - - grpOutputPathGeneration - - - True - - - True - - - $this - - - &None - - - 7 - - - 122, 17 - - - True - - - 3 - - - btnBrowseOutput - - - 3 - - - 6 - - - Advanced Settings... - - - 8, 24 - - - 412, 245 - - - True - - - 1 - - - rbDontGenerate - - - 385, 21 - - - True - - - grpAudioOutput - - - 0 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - btnFilenameCorrector - - - 71, 23 - - - CUE Paths + + 412, 307 131, 23 - - True - - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 2 - - - $this - - - 3 - - - $this - - - grpCUEPaths - - - 10, 51 - - - &WAV - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 412, 152 - - - 4 - - - 10, 85 - - - 131, 23 - - - True - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 452, 20 - - - btnSettings - - - - - - $this - - - 4 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.MaskedTextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 50, 17 - - - 2 - - - grpAccurateRip - - - Wav&Pack - - - toolStripStatusLabel1 - - - 2 - - - &Manual - - - 8, 4 - - - grpOutputStyle - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - rbSingleFile - - - Create multiple files with gaps left out - - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 2 - - - Tahoma, 8.25pt - - - &Output: - - - - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - grpOutputPathGeneration - - - 10, 66 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 92, 119 - - - 2 - - + + 5 - - Track progress - - - True - - - 4 - - - APE - - - Filename Corrector... - - - 104, 17 - - - grpOutputPathGeneration - - - 10, 34 - - - Not used for normal music CDs. Enhanced CDs with data tracks cannot be found in database unless you know the length of the data track. You can often find it in EAC log. If EAC log is found next to the CUE sheet, it will be parsed automaticly and you won't have to enter anything here. - - - 0 - - - 144, 119 - - - - - - 3 - - - 69, 17 - - - True - - - grpOutputPathGeneration - - - 1 - - - grpAudioOutput - - - 1 - - - $this - - - About - - - lblOutput - - - grpOutputStyle - &Go - - txtInputPath + + btnConvert - - 412, 307 - - - 0, 339 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 2 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - AccurateRip - - - 412, 183 - - - grpOutputStyle - - - btnCUECreator - - - 44, 17 - - - 8, 211 - - - 10, 54 - - - &Single File + CUE - - - 10, 89 - - - 5 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - C&reate subdirectory: - - - Browse... - - - - - - 0 - - - 4 - - + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 140, 20 - - - 0 - - - 125, 17 - - - grpAudioOutput - - - txtCustomFormat - - - 412, 276 - - + $this - - 45, 13 - - - grpOutputPathGeneration - - - statusStrip1 - - - - - - - - - 120, 17 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - rbWAV - - - Create single file + CUE sheet - - - - - - 10, 20 - - - 92, 17 - - - toolTip1 - - - 1 - - - 131, 23 - - - 8, 92 - - - Disk progress - - - True + + 13 452, 49 - - &FLAC + + 71, 23 - - Output Path + + 5 - - + + Browse... - + + btnBrowseOutput + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpCUEPaths + + + 0 + + + 452, 20 + + + 71, 23 + + + 2 + + + Browse... + + + btnBrowseInput + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpCUEPaths + + + 1 + + True - - - - - 106, 17 - - - 59, 22 - - - - - - $this - 8, 52 - - Create multiple files with gaps appended + + 45, 13 - - New + + 3 - - + + &Output: - + + lblOutput + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpCUEPaths + + 2 - - 140, 16 + + True - - + + 8, 24 - - $this + + 37, 13 + + + 0 + + + &Input: + + + lblInput + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpCUEPaths + + + 3 + + + 59, 48 + + + 385, 21 + + + 4 txtOutputPath - - 6 - - - 140, 41 - - - txtAppendFilename - - - - - - Contact the AccurateRip databse for validation and compare the image against database - - - 11, 87 - - - System.Windows.Forms.ToolStripProgressBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 140, 16 - - - System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 - - - 1 - - - grpOutputStyle - - - True - - - 6, 13 - - - grpAccurateRip - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 grpCUEPaths - - 8, 89 + + 4 - - 0 + + 59, 22 - - -New + + 385, 21 - - 122, 17 - - - 11, 19 - - - label1 - - - 10, 43 - - - 3 - - - 10, 37 - - - 252, 17 - - - Data track: - - - True - - - 8 - - - Don't create any audio files, only CUE sheet - - - grpAudioOutput - - + 1 - - 2 + + txtInputPath - - 9 - - - grpAccurateRip - - - 178, 21 - - - rbCustomFormat - - - 61, 13 - - - grpAccurateRip - - - Audio Output - - - 128, 119 - - - rbAppendFilename - - - Create multiple files with gaps prepended - - - 2 - - - Use custom format: - - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 37, 13 - - - 3 - - - 3 - - - statusStrip1 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - On the first pass, verify and try to find an offset correction which makes the rip accurate according to the AccurateRip database. On the second pass, convert, possibly applying offset correction. - - - - - - &Verify, don't encode - - - 4 - - - 10, 20 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 140, 62 - - - grpOutputStyle - - - $this - - - 131, 23 - - - rbArApplyOffset - - - $this - - - - - - True - - - grpCUEPaths - - - rbArNone - - - 101, 17 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 - - - CUE Sheet Creator... - - - 11 - - + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpOutputPathGeneration - - - 4 - - - 11, 53 - - - grpCUEPaths - - - 3 - - - grpAudioOutput - - - CUE Tools - grpCUEPaths - - + + 5 + + + 8, 4 + + + 535, 84 + + + 0 + + + CUE Paths + + + grpCUEPaths + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 12 + + + True + + + + NoControl + + + 11, 19 + + + 75, 17 + + + 0 + + + &Embedded + + + 153, 8 + + + Create single file with embedded CUE sheet. + + + rbEmbedCUE + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpOutputStyle + + + 0 + + + True + + + 11, 87 + + + 92, 17 + + + 4 + + + Gaps Left Out + + + Create multiple files with gaps left out + + + rbGapsLeftOut + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpOutputStyle + + + 1 + + + True + + + 11, 70 + + + 104, 17 + + + 3 + + + Gaps Prepended + + + Create multiple files with gaps prepended + + + rbGapsPrepended + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpOutputStyle + + + 2 + + + True + + + 11, 53 + + + 101, 17 + + + 2 + + + Gaps &Appended + + + Create multiple files with gaps appended + + + rbGapsAppended + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpOutputStyle + + + 3 + + + True + + + 11, 36 + + + 106, 17 + + + 1 + + + &Single File + CUE + + + Create single file + CUE sheet + + + rbSingleFile + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpOutputStyle + + + 4 + + + 108, 211 + + + 128, 119 + + + 3 + + + CUE Style + + + grpOutputStyle + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 11 + + + 412, 152 + + + 131, 23 + + + 10 + + + About + + + btnAbout + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + + + 140, 62 + + + 178, 21 + + + 5 + + + %1:-2\New\%-1\%F.cue + + + txtCustomFormat + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpOutputPathGeneration + + + 0 + + + True + + + 10, 66 + + + 119, 17 + + + 4 + + + Use custom format: + + + rbCustomFormat + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpOutputPathGeneration + + + 1 + + + 140, 20 + + + 178, 21 + + + 1 + + + New + + + txtCreateSubdirectory + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpOutputPathGeneration + + + 2 + + + True + + + 10, 89 + + + 59, 17 + + + 6 + + + &Manual + + + rbDontGenerate + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpOutputPathGeneration + + + 3 + + + True + + + 10, 20 + + + 125, 17 + + + 0 + + + C&reate subdirectory: + + + rbCreateSubdirectory + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpOutputPathGeneration + + + 4 + + + True + + + 10, 43 + + + 122, 17 + + + 2 + + + Append to filename: + + + rbAppendFilename + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpOutputPathGeneration + + + 5 + + + 140, 41 + + + 178, 21 + + + 3 + + + -New + + + txtAppendFilename + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpOutputPathGeneration + + + 6 + + + 8, 92 + + + 330, 115 + + + 1 + + + Output Path + + + grpOutputPathGeneration + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + + + True + + + 10, 51 + + + 44, 17 + + + 2 + + + APE + + + rbAPE + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioOutput + + + 0 + + + True + + + 10, 85 + + + 50, 17 + + + 4 + + + &None + + + Don't create any audio files, only CUE sheet + + + rbNoAudio + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioOutput + + + 1 + + + True + + + 10, 34 + + + 69, 17 + + + 1 + + + Wav&Pack + + + rbWavPack + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioOutput + + + 2 + + + True + + + 10, 17 + + + 50, 17 + + + 0 + + + &FLAC + + + rbFLAC + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioOutput + + + 3 + + + True + + + 10, 68 + + + 48, 17 + + + 3 + + + &WAV + + + rbWAV + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioOutput + + + 4 + + + 8, 211 + + + 92, 119 + + + 2 + + + Audio Output + + + grpAudioOutput + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 + + + 412, 276 + + + 131, 23 + + + 6 + + + Batch... + + + btnBatch + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + 412, 245 + + + 131, 23 + + + 7 + + + Filename Corrector... + + + btnFilenameCorrector + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this - - toolStripProgressBar2 + + 6 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 412, 183 - - + + 131, 23 - + + 9 + + + Advanced Settings... + + + btnSettings + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 5 True - - 385, 21 + + 8, 89 - - &Embedded + + 61, 13 - + 3 - - 2 + + Data track: - - 10, 17 + + label1 - - 4 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - toolStripProgressBar1 - - - - - - - - - 131, 23 - - - 11, 70 - - - True - - - - - - 75, 17 - - - 0 - - - 1 - - - 5 - - - MiddleLeft - - - 48, 17 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Don't contact the AccurateRip database for validation - - - 1 - - - Gaps Prepended - - - &Input: + + grpAccurateRip 0 - - Gaps &Appended + + 78, 86 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 00:00:00 - - 6 + + 0 - - grpCUEPaths + + 54, 21 - - 119, 17 - - - 131, 23 - - - 11, 36 - - - &Don't verify, encode - - - 412, 214 - - - 71, 23 - - + 4 - - 50, 17 - - - rbNoAudio - - - 4 - - - True - - - btnBatch - - - System.Windows.Forms.ToolStripProgressBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - rbFLAC - - - grpAudioOutput - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 8 - - - 9 - - - 10 - - - rbCreateSubdirectory - - - 108, 211 - - - 2 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 2 - - - 59, 17 + + Not used for normal music CDs. Enhanced CDs with data tracks cannot be found in database unless you know the length of the data track. You can often find it in EAC log. If EAC log is found next to the CUE sheet, it will be parsed automaticly and you won't have to enter anything here. txtDataTrackLength - - 10, 68 + + System.Windows.Forms.MaskedTextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + grpAccurateRip - - 59, 48 + + 1 - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 153, 8 - - + True - + + + 10, 20 + + + 120, 17 + + + 0 + + + Verify, &then encode + + + On the first pass, verify and try to find an offset correction which makes the rip accurate according to the AccurateRip database. On the second pass, convert, possibly applying offset correction. + + + rbArApplyOffset + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAccurateRip + + + 2 + + + True + + + 10, 54 + + + 122, 17 + + + 2 + + + &Verify, don't encode + + + Contact the AccurateRip databse for validation and compare the image against database + + + rbArVerify + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAccurateRip + + + 3 + + + True + + + 10, 37 + + + 123, 17 + + + 1 + + + &Don't verify, encode + + + Don't contact the AccurateRip database for validation + + + rbArNone + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAccurateRip + + + 4 + + + 244, 211 + + + 144, 119 + + + 4 + + + AccurateRip + + + grpAccurateRip + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + 0, 339 + + 252, 17 + + + MiddleLeft + + + 140, 16 + + + Track progress + + + 140, 16 + + + Disk progress + + + 0, 339 + + + 551, 22 + + + 11 + + + statusStrip1 + + + statusStrip1 + + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + NoControl + + + 412, 214 + + + 131, 23 + + + 8 + + + CUE Sheet Creator... + + + btnCUECreator + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + NoControl + + + 412, 307 + + + 66, 23 + + + 12 + + + &Stop + + + False + + + btnStop + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + NoControl + + + 477, 307 + + + 66, 23 + + + 13 + + + &Pause + + + False + + + btnPause + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 6, 13 + + + 551, 361 + + + Tahoma, 8.25pt + + + CenterScreen + + + CUE Tools + + + toolStripStatusLabel1 + + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + toolStripProgressBar1 + + + System.Windows.Forms.ToolStripProgressBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + toolStripProgressBar2 + + + System.Windows.Forms.ToolStripProgressBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + toolTip1 + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + frmCUETools + + + System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/CUETools/frmCUETools.ru-RU.resx b/CUETools/frmCUETools.ru-RU.resx index b981eaa..409712c 100644 --- a/CUETools/frmCUETools.ru-RU.resx +++ b/CUETools/frmCUETools.ru-RU.resx @@ -120,21 +120,15 @@ Поехали - - + + Пути к файлам Выбор... - - - Выбор... - - - 44, 13 @@ -142,29 +136,17 @@ Выход: - - - 36, 13 &Вход: - - + + 130, 118 - - - - - - - - Пути к файлам - - - + + Стиль CUE 86, 17 @@ -211,86 +193,50 @@ Создать образ диска в виде одного аудио-файла и .cue файла - - 130, 118 - - - Стиль CUE - - - - О программе - - - - - 240, 21 - - - - - - 89, 17 - - - По шаблону: - - - - - - 240, 21 - - - - - - 70, 17 - - - Вручную - - - - - - 116, 17 - - - Создать каталог: - - - - - - 117, 17 - - - Суффикс к имени: - - - - - - 240, 21 - - - - 392, 113 Путь для выходных файлов - - + + 240, 21 - - + + 89, 17 + + + По шаблону: + + + 240, 21 + + + 70, 17 + + + Вручную + + + 116, 17 + + + Создать каталог: + + + 117, 17 + + + Суффикс к имени: + + + 240, 21 + + + Формат аудио 76, 17 @@ -298,38 +244,20 @@ Без аудио - - - - - - - - - - - Формат аудио - - - - Обработать папку... - - - Исправить имена... - - - Настройки... - - + + 250, 211 + + + 154, 118 47, 13 @@ -337,9 +265,6 @@ Данные - - - Не используется для обычных музыкальных дисков. "Улучшенные" компакт диски с треком данных не найдутся в базе данных, если не указать длину трека данных. Её часто можно найти в логе EAC. Если лог EAC лежит в той же папке что и .cue, и имеет такое же имя как .cue файл, то он будет проанализирован автоматически и тут опять же ничего не надо будет вводить. @@ -370,25 +295,13 @@ Сконвертировать, не обращаясь к базе данных AccurateRip - - 250, 211 - - - 154, 118 - - - - - - - Создать CUE... - - + + Стоп - - + + Пауза \ No newline at end of file diff --git a/CUEToolsLib/Main.cs b/CUEToolsLib/Main.cs index 1f9f36a..e9b6453 100644 --- a/CUEToolsLib/Main.cs +++ b/CUEToolsLib/Main.cs @@ -26,6 +26,7 @@ using System.Text; using System.Globalization; using System.IO; using System.Net; +using System.Threading; namespace CUEToolsLib { @@ -327,7 +328,7 @@ namespace CUEToolsLib } public class CUESheet { - private bool _stop; + private bool _stop, _pause; private List _attributes; private List _tracks; private List _sources; @@ -364,6 +365,7 @@ namespace CUEToolsLib NameValueCollection _trackTags = null; _stop = false; + _pause = false; _attributes = new List(); _tracks = new List(); _sources = new List(); @@ -1746,6 +1748,11 @@ namespace CUEToolsLib try { audioDest.Close(); } catch {} throw new StopException(); } + if (_pause) + { + statusDel ("Paused...", 0, 0); + Monitor.Wait(this); + } } } } @@ -1880,10 +1887,30 @@ namespace CUEToolsLib public void Stop() { lock (this) { + if (_pause) + { + _pause = false; + Monitor.Pulse(this); + } _stop = true; } } + public void Pause() + { + lock (this) + { + if (_pause) + { + _pause = false; + Monitor.Pulse(this); + } else + { + _pause = true; + } + } + } + public int TrackCount { get { return _tracks.Count;