Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:12.2
timidity
timidity-flac_api_changes.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File timidity-flac_api_changes.patch of Package timidity
Index: timidity/flac_a.c =================================================================== --- timidity/flac_a.c.orig 2004-05-23 06:35:44.000000000 +0200 +++ timidity/flac_a.c 2011-01-18 19:01:04.360175119 +0100 @@ -45,9 +45,6 @@ #endif #include <FLAC/all.h> -#ifdef AU_OGGFLAC -#include <OggFLAC/stream_encoder.h> -#endif #ifdef AU_FLAC_DLL #include "w32_libFLAC_dll_g.h" @@ -56,7 +53,10 @@ #include "w32_libOGGFLAC_dll_g.h" #endif +#include <time.h> + #include "timidity.h" +#include "common.h" #include "output.h" #include "controls.h" #include "timer.h" @@ -78,11 +78,7 @@ PlayMode dpm = { DEFAULT_RATE, PE_SIGNED|PE_16BIT, PF_PCM_STREAM, -1, {0}, /* default: get all the buffer fragments you can */ -#ifndef AU_OGGFLAC - "FLAC", 'F', -#else "FLAC / OggFLAC", 'F', -#endif /* AU_OGGFLAC */ NULL, open_output, close_output, @@ -100,28 +96,22 @@ typedef struct { unsigned long out_bytes; union { FLAC__StreamEncoderState flac; - FLAC__SeekableStreamEncoderState s_flac; -#ifdef AU_OGGFLAC - OggFLAC__StreamEncoderState ogg; -#endif + FLAC__StreamEncoderState s_flac; + FLAC__StreamEncoderState ogg; } state; union { union { FLAC__StreamEncoder *stream; - FLAC__SeekableStreamEncoder *s_stream; + FLAC__StreamEncoder *s_stream; } flac; -#ifdef AU_OGGFLAC union { - OggFLAC__StreamEncoder *stream; + FLAC__StreamEncoder *stream; } ogg; -#endif } encoder; } FLAC_ctx; typedef struct { -#ifdef AU_OGGFLAC int isogg; -#endif int verify; int padding; int blocksize; @@ -138,9 +128,7 @@ typedef struct { /* default compress level is 5 */ FLAC_options flac_options = { -#ifdef AU_OGGFLAC 0, /* isogg */ -#endif 0, /* verify */ 4096, /* padding */ 4608, /* blocksize */ @@ -158,29 +146,24 @@ FLAC_options flac_options = { static long serial_number = 0; FLAC_ctx *flac_ctx = NULL; -#ifdef AU_OGGFLAC static FLAC__StreamEncoderWriteStatus -ogg_stream_encoder_write_callback(const OggFLAC__StreamEncoder *encoder, +ogg_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], - unsigned bytes, unsigned samples, + size_t bytes, unsigned samples, unsigned current_frame, void *client_data); -#endif static FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], - unsigned bytes, unsigned samples, + size_t bytes, unsigned samples, unsigned current_frame, void *client_data); static void flac_stream_encoder_metadata_callback(const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, void *client_data); static FLAC__StreamEncoderWriteStatus -flac_seekable_stream_encoder_write_callback(const FLAC__SeekableStreamEncoder *encoder, +flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], - unsigned bytes, unsigned samples, + size_t bytes, unsigned samples, unsigned current_frame, void *client_data); -static void flac_seekable_stream_encoder_metadata_callback(const FLAC__SeekableStreamEncoder *encoder, - const FLAC__StreamMetadata *metadata, - void *client_data); /* preset */ void flac_set_compression_level(int compression_level) @@ -278,12 +261,10 @@ void flac_set_option_verify(int verify) { flac_options.verify = verify; } -#ifdef AU_OGGFLAC void flac_set_option_oggflac(int isogg) { flac_options.isogg = isogg; } -#endif static int flac_session_close() { @@ -295,19 +276,17 @@ static int flac_session_close() dpm.fd = -1; if (ctx != NULL) { -#ifdef AU_OGGFLAC if (flac_options.isogg) { if (ctx->encoder.ogg.stream) { - OggFLAC__stream_encoder_finish(ctx->encoder.ogg.stream); - OggFLAC__stream_encoder_delete(ctx->encoder.ogg.stream); + FLAC__stream_encoder_finish(ctx->encoder.ogg.stream); + FLAC__stream_encoder_delete(ctx->encoder.ogg.stream); } } else -#endif /* AU_OGGFLAC */ if (flac_options.seekable) { if (ctx->encoder.flac.s_stream) { - FLAC__seekable_stream_encoder_finish(ctx->encoder.flac.s_stream); - FLAC__seekable_stream_encoder_delete(ctx->encoder.flac.s_stream); + FLAC__stream_encoder_finish(ctx->encoder.flac.s_stream); + FLAC__stream_encoder_delete(ctx->encoder.flac.s_stream); } } else @@ -320,6 +299,7 @@ static int flac_session_close() free(ctx); flac_ctx = NULL; } + return 0; } static int flac_output_open(const char *fname, const char *comment) @@ -371,17 +351,16 @@ static int flac_output_open(const char * metadata[num_metadata++] = &padding; } -#ifdef AU_OGGFLAC if (flac_options.isogg) { - if ((ctx->encoder.ogg.stream = OggFLAC__stream_encoder_new()) == NULL) { + if ((ctx->encoder.ogg.stream = FLAC__stream_encoder_new()) == NULL) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create OggFLAC stream"); flac_session_close(); return -1; } - OggFLAC__stream_encoder_set_channels(ctx->encoder.ogg.stream, nch); + FLAC__stream_encoder_set_channels(ctx->encoder.ogg.stream, nch); /* 16bps only */ - OggFLAC__stream_encoder_set_bits_per_sample(ctx->encoder.ogg.stream, 16); + FLAC__stream_encoder_set_bits_per_sample(ctx->encoder.ogg.stream, 16); /* set sequential number for serial */ serial_number++; @@ -389,9 +368,9 @@ static int flac_output_open(const char * srand(time(NULL)); serial_number = rand(); } - OggFLAC__stream_encoder_set_serial_number(ctx->encoder.ogg.stream, serial_number); + FLAC__stream_encoder_set_ogg_serial_number(ctx->encoder.ogg.stream, serial_number); - OggFLAC__stream_encoder_set_verify(ctx->encoder.ogg.stream, flac_options.verify); + FLAC__stream_encoder_set_verify(ctx->encoder.ogg.stream, flac_options.verify); if (!FLAC__format_sample_rate_is_valid(dpm.rate)) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "invalid sampling rate %d", @@ -399,53 +378,52 @@ static int flac_output_open(const char * flac_session_close(); return -1; } - OggFLAC__stream_encoder_set_sample_rate(ctx->encoder.ogg.stream, dpm.rate); + FLAC__stream_encoder_set_sample_rate(ctx->encoder.ogg.stream, dpm.rate); - OggFLAC__stream_encoder_set_qlp_coeff_precision(ctx->encoder.ogg.stream, flac_options.qlp_coeff_precision); + FLAC__stream_encoder_set_qlp_coeff_precision(ctx->encoder.ogg.stream, flac_options.qlp_coeff_precision); /* expensive! */ - OggFLAC__stream_encoder_set_do_qlp_coeff_prec_search(ctx->encoder.ogg.stream, flac_options.qlp_coeff_precision_search); + FLAC__stream_encoder_set_do_qlp_coeff_prec_search(ctx->encoder.ogg.stream, flac_options.qlp_coeff_precision_search); if (nch == 2) { - OggFLAC__stream_encoder_set_do_mid_side_stereo(ctx->encoder.ogg.stream, flac_options.mid_side); - OggFLAC__stream_encoder_set_loose_mid_side_stereo(ctx->encoder.ogg.stream, flac_options.adaptive_mid_side); + FLAC__stream_encoder_set_do_mid_side_stereo(ctx->encoder.ogg.stream, flac_options.mid_side); + FLAC__stream_encoder_set_loose_mid_side_stereo(ctx->encoder.ogg.stream, flac_options.adaptive_mid_side); } - OggFLAC__stream_encoder_set_max_lpc_order(ctx->encoder.ogg.stream, flac_options.max_lpc_order); - OggFLAC__stream_encoder_set_min_residual_partition_order(ctx->encoder.ogg.stream, flac_options.min_residual_partition_order); - OggFLAC__stream_encoder_set_max_residual_partition_order(ctx->encoder.ogg.stream, flac_options.max_residual_partition_order); + FLAC__stream_encoder_set_max_lpc_order(ctx->encoder.ogg.stream, flac_options.max_lpc_order); + FLAC__stream_encoder_set_min_residual_partition_order(ctx->encoder.ogg.stream, flac_options.min_residual_partition_order); + FLAC__stream_encoder_set_max_residual_partition_order(ctx->encoder.ogg.stream, flac_options.max_residual_partition_order); - OggFLAC__stream_encoder_set_blocksize(ctx->encoder.ogg.stream, flac_options.blocksize); - - OggFLAC__stream_encoder_set_client_data(ctx->encoder.ogg.stream, ctx); + FLAC__stream_encoder_set_blocksize(ctx->encoder.ogg.stream, flac_options.blocksize); if (0 < num_metadata) - OggFLAC__stream_encoder_set_metadata(ctx->encoder.ogg.stream, metadata, num_metadata); - - /* set callback */ - OggFLAC__stream_encoder_set_write_callback(ctx->encoder.ogg.stream, ogg_stream_encoder_write_callback); + FLAC__stream_encoder_set_metadata(ctx->encoder.ogg.stream, metadata, num_metadata); - ctx->state.ogg = OggFLAC__stream_encoder_init(ctx->encoder.ogg.stream); - if (ctx->state.ogg != OggFLAC__STREAM_ENCODER_OK) { + ctx->state.ogg = FLAC__stream_encoder_init_ogg_stream(ctx->encoder.ogg.stream, + 0, + ogg_stream_encoder_write_callback, + 0, 0, 0, + ctx); + if (ctx->state.ogg != FLAC__STREAM_ENCODER_OK) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create OggFLAC state (%s)", - OggFLAC__StreamEncoderStateString[ctx->state.ogg]); + FLAC__StreamEncoderStateString[ctx->state.ogg]); flac_session_close(); return -1; } } else -#endif /* AU_OGGFLAC */ if (flac_options.seekable) { - if ((ctx->encoder.flac.s_stream = FLAC__seekable_stream_encoder_new()) == NULL) { + /* FLAC SEEKABLE STREAM */ + if ((ctx->encoder.flac.s_stream = FLAC__stream_encoder_new()) == NULL) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC stream"); flac_session_close(); return -1; } - FLAC__seekable_stream_encoder_set_channels(ctx->encoder.flac.s_stream, nch); + FLAC__stream_encoder_set_channels(ctx->encoder.flac.s_stream, nch); /* 16bps only */ - FLAC__seekable_stream_encoder_set_bits_per_sample(ctx->encoder.flac.s_stream, 16); + FLAC__stream_encoder_set_bits_per_sample(ctx->encoder.flac.s_stream, 16); - FLAC__seekable_stream_encoder_set_verify(ctx->encoder.flac.s_stream, flac_options.verify); + FLAC__stream_encoder_set_verify(ctx->encoder.flac.s_stream, flac_options.verify); if (!FLAC__format_sample_rate_is_valid(dpm.rate)) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "invalid sampling rate %d", @@ -453,44 +431,40 @@ static int flac_output_open(const char * flac_session_close(); return -1; } - FLAC__seekable_stream_encoder_set_sample_rate(ctx->encoder.flac.s_stream, dpm.rate); + FLAC__stream_encoder_set_sample_rate(ctx->encoder.flac.s_stream, dpm.rate); - FLAC__seekable_stream_encoder_set_qlp_coeff_precision(ctx->encoder.flac.s_stream, flac_options.qlp_coeff_precision); + FLAC__stream_encoder_set_qlp_coeff_precision(ctx->encoder.flac.s_stream, flac_options.qlp_coeff_precision); /* expensive! */ - FLAC__seekable_stream_encoder_set_do_qlp_coeff_prec_search(ctx->encoder.flac.s_stream, flac_options.qlp_coeff_precision_search); + FLAC__stream_encoder_set_do_qlp_coeff_prec_search(ctx->encoder.flac.s_stream, flac_options.qlp_coeff_precision_search); if (nch == 2) { - FLAC__seekable_stream_encoder_set_do_mid_side_stereo(ctx->encoder.flac.s_stream, flac_options.mid_side); - FLAC__seekable_stream_encoder_set_loose_mid_side_stereo(ctx->encoder.flac.s_stream, flac_options.adaptive_mid_side); + FLAC__stream_encoder_set_do_mid_side_stereo(ctx->encoder.flac.s_stream, flac_options.mid_side); + FLAC__stream_encoder_set_loose_mid_side_stereo(ctx->encoder.flac.s_stream, flac_options.adaptive_mid_side); } - FLAC__seekable_stream_encoder_set_max_lpc_order(ctx->encoder.flac.s_stream, flac_options.max_lpc_order); - FLAC__seekable_stream_encoder_set_min_residual_partition_order(ctx->encoder.flac.s_stream, flac_options.min_residual_partition_order); - FLAC__seekable_stream_encoder_set_max_residual_partition_order(ctx->encoder.flac.s_stream, flac_options.max_residual_partition_order); + FLAC__stream_encoder_set_max_lpc_order(ctx->encoder.flac.s_stream, flac_options.max_lpc_order); + FLAC__stream_encoder_set_min_residual_partition_order(ctx->encoder.flac.s_stream, flac_options.min_residual_partition_order); + FLAC__stream_encoder_set_max_residual_partition_order(ctx->encoder.flac.s_stream, flac_options.max_residual_partition_order); - FLAC__seekable_stream_encoder_set_blocksize(ctx->encoder.flac.s_stream, flac_options.blocksize); - FLAC__seekable_stream_encoder_set_client_data(ctx->encoder.flac.s_stream, ctx); + FLAC__stream_encoder_set_blocksize(ctx->encoder.flac.s_stream, flac_options.blocksize); if (0 < num_metadata) - FLAC__seekable_stream_encoder_set_metadata(ctx->encoder.flac.s_stream, metadata, num_metadata); + FLAC__stream_encoder_set_metadata(ctx->encoder.flac.s_stream, metadata, num_metadata); - /* set callback */ -/* FLAC__seekable_stream_encoder_set_metadata_callback(ctx->encoder.flac.s_stream, flac_seekable_stream_encoder_metadata_callback); /* */ -#ifndef __BORLANDC__ - FLAC__stream_encoder_set_metadata_callback(ctx->encoder.flac.s_stream, flac_seekable_stream_encoder_metadata_callback); /* */ -#endif - FLAC__seekable_stream_encoder_set_write_callback(ctx->encoder.flac.s_stream, flac_seekable_stream_encoder_write_callback); + ctx->state.s_flac = FLAC__stream_encoder_init_stream( + ctx->encoder.flac.s_stream, + flac_stream_encoder_write_callback, + 0, 0, 0, + ctx); - ctx->state.s_flac = FLAC__seekable_stream_encoder_init(ctx->encoder.flac.s_stream); - if (ctx->state.s_flac != FLAC__SEEKABLE_STREAM_ENCODER_OK) { + if (ctx->state.s_flac != FLAC__STREAM_ENCODER_OK) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC state (%s)", - FLAC__SeekableStreamEncoderStateString[ctx->state.s_flac]); + FLAC__StreamEncoderStateString[ctx->state.s_flac]); flac_session_close(); return -1; } - } - else - { + } else { + /* NON SEEKABLE STREAM */ if ((ctx->encoder.flac.stream = FLAC__stream_encoder_new()) == NULL) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC stream"); flac_session_close(); @@ -525,16 +499,16 @@ static int flac_output_open(const char * FLAC__stream_encoder_set_max_residual_partition_order(ctx->encoder.flac.stream, flac_options.max_residual_partition_order); FLAC__stream_encoder_set_blocksize(ctx->encoder.flac.stream, flac_options.blocksize); - FLAC__stream_encoder_set_client_data(ctx->encoder.flac.stream, ctx); if (0 < num_metadata) FLAC__stream_encoder_set_metadata(ctx->encoder.flac.stream, metadata, num_metadata); - /* set callback */ - FLAC__stream_encoder_set_metadata_callback(ctx->encoder.flac.stream, flac_stream_encoder_metadata_callback); - FLAC__stream_encoder_set_write_callback(ctx->encoder.flac.stream, flac_stream_encoder_write_callback); - - ctx->state.flac = FLAC__stream_encoder_init(ctx->encoder.flac.stream); + ctx->state.flac = FLAC__stream_encoder_init_stream(ctx->encoder.flac.stream, + flac_stream_encoder_write_callback, + 0, + 0, + flac_stream_encoder_metadata_callback, + ctx); if (ctx->state.flac != FLAC__STREAM_ENCODER_OK) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC state (%s)", FLAC__StreamEncoderStateString[ctx->state.flac]); @@ -550,7 +524,6 @@ static int auto_flac_output_open(const c { char *output_filename; -#ifdef AU_OGGFLAC if (flac_options.isogg) { #ifndef __W32G__ output_filename = create_auto_output_name(input_filename, "ogg", NULL, 0); @@ -559,7 +532,6 @@ static int auto_flac_output_open(const c #endif } else -#endif /* AU_OGGFLAC */ { #ifndef __W32G__ output_filename = create_auto_output_name(input_filename, "flac", NULL, 0); @@ -608,12 +580,10 @@ static int open_output(void) exclude_enc |= PE_BYTESWAP | PE_24BIT; dpm.encoding = validate_encoding(dpm.encoding, include_enc, exclude_enc); -#ifdef AU_OGGFLAC if (flac_options.isogg) { ctl->cmsg(CMSG_WARNING, VERB_NORMAL, "*** cannot write back seekpoints when encoding to Ogg yet ***"); ctl->cmsg(CMSG_WARNING, VERB_NORMAL, "*** and stream end will not be written. ***"); } -#endif #ifndef __W32G__ if(dpm.name == NULL) { @@ -638,11 +608,10 @@ static int open_output(void) return 0; } -#ifdef AU_OGGFLAC static FLAC__StreamEncoderWriteStatus -ogg_stream_encoder_write_callback(const OggFLAC__StreamEncoder *encoder, +ogg_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], - unsigned bytes, unsigned samples, + size_t bytes, unsigned samples, unsigned current_frame, void *client_data) { FLAC_ctx *ctx = (FLAC_ctx *)client_data; @@ -654,11 +623,10 @@ ogg_stream_encoder_write_callback(const else return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR; } -#endif static FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], - unsigned bytes, unsigned samples, + size_t bytes, unsigned samples, unsigned current_frame, void *client_data) { FLAC_ctx *ctx = (FLAC_ctx *)client_data; @@ -675,26 +643,6 @@ static void flac_stream_encoder_metadata void *client_data) { } -static FLAC__StreamEncoderWriteStatus -flac_seekable_stream_encoder_write_callback(const FLAC__SeekableStreamEncoder *encoder, - const FLAC__byte buffer[], - unsigned bytes, unsigned samples, - unsigned current_frame, void *client_data) -{ - FLAC_ctx *ctx = (FLAC_ctx *)client_data; - - ctx->out_bytes += bytes; - - if (write(dpm.fd, buffer, bytes) == bytes) - return FLAC__STREAM_ENCODER_WRITE_STATUS_OK; - else - return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR; -} -static void flac_seekable_stream_encoder_metadata_callback(const FLAC__SeekableStreamEncoder *encoder, - const FLAC__StreamMetadata *metadata, - void *client_data) -{ -} static int output_data(char *buf, int32 nbytes) { @@ -723,21 +671,18 @@ static int output_data(char *buf, int32 oggbuf[i] = *s++; } -#ifdef AU_OGGFLAC if (flac_options.isogg) { - ctx->state.ogg = OggFLAC__stream_encoder_get_state(ctx->encoder.ogg.stream); - if (ctx->state.ogg != OggFLAC__STREAM_ENCODER_OK) { - if (ctx->state.ogg == OggFLAC__STREAM_ENCODER_FLAC_STREAM_ENCODER_ERROR) { + ctx->state.ogg = FLAC__stream_encoder_get_state(ctx->encoder.ogg.stream); + if (ctx->state.ogg != FLAC__STREAM_ENCODER_OK) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "FLAC stream verify error (%s)", - FLAC__StreamDecoderStateString[OggFLAC__stream_encoder_get_verify_decoder_state(ctx->encoder.ogg.stream)]); - } + FLAC__StreamEncoderStateString[FLAC__stream_encoder_get_verify_decoder_state(ctx->encoder.ogg.stream)]); ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot encode OggFLAC stream (%s)", - OggFLAC__StreamEncoderStateString[ctx->state.ogg]); + FLAC__StreamEncoderStateString[ctx->state.ogg]); flac_session_close(); return -1; } - if (!OggFLAC__stream_encoder_process_interleaved(ctx->encoder.ogg.stream, oggbuf, + if (!FLAC__stream_encoder_process_interleaved(ctx->encoder.ogg.stream, oggbuf, nbytes / nch / 2)) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot encode OggFLAC stream"); flac_session_close(); @@ -745,24 +690,23 @@ static int output_data(char *buf, int32 } } else -#endif /* AU_OGGFLAC */ if (flac_options.seekable) { - ctx->state.s_flac = FLAC__seekable_stream_encoder_get_state(ctx->encoder.flac.s_stream); + ctx->state.s_flac = FLAC__stream_encoder_get_state(ctx->encoder.flac.s_stream); if (ctx->state.s_flac != FLAC__STREAM_ENCODER_OK) { - if (ctx->state.s_flac == FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR | + if ((ctx->state.s_flac == FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR) | FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "FLAC stream verify error (%s)", - FLAC__SeekableStreamDecoderStateString[FLAC__seekable_stream_encoder_get_verify_decoder_state(ctx->encoder.flac.s_stream)]); + FLAC__StreamDecoderStateString[FLAC__stream_encoder_get_verify_decoder_state(ctx->encoder.flac.s_stream)]); } else { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot encode FLAC stream (%s)", - FLAC__SeekableStreamEncoderStateString[ctx->state.s_flac]); + FLAC__StreamEncoderStateString[ctx->state.s_flac]); } flac_session_close(); return -1; } - if (!FLAC__seekable_stream_encoder_process_interleaved(ctx->encoder.flac.s_stream, oggbuf, + if (!FLAC__stream_encoder_process_interleaved(ctx->encoder.flac.s_stream, oggbuf, nbytes / nch / 2 )) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot encode FLAC stream"); flac_session_close(); @@ -773,7 +717,7 @@ static int output_data(char *buf, int32 { ctx->state.flac = FLAC__stream_encoder_get_state(ctx->encoder.flac.stream); if (ctx->state.flac != FLAC__STREAM_ENCODER_OK) { - if (ctx->state.flac == FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR | + if ((ctx->state.flac == FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR) | FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "FLAC stream verify error (%s)", FLAC__StreamDecoderStateString[FLAC__stream_encoder_get_verify_decoder_state(ctx->encoder.flac.stream)]); @@ -814,19 +758,17 @@ static void close_output(void) } if (flac_options.isogg) { -#ifdef AU_OGGFLAC - if ((ctx->state.ogg = OggFLAC__stream_encoder_get_state(ctx->encoder.ogg.stream)) != OggFLAC__STREAM_ENCODER_OK) { + if ((ctx->state.ogg = FLAC__stream_encoder_get_state(ctx->encoder.ogg.stream)) != FLAC__STREAM_ENCODER_OK) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "OggFLAC stream encoder is invalid (%s)", - OggFLAC__StreamEncoderStateString[ctx->state.ogg]); + FLAC__StreamEncoderStateString[ctx->state.ogg]); /* fall through */ } } else -#endif /* AU_OGGFLAC */ if (flac_options.seekable) { - if ((ctx->state.s_flac = FLAC__seekable_stream_encoder_get_state(ctx->encoder.flac.s_stream)) != FLAC__SEEKABLE_STREAM_ENCODER_OK) { + if ((ctx->state.s_flac = FLAC__stream_encoder_get_state(ctx->encoder.flac.s_stream)) != FLAC__STREAM_ENCODER_OK) { ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "FLAC stream encoder is invalid (%s)", - FLAC__SeekableStreamEncoderStateString[ctx->state.s_flac]); + FLAC__StreamEncoderStateString[ctx->state.s_flac]); /* fall through */ } } Index: configure.in =================================================================== --- configure.in.orig 2011-01-18 19:01:04.000000000 +0100 +++ configure.in 2011-01-18 19:23:55.642611875 +0100 @@ -1194,15 +1194,10 @@ if test "x$CYGNUS" = xyes || test "x$MSY AC_MSG_RESULT([yes, configuring flac]) SYSEXTRAS="$SYSEXTRAS flac_a.c w32_libFLAC_dll.c w32_libOggFLAC_dll.c" AM_PATH_LIBFLAC([ - EXTRADEFS="$EXTRADEFS -DAU_FLAC -DAU_FLAC_DLL" + EXTRADEFS="$EXTRADEFS -DAU_FLAC -DAU_FLAC_DLL -DAU_OGGFLAC" EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBFLAC_CFLAGS) LIBS="$LIBS $LIBFLAC_LIBS" ]) - AM_PATH_LIBOGGFLAC([ - EXTRADEFS="$EXTRADEFS -DAU_OGGFLAC -DAU_OGGFLAC_DLL" - EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBOGGFLAC_CFLAGS) - LIBS="$LIBS $LIBOGGFLAC_LIBS" - ]) else AC_MSG_RESULT(no) fi @@ -1212,15 +1207,10 @@ else AC_MSG_RESULT([yes, configuring flac]) SYSEXTRAS="$SYSEXTRAS flac_a.c" AM_PATH_LIBFLAC([ - EXTRADEFS="$EXTRADEFS -DAU_FLAC" + EXTRADEFS="$EXTRADEFS -DAU_FLAC -DAU_OGGFLAC" EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBFLAC_CFLAGS) LIBS="$LIBS $LIBFLAC_LIBS" ]) - AM_PATH_LIBOGGFLAC([ - EXTRADEFS="$EXTRADEFS -DAU_OGGFLAC" - EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBOGGFLAC_CFLAGS) - LIBS="$LIBS $LIBOGGFLAC_LIBS" - ]) else AC_MSG_RESULT(no) fi
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
