actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/arch/Sound/RageSoundDriver.cpp
+10 -9
View File
@@ -3,7 +3,7 @@
#include "RageSoundManager.h"
#include "RageLog.h"
#include "RageUtil.h"
#include "Foreach.h"
#include "arch/arch_default.h"
DriverList RageSoundDriver::m_pDriverList;
@@ -44,28 +44,29 @@ RageSoundDriver *RageSoundDriver::Create( const RString& drivers )
}
}
FOREACH_CONST( RString, drivers_to_try, Driver )
for (RString const &Driver : drivers_to_try)
{
RageDriver *pDriver = m_pDriverList.Create( *Driver );
if( pDriver == NULL )
RageDriver *pDriver = m_pDriverList.Create( Driver );
char const *driverString = Driver.c_str();
if( pDriver == nullptr )
{
LOG->Trace( "Unknown sound driver: %s", Driver->c_str() );
LOG->Trace( "Unknown sound driver: %s", driverString );
continue;
}
RageSoundDriver *pRet = dynamic_cast<RageSoundDriver *>( pDriver );
ASSERT( pRet != NULL );
ASSERT( pRet != nullptr );
const RString sError = pRet->Init();
if( sError.empty() )
{
LOG->Info( "Sound driver: %s", Driver->c_str() );
LOG->Info( "Sound driver: %s", driverString );
return pRet;
}
LOG->Info( "Couldn't load driver %s: %s", Driver->c_str(), sError.c_str() );
LOG->Info( "Couldn't load driver %s: %s", driverString, sError.c_str() );
SAFE_DELETE( pRet );
}
return NULL;
return nullptr;
}
RString RageSoundDriver::GetDefaultSoundDriverList()