ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move `AudioExtractor` to DiscSystem and clean up

This commit is contained in:
YoshiRulz 2021-11-02 21:44:08 +10:00 committed by James Groom
parent 551fd72275
commit 6a43277ae3
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/BizHawk.Client.DiscoHawk/Program.cs
View File

@ -77,7 +77,6 @@ namespace BizHawk.Client.DiscoHawk
if (!File.Exists(ffmpegPath))
ffmpegPath = Path.Combine(Path.Combine(GetExeDirectoryAbsolute(), "dll"), "ffmpeg.exe");
FFmpegService.FFmpegPath = ffmpegPath;
AudioExtractor.FFmpegPath = ffmpegPath;
if (args.Length == 0)
{

26
src/BizHawk.Client.DiscoHawk/AudioExtractor.cs → src/BizHawk.Emulation.DiscSystem/DiscoHawkLogic/AudioExtractor.cs
View File

@ -9,8 +9,6 @@ namespace BizHawk.Client.DiscoHawk
{
public static class AudioExtractor
{
public static string FFmpegPath;
public static void Extract(Disc disc, string path, string fileBase, Func<bool?> getOverwritePolicy)
{
var dsr = new DiscSectorReader(disc);
@ -21,24 +19,21 @@ namespace BizHawk.Client.DiscoHawk
var tracks = disc.Session1.Tracks;
Parallel.ForEach(tracks, track =>
{
if (shouldHalt) return;
if (shouldHalt || track.NextTrack == null) return;
if (!track.IsAudio) return;
if (!track.IsAudio)
return;
if (track.NextTrack == null)
return;
int trackLength = track.NextTrack.LBA - track.LBA;
var startLba = track.LBA;
var trackLength = track.NextTrack.LBA - startLba;
var waveData = new byte[trackLength * 2352];
int startLba = track.LBA;
lock(disc)
for (int sector = 0; sector < trackLength; sector++)
lock (disc)
{
for (var sector = 0; sector < trackLength; sector++)
{
dsr.ReadLBA_2352(startLba + sector, waveData, sector * 2352);
}
}
string mp3Path = $"{Path.Combine(path, fileBase)} - Track {track.Number:D2}.mp3";
var mp3Path = $"{Path.Combine(path, fileBase)} - Track {track.Number:D2}.mp3";
if (File.Exists(mp3Path))
{
overwriteExisting ??= getOverwritePolicy();
@ -55,8 +50,7 @@ namespace BizHawk.Client.DiscoHawk
}
}
string tempfile = Path.GetTempFileName();
var tempfile = Path.GetTempFileName();
try
{
File.WriteAllBytes(tempfile, waveData);