ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated VS 2005 project with latest changes. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2266 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2011-08-17 00:09:07 +00:00
parent 55f4de0725
commit 672461b942
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/SoundSDL.cxx
View File

@ -50,7 +50,11 @@ SoundSDL::SoundSDL(OSystem* osystem)
SoundSDL::~SoundSDL() SoundSDL::~SoundSDL()
{ {
// Close the SDL audio system if it's initialized // Close the SDL audio system if it's initialized
close(); if(myIsInitializedFlag)
{
SDL_CloseAudio();
myIsInitializedFlag = false;
}
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -75,8 +79,9 @@ void SoundSDL::open()
myRegWriteQueue.clear(); myRegWriteQueue.clear();
myTIASound.reset(); myTIASound.reset();
if(SDL_WasInit(SDL_INIT_AUDIO) == 0) if(!myIsInitializedFlag && SDL_WasInit(SDL_INIT_AUDIO) == 0)
{ {
cerr << "SoundSDL::open()\n";
myIsInitializedFlag = false; myIsInitializedFlag = false;
myIsMuted = false; myIsMuted = false;
myLastRegisterSetCycle = 0; myLastRegisterSetCycle = 0;
@ -158,8 +163,8 @@ void SoundSDL::close()
{ {
if(myIsInitializedFlag) if(myIsInitializedFlag)
{ {
SDL_CloseAudio(); cerr << "SoundSDL::close()\n";
myIsInitializedFlag = false; SDL_PauseAudio(1);
} }
} }

4
src/emucore/OSystem.cxx
View File

@ -464,8 +464,8 @@ fallback:
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void OSystem::createSound() void OSystem::createSound()
{ {
delete mySound; mySound = NULL; if(!mySound)
mySound = MediaFactory::createAudio(this); mySound = MediaFactory::createAudio(this);
#ifndef SOUND_SUPPORT #ifndef SOUND_SUPPORT
mySettings->setBool("sound", false); mySettings->setBool("sound", false);
#endif #endif

8
src/win32/Stella_vs2005.vcproj
View File

@ -736,6 +736,10 @@
RelativePath="..\gui\ListWidget.cxx" RelativePath="..\gui\ListWidget.cxx"
> >
</File> </File>
<File
RelativePath="..\gui\LoggerDialog.cxx"
>
</File>
<File <File
RelativePath="..\gui\Menu.cxx" RelativePath="..\gui\Menu.cxx"
> >
@ -1550,6 +1554,10 @@
RelativePath="..\gui\ListWidget.hxx" RelativePath="..\gui\ListWidget.hxx"
> >
</File> </File>
<File
RelativePath="..\gui\LoggerDialog.hxx"
>
</File>
<File <File
RelativePath="..\gui\Menu.hxx" RelativePath="..\gui\Menu.hxx"
> >