#51 ストリーム周りの修正

OUCC · May 3, 2024 · 8a6b5d3 · 8a6b5d3
1 parent a984402
commit 8a6b5d3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/Epub/KoeBook.Epub/Services/EpubGenerateService.cs b/Epub/KoeBook.Epub/Services/EpubGenerateService.cs
@@ -23,9 +23,7 @@ public async ValueTask<string> GenerateEpubAsync(BookScripts bookScripts, string
         {
             var scriptLine = bookScripts.ScriptLines[i];
             var wavData = await _soundGenerationService.GenerateLineSoundAsync(scriptLine, bookScripts.Options, cancellationToken).ConfigureAwait(false);
-            var ms = new MemoryStream();
-            ms.Write(wavData);
-            ms.Position = 0;
+            using var ms = new MemoryStream(wavData);
             using var reader = new WaveFileReader(ms);
             var tmpMp3Path = Path.Combine(tempDirectory, $"{document.Title}{i}.mp3");
             MediaFoundationEncoder.EncodeToMp3(reader, tmpMp3Path);

diff --git a/KoeBook.Core/Models/Audio.cs b/KoeBook.Core/Models/Audio.cs
@@ -1,4 +1,5 @@
-using NAudio.Wave;
+using System.IO;
+using NAudio.Wave;
 
 namespace KoeBook.Epub.Models;
 
@@ -9,6 +10,6 @@ public sealed class Audio(TimeSpan totalTIme, string tempFilePath)
 
     public FileStream GetStream()
     {
-        return File.OpenRead(TempFilePath);
+        return new FileStream(TempFilePath, FileMode.Open, FileAccess.Read, FileShare.Read, 4096, true);
     }
 }
diff --git a/KoeBook.Core/Services/SoundGenerationService.cs b/KoeBook.Core/Services/SoundGenerationService.cs
@@ -33,9 +33,7 @@ public async ValueTask<byte[]> GenerateLineSoundAsync(ScriptLine scriptLine, Boo
                     ArrayPool<byte>.Shared.Return(dataBuffer);
                     dataBuffer = ArrayPool<byte>.Shared.Rent(voice.Length);
                 }
-                using var msReader = new MemoryStream();
-                await msReader.WriteAsync(voice, cancellationToken);
-                msReader.Position = 0;
+                using var msReader = new MemoryStream(voice);
                 using var reader = new WaveFileReader(msReader);
                 var read = await reader.ReadAsync(dataBuffer, cancellationToken);
                 if (writer is null)