Revision: 2274
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2274&view=rev
Author: tmzullinger
Date: 2009-03-16 18:20:28 +0000 (Mon, 16 Mar 2009)
Log Message:
-----------
Lame did not store ReplayGain values prior to 3.94b
http://lame.cvs.sourceforge.net/*checkout*/lame/lame/doc/html/history.html
Modified Paths:
--------------
gtkpod/trunk/ChangeLog
gtkpod/trunk/src/mp3file.c
Modified: gtkpod/trunk/ChangeLog
===================================================================
--- gtkpod/trunk/ChangeLog 2009-03-14 18:12:13 UTC (rev 2273)
+++ gtkpod/trunk/ChangeLog 2009-03-16 18:20:28 UTC (rev 2274)
@@ -1,3 +1,8 @@
+2009-03-16 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * src/mp3file.c (mp3_get_track_lame_replaygain):
+ Lame did not store ReplayGain values prior to 3.94b
+
2009-02-28 Jorg Schuler <jcsjcs at users.sourceforge.net>
* src/misc.h
Modified: gtkpod/trunk/src/mp3file.c
===================================================================
--- gtkpod/trunk/src/mp3file.c 2009-03-14 18:12:13 UTC (rev 2273)
+++ gtkpod/trunk/src/mp3file.c 2009-03-16 18:20:28 UTC (rev 2274)
@@ -2036,28 +2036,19 @@
gd->radio_gain_set = FALSE;
gd->audiophile_gain_set = FALSE;
gd->peak_signal_set = FALSE;
-
- if (lame_vcmp(lt.version_string, "3.90") < 0) {
+
+ /* Replay Gain data is only available since Lame version 3.94b */
+ if (lame_vcmp(lt.version_string, "3.94b") < 0) {
/* fprintf(stderr, "Old lame version (%c%c%c%c%c). Not used.\n",
version[0], version[1], version[2], version[3],
version[4]); */
goto rg_fail;
}
-
- /* Don't know when fixed-point PeakSingleAmplitude
- * was introduced exactly. 3.94b will be used for now.) */
- if ((lame_vcmp(lt.version_string, "3.94b") >= 0)) {
- if ((!gd->peak_signal_set) && lt.peak_signal_amplitude) {
- gd->peak_signal = lt.peak_signal_amplitude;
- gd->peak_signal_set = TRUE;
-/* printf("peak_signal (lame): %f\n", (double)
- gd->peak_signal / 0x800000);*/
- }
- } else {
- gd->peak_signal = (guint32) (lt.peak_signal_amplitude *
0x800000);
+
+ if ((!gd->peak_signal_set) && lt.peak_signal_amplitude) {
+ gd->peak_signal = lt.peak_signal_amplitude;
gd->peak_signal_set = TRUE;
- /* I would like to see an example of that. */
-/* printf("peak_signal (lame floating point): %f. PLEASE
report.\n",
- (double) gd->peak_signal / 0x800000);*/
+/* printf("peak_signal (lame): %f\n", (double)
+ gd->peak_signal / 0x800000);*/
}
/*
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
