summaryrefslogtreecommitdiff
path: root/apps/codecs/libFLAC/file_decoder.c
diff options
context:
space:
mode:
authorThom Johansen <thomj@rockbox.org>2005-09-07 10:13:39 +0000
committerThom Johansen <thomj@rockbox.org>2005-09-07 10:13:39 +0000
commit0c885ac4c1b5351162cb08f92e67d2ea1247f7c1 (patch)
tree10c959273160ee9deedae6ad630cd81bdba0c026 /apps/codecs/libFLAC/file_decoder.c
parent4e9969bcb9e4ff0baec3a998e0e30d1759e88a98 (diff)
downloadrockbox-0c885ac4c1b5351162cb08f92e67d2ea1247f7c1.tar.gz
rockbox-0c885ac4c1b5351162cb08f92e67d2ea1247f7c1.zip
Put some FLAC data in IRAM. Will clean up code later.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7496 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libFLAC/file_decoder.c')
-rw-r--r--apps/codecs/libFLAC/file_decoder.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/apps/codecs/libFLAC/file_decoder.c b/apps/codecs/libFLAC/file_decoder.c
index f0a3ea170e..213e76e8a5 100644
--- a/apps/codecs/libFLAC/file_decoder.c
+++ b/apps/codecs/libFLAC/file_decoder.c
@@ -100,6 +100,8 @@ FLAC_API const char * const FLAC__FileDecoderStateString[] = {
100 * Class constructor/destructor 100 * Class constructor/destructor
101 * 101 *
102 ***********************************************************************/ 102 ***********************************************************************/
103FLAC_FileDecoderProtected _fdprotected;
104FLAC_FileDecoderPrivate _fdprivate;
103 105
104FLAC_API FLAC__FileDecoder *FLAC__file_decoder_new() 106FLAC_API FLAC__FileDecoder *FLAC__file_decoder_new()
105{ 107{
@@ -112,24 +114,26 @@ FLAC_API FLAC__FileDecoder *FLAC__file_decoder_new()
112 return 0; 114 return 0;
113 } 115 }
114 116
115 decoder->protected_ = (FLAC__FileDecoderProtected*)calloc(1, sizeof(FLAC__FileDecoderProtected)); 117 decoder->protected = &_fdprotected;
118 /*decoder->protected_ = (FLAC__FileDecoderProtected*)calloc(1, sizeof(FLAC__FileDecoderProtected));
116 if(decoder->protected_ == 0) { 119 if(decoder->protected_ == 0) {
117 free(decoder); 120 free(decoder);
118 return 0; 121 return 0;
119 } 122 }*/
120 123
121 decoder->private_ = (FLAC__FileDecoderPrivate*)calloc(1, sizeof(FLAC__FileDecoderPrivate)); 124 decoder->private_ = &_fdprivate;
125 /*decoder->private_ = (FLAC__FileDecoderPrivate*)calloc(1, sizeof(FLAC__FileDecoderPrivate));
122 if(decoder->private_ == 0) { 126 if(decoder->private_ == 0) {
123 free(decoder->protected_); 127 free(decoder->protected_);
124 free(decoder); 128 free(decoder);
125 return 0; 129 return 0;
126 } 130 }*/
127 131
128 decoder->private_->seekable_stream_decoder = FLAC__seekable_stream_decoder_new(); 132 decoder->private_->seekable_stream_decoder = FLAC__seekable_stream_decoder_new();
129 if(0 == decoder->private_->seekable_stream_decoder) { 133 if(0 == decoder->private_->seekable_stream_decoder) {
130 free(decoder->private_); 134 /*free(decoder->private_);
131 free(decoder->protected_); 135 free(decoder->protected_);
132 free(decoder); 136 free(decoder);*/
133 return 0; 137 return 0;
134 } 138 }
135 139
@@ -153,9 +157,9 @@ FLAC_API void FLAC__file_decoder_delete(FLAC__FileDecoder *decoder)
153 157
154 FLAC__seekable_stream_decoder_delete(decoder->private_->seekable_stream_decoder); 158 FLAC__seekable_stream_decoder_delete(decoder->private_->seekable_stream_decoder);
155 159
156 free(decoder->private_); 160 /*free(decoder->private_);
157 free(decoder->protected_); 161 free(decoder->protected_);
158 free(decoder); 162 free(decoder);*/
159} 163}
160 164
161/*********************************************************************** 165/***********************************************************************