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

Build system cleanup. Platform dependent plugins moved to "plugins" subdirectories.

Browse Source
This commit is contained in:
Grigory Chudov
2018-03-11 18:42:41 -04:00
parent 929b7de944
commit a4565dbd30
15 changed files with 201 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CUERipper/Program.cs
View File

@@ -20,8 +20,8 @@ namespace CUERipper
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
string arch = Marshal.SizeOf(typeof(IntPtr)) == 8 ? "x64" : "Win32";
GetSatelliteAssemblies("Plugins (" + arch + ")");
string arch = Marshal.SizeOf(typeof(IntPtr)) == 8 ? "x64" : "win32";
GetSatelliteAssemblies(System.IO.Path.Combine("plugins", arch));
CUEConfig config = new CUEConfig();
config.Load(new SettingsReader("CUERipper", "settings.txt", Application.ExecutablePath));

9
CUETools.Codecs.APE/CUETools.Codecs.APE.vcxproj
View File

@@ -70,16 +70,16 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\bin\$(Configuration)\net40\plugins ($(Platform))\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\bin\$(Configuration)\plugins\$(Platform)\net40\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\bin\$(Configuration)\net40\plugins ($(Platform))\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\bin\$(Configuration)\plugins\$(Platform)\net40\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\bin\$(Configuration)\net40\plugins ($(Platform))\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\bin\$(Configuration)\plugins\$(Platform)\net40\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\bin\$(Configuration)\net40\plugins ($(Platform))\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\bin\$(Configuration)\plugins\$(Platform)\net40\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -103,7 +103,6 @@
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>

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

@@ -10,7 +10,7 @@
<Copyright>Copyright (c) 2008-2018 Grigory Chudov</Copyright>
<Authors>Grigory Chudov</Authors>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputPath>..\bin\$(Configuration)\plugins (Win32)</OutputPath>
<OutputPath>..\bin\$(Configuration)\plugins\</OutputPath>
<RepositoryUrl>https://github.com/gchudov/cuetools.net</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<Company />

126
CUETools.Codecs.HDCD/HDCDDLL.cs Normal file
View File

