From: Josh Coalson <jcoalson@users.sourceforce.net>
Date: Sun, 28 Jan 2001 09:41:45 +0000 (+0000)
Subject: fix to work with new write_callback signature
X-Git-Tag: 1.2.0~2674
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=efc42137fa113a656928d7336a23087c1dc8c533;p=platform%2Fupstream%2Fflac.git

fix to work with new write_callback signature
---

diff --git a/src/plugin_winamp2/in_flac.c b/src/plugin_winamp2/in_flac.c
index 29e3e60..07b4d76 100644
--- a/src/plugin_winamp2/in_flac.c
+++ b/src/plugin_winamp2/in_flac.c
@@ -43,7 +43,7 @@ typedef struct {
 } stream_info_struct;
 
 static bool stream_init(const char *infile);
-static FLAC__StreamDecoderWriteStatus write_callback(const FLAC__FileDecoder *decoder, const FLAC__FrameHeader *header, const int32 *buffer[], void *client_data);
+static FLAC__StreamDecoderWriteStatus write_callback(const FLAC__FileDecoder *decoder, const FLAC__Frame *frame, const int32 *buffer[], void *client_data);
 static void metadata_callback(const FLAC__FileDecoder *decoder, const FLAC__StreamMetaData *metadata, void *client_data);
 static void error_callback(const FLAC__FileDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
 
@@ -376,11 +376,11 @@ bool stream_init(const char *infile)
 	return true;
 }
 
-FLAC__StreamDecoderWriteStatus write_callback(const FLAC__FileDecoder *decoder, const FLAC__FrameHeader *header, const int32 *buffer[], void *client_data)
+FLAC__StreamDecoderWriteStatus write_callback(const FLAC__FileDecoder *decoder, const FLAC__Frame *frame, const int32 *buffer[], void *client_data)
 {
 	stream_info_struct *stream_info = (stream_info_struct *)client_data;
 	unsigned bps = stream_info->bits_per_sample, channels = stream_info->channels;
-	unsigned wide_samples = header->blocksize, wide_sample, sample, channel, offset;
+	unsigned wide_samples = frame->header.blocksize, wide_sample, sample, channel, offset;
 
 	(void)decoder;
 
diff --git a/src/plugin_xmms/plugin.c b/src/plugin_xmms/plugin.c
index 916a848..8b5e4f3 100644
--- a/src/plugin_xmms/plugin.c
+++ b/src/plugin_xmms/plugin.c
@@ -64,7 +64,7 @@ static void FLAC_XMMS__get_song_info(char *filename, char **title, int *length);
 static void *play_loop_(void *arg);
 static bool decoder_init_(const char *filename);
 static bool get_id3v1_tag_(const char *filename, id3v1_struct *tag);
-static FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__FileDecoder *decoder, const FLAC__FrameHeader *header, const int32 *buffer[], void *client_data);
+static FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__FileDecoder *decoder, const FLAC__Frame *frame, const int32 *buffer[], void *client_data);
 static void metadata_callback_(const FLAC__FileDecoder *decoder, const FLAC__StreamMetaData *metadata, void *client_data);
 static void error_callback_(const FLAC__FileDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
 
@@ -346,11 +346,11 @@ bool get_id3v1_tag_(const char *filename, id3v1_struct *tag)
 	}
 }
 
-FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__FileDecoder *decoder, const FLAC__FrameHeader *header, const int32 *buffer[], void *client_data)
+FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__FileDecoder *decoder, const FLAC__Frame *frame, const int32 *buffer[], void *client_data)
 {
 	file_info_struct *file_info = (file_info_struct *)client_data;
 	unsigned bps = file_info->bits_per_sample, channels = file_info->channels;
-	unsigned wide_samples = header->blocksize, wide_sample, sample, channel;
+	unsigned wide_samples = frame->header.blocksize, wide_sample, sample, channel;
 
 	(void)decoder;