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

Renamed LAME to libmp3lame. Ignore errors when parsing config.

Browse Source
This commit is contained in:
Grigory Chudov
2018-03-24 13:02:17 -04:00
parent e1f8906170
commit 13f260d80a
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CUETools.Codecs.Icecast/CUETools.Codecs.Icecast.csproj
View File

@@ -24,7 +24,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\CUETools.Codecs\CUETools.Codecs.csproj" /> <ProjectReference Include="..\CUETools.Codecs\CUETools.Codecs.csproj" />
<ProjectReference Include="..\CUETools.Codecs.LAME\CUETools.Codecs.LAME.csproj" /> <ProjectReference Include="..\CUETools.Codecs.libmp3lame\CUETools.Codecs.libmp3lame.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
CUETools.Codecs.Icecast/IcecastWriter.cs
View File

@@ -12,7 +12,7 @@ namespace CUETools.Codecs.Icecast
{ {
private long _sampleOffset = 0; private long _sampleOffset = 0;
private AudioEncoderSettings m_settings; private AudioEncoderSettings m_settings;
private LAME.AudioEncoder encoder = null; private libmp3lame.AudioEncoder encoder = null;
private HttpWebRequest req = null; private HttpWebRequest req = null;
private HttpWebResponse resp = null; private HttpWebResponse resp = null;
private Stream reqStream; private Stream reqStream;
@@ -80,12 +80,12 @@ namespace CUETools.Codecs.Icecast
resp = req.GetResponse() as HttpWebResponse; resp = req.GetResponse() as HttpWebResponse;
if (resp.StatusCode == HttpStatusCode.OK) if (resp.StatusCode == HttpStatusCode.OK)
{ {
var encoderSettings = new CUETools.Codecs.LAME.CBREncoderSettings() { PCM = AudioPCMConfig.RedBook }; var encoderSettings = new CUETools.Codecs.libmp3lame.CBREncoderSettings() { PCM = AudioPCMConfig.RedBook };
//encoderSettings.StereoMode = settings.JointStereo ? //encoderSettings.StereoMode = settings.JointStereo ?
// CUETools.Codecs.LAME.Interop.MpegMode.JOINT_STEREO : // CUETools.Codecs.LAME.Interop.MpegMode.JOINT_STEREO :
// CUETools.Codecs.LAME.Interop.MpegMode.STEREO; // CUETools.Codecs.LAME.Interop.MpegMode.STEREO;
//encoderSettings.CustomBitrate = settings.Bitrate; //encoderSettings.CustomBitrate = settings.Bitrate;
encoder = new CUETools.Codecs.LAME.AudioEncoder(encoderSettings, "", reqStream); encoder = new CUETools.Codecs.libmp3lame.AudioEncoder(encoderSettings, "", reqStream);
} }
} }
catch (WebException ex) catch (WebException ex)

4
CUETools.Processor/CUEConfig.cs
View File

@@ -408,6 +408,10 @@ namespace CUETools.Processor
{ {
DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate, DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate,
TypeNameHandling = TypeNameHandling.Auto, TypeNameHandling = TypeNameHandling.Auto,
Error = (sender, ev) => {
System.Diagnostics.Trace.WriteLine(ev.ErrorContext.Error.ToString());
ev.ErrorContext.Handled = true;
}
}); });
if (jsonObject as CUEConfigAdvanced == null) if (jsonObject as CUEConfigAdvanced == null)
throw new Exception(); throw new Exception();