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/rbsound.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/rbsound.c')
-rw-r--r-- | apps/plugins/rockboy/rbsound.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/plugins/rockboy/rbsound.c b/apps/plugins/rockboy/rbsound.c index ac5a29c517..c0d0277915 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) | |||
24 | doneplay=1; | 24 | doneplay=1; |
25 | } | 25 | } |
26 | 26 | ||
27 | void pcm_init(void) | 27 | void rockboy_pcm_init(void) |
28 | { | 28 | { |
29 | if(plugbuf) | 29 | if(plugbuf) |
30 | return; | 30 | return; |
@@ -61,7 +61,7 @@ void pcm_init(void) | |||
61 | rb->pcm_set_frequency(pcm.hz); /* 44100 22050 11025 */ | 61 | rb->pcm_set_frequency(pcm.hz); /* 44100 22050 11025 */ |
62 | } | 62 | } |
63 | 63 | ||
64 | void pcm_close(void) | 64 | void rockboy_pcm_close(void) |
65 | { | 65 | { |
66 | memset(&pcm, 0, sizeof pcm); | 66 | memset(&pcm, 0, sizeof pcm); |
67 | newly_started = true; | 67 | newly_started = true; |
@@ -69,7 +69,7 @@ void pcm_close(void) | |||
69 | rb->pcm_set_frequency(HW_SAMPR_DEFAULT); | 69 | rb->pcm_set_frequency(HW_SAMPR_DEFAULT); |
70 | } | 70 | } |
71 | 71 | ||
72 | int pcm_submit(void) | 72 | int rockboy_pcm_submit(void) |
73 | { | 73 | { |
74 | if (!pcm.buf) return 0; | 74 | if (!pcm.buf) return 0; |
75 | if (pcm.pos < pcm.len) return 1; | 75 | if (pcm.pos < pcm.len) return 1; |
@@ -91,7 +91,7 @@ int pcm_submit(void) | |||
91 | 91 | ||
92 | #else | 92 | #else |
93 | 93 | ||
94 | void pcm_init(void) | 94 | void rockboy_pcm_init(void) |
95 | { | 95 | { |
96 | pcm.hz = 44100; | 96 | pcm.hz = 44100; |
97 | pcm.stereo = 1; | 97 | pcm.stereo = 1; |
@@ -100,12 +100,12 @@ void pcm_init(void) | |||
100 | pcm.pos = 0; | 100 | pcm.pos = 0; |
101 | } | 101 | } |
102 | 102 | ||
103 | void pcm_close(void) | 103 | void rockboy_pcm_close(void) |
104 | { | 104 | { |
105 | memset(&pcm, 0, sizeof pcm); | 105 | memset(&pcm, 0, sizeof pcm); |
106 | } | 106 | } |
107 | 107 | ||
108 | int pcm_submit(void) | 108 | int rockboy_pcm_submit(void) |
109 | { | 109 | { |
110 | pcm.pos =0; | 110 | pcm.pos =0; |
111 | return 0; | 111 | return 0; |