@@ -0,0 +1,126 @@
using System;
using System.Runtime.InteropServices;
namespace CUETools.Codecs.HDCD
{
internal static class HDCDDLL
{
internal const string DllName = "hdcd";
[DllImport("kernel32.dll")]
private static extern IntPtr LoadLibrary(string dllToLoad);
[DllImport("kernel32.dll")]
public static extern IntPtr GetProcAddress(IntPtr hModule, string procedureName);
internal delegate bool hdcd_decoder_write_callback(IntPtr decoder, IntPtr buffer, int samples, IntPtr client_data);
[DllImport(DllName)]
internal static extern IntPtr hdcd_decoder_new();
[DllImport(DllName)]
internal static extern void hdcd_decoder_delete(IntPtr decoder);
[DllImport(DllName)]
internal static extern hdcd_decoder_state hdcd_decoder_get_state(IntPtr decoder);
[DllImport(DllName)]
internal static extern bool hdcd_decoder_set_num_channels(IntPtr decoder, Int16 num_channels);
//HDCD_API uint16_t hdcd_decoder_get_num_channels(const hdcd_decoder *const _decoder);
[DllImport(DllName)]
internal static extern bool hdcd_decoder_set_sample_rate(IntPtr decoder, Int32 sample_rate);
//HDCD_API uint32_t hdcd_decoder_get_sample_rate(const hdcd_decoder *const _decoder);
[DllImport(DllName)]
internal static extern bool hdcd_decoder_set_input_bps(IntPtr decoder, Int16 input_bps);
//HDCD_API uint16_t hdcd_decoder_get_input_bps(const hdcd_decoder *const _decoder);
[DllImport(DllName)]
internal static extern bool hdcd_decoder_set_output_bps(IntPtr decoder, Int16 output_bps);
//HDCD_API uint16_t hdcd_decoder_get_output_bps(const hdcd_decoder *const _decoder);
[DllImport(DllName)]
internal static extern hdcd_decoder_init_status hdcd_decoder_init(IntPtr decoder, IntPtr unused, hdcd_decoder_write_callback write_callback, IntPtr client_data);
[DllImport(DllName)]
internal static extern bool hdcd_decoder_finish(IntPtr decoder);
[DllImport(DllName)]
internal static extern bool hdcd_decoder_process_buffer_interleaved(IntPtr decoder, [In, Out] int[,] input_buffer, Int32 samples);
[DllImport(DllName)]
internal static extern bool hdcd_decoder_flush_buffer(IntPtr decoder);
[DllImport(DllName)]
internal static extern bool hdcd_decoder_reset(IntPtr decoder);
[DllImport(DllName)]
internal static extern bool hdcd_decoder_detected_hdcd(IntPtr decoder);
[DllImport(DllName)]
internal static extern IntPtr hdcd_decoder_get_statistics(IntPtr decoder);
static HDCDDLL()
{
var myPath = new Uri(typeof(HDCDDLL).Assembly.CodeBase).LocalPath;
var myFolder = System.IO.Path.GetDirectoryName(myPath);
var is64 = IntPtr.Size == 8;
var subfolder = is64 ? "x64" : "win32";
#if NET40
IntPtr Dll = LoadLibrary(System.IO.Path.Combine(myFolder, subfolder, DllName + ".dll"));
#else
IntPtr Dll = LoadLibrary(System.IO.Path.Combine(System.IO.Path.Combine(myFolder, subfolder), DllName + ".dll"));
#endif
if (Dll == IntPtr.Zero)
Dll = LoadLibrary(DllName + ".dll");
if (Dll == IntPtr.Zero)
throw new DllNotFoundException();
}
}
/** \brief Statistics for decoding. */
[StructLayout(LayoutKind.Sequential)]
public struct hdcd_decoder_statistics
{
public UInt32 num_packets;
/**<Total number of samples processed. */
public bool enabled_peak_extend;
/**< True if peak extend was enabled during decoding. */
public bool disabled_peak_extend;
/**< True if peak extend was disabled during decoding. */
public double min_gain_adjustment;
/**< Minimum dynamic gain used during decoding. */
public double max_gain_adjustment;
/**< Maximum dynamic gain used during decoding. */
public bool enabled_transient_filter;
/**< True if the transient filter was enabled during decoding. */
public bool disabled_transient_filter;
/**< True if the transient filter was disabled during decoding. */
};
/** \brief Return values from hdcd_decoder_init. */
internal enum hdcd_decoder_init_status
{
HDCD_DECODER_INIT_STATUS_OK = 0,
/**< Initialization was successful. */
HDCD_DECODER_INIT_STATUS_INVALID_STATE,
/**< The _decoder was already initialised. */
HDCD_DECODER_INIT_STATUS_MEMORY_ALOCATION_ERROR,
/**< Initialization failed due to a memory allocation error. */
HDCD_DECODER_INIT_STATUS_INVALID_NUM_CHANNELS,
/**< Initialization failed because the configured number of channels was invalid. */
HDCD_DECODER_INIT_STATUS_INVALID_SAMPLE_RATE,
/**< Initialization failed because the configured sample rate was invalid. */
HDCD_DECODER_INIT_STATUS_INVALID_INPUT_BPS,
/**< Initialization failed because the configured input bits per sample was invalid. */
HDCD_DECODER_INIT_STATUS_INVALID_OUTPUT_BPS
/**< Initialization failed because the configured output bits per sample was invalid. */
}
/** \brief State values for a decoder.
*
* The decoder's state can be obtained by calling hdcd_decoder_get_state().
*/
internal enum hdcd_decoder_state
{
HDCD_DECODER_STATE_UNINITIALISED = 1,
/**< The decoder is uninitialised. */
HDCD_DECODER_STATE_READY,
/**< The decoder is initialised and ready to process data. */
HDCD_DECODER_STATE_DIRTY,
/**< The decoder has processed data, but has not yet been flushed. */
HDCD_DECODER_STATE_FLUSHED,
/**< The decoder has been flushed. */
HDCD_DECODER_STATE_WRITE_ERROR,
/**< An error was returned by the write callback. */
HDCD_DECODER_STATE_MEMORY_ALOCATION_ERROR
/**< Processing failed due to a memory allocation error. */
};
}

