claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename ENCODING to STREAMINFO

Browse Source
This commit is contained in:
Josh Coalson
2001-03-05 18:36:59 +00:00
parent 30e5396a79
commit 665b7ad5b4
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugin_winamp2/in_flac.c
View File

@@ -400,12 +400,12 @@ void metadata_callback(const FLAC__FileDecoder *decoder, const FLAC__StreamMetaD
{ {
stream_info_struct *stream_info = (stream_info_struct *)client_data; stream_info_struct *stream_info = (stream_info_struct *)client_data;
(void)decoder; (void)decoder;
if(metadata->type == FLAC__METADATA_TYPE_ENCODING) { if(metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
assert(metadata->data.encoding.total_samples < 0x100000000); /* this plugin can only handle < 4 gigasamples */ assert(metadata->data.stream_info.total_samples < 0x100000000); /* this plugin can only handle < 4 gigasamples */
stream_info->total_samples = (unsigned)(metadata->data.encoding.total_samples&0xffffffff); stream_info->total_samples = (unsigned)(metadata->data.stream_info.total_samples&0xffffffff);
stream_info->bits_per_sample = metadata->data.encoding.bits_per_sample; stream_info->bits_per_sample = metadata->data.stream_info.bits_per_sample;
stream_info->channels = metadata->data.encoding.channels; stream_info->channels = metadata->data.stream_info.channels;
stream_info->sample_rate = metadata->data.encoding.sample_rate; stream_info->sample_rate = metadata->data.stream_info.sample_rate;
if(stream_info->bits_per_sample != 16) { 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); MessageBox(mod.hMainWindow,"ERROR: plugin can only handle 16-bit samples\n","ERROR: plugin can only handle 16-bit samples",0);

12
src/plugin_winamp3/in_flac.cpp
View File

@@ -361,12 +361,12 @@ void metadata_callback_(const FLAC__FileDecoder *decoder, const FLAC__StreamMeta
{ {
file_info_struct *file_info = (file_info_struct *)client_data; file_info_struct *file_info = (file_info_struct *)client_data;
(void)decoder; (void)decoder;
if(metadata->type == FLAC__METADATA_TYPE_ENCODING) { if(metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
assert(metadata->data.encoding.total_samples < 0x100000000); /* this plugin can only handle < 4 gigasamples */ assert(metadata->data.stream_info.total_samples < 0x100000000); /* this plugin can only handle < 4 gigasamples */
file_info->total_samples = (unsigned)(metadata->data.encoding.total_samples&0xffffffff); file_info->total_samples = (unsigned)(metadata->data.stream_info.total_samples&0xffffffff);
file_info->bits_per_sample = metadata->data.encoding.bits_per_sample; file_info->bits_per_sample = metadata->data.stream_info.bits_per_sample;
file_info->channels = metadata->data.encoding.channels; file_info->channels = metadata->data.stream_info.channels;
file_info->sample_rate = metadata->data.encoding.sample_rate; file_info->sample_rate = metadata->data.stream_info.sample_rate;
if(file_info->bits_per_sample != 16) { if(file_info->bits_per_sample != 16) {
file_info->abort_flag = true; file_info->abort_flag = true;

12
src/plugin_xmms/plugin.c
View File

@@ -465,12 +465,12 @@ void metadata_callback_(const FLAC__FileDecoder *decoder, const FLAC__StreamMeta
{ {
file_info_struct *file_info = (file_info_struct *)client_data; file_info_struct *file_info = (file_info_struct *)client_data;
(void)decoder; (void)decoder;
if(metadata->type == FLAC__METADATA_TYPE_ENCODING) { if(metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
assert(metadata->data.encoding.total_samples < 0x100000000); /* this plugin can only handle < 4 gigasamples */ assert(metadata->data.stream_info.total_samples < 0x100000000); /* this plugin can only handle < 4 gigasamples */
file_info->total_samples = (unsigned)(metadata->data.encoding.total_samples&0xffffffff); file_info->total_samples = (unsigned)(metadata->data.stream_info.total_samples&0xffffffff);
file_info->bits_per_sample = metadata->data.encoding.bits_per_sample; file_info->bits_per_sample = metadata->data.stream_info.bits_per_sample;
file_info->channels = metadata->data.encoding.channels; file_info->channels = metadata->data.stream_info.channels;
file_info->sample_rate = metadata->data.encoding.sample_rate; file_info->sample_rate = metadata->data.stream_info.sample_rate;
if(file_info->bits_per_sample != 16) { if(file_info->bits_per_sample != 16) {
file_info->abort_flag = true; file_info->abort_flag = true;