diff options
author | Daniel Stenberg <daniel@haxx.se> | 2005-07-12 10:10:02 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2005-07-12 10:10:02 +0000 |
commit | 7ba03e627962e2f903b1c122b7b33d7ce3b7be06 (patch) | |
tree | 7b52eaf9fd5abd849a29ed96fba842ccfa497128 /apps/codecs | |
parent | a19acbdadd036e0d2c1ca000661c86922f775d56 (diff) | |
download | rockbox-7ba03e627962e2f903b1c122b7b33d7ce3b7be06.tar.gz rockbox-7ba03e627962e2f903b1c122b7b33d7ce3b7be06.zip |
removed an extra codec_api struct pointer and the function setting it
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7117 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs')
-rw-r--r-- | apps/codecs/lib/codeclib.c | 2 | ||||
-rw-r--r-- | apps/codecs/lib/codeclib.h | 2 | ||||
-rw-r--r-- | apps/codecs/lib/xxx2wav.c | 26 |
3 files changed, 12 insertions, 18 deletions
diff --git a/apps/codecs/lib/codeclib.c b/apps/codecs/lib/codeclib.c index 8b814d0f25..2494fe59f1 100644 --- a/apps/codecs/lib/codeclib.c +++ b/apps/codecs/lib/codeclib.c | |||
@@ -29,8 +29,6 @@ struct codec_api *local_rb; | |||
29 | int codec_init(struct codec_api* rb) | 29 | int codec_init(struct codec_api* rb) |
30 | { | 30 | { |
31 | local_rb = rb; | 31 | local_rb = rb; |
32 | |||
33 | xxx2wav_set_api(rb); | ||
34 | mem_ptr = 0; | 32 | mem_ptr = 0; |
35 | mallocbuf = (unsigned char *)rb->get_codec_memory((long *)&bufsize); | 33 | mallocbuf = (unsigned char *)rb->get_codec_memory((long *)&bufsize); |
36 | 34 | ||
diff --git a/apps/codecs/lib/codeclib.h b/apps/codecs/lib/codeclib.h index 762b68dd95..77276fbae2 100644 --- a/apps/codecs/lib/codeclib.h +++ b/apps/codecs/lib/codeclib.h | |||
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | extern int mem_ptr; | 25 | extern int mem_ptr; |
26 | extern int bufsize; | 26 | extern int bufsize; |
27 | extern unsigned char* mallocbuf; // 512K from the start of MP3 buffer | 27 | extern unsigned char* mallocbuf; /* 512K from the start of MP3 buffer */ |
28 | 28 | ||
29 | void* codec_malloc(size_t size); | 29 | void* codec_malloc(size_t size); |
30 | void* codec_calloc(size_t nmemb, size_t size); | 30 | void* codec_calloc(size_t nmemb, size_t size); |
diff --git a/apps/codecs/lib/xxx2wav.c b/apps/codecs/lib/xxx2wav.c index 8b61e3c6e7..338f1c41aa 100644 --- a/apps/codecs/lib/xxx2wav.c +++ b/apps/codecs/lib/xxx2wav.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include "codecs.h" | 25 | #include "codecs.h" |
26 | #include "xxx2wav.h" | 26 | #include "xxx2wav.h" |
27 | 27 | ||
28 | static struct codec_api* local_rb; | 28 | extern struct codec_api* local_rb; |
29 | 29 | ||
30 | int mem_ptr; | 30 | int mem_ptr; |
31 | int bufsize; | 31 | int bufsize; |
@@ -38,7 +38,7 @@ void* codec_malloc(size_t size) | |||
38 | void* x; | 38 | void* x; |
39 | 39 | ||
40 | x=&mallocbuf[mem_ptr]; | 40 | x=&mallocbuf[mem_ptr]; |
41 | mem_ptr+=(size+3)&~3; // Keep memory 32-bit aligned (if it was already?) | 41 | mem_ptr+=(size+3)&~3; /* Keep memory 32-bit aligned */ |
42 | 42 | ||
43 | return(x); | 43 | return(x); |
44 | } | 44 | } |
@@ -66,23 +66,23 @@ void* codec_realloc(void* ptr, size_t size) | |||
66 | { | 66 | { |
67 | void* x; | 67 | void* x; |
68 | (void)ptr; | 68 | (void)ptr; |
69 | x = codec_malloc(size); | 69 | x = codec_malloc(size); |
70 | return(x); | 70 | return(x); |
71 | } | 71 | } |
72 | 72 | ||
73 | void *memcpy(void *dest, const void *src, size_t n) | 73 | void *memcpy(void *dest, const void *src, size_t n) |
74 | { | 74 | { |
75 | return(local_rb->memcpy(dest,src,n)); | 75 | return(local_rb->memcpy(dest,src,n)); |
76 | } | 76 | } |
77 | 77 | ||
78 | void *memset(void *s, int c, size_t n) | 78 | void *memset(void *s, int c, size_t n) |
79 | { | 79 | { |
80 | return(local_rb->memset(s,c,n)); | 80 | return(local_rb->memset(s,c,n)); |
81 | } | 81 | } |
82 | 82 | ||
83 | int memcmp(const void *s1, const void *s2, size_t n) | 83 | int memcmp(const void *s1, const void *s2, size_t n) |
84 | { | 84 | { |
85 | return(local_rb->memcmp(s1,s2,n)); | 85 | return(local_rb->memcmp(s1,s2,n)); |
86 | } | 86 | } |
87 | 87 | ||
88 | void* memchr(const void *s, int c, size_t n) | 88 | void* memchr(const void *s, int c, size_t n) |
@@ -96,20 +96,16 @@ void* memmove(const void *s1, const void *s2, size_t n) | |||
96 | char* src=(char*)s2; | 96 | char* src=(char*)s2; |
97 | size_t i; | 97 | size_t i; |
98 | 98 | ||
99 | for (i=0;i<n;i++) { dest[i]=src[i]; } | 99 | for (i=0;i<n;i++) |
100 | dest[i]=src[i]; | ||
100 | 101 | ||
101 | return(dest); | 102 | return(dest); |
102 | } | 103 | } |
103 | 104 | ||
104 | void qsort(void *base, size_t nmemb, size_t size, | 105 | void qsort(void *base, size_t nmemb, size_t size, |
105 | int(*compar)(const void *, const void *)) { | 106 | int(*compar)(const void *, const void *)) |
106 | local_rb->qsort(base,nmemb,size,compar); | ||
107 | } | ||
108 | |||
109 | |||
110 | void xxx2wav_set_api(struct codec_api* rb) | ||
111 | { | 107 | { |
112 | local_rb = rb; | 108 | local_rb->qsort(base,nmemb,size,compar); |
113 | } | 109 | } |
114 | 110 | ||
115 | #endif /* CONFIG_HWCODEC == MASNONE */ | 111 | #endif /* CONFIG_HWCODEC == MASNONE */ |