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

Standup basic audio event triggering

This commit is contained in:
bh247484 2025-02-26 20:09:36 -06:00
parent 0525ea043e
commit 0e4db102e2
11 changed files with 93120 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,80 @@
{
"cmake.sourceDirectory": "/Users/bh/Documents/personal-code/snes9x/gtk",
"files.associations": {
"vector": "cpp",
"numeric": "cpp",
"cmath": "cpp",
"sstream": "cpp",
"fstream": "cpp",
"utility": "cpp",
"atomic": "cpp",
"bitset": "cpp",
"limits": "cpp",
"algorithm": "cpp",
"string": "cpp",
"cstdint": "cpp",
"thread": "cpp",
"cstdio": "cpp",
"tuple": "cpp",
"chrono": "cpp",
"filesystem": "cpp",
"__bit_reference": "cpp",
"__hash_table": "cpp",
"__locale": "cpp",
"__node_handle": "cpp",
"__split_buffer": "cpp",
"__threading_support": "cpp",
"__tree": "cpp",
"__verbose_abort": "cpp",
"any": "cpp",
"array": "cpp",
"cctype": "cpp",
"charconv": "cpp",
"cinttypes": "cpp",
"clocale": "cpp",
"complex": "cpp",
"condition_variable": "cpp",
"csignal": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"deque": "cpp",
"execution": "cpp",
"memory": "cpp",
"forward_list": "cpp",
"future": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"ios": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"list": "cpp",
"locale": "cpp",
"map": "cpp",
"mutex": "cpp",
"new": "cpp",
"optional": "cpp",
"ostream": "cpp",
"print": "cpp",
"queue": "cpp",
"ratio": "cpp",
"set": "cpp",
"shared_mutex": "cpp",
"source_location": "cpp",
"span": "cpp",
"stack": "cpp",
"stdexcept": "cpp",
"streambuf": "cpp",
"string_view": "cpp",
"typeinfo": "cpp",
"unordered_map": "cpp",
"unordered_set": "cpp",
"variant": "cpp",
"__config": "cpp"
}
}

36
apu/apu.cpp
View File

