mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-02 15:45:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some work on changing comments, log messages, and variable and function names to reflect that the plugins are not plugins anymore.

Browse source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7170 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2011-02-14 02:18:03 +00:00
commit 0ae8d33149
85 changed files with 12731 additions and 9818 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Source/Core/Core/Src/Core.cpp
View file

@ -274,7 +274,7 @@ void CpuThread()
}
// Initalize plugins and create emulation thread
// Initalize and create emulation thread
// Call browser: Init():g_EmuThread(). See the BootManager.cpp file description for a complete call schedule.
void EmuThread()
{
@ -367,7 +367,7 @@ void EmuThread()
{
// the spawned CPU Thread also does the graphics. the EmuThread is
// thus an idle thread, which sleep wait for the program to terminate.
// Without this extra thread, the video plugin window hangs in single
// Without this extra thread, the video backend window hangs in single
// core mode since noone is pumping messages.
cpuThread = std::thread(CpuThread);
@ -409,8 +409,8 @@ void EmuThread()
VolumeHandler::EjectVolume();
FileMon::Close();
// Stop audio thread - Actually this does nothing on HLE plugin.
// But stops the DSP Interpreter on LLE plugin.
// Stop audio thread - Actually this does nothing when using HLE emulation.
// But stops the DSP Interpreter when using LLE emulation.
DSP::GetDSPEmulator()->DSP_StopSoundStream();
// We must set up this flag before executing HW::Shutdown()
@ -426,8 +426,6 @@ void EmuThread()
Pad::Shutdown();
Wiimote::Shutdown();
INFO_LOG(CONSOLE, "%s", StopMessage(false, "Plugins shutdown").c_str());
INFO_LOG(CONSOLE, "%s", StopMessage(true, "Main thread stopped").c_str());
INFO_LOG(CONSOLE, "Stop [Main Thread]\t\t---- Shutdown complete ----");
@ -613,7 +611,7 @@ bool report_slow(int skipped)
return fps_slow;
}
// --- Callbacks for plugins / engine ---
// --- Callbacks for backends / engine ---
// Callback_VideoLog
// WARNING - THIS IS EXECUTED FROM VIDEO THREAD
@ -660,7 +658,7 @@ void Callback_DSPInterrupt()
}
// Callback_ISOName: Let the DSP plugin get the game name
// Callback_ISOName: Let the DSP emulator get the game name
//
const char *Callback_ISOName()
{

1
Source/Core/Core/Src/CoreRerecording.cpp
View file

@ -54,7 +54,6 @@ bool rerecording = false;
#include "PowerPC/PowerPC.h"
#include "PluginManager.h"
#include "ConfigManager.h"
#include "MemTools.h"

2
Source/Core/Core/Src/DSP/DSPCore.h
View file

@ -225,7 +225,7 @@ struct SDSP
// This is NOT the same cr as r.cr.
// This register is shared with the main emulation, see DSP.cpp
// The plugin has control over 0x0C07 of this reg.
// The engine has control over 0x0C07 of this reg.
// Bits are defined in a struct in DSP.cpp.
u16 cr;

6
Source/Core/Core/Src/DSPEmulator.h
View file

@ -15,8 +15,8 @@
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#ifndef _PLUGINDSP_H_
#define _PLUGINDSP_H_
#ifndef _DSPEMULATOR_H_
#define _DSPEMULATOR_H_
#include "ChunkFile.h"
@ -47,4 +47,4 @@ public:
DSPEmulator *CreateDSPEmulator(bool LLE);
#endif // _PLUGINDSP_H_
#endif // _DSPEMULATOR_H_

2
Source/Core/Core/Src/HW/AudioInterface.h
View file

@ -33,7 +33,7 @@ void DoState(PointerWrap &p);
void Update();
// Called by DSP plugin
// Called by DSP emulator
void Callback_GetSampleRate(unsigned int &_AISampleRate, unsigned int &_DACSampleRate);
unsigned int Callback_GetStreaming(short* _pDestBuffer, unsigned int _numSamples, unsigned int _sampleRate = 48000);

2
Source/Core/Core/Src/HW/DSP.cpp
View file

@ -412,7 +412,7 @@ void Write16(const u16 _Value, const u32 _Address)
// Not really sure if this is correct, but it works...
// Kind of a hack because DSP_CONTROL_MASK should make this bit
// only viewable to dsp plugin
// only viewable to dsp emulator
if (_Value & 1 /*DSPReset*/)
{
g_audioDMA.AudioDMAControl.Hex = 0;

2
Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp
View file

@ -196,7 +196,7 @@ u16 DSPHLE::DSP_WriteControlRegister(unsigned short _Value)
AudioInterface::Callback_GetSampleRate(AISampleRate, DACSampleRate);
soundStream = AudioCommon::InitSoundStream(
new HLEMixer(this, AISampleRate, DACSampleRate, ac_Config.sFrequency), m_hWnd);
new HLEMixer(this, AISampleRate, DACSampleRate, ac_Config.iFrequency), m_hWnd);
if(!soundStream) PanicAlert("Error starting up sound stream");
// Mixer is initialized
m_InitMixer = true;

4
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp
View file

@ -94,12 +94,12 @@ IUCode* UCodeFactory(u32 _CRC, DSPHLE *dsp_hle, bool bWii)
default:
if (bWii)
{
PanicAlert("DSPHLE: Unknown ucode (CRC = %08x) - forcing AXWii.\n\nTry LLE plugin if this is homebrew.", _CRC);
PanicAlert("DSPHLE: Unknown ucode (CRC = %08x) - forcing AXWii.\n\nTry LLE emulator if this is homebrew.", _CRC);
return new CUCode_AXWii(dsp_hle, _CRC);
}
else
{
PanicAlert("DSPHLE: Unknown ucode (CRC = %08x) - forcing AX.\n\nTry LLE plugin if this is homebrew.", _CRC);
PanicAlert("DSPHLE: Unknown ucode (CRC = %08x) - forcing AX.\n\nTry LLE emulator if this is homebrew.", _CRC);
return new CUCode_AX(dsp_hle);
}
}

