From 293b5cb4c16b9da1c1d72b65ebf0e4fc23b3be84 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Tue, 4 Jan 2011 13:59:44 +0000 Subject: [PATCH] Look for the DSP ROM files in Sys/GC as before before trying User/GC to allow both system-side (also Windows) and per-user installations. The IPL ROM is another candidate for this, but I don't have an image to test with. Perhaps a more general solution would be to just phase out the Sys directory. As used for data which would have been available in ROM or flash on the real hardware, it really contains two classes of files that are both read-only during emulation: - Settings and font files, which can be freely distributed - ROM files which must be obtained from the user's own GC or Wii Since the two could be freely put together on Windows without any problems and with the users of that platform being resistant to change, it may be easiest to just treat Sys as another directory to be copied from the application bundle into User/Sys at startup on non-Windows. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6738 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_DSP_LLE/Src/main.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp b/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp index f82fc2df6f..3f8f200d7e 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp +++ b/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp @@ -219,9 +219,15 @@ void Initialize(void *init) g_Config.Load(); snprintf(irom_file, MAX_PATH, "%s%s", - File::GetUserPath(D_GCUSER_IDX), DIR_SEP DSP_IROM); + File::GetSysDirectory().c_str(), GC_SYS_DIR DIR_SEP DSP_IROM); + if (!File::Exists(irom_file)) + snprintf(irom_file, MAX_PATH, "%s%s", + File::GetUserPath(D_GCUSER_IDX), DIR_SEP DSP_IROM); snprintf(coef_file, MAX_PATH, "%s%s", - File::GetUserPath(D_GCUSER_IDX), DIR_SEP DSP_COEF); + File::GetSysDirectory().c_str(), GC_SYS_DIR DIR_SEP DSP_COEF); + if (!File::Exists(coef_file)) + snprintf(coef_file, MAX_PATH, "%s%s", + File::GetUserPath(D_GCUSER_IDX), DIR_SEP DSP_COEF); bCanWork = DSPCore_Init(irom_file, coef_file, AudioCommon::UseJIT()); g_dsp.cpu_ram = g_dspInitialize.pGetMemoryPointer(0);