lifegpc/GARbro-crskycode
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2026-07-08 01:30:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

(WaveAudio): support Ogg-tagged wave streams.

Browse Source
This commit is contained in:
morkt
2015-05-01 23:30:57 +04:00
parent a2a9ced8df
commit 888718e900
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
GameRes/AudioWAV.cs
View File

@@ -2,7 +2,7 @@
//! \date Tue Nov 04 18:22:37 2014 //! \date Tue Nov 04 18:22:37 2014
//! \brief WAVE audio format implementation. //! \brief WAVE audio format implementation.
// //
// Copyright (C) 2014 by morkt // Copyright (C) 2014-2015 by morkt
// //
// Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
@@ -151,7 +151,21 @@ namespace GameRes
public override SoundInput TryOpen (Stream file) public override SoundInput TryOpen (Stream file)
{ {
return new WaveInput (file); SoundInput sound = new WaveInput (file);
if (0x674f == sound.Format.FormatTag || 0x6771 == sound.Format.FormatTag)
{
try
{
var ogg = AudioFormat.Read (sound);
if (null != ogg)
{
sound.Dispose();
sound = ogg;
}
}
catch { /* ignore errors */ }
}
return sound;
} }
public override void Write (SoundInput source, Stream output) public override void Write (SoundInput source, Stream output)

11
MainWindow.xaml.cs
View File

@@ -1,6 +1,6 @@
// Game Resource Browser // Game Resource Browser
// //
// Copyright (C) 2014 by morkt // Copyright (C) 2014-2015 by morkt
// //
// Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
@@ -810,15 +810,6 @@ namespace GARbro.GUI
throw FormatCatalog.Instance.LastError; throw FormatCatalog.Instance.LastError;
return; return;
} }
if (sound is WaveInput && 0x674f == sound.Format.FormatTag)
{
var ogg = AudioFormat.Read (sound);
if (null != ogg)
{
sound.Dispose();
sound = ogg;
}
}
if (m_audio != null) if (m_audio != null)
{ {