diff options
| author | Josh Coalson <jcoalson@users.sourceforce.net> | 2002-11-07 05:07:30 +0000 |
|---|---|---|
| committer | Josh Coalson <jcoalson@users.sourceforce.net> | 2002-11-07 05:07:30 +0000 |
| commit | b8f8a07684a57591cb7c7013546527856dca1fbd (patch) | |
| tree | 1b488c158e0a5d39717c01530df135acfaf2a500 /src/plugin_xmms | |
| parent | 0dad163d95126989d4a436b1b454e5a244fe139f (diff) | |
| download | flac-b8f8a07684a57591cb7c7013546527856dca1fbd.tar.gz | |
updates to work with new grabbag lib
Diffstat (limited to 'src/plugin_xmms')
| -rw-r--r-- | src/plugin_xmms/Makefile.lite | 2 | ||||
| -rw-r--r-- | src/plugin_xmms/plugin.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugin_xmms/Makefile.lite b/src/plugin_xmms/Makefile.lite index cf7ab698..57171c96 100644 --- a/src/plugin_xmms/Makefile.lite +++ b/src/plugin_xmms/Makefile.lite @@ -23,7 +23,7 @@ topdir = ../.. LIB_NAME = libxmms-flac INCLUDES = $(shell xmms-config --cflags) -I./include -I$(topdir)/include -I.. -LIBS = $(topdir)/obj/lib/libFLAC.a $(topdir)/obj/lib/libplugin_common.a $(topdir)/obj/lib/libreplaygain.a $(topdir)/obj/lib/libgain_analysis.a $(topdir)/obj/lib/libfile_utils.a $(HOME)/local/lib/libid3.a -lstdc++ -lz +LIBS = $(topdir)/obj/lib/libFLAC.a $(topdir)/obj/lib/libplugin_common.a $(topdir)/obj/lib/libgrabbag.a $(topdir)/obj/lib/libgain_analysis.a $(HOME)/local/lib/libid3.a -lstdc++ -lz OBJS = \ charset.o \ diff --git a/src/plugin_xmms/plugin.c b/src/plugin_xmms/plugin.c index 5f5ea67b..5503bfe5 100644 --- a/src/plugin_xmms/plugin.c +++ b/src/plugin_xmms/plugin.c @@ -37,7 +37,7 @@ #include "FLAC/all.h" #include "plugin_common/all.h" -#include "share/replaygain.h" +#include "share/grabbag.h" #include "configure.h" #include "wrap_id3.h" #include "charset.h" @@ -494,9 +494,9 @@ void metadata_callback_(const FLAC__FileDecoder *decoder, const FLAC__StreamMeta } else if(metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) { double gain, peak; - if(FLAC__replaygain_load_from_vorbiscomment(metadata, flac_cfg.output.replaygain.album_mode, &gain, &peak)) { + if(grabbag__replaygain_load_from_vorbiscomment(metadata, flac_cfg.output.replaygain.album_mode, &gain, &peak)) { file_info_.has_replaygain = true; - file_info_.replay_scale = FLAC__replaygain_compute_scale_factor(peak, gain, (double)flac_cfg.output.replaygain.preamp, /*prevent_clipping=*/!flac_cfg.output.replaygain.hard_limit); + file_info_.replay_scale = grabbag__replaygain_compute_scale_factor(peak, gain, (double)flac_cfg.output.replaygain.preamp, /*prevent_clipping=*/!flac_cfg.output.replaygain.hard_limit); } } } |