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

Linux: Tons of warning cleanup plus workaround a nasty crash problem in StatusBarMessage.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4234 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2009-09-08 21:16:05 +00:00
parent e3d505c631
commit 0a576c7508
29 changed files with 107 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
Source/Plugins/Plugin_DSP_LLE/Src/Logging/Logging.cpp
View File

@ -31,68 +31,65 @@
// Externals
extern u32 m_addressPBs;
float ratioFactor;
int globaliSize;
short globalpBuffer;
u32 gLastBlock;
static float ratioFactor;
static u32 gLastBlock;
// Vectors and other things
std::vector<u32> gloopPos(64);
std::vector<u32> gsampleEnd(64);
std::vector<u32> gsamplePos(64);
std::vector<u32> gratio(64);
std::vector<u32> gratiohi(64);
std::vector<u32> gratiolo(64);
std::vector<u32> gfrac(64);
std::vector<u32> gcoef(64);
static std::vector<u32> gloopPos(64);
static std::vector<u32> gsampleEnd(64);
static std::vector<u32> gsamplePos(64);
static std::vector<u32> gratio(64);
static std::vector<u32> gratiohi(64);
static std::vector<u32> gratiolo(64);
static std::vector<u32> gfrac(64);
static std::vector<u32> gcoef(64);
// PBSampleRateConverter mixer
std::vector<u16> gvolume_left(64);
std::vector<u16> gvolume_right(64);
std::vector<u16> gmixer_control(64);
std::vector<u16> gcur_volume(64);
std::vector<u16> gcur_volume_delta(64);
static std::vector<u16> gvolume_left(64);
static std::vector<u16> gvolume_right(64);
static std::vector<u16> gmixer_control(64);
static std::vector<u16> gcur_volume(64);
static std::vector<u16> gcur_volume_delta(64);
std::vector<u16> gaudioFormat(64);
std::vector<u16> glooping(64);
std::vector<u16> gsrc_type(64);
std::vector<u16> gis_stream(64);
static std::vector<u16> gaudioFormat(64);
static std::vector<u16> glooping(64);
static std::vector<u16> gsrc_type(64);
static std::vector<u16> gis_stream(64);
// loop
std::vector<u16> gloop1(64);
std::vector<u16> gloop2(64);
std::vector<u16> gloop3(64);
std::vector<u16> gadloop1(64);
std::vector<u16> gadloop2(64);
std::vector<u16> gadloop3(64);
static std::vector<u16> gloop1(64);
static std::vector<u16> gloop2(64);
static std::vector<u16> gloop3(64);
static std::vector<u16> gadloop1(64);
static std::vector<u16> gadloop2(64);
static std::vector<u16> gadloop3(64);
// updates
std::vector<u16> gupdates1(64);
std::vector<u16> gupdates2(64);
std::vector<u16> gupdates3(64);
std::vector<u16> gupdates4(64);
std::vector<u16> gupdates5(64);
std::vector<u32> gupdates_addr(64);
static std::vector<u16> gupdates1(64);
static std::vector<u16> gupdates2(64);
static std::vector<u16> gupdates3(64);
static std::vector<u16> gupdates4(64);
static std::vector<u16> gupdates5(64);
static std::vector<u32> gupdates_addr(64);
// Other things
std::vector<u16> Jump(64); // this is 1 or 0
std::vector<int> musicLength(64);
std::vector< std::vector<int> > vector1(64, std::vector<int>(100,0));
std::vector<int> numberRunning(64);
static std::vector<u16> Jump(64); // this is 1 or 0
static std::vector<int> musicLength(64);
static std::vector< std::vector<int> > vector1(64, std::vector<int>(100,0));
static std::vector<int> numberRunning(64);
int j = 0;
int k = 0;
s64 l = 0;
int iupd = 0;
bool iupdonce = false;
std::vector<u16> viupd(15); // the length of the update frequency bar
int vectorLength = 15; // the length of the playback history bar and how long
static int j = 0;
static int k = 0;
static s64 l = 0;
static bool iupdonce = false;
static std::vector<u16> viupd(15); // the length of the update frequency bar
static int vectorLength = 15; // the length of the playback history bar and how long
// old blocks are shown
std::vector<u16> vector62(vectorLength);
std::vector<u16> vector63(vectorLength);
static std::vector<u16> vector62(vectorLength);
static std::vector<u16> vector63(vectorLength);
int ReadOutPBs(AXParamBlock * _pPBs, int _num);

2
Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
View File

@ -127,7 +127,7 @@ FRAGMENTSHADER &GetOrCreateEncodingShader(u32 format)
if (!PixelShaderCache::CompilePixelShader(s_encodingPrograms[format], shader)) {
const char* error = cgGetLastListing(g_cgcontext);
ERROR_LOG(VIDEO, "Failed to create encoding fragment program");
ERROR_LOG(VIDEO, "Failed to create encoding fragment program:\n%s", error);
}
}

1
Source/Plugins/Plugin_Wiimote/Src/EmuDefinitions.h
View File

@ -194,6 +194,7 @@ struct SDot
int Size; // Size of the IR dot (0-15)
int Order; // Increasing order from low to higher x-axis values
};
struct SIR
{
SDot Dot[4];

5
Source/Plugins/Plugin_Wiimote/Src/EmuDynamics.cpp
View File

@ -276,7 +276,7 @@ void IRData2Dots(u8 *Data)
void ReorderIRDots()
{
// Create a shortcut
struct SDot* Dot = g_Wiimote_kbd.IR.Dot;
SDot* Dot = g_Wiimote_kbd.IR.Dot;
// Variables
int i, j, order;
@ -285,6 +285,7 @@ void ReorderIRDots()
for (i = 0; i < 4; ++i)
Dot[i].Order = 0;
// is this just a weird filter+sort?
for (order = 1; order < 5; ++order)
{
i = 0;
@ -353,4 +354,4 @@ std::string CCData2Values(u8 *Data)
(Data[2] & 0x1f));
}
} // WiiMoteEmu
} // WiiMoteEmu

2
Source/Plugins/Plugin_Wiimote/Src/wiimote_real.cpp
View File

@ -212,10 +212,10 @@ private:
u16 m_channelID;
CEventQueue m_EventReadQueue; // Read from Wiimote
CEventQueue m_EventWriteQueue; // Write to Wiimote
Common::CriticalSection* m_pCriticalSection;
bool m_LastReportValid;
SEvent m_LastReport;
wiimote_t* m_pWiiMote; // This is g_WiiMotesFromWiiUse[]
Common::CriticalSection* m_pCriticalSection;
// Send queued data to the core
void SendEvent(SEvent& _rEvent)