From 5adcf0b30c9bfe98fc3fe3a6522f52efe8938dcd Mon Sep 17 00:00:00 2001 From: DJRobX Date: Tue, 6 Nov 2007 10:53:19 +0000 Subject: [PATCH] fix menubar in DirectDraw triple buffer mode clean up old #define in sound.cpp --- trunk/src/Sound.cpp | 9 +-------- trunk/src/win32/DirectDraw.cpp | 6 +----- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/trunk/src/Sound.cpp b/trunk/src/Sound.cpp index 70e2b796..ec623c8a 100644 --- a/trunk/src/Sound.cpp +++ b/trunk/src/Sound.cpp @@ -387,22 +387,15 @@ inline void interp_push(int ch, int sample) interp[ch]->push(sample); } -#ifdef ENHANCED_RATE -inline int interp_pop(int ch, double rate) -{ - return interp[ch]->pop(rate); -#else inline int interp_pop(int ch) { return interp[ch]->pop(); -#endif } - // *** End snd_interp code static void soundEventGB(u32 address, u8 data) - { +{ if ( apu ) { int divisor = 4 * soundQuality; diff --git a/trunk/src/win32/DirectDraw.cpp b/trunk/src/win32/DirectDraw.cpp index 21df50e8..67d4f48e 100644 --- a/trunk/src/win32/DirectDraw.cpp +++ b/trunk/src/win32/DirectDraw.cpp @@ -837,11 +837,7 @@ void DirectDrawDisplay::render() pDirectDraw->FlipToGDISurface(); ddsPrimary->SetClipper(ddsClipper); hret = ddsPrimary->Blt(&theApp.dest, ddsFlip, NULL, DDBLT_ASYNC, NULL); - // if using emulation only, then we have to redraw the menu - // everytime. It seems like a bug in DirectDraw to me as we not - // overwritting the menu area at all. - if(theApp.ddrawUsingEmulationOnly) - theApp.m_pMainWnd->DrawMenuBar(); + theApp.m_pMainWnd->DrawMenuBar(); } else hret = ddsPrimary->Flip(NULL, 0); }