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

CUETools.Converter: show available encoders if specified incorrectly

Browse Source
This commit is contained in:
Grigory Chudov
2013-06-04 20:44:50 -04:00
parent dd57626b4e
commit 3d9029b7a4
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
CUETools.Converter/Program.cs
View File

@@ -3,6 +3,7 @@ using System.IO;
using CUETools.Codecs;
using CUETools.Processor;
using CUETools.Processor.Settings;
using System.Collections.Generic;
namespace CUETools.Converter
{
@@ -26,8 +27,9 @@ namespace CUETools.Converter
public static CUEToolsUDC GetEncoder(CUEConfig config, CUEToolsFormat fmt, bool lossless, string chosenEncoder)
{
CUEToolsUDC tmpEncoder;
return chosenEncoder != null && config.encoders.TryGetValue(fmt.extension, lossless, chosenEncoder, out tmpEncoder) ? tmpEncoder :
lossless ? fmt.encoderLossless : fmt.encoderLossy;
return chosenEncoder != null ?
(config.encoders.TryGetValue(fmt.extension, lossless, chosenEncoder, out tmpEncoder) ? tmpEncoder : null) :
(lossless ? fmt.encoderLossless : fmt.encoderLossy);
}
public static IAudioSource GetAudioSource(CUEConfig config, string path, string chosenDecoder)
@@ -162,7 +164,12 @@ namespace CUETools.Converter
audioEncoderType == AudioEncoderType.Lossy ? Program.GetEncoder(config, fmt, false, encoderName) :
Program.GetEncoder(config, fmt, true, encoderName) ?? Program.GetEncoder(config, fmt, false, encoderName);
if (encoder == null)
throw new Exception("Encoder available for format " + fmt.extension + ": " + (fmt.encoderLossless != null ? fmt.encoderLossless.Name + " (lossless)" : fmt.encoderLossy != null ? fmt.encoderLossy.Name + " (lossy)" : "none"));
{
var lst = new List<CUEToolsUDC>(config.Encoders).FindAll(
e => e.extension == fmt.extension && (audioEncoderType == AudioEncoderType.NoAudio || audioEncoderType == (e.Lossless ? AudioEncoderType.Lossless : AudioEncoderType.Lossy))).
ConvertAll(e => e.Name + (e.Lossless ? " (lossless)" : " (lossy)"));
throw new Exception("Encoders available for format " + fmt.extension + ": " + (lst.Count == 0 ? "none" : string.Join(", ", lst.ToArray())));
}
var settings = encoder.settings.Clone();
settings.PCM = audioSource.PCM;
settings.Padding = padding;