131
CUETools.Codecs.HDCD/HDCDDotNet.cs
View File

@@ -1,32 +1,9 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Runtime.InteropServices;
using CUETools.Codecs;
namespace HDCDDotNet
namespace CUETools.Codecs.HDCD
{
/** \brief Statistics for decoding. */
[StructLayout(LayoutKind.Sequential)]
public struct hdcd_decoder_statistics
{
public UInt32 num_packets;
/**<Total number of samples processed. */
public bool enabled_peak_extend;
/**< True if peak extend was enabled during decoding. */
public bool disabled_peak_extend;
/**< True if peak extend was disabled during decoding. */
public double min_gain_adjustment;
/**< Minimum dynamic gain used during decoding. */
public double max_gain_adjustment;
/**< Maximum dynamic gain used during decoding. */
public bool enabled_transient_filter;
/**< True if the transient filter was enabled during decoding. */
public bool disabled_transient_filter;
/**< True if the transient filter was disabled during decoding. */
};
public class HDCDDotNet : IAudioDest, IAudioFilter, IFormattable
public class HDCDDotNet : IAudioDest, IAudioFilter, IFormattable
{
public HDCDDotNet (int channels, int sample_rate, int output_bps, bool decode)
{
@@ -34,21 +11,21 @@ namespace HDCDDotNet
#if !MONO
if (decode)
_audioBuffer = new AudioBuffer(new AudioPCMConfig(output_bps, channels, 44100), 256);
_decoder = hdcd_decoder_new();
_decoder = HDCDDLL.hdcd_decoder_new();
_channelCount = channels;
_bitsPerSample = output_bps;
if (_decoder == IntPtr.Zero)
throw new Exception("Failed to initialize HDCD decoder.");
bool b = true;
b &= hdcd_decoder_set_num_channels(_decoder, (short) _channelCount);
b &= hdcd_decoder_set_sample_rate(_decoder, sample_rate);
b &= hdcd_decoder_set_input_bps(_decoder, 16);
b &= hdcd_decoder_set_output_bps(_decoder, (short)_bitsPerSample);
b &= HDCDDLL.hdcd_decoder_set_num_channels(_decoder, (short) _channelCount);
b &= HDCDDLL.hdcd_decoder_set_sample_rate(_decoder, sample_rate);
b &= HDCDDLL.hdcd_decoder_set_input_bps(_decoder, 16);
b &= HDCDDLL.hdcd_decoder_set_output_bps(_decoder, (short)_bitsPerSample);
if (!b)
throw new Exception("Failed to set up HDCD _decoder parameters.");
_decoderCallback = decode ? new hdcd_decoder_write_callback(DecoderCallback) : null;
_decoderCallback = decode ? new HDCDDLL.hdcd_decoder_write_callback(DecoderCallback) : null;
_gch = GCHandle.Alloc(this);
hdcd_decoder_init_status status = hdcd_decoder_init(_decoder, IntPtr.Zero, _decoderCallback, (IntPtr) _gch);
hdcd_decoder_init_status status = HDCDDLL.hdcd_decoder_init(_decoder, IntPtr.Zero, _decoderCallback, (IntPtr) _gch);
switch (status)
{
case hdcd_decoder_init_status.HDCD_DECODER_INIT_STATUS_OK:
@@ -72,7 +49,7 @@ namespace HDCDDotNet
get
{
#if !MONO
return hdcd_decoder_detected_hdcd(_decoder);
return HDCDDLL.hdcd_decoder_detected_hdcd(_decoder);
#else
throw new Exception("HDCD unsupported.");
#endif
@@ -142,7 +119,7 @@ namespace HDCDDotNet
public void Reset()
{
#if !MONO
if (!hdcd_decoder_reset(_decoder))
if (!HDCDDLL.hdcd_decoder_reset(_decoder))
#endif
throw new Exception("error resetting decoder.");
}
@@ -150,7 +127,7 @@ namespace HDCDDotNet
public void GetStatistics(out hdcd_decoder_statistics stats)
{
#if !MONO
IntPtr _statsPtr = hdcd_decoder_get_statistics(_decoder);
IntPtr _statsPtr = HDCDDLL.hdcd_decoder_get_statistics(_decoder);
#else
IntPtr _statsPtr = IntPtr.Zero;
#endif
@@ -162,7 +139,7 @@ namespace HDCDDotNet
public void Write(AudioBuffer buff)
{
#if !MONO
if (!hdcd_decoder_process_buffer_interleaved(_decoder, buff.Samples, buff.Length))
if (!HDCDDLL.hdcd_decoder_process_buffer_interleaved(_decoder, buff.Samples, buff.Length))
throw new Exception("HDCD processing error.");
#endif
}
@@ -170,7 +147,7 @@ namespace HDCDDotNet
public void Flush ()
{
#if !MONO
if (!hdcd_decoder_flush_buffer(_decoder))
if (!HDCDDLL.hdcd_decoder_flush_buffer(_decoder))
#endif
throw new Exception("error flushing buffer.");
}
@@ -179,7 +156,7 @@ namespace HDCDDotNet
{
#if !MONO
if (_decoder != IntPtr.Zero)
hdcd_decoder_delete(_decoder);
HDCDDLL.hdcd_decoder_delete(_decoder);
_decoder = IntPtr.Zero;
if (_gch.IsAllocated)
_gch.Free();
@@ -205,51 +182,12 @@ namespace HDCDDotNet
}
}
/** \brief Return values from hdcd_decoder_init. */
private enum hdcd_decoder_init_status
{
HDCD_DECODER_INIT_STATUS_OK = 0,
/**< Initialization was successful. */
HDCD_DECODER_INIT_STATUS_INVALID_STATE,
/**< The _decoder was already initialised. */
HDCD_DECODER_INIT_STATUS_MEMORY_ALOCATION_ERROR,
/**< Initialization failed due to a memory allocation error. */
HDCD_DECODER_INIT_STATUS_INVALID_NUM_CHANNELS,
/**< Initialization failed because the configured number of channels was invalid. */
HDCD_DECODER_INIT_STATUS_INVALID_SAMPLE_RATE,
/**< Initialization failed because the configured sample rate was invalid. */
HDCD_DECODER_INIT_STATUS_INVALID_INPUT_BPS,
/**< Initialization failed because the configured input bits per sample was invalid. */
HDCD_DECODER_INIT_STATUS_INVALID_OUTPUT_BPS
/**< Initialization failed because the configured output bits per sample was invalid. */
}
/** \brief State values for a decoder.
*
* The decoder's state can be obtained by calling hdcd_decoder_get_state().
*/
private enum hdcd_decoder_state
{
HDCD_DECODER_STATE_UNINITIALISED = 1,
/**< The decoder is uninitialised. */
HDCD_DECODER_STATE_READY,
/**< The decoder is initialised and ready to process data. */
HDCD_DECODER_STATE_DIRTY,
/**< The decoder has processed data, but has not yet been flushed. */
HDCD_DECODER_STATE_FLUSHED,
/**< The decoder has been flushed. */
HDCD_DECODER_STATE_WRITE_ERROR,
/**< An error was returned by the write callback. */
HDCD_DECODER_STATE_MEMORY_ALOCATION_ERROR
/**< Processing failed due to a memory allocation error. */
};
private AudioBuffer _audioBuffer;
private IntPtr _decoder;
//private int[,] _inSampleBuffer;
private int[,] _outSampleBuffer;
private int _channelCount, _bitsPerSample;
hdcd_decoder_write_callback _decoderCallback;
HDCDDLL.hdcd_decoder_write_callback _decoderCallback;
IAudioDest _audioDest;
GCHandle _gch;
@@ -258,8 +196,6 @@ namespace HDCDDotNet
Close();
}
private delegate bool hdcd_decoder_write_callback(IntPtr decoder, IntPtr buffer, int samples, IntPtr client_data);
private unsafe bool Output(IntPtr buffer, int samples)
{
if (AudioDest == null)
@@ -287,40 +223,5 @@ namespace HDCDDotNet
HDCDDotNet hdcd = (HDCDDotNet)gch.Target;
return hdcd.Output(buffer, samples);
}
#if !MONO
[DllImport("hdcd.dll")]
private static extern IntPtr hdcd_decoder_new ();
[DllImport("hdcd.dll")]
private static extern void hdcd_decoder_delete(IntPtr decoder);
[DllImport("hdcd.dll")]
private static extern hdcd_decoder_state hdcd_decoder_get_state(IntPtr decoder);
[DllImport("hdcd.dll")]
private static extern bool hdcd_decoder_set_num_channels (IntPtr decoder, Int16 num_channels);
//HDCD_API uint16_t hdcd_decoder_get_num_channels(const hdcd_decoder *const _decoder);
[DllImport("hdcd.dll")]
private static extern bool hdcd_decoder_set_sample_rate(IntPtr decoder, Int32 sample_rate);
//HDCD_API uint32_t hdcd_decoder_get_sample_rate(const hdcd_decoder *const _decoder);
[DllImport("hdcd.dll")]
private static extern bool hdcd_decoder_set_input_bps(IntPtr decoder, Int16 input_bps);
//HDCD_API uint16_t hdcd_decoder_get_input_bps(const hdcd_decoder *const _decoder);
[DllImport("hdcd.dll")]
private static extern bool hdcd_decoder_set_output_bps(IntPtr decoder, Int16 output_bps);
//HDCD_API uint16_t hdcd_decoder_get_output_bps(const hdcd_decoder *const _decoder);
[DllImport("hdcd.dll")]
private static extern hdcd_decoder_init_status hdcd_decoder_init (IntPtr decoder, IntPtr unused, hdcd_decoder_write_callback write_callback, IntPtr client_data);
[DllImport("hdcd.dll")]
private static extern bool hdcd_decoder_finish(IntPtr decoder);
[DllImport("hdcd.dll")]
private static extern bool hdcd_decoder_process_buffer_interleaved(IntPtr decoder, [In, Out] int [,] input_buffer, Int32 samples);
[DllImport("hdcd.dll")]
private static extern bool hdcd_decoder_flush_buffer(IntPtr decoder);
[DllImport("hdcd.dll")]
private static extern bool hdcd_decoder_reset(IntPtr decoder);
[DllImport("hdcd.dll")]
private static extern bool hdcd_decoder_detected_hdcd(IntPtr decoder);
[DllImport("hdcd.dll")]
private static extern IntPtr hdcd_decoder_get_statistics(IntPtr decoder);
#endif
}
}

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

@@ -10,7 +10,7 @@
<Copyright>Copyright (c) 2008-2018 Grigory Chudov</Copyright>
<Authors>Grigory Chudov</Authors>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputPath>..\bin\$(Configuration)\plugins (Win32)</OutputPath>
<OutputPath>..\bin\$(Configuration)\plugins\win32</OutputPath>
<RepositoryUrl>https://github.com/gchudov/cuetools.net</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<Company />

8
CUETools.Codecs.TTA/CUETools.Codecs.TTA.vcxproj
View File

@@ -70,16 +70,16 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\bin\$(Configuration)\net40\plugins ($(Platform))\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\bin\$(Configuration)\plugins\$(Platform)\net40\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\obj\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\bin\$(Configuration)\net40\plugins ($(Platform))\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\bin\$(Configuration)\plugins\$(Platform)\net40\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\obj\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\bin\$(Configuration)\net40\plugins ($(Platform))\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\bin\$(Configuration)\plugins\$(Platform)\net40\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\obj\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\bin\$(Configuration)\net40\plugins ($(Platform))\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\bin\$(Configuration)\plugins\$(Platform)\net40\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\obj\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

8
CUETools.Codecs.WavPack/CUETools.Codecs.WavPack.vcxproj
View File

@@ -70,16 +70,16 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\bin\$(Configuration)\net40\plugins ($(Platform))\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\bin\$(Configuration)\plugins\$(Platform)\net40\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\bin\$(Configuration)\net40\plugins ($(Platform))\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\bin\$(Configuration)\plugins\$(Platform)\net40\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\bin\$(Configuration)\net40\plugins ($(Platform))\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\bin\$(Configuration)\plugins\$(Platform)\net40\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\bin\$(Configuration)\net40\plugins ($(Platform))\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\bin\$(Configuration)\plugins\$(Platform)\net40\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

66
CUETools.Codecs.libFLAC/FLACDLL.cs
View File

@@ -5,7 +5,7 @@ namespace CUETools.Codecs.libFLAC
{
internal unsafe static class FLACDLL
{
internal const string libFLACDll = "libFLAC_dynamic";
internal const string DllName = "libFLAC_dynamic";
internal const CallingConvention libFLACCallingConvention = CallingConvention.Cdecl;
internal const int FLAC__MAX_CHANNELS = 8;
private static string version;
@@ -43,16 +43,16 @@ namespace CUETools.Codecs.libFLAC
internal delegate void FLAC__StreamDecoderErrorCallback(IntPtr decoder, FLAC__StreamDecoderErrorStatus status, void* client_data);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern IntPtr FLAC__stream_decoder_new();
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern int FLAC__stream_decoder_set_metadata_respond(IntPtr decoder, FLAC__MetadataType type);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern int FLAC__stream_decoder_process_until_end_of_metadata(IntPtr decoder);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_stream(
IntPtr decoder,
FLAC__StreamDecoderReadCallback read_callback,
@@ -66,75 +66,75 @@ namespace CUETools.Codecs.libFLAC
void* client_data
);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern int FLAC__stream_decoder_finish(IntPtr decoder);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern int FLAC__stream_decoder_delete(IntPtr decoder);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern int FLAC__stream_decoder_seek_absolute(IntPtr decoder, long sample);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern FLAC__StreamDecoderState FLAC__stream_decoder_get_state(IntPtr decoder);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern int FLAC__stream_decoder_process_single(IntPtr decoder);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern IntPtr FLAC__stream_encoder_new();
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern int FLAC__stream_encoder_set_bits_per_sample(IntPtr encoder, uint value);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern int FLAC__stream_encoder_set_sample_rate(IntPtr encoder, uint value);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern int FLAC__stream_encoder_set_channels(IntPtr encoder, uint value);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern int FLAC__stream_encoder_finish(IntPtr encoder);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern int FLAC__stream_encoder_delete(IntPtr encoder);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern int FLAC__stream_encoder_process_interleaved(IntPtr encoder, int* buffer, int samples);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern FLAC__StreamEncoderState FLAC__stream_encoder_get_state(IntPtr encoder);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern void FLAC__stream_encoder_get_verify_decoder_error_stats(IntPtr encoder, out ulong absolute_sample, out uint frame_number, out uint channel, out uint sample, out int expected, out int got);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern FLAC__StreamMetadata* FLAC__metadata_object_new(FLAC__MetadataType type);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern int FLAC__metadata_object_seektable_template_append_spaced_points_by_samples(FLAC__StreamMetadata* metadata, int samples, long total_samples);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern int FLAC__metadata_object_seektable_template_sort(FLAC__StreamMetadata* metadata, int compact);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern int FLAC__stream_encoder_set_metadata(IntPtr encoder, FLAC__StreamMetadata** metadata, int num_blocks);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern int FLAC__stream_encoder_set_verify(IntPtr encoder, int value);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern int FLAC__stream_encoder_set_do_md5(IntPtr encoder, int value);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern int FLAC__stream_encoder_set_total_samples_estimate(IntPtr encoder, long value);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern int FLAC__stream_encoder_set_compression_level(IntPtr encoder, int value);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern int FLAC__stream_encoder_set_blocksize(IntPtr encoder, int value);
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
@@ -149,7 +149,7 @@ namespace CUETools.Codecs.libFLAC
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
internal delegate void FLAC__StreamEncoderMetadataCallback(IntPtr encoder, FLAC__StreamMetadata* metadata, void* client_data);
[DllImport(libFLACDll, CallingConvention = libFLACCallingConvention)]
[DllImport(DllName, CallingConvention = libFLACCallingConvention)]
internal static extern FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_stream(IntPtr encoder,
FLAC__StreamEncoderWriteCallback write_callback,
FLAC__StreamEncoderSeekCallback seek_callback,
@@ -162,14 +162,14 @@ namespace CUETools.Codecs.libFLAC
var myPath = new Uri(typeof(FLACDLL).Assembly.CodeBase).LocalPath;
var myFolder = System.IO.Path.GetDirectoryName(myPath);
var is64 = IntPtr.Size == 8;
var subfolder = is64 ? "plugins (x64)" : "plugins (win32)";
var subfolder = is64 ? "x64" : "win32";
#if NET40
IntPtr Dll = LoadLibrary(System.IO.Path.Combine(myFolder, "..", subfolder, libFLACDll + ".dll"));
IntPtr Dll = LoadLibrary(System.IO.Path.Combine(myFolder, subfolder, DllName + ".dll"));
#else
IntPtr Dll = LoadLibrary(System.IO.Path.Combine(System.IO.Path.Combine(System.IO.Path.Combine(myFolder, ".."), subfolder), libFLACDll + ".dll"));
IntPtr Dll = LoadLibrary(System.IO.Path.Combine(System.IO.Path.Combine(myFolder, subfolder), DllName + ".dll"));
#endif
if (Dll == IntPtr.Zero)
Dll = LoadLibrary(libFLACDll + ".dll");
Dll = LoadLibrary(DllName + ".dll");
if (Dll == IntPtr.Zero)
throw new DllNotFoundException();
IntPtr addr = GetProcAddress(Dll, "FLAC__VERSION_STRING");

2
CUETools.Compression.Rar/CUETools.Compression.Rar.csproj
View File

@@ -10,7 +10,7 @@
<Copyright>Copyright (c) 2008-2018 Grigory Chudov, Michael A. McCloskey</Copyright>
<Authors>Grigory Chudov, Michael A. McCloskey</Authors>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputPath>..\bin\$(Configuration)\plugins (Win32)</OutputPath>
<OutputPath>..\bin\$(Configuration)\plugins\win32</OutputPath>
<RepositoryUrl>https://github.com/gchudov/cuetools.net</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<Company />

12
CUETools.Processor/CUEProcessorPlugins.cs
View File

@@ -32,13 +32,15 @@ namespace CUETools.Processor
//string arch = asi.ApplicationId.ProcessorArchitecture;
//ActivationContext is null most of the time :(
string arch = Type.GetType("Mono.Runtime", false) != null ? "mono" : Marshal.SizeOf(typeof(IntPtr)) == 8 ? "x64" : "Win32";
string plugins_path = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Plugins (" + arch + ")");
if (Directory.Exists(plugins_path))
AddPluginDirectory(plugins_path);
plugins_path = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Plugins");
string plugins_path = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "plugins");
if (Directory.Exists(plugins_path))
{
AddPluginDirectory(plugins_path);
string arch = Type.GetType("Mono.Runtime", false) != null ? "mono" : Marshal.SizeOf(typeof(IntPtr)) == 8 ? "x64" : "win32";
plugins_path = Path.Combine(plugins_path, arch);
if (Directory.Exists(plugins_path))
AddPluginDirectory(plugins_path);
}
}
private static void AddPluginDirectory(string plugins_path)

BIN
MAC_SDK/Source/MACLib/Assembly/Assembly.obj
View File

Binary file not shown.

BIN
MAC_SDK/Source/MACLib/Assembly/Assembly64.obj
View File

Binary file not shown.

2
MAC_SDK/Source/MACLib/MACLib.vcxproj
View File

@@ -20,7 +20,6 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{0B9C97D4-61B8-4294-A1DF-BA90752A1779}</ProjectGuid>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<RootNamespace>MACLib</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
@@ -573,6 +572,7 @@ nasmw -d WIN32 -f win64 -o Assembly64.obj Assembly64.nas
<ItemGroup>
<Object Include="Assembly\Assembly.obj">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</Object>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

2
ttalib-1.1/TTALib.vcxproj
View File

@@ -120,7 +120,7 @@
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>