From cacc3516c13f3dc82e8be9a5fb431f35c9d5efa8 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Wed, 2 Feb 2011 23:20:03 +0000 Subject: [PATCH] This should have gone into r5269: These files were re-licensed with permission of the original author. (Karl Blomster). Originally committed to SVN as r5270. --- aegisub/libaegisub/common/ffms_audio.cpp | 4 ++-- aegisub/libaegisub/common/ffms_audio.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/aegisub/libaegisub/common/ffms_audio.cpp b/aegisub/libaegisub/common/ffms_audio.cpp index b33e260dd..82819963b 100644 --- a/aegisub/libaegisub/common/ffms_audio.cpp +++ b/aegisub/libaegisub/common/ffms_audio.cpp @@ -39,7 +39,7 @@ Audio::Audio(std::string filename) #ifdef WIN32 HRESULT res; res = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - if (SUCCEEDED(res)) + if (SUCCEEDED(res)) COMInited = true; else if (res != RPC_E_CHANGED_MODE) throw AudioOpenError("COM initialization failure"); @@ -128,7 +128,7 @@ void Audio::LoadAudio(std::string filename) { } } // no valid index exists and the file only has one audio track, index it - else if (TrackNumber < 0) + else if (TrackNumber < 0) TrackNumber = FFMS_TRACKMASK_ALL; // else: do nothing (keep track mask as it is) diff --git a/aegisub/libaegisub/common/ffms_audio.h b/aegisub/libaegisub/common/ffms_audio.h index 111ca1864..800e9b924 100644 --- a/aegisub/libaegisub/common/ffms_audio.h +++ b/aegisub/libaegisub/common/ffms_audio.h @@ -31,6 +31,8 @@ namespace ffms { +/// @class Audio +/// Audio file support. class Audio { FFMS_AudioSource *AudioSource; ///< audio source object bool COMInited; ///< COM initialization state