rename ENCODING to STREAMINFO

diff --git a/src/plugin_winamp2/in_flac.c b/src/plugin_winamp2/in_flac.c
index cada611..4407340 100644 (file)
--- 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 061cf0b..b6eb0bc 100644 (file)
--- 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 6edf356..a5a31d9 100644 (file)
--- 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;