Merge branch 'master' into jgrpp
# Conflicts: # src/articulated_vehicles.cpp # src/articulated_vehicles.h # src/base_media_base.h # src/base_media_func.h # src/build_vehicle_gui.cpp # src/dock_gui.cpp # src/main_gui.cpp # src/music_gui.cpp # src/network/network_chat_gui.cpp # src/network/network_content.cpp # src/newgrf.cpp # src/newgrf_roadstop.cpp # src/os/windows/string_uniscribe.h # src/os/windows/win32.cpp # src/rail_gui.cpp # src/road.cpp # src/road_gui.cpp # src/settings.cpp # src/settings_gui.cpp # src/smallmap_gui.cpp # src/strings.cpp # src/terraform_gui.cpp # src/tests/test_script_admin.cpp # src/tests/test_window_desc.cpp # src/timer/timer_game_calendar.h # src/vehicle.cpp # src/vehicle_base.h # src/viewport.cpp # src/widget_type.h # src/window.cpp # src/window_gui.h
This commit is contained in:
@@ -41,9 +41,9 @@ typedef HRESULT(__stdcall *API_XAudio2Create)(_Outptr_ IXAudio2** ppXAudio2, UIN
|
||||
static FSoundDriver_XAudio2 iFSoundDriver_XAudio2;
|
||||
|
||||
/**
|
||||
* Implementation of the IXAudio2VoiceCallback interface.
|
||||
* Provides buffered audio to XAudio2 from the OpenTTD mixer.
|
||||
*/
|
||||
* Implementation of the IXAudio2VoiceCallback interface.
|
||||
* Provides buffered audio to XAudio2 from the OpenTTD mixer.
|
||||
*/
|
||||
class StreamingVoiceContext : public IXAudio2VoiceCallback
|
||||
{
|
||||
private:
|
||||
@@ -132,12 +132,12 @@ static HRESULT CreateXAudio(API_XAudio2Create xAudio2Create)
|
||||
}
|
||||
|
||||
/**
|
||||
* Initialises the XAudio2 driver.
|
||||
*
|
||||
* @param parm Driver parameters.
|
||||
* @return An error message if unsuccessful, or nullptr otherwise.
|
||||
*
|
||||
*/
|
||||
* Initialises the XAudio2 driver.
|
||||
*
|
||||
* @param parm Driver parameters.
|
||||
* @return An error message if unsuccessful, or nullptr otherwise.
|
||||
*
|
||||
*/
|
||||
const char *SoundDriver_XAudio2::Start(const StringList &parm)
|
||||
{
|
||||
HRESULT hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
|
||||
@@ -261,8 +261,8 @@ const char *SoundDriver_XAudio2::Start(const StringList &parm)
|
||||
}
|
||||
|
||||
/**
|
||||
* Terminates the XAudio2 driver.
|
||||
*/
|
||||
* Terminates the XAudio2 driver.
|
||||
*/
|
||||
void SoundDriver_XAudio2::Stop()
|
||||
{
|
||||
// Clean up XAudio2
|
||||
|
Reference in New Issue
Block a user