mute frame advance option works once again
This commit is contained in:
parent
201261c142
commit
ef228133f6
23
src/fceu.cpp
23
src/fceu.cpp
|
@ -47,6 +47,11 @@
|
|||
#include "file.h"
|
||||
#include "vsuni.h"
|
||||
|
||||
//TODO - we really need some kind of global platform-specific options api
|
||||
#ifdef WIN32
|
||||
#include "drivers/win/main.h"
|
||||
#endif
|
||||
|
||||
|
||||
uint64 timestampbase;
|
||||
|
||||
|
@ -524,9 +529,9 @@ void FCEUI_Emulate(uint8 **pXBuf, int32 **SoundBuf, int32 *SoundBufSize, int ski
|
|||
|
||||
ssize=FlushEmulateSound();
|
||||
|
||||
//#ifdef WIN32
|
||||
// FCEUI_AviVideoUpdate(XBuf);
|
||||
//#endif
|
||||
//#ifdef WIN32
|
||||
// FCEUI_AviVideoUpdate(XBuf);
|
||||
//#endif
|
||||
|
||||
timestampbase += timestamp;
|
||||
timestamp = 0;
|
||||
|
@ -541,13 +546,13 @@ void FCEUI_Emulate(uint8 **pXBuf, int32 **SoundBuf, int32 *SoundBufSize, int ski
|
|||
if(EmulationPaused&2)
|
||||
{
|
||||
EmulationPaused = 1; // restore paused flag
|
||||
//mbg merge 7/28/06 don't like the looks of this...
|
||||
//#ifdef WIN32
|
||||
// #define SO_MUTEFA 16
|
||||
// extern int soundoptions;
|
||||
// if(soundoptions&SO_MUTEFA)
|
||||
//#endif
|
||||
|
||||
//mute the frame advance if the user requested it
|
||||
#ifdef WIN32
|
||||
if(soundoptions&SO_MUTEFA)
|
||||
*SoundBufSize=0; // keep sound muted
|
||||
#endif
|
||||
|
||||
JustFrameAdvanced = true;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -13,12 +13,10 @@ Global
|
|||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{6893EF44-FEA3-46DF-B236-C4C200F54294}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{6893EF44-FEA3-46DF-B236-C4C200F54294}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{6893EF44-FEA3-46DF-B236-C4C200F54294}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{6893EF44-FEA3-46DF-B236-C4C200F54294}.Debug|x64.Build.0 = Debug|x64
|
||||
{6893EF44-FEA3-46DF-B236-C4C200F54294}.Debug|x64.ActiveCfg = Debug|Win32
|
||||
{6893EF44-FEA3-46DF-B236-C4C200F54294}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{6893EF44-FEA3-46DF-B236-C4C200F54294}.Release|Win32.Build.0 = Release|Win32
|
||||
{6893EF44-FEA3-46DF-B236-C4C200F54294}.Release|x64.ActiveCfg = Release|x64
|
||||
{6893EF44-FEA3-46DF-B236-C4C200F54294}.Release|x64.Build.0 = Release|x64
|
||||
{6893EF44-FEA3-46DF-B236-C4C200F54294}.Release|x64.ActiveCfg = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
Loading…
Reference in New Issue