diff --git a/CUETools.Codecs.FLACCL/FLACCLWriter.cs b/CUETools.Codecs.FLACCL/FLACCLWriter.cs index 7aea4fd..5fcdf84 100644 --- a/CUETools.Codecs.FLACCL/FLACCLWriter.cs +++ b/CUETools.Codecs.FLACCL/FLACCLWriter.cs @@ -28,6 +28,7 @@ using System.Runtime.InteropServices; using CUETools.Codecs; using CUETools.Codecs.FLAKE; using OpenCLNet; +using System.Xml.Serialization; namespace CUETools.Codecs.FLACCL { @@ -84,6 +85,7 @@ namespace CUETools.Codecs.FLACCL string.Join(", ", (new List(OpenCL.GetPlatforms())).ConvertAll(p => "\"" + p.Name + "\"").ToArray())); } Platform = OpenCL.GetPlatform(m_platform).Name; + PlatformVersion = OpenCL.GetPlatform(m_platform).Version; { //var device = OpenCL.GetPlatform(m_platform).GetDevice(OpenCL.GetPlatform(m_platform).QueryDeviceIntPtr()[0]); var devices = new List(OpenCL.GetPlatform(m_platform).QueryDevices((DeviceType)DeviceType)); @@ -94,6 +96,7 @@ namespace CUETools.Codecs.FLACCL throw new Exception("no OpenCL devices found that matched filter criteria"); m_device = devices[0].DeviceID; Device = devices[0].Name; + DriverVersion = devices[0].DriverVersion; } SetDefaultValuesForMode(); if (Padding < 0) @@ -202,6 +205,7 @@ namespace CUETools.Codecs.FLACCL //[TypeConverter(typeof(FLACCLWriterSettingsDeviceConverter))] [SRDescription(typeof(Properties.Resources), "DescriptionDevice")] + [XmlIgnore] [Browsable(false)] public string Device { get; set; } @@ -213,6 +217,14 @@ namespace CUETools.Codecs.FLACCL [DisplayName("Allow Non-subset")] [SRDescription(typeof(Properties.Resources), "AllowNonSubsetDescription")] public bool AllowNonSubset { get; set; } + + [XmlIgnore] + [Browsable(false)] + public string PlatformVersion { get; set; } + + [XmlIgnore] + [Browsable(false)] + public string DriverVersion { get; set; } } public class FLACCLWriterSettingsPlatformConverter : TypeConverter diff --git a/CUETools.FLACCL.cmd/Program.cs b/CUETools.FLACCL.cmd/Program.cs index 691edcd..68ce18f 100644 --- a/CUETools.FLACCL.cmd/Program.cs +++ b/CUETools.FLACCL.cmd/Program.cs @@ -311,8 +311,7 @@ namespace CUETools.FLACCL.cmd { Console.WriteLine("Filename : {0}", input_file); Console.WriteLine("File Info : {0}kHz; {1} channel; {2} bit; {3}", audioSource.PCM.SampleRate, audioSource.PCM.ChannelCount, audioSource.PCM.BitsPerSample, TimeSpan.FromSeconds(audioSource.Length * 1.0 / audioSource.PCM.SampleRate)); - Console.WriteLine("Platform : {0}", settings.Platform); - Console.WriteLine("Device : {0}", settings.Device); + Console.WriteLine("Device : {0}, Platform: \"{1}\", Version: {2}, Driver: {3}", settings.Device.Trim(), settings.Platform, settings.PlatformVersion.Trim(), settings.DriverVersion.Trim()); } bool keepRunning = true;