diff options
Diffstat (limited to 'apps/codecs/libFLAC/seekable_stream_decoder.c')
-rw-r--r-- | apps/codecs/libFLAC/seekable_stream_decoder.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/apps/codecs/libFLAC/seekable_stream_decoder.c b/apps/codecs/libFLAC/seekable_stream_decoder.c index 7aa215bed5..5af0af0d03 100644 --- a/apps/codecs/libFLAC/seekable_stream_decoder.c +++ b/apps/codecs/libFLAC/seekable_stream_decoder.c | |||
@@ -135,35 +135,42 @@ FLAC_API const char * const FLAC__SeekableStreamDecoderLengthStatusString[] = { | |||
135 | * | 135 | * |
136 | ***********************************************************************/ | 136 | ***********************************************************************/ |
137 | 137 | ||
138 | FLAC__SeekableStreamDecoder _ssd; | ||
139 | FLAC__SeekableStreamDecoderProtected _ssdprotected IDATA_ATTR; | ||
140 | FLAC__SeekableStreamDecoderPrivate _ssdprivate IDATA_ATTR; | ||
141 | |||
138 | FLAC_API FLAC__SeekableStreamDecoder *FLAC__seekable_stream_decoder_new(void) | 142 | FLAC_API FLAC__SeekableStreamDecoder *FLAC__seekable_stream_decoder_new(void) |
139 | { | 143 | { |
140 | FLAC__SeekableStreamDecoder *decoder; | 144 | FLAC__SeekableStreamDecoder *decoder; |
141 | 145 | ||
142 | FLAC__ASSERT(sizeof(int) >= 4); /* we want to die right away if this is not true */ | 146 | FLAC__ASSERT(sizeof(int) >= 4); /* we want to die right away if this is not true */ |
143 | 147 | ||
144 | decoder = (FLAC__SeekableStreamDecoder*)calloc(1, sizeof(FLAC__SeekableStreamDecoder)); | 148 | decoder = &_ssd; |
149 | /*decoder = (FLAC__SeekableStreamDecoder*)calloc(1, sizeof(FLAC__SeekableStreamDecoder)); | ||
145 | if(decoder == 0) { | 150 | if(decoder == 0) { |
146 | return 0; | 151 | return 0; |
147 | } | 152 | }*/ |
148 | 153 | ||
149 | decoder->protected_ = (FLAC__SeekableStreamDecoderProtected*)calloc(1, sizeof(FLAC__SeekableStreamDecoderProtected)); | 154 | decoder->protected_ = &_ssdprotected; |
155 | /*decoder->protected_ = (FLAC__SeekableStreamDecoderProtected*)calloc(1, sizeof(FLAC__SeekableStreamDecoderProtected)); | ||
150 | if(decoder->protected_ == 0) { | 156 | if(decoder->protected_ == 0) { |
151 | free(decoder); | 157 | free(decoder); |
152 | return 0; | 158 | return 0; |
153 | } | 159 | }*/ |
154 | 160 | ||
155 | decoder->private_ = (FLAC__SeekableStreamDecoderPrivate*)calloc(1, sizeof(FLAC__SeekableStreamDecoderPrivate)); | 161 | decoder->private_ = &_ssdprivate; |
162 | /*decoder->private_ = (FLAC__SeekableStreamDecoderPrivate*)calloc(1, sizeof(FLAC__SeekableStreamDecoderPrivate)); | ||
156 | if(decoder->private_ == 0) { | 163 | if(decoder->private_ == 0) { |
157 | free(decoder->protected_); | 164 | free(decoder->protected_); |
158 | free(decoder); | 165 | free(decoder); |
159 | return 0; | 166 | return 0; |
160 | } | 167 | }*/ |
161 | 168 | ||
162 | decoder->private_->stream_decoder = FLAC__stream_decoder_new(); | 169 | decoder->private_->stream_decoder = FLAC__stream_decoder_new(); |
163 | if(0 == decoder->private_->stream_decoder) { | 170 | if(0 == decoder->private_->stream_decoder) { |
164 | free(decoder->private_); | 171 | /*free(decoder->private_); |
165 | free(decoder->protected_); | 172 | free(decoder->protected_); |
166 | free(decoder); | 173 | free(decoder);*/ |
167 | return 0; | 174 | return 0; |
168 | } | 175 | } |
169 | 176 | ||
@@ -185,9 +192,9 @@ FLAC_API void FLAC__seekable_stream_decoder_delete(FLAC__SeekableStreamDecoder * | |||
185 | 192 | ||
186 | FLAC__stream_decoder_delete(decoder->private_->stream_decoder); | 193 | FLAC__stream_decoder_delete(decoder->private_->stream_decoder); |
187 | 194 | ||
188 | free(decoder->private_); | 195 | /*free(decoder->private_); |
189 | free(decoder->protected_); | 196 | free(decoder->protected_); |
190 | free(decoder); | 197 | free(decoder);*/ |
191 | } | 198 | } |
192 | 199 | ||
193 | /*********************************************************************** | 200 | /*********************************************************************** |