Changeset 4600:22178628ad1d in roaraudio

Timestamp:

11/10/10 04:47:08 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for flac version 1.2.1

File:

• roard/codecfilter_flac.c (modified) (2 diffs)

roard/codecfilter_flac.c

@@ -207 +207 @@
  }
 
+#ifndef ROAR_HAVE_FLAC_VERSION_1_2_1
  FLAC__stream_decoder_set_read_callback(self->decoder.decoder, cf_flac_cb_read);
  FLAC__stream_decoder_set_write_callback(self->decoder.decoder, cf_flac_cb_write);
@@ -212 +213 @@
  FLAC__stream_decoder_set_error_callback(self->decoder.decoder, cf_flac_cb_error);
  FLAC__stream_decoder_set_client_data(self->decoder.decoder, self);
+#endif
 
  FLAC__stream_decoder_set_metadata_respond(self->decoder.decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
 
+#ifdef ROAR_HAVE_FLAC_VERSION_1_2_1
+ FLAC__stream_decoder_init_stream(self->decoder.decoder, cf_flac_cb_read, NULL, NULL, NULL, NULL, cf_flac_cb_write, cf_flac_cb_metadata, cf_flac_cb_error, self);
+#else
  FLAC__stream_decoder_init(self->decoder.decoder);
+#endif
 
  *inst = self;