diff --git a/ALACDotNet/ALACDotNet.cs b/ALACDotNet/ALACDotNet.cs index e376b61..036dbfd 100644 --- a/ALACDotNet/ALACDotNet.cs +++ b/ALACDotNet/ALACDotNet.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Collections.Specialized; using AudioCodecsDotNet; +//Copyright (c) 2008 Gregory S. Chudov. //This library is based on ALAC decoder by David Hammerton. //See http://crazney.net/programs/itunes/alac.html for details. //Copyright (c) 2004 David Hammerton. diff --git a/APEDotNet/apedotnet.cpp b/APEDotNet/apedotnet.cpp index bde332e..3773737 100644 --- a/APEDotNet/apedotnet.cpp +++ b/APEDotNet/apedotnet.cpp @@ -345,6 +345,12 @@ namespace APEDotNet { } } + virtual void Delete() + { + try { Close (); } catch (Exception^) {} + File::Delete(_path); + } + virtual property Int64 FinalSampleCount { Int64 get() diff --git a/AudioCodecsDotNet/AudioCodecsDotNet.cs b/AudioCodecsDotNet/AudioCodecsDotNet.cs index 59e5463..c8ce242 100644 --- a/AudioCodecsDotNet/AudioCodecsDotNet.cs +++ b/AudioCodecsDotNet/AudioCodecsDotNet.cs @@ -25,6 +25,7 @@ namespace AudioCodecsDotNet void Write(int[,] buff, uint sampleCount); bool SetTags(NameValueCollection tags); void Close(); + void Delete(); long FinalSampleCount { set; } string Path { get; } } @@ -141,6 +142,10 @@ namespace AudioCodecsDotNet { } + public void Delete() + { + } + public long FinalSampleCount { set @@ -575,6 +580,14 @@ namespace AudioCodecsDotNet _IO = null; } + public void Delete() + { + _bw.Close(); + _bw = null; + _IO = null; + File.Delete(_path); + } + public long Position { get diff --git a/CUETools/License.txt b/CUETools/License.txt new file mode 100644 index 0000000..ad7d7bd --- /dev/null +++ b/CUETools/License.txt @@ -0,0 +1,208 @@ +******************************************************************************** + CUETools: +-------------------------------------------------------------------------------- +Copyright (C) 2006-2008 Moitah (moitah@yahoo.com) +Copyright (C) 2008 Gregory S. Chudov (gchudov@gmail.com) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +******************************************************************************** + +******************************************************************************** + hdcd.dll: +-------------------------------------------------------------------------------- +Copyright (c) 2006-2008 Christoper Key. + +Permission is hereby granted to use, copy, modify, merge, publish, distribute, +sublicense, and/or sell copies of this software (the Software), subject to +the following conditions: + + This notice be included in all copies and substantial portions of the + Software. + + The Software shall not be used in any manner that infriges the rights of any + third parties, including but not limited to those arising from US Patents + 5,479,168 and 5,872,531. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + +HDCD is a registered trademark of Microsoft Corporation. +******************************************************************************** + +******************************************************************************** + unrar.dll: +-------------------------------------------------------------------------------- + The unrar.dll library is freeware. This means: + + 1. All copyrights to RAR and the unrar.dll are exclusively + owned by the author - Alexander Roshal. + + 2. The unrar.dll library may be used in any software to handle RAR + archives without limitations free of charge. + + 3. THE RAR ARCHIVER AND THE UNRAR.DLL LIBRARY ARE DISTRIBUTED "AS IS". + NO WARRANTY OF ANY KIND IS EXPRESSED OR IMPLIED. YOU USE AT + YOUR OWN RISK. THE AUTHOR WILL NOT BE LIABLE FOR DATA LOSS, + DAMAGES, LOSS OF PROFITS OR ANY OTHER KIND OF LOSS WHILE USING + OR MISUSING THIS SOFTWARE. + + Thank you for your interest in RAR and unrar.dll. + + + Alexander L. Roshal +******************************************************************************** + +******************************************************************************** + unrar.cs: +-------------------------------------------------------------------------------- +Author: Michael A. McCloskey +Company: Schematrix +Version: 20040714 + +Personal Comments: +I created this unrar wrapper class for personal use +after running into a number of issues trying to use +another COM unrar product via COM interop. I hope it +proves as useful to you as it has to me and saves you +some time in building your own products. +******************************************************************************** + +******************************************************************************** + ALACDotNet.cs: +-------------------------------------------------------------------------------- +This library is based on ALAC decoder by David Hammerton. +See http://crazney.net/programs/itunes/alac.html for details. +Copyright (c) 2004 David Hammerton. +Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is furnished + to do so, subject to the following conditions: +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +******************************************************************************** + +******************************************************************************** + libFLAC: +-------------------------------------------------------------------------------- +libFLAC - Free Lossless Audio Codec library +Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007,2008 Josh Coalson + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +- Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +- Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +- Neither the name of the Xiph.org Foundation nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +******************************************************************************** + +******************************************************************************** + MAC_SDK: +-------------------------------------------------------------------------------- +Monkey's Audio Source Code License Agreement + +License Agreement + +1. The Monkey's Audio SDK and source code can be freely used to add APE format + playback, encoding, or tagging support to any product, free or commercial. + Use of the code for proprietary efforts that don't support the official APE + format require written consent of the author. + +2. Monkey's Audio source can be included in GPL and open-source software, + although Monkey's Audio itself will not be subjected to external licensing + requirements or other viral source restrictions. + +3. Code changes and improvements must be contributed back to the Monkey's Audio + project free from restrictions or royalties for the sake of the common good, + unless exempted by express written consent of the author. + +4. Any source code, ideas, or libraries used must be plainly acknowledged in + the software using the code. + +5. Although the software has been tested thoroughly, the author is in no way + responsible for damages due to bugs or misuse. + +6. If you do not completely agree with all of the previous stipulations, you + must cease using this source code and remove it from your storage device. + +All rights not expressly granted here are reserved by Matthew T. Ashland. + +- All materials and programs copyrighted c2000-2006 by Matthew T. Ashland - + +- All rights reserved. - +******************************************************************************** + +******************************************************************************** + libwavpack: +-------------------------------------------------------------------------------- + Copyright (c) 1998 - 2008 Conifer Software + All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of Conifer Software nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +******************************************************************************** diff --git a/CUETools/frmAbout.resx b/CUETools/frmAbout.resx index 9d665b8..8d3d2cb 100644 --- a/CUETools/frmAbout.resx +++ b/CUETools/frmAbout.resx @@ -138,7 +138,7 @@ 27, 22 - About CUETools v1.9.2 + About CUETools v1.9.3 0 @@ -177,13 +177,16 @@ Close - AccurateRip, Monkey's Audio and -embedded CUE sheet support added in 2008 -by Greg Chudov, gchudov@gmail.com. -Thanks go out to Christopher Key and Whitehobbit -for insight on AccurateRip functionality, -and to Mr Spoon for permission to use the database. -Monkey's Audio library by Matthew T. Ashland. + AccurateRip, Monkey's Audio, Apple Lossless, RAR archives, tags +and HDCD support (c) Gregory S. Chudov, gchudov@gmail.com. +Thanks go out to Christopher Key and Whitehobbit for insight on AccurateRip +functionality, and to Mr Spoon for permission to use the database. + +MAC_SDK (c) Matthew T. Ashland +mp4 decoder (c) David Hammerton +unrar.dll (c) Alexander Roshal +Unrar.cs (c) Michael A. McCloskey +hdcd.dll (c) Christopher Key linkLabel1 @@ -234,7 +237,4 @@ Monkey's Audio library by Matthew T. Ashland. True - - Russian (Russia) - \ No newline at end of file diff --git a/CUETools/frmAbout.ru-RU.resx b/CUETools/frmAbout.ru-RU.resx index 8848efc..28a8670 100644 --- a/CUETools/frmAbout.ru-RU.resx +++ b/CUETools/frmAbout.ru-RU.resx @@ -119,14 +119,17 @@ - 415, 149 + 415, 214 - Библиотека Monkey's Audio (c) Matthew T. Ashland. -Поддержка AccurateRip, Monkey's Audio и встроенных .cue -добавлена в 2008 году Григорием Чудовым, gchudov@gmail.com. -Спасибо Christopher Key и Whitehobbit за их исследования принципов -работы AccurateRip, и Mr Spoon за разрешение пользоваться базой данных. + Поддержка AccurateRip, Monkey's Audio, Apple Lossless, RAR архивов, +тэгов и HDCD добавлена в 2008 году Григорием Чудовым, gchudov@gmail.com. +Спасибо Christopher Key и Whitehobbit за их исследования принципов работы +AccurateRip, и Mr Spoon за разрешение пользоваться базой данных. + +MAC_SDK (c) Matthew T. Ashland, mp4 decoder (c) David Hammerton, +unrar.dll (c) Alexander Roshal, Unrar.cs (c) Michael A. McCloskey +hdcd.dll (c) Christopher Key Пользуясь возможностью, хотел бы попросить российских граждан требовать от своего правительства немедленного @@ -134,9 +137,12 @@ с оккупированных грузинских территорий. Григорий Чудов. - 182, 208 + 182, 261 + + + 439, 296 - CUETools v1.9.2: О программе + CUETools v1.9.3: О программе \ No newline at end of file diff --git a/CUETools/frmBatch.cs b/CUETools/frmBatch.cs index 87b62cf..0532a68 100644 --- a/CUETools/frmBatch.cs +++ b/CUETools/frmBatch.cs @@ -54,6 +54,7 @@ namespace JDP string pathOut; bool _accurateRip; bool _accurateOffset; + bool _reducePriority; DateTime _startedAt; List _batchPaths; @@ -260,19 +261,13 @@ namespace JDP { textBox1.Hide(); SettingsReader sr = new SettingsReader("CUE Tools", "settings.txt"); - string val; + _config.Load(sr); - - try - { - val = sr.Load("CUEStyle"); - _cueStyle = (val != null) ? (CUEStyle)Int32.Parse(val) : CUEStyle.SingleFile; - val = sr.Load("OutputAudioFormat"); - _audioFormat = (val != null) ? (OutputAudioFormat)Int32.Parse(val) : OutputAudioFormat.WAV; - } - catch { }; - - if (_config.processPriorityIdle) + _reducePriority = sr.LoadBoolean("ReducePriority") ?? true; + _cueStyle = (CUEStyle?)sr.LoadInt32("CUEStyle", null, null) ?? CUEStyle.SingleFileWithCUE; + _audioFormat = (OutputAudioFormat?)sr.LoadInt32("OutputAudioFormat", null, null) ?? OutputAudioFormat.WAV; + + if (_reducePriority) Process.GetCurrentProcess().PriorityClass = System.Diagnostics.ProcessPriorityClass.Idle; if (_accurateOffset || !_accurateRip) diff --git a/CUETools/frmCUETools.cs b/CUETools/frmCUETools.cs index e09205c..d1f00ea 100644 --- a/CUETools/frmCUETools.cs +++ b/CUETools/frmCUETools.cs @@ -47,7 +47,7 @@ namespace JDP { DialogResult dlgRes; fileDlg.Title = "Input CUE Sheet or album image"; - fileDlg.Filter = "CUE Sheets (*.cue)|*.cue|FLAC images (*.flac)|*.flac|WavPack images (*.wv)|*.wv|APE images (*.ape)|*.ape"; + fileDlg.Filter = "CUE Sheets (*.cue)|*.cue|FLAC images (*.flac)|*.flac|WavPack images (*.wv)|*.wv|APE images (*.ape)|*.ape|RAR archives (*.rar)|*.rar"; try { @@ -117,12 +117,14 @@ namespace JDP { private void btnSettings_Click(object sender, EventArgs e) { using (frmSettings settingsForm = new frmSettings()) { settingsForm.WriteOffset = _writeOffset; + settingsForm.ReducePriority = _reducePriority; settingsForm.Config = _config; CenterSubForm(settingsForm); settingsForm.ShowDialog(); _writeOffset = settingsForm.WriteOffset; + _reducePriority = settingsForm.ReducePriority; _config = settingsForm.Config; UpdateOutputPath(); } @@ -190,7 +192,7 @@ namespace JDP { private void frmCUETools_Load(object sender, EventArgs e) { _batchPaths = new List(); LoadSettings(); - if (_config.processPriorityIdle) + if (_reducePriority) Process.GetCurrentProcess().PriorityClass = System.Diagnostics.ProcessPriorityClass.Idle; SetupControls(false); UpdateOutputPath(); @@ -208,6 +210,7 @@ namespace JDP { List _batchPaths; bool _usePregapForFirstTrackInSingleFile; int _writeOffset; + bool _reducePriority; Thread _workThread; CUESheet _workClass; CUEConfig _config; @@ -440,7 +443,10 @@ namespace JDP { } private bool ShowErrorMessage(Exception ex) { - DialogResult dlgRes = MessageBox.Show(ex.Message, "Error", (_batchPaths.Count == 0) ? + string message = "Exception"; + for (Exception e = ex; e != null; e = e.InnerException) + message += ": " + e.Message; + DialogResult dlgRes = MessageBox.Show(this, message, "Error", (_batchPaths.Count == 0) ? MessageBoxButtons.OK : MessageBoxButtons.OKCancel, MessageBoxIcon.Error); return (dlgRes == DialogResult.OK); } @@ -487,89 +493,32 @@ namespace JDP { private void LoadSettings() { SettingsReader sr = new SettingsReader("CUE Tools", "settings.txt"); - string val; - - val = sr.Load("OutputPathGeneration"); - if (val != null) { - try { - SelectedOutputPathGeneration = (OutputPathGeneration)Int32.Parse(val); - } - catch { } - } - - val = sr.Load("OutputSubdirectory"); - if (val != null) { - txtCreateSubdirectory.Text = val; - } - - val = sr.Load("OutputFilenameSuffix"); - if (val != null) { - txtAppendFilename.Text = val; - } - - val = sr.Load("OutputCustomFormat"); - if (val != null) { - txtCustomFormat.Text = val; - } - - val = sr.Load("OutputAudioFormat"); - if (val != null) { - try { - SelectedOutputAudioFormat = (OutputAudioFormat)Int32.Parse(val); - } - catch { } - } - - val = sr.Load("AccurateRipMode"); - if (val != null) { - try { - SelectedAccurateRipMode = (AccurateRipMode)Int32.Parse(val); - } - catch { } - } - - val = sr.Load("CUEStyle"); - if (val != null) { - try { - SelectedCUEStyle = (CUEStyle)Int32.Parse(val); - } - catch { } - } - - val = sr.Load("WriteOffset"); - if (val != null) { - if (!Int32.TryParse(val, out _writeOffset)) _writeOffset = 0; - } - - val = sr.Load("UsePregapForFirstTrackInSingleFile"); - _usePregapForFirstTrackInSingleFile = (val != null) ? (val != "0") : false; - + txtCreateSubdirectory.Text = sr.Load("OutputSubdirectory") ?? "New"; + txtAppendFilename.Text = sr.Load("OutputFilenameSuffix") ?? "-New"; + txtCustomFormat.Text = sr.Load("OutputCustomFormat") ?? "%1:-2\\New\\%-1\\%F.cue"; + SelectedOutputPathGeneration = (OutputPathGeneration?)sr.LoadInt32("OutputPathGeneration", null, null) ?? OutputPathGeneration.CreateSubdirectory; + SelectedOutputAudioFormat = (OutputAudioFormat?)sr.LoadInt32("OutputAudioFormat", null, null) ?? OutputAudioFormat.WAV; + SelectedAccurateRipMode = (AccurateRipMode?)sr.LoadInt32("AccurateRipMode", null, null) ?? AccurateRipMode.None; + SelectedCUEStyle = (CUEStyle?)sr.LoadInt32("CUEStyle", null, null) ?? CUEStyle.SingleFileWithCUE; + _writeOffset = sr.LoadInt32("WriteOffset", null, null) ?? 0; + _usePregapForFirstTrackInSingleFile = sr.LoadBoolean("UsePregapForFirstTrackInSingleFile") ?? false; + _reducePriority = sr.LoadBoolean("ReducePriority") ?? true; _config.Load(sr); } private void SaveSettings() { SettingsWriter sw = new SettingsWriter("CUE Tools", "settings.txt"); - - sw.Save("OutputPathGeneration", ((int)SelectedOutputPathGeneration).ToString()); - + sw.Save("OutputPathGeneration", (int)SelectedOutputPathGeneration); sw.Save("OutputSubdirectory", txtCreateSubdirectory.Text); - sw.Save("OutputFilenameSuffix", txtAppendFilename.Text); - sw.Save("OutputCustomFormat", txtCustomFormat.Text); - - sw.Save("OutputAudioFormat", ((int)SelectedOutputAudioFormat).ToString()); - - sw.Save("AccurateRipMode", ((int)SelectedAccurateRipMode).ToString()); - - sw.Save("CUEStyle", ((int)SelectedCUEStyle).ToString()); - - sw.Save("WriteOffset", _writeOffset.ToString()); - - sw.Save("UsePregapForFirstTrackInSingleFile", _usePregapForFirstTrackInSingleFile ? "1" : "0"); - + sw.Save("OutputAudioFormat", (int)SelectedOutputAudioFormat); + sw.Save("AccurateRipMode", (int)SelectedAccurateRipMode); + sw.Save("CUEStyle", (int)SelectedCUEStyle); + sw.Save("WriteOffset", _writeOffset); + sw.Save("UsePregapForFirstTrackInSingleFile", _usePregapForFirstTrackInSingleFile); + sw.Save("ReducePriority", _reducePriority); _config.Save(sw); - sw.Close(); } diff --git a/CUETools/frmSettings.Designer.cs b/CUETools/frmSettings.Designer.cs index 64e1cf1..c519aad 100644 --- a/CUETools/frmSettings.Designer.cs +++ b/CUETools/frmSettings.Designer.cs @@ -92,6 +92,7 @@ namespace JDP { this.tabPage4 = new System.Windows.Forms.TabPage(); this.grpHDCD = new System.Windows.Forms.GroupBox(); this.chkHDCDDetect = new System.Windows.Forms.CheckBox(); + this.chkReducePriority = new System.Windows.Forms.CheckBox(); btnCancel = new System.Windows.Forms.Button(); this.grpGeneral.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericWriteOffset)).BeginInit(); @@ -117,22 +118,14 @@ namespace JDP { // // btnCancel // - btnCancel.AccessibleDescription = null; - btnCancel.AccessibleName = null; - resources.ApplyResources(btnCancel, "btnCancel"); - btnCancel.BackgroundImage = null; btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - btnCancel.Font = null; + resources.ApplyResources(btnCancel, "btnCancel"); btnCancel.Name = "btnCancel"; - this.toolTip1.SetToolTip(btnCancel, resources.GetString("btnCancel.ToolTip")); btnCancel.UseVisualStyleBackColor = true; // // grpGeneral // - this.grpGeneral.AccessibleDescription = null; - this.grpGeneral.AccessibleName = null; - resources.ApplyResources(this.grpGeneral, "grpGeneral"); - this.grpGeneral.BackgroundImage = null; + this.grpGeneral.Controls.Add(this.chkReducePriority); this.grpGeneral.Controls.Add(this.chkTruncateExtra4206Samples); this.grpGeneral.Controls.Add(this.chkCreateCUEFileWhenEmbedded); this.grpGeneral.Controls.Add(this.chkCreateM3U); @@ -142,72 +135,45 @@ namespace JDP { this.grpGeneral.Controls.Add(this.chkAutoCorrectFilenames); this.grpGeneral.Controls.Add(this.chkPreserveHTOA); this.grpGeneral.Controls.Add(this.lblWriteOffset); - this.grpGeneral.Font = null; + resources.ApplyResources(this.grpGeneral, "grpGeneral"); this.grpGeneral.Name = "grpGeneral"; this.grpGeneral.TabStop = false; - this.toolTip1.SetToolTip(this.grpGeneral, resources.GetString("grpGeneral.ToolTip")); // // chkTruncateExtra4206Samples // - this.chkTruncateExtra4206Samples.AccessibleDescription = null; - this.chkTruncateExtra4206Samples.AccessibleName = null; resources.ApplyResources(this.chkTruncateExtra4206Samples, "chkTruncateExtra4206Samples"); - this.chkTruncateExtra4206Samples.BackgroundImage = null; - this.chkTruncateExtra4206Samples.Font = null; this.chkTruncateExtra4206Samples.Name = "chkTruncateExtra4206Samples"; this.toolTip1.SetToolTip(this.chkTruncateExtra4206Samples, resources.GetString("chkTruncateExtra4206Samples.ToolTip")); this.chkTruncateExtra4206Samples.UseVisualStyleBackColor = true; // // chkCreateCUEFileWhenEmbedded // - this.chkCreateCUEFileWhenEmbedded.AccessibleDescription = null; - this.chkCreateCUEFileWhenEmbedded.AccessibleName = null; resources.ApplyResources(this.chkCreateCUEFileWhenEmbedded, "chkCreateCUEFileWhenEmbedded"); - this.chkCreateCUEFileWhenEmbedded.BackgroundImage = null; - this.chkCreateCUEFileWhenEmbedded.Font = null; this.chkCreateCUEFileWhenEmbedded.Name = "chkCreateCUEFileWhenEmbedded"; - this.toolTip1.SetToolTip(this.chkCreateCUEFileWhenEmbedded, resources.GetString("chkCreateCUEFileWhenEmbedded.ToolTip")); this.chkCreateCUEFileWhenEmbedded.UseVisualStyleBackColor = true; // // chkCreateM3U // - this.chkCreateM3U.AccessibleDescription = null; - this.chkCreateM3U.AccessibleName = null; resources.ApplyResources(this.chkCreateM3U, "chkCreateM3U"); - this.chkCreateM3U.BackgroundImage = null; - this.chkCreateM3U.Font = null; this.chkCreateM3U.Name = "chkCreateM3U"; - this.toolTip1.SetToolTip(this.chkCreateM3U, resources.GetString("chkCreateM3U.ToolTip")); this.chkCreateM3U.UseVisualStyleBackColor = true; // // chkFillUpCUE // - this.chkFillUpCUE.AccessibleDescription = null; - this.chkFillUpCUE.AccessibleName = null; resources.ApplyResources(this.chkFillUpCUE, "chkFillUpCUE"); - this.chkFillUpCUE.BackgroundImage = null; - this.chkFillUpCUE.Font = null; this.chkFillUpCUE.Name = "chkFillUpCUE"; - this.toolTip1.SetToolTip(this.chkFillUpCUE, resources.GetString("chkFillUpCUE.ToolTip")); this.chkFillUpCUE.UseVisualStyleBackColor = true; // // chkEmbedLog // - this.chkEmbedLog.AccessibleDescription = null; - this.chkEmbedLog.AccessibleName = null; resources.ApplyResources(this.chkEmbedLog, "chkEmbedLog"); - this.chkEmbedLog.BackgroundImage = null; - this.chkEmbedLog.Font = null; this.chkEmbedLog.Name = "chkEmbedLog"; this.toolTip1.SetToolTip(this.chkEmbedLog, resources.GetString("chkEmbedLog.ToolTip")); this.chkEmbedLog.UseVisualStyleBackColor = true; // // numericWriteOffset // - this.numericWriteOffset.AccessibleDescription = null; - this.numericWriteOffset.AccessibleName = null; resources.ApplyResources(this.numericWriteOffset, "numericWriteOffset"); - this.numericWriteOffset.Font = null; this.numericWriteOffset.Maximum = new decimal(new int[] { 99999, 0, @@ -219,66 +185,43 @@ namespace JDP { 0, -2147483648}); this.numericWriteOffset.Name = "numericWriteOffset"; - this.toolTip1.SetToolTip(this.numericWriteOffset, resources.GetString("numericWriteOffset.ToolTip")); // // chkAutoCorrectFilenames // - this.chkAutoCorrectFilenames.AccessibleDescription = null; - this.chkAutoCorrectFilenames.AccessibleName = null; resources.ApplyResources(this.chkAutoCorrectFilenames, "chkAutoCorrectFilenames"); - this.chkAutoCorrectFilenames.BackgroundImage = null; - this.chkAutoCorrectFilenames.Font = null; this.chkAutoCorrectFilenames.Name = "chkAutoCorrectFilenames"; this.toolTip1.SetToolTip(this.chkAutoCorrectFilenames, resources.GetString("chkAutoCorrectFilenames.ToolTip")); this.chkAutoCorrectFilenames.UseVisualStyleBackColor = true; // // chkPreserveHTOA // - this.chkPreserveHTOA.AccessibleDescription = null; - this.chkPreserveHTOA.AccessibleName = null; resources.ApplyResources(this.chkPreserveHTOA, "chkPreserveHTOA"); - this.chkPreserveHTOA.BackgroundImage = null; - this.chkPreserveHTOA.Font = null; this.chkPreserveHTOA.Name = "chkPreserveHTOA"; - this.toolTip1.SetToolTip(this.chkPreserveHTOA, resources.GetString("chkPreserveHTOA.ToolTip")); this.chkPreserveHTOA.UseVisualStyleBackColor = true; // // lblWriteOffset // - this.lblWriteOffset.AccessibleDescription = null; - this.lblWriteOffset.AccessibleName = null; resources.ApplyResources(this.lblWriteOffset, "lblWriteOffset"); - this.lblWriteOffset.Font = null; this.lblWriteOffset.Name = "lblWriteOffset"; - this.toolTip1.SetToolTip(this.lblWriteOffset, resources.GetString("lblWriteOffset.ToolTip")); // // grpFLAC // - this.grpFLAC.AccessibleDescription = null; - this.grpFLAC.AccessibleName = null; - resources.ApplyResources(this.grpFLAC, "grpFLAC"); - this.grpFLAC.BackgroundImage = null; this.grpFLAC.Controls.Add(this.numericFLACCompressionLevel); this.grpFLAC.Controls.Add(this.lblFLACCompressionLevel); this.grpFLAC.Controls.Add(this.chkFLACVerify); - this.grpFLAC.Font = null; + resources.ApplyResources(this.grpFLAC, "grpFLAC"); this.grpFLAC.Name = "grpFLAC"; this.grpFLAC.TabStop = false; - this.toolTip1.SetToolTip(this.grpFLAC, resources.GetString("grpFLAC.ToolTip")); // // numericFLACCompressionLevel // - this.numericFLACCompressionLevel.AccessibleDescription = null; - this.numericFLACCompressionLevel.AccessibleName = null; resources.ApplyResources(this.numericFLACCompressionLevel, "numericFLACCompressionLevel"); - this.numericFLACCompressionLevel.Font = null; this.numericFLACCompressionLevel.Maximum = new decimal(new int[] { 8, 0, 0, 0}); this.numericFLACCompressionLevel.Name = "numericFLACCompressionLevel"; - this.toolTip1.SetToolTip(this.numericFLACCompressionLevel, resources.GetString("numericFLACCompressionLevel.ToolTip")); this.numericFLACCompressionLevel.Value = new decimal(new int[] { 5, 0, @@ -287,43 +230,25 @@ namespace JDP { // // lblFLACCompressionLevel // - this.lblFLACCompressionLevel.AccessibleDescription = null; - this.lblFLACCompressionLevel.AccessibleName = null; resources.ApplyResources(this.lblFLACCompressionLevel, "lblFLACCompressionLevel"); - this.lblFLACCompressionLevel.Font = null; this.lblFLACCompressionLevel.Name = "lblFLACCompressionLevel"; - this.toolTip1.SetToolTip(this.lblFLACCompressionLevel, resources.GetString("lblFLACCompressionLevel.ToolTip")); // // chkFLACVerify // - this.chkFLACVerify.AccessibleDescription = null; - this.chkFLACVerify.AccessibleName = null; resources.ApplyResources(this.chkFLACVerify, "chkFLACVerify"); - this.chkFLACVerify.BackgroundImage = null; - this.chkFLACVerify.Font = null; this.chkFLACVerify.Name = "chkFLACVerify"; - this.toolTip1.SetToolTip(this.chkFLACVerify, resources.GetString("chkFLACVerify.ToolTip")); this.chkFLACVerify.UseVisualStyleBackColor = true; // // btnOK // - this.btnOK.AccessibleDescription = null; - this.btnOK.AccessibleName = null; - resources.ApplyResources(this.btnOK, "btnOK"); - this.btnOK.BackgroundImage = null; this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.btnOK.Font = null; + resources.ApplyResources(this.btnOK, "btnOK"); this.btnOK.Name = "btnOK"; - this.toolTip1.SetToolTip(this.btnOK, resources.GetString("btnOK.ToolTip")); this.btnOK.UseVisualStyleBackColor = true; this.btnOK.Click += new System.EventHandler(this.btnOK_Click); // // grpWavPack // - this.grpWavPack.AccessibleDescription = null; - this.grpWavPack.AccessibleName = null; - resources.ApplyResources(this.grpWavPack, "grpWavPack"); - this.grpWavPack.BackgroundImage = null; this.grpWavPack.Controls.Add(this.chkWVStoreMD5); this.grpWavPack.Controls.Add(this.numWVExtraMode); this.grpWavPack.Controls.Add(this.chkWVExtraMode); @@ -331,28 +256,19 @@ namespace JDP { this.grpWavPack.Controls.Add(this.rbWVHigh); this.grpWavPack.Controls.Add(this.rbWVNormal); this.grpWavPack.Controls.Add(this.rbWVFast); - this.grpWavPack.Font = null; + resources.ApplyResources(this.grpWavPack, "grpWavPack"); this.grpWavPack.Name = "grpWavPack"; this.grpWavPack.TabStop = false; - this.toolTip1.SetToolTip(this.grpWavPack, resources.GetString("grpWavPack.ToolTip")); // // chkWVStoreMD5 // - this.chkWVStoreMD5.AccessibleDescription = null; - this.chkWVStoreMD5.AccessibleName = null; resources.ApplyResources(this.chkWVStoreMD5, "chkWVStoreMD5"); - this.chkWVStoreMD5.BackgroundImage = null; - this.chkWVStoreMD5.Font = null; this.chkWVStoreMD5.Name = "chkWVStoreMD5"; - this.toolTip1.SetToolTip(this.chkWVStoreMD5, resources.GetString("chkWVStoreMD5.ToolTip")); this.chkWVStoreMD5.UseVisualStyleBackColor = true; // // numWVExtraMode // - this.numWVExtraMode.AccessibleDescription = null; - this.numWVExtraMode.AccessibleName = null; resources.ApplyResources(this.numWVExtraMode, "numWVExtraMode"); - this.numWVExtraMode.Font = null; this.numWVExtraMode.Maximum = new decimal(new int[] { 6, 0, @@ -364,7 +280,6 @@ namespace JDP { 0, 0}); this.numWVExtraMode.Name = "numWVExtraMode"; - this.toolTip1.SetToolTip(this.numWVExtraMode, resources.GetString("numWVExtraMode.ToolTip")); this.numWVExtraMode.Value = new decimal(new int[] { 1, 0, @@ -373,68 +288,39 @@ namespace JDP { // // chkWVExtraMode // - this.chkWVExtraMode.AccessibleDescription = null; - this.chkWVExtraMode.AccessibleName = null; resources.ApplyResources(this.chkWVExtraMode, "chkWVExtraMode"); - this.chkWVExtraMode.BackgroundImage = null; - this.chkWVExtraMode.Font = null; this.chkWVExtraMode.Name = "chkWVExtraMode"; - this.toolTip1.SetToolTip(this.chkWVExtraMode, resources.GetString("chkWVExtraMode.ToolTip")); this.chkWVExtraMode.UseVisualStyleBackColor = true; this.chkWVExtraMode.CheckedChanged += new System.EventHandler(this.chkWVExtraMode_CheckedChanged); // // rbWVVeryHigh // - this.rbWVVeryHigh.AccessibleDescription = null; - this.rbWVVeryHigh.AccessibleName = null; resources.ApplyResources(this.rbWVVeryHigh, "rbWVVeryHigh"); - this.rbWVVeryHigh.BackgroundImage = null; - this.rbWVVeryHigh.Font = null; this.rbWVVeryHigh.Name = "rbWVVeryHigh"; - this.toolTip1.SetToolTip(this.rbWVVeryHigh, resources.GetString("rbWVVeryHigh.ToolTip")); this.rbWVVeryHigh.UseVisualStyleBackColor = true; // // rbWVHigh // - this.rbWVHigh.AccessibleDescription = null; - this.rbWVHigh.AccessibleName = null; resources.ApplyResources(this.rbWVHigh, "rbWVHigh"); - this.rbWVHigh.BackgroundImage = null; - this.rbWVHigh.Font = null; this.rbWVHigh.Name = "rbWVHigh"; - this.toolTip1.SetToolTip(this.rbWVHigh, resources.GetString("rbWVHigh.ToolTip")); this.rbWVHigh.UseVisualStyleBackColor = true; // // rbWVNormal // - this.rbWVNormal.AccessibleDescription = null; - this.rbWVNormal.AccessibleName = null; resources.ApplyResources(this.rbWVNormal, "rbWVNormal"); - this.rbWVNormal.BackgroundImage = null; this.rbWVNormal.Checked = true; - this.rbWVNormal.Font = null; this.rbWVNormal.Name = "rbWVNormal"; this.rbWVNormal.TabStop = true; - this.toolTip1.SetToolTip(this.rbWVNormal, resources.GetString("rbWVNormal.ToolTip")); this.rbWVNormal.UseVisualStyleBackColor = true; // // rbWVFast // - this.rbWVFast.AccessibleDescription = null; - this.rbWVFast.AccessibleName = null; resources.ApplyResources(this.rbWVFast, "rbWVFast"); - this.rbWVFast.BackgroundImage = null; - this.rbWVFast.Font = null; this.rbWVFast.Name = "rbWVFast"; - this.toolTip1.SetToolTip(this.rbWVFast, resources.GetString("rbWVFast.ToolTip")); this.rbWVFast.UseVisualStyleBackColor = true; // // groupBox1 // - this.groupBox1.AccessibleDescription = null; - this.groupBox1.AccessibleName = null; - resources.ApplyResources(this.groupBox1, "groupBox1"); - this.groupBox1.BackgroundImage = null; this.groupBox1.Controls.Add(this.chkEncodeWhenZeroOffset); this.groupBox1.Controls.Add(this.chkArFixOffset); this.groupBox1.Controls.Add(this.chkWriteArLogOnConvert); @@ -448,89 +334,61 @@ namespace JDP { this.groupBox1.Controls.Add(this.numFixWhenConfidence); this.groupBox1.Controls.Add(this.labelFixWhenPercent); this.groupBox1.Controls.Add(this.numFixWhenPercent); - this.groupBox1.Font = null; + resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Name = "groupBox1"; this.groupBox1.TabStop = false; - this.toolTip1.SetToolTip(this.groupBox1, resources.GetString("groupBox1.ToolTip")); // // chkEncodeWhenZeroOffset // - this.chkEncodeWhenZeroOffset.AccessibleDescription = null; - this.chkEncodeWhenZeroOffset.AccessibleName = null; resources.ApplyResources(this.chkEncodeWhenZeroOffset, "chkEncodeWhenZeroOffset"); - this.chkEncodeWhenZeroOffset.BackgroundImage = null; - this.chkEncodeWhenZeroOffset.Font = null; this.chkEncodeWhenZeroOffset.Name = "chkEncodeWhenZeroOffset"; - this.toolTip1.SetToolTip(this.chkEncodeWhenZeroOffset, resources.GetString("chkEncodeWhenZeroOffset.ToolTip")); this.chkEncodeWhenZeroOffset.UseVisualStyleBackColor = true; // // chkArFixOffset // - this.chkArFixOffset.AccessibleDescription = null; - this.chkArFixOffset.AccessibleName = null; resources.ApplyResources(this.chkArFixOffset, "chkArFixOffset"); - this.chkArFixOffset.BackgroundImage = null; this.chkArFixOffset.Checked = true; this.chkArFixOffset.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkArFixOffset.Font = null; this.chkArFixOffset.Name = "chkArFixOffset"; - this.toolTip1.SetToolTip(this.chkArFixOffset, resources.GetString("chkArFixOffset.ToolTip")); this.chkArFixOffset.UseVisualStyleBackColor = true; this.chkArFixOffset.CheckedChanged += new System.EventHandler(this.chkArFixOffset_CheckedChanged); // // chkWriteArLogOnConvert // - this.chkWriteArLogOnConvert.AccessibleDescription = null; - this.chkWriteArLogOnConvert.AccessibleName = null; resources.ApplyResources(this.chkWriteArLogOnConvert, "chkWriteArLogOnConvert"); - this.chkWriteArLogOnConvert.BackgroundImage = null; this.chkWriteArLogOnConvert.Checked = true; this.chkWriteArLogOnConvert.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkWriteArLogOnConvert.Font = null; this.chkWriteArLogOnConvert.Name = "chkWriteArLogOnConvert"; - this.toolTip1.SetToolTip(this.chkWriteArLogOnConvert, resources.GetString("chkWriteArLogOnConvert.ToolTip")); this.chkWriteArLogOnConvert.UseVisualStyleBackColor = true; // // chkWriteArTagsOnConvert // - this.chkWriteArTagsOnConvert.AccessibleDescription = null; - this.chkWriteArTagsOnConvert.AccessibleName = null; resources.ApplyResources(this.chkWriteArTagsOnConvert, "chkWriteArTagsOnConvert"); - this.chkWriteArTagsOnConvert.BackgroundImage = null; this.chkWriteArTagsOnConvert.Checked = true; this.chkWriteArTagsOnConvert.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkWriteArTagsOnConvert.Font = null; this.chkWriteArTagsOnConvert.Name = "chkWriteArTagsOnConvert"; this.toolTip1.SetToolTip(this.chkWriteArTagsOnConvert, resources.GetString("chkWriteArTagsOnConvert.ToolTip")); this.chkWriteArTagsOnConvert.UseVisualStyleBackColor = true; // // labelEncodeWhenPercent // - this.labelEncodeWhenPercent.AccessibleDescription = null; - this.labelEncodeWhenPercent.AccessibleName = null; resources.ApplyResources(this.labelEncodeWhenPercent, "labelEncodeWhenPercent"); - this.labelEncodeWhenPercent.Font = null; this.labelEncodeWhenPercent.Name = "labelEncodeWhenPercent"; - this.toolTip1.SetToolTip(this.labelEncodeWhenPercent, resources.GetString("labelEncodeWhenPercent.ToolTip")); // // numEncodeWhenPercent // - this.numEncodeWhenPercent.AccessibleDescription = null; - this.numEncodeWhenPercent.AccessibleName = null; - resources.ApplyResources(this.numEncodeWhenPercent, "numEncodeWhenPercent"); - this.numEncodeWhenPercent.Font = null; this.numEncodeWhenPercent.Increment = new decimal(new int[] { 5, 0, 0, 0}); + resources.ApplyResources(this.numEncodeWhenPercent, "numEncodeWhenPercent"); this.numEncodeWhenPercent.Minimum = new decimal(new int[] { 1, 0, 0, 0}); this.numEncodeWhenPercent.Name = "numEncodeWhenPercent"; - this.toolTip1.SetToolTip(this.numEncodeWhenPercent, resources.GetString("numEncodeWhenPercent.ToolTip")); this.numEncodeWhenPercent.Value = new decimal(new int[] { 100, 0, @@ -539,26 +397,18 @@ namespace JDP { // // labelEncodeWhenConfidence // - this.labelEncodeWhenConfidence.AccessibleDescription = null; - this.labelEncodeWhenConfidence.AccessibleName = null; resources.ApplyResources(this.labelEncodeWhenConfidence, "labelEncodeWhenConfidence"); - this.labelEncodeWhenConfidence.Font = null; this.labelEncodeWhenConfidence.Name = "labelEncodeWhenConfidence"; - this.toolTip1.SetToolTip(this.labelEncodeWhenConfidence, resources.GetString("labelEncodeWhenConfidence.ToolTip")); // // numEncodeWhenConfidence // - this.numEncodeWhenConfidence.AccessibleDescription = null; - this.numEncodeWhenConfidence.AccessibleName = null; resources.ApplyResources(this.numEncodeWhenConfidence, "numEncodeWhenConfidence"); - this.numEncodeWhenConfidence.Font = null; this.numEncodeWhenConfidence.Minimum = new decimal(new int[] { 1, 0, 0, 0}); this.numEncodeWhenConfidence.Name = "numEncodeWhenConfidence"; - this.toolTip1.SetToolTip(this.numEncodeWhenConfidence, resources.GetString("numEncodeWhenConfidence.ToolTip")); this.numEncodeWhenConfidence.Value = new decimal(new int[] { 1, 0, @@ -567,40 +417,27 @@ namespace JDP { // // chkArNoUnverifiedAudio // - this.chkArNoUnverifiedAudio.AccessibleDescription = null; - this.chkArNoUnverifiedAudio.AccessibleName = null; resources.ApplyResources(this.chkArNoUnverifiedAudio, "chkArNoUnverifiedAudio"); - this.chkArNoUnverifiedAudio.BackgroundImage = null; this.chkArNoUnverifiedAudio.Checked = true; this.chkArNoUnverifiedAudio.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkArNoUnverifiedAudio.Font = null; this.chkArNoUnverifiedAudio.Name = "chkArNoUnverifiedAudio"; - this.toolTip1.SetToolTip(this.chkArNoUnverifiedAudio, resources.GetString("chkArNoUnverifiedAudio.ToolTip")); this.chkArNoUnverifiedAudio.UseVisualStyleBackColor = true; this.chkArNoUnverifiedAudio.CheckedChanged += new System.EventHandler(this.chkArNoUnverifiedAudio_CheckedChanged); // // labelFixWhenConfidence // - this.labelFixWhenConfidence.AccessibleDescription = null; - this.labelFixWhenConfidence.AccessibleName = null; resources.ApplyResources(this.labelFixWhenConfidence, "labelFixWhenConfidence"); - this.labelFixWhenConfidence.Font = null; this.labelFixWhenConfidence.Name = "labelFixWhenConfidence"; - this.toolTip1.SetToolTip(this.labelFixWhenConfidence, resources.GetString("labelFixWhenConfidence.ToolTip")); // // numFixWhenConfidence // - this.numFixWhenConfidence.AccessibleDescription = null; - this.numFixWhenConfidence.AccessibleName = null; resources.ApplyResources(this.numFixWhenConfidence, "numFixWhenConfidence"); - this.numFixWhenConfidence.Font = null; this.numFixWhenConfidence.Minimum = new decimal(new int[] { 1, 0, 0, 0}); this.numFixWhenConfidence.Name = "numFixWhenConfidence"; - this.toolTip1.SetToolTip(this.numFixWhenConfidence, resources.GetString("numFixWhenConfidence.ToolTip")); this.numFixWhenConfidence.Value = new decimal(new int[] { 1, 0, @@ -609,31 +446,23 @@ namespace JDP { // // labelFixWhenPercent // - this.labelFixWhenPercent.AccessibleDescription = null; - this.labelFixWhenPercent.AccessibleName = null; resources.ApplyResources(this.labelFixWhenPercent, "labelFixWhenPercent"); - this.labelFixWhenPercent.Font = null; this.labelFixWhenPercent.Name = "labelFixWhenPercent"; - this.toolTip1.SetToolTip(this.labelFixWhenPercent, resources.GetString("labelFixWhenPercent.ToolTip")); // // numFixWhenPercent // - this.numFixWhenPercent.AccessibleDescription = null; - this.numFixWhenPercent.AccessibleName = null; - resources.ApplyResources(this.numFixWhenPercent, "numFixWhenPercent"); - this.numFixWhenPercent.Font = null; this.numFixWhenPercent.Increment = new decimal(new int[] { 5, 0, 0, 0}); + resources.ApplyResources(this.numFixWhenPercent, "numFixWhenPercent"); this.numFixWhenPercent.Minimum = new decimal(new int[] { 1, 0, 0, 0}); this.numFixWhenPercent.Name = "numFixWhenPercent"; - this.toolTip1.SetToolTip(this.numFixWhenPercent, resources.GetString("numFixWhenPercent.ToolTip")); this.numFixWhenPercent.Value = new decimal(new int[] { 51, 0, @@ -648,56 +477,37 @@ namespace JDP { // // chkFilenamesANSISafe // - this.chkFilenamesANSISafe.AccessibleDescription = null; - this.chkFilenamesANSISafe.AccessibleName = null; resources.ApplyResources(this.chkFilenamesANSISafe, "chkFilenamesANSISafe"); - this.chkFilenamesANSISafe.BackgroundImage = null; - this.chkFilenamesANSISafe.Font = null; this.chkFilenamesANSISafe.Name = "chkFilenamesANSISafe"; this.toolTip1.SetToolTip(this.chkFilenamesANSISafe, resources.GetString("chkFilenamesANSISafe.ToolTip")); this.chkFilenamesANSISafe.UseVisualStyleBackColor = true; + this.chkFilenamesANSISafe.CheckedChanged += new System.EventHandler(this.chkFilenamesANSISafe_CheckedChanged); // // chkWriteARTagsOnVerify // - this.chkWriteARTagsOnVerify.AccessibleDescription = null; - this.chkWriteARTagsOnVerify.AccessibleName = null; resources.ApplyResources(this.chkWriteARTagsOnVerify, "chkWriteARTagsOnVerify"); - this.chkWriteARTagsOnVerify.BackgroundImage = null; this.chkWriteARTagsOnVerify.Checked = true; this.chkWriteARTagsOnVerify.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkWriteARTagsOnVerify.Font = null; this.chkWriteARTagsOnVerify.Name = "chkWriteARTagsOnVerify"; this.toolTip1.SetToolTip(this.chkWriteARTagsOnVerify, resources.GetString("chkWriteARTagsOnVerify.ToolTip")); this.chkWriteARTagsOnVerify.UseVisualStyleBackColor = true; // // chkHDCDDecode // - this.chkHDCDDecode.AccessibleDescription = null; - this.chkHDCDDecode.AccessibleName = null; resources.ApplyResources(this.chkHDCDDecode, "chkHDCDDecode"); - this.chkHDCDDecode.BackgroundImage = null; - this.chkHDCDDecode.Font = null; this.chkHDCDDecode.Name = "chkHDCDDecode"; this.toolTip1.SetToolTip(this.chkHDCDDecode, resources.GetString("chkHDCDDecode.ToolTip")); this.chkHDCDDecode.UseVisualStyleBackColor = true; // // chkHDCDStopLooking // - this.chkHDCDStopLooking.AccessibleDescription = null; - this.chkHDCDStopLooking.AccessibleName = null; resources.ApplyResources(this.chkHDCDStopLooking, "chkHDCDStopLooking"); - this.chkHDCDStopLooking.BackgroundImage = null; - this.chkHDCDStopLooking.Font = null; this.chkHDCDStopLooking.Name = "chkHDCDStopLooking"; this.toolTip1.SetToolTip(this.chkHDCDStopLooking, resources.GetString("chkHDCDStopLooking.ToolTip")); this.chkHDCDStopLooking.UseVisualStyleBackColor = true; // // grpAudioFilenames // - this.grpAudioFilenames.AccessibleDescription = null; - this.grpAudioFilenames.AccessibleName = null; - resources.ApplyResources(this.grpAudioFilenames, "grpAudioFilenames"); - this.grpAudioFilenames.BackgroundImage = null; this.grpAudioFilenames.Controls.Add(this.chkFilenamesANSISafe); this.grpAudioFilenames.Controls.Add(this.chkKeepOriginalFilenames); this.grpAudioFilenames.Controls.Add(this.txtSpecialExceptions); @@ -707,316 +517,204 @@ namespace JDP { this.grpAudioFilenames.Controls.Add(this.lblTrackFilenameFormat); this.grpAudioFilenames.Controls.Add(this.lblSingleFilenameFormat); this.grpAudioFilenames.Controls.Add(this.txtSingleFilenameFormat); - this.grpAudioFilenames.Font = null; + resources.ApplyResources(this.grpAudioFilenames, "grpAudioFilenames"); this.grpAudioFilenames.Name = "grpAudioFilenames"; this.grpAudioFilenames.TabStop = false; - this.toolTip1.SetToolTip(this.grpAudioFilenames, resources.GetString("grpAudioFilenames.ToolTip")); // // chkKeepOriginalFilenames // - this.chkKeepOriginalFilenames.AccessibleDescription = null; - this.chkKeepOriginalFilenames.AccessibleName = null; resources.ApplyResources(this.chkKeepOriginalFilenames, "chkKeepOriginalFilenames"); - this.chkKeepOriginalFilenames.BackgroundImage = null; this.chkKeepOriginalFilenames.Checked = true; this.chkKeepOriginalFilenames.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkKeepOriginalFilenames.Font = null; this.chkKeepOriginalFilenames.Name = "chkKeepOriginalFilenames"; - this.toolTip1.SetToolTip(this.chkKeepOriginalFilenames, resources.GetString("chkKeepOriginalFilenames.ToolTip")); this.chkKeepOriginalFilenames.UseVisualStyleBackColor = true; // // txtSpecialExceptions // - this.txtSpecialExceptions.AccessibleDescription = null; - this.txtSpecialExceptions.AccessibleName = null; resources.ApplyResources(this.txtSpecialExceptions, "txtSpecialExceptions"); - this.txtSpecialExceptions.BackgroundImage = null; - this.txtSpecialExceptions.Font = null; this.txtSpecialExceptions.Name = "txtSpecialExceptions"; - this.toolTip1.SetToolTip(this.txtSpecialExceptions, resources.GetString("txtSpecialExceptions.ToolTip")); // // chkRemoveSpecial // - this.chkRemoveSpecial.AccessibleDescription = null; - this.chkRemoveSpecial.AccessibleName = null; resources.ApplyResources(this.chkRemoveSpecial, "chkRemoveSpecial"); - this.chkRemoveSpecial.BackgroundImage = null; this.chkRemoveSpecial.Checked = true; this.chkRemoveSpecial.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkRemoveSpecial.Font = null; this.chkRemoveSpecial.Name = "chkRemoveSpecial"; - this.toolTip1.SetToolTip(this.chkRemoveSpecial, resources.GetString("chkRemoveSpecial.ToolTip")); this.chkRemoveSpecial.UseVisualStyleBackColor = true; + this.chkRemoveSpecial.CheckedChanged += new System.EventHandler(this.chkRemoveSpecial_CheckedChanged); // // chkReplaceSpaces // - this.chkReplaceSpaces.AccessibleDescription = null; - this.chkReplaceSpaces.AccessibleName = null; resources.ApplyResources(this.chkReplaceSpaces, "chkReplaceSpaces"); - this.chkReplaceSpaces.BackgroundImage = null; this.chkReplaceSpaces.Checked = true; this.chkReplaceSpaces.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkReplaceSpaces.Font = null; this.chkReplaceSpaces.Name = "chkReplaceSpaces"; - this.toolTip1.SetToolTip(this.chkReplaceSpaces, resources.GetString("chkReplaceSpaces.ToolTip")); this.chkReplaceSpaces.UseVisualStyleBackColor = true; // // txtTrackFilenameFormat // - this.txtTrackFilenameFormat.AccessibleDescription = null; - this.txtTrackFilenameFormat.AccessibleName = null; resources.ApplyResources(this.txtTrackFilenameFormat, "txtTrackFilenameFormat"); - this.txtTrackFilenameFormat.BackgroundImage = null; - this.txtTrackFilenameFormat.Font = null; this.txtTrackFilenameFormat.Name = "txtTrackFilenameFormat"; - this.toolTip1.SetToolTip(this.txtTrackFilenameFormat, resources.GetString("txtTrackFilenameFormat.ToolTip")); // // lblTrackFilenameFormat // - this.lblTrackFilenameFormat.AccessibleDescription = null; - this.lblTrackFilenameFormat.AccessibleName = null; resources.ApplyResources(this.lblTrackFilenameFormat, "lblTrackFilenameFormat"); - this.lblTrackFilenameFormat.Font = null; this.lblTrackFilenameFormat.Name = "lblTrackFilenameFormat"; - this.toolTip1.SetToolTip(this.lblTrackFilenameFormat, resources.GetString("lblTrackFilenameFormat.ToolTip")); // // lblSingleFilenameFormat // - this.lblSingleFilenameFormat.AccessibleDescription = null; - this.lblSingleFilenameFormat.AccessibleName = null; resources.ApplyResources(this.lblSingleFilenameFormat, "lblSingleFilenameFormat"); - this.lblSingleFilenameFormat.Font = null; this.lblSingleFilenameFormat.Name = "lblSingleFilenameFormat"; - this.toolTip1.SetToolTip(this.lblSingleFilenameFormat, resources.GetString("lblSingleFilenameFormat.ToolTip")); // // txtSingleFilenameFormat // - this.txtSingleFilenameFormat.AccessibleDescription = null; - this.txtSingleFilenameFormat.AccessibleName = null; resources.ApplyResources(this.txtSingleFilenameFormat, "txtSingleFilenameFormat"); - this.txtSingleFilenameFormat.BackgroundImage = null; - this.txtSingleFilenameFormat.Font = null; this.txtSingleFilenameFormat.Name = "txtSingleFilenameFormat"; - this.toolTip1.SetToolTip(this.txtSingleFilenameFormat, resources.GetString("txtSingleFilenameFormat.ToolTip")); // // groupBox2 // - this.groupBox2.AccessibleDescription = null; - this.groupBox2.AccessibleName = null; - resources.ApplyResources(this.groupBox2, "groupBox2"); - this.groupBox2.BackgroundImage = null; this.groupBox2.Controls.Add(this.rbAPEinsane); this.groupBox2.Controls.Add(this.rbAPEextrahigh); this.groupBox2.Controls.Add(this.rbAPEhigh); this.groupBox2.Controls.Add(this.rbAPEnormal); this.groupBox2.Controls.Add(this.rbAPEfast); - this.groupBox2.Font = null; + resources.ApplyResources(this.groupBox2, "groupBox2"); this.groupBox2.Name = "groupBox2"; this.groupBox2.TabStop = false; - this.toolTip1.SetToolTip(this.groupBox2, resources.GetString("groupBox2.ToolTip")); // // rbAPEinsane // - this.rbAPEinsane.AccessibleDescription = null; - this.rbAPEinsane.AccessibleName = null; resources.ApplyResources(this.rbAPEinsane, "rbAPEinsane"); - this.rbAPEinsane.BackgroundImage = null; - this.rbAPEinsane.Font = null; this.rbAPEinsane.Name = "rbAPEinsane"; this.rbAPEinsane.TabStop = true; - this.toolTip1.SetToolTip(this.rbAPEinsane, resources.GetString("rbAPEinsane.ToolTip")); this.rbAPEinsane.UseVisualStyleBackColor = true; // // rbAPEextrahigh // - this.rbAPEextrahigh.AccessibleDescription = null; - this.rbAPEextrahigh.AccessibleName = null; resources.ApplyResources(this.rbAPEextrahigh, "rbAPEextrahigh"); - this.rbAPEextrahigh.BackgroundImage = null; - this.rbAPEextrahigh.Font = null; this.rbAPEextrahigh.Name = "rbAPEextrahigh"; this.rbAPEextrahigh.TabStop = true; - this.toolTip1.SetToolTip(this.rbAPEextrahigh, resources.GetString("rbAPEextrahigh.ToolTip")); this.rbAPEextrahigh.UseVisualStyleBackColor = true; // // rbAPEhigh // - this.rbAPEhigh.AccessibleDescription = null; - this.rbAPEhigh.AccessibleName = null; resources.ApplyResources(this.rbAPEhigh, "rbAPEhigh"); - this.rbAPEhigh.BackgroundImage = null; - this.rbAPEhigh.Font = null; this.rbAPEhigh.Name = "rbAPEhigh"; this.rbAPEhigh.TabStop = true; - this.toolTip1.SetToolTip(this.rbAPEhigh, resources.GetString("rbAPEhigh.ToolTip")); this.rbAPEhigh.UseVisualStyleBackColor = true; // // rbAPEnormal // - this.rbAPEnormal.AccessibleDescription = null; - this.rbAPEnormal.AccessibleName = null; resources.ApplyResources(this.rbAPEnormal, "rbAPEnormal"); - this.rbAPEnormal.BackgroundImage = null; - this.rbAPEnormal.Font = null; this.rbAPEnormal.Name = "rbAPEnormal"; this.rbAPEnormal.TabStop = true; - this.toolTip1.SetToolTip(this.rbAPEnormal, resources.GetString("rbAPEnormal.ToolTip")); this.rbAPEnormal.UseVisualStyleBackColor = true; // // rbAPEfast // - this.rbAPEfast.AccessibleDescription = null; - this.rbAPEfast.AccessibleName = null; resources.ApplyResources(this.rbAPEfast, "rbAPEfast"); - this.rbAPEfast.BackgroundImage = null; - this.rbAPEfast.Font = null; this.rbAPEfast.Name = "rbAPEfast"; this.rbAPEfast.TabStop = true; - this.toolTip1.SetToolTip(this.rbAPEfast, resources.GetString("rbAPEfast.ToolTip")); this.rbAPEfast.UseVisualStyleBackColor = true; // // tabControl1 // - this.tabControl1.AccessibleDescription = null; - this.tabControl1.AccessibleName = null; resources.ApplyResources(this.tabControl1, "tabControl1"); - this.tabControl1.BackgroundImage = null; this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage2); this.tabControl1.Controls.Add(this.tabPage3); this.tabControl1.Controls.Add(this.tabPage4); - this.tabControl1.Font = null; this.tabControl1.HotTrack = true; this.tabControl1.Multiline = true; this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.toolTip1.SetToolTip(this.tabControl1, resources.GetString("tabControl1.ToolTip")); // // tabPage1 // - this.tabPage1.AccessibleDescription = null; - this.tabPage1.AccessibleName = null; - resources.ApplyResources(this.tabPage1, "tabPage1"); this.tabPage1.BackColor = System.Drawing.Color.Transparent; - this.tabPage1.BackgroundImage = null; this.tabPage1.Controls.Add(this.grpGeneral); this.tabPage1.Controls.Add(this.grpAudioFilenames); - this.tabPage1.Font = null; + resources.ApplyResources(this.tabPage1, "tabPage1"); this.tabPage1.Name = "tabPage1"; - this.toolTip1.SetToolTip(this.tabPage1, resources.GetString("tabPage1.ToolTip")); // // tabPage2 // - this.tabPage2.AccessibleDescription = null; - this.tabPage2.AccessibleName = null; - resources.ApplyResources(this.tabPage2, "tabPage2"); this.tabPage2.BackColor = System.Drawing.SystemColors.Control; - this.tabPage2.BackgroundImage = null; this.tabPage2.Controls.Add(this.groupBox3); this.tabPage2.Controls.Add(this.groupBox1); - this.tabPage2.Font = null; + resources.ApplyResources(this.tabPage2, "tabPage2"); this.tabPage2.Name = "tabPage2"; - this.toolTip1.SetToolTip(this.tabPage2, resources.GetString("tabPage2.ToolTip")); // // groupBox3 // - this.groupBox3.AccessibleDescription = null; - this.groupBox3.AccessibleName = null; - resources.ApplyResources(this.groupBox3, "groupBox3"); - this.groupBox3.BackgroundImage = null; this.groupBox3.Controls.Add(this.chkWriteARLogOnVerify); this.groupBox3.Controls.Add(this.chkWriteARTagsOnVerify); - this.groupBox3.Font = null; + resources.ApplyResources(this.groupBox3, "groupBox3"); this.groupBox3.Name = "groupBox3"; this.groupBox3.TabStop = false; - this.toolTip1.SetToolTip(this.groupBox3, resources.GetString("groupBox3.ToolTip")); // // chkWriteARLogOnVerify // - this.chkWriteARLogOnVerify.AccessibleDescription = null; - this.chkWriteARLogOnVerify.AccessibleName = null; resources.ApplyResources(this.chkWriteARLogOnVerify, "chkWriteARLogOnVerify"); - this.chkWriteARLogOnVerify.BackgroundImage = null; this.chkWriteARLogOnVerify.Checked = true; this.chkWriteARLogOnVerify.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkWriteARLogOnVerify.Font = null; this.chkWriteARLogOnVerify.Name = "chkWriteARLogOnVerify"; - this.toolTip1.SetToolTip(this.chkWriteARLogOnVerify, resources.GetString("chkWriteARLogOnVerify.ToolTip")); this.chkWriteARLogOnVerify.UseVisualStyleBackColor = true; // // tabPage3 // - this.tabPage3.AccessibleDescription = null; - this.tabPage3.AccessibleName = null; - resources.ApplyResources(this.tabPage3, "tabPage3"); this.tabPage3.BackColor = System.Drawing.SystemColors.Control; - this.tabPage3.BackgroundImage = null; this.tabPage3.Controls.Add(this.grpWavPack); this.tabPage3.Controls.Add(this.groupBox2); this.tabPage3.Controls.Add(this.grpFLAC); - this.tabPage3.Font = null; + resources.ApplyResources(this.tabPage3, "tabPage3"); this.tabPage3.Name = "tabPage3"; - this.toolTip1.SetToolTip(this.tabPage3, resources.GetString("tabPage3.ToolTip")); // // tabPage4 // - this.tabPage4.AccessibleDescription = null; - this.tabPage4.AccessibleName = null; - resources.ApplyResources(this.tabPage4, "tabPage4"); this.tabPage4.BackColor = System.Drawing.SystemColors.Control; - this.tabPage4.BackgroundImage = null; this.tabPage4.Controls.Add(this.grpHDCD); this.tabPage4.Controls.Add(this.chkHDCDDetect); - this.tabPage4.Font = null; + resources.ApplyResources(this.tabPage4, "tabPage4"); this.tabPage4.Name = "tabPage4"; - this.toolTip1.SetToolTip(this.tabPage4, resources.GetString("tabPage4.ToolTip")); // // grpHDCD // - this.grpHDCD.AccessibleDescription = null; - this.grpHDCD.AccessibleName = null; - resources.ApplyResources(this.grpHDCD, "grpHDCD"); - this.grpHDCD.BackgroundImage = null; this.grpHDCD.Controls.Add(this.chkHDCDStopLooking); this.grpHDCD.Controls.Add(this.chkHDCDDecode); - this.grpHDCD.Font = null; + resources.ApplyResources(this.grpHDCD, "grpHDCD"); this.grpHDCD.Name = "grpHDCD"; this.grpHDCD.TabStop = false; - this.toolTip1.SetToolTip(this.grpHDCD, resources.GetString("grpHDCD.ToolTip")); // // chkHDCDDetect // - this.chkHDCDDetect.AccessibleDescription = null; - this.chkHDCDDetect.AccessibleName = null; resources.ApplyResources(this.chkHDCDDetect, "chkHDCDDetect"); - this.chkHDCDDetect.BackgroundImage = null; - this.chkHDCDDetect.Font = null; this.chkHDCDDetect.Name = "chkHDCDDetect"; - this.toolTip1.SetToolTip(this.chkHDCDDetect, resources.GetString("chkHDCDDetect.ToolTip")); this.chkHDCDDetect.UseVisualStyleBackColor = true; this.chkHDCDDetect.CheckedChanged += new System.EventHandler(this.chkHDCDDetect_CheckedChanged); // + // chkReducePriority + // + resources.ApplyResources(this.chkReducePriority, "chkReducePriority"); + this.chkReducePriority.Name = "chkReducePriority"; + this.chkReducePriority.UseVisualStyleBackColor = true; + // // frmSettings // this.AcceptButton = this.btnOK; - this.AccessibleDescription = null; - this.AccessibleName = null; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackgroundImage = null; this.CancelButton = btnCancel; this.ControlBox = false; this.Controls.Add(this.tabControl1); this.Controls.Add(btnCancel); this.Controls.Add(this.btnOK); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Icon = null; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "frmSettings"; this.ShowIcon = false; this.ShowInTaskbar = false; - this.toolTip1.SetToolTip(this, resources.GetString("$this.ToolTip")); this.Load += new System.EventHandler(this.frmSettings_Load); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmSettings_FormClosing); this.grpGeneral.ResumeLayout(false); @@ -1120,6 +818,7 @@ namespace JDP { private System.Windows.Forms.CheckBox chkCreateM3U; private System.Windows.Forms.CheckBox chkCreateCUEFileWhenEmbedded; private System.Windows.Forms.CheckBox chkTruncateExtra4206Samples; + private System.Windows.Forms.CheckBox chkReducePriority; } } \ No newline at end of file diff --git a/CUETools/frmSettings.cs b/CUETools/frmSettings.cs index 30cb75f..0dfa279 100644 --- a/CUETools/frmSettings.cs +++ b/CUETools/frmSettings.cs @@ -9,6 +9,7 @@ using CUEToolsLib; namespace JDP { public partial class frmSettings : Form { int _writeOffset; + bool _reducePriority; CUEConfig _config; public frmSettings() { @@ -16,6 +17,7 @@ namespace JDP { } private void frmSettings_Load(object sender, EventArgs e) { + chkReducePriority.Checked = _reducePriority; numericWriteOffset.Value = _writeOffset; chkPreserveHTOA.Checked = _config.preserveHTOA; chkAutoCorrectFilenames.Checked = _config.autoCorrectFilenames; @@ -73,6 +75,12 @@ namespace JDP { set { _writeOffset = value; } } + public bool ReducePriority + { + get { return _reducePriority; } + set { _reducePriority = value; } + } + public CUEConfig Config { get { return _config; } set { _config = value; } @@ -85,6 +93,7 @@ namespace JDP { private void btnOK_Click(object sender, EventArgs e) { _writeOffset = (int)numericWriteOffset.Value; + _reducePriority = chkReducePriority.Checked; _config.preserveHTOA = chkPreserveHTOA.Checked; _config.autoCorrectFilenames = chkAutoCorrectFilenames.Checked; _config.flacCompressionLevel = (uint)numericFLACCompressionLevel.Value; @@ -150,5 +159,16 @@ namespace JDP { { grpHDCD.Enabled = chkHDCDDetect.Checked; } + + private void chkFilenamesANSISafe_CheckedChanged(object sender, EventArgs e) + { + chkRemoveSpecial.Enabled = chkFilenamesANSISafe.Checked; + txtSpecialExceptions.Enabled = chkRemoveSpecial.Checked && chkFilenamesANSISafe.Checked; + } + + private void chkRemoveSpecial_CheckedChanged(object sender, EventArgs e) + { + txtSpecialExceptions.Enabled = chkRemoveSpecial.Checked; + } } } \ No newline at end of file diff --git a/CUETools/frmSettings.resx b/CUETools/frmSettings.resx index 1115077..48a15ad 100644 --- a/CUETools/frmSettings.resx +++ b/CUETools/frmSettings.resx @@ -117,1361 +117,290 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - - - Add ACCURATERIPCOUNT/ACCURATERIPCOUNTALLOFFSETS/ACCURATERIPTOTAL tags to input files. You can set up foobar2000 to show those values, and see if your music was ripped correctly or how popular it is. - - - $this - + + False + - - 73, 23 - - - Add ACCURATERIPCOUNT/ACCURATERIPCOUNTALLOFFSETS/ACCURATERIPTOTAL tags to output files. You can set up foobar2000 to show those values, and see if your music was ripped correctly or how popular it is. - - - 137, 17 - - - 8, 6 - - - 2 - - - - - - 6, 20 - - - lblSingleFilenameFormat - - - 12, 172 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 12, 112 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 12, 44 - - - labelEncodeWhenConfidence - - - - 2 - - - 7 - - - Single format: - - - chkWriteARLogOnVerify - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Very High - - - 46, 17 - - - True - - - 2 - - - File should be in the same directory as source file and have a .log extension - - - - - - groupBox1 - - - grpGeneral - - - %N-%A-%T - - - btnOK - - - 7 - - - 128, 101 - - - 36, 21 - - - True - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 194, 271 - - - 4 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 71, 17 - - - 46, 17 - - - 6, 172 - - - 6 - - - Некоторые FLAC-кодировщики добавляют лишние 4206 пустых сэмплов в конце файла. Эту ситуацию можно легко обнаружить и исправить. - - - 12, 20 - - - 0 - - - grpWavPack - - - 136, 17 - - - 4 - - - Detect HDCD encoding - - - True - - - - 3, 3, 3, 3 - - - grpGeneral - - - Write offset (samples): - - - tabControl1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 3 - - - chkHDCDStopLooking - - - groupBox3 - - - System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 - - - chkEncodeWhenZeroOffset - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 542, 307 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - %F - - - - - - 0 - - - 1 - - - 121, 13 - - - grpAudioFilenames - - - grpAudioFilenames - - - 3 - - - 74, 13 - - - 135, 17 - - - 13, 36 - - - 9, 93 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 2 - - - and zero offset - - - grpWavPack - - - 12, 150 - - - frmSettings - - - - - - Yes - - - 1 - - - grpFLAC - - - - - - 12, 129 - - - 13, 19 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 3 - - - chkCreateM3U - - - chkArNoUnverifiedAudio - - - 4, 22 - - - tabControl1 - - - 54, 17 - - - grpHDCD - - - - - - groupBox2 - - - 4 - - - rbWVHigh - - - groupBox1 - - - chkHDCDDetect - - - 101, 23 - - - 103, 91 - - - HDCD options - - - lblTrackFilenameFormat - - - Top, Left, Right - - - 75, 17 - - - 2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 1 - - - 0 - - - rbAPEnormal - - - True - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 12 - - - Fill up missing CUE data from tags - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 4, 22 - - - 2 - - - 3 - - - 108, 21 - - - chkWVStoreMD5 - - - 58, 17 - - - grpWavPack - - - 37, 21 - - - 97, 123 - - - 12, 92 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Top, Right - - - 0 - - - labelFixWhenConfidence - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 125, 17 - - - 1 - - - Locate audio files if missing - - - 72, 13 - - - Codecs - - - numericWriteOffset - - - 2 - - - 5 - - - - - - 6 - - - rbWVVeryHigh - - - 535, 227 - - - Normal - - - 100, 17 - - - 93, 17 - - - True - - - 12, 114 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 46, 17 - - - 2 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 7 - - - 128, 42 - - - True - - - 168, 17 - - - grpHDCD - - - 0 - - - groupBox1 - - - grpGeneral - - - 229, 17 - - - 4 - - - FLAC - - - 12, 61 - - - 543, 253 - - - Extra mode: - - - True - - - OK - 273, 271 - - numericFLACCompressionLevel - - - NoControl - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 2 - - - groupBox3 - - - with confidence >= - - - 6 - - - 12, 100 - - - groupBox2 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Only allow characters, which are present in ANSI codepage, for compatibility with non-unicode applications - - - grpAudioFilenames - - - 38, 21 - - - True - - - True - - - 2 - - - 6 - - - 38, 21 - - - True - - - chkEmbedLog - - - 5 - - - chkRemoveSpecial - - - 1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpAudioFilenames - - + 73, 23 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Compression level: - - - numWVExtraMode - - - numFixWhenPercent - - - Force ANSI filenames - - - - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 3, 3, 3, 3 - - - Fix offset if - - - - - - tabPage1 - - - 0 - - - 0 - - - - - - 8 - - - True - - - Decode HDCD to 24 bit - - - 1 - - - - - - 252, 204 - - - 0 - - - tabPage4 - - - - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - - - - NoControl - - - Write AccurateRip log - - - 0 - - - tabPage3 - - - 235, 40 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - + + 6 - - 5 - - - True - - - chkWriteArLogOnConvert - - - chkFLACVerify - - - - - - CUETools - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 11 - - - True - - - 3 - - - groupBox1 - - - tabPage3 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 - - - rbAPEhigh - - - groupBox1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 4 - - - 97, 40 - - - groupBox1 - - - numEncodeWhenPercent - - - True - - - grpGeneral - - - numEncodeWhenConfidence - - - 7 - - - labelFixWhenPercent - - - 2 - - - 6 - - - tabControl1 - - - 8 - - - - - - 1 - - - 9 - - - 8 - - - 2 - - - groupBox1 - - - 12 - - - 11 - - - 1 - - - txtSpecialExceptions - - - tabControl1 - - - 12, 78 - - - Embed log file as a tag - - - True - - - Stop looking for HDCD information, If none found in first 10 seconds of the disc - - - 118, 13 - - - grpHDCD - - - Right - - - - - - chkWriteArTagsOnConvert - - - - - - True - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - NoControl - - - txtTrackFilenameFormat - - - groupBox1 - - - Right - - - - - - 5 - - - grpAudioFilenames - - - True - - - lblFLACCompressionLevel - - - 145, 148 - - - 1 - - - grpGeneral - - - 97, 68 - - - 13, 37 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 3 - - - grpGeneral - - - 215, 17 - - - True - - - txtSingleFilenameFormat - - - 7 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 8 - - - 4 - - - grpGeneral - - - 7 - - - NoControl - - - Monkey's Audio (.ape) - - - 5 - - - 127, 17 - Cancel - - True + + btnCancel - - 6, 43 + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 2 + + $this - - -() - - - True - - - 137, 17 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + 1 - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 295, 215 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - + True - - + + + NoControl - - + + 12, 163 - - 134, 17 + + 173, 17 - - chkWVExtraMode + + 9 - - chkWriteARTagsOnVerify + + Reduce process priority to Idle - + + chkReducePriority + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + grpGeneral + + 0 - - rbWVNormal - - - 13, 70 - - - grpWavPack - - - Verify - - - 3 - - - 189, 17 - - - 2 - - - groupBox1 - - - - - - 5 - - - grpAudioFilenames - - - - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 112, 89 - - - 187, 17 - - - 0 - - - groupBox2 - - - 235, 19 - - - 9, 43 - - - 38, 21 - - - 58, 17 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 264, 6 - - - 226, 6 - - - 133, 20 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - rbAPEextrahigh - - - 317, 6 - - - 212, 215 - - - - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 - - - groupBox1 - - - chkArFixOffset - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpAudioFilenames - - - toolTip1 - - - Preserve HTOA for gaps appended output - - - Keep original filenames - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Create .cue file even if embedded - - + True - - 101, 13 - - - 1 - 12, 146 - - 46, 17 + + 215, 17 - - HDCD - - - 1 - - - labelEncodeWhenPercent - - - 6 - - - Write AccurateRip tags - - - NoControl - - - 0, 0, 0, 0 - - - Verify, then convert - - - 149, 21 - - - Extra High - - - 1 - - - 173, 62 - - - 149, 21 - - - 12, 95 - - - 19, 19 - - - rbAPEfast - - - 13, 53 - - - 2 - - - Normal - - - chkPreserveHTOA - - - 81, 17 + + 8 Truncate extra 4206 samples if present - - 3 - - - rbAPEinsane - - - High - - - 252, 204 - - - 8 - - - grpFLAC - - - Right - - - 7 - - - 3 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - 2 - - - 6, 6 - - - chkCreateCUEFileWhenEmbedded - - - 0 - - - - - - 6, 149 - - - tabPage4 - - - 185, 17 - - - 3 - - - Write AccurateRip log - - - 4, 22 - - - 146, 148 - - - Create .m3u playlists + + 17, 17 + + + Некоторые FLAC-кодировщики добавляют лишние 4206 пустых сэмплов в конце файла. Эту ситуацию можно легко обнаружить и исправить. chkTruncateExtra4206Samples - - tabPage2 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPage4 + + grpGeneral - - chkFilenamesANSISafe + + 1 - - 0, 0 + + True + + + 12, 129 + + + 189, 17 + + + 7 + + + Create .cue file even if embedded + + + chkCreateCUEFileWhenEmbedded + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGeneral + + + 2 + + + True + + + 12, 112 + + + 127, 17 + + + 6 + + + Create .m3u playlists + + + chkCreateM3U + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGeneral + + + 3 + + + True + + + 12, 95 + + + 187, 17 + + + 5 + + + Fill up missing CUE data from tags + + + chkFillUpCUE + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGeneral + + + 4 + + + True + + + 12, 78 + + + 134, 17 + + + 4 + + + Embed log file as a tag + + + File should be in the same directory as source file and have a .log extension + + + chkEmbedLog + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGeneral + + + 5 + + + 133, 20 + + + 62, 21 + + + 1 + + + Right + + + numericWriteOffset + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGeneral + + + 6 + + + True + + + 12, 61 + + + 155, 17 + + + 3 + + + Locate audio files if missing + + + Preprocess with filename corrector if unable to locate audio files + + + chkAutoCorrectFilenames + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGeneral + + + 7 + + + True + + + 12, 44 + + + 229, 17 + + + 2 + + + Preserve HTOA for gaps appended output + + + chkPreserveHTOA + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGeneral + + + 8 True @@ -1479,619 +408,1543 @@ 9, 23 - + + 118, 13 + + + 0 + + + Write offset (samples): + + + lblWriteOffset + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + grpGeneral - - 2 + + 9 + + + 6, 6 + + + 252, 204 0 - - chkReplaceSpaces + + General - - - - - - - - True - - - System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 97, 13 - - - 130, 17 - - - Audio Filenames - - - - - - - - - 235, 101 - - - 0 - - - 6 - - - tabPage1 - - - 6, 13 - - - tabPage3 - - - chkAutoCorrectFilenames - - - Remove special characters except: - - - 535, 227 - - - grpAudioFilenames - - - groupBox2 - - - - - - Top, Right - - - 1 - - - True - - - True - - - 203, 165 - - - 149, 21 - - - 4 - - - $this - - - 1 - - - 4 - - - 36, 21 - - - groupBox1 - - - 135, 17 - - - NoControl - - - chkKeepOriginalFilenames - - - groupBox1 - - - 4 - - - True - - - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 3 - - - 3 - - - 12, 20 - - - chkHDCDDecode - - - True - - - 5, 172 - - - - - - Replace spaces with underscores - - - Verify - - - Stop looking after 750 frames - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 - - - 155, 17 - - - 8 - - - 235, 80 - - - - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpWavPack - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - numFixWhenConfidence - - - AccurateRip - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 4 - - - Encode only if - - - 1 - - - grpAudioFilenames - - - 535, 227 - - - True - - - 1 - - - 1 - - + grpGeneral - - + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - HDCD decoding is irreversable. Resulting files cannot be burned to the CD. 24-bit audio files are created, but the actual resolution is 20 bit - - - % of verified tracks >= - - - - - - Store MD5 checksum - - - grpWavPack - - - True - - - 1 - - - 194, 17 + + tabPage1 0 - - 3, 3, 3, 3 + + 112, 89 - - 62, 21 + + 36, 21 - - 6, 149 + + 2 - - % of verified tracks >= + + Right - - 3, 3, 3, 3 + + numericFLACCompressionLevel - - + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 13, 71 + + grpFLAC - + 0 - - Top, Right + + True - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 9, 93 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 97, 13 - - 10 + + 1 - - 19, 42 + + Compression level: - - groupBox1 + + lblFLACCompressionLevel - - Advanced Settings + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 6, 81 - - - 3 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + grpFLAC 1 - - 0 - - - - - - 7 - - - chkFillUpCUE - True - - tabPage1 + + 12, 20 - - 6 + + 54, 17 - - + + 0 - - 3 + + Verify - - + + chkFLACVerify - - - - - Insane - - - - - - - - - 5 - - - 5 - - - WavPack (.wv) - - - 1 - - - - - - 58, 17 - - - Fast - - - Tahoma, 8.25pt - - - grpWavPack - - - 13, 54 - - - 1 - - - - - - 4 - - - NoControl - - - Fast - - - groupBox1 - - - True - - - 535, 227 - - - - - + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 grpFLAC - - 1 + + 2 - - Write AccurateRip tags + + 317, 6 - - 108, 82 + + 204, 148 - - 128, 17 + + 4 - + + FLAC + + + grpFLAC + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage3 + + + 2 + + + 194, 271 + + + 73, 23 + + + 5 + + + OK + + + btnOK + + + System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + True + + + 12, 114 + + + 125, 17 + + + 6 + + + Store MD5 checksum + + + chkWVStoreMD5 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + grpWavPack - - - - - - - - Preprocess with filename corrector if unable to locate audio files - - - btnCancel - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 9 - - - CenterParent - - - with confidence >= - - - 2 - - - 2 - - - - - + 0 - - tabControl1 + + 103, 91 - - 6, 20 + + 36, 21 - - Track format: + + 5 - - + + Right - - grpFLAC + + numWVExtraMode + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpWavPack + + + 1 + + + True + + + 12, 92 85, 17 - - 6, 6 + + 4 + + + Extra mode: + + + chkWVExtraMode + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpWavPack + + + 2 + + + True + + + 13, 70 + + + 71, 17 + + + 3 + + + Very High + + + rbWVVeryHigh + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpWavPack 3 - - - - - tabPage2 - - - lblWriteOffset - - - High - - + True - + + 13, 53 + + + 46, 17 + + + 2 + + + High + + + rbWVHigh + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpWavPack + + + 4 + + + True + + + 13, 36 + + + 58, 17 + + + 1 + + + Normal + + + rbWVNormal + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpWavPack + + + 5 + + + True + + + 13, 19 + + + 46, 17 + + + 0 + + + Fast + + + rbWVFast + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpWavPack + + + 6 + + + 6, 6 + + + 146, 148 + + + 3 + + + WavPack (.wv) + + + grpWavPack + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage3 + + + 0 + + + Top, Right + + + True + + + 173, 62 + + + Yes + + + 100, 17 + + + 12 + + + and zero offset + + + chkEncodeWhenZeroOffset + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 0 + + + True + + + 6, 81 + + + 81, 17 + + + 7 + + + Fix offset if + + + chkArFixOffset + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 1 + + + True + + + 6, 172 + + 130, 17 - - + + 1 + + + Write AccurateRip log + + + chkWriteArLogOnConvert + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 2 + + + True + + + 6, 149 + + + 137, 17 + + + 0 + + + Write AccurateRip tags + + + Add ACCURATERIPCOUNT/ACCURATERIPCOUNTALLOFFSETS/ACCURATERIPTOTAL tags to output files. You can set up foobar2000 to show those values, and see if your music was ripped correctly or how popular it is. + + + chkWriteArTagsOnConvert + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 3 + + + Top, Right + + + True + + + 108, 21 + + + 121, 13 + + + 3 + + + % of verified tracks >= + + + labelEncodeWhenPercent + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 4 + + + 235, 19 + + + 38, 21 + + + 4 + + + numEncodeWhenPercent + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 5 + + + Top, Right + + + True + + + 128, 42 + + + 101, 13 + + + 5 + + + with confidence >= + + + labelEncodeWhenConfidence + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 6 + + + 235, 40 + + + 38, 21 + + + 6 + + + numEncodeWhenConfidence + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 7 + + + True + + + 6, 20 + + + 93, 17 + + + 2 + + + Encode only if + + + chkArNoUnverifiedAudio + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 8 + + + 128, 101 + + + 101, 23 10 - + + with confidence >= + + + labelFixWhenConfidence + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 9 + + + 235, 101 + + + 37, 21 + + + 11 + + + numFixWhenConfidence + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + groupBox1 + + + 10 + + + 108, 82 + + + 121, 23 + + + 8 + + + % of verified tracks >= + + + labelFixWhenPercent + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 11 + + + 235, 80 + + + 38, 21 + + + 9 + + + numFixWhenPercent + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 12 + + + 226, 6 + + + 295, 215 + + + 2 + + + Verify, then convert + + + groupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tabPage2 - - + + 1 - + + True + + + 12, 98 + + + 128, 17 + + + 7 + + + Force ANSI filenames + + + Only allow characters, which are present in ANSI codepage, for compatibility with non-unicode applications + + + chkFilenamesANSISafe + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 0 + + + True + + + NoControl + + + 6, 149 + + + 137, 17 + + + 2 + + + Write AccurateRip tags + + + Add ACCURATERIPCOUNT/ACCURATERIPCOUNTALLOFFSETS/ACCURATERIPTOTAL tags to input files. You can set up foobar2000 to show those values, and see if your music was ripped correctly or how popular it is. + + + chkWriteARTagsOnVerify + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox3 + + + 1 + + + True + + + 6, 43 + + + 136, 17 + + + 1 + + + Decode HDCD to 24 bit + + + HDCD decoding is irreversable. Resulting files cannot be burned to the CD. 24-bit audio files are created, but the actual resolution is 20 bit + + + chkHDCDDecode + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpHDCD + + + 1 + + + True + + + 6, 20 + + + 168, 17 + + + 2 + + + Stop looking after 750 frames + + + Stop looking for HDCD information, If none found in first 10 seconds of the disc + + + chkHDCDStopLooking + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpHDCD + + + 0 + + + True + + + NoControl + + + 12, 20 + + + 135, 17 + + + 0 + + + Keep original filenames + + + chkKeepOriginalFilenames + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 1 + + + 97, 132 + + + 149, 21 + + + 6 + + + -() + + + txtSpecialExceptions + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 2 + + + True + + + NoControl + + + 34, 115 + + + 194, 17 + + + 5 + + + Remove special characters except: + + + chkRemoveSpecial + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 3 + + + True + + + NoControl + + + 12, 165 + + + 185, 17 + + + 7 + + + Replace spaces with underscores + + + chkReplaceSpaces + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 4 + + + 97, 68 + + + 149, 21 + + + 4 + + + %N-%A-%T + + + txtTrackFilenameFormat + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 5 + + + True + + + NoControl + + + 11, 71 + + + 72, 13 + + + 3 + + + Track format: + + + lblTrackFilenameFormat + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 6 + + + True + + + NoControl + + + 9, 43 + + + 74, 13 + + + 1 + + + Single format: + + + lblSingleFilenameFormat + + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 7 + + + 97, 40 + + + 149, 21 + + + 2 + + + %F + + + txtSingleFilenameFormat + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpAudioFilenames + + + 8 + + + 264, 6 + + + 252, 204 + + + 1 + + + Audio Filenames + + + grpAudioFilenames + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage1 + + + 1 + + + True + + + 13, 88 + + + 58, 17 + + + 4 + + + Insane + + + rbAPEinsane + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 0 + + + True + + + 13, 71 + + + 75, 17 + + + 3 + + + Extra High + + + rbAPEextrahigh + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 1 + + + True + + + 13, 54 + + + 46, 17 + + + 2 + + + High + + + rbAPEhigh + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 2 + + + True + + + 13, 37 + + + 58, 17 + + + 1 + + + Normal + + + rbAPEnormal + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 3 + + True 13, 20 - + + 46, 17 + + + 0 + + + Fast + + + rbAPEfast + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 121, 23 + + groupBox2 - - True - - - 4, 22 - - - True - - - grpGeneral - - - grpAudioFilenames - - - tabPage3 - - - + + 4 166, 6 - + + 145, 148 + + + 7 + + + Monkey's Audio (.ape) + + + groupBox2 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage3 + + + 1 + + + Top, Left, Right + + + 4, 22 + + + 3, 3, 3, 3 + + + 535, 227 + + + 0 + + + CUETools + + + tabPage1 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 0 + + + True + + + NoControl + + + 5, 172 + + + 130, 17 + + + 3 + + + Write AccurateRip log + + + chkWriteARLogOnVerify + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 11, 71 + + groupBox3 - - + + 0 - - General + + 8, 6 - - 204, 148 + + 212, 215 - - 13, 88 + + 3 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Verify - - + + groupBox3 - - grpWavPack + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - rbWVFast + + tabPage2 - + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 535, 227 + + + 1 + + + AccurateRip + + + tabPage2 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 1 + + + 4, 22 + + + 3, 3, 3, 3 + + + 535, 227 + + 2 - - False - - - 17, 17 - + + Codecs + + + tabPage3 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 2 + + + 19, 42 + + + 203, 165 + + + 2 + + + HDCD options + + + grpHDCD + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage4 + + + 0 + + + True + + + 19, 19 + + + 135, 17 + + + 0 + + + Detect HDCD encoding + + + chkHDCDDetect + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage4 + + + 1 + + + 4, 22 + + + 3, 3, 3, 3 + + + 535, 227 + + + 3 + + + HDCD + + + tabPage4 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 3 + + + 0, 0 + + + 0, 0, 0, 0 + + + 543, 253 + + + 8 + + + tabControl1 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + True + + 6, 13 + + + 542, 307 + + + Tahoma, 8.25pt + + + CenterParent + + + Advanced Settings + + + toolTip1 + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + frmSettings + + + 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/frmSettings.ru-RU.resx b/CUETools/frmSettings.ru-RU.resx index 75a852c..a399a40 100644 --- a/CUETools/frmSettings.ru-RU.resx +++ b/CUETools/frmSettings.ru-RU.resx @@ -120,8 +120,8 @@ Отмена - - Общие + + @@ -136,18 +136,27 @@ Создавать .cue даже при встраивании + + + 166, 17 Создавать плейлисты .m3u + + + 221, 17 Пополнить .cue информацией из тэгов + + + 156, 17 @@ -157,6 +166,9 @@ Работает, если .log лежит в той же папке и имеет то же имя, что и исходный файл + + + 213, 17 @@ -172,15 +184,30 @@ Сохранять HTOA при разбивке на треки + + + 114, 13 Смещение (сэмплов): + + + + + Общие + + + + 147, 88 + + + 11, 90 @@ -190,50 +217,83 @@ Уровень сжатия: + + + 94, 17 Верификация + + + + + + + + + 119, 17 MD5-хеширование + + + + + + 89, 17 Доп. режим: + + + 103, 17 Очень высокий + + + 68, 17 Высокий + + + 69, 17 Средний + + + 70, 17 Быстрый - - Проверить и записать + + + + + 150, 77 @@ -244,6 +304,9 @@ и нулевым смещением + + + 6, 100 @@ -253,6 +316,9 @@ Исправлять смещение если + + + 6, 181 @@ -262,6 +328,9 @@ Записывать отчет AccurateRip + + + 6, 164 @@ -283,9 +352,15 @@ % проверенных треков >= + + + 250, 35 + + + 125, 58 @@ -295,15 +370,24 @@ с достоверностью >= + + + 250, 56 + + + 176, 17 Конвертировать только если + + + Top, Right @@ -321,9 +405,15 @@ с достоверностью >= + + + 251, 137 + + + Top, Right @@ -339,9 +429,21 @@ % проверенных треков >= + + + 250, 116 + + + + + Проверить и записать + + + + 207, 17 @@ -381,27 +483,39 @@ Прекращать поиск HDCD-кодировки, если её не обнаружено в первых 10 секундах аудио данных. - - Имена аудиофайлов - 157, 17 Сохранять оригинальные + + + + + + 223, 17 Удалять специальные символы кроме: + + + 209, 17 Заменять пробелы подчеркиванями + + + + + + 10, 75 @@ -411,14 +525,47 @@ Трек: + + + 75, 13 Образ диска: - - При проверке + + + + + + + + Имена аудиофайлов + + + + + + + + + + + + + + + + + + + + + + + + 5, 181 @@ -429,19 +576,49 @@ Записывать отчет AccurateRip + + + + + При проверке + + + + + + + Форматы + + + Параметры + + + 120, 17 Определять HDCD + + + + + + + + + Продвинутые настройки + + + \ No newline at end of file diff --git a/CUEToolsLib/Main.cs b/CUEToolsLib/Main.cs index b89b27c..5b98cc9 100644 --- a/CUEToolsLib/Main.cs +++ b/CUEToolsLib/Main.cs @@ -241,7 +241,6 @@ namespace CUEToolsLib public bool createTOC; public bool createCUEFileWhenEmbedded; public bool truncate4608ExtraSamples; - public bool processPriorityIdle; public CUEConfig() { @@ -282,7 +281,6 @@ namespace CUEToolsLib createTOC = false; createCUEFileWhenEmbedded = false; truncate4608ExtraSamples = true; - processPriorityIdle = true; } public void Save (SettingsWriter sw) @@ -324,7 +322,6 @@ namespace CUEToolsLib sw.Save("CreateTOC", createTOC); sw.Save("CreateCUEFileWhenEmbedded", createCUEFileWhenEmbedded); sw.Save("Truncate4608ExtraSamples", truncate4608ExtraSamples); - sw.Save("ProcessPriorityIdle", processPriorityIdle); } public void Load(SettingsReader sr) @@ -366,7 +363,6 @@ namespace CUEToolsLib createTOC = sr.LoadBoolean("CreateTOC") ?? false; createCUEFileWhenEmbedded = sr.LoadBoolean("CreateCUEFileWhenEmbedded") ?? false; truncate4608ExtraSamples = sr.LoadBoolean("Truncate4608ExtraSamples") ?? true; - processPriorityIdle = sr.LoadBoolean("ProcessPriorityIdle") ?? true; } public string CleanseString (string s) @@ -380,16 +376,16 @@ namespace CUEToolsLib for (int i = 0; i < s.Length; i++) { char ch = s[i]; - if (removeSpecial && specialExceptions.IndexOf(ch) < 0 && !( + if (filenamesANSISafe && removeSpecial && specialExceptions.IndexOf(ch) < 0 && !( ((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z')) || ((ch >= '0') && (ch <= '9')) || (ch == ' ') || (ch == '_'))) ch = '_'; - if (Array.IndexOf(invalid, ch) >= 0) + if ((Array.IndexOf(invalid, ch) >= 0) || (replaceSpaces && ch == ' ')) sb.Append("_"); else - sb.Append (ch); + sb.Append(ch); } return sb.ToString(); @@ -904,7 +900,9 @@ namespace CUEToolsLib #if !MONO private void unrar_ExtractionProgress(object sender, ExtractionProgressEventArgs e) { - _progress.percentTrack = (uint) Math.Round(e.PercentComplete); + if (this.CUEToolsProgress == null) + return; + _progress.percentTrack = (uint)Math.Round(e.PercentComplete); this.CUEToolsProgress(this, _progress); } @@ -1010,6 +1008,9 @@ namespace CUEToolsLib replace.Add(null); replace.Add(Path.GetFileNameWithoutExtension(outputPath)); + if (_config.detectHDCD && hdcdDecoder != null && _config.decodeHDCD) + extension = ".24bit" + extension; + if (_config.keepOriginalFilenames && HasSingleFilename) { SingleFilename = Path.ChangeExtension(SingleFilename, extension); @@ -1018,15 +1019,8 @@ namespace CUEToolsLib { filename = General.ReplaceMultiple(_config.singleFilenameFormat, find, replace); if (filename == null) - { filename = "Range"; - } - if (_config.replaceSpaces) - { - filename = filename.Replace(' ', '_'); - } filename += extension; - SingleFilename = filename; } @@ -1055,13 +1049,7 @@ namespace CUEToolsLib filename = General.ReplaceMultiple(_config.trackFilenameFormat, find, replace); if (filename == null) - { filename = replace[2]; - } - if (_config.replaceSpaces) - { - filename = filename.Replace(' ', '_'); - } filename += extension; if (htoa) @@ -2125,11 +2113,11 @@ namespace CUEToolsLib TrackInfo track; IAudioSource audioSource = null; IAudioDest audioDest = null; - IAudioDest decodedAudioDest = null; bool discardOutput; int iSource = -1; int iDest = -1; uint samplesRemSource = 0; + int bitsPerSample = (_config.detectHDCD && hdcdDecoder != null && _config.decodeHDCD && !noOutput) ? 24 : 16; if (_writeOffset != 0) { @@ -2183,15 +2171,9 @@ namespace CUEToolsLib if (style == CUEStyle.SingleFile || style == CUEStyle.SingleFileWithCUE) { iDest++; - audioDest = GetAudioDest(destPaths[iDest], destLengths[iDest], noOutput, 16); + audioDest = GetAudioDest(destPaths[iDest], destLengths[iDest], noOutput, bitsPerSample); if (!noOutput) SetAlbumTags(audioDest, bestOffset, style == CUEStyle.SingleFileWithCUE); - if (_config.detectHDCD && hdcdDecoder != null && _config.decodeHDCD && !noOutput) - { - decodedAudioDest = GetAudioDest(Path.ChangeExtension(destPaths[iDest], ".24bit" + Path.GetExtension(destPaths[iDest])), - destLengths[iDest], noOutput, 24); - SetAlbumTags(decodedAudioDest, bestOffset, style == CUEStyle.SingleFileWithCUE); - } } if (_accurateRip && noOutput) @@ -2217,20 +2199,14 @@ namespace CUEToolsLib track = _tracks[iTrack]; if ((style == CUEStyle.GapsPrepended) || (style == CUEStyle.GapsLeftOut)) { - if (audioDest != null) audioDest.Close(); iDest++; - audioDest = GetAudioDest(destPaths[iDest], destLengths[iDest], noOutput, 16); + if (hdcdDecoder != null) + hdcdDecoder.AudioDest = null; + if (audioDest != null) + audioDest.Close(); + audioDest = GetAudioDest(destPaths[iDest], destLengths[iDest], noOutput, bitsPerSample); if (!noOutput) SetTrackTags(audioDest, iTrack, bestOffset); - if (_config.detectHDCD && hdcdDecoder != null && _config.decodeHDCD && !noOutput) - { - hdcdDecoder.AudioDest = null; - if (decodedAudioDest != null) - decodedAudioDest.Close(); - decodedAudioDest = GetAudioDest(Path.ChangeExtension(destPaths[iDest], ".24bit" + Path.GetExtension(destPaths[iDest])), - destLengths[iDest], noOutput, 24); - SetTrackTags(decodedAudioDest, iTrack, bestOffset); - } } for (iIndex = 0; iIndex <= track.LastIndex; iIndex++) { @@ -2248,33 +2224,23 @@ namespace CUEToolsLib trackLength += _tracks[iTrack + 1].IndexLengths[0] * 588; } - if ((style == CUEStyle.GapsAppended) && (iIndex == 1)) { - if (audioDest != null) audioDest.Close(); + if ((style == CUEStyle.GapsAppended) && (iIndex == 1)) + { + if (hdcdDecoder != null) + hdcdDecoder.AudioDest = null; + if (audioDest != null) + audioDest.Close(); iDest++; - audioDest = GetAudioDest(destPaths[iDest], destLengths[iDest], noOutput, 16); + audioDest = GetAudioDest(destPaths[iDest], destLengths[iDest], noOutput, bitsPerSample); if (!noOutput) SetTrackTags(audioDest, iTrack, bestOffset); - if (_config.detectHDCD && hdcdDecoder != null && _config.decodeHDCD && !noOutput) - { - hdcdDecoder.AudioDest = null; - if (decodedAudioDest != null) - decodedAudioDest.Close(); - decodedAudioDest = GetAudioDest(Path.ChangeExtension(destPaths[iDest], ".24bit" + Path.GetExtension(destPaths[iDest])), - destLengths[iDest], noOutput, 24); - SetTrackTags(decodedAudioDest, iTrack, bestOffset); - } } if ((style == CUEStyle.GapsAppended) && (iIndex == 0) && (iTrack == 0)) { discardOutput = !htoaToFile; if (htoaToFile) { iDest++; - audioDest = GetAudioDest(destPaths[iDest], destLengths[iDest], noOutput, 16); - if (_config.detectHDCD && hdcdDecoder != null && _config.decodeHDCD && !noOutput) - { - decodedAudioDest = GetAudioDest(Path.ChangeExtension(destPaths[iDest], ".24bit" + Path.GetExtension(destPaths[iDest])), - destLengths[iDest], noOutput, 24); - } + audioDest = GetAudioDest(destPaths[iDest], destLengths[iDest], noOutput, bitsPerSample); } } else if ((style == CUEStyle.GapsLeftOut) && (iIndex == 0)) { @@ -2304,20 +2270,30 @@ namespace CUEToolsLib lastTrackPercent = trackPercent; } - audioSource.Read(sampleBuffer, copyCount); - if (!discardOutput) audioDest.Write(sampleBuffer, copyCount); - if (_config.detectHDCD && hdcdDecoder != null) + audioSource.Read(sampleBuffer, copyCount); + if (!discardOutput) { - if (_config.wait750FramesForHDCD && diskOffset > 750 * 588 && !hdcdDecoder.Detected) + if (!_config.detectHDCD || !_config.decodeHDCD || hdcdDecoder == null) + audioDest.Write(sampleBuffer, copyCount); + if (_config.detectHDCD && hdcdDecoder != null) { - hdcdDecoder.AudioDest = null; - hdcdDecoder = null; - } - else - { - if (_config.decodeHDCD) - hdcdDecoder.AudioDest = (discardOutput || noOutput) ? null : decodedAudioDest; - hdcdDecoder.Process(sampleBuffer, copyCount); + if (_config.wait750FramesForHDCD && diskOffset > 750 * 588 && !hdcdDecoder.Detected) + { + hdcdDecoder.AudioDest = null; + hdcdDecoder = null; + if (_config.decodeHDCD) + { + audioSource.Close(); + audioDest.Delete(); + throw new Exception("HDCD not detected."); + } + } + else + { + if (_config.decodeHDCD) + hdcdDecoder.AudioDest = (discardOutput || noOutput) ? null : audioDest; + hdcdDecoder.Process(sampleBuffer, copyCount); + } } } if (_accurateRip && noOutput && (iTrack != 0 || iIndex != 0)) @@ -2353,12 +2329,6 @@ namespace CUEToolsLib try { if (audioDest != null) audioDest.Close(); } catch { } - // need two separate try/catches, - // because Close always throws an exception, and - // we want both streams closed. - try { - if (decodedAudioDest != null) decodedAudioDest.Close(); - } catch { } throw new StopException(); } if (_pause) @@ -2373,10 +2343,10 @@ namespace CUEToolsLib if (hdcdDecoder != null) hdcdDecoder.AudioDest = null; - if (audioSource != null) audioSource.Close(); - audioDest.Close(); - if (decodedAudioDest != null) - decodedAudioDest.Close(); + if (audioSource != null) + audioSource.Close(); + if (audioDest != null) + audioDest.Close(); } public static string CreateDummyCUESheet(string path, string extension) diff --git a/FLACDotNet/flacdotnet.cpp b/FLACDotNet/flacdotnet.cpp index 6314e56..2f899cf 100644 --- a/FLACDotNet/flacdotnet.cpp +++ b/FLACDotNet/flacdotnet.cpp @@ -496,6 +496,12 @@ namespace FLACDotNet { _tags->Clear (); } + virtual void Delete() + { + try { Close (); } catch (Exception^) {} + File::Delete(_path); + } + virtual property Int64 FinalSampleCount { Int64 get() { return _finalSampleCount; diff --git a/MAC_SDK/Source/MACLib/Assembly/Assembly.obj b/MAC_SDK/Source/MACLib/Assembly/Assembly.obj index 5424340..c01d7e9 100644 Binary files a/MAC_SDK/Source/MACLib/Assembly/Assembly.obj and b/MAC_SDK/Source/MACLib/Assembly/Assembly.obj differ diff --git a/MAC_SDK/Source/MACLib/Assembly/Assembly64.obj b/MAC_SDK/Source/MACLib/Assembly/Assembly64.obj index cb0e9bd..0391c8e 100644 Binary files a/MAC_SDK/Source/MACLib/Assembly/Assembly64.obj and b/MAC_SDK/Source/MACLib/Assembly/Assembly64.obj differ diff --git a/UnRarDotNet/RarStream.cs b/UnRarDotNet/RarStream.cs index 256776b..ae02b7a 100644 --- a/UnRarDotNet/RarStream.cs +++ b/UnRarDotNet/RarStream.cs @@ -231,7 +231,9 @@ namespace UnRarDotNet _unrar.DataAvailable += new DataAvailableHandler(unrar_DataAvailable); _unrar.PasswordRequired += PasswordRequired; _unrar.ExtractionProgress += ExtractionProgress; +#if !DEBUG try +#endif { do { @@ -278,10 +280,12 @@ namespace UnRarDotNet } } while (true); } +#if !DEBUG catch (Exception ex) { _ex = ex; } +#endif lock (this) { _close = true; diff --git a/WavPackDotNet/WavPackDotNet.cpp b/WavPackDotNet/WavPackDotNet.cpp index 00727e6..86251d7 100644 --- a/WavPackDotNet/WavPackDotNet.cpp +++ b/WavPackDotNet/WavPackDotNet.cpp @@ -363,6 +363,12 @@ namespace WavPackDotNet { } } + virtual void Delete() + { + try { Close (); } catch (Exception^) {} + File::Delete(_path); + } + virtual property Int64 FinalSampleCount { Int64 get() diff --git a/flac/src/libFLAC/ia32/bitreader_asm.obj b/flac/src/libFLAC/ia32/bitreader_asm.obj index 327a8d0..859918d 100644 Binary files a/flac/src/libFLAC/ia32/bitreader_asm.obj and b/flac/src/libFLAC/ia32/bitreader_asm.obj differ diff --git a/flac/src/libFLAC/ia32/cpu_asm.obj b/flac/src/libFLAC/ia32/cpu_asm.obj index f3bedfc..1efaf88 100644 Binary files a/flac/src/libFLAC/ia32/cpu_asm.obj and b/flac/src/libFLAC/ia32/cpu_asm.obj differ diff --git a/flac/src/libFLAC/ia32/fixed_asm.obj b/flac/src/libFLAC/ia32/fixed_asm.obj index 2dafc49..c0f2165 100644 Binary files a/flac/src/libFLAC/ia32/fixed_asm.obj and b/flac/src/libFLAC/ia32/fixed_asm.obj differ diff --git a/flac/src/libFLAC/ia32/lpc_asm.obj b/flac/src/libFLAC/ia32/lpc_asm.obj index b1cc4f8..aacf059 100644 Binary files a/flac/src/libFLAC/ia32/lpc_asm.obj and b/flac/src/libFLAC/ia32/lpc_asm.obj differ diff --git a/flac/src/libFLAC/ia32/stream_encoder_asm.obj b/flac/src/libFLAC/ia32/stream_encoder_asm.obj index dcdd8d8..9b53590 100644 Binary files a/flac/src/libFLAC/ia32/stream_encoder_asm.obj and b/flac/src/libFLAC/ia32/stream_encoder_asm.obj differ