mirror of
https://github.com/AppleWin/AppleWin.git
synced 2024-06-01 14:41:33 +00:00
Wrap all instances of Speech API in USE_SPEECH_API
This commit is contained in:
tomch
parent
a10750b7bd
commit
2143d063c9
|
|
@ -48,6 +48,7 @@
|
|||
AdditionalOptions="/Zm200 "
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="2"
|
||||
AdditionalIncludeDirectories=""D:\Apple][\AppleWin\svn\trunk\AppleWin\source";"D:\Apple][\AppleWin\svn\trunk\AppleWin\zlib";"D:\Apple][\AppleWin\svn\trunk\AppleWin\zip_lib";"D:\Apple][\AppleWin\svn\trunk\AppleWin\source\Debugger""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAS_M6803"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="0"
|
||||
|
|
@ -143,6 +144,7 @@
|
|||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/Zm200 "
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""D:\Apple][\AppleWin\svn\trunk\AppleWin\source";"D:\Apple][\AppleWin\svn\trunk\AppleWin\zlib";"D:\Apple][\AppleWin\svn\trunk\AppleWin\zip_lib";"D:\Apple][\AppleWin\svn\trunk\AppleWin\source\Debugger""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAS_M6803"
|
||||
RuntimeLibrary="1"
|
||||
EnableFunctionLevelLinking="true"
|
||||
|
|
@ -261,6 +263,14 @@
|
|||
RelativePath=".\source\DiskImage.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\DiskImageHelper.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\DiskImageHelper.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\Frame.cpp"
|
||||
>
|
||||
|
|
@ -325,6 +335,14 @@
|
|||
RelativePath=".\source\MouseInterface.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\NoSlotClock.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\NoSlotClock.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\ParallelPrinter.cpp"
|
||||
>
|
||||
|
|
@ -389,6 +407,14 @@
|
|||
RelativePath=".\source\Speaker.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\Speech.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\Speech.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\Tape.cpp"
|
||||
>
|
||||
|
|
@ -425,79 +451,79 @@
|
|||
Name="Debugger"
|
||||
>
|
||||
<File
|
||||
RelativePath=".\source\Debug.cpp"
|
||||
RelativePath=".\source\Debugger\Debug.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\Debug.h"
|
||||
RelativePath=".\source\Debugger\Debug.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\Debugger_Assembler.cpp"
|
||||
RelativePath=".\source\Debugger\Debugger_Assembler.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\Debugger_Assembler.h"
|
||||
RelativePath=".\source\Debugger\Debugger_Assembler.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\Debugger_Console.cpp"
|
||||
RelativePath=".\source\Debugger\Debugger_Console.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\Debugger_Console.h"
|
||||
RelativePath=".\source\Debugger\Debugger_Console.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\Debugger_DisassemblerData.cpp"
|
||||
RelativePath=".\source\Debugger\Debugger_DisassemblerData.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\Debugger_DisassemblerData.h"
|
||||
RelativePath=".\source\Debugger\Debugger_DisassemblerData.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\Debugger_Display.cpp"
|
||||
RelativePath=".\source\Debugger\Debugger_Display.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\Debugger_Display.h"
|
||||
RelativePath=".\source\Debugger\Debugger_Display.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\Debugger_Help.cpp"
|
||||
RelativePath=".\source\Debugger\Debugger_Help.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\Debugger_Help.h"
|
||||
RelativePath=".\source\Debugger\Debugger_Help.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\Debugger_Parser.cpp"
|
||||
RelativePath=".\source\Debugger\Debugger_Parser.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\Debugger_Parser.h"
|
||||
RelativePath=".\source\Debugger\Debugger_Parser.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\Debugger_Range.cpp"
|
||||
RelativePath=".\source\Debugger\Debugger_Range.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\Debugger_Range.h"
|
||||
RelativePath=".\source\Debugger\Debugger_Range.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\Debugger_Symbols.cpp"
|
||||
RelativePath=".\source\Debugger\Debugger_Symbols.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\Debugger_Symbols.h"
|
||||
RelativePath=".\source\Debugger\Debugger_Symbols.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\Debugger_Types.h"
|
||||
RelativePath=".\source\Debugger\Debugger_Types.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
|
|
@ -613,6 +639,150 @@
|
|||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="ZLib"
|
||||
>
|
||||
<File
|
||||
RelativePath=".\zlib\adler32.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zlib\compress.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zlib\crc32.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zlib\crc32.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zlib\deflate.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zlib\deflate.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zlib\gzio.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zlib\infback.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zlib\inffast.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zlib\inffast.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zlib\inffixed.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zlib\inflate.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zlib\inflate.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zlib\inftrees.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zlib\inftrees.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zlib\trees.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zlib\trees.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zlib\uncompr.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zlib\zconf.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zlib\zconf.in.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zlib\zlib.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zlib\zutil.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zlib\zutil.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Zip_lib"
|
||||
>
|
||||
<File
|
||||
RelativePath=".\zip_lib\crypt.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zip_lib\ioapi.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zip_lib\ioapi.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zip_lib\iowin32.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zip_lib\iowin32.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zip_lib\mztools.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zip_lib\mztools.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zip_lib\unzip.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zip_lib\unzip.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zip_lib\zip.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\zip_lib\zip.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Docs"
|
||||
|
|
|
|||
|
|
@ -95,7 +95,9 @@ HANDLE g_hCustomRomF8 = INVALID_HANDLE_VALUE; // Cmd-line specified custom ROM
|
|||
static bool g_bCustomRomF8Failed = false; // Set if custom ROM file failed
|
||||
|
||||
static bool g_bEnableSpeech = false;
|
||||
#ifdef USE_SPEECH_API
|
||||
CSpeech g_Speech;
|
||||
#endif
|
||||
|
||||
//===========================================================================
|
||||
|
||||
|
|
@ -169,7 +171,9 @@ void ContinueExecution()
|
|||
// Don't call Spkr_Mute() - will get speaker clicks
|
||||
MB_Mute();
|
||||
SysClk_StopTimer();
|
||||
#ifdef USE_SPEECH_API
|
||||
g_Speech.Reset(); // TODO: Put this on a timer (in emulated cycles)... otherwise CATALOG cuts out
|
||||
#endif
|
||||
|
||||
g_nCpuCyclesFeedback = 0; // For the case when this is a big -ve number
|
||||
|
||||
|
|
@ -921,6 +925,7 @@ int APIENTRY WinMain (HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
|
|||
// Initialize COM - so we can use CoCreateInstance
|
||||
// . NB. DSInit() & DIMouse::DirectInputInit are done when g_hFrameWindow is created (WM_CREATE)
|
||||
CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
|
||||
// CoInitialize(NULL);
|
||||
bool bSysClkOK = SysClk_InitTimer();
|
||||
#ifdef USE_SPEECH_API
|
||||
if (g_bEnableSpeech)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
#include "StdAfx.h"
|
||||
|
||||
#ifdef USE_SPEECH_API
|
||||
#include <sapi.h>
|
||||
#include "Speech.h"
|
||||
|
||||
|
|
@ -53,3 +55,5 @@ void CSpeech::Speak(const char* const pBuffer)
|
|||
|
||||
delete [] pszWTextString;
|
||||
}
|
||||
|
||||
#endif // USE_SPEECH_API
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user