ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add some docs to the lle-testing vcproj and try to shutdown the plugin without crashing 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2794 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2009-03-30 06:28:15 +00:00
parent 57105f08d6
commit 7cfd2b9999
3 changed files with 176 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Common/Common.vcproj
View File

@ -498,10 +498,6 @@
<Filter <Filter
Name="Specs" Name="Specs"
> >
<File
RelativePath="..\..\PluginSpecs\CommonTypes.h"
>
</File>
<File <File
RelativePath="..\..\PluginSpecs\ExportEpilog.h" RelativePath="..\..\PluginSpecs\ExportEpilog.h"
> >

170
Source/Plugins/Plugin_DSP_LLE-testing/Plugin_DSP_LLE_Test.vcproj
View File

@ -709,15 +709,179 @@
Name="Docs" Name="Docs"
> >
<File <File
RelativePath="..\..\..\Docs\DSP\Crazy Taxi.txt" RelativePath="..\..\..\..\docs\DSP\AX.c"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\docs\DSP\Crazy Taxi.txt"
> >
</File> </File>
<File <File
RelativePath="..\..\..\Docs\DSP\dsp_rom.txt" RelativePath="..\..\..\..\docs\DSP\dsp_rom.txt"
> >
</File> </File>
<File <File
RelativePath="..\..\..\Docs\DSP\DSP_UC_Zelda.txt" RelativePath="..\..\..\..\docs\DSP\DSP_UC_Zelda.txt"
>
</File>
<File
RelativePath="..\..\..\..\docs\DSP\SrcSelect_.c"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\docs\DSP\wwdsp.c"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\docs\DSP\Zelda.txt"
>
</File>
<File
RelativePath="..\..\..\..\docs\DSP\zeldaNotes.txt"
> >
</File> </File>
</Filter> </Filter>

12
Source/Plugins/Plugin_DSP_LLE-testing/Src/main.cpp
View File

@ -38,7 +38,7 @@
PLUGIN_GLOBALS* globals = NULL; PLUGIN_GLOBALS* globals = NULL;
DSPInitialize g_dspInitialize; DSPInitialize g_dspInitialize;
Common::Thread *g_hDSPThread; Common::Thread *g_hDSPThread = NULL;
SoundStream *soundStream = NULL; SoundStream *soundStream = NULL;
@ -52,6 +52,7 @@ extern u32 m_addressPBs;
bool AXTask(u32& _uMail); bool AXTask(u32& _uMail);
bool bCanWork = false; bool bCanWork = false;
bool bIsRunning = false;
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// UGLY wxw stuff, TODO fix up // UGLY wxw stuff, TODO fix up
@ -168,14 +169,15 @@ void DllDebugger(HWND _hParent, bool Show)
// Regular thread // Regular thread
THREAD_RETURN dsp_thread(void* lpParameter) THREAD_RETURN dsp_thread(void* lpParameter)
{ {
while (1) while (bIsRunning)
{ {
if (!gdsp_run()) if (!gdsp_run())
{ {
PanicAlert("ERROR: DSP Halt"); ERROR_LOG(AUDIO, "DSP Halt");
return 0; return 0;
} }
} }
return 0;
} }
// Debug thread // Debug thread
@ -218,6 +220,8 @@ void Initialize(void *init)
if(!bCanWork) if(!bCanWork)
return; // TODO: Don't let it work return; // TODO: Don't let it work
bIsRunning = true;
g_hDSPThread = new Common::Thread(dsp_thread, NULL); g_hDSPThread = new Common::Thread(dsp_thread, NULL);
soundStream = AudioCommon::InitSoundStream(g_Config.sBackend); soundStream = AudioCommon::InitSoundStream(g_Config.sBackend);
@ -233,6 +237,8 @@ void DSP_StopSoundStream()
void Shutdown(void) void Shutdown(void)
{ {
bIsRunning = false;
gdsp_stop();
AudioCommon::ShutdownSoundStream(); AudioCommon::ShutdownSoundStream();
} }