Modified code to #ifdef ATARIVOX_SUPPORT sections of code which are used

for the AtariVox support but not needed otherwise.  Also changed a forward
declaration of a struct which was declared as a class.  I'm currently
building without AtariVox support, however, it should work as before if
ATARIVOX_SUPPORT is defined.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1117 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

stella/src/common/SoundSDL.cxx

@@ -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: SoundSDL.cxx,v 1.31 2006-06-11 22:43:55 urchlay Exp $
+// $Id: SoundSDL.cxx,v 1.32 2006-08-09 02:38:03 bwmott Exp $
 //============================================================================
 
 #ifdef SOUND_SUPPORT
@@ -408,6 +408,7 @@ void SoundSDL::callback(void* udata, uInt8* stream, int len)
 {
   SoundSDL* sound = (SoundSDL*)udata;
   sound->processFragment(stream, (Int32)len);
+#ifdef ATARIVOX_SUPPORT
   cerr << "SoundSDL::callback(): len==" << len << endl;
 
   // See if we need sound from the AtariVox
@@ -426,6 +427,7 @@ void SoundSDL::callback(void* udata, uInt8* stream, int len)
       s += OUTPUT_BUFFER_SIZE;
     }
   }
+#endif
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

stella/src/emucore/AtariVox.hxx

@@ -14,9 +14,11 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: AtariVox.hxx,v 1.3 2006-06-11 22:43:55 urchlay Exp $
+// $Id: AtariVox.hxx,v 1.4 2006-08-09 02:38:03 bwmott Exp $
 //============================================================================
 
+#ifdef ATARIVOX_SUPPORT
+
 #ifndef ATARIVOX_HXX
 #define ATARIVOX_HXX
 
@@ -33,7 +35,7 @@
   driver code.
 
   @author  B. Watson
-  @version $Id: AtariVox.hxx,v 1.3 2006-06-11 22:43:55 urchlay Exp $
+  @version $Id: AtariVox.hxx,v 1.4 2006-08-09 02:38:03 bwmott Exp $
 */
 class AtariVox : public Controller
 {
@@ -129,3 +131,4 @@ class AtariVox : public Controller
 };
 
 #endif
+#endif

stella/src/emucore/Console.cxx

@@ -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: Console.cxx,v 1.92 2006-06-11 22:43:55 urchlay Exp $
+// $Id: Console.cxx,v 1.93 2006-08-09 02:38:03 bwmott Exp $
 //============================================================================
 
 #include <assert.h>
@@ -140,8 +140,10 @@ Console::Console(const uInt8* image, uInt32 size, const string& md5,
   {
     myControllers[0] = new Joystick(leftjack, *myEvent);
   }
-  
+ 
+#ifdef ATARIVOX_SUPPORT 
   vox = 0;
+#endif
 
   // Construct right controller
   if(right == "BOOSTER-GRIP")
@@ -160,10 +162,12 @@ Console::Console(const uInt8* image, uInt32 size, const string& md5,
   {
     myControllers[1] = new Paddles(rightjack, *myEvent);
   }
+#ifdef ATARIVOX_SUPPORT 
   else if(right == "ATARIVOX")
   {
     myControllers[1] = vox = new AtariVox(rightjack, *myEvent);
   }
+#endif
   else
   {
     myControllers[1] = new Joystick(rightjack, *myEvent);
@@ -186,8 +190,10 @@ Console::Console(const uInt8* image, uInt32 size, const string& md5,
 
   // AtariVox is a smart peripheral; it needs access to the system
   // cycles counter, so it needs a reference to the System
+#ifdef ATARIVOX_SUPPORT 
   if(vox)
     vox->setSystem(mySystem);
+#endif
 
   M6502* m6502;
   if(myOSystem->settings().getString("cpu") == "low")

stella/src/emucore/Console.hxx

@@ -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: Console.hxx,v 1.44 2006-06-11 22:43:55 urchlay Exp $
+// $Id: Console.hxx,v 1.45 2006-08-09 02:38:03 bwmott Exp $
 //============================================================================
 
 #ifndef CONSOLE_HXX
@@ -38,7 +38,7 @@ class System;
   This class represents the entire game console.
 
   @author  Bradford W. Mott
-  @version $Id: Console.hxx,v 1.44 2006-06-11 22:43:55 urchlay Exp $
+  @version $Id: Console.hxx,v 1.45 2006-08-09 02:38:03 bwmott Exp $
 */
 class Console
 {
@@ -236,7 +236,9 @@ class Console
     void togglePFBit() { toggleTIABit(TIA::PF, "PF"); }
     void enableBits(bool enable);
 
+#ifdef ATARIVOX_SUPPORT
     AtariVox *atariVox() { return vox; }
+#endif
 
   private:
     void toggleTIABit(TIA::TIABit bit, const string& bitname, bool show = true);
@@ -271,7 +273,9 @@ class Console
     // A RIOT of my own! (...with apologies to The Clash...)
     M6532 *myRiot;
 
+#ifdef ATARIVOX_SUPPORT
     AtariVox *vox;
+#endif
 
     // Indicates whether the console was correctly initialized
     // We don't really care why it wasn't initialized ...

stella/src/emucore/SpeakJet.hxx

@@ -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: SpeakJet.hxx,v 1.3 2006-06-11 22:43:55 urchlay Exp $
+// $Id: SpeakJet.hxx,v 1.4 2006-08-09 02:38:03 bwmott Exp $
 //============================================================================
 
 #ifndef SPEAKJET_HXX
@@ -75,7 +75,7 @@
   anyway).
 
   @author  B. Watson
-  @version $Id: SpeakJet.hxx,v 1.3 2006-06-11 22:43:55 urchlay Exp $
+  @version $Id: SpeakJet.hxx,v 1.4 2006-08-09 02:38:03 bwmott Exp $
 */
 
 #include "bspf.hxx"
@@ -84,7 +84,7 @@
 #include <SDL_thread.h>
 #include "rsynth/rsynth.h"
 
-class SpeechBuffer;
+struct SpeechBuffer;
 
 
 enum { INPUT_BUFFER_SIZE = 128 };