diff options
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/rockboy/HACKING | 12 | ||||
| -rw-r--r-- | apps/plugins/rockboy/emu.c | 2 | ||||
| -rw-r--r-- | apps/plugins/rockboy/menu.c | 2 | ||||
| -rw-r--r-- | apps/plugins/rockboy/pcm.h | 6 | ||||
| -rw-r--r-- | apps/plugins/rockboy/rbsound.c | 12 | ||||
| -rw-r--r-- | apps/plugins/rockboy/rockboy.c | 4 | ||||
| -rw-r--r-- | apps/plugins/rockboy/sound.c | 2 |
7 files changed, 20 insertions, 20 deletions
diff --git a/apps/plugins/rockboy/HACKING b/apps/plugins/rockboy/HACKING index 3efd85e..b0b9169 100644 --- a/apps/plugins/rockboy/HACKING +++ b/apps/plugins/rockboy/HACKING @@ -364,22 +364,22 @@ called before reading or writing a sound register, and at the end of each frame. The main sound module interfaces with the system-specific code through -one structure, pcm, and a few functions: pcm_init, pcm_close, and -pcm_submit. While the first two should be obvious, pcm_submit needs +one structure, pcm, and a few functions: rockboy_pcm_init, rockboy_pcm_close, and +rockboy_pcm_submit. While the first two should be obvious, rockboy_pcm_submit needs some explaining. Whenever realtime sound output is operational, -pcm_submit is responsible for timing, and should not return until it +rockboy_pcm_submit is responsible for timing, and should not return until it has successfully processed all the data in its input buffer (pcm.buf). On *nix sound devices, this typically means just waiting for the write syscall to return, but on systems such as DOS where low level IO must -be handled in the program, pcm_submit needs to delay until the current +be handled in the program, rockboy_pcm_submit needs to delay until the current position in the DMA buffer has advanced sufficiently to make space for the new samples, then copy them. For special sound output implementations like write-to-file or the -dummy sound device, pcm_submit should write the data immediately and +dummy sound device, rockboy_pcm_submit should write the data immediately and return 0, indicating to the caller that other methods must be used for timing. On real sound devices that are presently functional, -pcm_submit should return 1, regardless of whether it buffered or +rockboy_pcm_submit should return 1, regardless of whether it buffered or actually wrote the sound data. And yes, for unices without OSS, we hope to add piped audio output diff --git a/apps/plugins/rockboy/emu.c b/apps/plugins/rockboy/emu.c index 08c4dab..57b82cf 100644 --- a/apps/plugins/rockboy/emu.c +++ b/apps/plugins/rockboy/emu.c @@ -56,7 +56,7 @@ void emu_run(void) if (options.sound || !plugbuf) { sound_mix(); - pcm_submit(); + rockboy_pcm_submit(); } doevents(); diff --git a/apps/plugins/rockboy/menu.c b/apps/plugins/rockboy/menu.c index b1a7389..6e8df5c 100644 --- a/apps/plugins/rockboy/menu.c +++ b/apps/plugins/rockboy/menu.c @@ -85,7 +85,7 @@ int do_user_menu(void) { "Load Game", "Save Game", "Options", "Quit"); - pcm_init(); + rockboy_pcm_init(); while(!done) { diff --git a/apps/plugins/rockboy/pcm.h b/apps/plugins/rockboy/pcm.h index b90bba0..795b2be 100644 --- a/apps/plugins/rockboy/pcm.h +++ b/apps/plugins/rockboy/pcm.h @@ -15,9 +15,9 @@ struct pcm extern struct pcm pcm; -void pcm_init(void); -int pcm_submit(void); -void pcm_close(void); +void rockboy_pcm_init(void); +int rockboy_pcm_submit(void); +void rockboy_pcm_close(void); #endif diff --git a/apps/plugins/rockboy/rbsound.c b/apps/plugins/rockboy/rbsound.c index ac5a29c..c0d0277 100644 --- a/apps/plugins/rockboy/rbsound.c +++ b/apps/plugins/rockboy/rbsound.c @@ -24,7 +24,7 @@ static void get_more(unsigned char** start, size_t* size) doneplay=1; } -void pcm_init(void) +void rockboy_pcm_init(void) { if(plugbuf) return; @@ -61,7 +61,7 @@ void pcm_init(void) rb->pcm_set_frequency(pcm.hz); /* 44100 22050 11025 */ } -void pcm_close(void) +void rockboy_pcm_close(void) { memset(&pcm, 0, sizeof pcm); newly_started = true; @@ -69,7 +69,7 @@ void pcm_close(void) rb->pcm_set_frequency(HW_SAMPR_DEFAULT); } -int pcm_submit(void) +int rockboy_pcm_submit(void) { if (!pcm.buf) return 0; if (pcm.pos < pcm.len) return 1; @@ -91,7 +91,7 @@ int pcm_submit(void) #else -void pcm_init(void) +void rockboy_pcm_init(void) { pcm.hz = 44100; pcm.stereo = 1; @@ -100,12 +100,12 @@ void pcm_init(void) pcm.pos = 0; } -void pcm_close(void) +void rockboy_pcm_close(void) { memset(&pcm, 0, sizeof pcm); } -int pcm_submit(void) +int rockboy_pcm_submit(void) { pcm.pos =0; return 0; diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 82f9667..b95cd6d 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c @@ -361,7 +361,7 @@ static int gnuboy_main(const char *rom) rb->lcd_puts(0,0,"Init video"); vid_init(); rb->lcd_puts(0,1,"Init sound"); - pcm_init(); + rockboy_pcm_init(); rb->lcd_puts(0,2,"Loading rom"); loader_init(rom); if(shut) @@ -438,7 +438,7 @@ enum plugin_status plugin_start(const void* parameter) return PLUGIN_ERROR; } if(!rb->audio_status()) - pcm_close(); + rockboy_pcm_close(); rb->splash(HZ/2, "Closing Rockboy"); diff --git a/apps/plugins/rockboy/sound.c b/apps/plugins/rockboy/sound.c index 6efc01b..e8b8c69 100644 --- a/apps/plugins/rockboy/sound.c +++ b/apps/plugins/rockboy/sound.c @@ -422,7 +422,7 @@ void sound_mix(void) if (pcm.buf) { if (pcm.pos >= pcm.len) - pcm_submit(); + rockboy_pcm_submit(); if (pcm.stereo) { pcm.buf[pcm.pos++] = l; |