From a5cb67551fa20d04a691395eea025483b7c0caff Mon Sep 17 00:00:00 2001 From: stephena Date: Sun, 27 Jan 2013 15:08:04 +0000 Subject: [PATCH] Final updates to the sound code (resampling seems to be working fine). git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2585 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- Changes.txt | 9 ++-- docs/graphics/options_audio.png | Bin 3614 -> 3189 bytes docs/index.html | 17 ++------ src/common/SoundNull.cxx | 74 -------------------------------- src/common/SoundNull.hxx | 36 ++++++++++++++-- src/common/SoundSDL.cxx | 2 - src/common/module.mk | 1 - src/emucore/Settings.cxx | 9 ++-- src/emucore/TIASnd.cxx | 21 +++------ src/emucore/TIASnd.hxx | 11 ++--- src/gui/AudioDialog.cxx | 21 ++------- src/gui/AudioDialog.hxx | 1 - 12 files changed, 58 insertions(+), 144 deletions(-) delete mode 100644 src/common/SoundNull.cxx diff --git a/Changes.txt b/Changes.txt index bb0909587..de050f686 100644 --- a/Changes.txt +++ b/Changes.txt @@ -12,16 +12,17 @@ Release History =========================================================================== -3.7.5 to 3.8: (January xx, 2013) +3.7.5 to 3.8: (February xx, 2013) * Huge changes to the sound system: - - The sound code now uses signed 16-bit samples instead of unsigned - 8-bit samples, making it more compatible with a wider variety of + - The sound code now uses 16-bit signed samples instead of 8-bit + unsigned samples, making it more compatible with a wider variety of systems. - Improved sound output for several ROMs, including "Space Rocks" (the 'heartbeat' sound can now be clearly heard). - The 'volume clipping' option has been removed, since in 16-bit mode it's no longer needed. + - The 'Tia freq' option has been removed. * Improved bankswitch autodetection for X07 ROMs (although there's only two known ROMs in existence, so the detection probably isn't robust). @@ -69,7 +70,7 @@ reading from TIMINT. Also, D6 of the Interrupt Flag register is now properly set on active transition of the PA7 pin. - * Fixed bug in DPC+ bankswitch scheme; the music in "Stay Frosty 2" + * Fixed bug in DPC+ bankswitch scheme; the music several DPC+ ROMS wasn't playing correctly. * The ROM properties database now uses 'Auto' instead of 'Auto-select' diff --git a/docs/graphics/options_audio.png b/docs/graphics/options_audio.png index 1bf47fa3eac49cc92e4255d1a1001e35d498c62e..d89bca32658b9db36c631edb69d08ec0536c6408 100644 GIT binary patch delta 3056 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 G!M_1fbNkZ( diff --git a/docs/index.html b/docs/index.html index 0fba9d048..dc16b117a 100644 --- a/docs/index.html +++ b/docs/index.html @@ -10,7 +10,7 @@

A multi-platform Atari 2600 VCS emulator

-

Release 3.7.5

+

Release 3.8



User's Guide

@@ -54,7 +54,7 @@


-
February 1999 - December 2012
+
February 1999 - February 2013
The Stella Team
Stella Homepage
@@ -1995,14 +1995,7 @@ 
-freq <number>
- Set sound sample output frequency (0 - 48000). - Default is 31400. Do not change unless you experience sound - issues. - - - - 
-tiafreq <number>
- Set sound sample generation frequency (0 - 48000). + Set sound sample output frequency (11025,22050,31400,44100,48000) Default is 31400. Do not change unless you experience sound issues. @@ -2494,9 +2487,7 @@ ItemBrief descriptionFor more information,
see CommandLine Volumeself-explanatory-volume Sample size (*)set size of audio buffers-fragsize - Output freq (*)change sound output frequency (advanced)-freq - TIA freqchange TIA output frequency (advanced)-tiafreq - Clip volumeEliminate popping in sound generation (advanced)-clipvol + Frequency (*)change sound output frequency-freq Enable soundself-explanatory-sound diff --git a/src/common/SoundNull.cxx b/src/common/SoundNull.cxx deleted file mode 100644 index 4f4784a0e..000000000 --- a/src/common/SoundNull.cxx +++ /dev/null @@ -1,74 +0,0 @@ -//============================================================================ -// -// SSSS tt lll lll -// SS SS tt ll ll -// SS tttttt eeee ll ll aaaa -// SSSS tt ee ee ll ll aa -// SS tt eeeeee ll ll aaaaa -- "An Atari 2600 VCS Emulator" -// SS SS tt ee ll ll aa aa -// SSSS ttt eeeee llll llll aaaaa -// -// Copyright (c) 1995-2013 by Bradford W. Mott, Stephen Anthony -// and the Stella Team -// -// See the file "License.txt" for information on usage and redistribution of -// this file, and for a DISCLAIMER OF ALL WARRANTIES. -// -// $Id$ -//============================================================================ - -#include "bspf.hxx" - -#include "OSystem.hxx" -#include "Settings.hxx" -#include "SoundNull.hxx" - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -SoundNull::SoundNull(OSystem* osystem) - : Sound(osystem) -{ - myOSystem->logMessage("Sound disabled.\n", 1); -} - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -SoundNull::~SoundNull() -{ -} - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -bool SoundNull::load(Serializer& in) -{ - if(in.getString() != "TIASound") - return false; - - // Read sound registers and discard - in.getByte(); - in.getByte(); - in.getByte(); - in.getByte(); - in.getByte(); - in.getByte(); - - // myLastRegisterSetCycle - in.getInt(); - - return true; -} - -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -bool SoundNull::save(Serializer& out) const -{ - out.putString("TIASound"); - - out.putByte(0); - out.putByte(0); - out.putByte(0); - out.putByte(0); - out.putByte(0); - out.putByte(0); - - // myLastRegisterSetCycle - out.putInt(0); - - return true; -} diff --git a/src/common/SoundNull.hxx b/src/common/SoundNull.hxx index 874ae3301..1f5180bd7 100644 --- a/src/common/SoundNull.hxx +++ b/src/common/SoundNull.hxx @@ -24,6 +24,7 @@ class OSystem; #include "bspf.hxx" #include "Sound.hxx" +#include "OSystem.hxx" /** This class implements a Null sound object, where-by sound generation @@ -39,7 +40,10 @@ class SoundNull : public Sound Create a new sound object. The init method must be invoked before using the object. */ - SoundNull(OSystem* osystem); + SoundNull(OSystem* osystem) : Sound(osystem) + { + myOSystem->logMessage("Sound disabled.\n", 1); + } /** Destructor @@ -128,14 +132,25 @@ class SoundNull : public Sound */ void adjustVolume(Int8 direction) { } -public: + public: /** Saves the current state of this device to the given Serializer. @param out The serializer device to save to. @return The result of the save. True on success, false on failure. */ - bool save(Serializer& out) const; + bool save(Serializer& out) const + { + out.putString("TIASound"); + + for(int = 0; i < 6; ++i) + out.putByte(0); + + // myLastRegisterSetCycle + out.putInt(0); + + return true; + } /** Loads the current state of this device from the given Serializer. @@ -143,7 +158,20 @@ public: @param in The Serializer device to load from. @return The result of the load. True on success, false on failure. */ - bool load(Serializer& in); + bool load(Serializer& in) + { + if(in.getString() != "TIASound") + return false; + + // Read sound registers and discard + for(int = 0; i < 6; ++i) + in.getByte(); + + // myLastRegisterSetCycle + in.getInt(); + + return true; + } /** Get a descriptor for this console class (used in error checking). diff --git a/src/common/SoundSDL.cxx b/src/common/SoundSDL.cxx index d34f29d9c..9b779f48a 100644 --- a/src/common/SoundSDL.cxx +++ b/src/common/SoundSDL.cxx @@ -125,9 +125,7 @@ void SoundSDL::open() } // Now initialize the TIASound object which will actually generate sound - int tiafreq = myOSystem->settings().getInt("tiafreq"); myTIASound.outputFrequency(myHardwareSpec.freq); - myTIASound.tiaFrequency(tiafreq); const string& chanResult = myTIASound.channels(myHardwareSpec.channels, myNumChannels == 2); diff --git a/src/common/module.mk b/src/common/module.mk index 7f50934b3..9e91715f3 100644 --- a/src/common/module.mk +++ b/src/common/module.mk @@ -2,7 +2,6 @@ MODULE := src/common MODULE_OBJS := \ src/common/mainSDL.o \ - src/common/SoundNull.o \ src/common/SoundSDL.o \ src/common/FrameBufferSoft.o \ src/common/FrameBufferGL.o \ diff --git a/src/emucore/Settings.cxx b/src/emucore/Settings.cxx index 9f50f7b08..7035c7034 100644 --- a/src/emucore/Settings.cxx +++ b/src/emucore/Settings.cxx @@ -79,7 +79,6 @@ Settings::Settings(OSystem* osystem) setInternal("sound", "true"); setInternal("fragsize", "512"); setInternal("freq", "31400"); - setInternal("tiafreq", "31400"); setInternal("volume", "100"); // Input event options @@ -285,9 +284,8 @@ void Settings::validate() i = getInt("volume"); if(i < 0 || i > 100) setInternal("volume", "100"); i = getInt("freq"); - if(i < 0 || i > 48000) setInternal("freq", "31400"); - i = getInt("tiafreq"); - if(i < 0 || i > 48000) setInternal("tiafreq", "31400"); + if(!(i == 11025 || i == 22050 || i == 31400 || i == 44100 || i == 48000)) + setInternal("freq", "31400"); #endif i = getInt("joydeadzone"); @@ -382,8 +380,7 @@ void Settings::usage() #ifdef SOUND_SUPPORT << " -sound <1|0> Enable sound generation\n" << " -fragsize The size of sound fragments (must be a power of two)\n" - << " -freq Set sound sample output frequency (0 - 48000)\n" - << " -tiafreq Set sound sample generation frequency (0 - 48000)\n" + << " -freq Set sound sample output frequency (11025|22050|31400|44100|48000)\n" << " -volume Set the volume (0 - 100)\n" << " -clipvol <1|0> Enable volume clipping (eliminates popping)\n" << endl diff --git a/src/emucore/TIASnd.cxx b/src/emucore/TIASnd.cxx index 2c0001fb9..bed979521 100644 --- a/src/emucore/TIASnd.cxx +++ b/src/emucore/TIASnd.cxx @@ -21,10 +21,9 @@ #include "TIASnd.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -TIASound::TIASound(Int32 outputFrequency, Int32 tiaFrequency) +TIASound::TIASound(Int32 outputFrequency) : myChannelMode(Hardware2Stereo), myOutputFrequency(outputFrequency), - myTIAFrequency(tiaFrequency), myOutputCounter(0), myVolumePercentage(100) { @@ -68,12 +67,6 @@ void TIASound::outputFrequency(Int32 freq) myOutputFrequency = freq; } -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -void TIASound::tiaFrequency(Int32 freq) -{ - myTIAFrequency = freq; -} - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - string TIASound::channels(uInt32 hardware, bool stereo) { @@ -352,31 +345,31 @@ void TIASound::process(Int16* buffer, uInt32 samples) switch(myChannelMode) { case Hardware2Mono: // mono sampling with 2 hardware channels - while((samples > 0) && (myOutputCounter >= myTIAFrequency)) + while((samples > 0) && (myOutputCounter >= 31400)) { Int16 byte = v0 + v1; *(buffer++) = byte; *(buffer++) = byte; - myOutputCounter -= myTIAFrequency; + myOutputCounter -= 31400; samples--; } break; case Hardware2Stereo: // stereo sampling with 2 hardware channels - while((samples > 0) && (myOutputCounter >= myTIAFrequency)) + while((samples > 0) && (myOutputCounter >= 31400)) { *(buffer++) = v0; *(buffer++) = v1; - myOutputCounter -= myTIAFrequency; + myOutputCounter -= 31400; samples--; } break; case Hardware1: // mono/stereo sampling with only 1 hardware channel - while((samples > 0) && (myOutputCounter >= myTIAFrequency)) + while((samples > 0) && (myOutputCounter >= 31400)) { *(buffer++) = v0 + v1; - myOutputCounter -= myTIAFrequency; + myOutputCounter -= 31400; samples--; } break; diff --git a/src/emucore/TIASnd.hxx b/src/emucore/TIASnd.hxx index 57ce93f17..41a38b7b2 100644 --- a/src/emucore/TIASnd.hxx +++ b/src/emucore/TIASnd.hxx @@ -26,6 +26,9 @@ This class implements a fairly accurate emulation of the TIA sound hardware. This class uses code/ideas from z26 and MESS. + Currently, the sound generation routines work at 31400Hz only. + Resampling can be done by passing in a different output frequency. + @author Bradford W. Mott, Stephen Anthony, z26 and MESS teams @version $Id$ */ @@ -35,7 +38,7 @@ class TIASound /** Create a new TIA Sound object using the specified output frequency */ - TIASound(Int32 outputFrequency = 31400, Int32 tiaFrequency = 31400); + TIASound(Int32 outputFrequency = 31400); /** Destructor @@ -53,11 +56,6 @@ class TIASound */ void outputFrequency(Int32 freq); - /** - Set the frequency the of the TIA device - */ - void tiaFrequency(Int32 freq); - /** Selects the number of audio channels per sample. There are two factors to consider: hardware capability and desired mixing. @@ -159,7 +157,6 @@ class TIASound ChannelMode myChannelMode; Int32 myOutputFrequency; - Int32 myTIAFrequency; Int32 myOutputCounter; uInt32 myVolumePercentage; diff --git a/src/gui/AudioDialog.cxx b/src/gui/AudioDialog.cxx index 455256a79..0be5dc601 100644 --- a/src/gui/AudioDialog.cxx +++ b/src/gui/AudioDialog.cxx @@ -55,7 +55,7 @@ AudioDialog::AudioDialog(OSystem* osystem, DialogContainer* parent, // Set real dimensions _w = 35 * fontWidth + 10; - _h = 8 * (lineHeight + 4) + 10; + _h = 7 * (lineHeight + 4) + 10; // Volume xpos = 3 * fontWidth; ypos = 10; @@ -95,20 +95,13 @@ AudioDialog::AudioDialog(OSystem* osystem, DialogContainer* parent, items.push_back("48000 Hz", "48000"); myFreqPopup = new PopUpWidget(this, font, xpos, ypos, pwidth + myVolumeLabel->getWidth() - 4, lineHeight, - items, "Output freq (*): ", lwidth); + items, "Frequency (*): ", lwidth); wid.push_back(myFreqPopup); ypos += lineHeight + 4; - // TIA frequency - // ... use same items as above - myTiaFreqPopup = new PopUpWidget(this, font, xpos, ypos, - pwidth + myVolumeLabel->getWidth() - 4, lineHeight, - items, "TIA freq: ", lwidth); - wid.push_back(myTiaFreqPopup); - ypos += lineHeight + 4; - // Enable sound xpos = (_w - (font.getStringWidth("Enable sound") + 10)) / 2; + ypos += 4; mySoundEnableCheckbox = new CheckboxWidget(this, font, xpos, ypos, "Enable sound", kSoundEnableChanged); wid.push_back(mySoundEnableCheckbox); @@ -148,9 +141,6 @@ void AudioDialog::loadConfig() // Output frequency myFreqPopup->setSelected(instance().settings().getString("freq"), "31400"); - // TIA frequency - myTiaFreqPopup->setSelected(instance().settings().getString("tiafreq"), "31400"); - // Enable sound bool b = instance().settings().getBool("sound"); mySoundEnableCheckbox->setState(b); @@ -174,9 +164,6 @@ void AudioDialog::saveConfig() // Output frequency settings.setString("freq", myFreqPopup->getSelectedTag()); - // TIA frequency - settings.setString("tiafreq", myTiaFreqPopup->getSelectedTag()); - // Enable/disable sound (requires a restart to take effect) instance().sound().setEnabled(mySoundEnableCheckbox->getState()); @@ -194,7 +181,6 @@ void AudioDialog::setDefaults() myFragsizePopup->setSelected("512", ""); myFreqPopup->setSelected("31400", ""); - myTiaFreqPopup->setSelected("31400", ""); mySoundEnableCheckbox->setState(true); @@ -211,7 +197,6 @@ void AudioDialog::handleSoundEnableChange(bool active) myVolumeLabel->setEnabled(active); myFragsizePopup->setEnabled(active); myFreqPopup->setEnabled(active); - myTiaFreqPopup->setEnabled(active); } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/AudioDialog.hxx b/src/gui/AudioDialog.hxx index c35cd82f5..a79cee551 100644 --- a/src/gui/AudioDialog.hxx +++ b/src/gui/AudioDialog.hxx @@ -45,7 +45,6 @@ class AudioDialog : public Dialog StaticTextWidget* myVolumeLabel; PopUpWidget* myFragsizePopup; PopUpWidget* myFreqPopup; - PopUpWidget* myTiaFreqPopup; CheckboxWidget* mySoundEnableCheckbox; private: