Removed more dead code related to emulating the AtariVox.

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

src/emucore/AtariVox.cxx

@@ -16,10 +16,6 @@
 // $Id$
 //============================================================================
 
-#ifdef SPEAKJET_EMULATION
-  #include "SpeakJet.hxx"
-#endif
-
 #include "MT24LC256.hxx"
 #include "SerialPort.hxx"
 #include "System.hxx"
@@ -36,15 +32,10 @@ AtariVox::AtariVox(Jack jack, const Event& event, const System& system,
     myShiftRegister(0),
     myLastDataWriteCycle(0)
 {
-#ifndef SPEAKJET_EMULATION
   if(mySerialPort.openPort(portname))
     myAboutString = " (using serial port \'" + portname + "\')";
   else
     myAboutString = " (invalid serial port \'" + portname + "\')";
-#else
-  mySpeakJet = new SpeakJet();
-  myAboutString = " (emulating SpeakJet device)";
-#endif
 
   myEEPROM = new MT24LC256(eepromfile, system);
 
@@ -57,11 +48,7 @@ AtariVox::AtariVox(Jack jack, const Event& event, const System& system,
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 AtariVox::~AtariVox()
 {
-#ifndef SPEAKJET_EMULATION
   mySerialPort.closePort();
-#else
-  delete mySpeakJet;
-#endif
   delete myEEPROM;
 }
 
@@ -158,11 +145,7 @@ void AtariVox::clockDataIn(bool value)
       else
       {
         uInt8 data = ((myShiftRegister >> 1) & 0xff);
-    #ifndef SPEAKJET_EMULATION
         mySerialPort.writeByte(&data);
-    #else
-        mySpeakJet->write(data);
-    #endif
       }
       myShiftRegister = 0;
     }

src/emucore/AtariVox.hxx

@@ -19,7 +19,6 @@
 #ifndef ATARIVOX_HXX
 #define ATARIVOX_HXX
 
-class SpeakJet;
 class SerialPort;
 class MT24LC256;
 
@@ -91,10 +90,6 @@ class AtariVox : public Controller
 
     virtual string about() const;
 
-#ifdef SPEAKJET_EMULATION
-    SpeakJet* getSpeakJet() { return mySpeakJet; }
-#endif
-
   private:
    void clockDataIn(bool value);
    void shiftIn(bool value);
@@ -108,11 +103,6 @@ class AtariVox : public Controller
     // The EEPROM used in the AtariVox
     MT24LC256* myEEPROM;
 
-#ifdef SPEAKJET_EMULATION
-    // Instance of SpeakJet which will actually do the talking for us.
-    SpeakJet *mySpeakJet;
-#endif
-
     // How many bits have been shifted into the shift register?
     uInt8 myShiftCount;
 

src/emucore/Console.cxx

@@ -63,7 +63,6 @@
 Console::Console(OSystem* osystem, Cartridge* cart, const Properties& props)
   : myOSystem(osystem),
     myProperties(props),
-    myAVox(0),
     myDisplayFormat("NTSC"),
     myFramerate(60.0),
     myUserPaletteDefined(false)
@@ -667,8 +666,8 @@ void Console::setControllers(const string& rommd5)
   {
     const string& eepromfile = myOSystem->eepromDir() + BSPF_PATH_SEPARATOR +
                                "atarivox_eeprom.dat";
-    myControllers[rightPort] = myAVox =
+    myControllers[rightPort] = new AtariVox(Controller::Right, *myEvent,
-      new AtariVox(Controller::Right, *myEvent, *mySystem, myOSystem->serialPort(),
+                   *mySystem, myOSystem->serialPort(),
                    myOSystem->settings().getString("avoxport"), eepromfile);
   }
   else if(right == "SAVEKEY")

src/emucore/Console.hxx

@@ -264,9 +264,6 @@ class Console : public Serializable
     void togglePFBit() const { toggleTIABit(TIA::PF, "PF"); }
     void enableBits(bool enable) const;
 
-    // TODO - make the core code work without needing to access this
-    AtariVox* atariVox() { return myAVox; }
-
   private:
     /**
       Adds the left and right controllers to the console
@@ -322,8 +319,6 @@ class Console : public Serializable
     // A RIOT of my own! (...with apologies to The Clash...)
     M6532 *myRiot;
 
-    AtariVox* myAVox;
-
     // The currently defined display format (NTSC/PAL/SECAM)
     string myDisplayFormat;