mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Leave the old audio open when opening new audio fails for any reason

Browse source 
Originally committed to SVN as r6738.
This commit is contained in:
Thomas Goyne 2012-05-02 00:31:38 +00:00
parent b8212512e7
commit cb75c42f04
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
aegisub/src/audio_controller.cpp
View file

@ -150,13 +150,13 @@ void AudioController::OnAudioProviderChanged()
void AudioController::OpenAudio(const wxString &url) void AudioController::OpenAudio(const wxString &url)
{ {
CloseAudio();
if (!url) if (!url)
throw agi::InternalError("AudioController::OpenAudio() was passed an empty string. This must not happen.", 0); throw agi::InternalError("AudioController::OpenAudio() was passed an empty string. This must not happen.", 0);
wxString path_part; wxString path_part;
AudioProvider *new_provider = 0;
if (url.StartsWith("dummy-audio:", &path_part)) if (url.StartsWith("dummy-audio:", &path_part))
{ {
/* /*
@ -179,7 +179,7 @@ void AudioController::OpenAudio(const wxString &url)
* in every channel even if one would be LFE. * in every channel even if one would be LFE.
* "ln", length of signal in samples. ln/sr gives signal length in seconds. * "ln", length of signal in samples. ln/sr gives signal length in seconds.
*/ */
provider = new DummyAudioProvider(5*30*60*1000, path_part.StartsWith("noise")); new_provider = new DummyAudioProvider(5*30*60*1000, path_part.StartsWith("noise"));
} }
else if (url.StartsWith("video-audio:", &path_part)) else if (url.StartsWith("video-audio:", &path_part))
{ {
@ -215,7 +215,7 @@ void AudioController::OpenAudio(const wxString &url)
* Assume it's not a URI but instead a filename in the platform's native format. * Assume it's not a URI but instead a filename in the platform's native format.
*/ */
try { try {
provider = AudioProviderFactory::GetProvider(url); new_provider = AudioProviderFactory::GetProvider(url);
StandardPaths::SetPathValue("?audio", wxFileName(url).GetPath()); StandardPaths::SetPathValue("?audio", wxFileName(url).GetPath());
} }
catch (agi::UserCancelException const&) { catch (agi::UserCancelException const&) {
@ -227,6 +227,9 @@ void AudioController::OpenAudio(const wxString &url)
} }
} }
CloseAudio();
provider = new_provider;
try try
{ {
player = AudioPlayerFactory::GetAudioPlayer(); player = AudioPlayerFactory::GetAudioPlayer();