2
Source/Core/Core/Src/HW/VideoInterface.cpp
View file

@ -413,7 +413,7 @@ void Write16(const u16 _iValue, const u32 _iAddress)
{
DEBUG_LOG(VIDEOINTERFACE, "(w16): 0x%04x, 0x%08x",_iValue,_iAddress);
//Somewhere it sets screen width.. we need to communicate this to the gfx plugin...
//Somewhere it sets screen width.. we need to communicate this to the gfx backend...
switch (_iAddress & 0xFFF)
{

4
Source/Core/Core/Src/OnFrame.cpp
View file

@ -477,8 +477,8 @@ void SaveRecording(const char *filename)
// TODO
header.uniqueID = 0;
// header.author;
// header.videoPlugin;
// header.audioPlugin;
// header.videoBackend;
// header.audioEmulator;
fwrite(&header, sizeof(DTMHeader), 1, g_recordfd);
}

6
Source/Core/Core/Src/OnFrame.h
View file

@ -81,9 +81,9 @@ struct DTMHeader {
u32 numRerecords; // Number of rerecords/'cuts' of this TAS
u8 author[32]; // Author's name (encoded in UTF-8)
u8 videoPlugin[16]; // UTF-8 representation of the video plugin
u8 audioPlugin[16]; // UTF-8 representation of the audio plugin
u8 padPlugin[16]; // UTF-8 representation of the input plugin
u8 videoBackend[16]; // UTF-8 representation of the video backend
u8 audioEmulator[16]; // UTF-8 representation of the audio emulator
u8 padBackend[16]; // UTF-8 representation of the input backend
u8 padding[7]; // Padding to align the header to 1024 bits

2
Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp
View file

@ -353,7 +353,7 @@ void Interpreter::dcba(UGeckoInstruction _inst)
void Interpreter::dcbf(UGeckoInstruction _inst)
{
//This should tell GFX plugin to throw out any cached data here
//This should tell GFX backend to throw out any cached data here
// !!! SPEEDUP HACK for OSProtectRange !!!
/* u32 tmp1 = Memory::Read_U32(PC+4);
u32 tmp2 = Memory::Read_U32(PC+8);

2
Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
View file

@ -93,7 +93,7 @@ using namespace PowerPC;
// Seldom-happening events is handled by adding a decrement of a counter to all blr instructions (which are
// expensive anyway since we need to return to dispatcher, except when they can be predicted).
// TODO: SERIOUS synchronization problem with the video plugin setting tokens and breakpoints in dual core mode!!!
// TODO: SERIOUS synchronization problem with the video backend setting tokens and breakpoints in dual core mode!!!
// Somewhat fixed by disabling idle skipping when certain interrupts are enabled
// This is no permanent reliable fix
// TODO: Zeldas go whacko when you hang the gfx thread

2
Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp
View file

@ -88,7 +88,7 @@ using namespace PowerPC;
// Seldom-happening events is handled by adding a decrement of a counter to all blr instructions (which are
// expensive anyway since we need to return to dispatcher, except when they can be predicted).
// TODO: SERIOUS synchronization problem with the video plugin setting tokens and breakpoints in dual core mode!!!
// TODO: SERIOUS synchronization problem with the video backend setting tokens and breakpoints in dual core mode!!!
// Somewhat fixed by disabling idle skipping when certain interrupts are enabled
// This is no permanent reliable fix
// TODO: Zeldas go whacko when you hang the gfx thread

2
Source/Core/Core/Src/State.cpp
View file

@ -87,7 +87,7 @@ void DoState(PointerWrap &p)
p.SetMode(PointerWrap::MODE_MEASURE);
return;
}
// Begin with video plugin, so that it gets a chance to clear it's caches and writeback modified things to RAM
// Begin with video backend, so that it gets a chance to clear it's caches and writeback modified things to RAM
// Pause the video thread in multi-threaded mode
g_video_backend->RunLoop(false);
g_video_backend->DoState(p);