mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-31 23:42:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Several little things.

Browse source 
The C version of the GenericLog was being used in both C and C++ branches of the code.
Parent panic alerts by the main_frame so that those windows get the icon too.
Fix a couple of compiler warnings.
Added some checks for libraries in the cmake build.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6385 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-11-12 05:05:27 +00:00
parent 7800d68fee
commit c0bdf4de81
7 changed files with 34 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/AudioCommon/Src/Mixer.cpp
View file

@ -74,12 +74,12 @@ unsigned int CMixer::Mix(short* samples, unsigned int numSamples)
s16 l1 = Common::swap16(m_buffer[m_indexR & INDEX_MASK]); //current
s16 l2 = Common::swap16(m_buffer[m_indexR2 & INDEX_MASK]); //next
int sampleL = (l1 << 16) + (l2 - l1) * (u16)frac >> 16;
int sampleL = ((l1 << 16) + (l2 - l1) * (u16)frac) >> 16;
samples[i] = sampleL;
s16 r1 = Common::swap16(m_buffer[(m_indexR + 1) & INDEX_MASK]); //current
s16 r2 = Common::swap16(m_buffer[(m_indexR2 + 1) & INDEX_MASK]); //next
int sampleR = (r1 << 16) + (r2 - r1) * (u16)frac >> 16;
int sampleR = ((r1 << 16) + (r2 - r1) * (u16)frac) >> 16;
samples[i+1] = sampleR;
frac += ratio;

2
Source/Core/Common/Src/Log.h
View file

@ -95,7 +95,9 @@ extern "C" {
#endif
void GenericLogC(int level, int type,
const char *file, int line, const char *fmt, ...);
#ifndef __cplusplus
#define GenericLog GenericLogC
#endif
#ifdef __cplusplus
};
#endif

4
Source/Core/Core/Src/HW/AudioInterface.cpp
View file

@ -335,8 +335,8 @@ unsigned int Callback_GetStreaming(short* _pDestBuffer, unsigned int _numSamples
r2 = pcm[pos * 2 + 1]; //next
}
pcm_l = (l1 << 16) + (l2 - l1) * (u16)frac >> 16;
pcm_r = (l1 << 16) + (l2 - l1) * (u16)frac >> 16;
pcm_l = ((l1 << 16) + (l2 - l1) * (u16)frac) >> 16;
pcm_r = ((l1 << 16) + (l2 - l1) * (u16)frac) >> 16;
pcm_l = (pcm_l * lvolume >> 8) + (int)(*_pDestBuffer);

2
Source/Core/DolphinWX/Src/Frame.cpp
View file

@ -658,7 +658,7 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
#ifdef __WXGTK__
case IDM_PANIC:
bPanicResult = (wxYES == wxMessageBox(event.GetString(),
wxT("Warning"), event.GetInt() ? wxYES_NO : wxOK));
wxT("Warning"), event.GetInt() ? wxYES_NO : wxOK), this);
panic_event.Set();
break;
#endif

2
Source/Core/DolphinWX/Src/Main.cpp
View file

@ -457,7 +457,7 @@ bool wxMsgAlert(const char* caption, const char* text, bool yes_no, int /*Style*
#endif
return wxYES == wxMessageBox(wxString::FromAscii(text),
wxString::FromAscii(caption),
(yes_no) ? wxYES_NO : wxOK);
(yes_no) ? wxYES_NO : wxOK, main_frame);
#ifdef __WXGTK__
else
{