mirror of
https://github.com/bsnes-emu/bsnes.git
synced 2025-04-02 10:42:14 -04:00
19e1d89f00
byuu says:
Changelog:
- SFC: balanced profile removed
- SFC: performance profile removed
- SFC: code for handling non-threaded CPU, SMP, DSP, PPU removed
- SFC: Coprocessor, Controller (and expansion port) shared Thread code
merged to SFC::Cothread
- Cothread here just means "Thread with CPU affinity" (couldn't think
of a better name, sorry)
- SFC: CPU now has vector<Thread*> coprocessors, peripherals;
- this is the beginning of work to allow expansion port devices to be
dynamically changed at run-time
- ruby: all audio drivers default to 48000hz instead of 22050hz now if
no frequency is assigned
- note: the WASAPI driver can default to whatever the native frequency
is; doesn't have to be 48000hz
- tomoko: removed the ability to change the frequency from the UI (but
it will display the frequency used)
- tomoko: removed the timing settings panel
- the goal is to work toward smooth video via adaptive sync
- the model is broken by not being in control of the audio frequency
anyway
- it's further broken by PAL running at 50hz and WSC running at 75hz
- it was always broken anyway by SNES interlace timing varying from
progressive timing
- higan: audio/ stub created (for now, it's just nall/dsp/ moved here
and included as a header)
- higan: video/ stub created
- higan/GNUmakefile: now includes build rules for essential components
(libco, emulator, audio, video)
The audio changes are in preparation to merge wareya's awesome WASAPI
work without the need for the nall/dsp resampler.
73 lines
1.7 KiB
C++
73 lines
1.7 KiB
C++
#include <ao/ao.h>
|
|
|
|
struct AudioAO : Audio {
|
|
~AudioAO() { term(); }
|
|
|
|
int driver_id;
|
|
ao_sample_format driver_format;
|
|
ao_device* audio_device = nullptr;
|
|
|
|
struct {
|
|
unsigned frequency = 48000;
|
|
} settings;
|
|
|
|
auto cap(const string& name) -> bool {
|
|
if(name == Audio::Frequency) return true;
|
|
return false;
|
|
}
|
|
|
|
auto get(const string& name) -> any {
|
|
if(name == Audio::Frequency) return settings.frequency;
|
|
return {};
|
|
}
|
|
|
|
auto set(const string& name, const any& value) -> bool {
|
|
if(name == Audio::Frequency && value.is<unsigned>()) {
|
|
settings.frequency = value.get<unsigned>();
|
|
if(audio_device) init();
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
auto sample(uint16_t l_sample, uint16_t r_sample) -> void {
|
|
uint32_t samp = (l_sample << 0) + (r_sample << 16);
|
|
ao_play(audio_device, (char*)&samp, 4); //This may need to be byte swapped for Big Endian
|
|
}
|
|
|
|
auto clear() -> void {
|
|
}
|
|
|
|
auto init() -> bool {
|
|
ao_initialize();
|
|
|
|
driver_id = ao_default_driver_id(); //ao_driver_id((const char*)driver)
|
|
if(driver_id < 0) return false;
|
|
|
|
driver_format.bits = 16;
|
|
driver_format.channels = 2;
|
|
driver_format.rate = settings.frequency;
|
|
driver_format.byte_format = AO_FMT_LITTLE;
|
|
|
|
ao_option* options = nullptr;
|
|
ao_info *di = ao_driver_info(driver_id);
|
|
if(!di) return false;
|
|
if(!strcmp(di->short_name, "alsa")) {
|
|
ao_append_option(&options, "buffer_time", "100000"); //100ms latency (default was 500ms)
|
|
}
|
|
|
|
audio_device = ao_open_live(driver_id, &driver_format, options);
|
|
if(!audio_device) return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
auto term() -> void {
|
|
if(audio_device) {
|
|
ao_close(audio_device);
|
|
audio_device = nullptr;
|
|
}
|
|
ao_shutdown();
|
|
}
|
|
};
|