From 3d56c239044773c39b78aebcd72f638dc2ed5598 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Wed, 12 Nov 2008 10:03:42 +0000 Subject: [PATCH] get rid of the old WII folder and put DSP.ini where it belongs git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1149 8ced0084-cf51-0410-be5f-012b33b47a6e --- Binary/linux/WII/setting-eur.txt | Bin 256 -> 0 bytes Binary/linux/WII/setting-jpn.txt | Bin 256 -> 0 bytes Binary/linux/WII/setting-usa.txt | Bin 256 -> 0 bytes Binary/linux/WII/shared2/sys/SYSCONF | Bin 16384 -> 0 bytes Binary/linux/WII/shared2/sys/readme.txt | 1 - .../title/00000001/00000002/data/setting.txt | Bin 256 -> 0 bytes Binary/mac/WII/setting-eur.txt | Bin 256 -> 0 bytes Binary/mac/WII/setting-jpn.txt | Bin 256 -> 0 bytes Binary/mac/WII/setting-usa.txt | Bin 256 -> 0 bytes Binary/win32/WII/setting-eur.txt | Bin 256 -> 0 bytes Binary/win32/WII/setting-jpn.txt | Bin 256 -> 0 bytes Binary/win32/WII/setting-usa.txt | Bin 256 -> 0 bytes Binary/win32/WII/shared2/sys/SYSCONF | Bin 16384 -> 0 bytes Binary/win32/WII/shared2/sys/readme.txt | 1 - .../title/00000001/00000002/data/setting.txt | Bin 256 -> 0 bytes Binary/x64/WII/setting-eur.txt | Bin 256 -> 0 bytes Binary/x64/WII/setting-jpn.txt | Bin 256 -> 0 bytes Binary/x64/WII/setting-usa.txt | Bin 256 -> 0 bytes Binary/x64/WII/shared2/sys/SYSCONF | Bin 16384 -> 0 bytes Binary/x64/WII/shared2/sys/readme.txt | 1 - .../Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp | 4 ++-- Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp | 6 +++--- 22 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 Binary/linux/WII/setting-eur.txt delete mode 100644 Binary/linux/WII/setting-jpn.txt delete mode 100644 Binary/linux/WII/setting-usa.txt delete mode 100644 Binary/linux/WII/shared2/sys/SYSCONF delete mode 100644 Binary/linux/WII/shared2/sys/readme.txt delete mode 100644 Binary/linux/WII/title/00000001/00000002/data/setting.txt delete mode 100644 Binary/mac/WII/setting-eur.txt delete mode 100644 Binary/mac/WII/setting-jpn.txt delete mode 100644 Binary/mac/WII/setting-usa.txt delete mode 100644 Binary/win32/WII/setting-eur.txt delete mode 100644 Binary/win32/WII/setting-jpn.txt delete mode 100644 Binary/win32/WII/setting-usa.txt delete mode 100644 Binary/win32/WII/shared2/sys/SYSCONF delete mode 100644 Binary/win32/WII/shared2/sys/readme.txt delete mode 100644 Binary/win32/WII/title/00000001/00000002/data/setting.txt delete mode 100644 Binary/x64/WII/setting-eur.txt delete mode 100644 Binary/x64/WII/setting-jpn.txt delete mode 100644 Binary/x64/WII/setting-usa.txt delete mode 100644 Binary/x64/WII/shared2/sys/SYSCONF delete mode 100644 Binary/x64/WII/shared2/sys/readme.txt diff --git a/Binary/linux/WII/setting-eur.txt b/Binary/linux/WII/setting-eur.txt deleted file mode 100644 index 693d7411eb42a219e441ae4e015bdde236ab20c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmdnJY|W%u+$Xc^-Zo#VH(vPsx$W%c+-~=y^B&oL+f=%1^}drg@2zD%Q)PYY-%}og z)$?~GPI)N#&wJs#U8z04bT@1|e&puk>2+&3ov$CBo@>8y{;#n1_k!DMR?YgQ_2`$@ K=kE-I8~^|e{yFCW diff --git a/Binary/linux/WII/setting-jpn.txt b/Binary/linux/WII/setting-jpn.txt deleted file mode 100644 index db15646b460bfec77340be165a8f07207f928d87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmdnJY|W%uEN9B=-Zo#VH(vPsx$W%c+-~=y6Q3)7+f=%1^}drg@2zD%Q)PYY-%}og z)$?~GPI)N#&wJs-U8z04bT@1|e&puk>2+&3ov$CBo@>8y{;#l^zxaMsKcDkWX;zcz Lx(^>11~&izI;uK5 diff --git a/Binary/linux/WII/setting-usa.txt b/Binary/linux/WII/setting-usa.txt deleted file mode 100644 index 38ca5d91db29572af2a1da2b6ef913772d124209..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmdnJY|W%u(&sDc-Zo#VH(vPsx$W%c+-~=yeNXhhZ7SWhdf&;L_tr9>sj|NH?iIhor#zJW=e@9RS8C5M-3^dfggM=j(^3=i0BF|0`_fFTNku&*ywon$@JW K_QMB;!3_XWWI9d& diff --git a/Binary/linux/WII/shared2/sys/SYSCONF b/Binary/linux/WII/shared2/sys/SYSCONF deleted file mode 100644 index 8925006cdb5d1efed05552aae11b02a54b594276..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 zcmWG`E;C?YWDsD00yU=)Jr_?uH%37w$w~%>@XXBI{E}1!L#Xs9H5vk=Aut*OqaiRF z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71* zAut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@? v8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3^7gAf1!@OB3- diff --git a/Binary/linux/WII/shared2/sys/readme.txt b/Binary/linux/WII/shared2/sys/readme.txt deleted file mode 100644 index 140df0d38f..0000000000 --- a/Binary/linux/WII/shared2/sys/readme.txt +++ /dev/null @@ -1 +0,0 @@ -This SYSCONF file describes a single registered Wiimote, with the Bluetooth address used by Dolphin. diff --git a/Binary/linux/WII/title/00000001/00000002/data/setting.txt b/Binary/linux/WII/title/00000001/00000002/data/setting.txt deleted file mode 100644 index 65f57c2ee985713476ac0b6e3483e6fe472e2176..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 KcmZP=;Q#;u00031 diff --git a/Binary/mac/WII/setting-eur.txt b/Binary/mac/WII/setting-eur.txt deleted file mode 100644 index 693d7411eb42a219e441ae4e015bdde236ab20c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmdnJY|W%u+$Xc^-Zo#VH(vPsx$W%c+-~=y^B&oL+f=%1^}drg@2zD%Q)PYY-%}og z)$?~GPI)N#&wJs#U8z04bT@1|e&puk>2+&3ov$CBo@>8y{;#n1_k!DMR?YgQ_2`$@ K=kE-I8~^|e{yFCW diff --git a/Binary/mac/WII/setting-jpn.txt b/Binary/mac/WII/setting-jpn.txt deleted file mode 100644 index db15646b460bfec77340be165a8f07207f928d87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmdnJY|W%uEN9B=-Zo#VH(vPsx$W%c+-~=y6Q3)7+f=%1^}drg@2zD%Q)PYY-%}og z)$?~GPI)N#&wJs-U8z04bT@1|e&puk>2+&3ov$CBo@>8y{;#l^zxaMsKcDkWX;zcz Lx(^>11~&izI;uK5 diff --git a/Binary/mac/WII/setting-usa.txt b/Binary/mac/WII/setting-usa.txt deleted file mode 100644 index 38ca5d91db29572af2a1da2b6ef913772d124209..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmdnJY|W%u(&sDc-Zo#VH(vPsx$W%c+-~=yeNXhhZ7SWhdf&;L_tr9>sj|NH?iIhor#zJW=e@9RS8C5M-3^dfggM=j(^3=i0BF|0`_fFTNku&*ywon$@JW K_QMB;!3_XWWI9d& diff --git a/Binary/win32/WII/setting-eur.txt b/Binary/win32/WII/setting-eur.txt deleted file mode 100644 index 693d7411eb42a219e441ae4e015bdde236ab20c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmdnJY|W%u+$Xc^-Zo#VH(vPsx$W%c+-~=y^B&oL+f=%1^}drg@2zD%Q)PYY-%}og z)$?~GPI)N#&wJs#U8z04bT@1|e&puk>2+&3ov$CBo@>8y{;#n1_k!DMR?YgQ_2`$@ K=kE-I8~^|e{yFCW diff --git a/Binary/win32/WII/setting-jpn.txt b/Binary/win32/WII/setting-jpn.txt deleted file mode 100644 index db15646b460bfec77340be165a8f07207f928d87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmdnJY|W%uEN9B=-Zo#VH(vPsx$W%c+-~=y6Q3)7+f=%1^}drg@2zD%Q)PYY-%}og z)$?~GPI)N#&wJs-U8z04bT@1|e&puk>2+&3ov$CBo@>8y{;#l^zxaMsKcDkWX;zcz Lx(^>11~&izI;uK5 diff --git a/Binary/win32/WII/setting-usa.txt b/Binary/win32/WII/setting-usa.txt deleted file mode 100644 index 38ca5d91db29572af2a1da2b6ef913772d124209..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmdnJY|W%u(&sDc-Zo#VH(vPsx$W%c+-~=yeNXhhZ7SWhdf&;L_tr9>sj|NH?iIhor#zJW=e@9RS8C5M-3^dfggM=j(^3=i0BF|0`_fFTNku&*ywon$@JW K_QMB;!3_XWWI9d& diff --git a/Binary/win32/WII/shared2/sys/SYSCONF b/Binary/win32/WII/shared2/sys/SYSCONF deleted file mode 100644 index 346a9528b627cd6b7f40cae879f4663b7f4ded2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 zcmWG`E;C?|Vz6OZ&a#>163Z=?M=Y;dzKF7m3W-XK=89H{Hj7UZpC`Ube3STY@gw4A z#jlCq6MrrKO@cv!L(M5f&&AWvjU|DJfuT~8NzgAduOu}uC0`*Z%tzPRFGSbCkbxAy zNEK5^v2j%GXb3RKnMN+UF&YkoIRutDh3Eyl`UNvEFfhA$2Keatd3uX7q%h<&fI7{Cl4KX*oTu!y5ekN|s*1OtP?PJ<-| zJE7VKf(m9RXUJqIVW?tAWhi3EVMt`iV@RQ+LxLHS88R5k8B!TC8LH@LFU+c7hEj%1 zhGK?dhE$jkU1^B@RSb!AwH0AmFhdzQZbhUhtm1UQ4tdlnuZt``&>!T=gZb$0P|V`2dbkKz#?0?R+U<8kwdAj&8 zGBQ2~nc*7hJ}q!_pu fgcy_Y*R)EF2Tco@Wjol{c)+YFjI diff --git a/Binary/win32/WII/shared2/sys/readme.txt b/Binary/win32/WII/shared2/sys/readme.txt deleted file mode 100644 index aa2c366098..0000000000 --- a/Binary/win32/WII/shared2/sys/readme.txt +++ /dev/null @@ -1 +0,0 @@ -This SYSCONF file describes two registered Wiimotes with the Bluetooth address used by Dolphin. diff --git a/Binary/win32/WII/title/00000001/00000002/data/setting.txt b/Binary/win32/WII/title/00000001/00000002/data/setting.txt deleted file mode 100644 index 65f57c2ee985713476ac0b6e3483e6fe472e2176..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 KcmZP=;Q#;u00031 diff --git a/Binary/x64/WII/setting-eur.txt b/Binary/x64/WII/setting-eur.txt deleted file mode 100644 index 693d7411eb42a219e441ae4e015bdde236ab20c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmdnJY|W%u+$Xc^-Zo#VH(vPsx$W%c+-~=y^B&oL+f=%1^}drg@2zD%Q)PYY-%}og z)$?~GPI)N#&wJs#U8z04bT@1|e&puk>2+&3ov$CBo@>8y{;#n1_k!DMR?YgQ_2`$@ K=kE-I8~^|e{yFCW diff --git a/Binary/x64/WII/setting-jpn.txt b/Binary/x64/WII/setting-jpn.txt deleted file mode 100644 index db15646b460bfec77340be165a8f07207f928d87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmdnJY|W%uEN9B=-Zo#VH(vPsx$W%c+-~=y6Q3)7+f=%1^}drg@2zD%Q)PYY-%}og z)$?~GPI)N#&wJs-U8z04bT@1|e&puk>2+&3ov$CBo@>8y{;#l^zxaMsKcDkWX;zcz Lx(^>11~&izI;uK5 diff --git a/Binary/x64/WII/setting-usa.txt b/Binary/x64/WII/setting-usa.txt deleted file mode 100644 index 38ca5d91db29572af2a1da2b6ef913772d124209..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmdnJY|W%u(&sDc-Zo#VH(vPsx$W%c+-~=yeNXhhZ7SWhdf&;L_tr9>sj|NH?iIhor#zJW=e@9RS8C5M-3^dfggM=j(^3=i0BF|0`_fFTNku&*ywon$@JW K_QMB;!3_XWWI9d& diff --git a/Binary/x64/WII/shared2/sys/SYSCONF b/Binary/x64/WII/shared2/sys/SYSCONF deleted file mode 100644 index 346a9528b627cd6b7f40cae879f4663b7f4ded2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 zcmWG`E;C?|Vz6OZ&a#>163Z=?M=Y;dzKF7m3W-XK=89H{Hj7UZpC`Ube3STY@gw4A z#jlCq6MrrKO@cv!L(M5f&&AWvjU|DJfuT~8NzgAduOu}uC0`*Z%tzPRFGSbCkbxAy zNEK5^v2j%GXb3RKnMN+UF&YkoIRutDh3Eyl`UNvEFfhA$2Keatd3uX7q%h<&fI7{Cl4KX*oTu!y5ekN|s*1OtP?PJ<-| zJE7VKf(m9RXUJqIVW?tAWhi3EVMt`iV@RQ+LxLHS88R5k8B!TC8LH@LFU+c7hEj%1 zhGK?dhE$jkU1^B@RSb!AwH0AmFhdzQZbhUhtm1UQ4tdlnuZt``&>!T=gZb$0P|V`2dbkKz#?0?R+U<8kwdAj&8 zGBQ2~nc*7hJ}q!_pu fgcy_Y*R)EF2Tco@Wjol{c)+YFjI diff --git a/Binary/x64/WII/shared2/sys/readme.txt b/Binary/x64/WII/shared2/sys/readme.txt deleted file mode 100644 index aa2c366098..0000000000 --- a/Binary/x64/WII/shared2/sys/readme.txt +++ /dev/null @@ -1 +0,0 @@ -This SYSCONF file describes two registered Wiimotes with the Bluetooth address used by Dolphin. diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp index 46d5bad154..8df0fefda9 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp @@ -26,9 +26,9 @@ std::string HLE_IPC_BuildFilename(const char* _pFilename, int _size) char Buffer[128]; memcpy(Buffer, _pFilename, _size); - std::string Filename(WII_SYS_DIR); + std::string Filename(FULL_WII_USER_DIR); if (Buffer[1] == '0') - Filename += std::string("/title"); // this looks and feel like an hack... + Filename += std::string("title"); // this looks and feel like an hack... Filename += File::SanitizePath(Buffer); diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp index 1ccdd4ff87..c5de36e138 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp @@ -42,7 +42,7 @@ void CConfig::Load() LoadDefaults(); IniFile file; - file.Load("DSP.ini"); + file.Load(FULL_CONFIG_DIR "DSP.ini"); file.Get("Config", "EnableHLEAudio", &m_EnableHLEAudio, true); file.Get("Config", "EnableDTKMusic", &m_EnableDTKMusic, true); file.Get("Config", "Interpolation", &m_Interpolation, true); @@ -59,7 +59,7 @@ void CConfig::Load() void CConfig::Save() { IniFile file; - file.Load("DSP.ini"); + file.Load(FULL_CONFIG_DIR "DSP.ini"); file.Set("Config", "EnableHLEAudio", m_EnableHLEAudio); file.Set("Config", "EnableDTKMusic", m_EnableDTKMusic); file.Set("Config", "Interpolation", m_Interpolation); @@ -71,5 +71,5 @@ void CConfig::Save() file.Set("Config", "DumpSamplePath", m_szSamplePath); #endif file.Set("Config", "AntiGap", m_AntiGap); - file.Save("DSP.ini"); + file.Save(FULL_CONFIG_DIR "DSP.ini"); }