Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-08 16:29:27 +00:00
Code Issues Projects Releases Wiki Activity
2cc23cf35d
apple2ix/src/audio/speaker.h

34 lines
867 B
C
Raw Normal View History

Timing model back to nanosleep for sound fidelity This is part 1 of 2 * Proper emulator timing is critical for emulating the Apple2 speaker with a square wave on a modern soundcard. The AppleWin sources provided reference, inspiration, and source for both timing and speaker emulation code. * cpu.S, cpu.h, timing.c : OK so I flip-flopped quite a bit here on how best to do proper emulator timing, but the previous spinloop implementation was not one of my more enlightened decisions :P ... cpu/power consumption nightmare ... * ds-shim.h, win-shim.h -- Shims for Windows-isms and DirectSound-isms. I assume these will eventually be refactored away... * soundcore.[hc], speaker.[hc] -- Directly ported from a recent version of AppleWin. Everything I've added should be braced with #ifdef APPLE2IX. * soundcore-alsa.[hc] -- An ALSA backend using mmap'ed soundcard access.
2013-10-06 06:22:08 +00:00
/*
Upgrade to GPLv3 "or later" and update copyrights
2015-10-22 05:13:26 +00:00
* Apple // emulator for *ix
Timing model back to nanosleep for sound fidelity This is part 1 of 2 * Proper emulator timing is critical for emulating the Apple2 speaker with a square wave on a modern soundcard. The AppleWin sources provided reference, inspiration, and source for both timing and speaker emulation code. * cpu.S, cpu.h, timing.c : OK so I flip-flopped quite a bit here on how best to do proper emulator timing, but the previous spinloop implementation was not one of my more enlightened decisions :P ... cpu/power consumption nightmare ... * ds-shim.h, win-shim.h -- Shims for Windows-isms and DirectSound-isms. I assume these will eventually be refactored away... * soundcore.[hc], speaker.[hc] -- Directly ported from a recent version of AppleWin. Everything I've added should be braced with #ifdef APPLE2IX. * soundcore-alsa.[hc] -- An ALSA backend using mmap'ed soundcard access.
2013-10-06 06:22:08 +00:00
*
* This software package is subject to the GNU General Public License
Upgrade to GPLv3 "or later" and update copyrights
2015-10-22 05:13:26 +00:00
* version 3 or later (your choice) as published by the Free Software
Timing model back to nanosleep for sound fidelity This is part 1 of 2 * Proper emulator timing is critical for emulating the Apple2 speaker with a square wave on a modern soundcard. The AppleWin sources provided reference, inspiration, and source for both timing and speaker emulation code. * cpu.S, cpu.h, timing.c : OK so I flip-flopped quite a bit here on how best to do proper emulator timing, but the previous spinloop implementation was not one of my more enlightened decisions :P ... cpu/power consumption nightmare ... * ds-shim.h, win-shim.h -- Shims for Windows-isms and DirectSound-isms. I assume these will eventually be refactored away... * soundcore.[hc], speaker.[hc] -- Directly ported from a recent version of AppleWin. Everything I've added should be braced with #ifdef APPLE2IX. * soundcore-alsa.[hc] -- An ALSA backend using mmap'ed soundcard access.
2013-10-06 06:22:08 +00:00
* Foundation.
*
Upgrade to GPLv3 "or later" and update copyrights
2015-10-22 05:13:26 +00:00
* Copyright 2013-2015 Aaron Culliney
Timing model back to nanosleep for sound fidelity This is part 1 of 2 * Proper emulator timing is critical for emulating the Apple2 speaker with a square wave on a modern soundcard. The AppleWin sources provided reference, inspiration, and source for both timing and speaker emulation code. * cpu.S, cpu.h, timing.c : OK so I flip-flopped quite a bit here on how best to do proper emulator timing, but the previous spinloop implementation was not one of my more enlightened decisions :P ... cpu/power consumption nightmare ... * ds-shim.h, win-shim.h -- Shims for Windows-isms and DirectSound-isms. I assume these will eventually be refactored away... * soundcore.[hc], speaker.[hc] -- Directly ported from a recent version of AppleWin. Everything I've added should be braced with #ifdef APPLE2IX. * soundcore-alsa.[hc] -- An ALSA backend using mmap'ed soundcard access.
2013-10-06 06:22:08 +00:00
*
*/
#ifndef _SPEAKER_H_
#define _SPEAKER_H_
Use single buffer queue callback for OpenSLES/Android - OpenSLES Callback now performs simple mix of 2 sources (speaker and mockingboard) - Avoids multiple callbacks which was a performance penalty especially for low-end droids
2015-07-11 21:37:41 +00:00
// leaky detail : max amplitude should be <= SHRT_MAX/2 to not overflow/clip 16bit samples when simple additive mixing
// between speaker and mockingboard
#define SPKR_DATA_INIT (SHRT_MAX>>3) // 0x0FFF
Timing model back to nanosleep for sound fidelity This is part 1 of 2 * Proper emulator timing is critical for emulating the Apple2 speaker with a square wave on a modern soundcard. The AppleWin sources provided reference, inspiration, and source for both timing and speaker emulation code. * cpu.S, cpu.h, timing.c : OK so I flip-flopped quite a bit here on how best to do proper emulator timing, but the previous spinloop implementation was not one of my more enlightened decisions :P ... cpu/power consumption nightmare ... * ds-shim.h, win-shim.h -- Shims for Windows-isms and DirectSound-isms. I assume these will eventually be refactored away... * soundcore.[hc], speaker.[hc] -- Directly ported from a recent version of AppleWin. Everything I've added should be braced with #ifdef APPLE2IX. * soundcore-alsa.[hc] -- An ALSA backend using mmap'ed soundcard access.
2013-10-06 06:22:08 +00:00
Refactor speaker system to prevent audio glitches and to support CPU automatic speed switching Squashed commit of the following: REFACTOR : fix comments, logging, and rename some variables REFACTOR : fix up some commentary, clean deadc0de REFACTOR : mostly fix all the audio glitches - amplitudes of samples are gradually shifted to zero when speaker has fallen silent - simplifies speaker state machine - fullspeed mode only enqueues quiet samples REFACTOR : fix up a number of other functions and comments REFACTOR : clean up code to submit normal speed wave buffer to OpenAL Move some initializations to the cpu_thread() REFACTOR : properly reset the speaker cycles access counter so we don't underflow and assert REFACTOR : should never get a split buffer from our soundcore implementation Fix warning from gcc ... static array size needs to be computed from integer values REFACTOR : gcc (but not clang) complains about these, so just make them preprocessor defines REFACTOR : use unsigned long long because we don't actually care that this counter is 64bit REFACTOR : remainder_buffer and miscellaneous tweaks - Adds implementation commentary to document remainder_buffer purpose - Also adds sample average for square wave boundary in case where remainder_buffer not used (whole-sample boundary) - Variable renaming and code shuffling REFACTOR : do not dynamically alloc remainder buffer - Never attribute to cache-coherancy bugs what is a simple thread race =P REFACTOR : comments and whitespace REFACTOR : rename public speaker API functions REFACTOR : clean up public speaker API REFACTOR : tabs to spaces REFACTOR : moar deadc0de clean up and renaming REFACTOR : remove deadc0de paths from soundcore REFACTOR : fully excise soundtype stuff now that we only support soundcard output Move a file static to function scope REFACTOR : rename more variables and remove deadc0de REFACTOR : samples_buffer naming and change to explict int16_t REFACTOR : removed deadc0de and shuffled code locations REFACTOR : remainder buffer naming and clarify type REFACTOR : move joystick timing to VM module and remove header visibility REFACTOR : clarify speaker variable name REFACTOR : clarify cycle counting codepaths REFACTOR : VBL/timing interfaces - eliminates passing around a common global REFACTOR : names and comments HACK around volume issue REFACTOR : rename speaker feedback variable REFACTOR : rename global total cycle count REFACTOR : rename a constant Fix test builds REFACTOR: rename to is_fullspeed REFACTOR : local variable naming changes REFACTOR : migrate cycle timing variables to correct location and remove header visibility Allow fullspeed codepath to update speaker REFACTOR : remove deadc0de paths in prep for cleanup REFACTOR : speaker now manages its own VM entry point
2015-01-31 21:57:10 +00:00
void speaker_init(void);
void speaker_destroy(void);
void speaker_reset(void);
void speaker_flush(void);
Use single buffer queue callback for OpenSLES/Android - OpenSLES Callback now performs simple mix of 2 sources (speaker and mockingboard) - Avoids multiple callbacks which was a performance penalty especially for low-end droids
2015-07-11 21:37:41 +00:00
void speaker_setVolumeZeroToTen(unsigned long goesToTen);
Renamed some speaker API methods
2015-07-12 20:00:39 +00:00
bool speaker_isActive(void);
Refactor speaker system to prevent audio glitches and to support CPU automatic speed switching Squashed commit of the following: REFACTOR : fix comments, logging, and rename some variables REFACTOR : fix up some commentary, clean deadc0de REFACTOR : mostly fix all the audio glitches - amplitudes of samples are gradually shifted to zero when speaker has fallen silent - simplifies speaker state machine - fullspeed mode only enqueues quiet samples REFACTOR : fix up a number of other functions and comments REFACTOR : clean up code to submit normal speed wave buffer to OpenAL Move some initializations to the cpu_thread() REFACTOR : properly reset the speaker cycles access counter so we don't underflow and assert REFACTOR : should never get a split buffer from our soundcore implementation Fix warning from gcc ... static array size needs to be computed from integer values REFACTOR : gcc (but not clang) complains about these, so just make them preprocessor defines REFACTOR : use unsigned long long because we don't actually care that this counter is 64bit REFACTOR : remainder_buffer and miscellaneous tweaks - Adds implementation commentary to document remainder_buffer purpose - Also adds sample average for square wave boundary in case where remainder_buffer not used (whole-sample boundary) - Variable renaming and code shuffling REFACTOR : do not dynamically alloc remainder buffer - Never attribute to cache-coherancy bugs what is a simple thread race =P REFACTOR : comments and whitespace REFACTOR : rename public speaker API functions REFACTOR : clean up public speaker API REFACTOR : tabs to spaces REFACTOR : moar deadc0de clean up and renaming REFACTOR : remove deadc0de paths from soundcore REFACTOR : fully excise soundtype stuff now that we only support soundcard output Move a file static to function scope REFACTOR : rename more variables and remove deadc0de REFACTOR : samples_buffer naming and change to explict int16_t REFACTOR : removed deadc0de and shuffled code locations REFACTOR : remainder buffer naming and clarify type REFACTOR : move joystick timing to VM module and remove header visibility REFACTOR : clarify speaker variable name REFACTOR : clarify cycle counting codepaths REFACTOR : VBL/timing interfaces - eliminates passing around a common global REFACTOR : names and comments HACK around volume issue REFACTOR : rename speaker feedback variable REFACTOR : rename global total cycle count REFACTOR : rename a constant Fix test builds REFACTOR: rename to is_fullspeed REFACTOR : local variable naming changes REFACTOR : migrate cycle timing variables to correct location and remove header visibility Allow fullspeed codepath to update speaker REFACTOR : remove deadc0de paths in prep for cleanup REFACTOR : speaker now manages its own VM entry point
2015-01-31 21:57:10 +00:00
/*
* returns the machine cycles per sample
Remove hardcoded sample rate and buffer sizes - Audio backend now specifies the sample rate and min/ideal buffer size for mono and stereo audio - Increase maximum speaker amplitude
2015-07-02 05:54:09 +00:00
* - for example, emulator running at normal speed: CLK_6502 / 44.1kHz == ~23
Refactor speaker system to prevent audio glitches and to support CPU automatic speed switching Squashed commit of the following: REFACTOR : fix comments, logging, and rename some variables REFACTOR : fix up some commentary, clean deadc0de REFACTOR : mostly fix all the audio glitches - amplitudes of samples are gradually shifted to zero when speaker has fallen silent - simplifies speaker state machine - fullspeed mode only enqueues quiet samples REFACTOR : fix up a number of other functions and comments REFACTOR : clean up code to submit normal speed wave buffer to OpenAL Move some initializations to the cpu_thread() REFACTOR : properly reset the speaker cycles access counter so we don't underflow and assert REFACTOR : should never get a split buffer from our soundcore implementation Fix warning from gcc ... static array size needs to be computed from integer values REFACTOR : gcc (but not clang) complains about these, so just make them preprocessor defines REFACTOR : use unsigned long long because we don't actually care that this counter is 64bit REFACTOR : remainder_buffer and miscellaneous tweaks - Adds implementation commentary to document remainder_buffer purpose - Also adds sample average for square wave boundary in case where remainder_buffer not used (whole-sample boundary) - Variable renaming and code shuffling REFACTOR : do not dynamically alloc remainder buffer - Never attribute to cache-coherancy bugs what is a simple thread race =P REFACTOR : comments and whitespace REFACTOR : rename public speaker API functions REFACTOR : clean up public speaker API REFACTOR : tabs to spaces REFACTOR : moar deadc0de clean up and renaming REFACTOR : remove deadc0de paths from soundcore REFACTOR : fully excise soundtype stuff now that we only support soundcard output Move a file static to function scope REFACTOR : rename more variables and remove deadc0de REFACTOR : samples_buffer naming and change to explict int16_t REFACTOR : removed deadc0de and shuffled code locations REFACTOR : remainder buffer naming and clarify type REFACTOR : move joystick timing to VM module and remove header visibility REFACTOR : clarify speaker variable name REFACTOR : clarify cycle counting codepaths REFACTOR : VBL/timing interfaces - eliminates passing around a common global REFACTOR : names and comments HACK around volume issue REFACTOR : rename speaker feedback variable REFACTOR : rename global total cycle count REFACTOR : rename a constant Fix test builds REFACTOR: rename to is_fullspeed REFACTOR : local variable naming changes REFACTOR : migrate cycle timing variables to correct location and remove header visibility Allow fullspeed codepath to update speaker REFACTOR : remove deadc0de paths in prep for cleanup REFACTOR : speaker now manages its own VM entry point
2015-01-31 21:57:10 +00:00
*/
Renamed some speaker API methods
2015-07-12 20:00:39 +00:00
double speaker_cyclesPerSample(void);
Timing model back to nanosleep for sound fidelity This is part 1 of 2 * Proper emulator timing is critical for emulating the Apple2 speaker with a square wave on a modern soundcard. The AppleWin sources provided reference, inspiration, and source for both timing and speaker emulation code. * cpu.S, cpu.h, timing.c : OK so I flip-flopped quite a bit here on how best to do proper emulator timing, but the previous spinloop implementation was not one of my more enlightened decisions :P ... cpu/power consumption nightmare ... * ds-shim.h, win-shim.h -- Shims for Windows-isms and DirectSound-isms. I assume these will eventually be refactored away... * soundcore.[hc], speaker.[hc] -- Directly ported from a recent version of AppleWin. Everything I've added should be braced with #ifdef APPLE2IX. * soundcore-alsa.[hc] -- An ALSA backend using mmap'ed soundcard access.
2013-10-06 06:22:08 +00:00
#endif /* whole file */
Reference in New Issue Copy Permalink