#include "sound.h"
#include <string.h> // For memset, memcpy
-#include <SDL.h>
+#include <SDL2/SDL.h>
#include "log.h"
// Useful defines
// Local variables
static SDL_AudioSpec desired, obtained;
+static SDL_AudioDeviceID device;
static bool soundInitialized = false;
static bool speakerState = false;
-static int16 soundBuffer[SOUND_BUFFER_SIZE];
-static uint32 soundBufferPos;
-static uint64 lastToggleCycles;
+static int16_t soundBuffer[SOUND_BUFFER_SIZE];
+static uint32_t soundBufferPos;
+static uint64_t lastToggleCycles;
static SDL_cond * conditional = NULL;
static SDL_mutex * mutex = NULL;
static SDL_mutex * mutex2 = NULL;
-static int16 sample;
-static uint8 ampPtr = 14; // Start with -16 - +16
-static int16 amplitude[17] = { 0, 1, 2, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047,
+static int16_t sample;
+static uint8_t ampPtr = 12; // Start with -2047 - +2047
+static int16_t amplitude[17] = { 0, 1, 2, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047,
4095, 8191, 16383, 32767 };
#ifdef WRITE_OUT_WAVE
static FILE * fp = NULL;
static void SDLSoundCallback(void * userdata, Uint8 * buffer, int length);
+
//
// Initialize the SDL sound system
//
// To weed out problems for now...
return;
#endif
-
+ SDL_zero(desired);
desired.freq = SAMPLE_RATE; // SDL will do conversion on the fly, if it can't get the exact rate. Nice!
-// desired.format = AUDIO_S8; // This uses the native endian (for portability)...
desired.format = AUDIO_S16SYS; // This uses the native endian (for portability)...
desired.channels = 1;
-// desired.samples = 4096; // Let's try a 4K buffer (can always go lower)
-// desired.samples = 2048; // Let's try a 2K buffer (can always go lower)
-// desired.samples = 1024; // Let's try a 1K buffer (can always go lower)
desired.samples = 512; // Let's try a 1/2K buffer (can always go lower)
desired.callback = SDLSoundCallback;
-// if (SDL_OpenAudio(&desired, NULL) < 0) // NULL means SDL guarantees what we want
-//When doing it this way, we need to check to see if we got what we asked for...
- if (SDL_OpenAudio(&desired, &obtained) < 0)
+ device = SDL_OpenAudioDevice(NULL, 0, &desired, &obtained, 0);
+
+ if (device == 0)
{
WriteLog("Sound: Failed to initialize SDL sound.\n");
return;
lastToggleCycles = 0;
sample = desired.silence; // ? wilwok ? yes
- SDL_PauseAudio(false); // Start playback!
+ SDL_PauseAudioDevice(device, 0); // Start playback!
soundInitialized = true;
WriteLog("Sound: Successfully initialized.\n");
#endif
}
+
//
// Close down the SDL sound subsystem
//
{
if (soundInitialized)
{
- SDL_PauseAudio(true);
- SDL_CloseAudio();
+// SDL_PauseAudio(true);
+ SDL_PauseAudioDevice(device, 1);
+// SDL_CloseAudio();
+ SDL_CloseAudioDevice(device);
SDL_DestroyCond(conditional);
SDL_DestroyMutex(mutex);
SDL_DestroyMutex(mutex2);
}
}
+
+void SoundPause(void)
+{
+ if (soundInitialized)
+ SDL_PauseAudioDevice(device, 1);
+}
+
+
+void SoundResume(void)
+{
+ if (soundInitialized)
+ SDL_PauseAudioDevice(device, 0);
+}
+
+
//
// Sound card callback handler
//
-static void SDLSoundCallback(void * userdata, Uint8 * buffer8, int length8)
+static void SDLSoundCallback(void * /*userdata*/, Uint8 * buffer8, int length8)
{
+//WriteLog("SDLSoundCallback(): begin (soundBufferPos=%i)\n", soundBufferPos);
// The sound buffer should only starve when starting which will cause it to
// lag behind the emulation at most by around 1 frame...
// (Actually, this should never happen since we fill the buffer beforehand.)
// Let's try using a mutex for shared resource consumption...
//Actually, I think Lock/UnlockAudio() does this already...
+//WriteLog("SDLSoundCallback: soundBufferPos = %i\n", soundBufferPos);
SDL_mutexP(mutex2);
// Recast this as a 16-bit type...
- int16 * buffer = (int16 *)buffer8;
- uint32 length = (uint32)length8 / 2;
+ int16_t * buffer = (int16_t *)buffer8;
+ uint32_t length = (uint32_t)length8 / 2;
+//WriteLog("SDLSoundCallback(): filling buffer...\n");
if (soundBufferPos < length) // The sound buffer is starved...
{
- for(uint32 i=0; i<soundBufferPos; i++)
+ for(uint32_t i=0; i<soundBufferPos; i++)
buffer[i] = soundBuffer[i];
// Fill buffer with last value
-// memset(buffer + soundBufferPos, (uint8)sample, length - soundBufferPos);
- for(uint32 i=soundBufferPos; i<length; i++)
- buffer[i] = (uint16)sample;
+// memset(buffer + soundBufferPos, (uint8_t)sample, length - soundBufferPos);
+ for(uint32_t i=soundBufferPos; i<length; i++)
+ buffer[i] = sample;
+
soundBufferPos = 0; // Reset soundBufferPos to start of buffer...
}
else
{
// Fill sound buffer with frame buffered sound
// memcpy(buffer, soundBuffer, length);
- for(uint32 i=0; i<length; i++)
+ for(uint32_t i=0; i<length; i++)
buffer[i] = soundBuffer[i];
+
soundBufferPos -= length;
// Move current buffer down to start
- for(uint32 i=0; i<soundBufferPos; i++)
+ for(uint32_t i=0; i<soundBufferPos; i++)
soundBuffer[i] = soundBuffer[length + i];
}
// Free the mutex...
+//WriteLog("SDLSoundCallback(): SDL_mutexV(mutex2)\n");
SDL_mutexV(mutex2);
// Wake up any threads waiting for the buffer to drain...
SDL_CondSignal(conditional);
+//WriteLog("SDLSoundCallback(): end\n");
}
+
+// This is called by the main CPU thread every ~21.333 cycles.
+void WriteSampleToBuffer(void)
+{
+//WriteLog("WriteSampleToBuffer(): SDL_mutexP(mutex2)\n");
+ SDL_mutexP(mutex2);
+
+ // This should almost never happen, but...
+ while (soundBufferPos >= (SOUND_BUFFER_SIZE - 1))
+ {
+//WriteLog("WriteSampleToBuffer(): Waiting for sound thread. soundBufferPos=%i, SOUNDBUFFERSIZE-1=%i\n", soundBufferPos, SOUND_BUFFER_SIZE-1);
+ SDL_mutexV(mutex2); // Release it so sound thread can get it,
+ SDL_mutexP(mutex); // Must lock the mutex for the cond to work properly...
+ SDL_CondWait(conditional, mutex); // Sleep/wait for the sound thread
+ SDL_mutexV(mutex); // Must unlock the mutex for the cond to work properly...
+ SDL_mutexP(mutex2); // Re-lock it until we're done with it...
+ }
+
+ soundBuffer[soundBufferPos++] = sample;
+//WriteLog("WriteSampleToBuffer(): SDL_mutexV(mutex2)\n");
+ SDL_mutexV(mutex2);
+}
+
+
// Need some interface functions here to take care of flipping the
// waveform at the correct time in the sound stream...
the time position back (or copies data down from what it took out)
*/
-void HandleBuffer(uint64 elapsedCycles)
+void HandleBuffer(uint64_t elapsedCycles)
{
// Step 1: Calculate delta time
- uint64 deltaCycles = elapsedCycles - lastToggleCycles;
+ uint64_t deltaCycles = elapsedCycles - lastToggleCycles;
// Step 2: Calculate new buffer position
- uint32 currentPos = (uint32)((double)deltaCycles / CYCLES_PER_SAMPLE);
+ uint32_t currentPos = (uint32_t)((double)deltaCycles / CYCLES_PER_SAMPLE);
// Step 3: Make sure there's room for it
// We need to lock since we touch both soundBuffer and soundBufferPos
SDL_mutexP(mutex2);
+
while ((soundBufferPos + currentPos) > (SOUND_BUFFER_SIZE - 1))
{
SDL_mutexV(mutex2); // Release it so sound thread can get it,
currentPos += soundBufferPos;
#ifdef WRITE_OUT_WAVE
- uint32 sbpSave = soundBufferPos;
+ uint32_t sbpSave = soundBufferPos;
#endif
// Backfill with current toggle state
while (soundBufferPos < currentPos)
- soundBuffer[soundBufferPos++] = (uint16)sample;
+ soundBuffer[soundBufferPos++] = sample;
#ifdef WRITE_OUT_WAVE
- fwrite(&soundBuffer[sbpSave], sizeof(int16), currentPos - sbpSave, fp);
+ fwrite(&soundBuffer[sbpSave], sizeof(int16_t), currentPos - sbpSave, fp);
#endif
SDL_mutexV(mutex2);
lastToggleCycles = elapsedCycles;
}
-void ToggleSpeaker(uint64 elapsedCycles)
+
+void ToggleSpeaker(uint64_t elapsedCycles)
{
if (!soundInitialized)
return;
- HandleBuffer(elapsedCycles);
+// HandleBuffer(elapsedCycles);
speakerState = !speakerState;
sample = (speakerState ? amplitude[ampPtr] : -amplitude[ampPtr]);
}
-void AdjustLastToggleCycles(uint64 elapsedCycles)
+
+void AdjustLastToggleCycles(uint64_t elapsedCycles)
{
if (!soundInitialized)
return;
HandleBuffer(elapsedCycles);
}
+
void VolumeUp(void)
{
- // Currently set for 8-bit samples
- // Now 16
+ // Currently set for 16-bit samples
if (ampPtr < 16)
ampPtr++;
}
+
void VolumeDown(void)
{
if (ampPtr > 0)
ampPtr--;
}
-uint8 GetVolume(void)
+
+uint8_t GetVolume(void)
{
return ampPtr;
}
projects / apple2 / blobdiff