diff options
| author | Rafaël Carré <rafael.carre@gmail.com> | 2010-05-27 12:00:23 +0000 |
|---|---|---|
| committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-05-27 12:00:23 +0000 |
| commit | b36e721aa66e20595eb4441edaaddac76f8d5147 (patch) | |
| tree | 09bf0d917cb6d04714ef9c21c26ee9f1a2a3d4d1 /apps/plugins/rockboy/rockboy.c | |
| parent | b0146de64cdcd581f4d179262d2361622c8de096 (diff) | |
| download | rockbox-b36e721aa66e20595eb4441edaaddac76f8d5147.tar.gz rockbox-b36e721aa66e20595eb4441edaaddac76f8d5147.zip | |
rockboy: rename pcm_*() functions to avoid namespace clash with rockbox
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26327 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/rockboy/rockboy.c')
| -rw-r--r-- | apps/plugins/rockboy/rockboy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 82f966763d..b95cd6d0ff 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
| @@ -361,7 +361,7 @@ static int gnuboy_main(const char *rom) | |||
| 361 | rb->lcd_puts(0,0,"Init video"); | 361 | rb->lcd_puts(0,0,"Init video"); |
| 362 | vid_init(); | 362 | vid_init(); |
| 363 | rb->lcd_puts(0,1,"Init sound"); | 363 | rb->lcd_puts(0,1,"Init sound"); |
| 364 | pcm_init(); | 364 | rockboy_pcm_init(); |
| 365 | rb->lcd_puts(0,2,"Loading rom"); | 365 | rb->lcd_puts(0,2,"Loading rom"); |
| 366 | loader_init(rom); | 366 | loader_init(rom); |
| 367 | if(shut) | 367 | if(shut) |
| @@ -438,7 +438,7 @@ enum plugin_status plugin_start(const void* parameter) | |||
| 438 | return PLUGIN_ERROR; | 438 | return PLUGIN_ERROR; |
| 439 | } | 439 | } |
| 440 | if(!rb->audio_status()) | 440 | if(!rb->audio_status()) |
| 441 | pcm_close(); | 441 | rockboy_pcm_close(); |
| 442 | 442 | ||
| 443 | rb->splash(HZ/2, "Closing Rockboy"); | 443 | rb->splash(HZ/2, "Closing Rockboy"); |
| 444 | 444 | ||