@ -12,6 +12,8 @@
#include "../snapshot.h"
#include "../display.h"
#include "resampler.h"
#include "hbbh/Orchestrator.h"
// #include "macosx/gtk_sound.h" <-- revisit this...
#include "bapu/snes/snes.hpp"
@ -61,16 +63,36 @@ static Resampler resampler;
static std::vector<int16_t> resampler_buffer;
} // namespace msu
// Attempt to write into new resampler.
// Foiled by emu lifecycle nuances/timing.
// namespace hbh {
// static Resampler resampler;
// static bool8 sound_in_sync = true;
// int sample_rate = Settings.SoundPlaybackRate;
// }
static void UpdatePlaybackRate(void);
static void SPCSnapshotCallback(void);
static inline int S9xAPUGetClock(int32);
static inline int S9xAPUGetClockRemainder(int32);
Orchestrator orch;
// Weirdly needs to be namespaced because SPC_DSP header code wraps/prefixes all included methods with `SNES::`.
namespace SNES {
void S9xForwardEvent(int snd_que)
{
// printf("snd_que: %d\n", snd_que);
orch.ForwardEvent(snd_que);
}
}
bool8 S9xMixSamples(uint8 *dest, int sample_count)
{
int16 *out = (int16 *)dest;
if (Settings.Mute)
// if (Settings.Mute)
if (true)
{
memset(out, 0, sample_count << 1);
S9xClearSamples();
@ -254,11 +276,23 @@ static inline int S9xAPUGetClockRemainder(int32 cpucycles)
uint8 S9xAPUReadPort(int port)
{
S9xAPUExecute();
// Early debugging work.
// uint8 val = (uint8)SNES::smp.port_read(port & 3);
// if (port != 0 && val != 0 && val != spc::last_value) {
// printf("%u - %d\n", val, port);
// }
// if (port != 0) {
// printf("%u - %d\n", val, port);
// }
// spc::last_value = val;
// return val;
return ((uint8)SNES::smp.port_read(port & 3));
}
void S9xAPUWritePort(int port, uint8 byte)
{
// printf("%u\n", byte);
S9xAPUExecute();
SNES::cpu.port_write(port & 3, byte);
}

2
apu/apu.h
View File

@ -29,6 +29,8 @@ void S9xAPULoadBlarggState(uint8 *oldblock);
void S9xAPUSaveState (uint8 *);
void S9xDumpSPCSnapshot (void);
bool8 S9xSPCDump (const char *);
void S9xForwardEvent (int snd_que);
// void S9xWriteToSoundDriver (int snd_que);
bool8 S9xInitSound (int);
bool8 S9xOpenSoundDevice (void);

9
apu/bapu/dsp/SPC_DSP.h
View File

@ -4,8 +4,8 @@
#ifndef SPC_DSP_H
#define SPC_DSP_H
#include "apu/apu.h"
#include "blargg_common.h"
extern "C" { typedef void (*dsp_copy_func_t)( unsigned char** io, void* state, size_t ); }
class SPC_DSP {
@ -262,7 +262,12 @@ inline int SPC_DSP::sample_count() const { return m.out - m.out_begin; }
inline int SPC_DSP::read( int addr ) const
{
assert( (unsigned) addr < register_count );
return m.external_regs [addr];
int data = m.external_regs[addr];
if ((addr >= v_srcn) && data != 0 && ((addr - v_srcn) % 0x10 == 0)) {
S9xForwardEvent(data);
printf("srcn (voice %d) - %d\n", (addr - v_srcn) / 0x10, data);
}
return data;
}
inline void SPC_DSP::write( int addr, int data )

43
apu/hbbh/Orchestrator.cpp Normal file
View File

@ -0,0 +1,43 @@
#include <iostream>
#include "Orchestrator.h"
#define MINIAUDIO_IMPLEMENTATION
#include "miniaudio.h"
// Constructor
Orchestrator::Orchestrator() {
ma_result result = ma_engine_init(NULL, &engine);
if (result != MA_SUCCESS) {
printf("Failed to initialize audio engine.");
}
channels = ma_engine_get_channels(&engine);
sampleRate = ma_engine_get_sample_rate(&engine);
graph = ma_engine_get_node_graph(&engine);
output = ma_engine_get_endpoint(&engine);
result = ma_sound_init_from_file(&engine, "/Users/bh/Documents/game-audio/snes9x/apu/hbbh/sfxFiles/blip.wav", MA_SOUND_FLAG_NO_DEFAULT_ATTACHMENT, NULL, NULL, &testSound);
if (result != MA_SUCCESS) {
printf("Failed to initialize testSound.");
}
result = ma_node_attach_output_bus(&testSound, 0, output, 0);
if (result != MA_SUCCESS) {
// Failed to attach node.
}
}
// Destructor
Orchestrator::~Orchestrator() {
ma_sound_uninit(&testSound);
ma_engine_uninit(&engine);
}
// Method to forward an event
void Orchestrator::ForwardEvent(int snd_queue) {
if (snd_queue == 3) {
ma_sound_start(&testSound);
}
std::cout << "Snd Queue: " << snd_queue << std::endl;
}

21
apu/hbbh/Orchestrator.h Normal file
View File

@ -0,0 +1,21 @@
// Node Graph
// single sfx branch trace
// sfx -> pitch -> more_dsp -> output
// One branch per sound
#include "miniaudio.h"
class Orchestrator {
ma_node_graph *graph;
ma_node *output;
ma_engine engine;
ma_uint32 channels;
ma_uint32 sampleRate;
ma_sound testSound;
public:
Orchestrator();
~Orchestrator();
void ForwardEvent(int snd_queue);
};

92621
apu/hbbh/miniaudio.h Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
apu/hbbh/sfxFiles/blip.wav Normal file
View File

Binary file not shown.

249
macosx/gtk_sound.cpp Normal file
View File

@ -0,0 +1,249 @@
/*****************************************************************************\
Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
This file is licensed under the Snes9x License.
For further information, consult the LICENSE file in the root directory.
\*****************************************************************************/
#include <unistd.h>
#include "gtk_s9x.h"
#include "gtk_sound.h"
#include "common/audio/s9x_sound_driver.hpp"
#include "snes9x.h"
#include "apu/apu.h"
#ifdef USE_PORTAUDIO
#include "common/audio/s9x_sound_driver_portaudio.hpp"
#endif
#ifdef USE_OSS
#include "common/audio/s9x_sound_driver_oss.hpp"
#endif
#include "common/audio/s9x_sound_driver_sdl.hpp"
#ifdef USE_ALSA
#include "common/audio/s9x_sound_driver_alsa.hpp"
#endif
#ifdef USE_PULSEAUDIO
#include "common/audio/s9x_sound_driver_pulse.hpp"
#endif
static int playback_rates[8] =
{
0, 8000, 11025, 16000, 22050, 32000, 44100, 48000
};
static S9xSoundDriver *driver;
// Revisit this...
// Try to write into built in sound driver.
// This is in macosx/gtk_sound.cpp not gtk/gtk_sound.cpp --- so it should be in the xcode build system.
void S9xSoundWriteSamples(int16_t *data, int num_samples)
{
if (driver)
driver->write_samples(data, num_samples);
}
int S9xSoundBase2log(int num)
{
int power;
if (num < 1)
return 0;
for (power = 0; num > 1; power++)
{
num >>= 1;
}
return power;
}
int S9xSoundPowerof2(int num)
{
return (1 << num);
}
std::vector<std::string> S9xGetSoundDriverNames()
{
std::vector<std::string> names;
#ifdef USE_PORTAUDIO
names.push_back("PortAudio");
#endif
#ifdef USE_OSS
names.push_back("OSS");
#endif
#ifdef USE_ALSA
names.push_back("ALSA");
#endif
#ifdef USE_PULSEAUDIO
names.push_back("PulseAudio");
#endif
names.push_back("SDL");
return names;
}
void S9xPortSoundInit()
{
if (gui_config->sound_driver >= (int)gui_config->sound_drivers.size())
gui_config->sound_driver = 0;
auto &name = gui_config->sound_drivers[gui_config->sound_driver];
#ifdef USE_PORTAUDIO
if (name == "PortAudio")
driver = new S9xPortAudioSoundDriver();
#endif
#ifdef USE_OSS
if (name == "OSS")
driver = new S9xOSSSoundDriver();
#endif
#ifdef USE_ALSA
if (name == "ALSA")
driver = new S9xAlsaSoundDriver();
#endif
#ifdef USE_PULSEAUDIO
if (name == "PulseAudio")
driver = new S9xPulseSoundDriver();
#endif
if (name == "SDL")
driver = new S9xSDLSoundDriver();
if (driver != NULL)
{
driver->init();
if (gui_config->auto_input_rate)
{
Settings.SoundInputRate = top_level->get_auto_input_rate();
if (Settings.SoundInputRate == 0.0)
{
Settings.SoundInputRate = 31950;
gui_config->auto_input_rate = 0;
}
}
else
{
Settings.SoundInputRate = CLAMP(gui_config->sound_input_rate, 31700, 32300);
}
Settings.SoundPlaybackRate = playback_rates[gui_config->sound_playback_rate];
S9xInitSound(0);
S9xSetSoundMute(false);
}
else
{
S9xSetSoundMute(gui_config->mute_sound);
}
}
void S9xPortSoundReinit()
{
S9xPortSoundDeinit();
/* Ensure the sound device is released before trying to reopen it. */
sync();
S9xPortSoundInit();
}
void S9xPortSoundDeinit()
{
S9xSoundStop();
if (driver)
driver->deinit();
delete driver;
}
void S9xSoundStart()
{
if (driver)
driver->start();
}
void S9xSoundStop()
{
if (driver)
driver->stop();
}
static std::vector<int16_t> temp_buffer;
void S9xSamplesAvailable(void *userdata)
{
bool clear_leftover_samples = false;
int samples = S9xGetSampleCount();
int space_free = driver->space_free();
if (space_free < samples)
{
if (!Settings.SoundSync)
clear_leftover_samples = true;
if (Settings.SoundSync && !Settings.TurboMode && !Settings.Mute)
{
for (int i = 0; i < 200; i++) // Wait for a max of 5ms
{
space_free = driver->space_free();
if (space_free < samples)
usleep(50);
else
break;
}
}
}
if (space_free < samples)
samples = space_free & ~1;
if (samples == 0)
{
S9xClearSamples();
return;
}
if ((int)temp_buffer.size() < samples)
temp_buffer.resize(samples);
S9xMixSamples((uint8_t *)temp_buffer.data(), samples);
driver->write_samples(temp_buffer.data(), samples);
if (clear_leftover_samples)
S9xClearSamples();
if (Settings.DynamicRateControl)
{
auto level = driver->buffer_level();
S9xUpdateDynamicRate(level.first, level.second);
}
}
bool8 S9xOpenSoundDevice()
{
if (gui_config->mute_sound)
return false;
gui_config->sound_buffer_size = CLAMP(gui_config->sound_buffer_size, 2, 256);
S9xSetSamplesAvailableCallback(S9xSamplesAvailable, nullptr);
return driver->open_device(Settings.SoundPlaybackRate, gui_config->sound_buffer_size);
}
/* This really shouldn't be in the port layer */
void S9xToggleSoundChannel(int c)
{
static int sound_switch = 255;
if (c == 8)
sound_switch = 255;
else
sound_switch ^= 1 << c;
S9xSetSoundControl(sound_switch);
}

24
macosx/gtk_sound.h Normal file
View File

@ -0,0 +1,24 @@
/*****************************************************************************\
Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
This file is licensed under the Snes9x License.
For further information, consult the LICENSE file in the root directory.
\*****************************************************************************/
#ifndef __GTK_SOUND_H
#define __GTK_SOUND_H
#include <vector>
#include <string>
void S9xPortSoundInit();
void S9xPortSoundDeinit();
void S9xPortSoundReinit();
void S9xSoundStart();
void S9xSoundStop();
extern void S9xSoundWriteSamples(int16_t *data, int num_samples);
int S9xSoundBase2log(int num);
int S9xSoundPowerof2(int num);
std::vector<std::string> S9xGetSoundDriverNames();
#endif /* __GTK_SOUND_H */

45
macosx/snes9x.xcodeproj/project.pbxproj
View File

@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 45;
objectVersion = 70;
objects = {
/* Begin PBXBuildFile section */
@ -574,6 +574,11 @@
F5FC76BD03873BBF01A80002 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
/* End PBXFileReference section */
/* Begin PBXFileSystemSynchronizedRootGroup section */
E1B687CC2D69A10A001C726B /* gtx */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = gtx; sourceTree = "<group>"; };
E1B687D72D6A9AD5001C726B /* hbbh */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = hbbh; sourceTree = "<group>"; };
/* End PBXFileSystemSynchronizedRootGroup section */
/* Begin PBXFrameworksBuildPhase section */
30714712230E379500917F82 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
@ -779,6 +784,7 @@
BF0B39791FA5792F002B04D3 /* apu */ = {
isa = PBXGroup;
children = (
E1B687D72D6A9AD5001C726B /* hbbh */,
BF0B397A1FA5792F002B04D3 /* apu.cpp */,
BF0B397B1FA5792F002B04D3 /* apu.h */,
BF0B397C1FA5792F002B04D3 /* bapu */,
@ -886,6 +892,7 @@
EAE061540526CCB900A80003 /* snes9x */ = {
isa = PBXGroup;
children = (
E1B687CC2D69A10A001C726B /* gtx */,
EAE0615A0526CCB900A80003 /* 65c816.h */,
BF0B39791FA5792F002B04D3 /* apu */,
85FEF90620DDB15B00C038E9 /* bml.cpp */,
@ -1206,6 +1213,10 @@
);
dependencies = (
);
fileSystemSynchronizedGroups = (
E1B687CC2D69A10A001C726B /* gtx */,
E1B687D72D6A9AD5001C726B /* hbbh */,
);
name = "snes9x framework";
productName = "snes9x framework";
productReference = 30D15CEF22CE6B5A005BC352 /* snes9x_framework.framework */;
@ -1499,7 +1510,10 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = Snes9x/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 1.63;
MTL_ENABLE_DEBUG_INFO = NO;
@ -1546,7 +1560,10 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = Snes9x/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 1.63;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
@ -1593,7 +1610,11 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = "snes9x framework/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
@ -1652,7 +1673,11 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = "snes9x framework/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
@ -1703,7 +1728,10 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES;
USER_HEADER_SEARCH_PATHS = "../apu/bapu ..";
USER_HEADER_SEARCH_PATHS = (
../apu/bapu,
..,
);
};
name = Debug;
};
@ -1737,7 +1765,10 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
USER_HEADER_SEARCH_PATHS = "../apu/bapu ..";
USER_HEADER_SEARCH_PATHS = (
../apu/bapu,
..,
);
};
name = Release;
};