piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

DSP plugin merge - the two DSP plugins are now gone and all the code has been merged into Dolphin.

Browse Source 
This WILL temporarily break the Linux and MacOSX builds but should be easy to fix.

Things left to do:
  * The UI on the new Audio tab for the LLE/HLE choice is ugly
  * At times the code still look "plugin-y" and needs cleanup
  * The two plugins should be merged further. DSPHLE should use the emulated memory etc of DSPLLE as much as possible, so that simply saving the DSPLLE state is enough. This would also bring the possibility of savestate compatibility between the two plugins.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6947 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2011-01-28 18:39:30 +00:00
parent 976420b9d5
commit 419d6a244b
116 changed files with 1271 additions and 3914 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Plugins/Plugin_VideoSoftware/Src/VideoConfig.cpp
View File

@ -19,9 +19,9 @@
#include "IniFile.h"
#include "VideoConfig.h"
VideoConfig g_Config;
SWVideoConfig g_Config;
VideoConfig::VideoConfig()
SWVideoConfig::SWVideoConfig()
{
bFullscreen = false;
bHideCursor = false;
@ -42,7 +42,7 @@ VideoConfig::VideoConfig()
drawEnd = 100000;
}
void VideoConfig::Load(const char* ini_file)
void SWVideoConfig::Load(const char* ini_file)
{
std::string temp;
IniFile iniFile;
@ -65,7 +65,7 @@ void VideoConfig::Load(const char* ini_file)
iniFile.Get("Misc", "DrawEnd", &drawEnd, 100000);
}
void VideoConfig::Save(const char* ini_file)
void SWVideoConfig::Save(const char* ini_file)
{
IniFile iniFile;
iniFile.Load(ini_file);

6
Source/Plugins/Plugin_VideoSoftware/Src/VideoConfig.h
View File

@ -23,9 +23,9 @@
#define STATISTICS 1
// NEVER inherit from this class.
struct VideoConfig : NonCopyable
struct SWVideoConfig : NonCopyable
{
VideoConfig();
SWVideoConfig();
void Load(const char* ini_file);
void Save(const char* ini_file);
@ -50,6 +50,6 @@ struct VideoConfig : NonCopyable
u32 drawEnd;
};
extern VideoConfig g_Config;
extern SWVideoConfig g_Config;
#endif // _PLUGIN_VIDEOSOFTWARE_CONFIG_H_

2
Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.h
View File

@ -76,7 +76,7 @@ protected:
void Event_ClickClose(wxCommandEvent&);
void Event_Close(wxCloseEvent&);
VideoConfig& vconfig;
SWVideoConfig& vconfig;
std::string ininame;
};