piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 17:49:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix the Audio tab and merge the DSP config into one.

Browse Source 
Unify the DSP settings into DSP.ini

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6955 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
sl1nk3.s
2011-01-29 04:16:05 +00:00
parent a2959b96c2
commit a8e2e9ec54
20 changed files with 299 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp
View File

@ -267,22 +267,3 @@ void DSPHLE::DSP_ClearAudioBuffer(bool mute)
if (soundStream)
soundStream->Clear(mute);
}
#define HLE_CONFIG_FILE "DSP.ini"
void DSPHLE_LoadConfig()
{
// first load defaults
IniFile file;
file.Load((std::string(File::GetUserPath(D_CONFIG_IDX)) + HLE_CONFIG_FILE).c_str());
ac_Config.Load(file);
}
void DSPHLE_SaveConfig()
{
IniFile file;
file.Load((std::string(File::GetUserPath(D_CONFIG_IDX)) + HLE_CONFIG_FILE).c_str());
ac_Config.Set(file);
file.Save((std::string(File::GetUserPath(D_CONFIG_IDX)) + HLE_CONFIG_FILE).c_str());
}

4
Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h
View File

@ -101,8 +101,4 @@ private:
bool m_bAssertInt;
};
// Hack to be deleted.
void DSPHLE_LoadConfig();
void DSPHLE_SaveConfig();
#endif // _DSPHLE_H

18
Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp
View File

@ -345,21 +345,3 @@ void DSPLLE::DSP_ClearAudioBuffer(bool mute)
if (soundStream)
soundStream->Clear(mute);
}
#define LLE_CONFIG_FILE "DSPLLE.ini"
void DSPLLE_LoadConfig()
{
// first load defaults
IniFile file;
file.Load((std::string(File::GetUserPath(D_CONFIG_IDX)) + LLE_CONFIG_FILE).c_str());
ac_Config.Load(file);
}
void DSPLLE_SaveConfig()
{
IniFile file;
file.Load((std::string(File::GetUserPath(D_CONFIG_IDX)) + LLE_CONFIG_FILE).c_str());
ac_Config.Set(file);
file.Save((std::string(File::GetUserPath(D_CONFIG_IDX)) + LLE_CONFIG_FILE).c_str());
}

4
Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h
View File

@ -69,8 +69,4 @@ private:
volatile u32 m_cycle_count;
};
// Hack to be deleted.
void DSPLLE_LoadConfig();
void DSPLLE_SaveConfig();
#endif // _DSPLLE_H

4
Source/Core/Core/Src/PluginDSP.cpp
View File

@ -22,14 +22,14 @@
PluginDSP *CreateDSPPlugin(bool HLE)
{
ac_Config.Load();
if (HLE)
{
DSPHLE_LoadConfig();
return new DSPHLE();
}
else
{
DSPLLE_LoadConfig();
return new DSPLLE();
}
}