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

Updated X11 and SDL ports to make use of the new ALSA sound backend. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@149 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2002-12-01 02:13:14 +00:00
parent 9feac30d84
commit 00515a2ba2
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
stella/src/ui/sdl/mainSDL.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: mainSDL.cxx,v 1.38 2002-11-13 16:19:21 stephena Exp $
// $Id: mainSDL.cxx,v 1.39 2002-12-01 02:13:13 stephena Exp $
//============================================================================
#include <fstream>
@ -41,6 +41,10 @@
#include "RectList.hxx"
#include "Settings.hxx"
#ifdef SOUND_ALSA
#include "SoundALSA.hxx"
#endif
#ifdef SOUND_OSS
#include "SoundOSS.hxx"
#endif
@ -1704,6 +1708,10 @@ int main(int argc, char* argv[])
// if sound has been disabled, we still need a sound object
sound = new Sound();
}
#ifdef SOUND_ALSA
else if(settings->theSoundDriver == "alsa")
sound = new SoundALSA();
#endif
#ifdef SOUND_OSS
else if(settings->theSoundDriver == "oss")
sound = new SoundOSS();

10
stella/src/ui/x11/mainX11.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: mainX11.cxx,v 1.33 2002-11-13 16:19:21 stephena Exp $
// $Id: mainX11.cxx,v 1.34 2002-12-01 02:13:14 stephena Exp $
//============================================================================
#include <fstream>
@ -44,6 +44,10 @@
#include "System.hxx"
#include "Settings.hxx"
#ifdef SOUND_ALSA
#include "SoundALSA.hxx"
#endif
#ifdef SOUND_OSS
#include "SoundOSS.hxx"
#endif
@ -1577,6 +1581,10 @@ int main(int argc, char* argv[])
// if sound has been disabled, we still need a sound object
sound = new Sound();
}
#ifdef SOUND_ALSA
else if(settings->theSoundDriver == "alsa")
sound = new SoundALSA();
#endif
#ifdef SOUND_OSS
else if(settings->theSoundDriver == "oss")
sound = new SoundOSS();