From 665b7ad5b4e7bdeaa0178f9e7ef0bc3d2d5b80f3 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Mon, 5 Mar 2001 18:36:59 +0000 Subject: [PATCH] rename ENCODING to STREAMINFO --- src/plugin_winamp2/in_flac.c | 12 ++++++------ src/plugin_winamp3/in_flac.cpp | 12 ++++++------ src/plugin_xmms/plugin.c | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/plugin_winamp2/in_flac.c b/src/plugin_winamp2/in_flac.c index cada611b..4407340d 100644 --- a/src/plugin_winamp2/in_flac.c +++ b/src/plugin_winamp2/in_flac.c @@ -400,12 +400,12 @@ void metadata_callback(const FLAC__FileDecoder *decoder, const FLAC__StreamMetaD { stream_info_struct *stream_info = (stream_info_struct *)client_data; (void)decoder; - if(metadata->type == FLAC__METADATA_TYPE_ENCODING) { - assert(metadata->data.encoding.total_samples < 0x100000000); /* this plugin can only handle < 4 gigasamples */ - stream_info->total_samples = (unsigned)(metadata->data.encoding.total_samples&0xffffffff); - stream_info->bits_per_sample = metadata->data.encoding.bits_per_sample; - stream_info->channels = metadata->data.encoding.channels; - stream_info->sample_rate = metadata->data.encoding.sample_rate; + if(metadata->type == FLAC__METADATA_TYPE_STREAMINFO) { + assert(metadata->data.stream_info.total_samples < 0x100000000); /* this plugin can only handle < 4 gigasamples */ + stream_info->total_samples = (unsigned)(metadata->data.stream_info.total_samples&0xffffffff); + stream_info->bits_per_sample = metadata->data.stream_info.bits_per_sample; + stream_info->channels = metadata->data.stream_info.channels; + stream_info->sample_rate = metadata->data.stream_info.sample_rate; if(stream_info->bits_per_sample != 16) { MessageBox(mod.hMainWindow,"ERROR: plugin can only handle 16-bit samples\n","ERROR: plugin can only handle 16-bit samples",0); diff --git a/src/plugin_winamp3/in_flac.cpp b/src/plugin_winamp3/in_flac.cpp index 061cf0b3..b6eb0bc8 100644 --- a/src/plugin_winamp3/in_flac.cpp +++ b/src/plugin_winamp3/in_flac.cpp @@ -361,12 +361,12 @@ void metadata_callback_(const FLAC__FileDecoder *decoder, const FLAC__StreamMeta { file_info_struct *file_info = (file_info_struct *)client_data; (void)decoder; - if(metadata->type == FLAC__METADATA_TYPE_ENCODING) { - assert(metadata->data.encoding.total_samples < 0x100000000); /* this plugin can only handle < 4 gigasamples */ - file_info->total_samples = (unsigned)(metadata->data.encoding.total_samples&0xffffffff); - file_info->bits_per_sample = metadata->data.encoding.bits_per_sample; - file_info->channels = metadata->data.encoding.channels; - file_info->sample_rate = metadata->data.encoding.sample_rate; + if(metadata->type == FLAC__METADATA_TYPE_STREAMINFO) { + assert(metadata->data.stream_info.total_samples < 0x100000000); /* this plugin can only handle < 4 gigasamples */ + file_info->total_samples = (unsigned)(metadata->data.stream_info.total_samples&0xffffffff); + file_info->bits_per_sample = metadata->data.stream_info.bits_per_sample; + file_info->channels = metadata->data.stream_info.channels; + file_info->sample_rate = metadata->data.stream_info.sample_rate; if(file_info->bits_per_sample != 16) { file_info->abort_flag = true; diff --git a/src/plugin_xmms/plugin.c b/src/plugin_xmms/plugin.c index 6edf356d..a5a31d92 100644 --- a/src/plugin_xmms/plugin.c +++ b/src/plugin_xmms/plugin.c @@ -465,12 +465,12 @@ void metadata_callback_(const FLAC__FileDecoder *decoder, const FLAC__StreamMeta { file_info_struct *file_info = (file_info_struct *)client_data; (void)decoder; - if(metadata->type == FLAC__METADATA_TYPE_ENCODING) { - assert(metadata->data.encoding.total_samples < 0x100000000); /* this plugin can only handle < 4 gigasamples */ - file_info->total_samples = (unsigned)(metadata->data.encoding.total_samples&0xffffffff); - file_info->bits_per_sample = metadata->data.encoding.bits_per_sample; - file_info->channels = metadata->data.encoding.channels; - file_info->sample_rate = metadata->data.encoding.sample_rate; + if(metadata->type == FLAC__METADATA_TYPE_STREAMINFO) { + assert(metadata->data.stream_info.total_samples < 0x100000000); /* this plugin can only handle < 4 gigasamples */ + file_info->total_samples = (unsigned)(metadata->data.stream_info.total_samples&0xffffffff); + file_info->bits_per_sample = metadata->data.stream_info.bits_per_sample; + file_info->channels = metadata->data.stream_info.channels; + file_info->sample_rate = metadata->data.stream_info.sample_rate; if(file_info->bits_per_sample != 16) { file_info->abort_flag = true;