pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updates in inputdevice

Browse source
This commit is contained in:
Dimitris Panokostas 2017-02-28 16:05:32 +01:00
parent 914677fdb7
commit 3c37275593
13 changed files with 882 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/sounddep/sound.h
View file

@ -12,11 +12,11 @@
#define SOUND_BUFFERS_COUNT 4
#define SNDBUFFER_LEN 2048
extern uae_u16 sndbuffer[SOUND_BUFFERS_COUNT][(SNDBUFFER_LEN+32)*DEFAULT_SOUND_CHANNELS];
extern uae_u16 *sndbufpt;
extern uae_u16 paula_sndbuffer[SOUND_BUFFERS_COUNT][(SNDBUFFER_LEN+32)*DEFAULT_SOUND_CHANNELS];
extern uae_u16 *paula_sndbufpt;
extern uae_u16 *render_sndbuff;
extern uae_u16 *finish_sndbuff;
extern int sndbufsize;
extern int paula_sndbufsize;
extern void finish_sound_buffer (void);
extern void restart_sound_buffer (void);
extern void pause_sound_buffer (void);
@ -28,23 +28,26 @@ extern int setup_sound (void);
extern void resume_sound (void);
extern void pause_sound (void);
extern void reset_sound (void);
extern void sound_mute(int);
extern void sound_volume (int);
extern void set_volume(int, int);
extern void master_sound_volume(int);
STATIC_INLINE void set_sound_buffers (void)
{
}
#define check_sound_buffers() { if (sndbufpt >= finish_sndbuff) finish_sound_buffer (); }
#define check_sound_buffers() { if (paula_sndbufpt >= finish_sndbuff) finish_sound_buffer (); }
STATIC_INLINE void clear_sound_buffers (void)
{
memset (sndbuffer, 0, sizeof(sndbuffer));
memset (paula_sndbuffer, 0, sizeof(paula_sndbuffer));
}
#define PUT_SOUND_WORD_MONO(x) put_sound_word_mono_func(x)
#define PUT_SOUND_WORD(b) do { *sndbufpt = b; sndbufpt = sndbufpt + 1; } while (0)
#define PUT_SOUND_WORD_STEREO(l,r) do { *((uae_u32 *)sndbufpt) = (r << 16) | (l & 0xffff); sndbufpt = sndbufpt + 2; } while (0)
#define PUT_SOUND_WORD(b) do { *paula_sndbufpt = b; paula_sndbufpt = paula_sndbufpt + 1; } while (0)
#define PUT_SOUND_WORD_STEREO(l,r) do { *((uae_u32 *)paula_sndbufpt) = (r << 16) | (l & 0xffff); paula_sndbufpt = paula_sndbufpt + 2; } while (0)
#define PUT_SOUND_WORD_LEFT(b) do { if (currprefs.sound_filter) b = filter (b, &sound_filter_state[0]); PUT_SOUND_WORD(b); } while (0)
#define PUT_SOUND_WORD_RIGHT(b) do { if (currprefs.sound_filter) b = filter (b, &sound_filter_state[1]); PUT_SOUND_WORD(b); } while (0)

32
src/sounddep/sound_sdl_new.cpp
View file

