From a1902a0690b53af2370fab6ccc12c09fe25b1a13 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Wed, 6 Jan 2010 08:02:15 +0000 Subject: [PATCH] Remove the frequently unstable or nonfunctional attempt at automatically loading audio from the loaded video when playing with no audio loading. Updates #1090. Originally committed to SVN as r3954. --- aegisub/src/audio_display.cpp | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/aegisub/src/audio_display.cpp b/aegisub/src/audio_display.cpp index 9c81822f5..6aec3ca8b 100644 --- a/aegisub/src/audio_display.cpp +++ b/aegisub/src/audio_display.cpp @@ -1127,33 +1127,7 @@ void AudioDisplay::Play(int start,int end) { // Check provider if (!provider) { wxLogDebug(_T("AudioDisplay::Play: no audio provider")); - // Load temporary provider from video - if (VideoContext::Get()->IsLoaded()) { - wxLogDebug(_T("AudioDisplay::Play: has video provider")); - try { - // Get provider - if (!VideoContext::Get()->videoName.StartsWith(_T("?dummy"))) - provider = AudioProviderFactoryManager::GetAudioProvider(VideoContext::Get()->videoName, 0); - else - return; - - // Get player - player = AudioPlayerFactoryManager::GetAudioPlayer(); - player->SetDisplayTimer(&UpdateTimer); - player->SetProvider(provider); - player->OpenStream(); - temporary = true; - wxLogDebug(_T("AudioDisplay::Play: got temp audio provider from video provider")); - } - catch (...) { - wxLogDebug(_T("AudioDisplay::Play: exception getting audio provider from video, returning")); - return; - } - } - if (!provider) { - wxLogDebug(_T("AudioDisplay::Play: has no provider, returning")); - return; - } + return; } // Set defaults