Coder vor 8 Monaten
Ursprung
Commit
4111ed5e09

+ 0 - 3
Bmp.Core/Playback/Inputs/InputSourceProvider.cs

@@ -117,12 +117,9 @@ namespace Bmp.Core.Playback.Inputs
                 underlyingStream.Position = 0;
                 if (DsfSourceStream.IsDsfFile(underlyingStream)) return new DsfSourceStream(urlOrPath);
 
-                //TODO: DFF Stream
-
                 underlyingStream.Position = 0;
                 if (DffSourceStream.IsDffFile(underlyingStream)) return new DffSourceStream(urlOrPath);
 
-
             }
 
             if (Uri.TryCreate(urlOrPath, UriKind.Absolute, out var url))

+ 1 - 1
Bmp.Core/Playback/Inputs/MetaData.cs

@@ -10,7 +10,7 @@ public class MetaData
     public string? Artist => RawTags?.TryGetValue("ARTIST", out var text) == true ? text : null;
     public string? Album => RawTags?.TryGetValue("ALBUM", out var text) == true ? text : null;
 
-    //TODO: track xx/yy
+    //TODO: MetaData TrackNo track xx/yy
     public int? TrackNo => RawTags?.TryGetValue("track", out var num) == true ? int.TryParse(num, out var track) ? track : null : null;
 
     public Exception? Error { get; set; }

+ 1 - 2
Bmp.Core/Playback/Outputs/NAudioASIO/ASIOSampleConvertor.cs

@@ -23,7 +23,7 @@ internal class AsioSampleConvertor
         SampleConvertor convertor = null;
         var is2Channels = waveFormat.Channels == 2;
 
-        // TODO : IMPLEMENTS OTHER CONVERTOR TYPES
+        // TODO: AsioSampleConvertor IMPLEMENTS OTHER CONVERTOR TYPES
         switch (asioType)
         {
             case AsioSampleType.Int32LSB:
@@ -92,7 +92,6 @@ internal class AsioSampleConvertor
                 switch (waveFormat.BitsPerSample)
                 {
                     case 16:
-                        // TODO: BmpMod: MulPcm16To32Float
                         throw new ArgumentException("Not a supported conversion");
                     case 32:
                         if (waveFormat.Encoding == WaveFormatEncoding.IeeeFloat)

+ 1 - 1
Bmp.Core/Playback/Outputs/NAudioASIO/Originals/Asio64Bit.cs

@@ -21,5 +21,5 @@ public struct Asio64Bit
     /// least significant bits (Bits 0..31)
     /// </summary>
     public uint lo;
-    // TODO: IMPLEMENT AN EASY WAY TO CONVERT THIS TO double  AND long
+    // TODO: Asio64Bit IMPLEMENT AN EASY WAY TO CONVERT THIS TO double  AND long
 };

+ 3 - 3
Bmp.Poc/PoCs/PocAsioDSFPlay.cs

@@ -35,7 +35,7 @@ internal static class PocAsioDSFPlay
         var nbSamples = drv.CreateBuffers(dsfStream.ChannelNum, 0, false);
         var outputBufBytes = nbSamples / 8;
 
-        var channelBlockBuf = new byte[dsfStream.BlockSizePerChannel * dsfStream.ChannelNum];
+        var channelBlockBuf = new byte[dsfStream.ClusterSizePerChannel * dsfStream.ChannelNum];
         var channelOffset = 0;
 
         //生产者-消费者 模式, 结束检测
@@ -62,12 +62,12 @@ internal static class PocAsioDSFPlay
             {
                 for (int ich = 0; ich < dsfStream.ChannelNum; ich++)
                 {
-                    Marshal.WriteByte(outputChannels[ich] + iBuf, channelBlockBuf[dsfStream.BlockSizePerChannel * ich + channelOffset]);
+                    Marshal.WriteByte(outputChannels[ich] + iBuf, channelBlockBuf[dsfStream.ClusterSizePerChannel * ich + channelOffset]);
                 }
 
                 channelOffset++;
 
-                if (channelOffset >= dsfStream.BlockSizePerChannel)
+                if (channelOffset >= dsfStream.ClusterSizePerChannel)
                 {
                     if (!ReadBlock())
                     {