mirror of
https://github.com/bsnes-emu/bsnes.git
synced 2025-04-02 10:42:14 -04:00
1a7bc6bb87
byuu says:
Lots of changes this time around. FreeBSD stability and compilation is
still a work in progress.
FreeBSD 10 + Clang 3.3 = 108fps
FreeBSD 10 + GCC 4.7 = 130fps
Errata 1: I've been fighting that god-damned endian.h header for the
past nine WIPs now. The above WIP isn't building now because FreeBSD
isn't including headers before using certain types, and you end up with
a trillion error messages. So just delete all the endian.h includes from
nall/intrinsics.hpp to build.
Errata 2: I was trying to match g++ and g++47, so I used $(findstring
g++,$(compiler)), which ends up also matching clang++. Oops. Easy fix,
put Clang first and then else if g++ next. Not ideal, but oh well. All
it's doing for now is declaring -fwrapv twice, so you don't have to fix
it just yet. Probably just going to alias g++="g++47" and do exact
matching instead.
Errata 3: both OpenGL::term and VideoGLX::term are causing a core dump
on BSD. No idea why. The resources are initialized and valid, but
releasing them crashes the application.
Changelog:
- nall/Makefile is more flexible with overriding $(compiler), so you can
build with GCC or Clang on BSD (defaults to GCC now)
- PLATFORM_X was renamed to PLATFORM_XORG, and it's also declared with
PLATFORM_LINUX or PLATFORM_BSD
- PLATFORM_XORG probably isn't the best name ... still thinking about
what best to call LINUX|BSD|SOLARIS or ^(WINDOWS|MACOSX)
- fixed a few legitimate Clang warning messages in nall
- Compiler::VisualCPP is ugly as hell, renamed to Compiler::CL
- nall/platform includes nall/intrinsics first. Trying to move away from
testing for _WIN32, etc directly in all files. Work in progress.
- nall turns off Clang warnings that I won't "fix", because they aren't
broken. It's much less noisy to compile with warnings on now.
- phoenix gains the ability to set background and foreground colors on
various text container widgets (GTK only for now.)
- rewrote a lot of the MSU1 code to try and simplify it. Really hope
I didn't break anything ... I don't have any MSU1 test ROMs handy
- SNES coprocessor audio is now mixed as sclamp<16>(system_sample
+ coprocessor_sample) instead of sclamp<16>((sys + cop) / 2)
- allows for greater chance of aliasing (still low, SNES audio is
quiet), but doesn't cut base system volume in half anymore
- fixed Super Scope and Justifier cursor colors
- use input.xlib instead of input.x ... allows Xlib input driver to be
visible on Linux and BSD once again
- make install and make uninstall must be run as root again; no longer
using install but cp instead for BSD compatibility
- killed $(DESTDIR) ... use make prefix=$DESTDIR$prefix instead
- you can now set text/background colors for the loki console via (eg):
- settings.terminal.background-color 0x000000
- settings.terminal.foreground-color 0xffffff
69 lines
1.8 KiB
C++
69 lines
1.8 KiB
C++
#ifdef SYSTEM_CPP
|
|
|
|
Audio audio;
|
|
|
|
void Audio::coprocessor_enable(bool state) {
|
|
coprocessor = state;
|
|
dspaudio.clear();
|
|
|
|
dsp_rdoffset = cop_rdoffset = 0;
|
|
dsp_wroffset = cop_wroffset = 0;
|
|
dsp_length = cop_length = 0;
|
|
}
|
|
|
|
void Audio::coprocessor_frequency(double input_frequency) {
|
|
dspaudio.setFrequency(input_frequency);
|
|
dspaudio.setResampler(nall::DSP::ResampleEngine::Sinc);
|
|
dspaudio.setResamplerFrequency(system.apu_frequency() / 768.0);
|
|
}
|
|
|
|
void Audio::sample(int16 lsample, int16 rsample) {
|
|
if(coprocessor == false) return interface->audioSample(lsample, rsample);
|
|
|
|
dsp_buffer[dsp_wroffset] = ((uint16)lsample << 0) + ((uint16)rsample << 16);
|
|
dsp_wroffset = (dsp_wroffset + 1) & buffer_mask;
|
|
dsp_length = (dsp_length + 1) & buffer_mask;
|
|
flush();
|
|
}
|
|
|
|
void Audio::coprocessor_sample(int16 lsample, int16 rsample) {
|
|
signed samples[] = {lsample, rsample};
|
|
dspaudio.sample(samples);
|
|
while(dspaudio.pending()) {
|
|
dspaudio.read(samples);
|
|
|
|
cop_buffer[cop_wroffset] = ((uint16)samples[0] << 0) + ((uint16)samples[1] << 16);
|
|
cop_wroffset = (cop_wroffset + 1) & buffer_mask;
|
|
cop_length = (cop_length + 1) & buffer_mask;
|
|
flush();
|
|
}
|
|
}
|
|
|
|
void Audio::init() {
|
|
}
|
|
|
|
void Audio::flush() {
|
|
while(dsp_length > 0 && cop_length > 0) {
|
|
uint32 dsp_sample = dsp_buffer[dsp_rdoffset];
|
|
uint32 cop_sample = cop_buffer[cop_rdoffset];
|
|
|
|
dsp_rdoffset = (dsp_rdoffset + 1) & buffer_mask;
|
|
cop_rdoffset = (cop_rdoffset + 1) & buffer_mask;
|
|
|
|
dsp_length--;
|
|
cop_length--;
|
|
|
|
signed dsp_left = (int16)(dsp_sample >> 0);
|
|
signed dsp_right = (int16)(dsp_sample >> 16);
|
|
|
|
signed cop_left = (int16)(cop_sample >> 0);
|
|
signed cop_right = (int16)(cop_sample >> 16);
|
|
|
|
interface->audioSample(
|
|
sclamp<16>(dsp_left + cop_left ),
|
|
sclamp<16>(dsp_right + cop_right)
|
|
);
|
|
}
|
|
}
|
|
|
|
#endif
|