@ -37,11 +37,11 @@ int produce_sound = 0;
int changed_produce_sound = 0;
// #define SOUND_USE_SEMAPHORES
uae_u16 sndbuffer[SOUND_BUFFERS_COUNT][(SNDBUFFER_LEN + 32)*DEFAULT_SOUND_CHANNELS];
uae_u16 paula_sndbuffer[SOUND_BUFFERS_COUNT][(SNDBUFFER_LEN + 32)*DEFAULT_SOUND_CHANNELS];
unsigned n_callback_sndbuff, n_render_sndbuff;
uae_u16 *sndbufpt = sndbuffer[0];
uae_u16 *render_sndbuff = sndbuffer[0];
uae_u16 *finish_sndbuff = sndbuffer[0] + SNDBUFFER_LEN * 2;
uae_u16 *paula_sndbufpt = paula_sndbuffer[0];
uae_u16 *render_sndbuff = paula_sndbuffer[0];
uae_u16 *finish_sndbuff = paula_sndbuffer[0] + SNDBUFFER_LEN * 2;
uae_u16 cdaudio_buffer[CDAUDIO_BUFFERS][(CDAUDIO_BUFFER_LEN + 32) * 2];
uae_u16 *cdbufpt = cdaudio_buffer[0];
@ -119,13 +119,13 @@ static void sound_copy_produced_block(void *ud, Uint8 *stream, int len)
if (cdaudio_active && currprefs.sound_freq == 44100 && cdrdcnt < cdwrcnt)
{
for (int i = 0; i < SNDBUFFER_LEN * 2; ++i)
sndbuffer[rdcnt % SOUND_BUFFERS_COUNT][i] += cdaudio_buffer[cdrdcnt & (CDAUDIO_BUFFERS - 1)][i];
paula_sndbuffer[rdcnt % SOUND_BUFFERS_COUNT][i] += cdaudio_buffer[cdrdcnt & (CDAUDIO_BUFFERS - 1)][i];
}
memcpy(stream, sndbuffer[rdcnt % SOUND_BUFFERS_COUNT], MIN(SNDBUFFER_LEN * 4, len));
memcpy(stream, paula_sndbuffer[rdcnt % SOUND_BUFFERS_COUNT], MIN(SNDBUFFER_LEN * 4, len));
}
else
memcpy(stream, sndbuffer[rdcnt % SOUND_BUFFERS_COUNT], MIN(SNDBUFFER_LEN * 2, len));
memcpy(stream, paula_sndbuffer[rdcnt % SOUND_BUFFERS_COUNT], MIN(SNDBUFFER_LEN * 2, len));
//cdrdcnt = cdwrcnt;
@ -171,9 +171,9 @@ static void sound_thread_mixer(void *ud, Uint8 *stream, int len)
static void init_soundbuffer_usage(void)
{
sndbufpt = sndbuffer[0];
render_sndbuff = sndbuffer[0];
finish_sndbuff = sndbuffer[0] + SNDBUFFER_LEN * 2;
paula_sndbufpt = paula_sndbuffer[0];
render_sndbuff = paula_sndbuffer[0];
finish_sndbuff = paula_sndbuffer[0] + SNDBUFFER_LEN * 2;
//output_cnt = 0;
rdcnt = 0;
wrcnt = 0;
@ -273,13 +273,13 @@ void finish_sound_buffer(void)
// "GET NEXT PRODUCER BUFFER FOR WRITING"
wrcnt++;
sndbufpt = render_sndbuff = sndbuffer[wrcnt % SOUND_BUFFERS_COUNT];
paula_sndbufpt = render_sndbuff = paula_sndbuffer[wrcnt % SOUND_BUFFERS_COUNT];
if (currprefs.sound_stereo)
finish_sndbuff = sndbufpt + SNDBUFFER_LEN * 2;
finish_sndbuff = paula_sndbufpt + SNDBUFFER_LEN * 2;
else
finish_sndbuff = sndbufpt + SNDBUFFER_LEN;
finish_sndbuff = paula_sndbufpt + SNDBUFFER_LEN;
#ifdef SOUND_USE_SEMAPHORES
sem_post(&sound_sem);
@ -301,11 +301,11 @@ void pause_sound_buffer(void)
void restart_sound_buffer(void)
{
sndbufpt = render_sndbuff = sndbuffer[wrcnt % SOUND_BUFFERS_COUNT];
paula_sndbufpt = render_sndbuff = paula_sndbuffer[wrcnt % SOUND_BUFFERS_COUNT];
if (currprefs.sound_stereo)
finish_sndbuff = sndbufpt + SNDBUFFER_LEN * 2;
finish_sndbuff = paula_sndbufpt + SNDBUFFER_LEN * 2;
else
finish_sndbuff = sndbufpt + SNDBUFFER_LEN;
finish_sndbuff = paula_sndbufpt + SNDBUFFER_LEN;
cdbufpt = render_cdbuff = cdaudio_buffer[cdwrcnt & (CDAUDIO_BUFFERS - 1)];
finish_cdbuff = cdbufpt + CDAUDIO_BUFFER_LEN * 2;