mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Fix a bug (introduced when support for w64 was added) that caused the PCM provider to never get used.

Browse source 
Originally committed to SVN as r2682.
This commit is contained in:
Karl Blomster 2009-01-10 05:41:56 +00:00
parent 811505ee83
commit 5e6253831a
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
aegisub/audio_provider_pcm.cpp
View file

@ -522,6 +522,8 @@ AudioProvider *CreatePCMAudioProvider(const wxString &filename)
// Try Microsoft/IBM RIFF WAV // Try Microsoft/IBM RIFF WAV
try { try {
provider = new RiffWavPCMAudioProvider(filename); provider = new RiffWavPCMAudioProvider(filename);
// don't bother trying with anything else if this works
return provider;
} }
catch (const wxChar *msg) { catch (const wxChar *msg) {
provider = 0; provider = 0;
@ -531,11 +533,13 @@ AudioProvider *CreatePCMAudioProvider(const wxString &filename)
// Try Sony Wave64 // Try Sony Wave64
try { try {
provider = new Wave64AudioProvider(filename); provider = new Wave64AudioProvider(filename);
return provider;
} }
catch (const wxChar *msg) { catch (const wxChar *msg) {
provider = 0; provider = 0;
wxLogDebug(_T("Creating Wave64 reader failed with message: %s\nProceeding to try other providers."), msg); wxLogDebug(_T("Creating Wave64 reader failed with message: %s\nProceeding to try other providers."), msg);
} }
return provider; // no providers could be created
return NULL;
} }