claunia/cuetools.net
1
0
Fork 0
mirror of https://github.com/claunia/cuetools.net.git synced 2025-12-16 18:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Grigory Chudov
2013-04-10 22:21:19 -04:00
parent a7d9ab0de1
commit 8f842e58c1
3 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CUERipper/frmCUERipper.cs
View File

@@ -996,8 +996,8 @@ namespace CUERipper
private void resetEncoderModes(CUEToolsUDC encoder) private void resetEncoderModes(CUEToolsUDC encoder)
{ {
if (encoder.settings != null) encoder.settings.PCM = AudioPCMConfig.RedBook; encoder.settings.PCM = AudioPCMConfig.RedBook;
buttonEncoderSettings.Enabled = encoder.settings != null && encoder.settings.HasBrowsableAttributes(); buttonEncoderSettings.Enabled = encoder.settings.HasBrowsableAttributes();
string[] modes = encoder.SupportedModes; string[] modes = encoder.SupportedModes;
if (modes == null || modes.Length < 2) if (modes == null || modes.Length < 2)
{ {
@@ -1008,7 +1008,7 @@ namespace CUERipper
} }
else else
{ {
if (encoder.EncoderModeIndex == -1 && encoder.settings != null) if (encoder.EncoderModeIndex == -1)
{ {
string defaultMode; string defaultMode;
encoder.settings.GetSupportedModes(out defaultMode); encoder.settings.GetSupportedModes(out defaultMode);
@@ -1592,8 +1592,6 @@ namespace CUERipper
CUEToolsUDC encoder = bnComboBoxEncoder.SelectedItem as CUEToolsUDC; CUEToolsUDC encoder = bnComboBoxEncoder.SelectedItem as CUEToolsUDC;
if (encoder == null) if (encoder == null)
return; return;
if (encoder.settings == null)
return;
var form = new Options(encoder.settings); var form = new Options(encoder.settings);
form.ShowDialog(this); form.ShowDialog(this);
resetEncoderModes(encoder); resetEncoderModes(encoder);

13
CUETools.Processor/AudioReadWrite.cs
View File

@@ -90,15 +90,10 @@ namespace CUETools.Processor
settings.PCM = pcm; settings.PCM = pcm;
settings.Padding = padding; settings.Padding = padding;
settings.Validate(); settings.Validate();
if (encoder.type != null) object o = Activator.CreateInstance(encoder.type, path, settings);
{ if (o == null || !(o is IAudioDest))
object o = Activator.CreateInstance(encoder.type, path, settings); throw new Exception("Unsupported audio type: " + path + ": " + encoder.type.FullName);
if (o == null || !(o is IAudioDest)) dest = o as IAudioDest;
throw new Exception("Unsupported audio type: " + path + ": " + encoder.type.FullName);
dest = o as IAudioDest;
}
else
throw new Exception("Unsupported audio type: " + path);
dest.FinalSampleCount = finalSampleCount; dest.FinalSampleCount = finalSampleCount;
return dest; return dest;
} }

4
CUETools/frmCUETools.cs
View File

@@ -2454,7 +2454,7 @@ namespace JDP
else else
SelectedOutputAudioFmt.encoderLossy = encoder; SelectedOutputAudioFmt.encoderLossy = encoder;
// TODO: something cleverer than this hack... // TODO: something cleverer than this hack...
if (encoder.settings != null) encoder.settings.PCM = AudioPCMConfig.RedBook; encoder.settings.PCM = AudioPCMConfig.RedBook;
string[] modes = encoder.SupportedModes; string[] modes = encoder.SupportedModes;
if (modes == null || modes.Length < 2) if (modes == null || modes.Length < 2)
{ {
@@ -2465,7 +2465,7 @@ namespace JDP
} }
else else
{ {
if (encoder.EncoderModeIndex == -1 && encoder.settings != null) if (encoder.EncoderModeIndex == -1)
{ {
string defaultMode; string defaultMode;
encoder.settings.GetSupportedModes(out defaultMode); encoder.settings.GetSupportedModes(out defaultMode);