Merge branch 'master' of https://github.com/raven02/ppsspp into raven02-master

Conflicts:
	Core/HW/audioPlayer.cpp
This commit is contained in:
Henrik Rydgård 2013-05-27 19:45:57 +02:00
commit ce873ccbeb
4 changed files with 4 additions and 10 deletions

View File

@ -571,9 +571,10 @@ void deleteAtrac3Audio(int atracID)
void initaudioEngine()
{
if (g_Config.bAutoLoadDShow) {
if (LoadFilterLibrary(0, "filter\\lib\\AsyncStreamflt.ax") != S_OK)
{
WARN_LOG(HLE, "Can't load AsyncStreamflt.ax");
if (LoadFilterLibrary(0, "filter\\lib\\AsyncStreamflt.ax") != S_OK) {
WARN_LOG(HLE, "AsyncStreamflt.ax failed to load");
} else {
NOTICE_LOG(HLE, "AsyncStreamflt.ax loading completed successfully");
}
}
CoInitialize(0);

View File

@ -1,5 +0,0 @@
Open task manager (Ctrl Shift Esc)
click show all processes button to launch it in Admin elevation.
click File > Run
tick create the task with administrative priviledges
select {ppssppdir}\lib\filter\Register.bat

View File

@ -1 +0,0 @@
@regsvr32 AsyncStreamflt.ax

View File

@ -1 +0,0 @@
@regsvr32 /u AsyncStreamflt.ax