valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Some more changes by Jochen

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3924
This commit is contained in:
Peter Veenstra 2015-07-09 06:25:46 +00:00
parent 79419f1f53
commit 0316809ac9
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gui/sdlmain.cpp
View file

@ -232,6 +232,7 @@ SDL_Surface* SDL_SetVideoMode_Wrap(int width,int height,int bpp,Bit32u flags){
// I don't see a difference, so disabled for now, as the code isn't finished either
#if SETMODE_SAVES_CLEAR
//TODO clear it.
#ifdef C_OPENGL
if ((flags & SDL_OPENGL)==0)
SDL_FillRect(sdl.surface,NULL,SDL_MapRGB(sdl.surface->format,0,0,0));
else {
@ -239,7 +240,10 @@ SDL_Surface* SDL_SetVideoMode_Wrap(int width,int height,int bpp,Bit32u flags){
glClear(GL_COLOR_BUFFER_BIT);
SDL_GL_SwapBuffers();
}
#endif
#else //C_OPENGL
SDL_FillRect(sdl.surface,NULL,SDL_MapRGB(sdl.surface->format,0,0,0));
#endif //C_OPENGL
#endif //SETMODE_SAVES_CLEAR
return sdl.surface;
}

7
src/hardware/mixer.cpp
View file

@ -410,11 +410,8 @@ static void MIXER_Mix_NoSound(void) {
mixer.tick_remain&=MIXER_REMAIN;
mixer.done=0;
}
#ifdef OS2
static void SDL_CALL MIXER_CallBack(void * userdata, Uint8 *stream, int len) {
#else
static void MIXER_CallBack(void * userdata, Uint8 *stream, int len) {
#endif
static void SDLCALL MIXER_CallBack(void * userdata, Uint8 *stream, int len) {
Bitu need=(Bitu)len/MIXER_SSIZE;
Bit16s * output=(Bit16s *)stream;
Bitu reduce;