[Amis-vcs] SF.net SVN: amis: [2218] branches/amis3
Brought to you by:
julienq,
marisademeglio
From: <dan...@us...> - 2007-10-19 06:00:02
|
Revision: 2218 http://amis.svn.sourceforge.net/amis/?rev=2218&view=rev Author: daniel_weck Date: 2007-10-18 23:00:03 -0700 (Thu, 18 Oct 2007) Log Message: ----------- - Daniel WECK * Attempt to compile+link Amis3 in Release mode...no success so far. Modified Paths: -------------- branches/amis3/AmisAudio/AmisAudio.cpp branches/amis3/AmisAudio/AmisAudio.vcproj branches/amis3/AmisCore/AmisCore.vcproj branches/amis3/AmisGuiMFC2/AmisGuiMFC2.vcproj branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AccessibleUIDataReader.cpp branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AccessibleUiDataReader.h branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AudioPrompt.h branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AudioPromptReader.cpp branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AudioPromptReader.h branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/Switch.cpp branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AudioSequence.h branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AudioSequenceComponent.h branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AudioSequencePlayer.cpp branches/amis3/AmisGuiMFC2/AmisSelfVoicing/PreTranslateMessageHandler.h branches/amis3/AmisGuiMFC2/AmisSelfVoicing/TTSPlayer.cpp branches/amis3/AmisGuiMFC2/AmisSelfVoicing/TTSPlayer.h branches/amis3/AmisGuiMFC2/AmisSelfVoicing/UiMediaTypes.h branches/amis3/AmisGuiMFC2/include/gui/AmisGuiMFC2.h branches/amis3/AmisGuiMFC2/src/DtbWithHooks.cpp branches/amis3/AmisGuiMFC2/src/gui/AmisGuiMFC2.cpp branches/amis3/AmisGuiMFC2/src/gui/dialogs/GoToPageDialog.cpp branches/amis3/VC7/amis.sln Modified: branches/amis3/AmisAudio/AmisAudio.cpp =================================================================== --- branches/amis3/AmisAudio/AmisAudio.cpp 2007-10-19 01:24:52 UTC (rev 2217) +++ branches/amis3/AmisAudio/AmisAudio.cpp 2007-10-19 06:00:03 UTC (rev 2218) @@ -54,6 +54,10 @@ */ +namespace amis +{ +namespace audio +{ AmisAudio* AmisAudio::pinstance = 0; AmisAudio* AmisAudio::Instance() @@ -630,3 +634,4 @@ return mbAudioPlaybackEnabled; } +}} \ No newline at end of file Modified: branches/amis3/AmisAudio/AmisAudio.vcproj =================================================================== --- branches/amis3/AmisAudio/AmisAudio.vcproj 2007-10-19 01:24:52 UTC (rev 2217) +++ branches/amis3/AmisAudio/AmisAudio.vcproj 2007-10-19 06:00:03 UTC (rev 2218) @@ -43,7 +43,7 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/FORCE:MULTIPLE" - AdditionalDependencies="Strmiids.lib TransformSample.lib stlib.lib kernel32.lib gdi32.lib user32.lib ../lib/AmisCoreD.lib" + AdditionalDependencies="Strmiids.lib TransformSample.lib stlib.lib kernel32.lib gdi32.lib user32.lib AmisCoreD.lib" ShowProgress="2" OutputFile="../bin/AmisAudioD.dll" LinkIncremental="1" @@ -85,20 +85,20 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\../bin" - IntermediateDirectory=".\tmp" - ConfigurationType="2" - UseOfMFC="2" + OutputDirectory="../lib" + IntermediateDirectory="Release" + ConfigurationType="4" + UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="1"> <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories=""../3rdPartyAudio"; "../mffmTimeCode"" + AdditionalIncludeDirectories=""../AmisGuiMFC2/include/";"../AmisCore/include/"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;AMISAUDIO_EXPORTS" StringPooling="TRUE" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" PrecompiledHeaderThrough="stdafx.h" @@ -108,20 +108,11 @@ ProgramDataBaseFileName=".\tmp/" WarningLevel="3" SuppressStartupBanner="TRUE" - CompileAs="0"/> + CompileAs="2"/> <Tool Name="VCCustomBuildTool"/> <Tool - Name="VCLinkerTool" - AdditionalDependencies="Strmiids.lib stlib.lib kernel32.lib gdi32.lib user32.lib AmisCommon.lib" - OutputFile=".\../bin/AmisAudio.dll" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="../lib" - IgnoreDefaultLibraryNames="libc.lib" - ProgramDatabaseFile="./tmp/AmisAudio.pdb" - ImportLibrary="../lib/AmisAudio.lib" - TargetMachine="1"/> + Name="VCLibrarianTool"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="NDEBUG" @@ -145,8 +136,6 @@ <Tool Name="VCXMLDataGeneratorTool"/> <Tool - Name="VCWebDeploymentTool"/> - <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> Modified: branches/amis3/AmisCore/AmisCore.vcproj =================================================================== --- branches/amis3/AmisCore/AmisCore.vcproj 2007-10-19 01:24:52 UTC (rev 2217) +++ branches/amis3/AmisCore/AmisCore.vcproj 2007-10-19 06:00:03 UTC (rev 2218) @@ -66,10 +66,11 @@ AdditionalIncludeDirectories="./include; ../../../../xerces-c-src/src;../../../../ambulant/include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" RuntimeLibrary="0" + EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3"/> + Detect64BitPortabilityProblems="FALSE" + DebugInformationFormat="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Modified: branches/amis3/AmisGuiMFC2/AmisGuiMFC2.vcproj =================================================================== --- branches/amis3/AmisGuiMFC2/AmisGuiMFC2.vcproj 2007-10-19 01:24:52 UTC (rev 2217) +++ branches/amis3/AmisGuiMFC2/AmisGuiMFC2.vcproj 2007-10-19 06:00:03 UTC (rev 2218) @@ -20,7 +20,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="include;../../../../ambulant/include/;"../../../../ambulant-private/pdtbplugin";"../../../../ambulant-private/pdtbplugin/PdtbIePlugin";../AmisCore/include;"../../../../xerces-c-src/src";../3rdPartyAudio;../mffmTimeCode;"$(VSInstallDir)\..\Microsoft Speech SDK 5.1\Include"" + AdditionalIncludeDirectories="include;../../../../ambulant/include/;"../../../../ambulant-private/pdtbplugin";"../../../../ambulant-private/pdtbplugin/PdtbIePlugin";../AmisCore/include;"../../../../xerces-c-src/src";"$(VSInstallDir)\..\Microsoft Speech SDK 5.1\Include"" PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG" MinimalRebuild="TRUE" BasicRuntimeChecks="3" @@ -35,7 +35,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="AmisCoreD.lib xerces-c_2D.lib libambulant_shwin32_D.lib AmisAudioD.lib vorbisfile_static.lib vorbisenc_static.lib vorbis_static.lib ogg_static.lib libmad.lib stlib.lib fftw3.lib audiere.lib" + AdditionalDependencies="AmisCoreD.lib xerces-c_2D.lib libambulant_shwin32_D.lib AmisAudioD.lib" LinkIncremental="2" AdditionalLibraryDirectories="../lib;../../../../ambulant/lib/win32;"$(VSInstallDir)\..\Microsoft Speech SDK 5.1\Lib\i386"" IgnoreDefaultLibraryNames="uafxcwd.lib;uafxcw.lib;LIBCD.lib;LIBC.lib;msvcrt.lib;libcmt.lib" @@ -75,13 +75,14 @@ IntermediateDirectory="Release" ConfigurationType="1" UseOfMFC="2" - CharacterSet="2"> + CharacterSet="1"> <Tool Name="VCCLCompilerTool" + AdditionalIncludeDirectories="include;../../../../ambulant/include/;"../../../../ambulant-private/pdtbplugin";"../../../../ambulant-private/pdtbplugin/PdtbIePlugin";../AmisCore/include;"../../../../xerces-c-src/src";"$(VSInstallDir)\..\Microsoft Speech SDK 5.1\Include"" PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG" MinimalRebuild="FALSE" RuntimeLibrary="2" - TreatWChar_tAsBuiltInType="TRUE" + TreatWChar_tAsBuiltInType="FALSE" UsePrecompiledHeader="3" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" @@ -90,7 +91,11 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" + AdditionalDependencies="Strmiids.lib UAFXCW.LIB msvcrt.lib AmisCore.lib AmisAudio.lib xerces-c_2.lib libambulant_shwin32.lib " LinkIncremental="1" + AdditionalLibraryDirectories="../lib;../../../../ambulant/lib/win32;"$(VSInstallDir)\..\Microsoft Speech SDK 5.1\Lib\i386"" + IgnoreAllDefaultLibraries="FALSE" + IgnoreDefaultLibraryNames="UAFXCW.LIB;libcpmt.lib;msvcprt.lib;libcmt.lib;msvcrt.lib" GenerateDebugInformation="TRUE" SubSystem="2" OptimizeReferences="2" @@ -269,12 +274,30 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\pdtb.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\Preferences.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\stdafx.cpp"> @@ -284,6 +307,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="1"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <Filter Name="io" @@ -296,6 +325,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> </Filter> <Filter @@ -303,18 +338,48 @@ Filter=""> <File RelativePath=".\src\gui\AmisGuiMFC2.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\ChildFrm.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\HtmlDoc.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\HtmlView.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\MainFrm.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\MainWndParts.cpp"> @@ -324,24 +389,60 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\MenuManip.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\MmDoc.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\MmView.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\TextRenderBrain.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <Filter Name="dialogs" Filter=""> <File RelativePath=".\src\gui\dialogs\AboutDialog.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\dialogs\AmisDialogBase.cpp"> @@ -351,18 +452,48 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\dialogs\AmisFileDialog.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\dialogs\GoToPageDialog.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\dialogs\OpenUrlDialog.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\dialogs\SkipDialog.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> </Filter> <Filter @@ -370,6 +501,12 @@ Filter=""> <File RelativePath=".\src\gui\sidebar\AmisSidebar.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\sidebar\AmisSidebarLoader.cpp"> @@ -379,36 +516,102 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\sidebar\cdxCDynamicBar.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\sidebar\cdxCDynamicControlsManager.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\sidebar\cdxCDynamicDialog.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\sidebar\cdxCDynamicWnd.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\sidebar\cdxCDynamicWndEx.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\sidebar\cdxCSizeIconCtrl.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\sidebar\NavListControl.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\sidebar\scbarcf.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\sidebar\scbarg.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\src\gui\sidebar\SizeCBar.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> </Filter> </Filter> @@ -424,6 +627,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\AmisSelfVoicing\AudioSequence.h"> @@ -436,6 +645,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\AmisSelfVoicing\AudioSequenceComponent.h"> @@ -448,6 +663,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\AmisSelfVoicing\AudioSequencePlayer.h"> @@ -460,6 +681,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\AmisSelfVoicing\PreTranslateMessageHandler.h"> @@ -472,6 +699,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\AmisSelfVoicing\Prompt.h"> @@ -484,6 +717,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\AmisSelfVoicing\PromptResolver.h"> @@ -496,6 +735,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\AmisSelfVoicing\TTSPlayer.h"> @@ -508,6 +753,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\AmisSelfVoicing\UiMediaTypes.h"> @@ -523,6 +774,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\AmisSelfVoicing\AccessibleUI\AccessibleUiDataReader.h"> @@ -535,6 +792,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\AmisSelfVoicing\AccessibleUI\Action.h"> @@ -547,6 +810,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\AmisSelfVoicing\AccessibleUI\AudioPrompt.h"> @@ -559,6 +828,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\AmisSelfVoicing\AccessibleUI\AudioPromptReader.h"> @@ -571,6 +846,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\AmisSelfVoicing\AccessibleUI\Container.h"> @@ -583,6 +864,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\AmisSelfVoicing\AccessibleUI\DataTree.h"> @@ -595,6 +882,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\AmisSelfVoicing\AccessibleUI\Dialog.h"> @@ -607,6 +900,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\AmisSelfVoicing\AccessibleUI\DialogControl.h"> @@ -619,6 +918,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\AmisSelfVoicing\AccessibleUI\IniFile.h"> @@ -631,6 +936,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\AmisSelfVoicing\AccessibleUI\Label.h"> @@ -643,6 +954,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\AmisSelfVoicing\AccessibleUI\LabelList.h"> @@ -655,6 +972,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\AmisSelfVoicing\AccessibleUI\Switch.h"> @@ -667,6 +990,12 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0"/> </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0"/> + </FileConfiguration> </File> <File RelativePath=".\AmisSelfVoicing\AccessibleUI\UiItem.h"> Modified: branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AccessibleUIDataReader.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AccessibleUIDataReader.cpp 2007-10-19 01:24:52 UTC (rev 2217) +++ branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AccessibleUIDataReader.cpp 2007-10-19 06:00:03 UTC (rev 2218) @@ -20,8 +20,8 @@ #include "AccessibleUiDataReader.h" #include "Switch.h" -#include "../AmisGuiMFC2/include/Preferences.h" -#include "../AmisCore/include/util/FilePathTools.h" +#include "Preferences.h" +#include "util/FilePathTools.h" #include "util/xercesutils.h" Modified: branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AccessibleUiDataReader.h =================================================================== --- branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AccessibleUiDataReader.h 2007-10-19 01:24:52 UTC (rev 2217) +++ branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AccessibleUiDataReader.h 2007-10-19 06:00:03 UTC (rev 2218) @@ -30,7 +30,7 @@ #include "UiItem.h" -#include "../AmisCore/include/Error.h" +#include "Error.h" //NAMESPACES XERCES_CPP_NAMESPACE_USE Modified: branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AudioPrompt.h =================================================================== --- branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AudioPrompt.h 2007-10-19 01:24:52 UTC (rev 2217) +++ branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AudioPrompt.h 2007-10-19 06:00:03 UTC (rev 2218) @@ -3,7 +3,7 @@ #include <string> -#include "../AmisCore/include/Media.h" +#include "Media.h" //!prompt variable structure /*! Modified: branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AudioPromptReader.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AudioPromptReader.cpp 2007-10-19 01:24:52 UTC (rev 2217) +++ branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AudioPromptReader.cpp 2007-10-19 06:00:03 UTC (rev 2218) @@ -159,10 +159,10 @@ p_prompt_var->mVarName.assign(name); XMLString::release(&name); //DANIEL MEMORY LEAK VERIFIED - p_prompt_var->mRuntimeValue = _T(""); + p_prompt_var->mRuntimeValue = L""; p_prompt_var->mbIsVar = true; - p_prompt_var->mTextAlternative = _T(""); + p_prompt_var->mTextAlternative = L""; mpCurrentPrompt->mSequence.push_back(p_prompt_var); } @@ -211,7 +211,7 @@ } p_pc->mbIsVar = false; - p_pc->mRuntimeValue = _T(""); + p_pc->mRuntimeValue = L""; p_pc->mVarName = ""; p_pc->mpMedia = p_audio; Modified: branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AudioPromptReader.h =================================================================== --- branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AudioPromptReader.h 2007-10-19 01:24:52 UTC (rev 2217) +++ branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AudioPromptReader.h 2007-10-19 06:00:03 UTC (rev 2218) @@ -27,7 +27,7 @@ //XERCES INCLUDES #include <xercesc/sax2/DefaultHandler.hpp> -#include "../AmisCore/include/Media.h" +#include "Media.h" #include "AudioPrompt.h" Modified: branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/Switch.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/Switch.cpp 2007-10-19 01:24:52 UTC (rev 2217) +++ branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/Switch.cpp 2007-10-19 06:00:03 UTC (rev 2218) @@ -1,6 +1,6 @@ #include "Switch.h" -#include "../AmisGuiMFC2/resource.h" +#include "../../AmisGuiMFC2/resource.h" //#include "../AudioAudio/AmisAudio.h" #include <fstream> Modified: branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AudioSequence.h =================================================================== --- branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AudioSequence.h 2007-10-19 01:24:52 UTC (rev 2217) +++ branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AudioSequence.h 2007-10-19 06:00:03 UTC (rev 2218) @@ -10,7 +10,7 @@ #include <atlcoll.h> -#include "../AmisCore/include/Media.h" +#include "Media.h" namespace amis Modified: branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AudioSequenceComponent.h =================================================================== --- branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AudioSequenceComponent.h 2007-10-19 01:24:52 UTC (rev 2217) +++ branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AudioSequenceComponent.h 2007-10-19 06:00:03 UTC (rev 2218) @@ -13,7 +13,7 @@ #endif #endif -#include "../AmisCore/include/Media.h" +#include "Media.h" namespace amis Modified: branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AudioSequencePlayer.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AudioSequencePlayer.cpp 2007-10-19 01:24:52 UTC (rev 2217) +++ branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AudioSequencePlayer.cpp 2007-10-19 06:00:03 UTC (rev 2218) @@ -8,13 +8,13 @@ #include "util/FilePathTools.h" -#include "../AmisAudio/AmisAudio.h" +#include "../../AmisAudio/AmisAudio.h" -#include "../AmisGuiMFC2/include/Preferences.h" +#include "Preferences.h" #include <gui/MainWndParts.h> -#include "../AmisCore/include/Media.h" +#include "Media.h" #include "gui/MmView.h" @@ -315,6 +315,7 @@ } unsigned __stdcall AudioSequencePlayer::ThreadProc(void* Arg) { + USES_CONVERSION; _ASSERT(Arg != NULL); @@ -476,6 +477,10 @@ strDebug.Format(_T("============ PLAY AUDIO TTS: --%s--\n"), comp->m_String); TRACE(strDebug); if (!TTSPlayer::Instance()->IsSpeaking()) { + + //LPCWSTR str = T2W(comp->m_String); + //std::wstring str = (LPCTSTR)comp->m_String.GetBuffer(); + //comp->m_String.ReleaseBuffer(); TTSPlayer::Instance()->Play(comp->m_String); delete comp; } else { @@ -630,7 +635,7 @@ CString str; str.Append(lpszText); - str.Replace(L"&", L""); + str.Replace(CString("&"), CString("")); CString strDebug; strDebug.Format(_T("+++ 1 --%s--\n"), str); //DAN_MENU_DEBUG Modified: branches/amis3/AmisGuiMFC2/AmisSelfVoicing/PreTranslateMessageHandler.h =================================================================== --- branches/amis3/AmisGuiMFC2/AmisSelfVoicing/PreTranslateMessageHandler.h 2007-10-19 01:24:52 UTC (rev 2217) +++ branches/amis3/AmisGuiMFC2/AmisSelfVoicing/PreTranslateMessageHandler.h 2007-10-19 06:00:03 UTC (rev 2218) @@ -25,8 +25,8 @@ int idUiFocus, bool ignoreSpaceKey = false, bool ignoreArrowKeys = false, - CString strTextField = L"", - CString strTextFieldFULL = L"", + CString strTextField = CString(L""), + CString strTextFieldFULL = CString(L""), bool ignoreCharKeys = false); private: Modified: branches/amis3/AmisGuiMFC2/AmisSelfVoicing/TTSPlayer.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/AmisSelfVoicing/TTSPlayer.cpp 2007-10-19 01:24:52 UTC (rev 2217) +++ branches/amis3/AmisGuiMFC2/AmisSelfVoicing/TTSPlayer.cpp 2007-10-19 06:00:03 UTC (rev 2218) @@ -20,8 +20,8 @@ //#include <gui/MainWndParts.h> -#include "../AmisGuiMFC2/include/Preferences.h" -#include "../AmisGuiMFC2/resource.h" +#include "Preferences.h" +#include "../../AmisGuiMFC2/resource.h" using namespace amis::tts; @@ -63,32 +63,43 @@ } // between -10 and 10. 0 is default rate (engine dependant). -BOOL TTSPlayer::SetSpeechRate(long newRate) +bool TTSPlayer::SetSpeechRate(long newRate) { HRESULT hr = 0; hr = m_iV->SetRate(newRate); if (SUCCEEDED(hr)) { - return TRUE; + return true; } else if (hr == E_INVALIDARG) { - return FALSE; + return false; } else { _ASSERT(0); - return FALSE; // Should never happen ! + return false; // Should never happen ! } } #ifdef USE_WSTRING void TTSPlayer::Play(std::wstring str) +{ #else void TTSPlayer::Play(CString str) +{ + USES_CONVERSION; #endif -{ + TRACE(L"******"); TRACE(str); if (IsSpeaking()) { TRACE("????????"); } + + +#ifdef USE_WSTRING m_iV->Speak(str, SPF_ASYNC | SPF_PURGEBEFORESPEAK, NULL); + #else + + //LPCWSTR str_ = T2W(str); +m_iV->Speak(str, SPF_ASYNC | SPF_PURGEBEFORESPEAK, NULL); +#endif } void TTSPlayer::Stop() @@ -156,7 +167,7 @@ } } -BOOL TTSPlayer::IsSpeaking(void) {return m_isSpeaking;} +bool TTSPlayer::IsSpeaking(void) {return m_isSpeaking;} TTSPlayer::TTSPlayer(void) : m_currentVoiceNumber(-1) Modified: branches/amis3/AmisGuiMFC2/AmisSelfVoicing/TTSPlayer.h =================================================================== --- branches/amis3/AmisGuiMFC2/AmisSelfVoicing/TTSPlayer.h 2007-10-19 01:24:52 UTC (rev 2217) +++ branches/amis3/AmisGuiMFC2/AmisSelfVoicing/TTSPlayer.h 2007-10-19 06:00:03 UTC (rev 2218) @@ -39,16 +39,16 @@ void WaitUntilDone(); long GetSpeechRate(); - BOOL SetSpeechRate(long newRate); + bool SetSpeechRate(long newRate); void ChangeVoice(bool speakNotify); void ChangeVoice(int index); int initVoiceList(HWND); -BOOL IsSpeaking(void); +bool IsSpeaking(void); - BOOL m_isSpeaking; + bool m_isSpeaking; static TTSPlayer* pinstance; Modified: branches/amis3/AmisGuiMFC2/AmisSelfVoicing/UiMediaTypes.h =================================================================== --- branches/amis3/AmisGuiMFC2/AmisSelfVoicing/UiMediaTypes.h 2007-10-19 01:24:52 UTC (rev 2217) +++ branches/amis3/AmisGuiMFC2/AmisSelfVoicing/UiMediaTypes.h 2007-10-19 06:00:03 UTC (rev 2218) @@ -3,7 +3,7 @@ #define UIMEDIATYPES_H -#include "../AmisCore/include/Media.h" +#include "Media.h" Modified: branches/amis3/AmisGuiMFC2/include/gui/AmisGuiMFC2.h =================================================================== --- branches/amis3/AmisGuiMFC2/include/gui/AmisGuiMFC2.h 2007-10-19 01:24:52 UTC (rev 2217) +++ branches/amis3/AmisGuiMFC2/include/gui/AmisGuiMFC2.h 2007-10-19 06:00:03 UTC (rev 2218) @@ -27,6 +27,8 @@ #error include 'stdafx.h' before including this file for PCH #endif +///This gets rid of some warnings +#pragma warning(disable : 4049) #include "resource.h" // main symbols #include <string> Modified: branches/amis3/AmisGuiMFC2/src/DtbWithHooks.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/DtbWithHooks.cpp 2007-10-19 01:24:52 UTC (rev 2217) +++ branches/amis3/AmisGuiMFC2/src/DtbWithHooks.cpp 2007-10-19 06:00:03 UTC (rev 2218) @@ -219,7 +219,7 @@ { amis::MediaGroup* p_media = new amis::MediaGroup(); amis::TextNode* p_text = new amis::TextNode(); - p_text->setTextString(_T("sections")); + p_text->setTextString(L"sections"); p_media->setText(p_text); p_map->setLabel(p_media); } @@ -235,7 +235,7 @@ { amis::MediaGroup* p_media = new amis::MediaGroup(); amis::TextNode* p_text = new amis::TextNode(); - p_text->setTextString(_T("pages")); + p_text->setTextString(L"pages"); p_media->setText(p_text); p_pages->setLabel(p_media); } @@ -254,7 +254,7 @@ { amis::MediaGroup* p_media = new amis::MediaGroup(); amis::TextNode* p_text = new amis::TextNode(); - p_text->setTextString(_T("")); + p_text->setTextString(L""); p_media->setText(p_text); ((*p_lists)[i])->setLabel(p_media); } @@ -273,38 +273,38 @@ if (id.compare("sidebar") == 0 || id.compare("sidebars") == 0) { - search_for.assign(_T("sidebars")); + search_for.assign(L"sidebars"); } else if (id.compare("optional-prodnote") == 0 || id.compare("optional-prodnotes") == 0 || id.compare("prodnote") == 0 || id.compare("prodnotes") == 0) { - search_for.assign(_T("prodnotes")); + search_for.assign(L"prodnotes"); } else if (id.compare("noteref") == 0 || id.compare("noterefs") == 0 || id.compare("footnote") == 0 || id.compare("footnotes") == 0) { - search_for.assign(_T("noterefs")); + search_for.assign(L"noterefs"); } else if (id.compare("group") == 0 || id.compare("groups") == 0) { - search_for.assign(_T("groups")); + search_for.assign(L"groups"); } else if (id.compare("page") == 0 || id.compare("pages") == 0 || id.compare("pagenumber") == 0 || id.compare("pagenumbers") == 0) { - search_for.assign(_T("pages")); + search_for.assign(L"pages"); } else if (id.compare("section") == 0 || id.compare("sections") == 0) { - search_for.assign(_T("sections")); + search_for.assign(L"sections"); } //TODO: match the item in the accessible UI data set @@ -352,7 +352,9 @@ //set the spine at this file. this also makes sure that we're going to a file that is in the book. if (getSpine()->goToFile(&full_path)) { - amis::gui::MainWndParts::Instance()->mpMmDoc->OnOpenDocument(A2T(full_path.get_url().c_str())); + + LPCTSTR str_ = A2T(full_path.get_url().c_str()); //(LPSTR) + amis::gui::MainWndParts::Instance()->mpMmDoc->OnOpenDocument(str_); } //DanToDo: Is this the best place to set the PLAY/PAUSE status ? (is the book actually playing at this stage...probably not) theApp.setPauseState(false); Modified: branches/amis3/AmisGuiMFC2/src/gui/AmisGuiMFC2.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/AmisGuiMFC2.cpp 2007-10-19 01:24:52 UTC (rev 2217) +++ branches/amis3/AmisGuiMFC2/src/gui/AmisGuiMFC2.cpp 2007-10-19 06:00:03 UTC (rev 2218) @@ -315,7 +315,7 @@ void CAmisGuiMFC2App::openBook(const ambulant::net::url* filename) { - MainWndParts::Instance()->updateTitleBar(MainWndParts::TITLEBAR_APPNAME, L"Amis"); + MainWndParts::Instance()->updateTitleBar(MainWndParts::TITLEBAR_APPNAME, CString(L"Amis")); MainWndParts::Instance()->updateTitleViewMode(); MainWndParts::Instance()->updateTitleSelfVoicing(Preferences::Instance()->mbIsSelfVoicing); Modified: branches/amis3/AmisGuiMFC2/src/gui/dialogs/GoToPageDialog.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/dialogs/GoToPageDialog.cpp 2007-10-19 01:24:52 UTC (rev 2217) +++ branches/amis3/AmisGuiMFC2/src/gui/dialogs/GoToPageDialog.cpp 2007-10-19 06:00:03 UTC (rev 2218) @@ -62,7 +62,7 @@ std::wstring GoToPageDialog::getPageNumber() { - return m_PageNumber.Trim(); + return m_PageNumber.Trim().GetBuffer(); } Modified: branches/amis3/VC7/amis.sln =================================================================== --- branches/amis3/VC7/amis.sln 2007-10-19 01:24:52 UTC (rev 2217) +++ branches/amis3/VC7/amis.sln 2007-10-19 06:00:03 UTC (rev 2218) @@ -38,7 +38,6 @@ {E0F81CE5-9C15-4E36-BC71-42BE1C0F2406}.Debug.ActiveCfg = Debug|Win32 {E0F81CE5-9C15-4E36-BC71-42BE1C0F2406}.Debug.Build.0 = Debug|Win32 {E0F81CE5-9C15-4E36-BC71-42BE1C0F2406}.Release.ActiveCfg = Release|Win32 - {E0F81CE5-9C15-4E36-BC71-42BE1C0F2406}.Release.Build.0 = Release|Win32 {A7A37247-BAAC-4376-8354-96A8C09F926A}.Debug.ActiveCfg = Debug|Win32 {A7A37247-BAAC-4376-8354-96A8C09F926A}.Debug.Build.0 = Debug|Win32 {A7A37247-BAAC-4376-8354-96A8C09F926A}.Release.ActiveCfg = Release|Win32 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |