aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--src/tag_rva2.c15
2 files changed, 13 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 0f4d22628..e0aa35dcf 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,8 @@ ver 0.17 (2011/??/??)
- curl: enable CURLOPT_NETRC
- curl: non-blocking I/O
- soup: new input plugin based on libsoup
+* tags:
+ - RVA2: support separate album/track replay gain
* decoder:
- mpg123: implement seeking
- ffmpeg: drop support for pre-0.5 ffmpeg
diff --git a/src/tag_rva2.c b/src/tag_rva2.c
index a08e1eae5..776146fc5 100644
--- a/src/tag_rva2.c
+++ b/src/tag_rva2.c
@@ -22,6 +22,7 @@
#include "replay_gain_info.h"
#include <stdint.h>
+#include <string.h>
#include <glib.h>
#include <id3tag.h>
@@ -73,15 +74,21 @@ rva2_float_volume_adjustment(const struct rva2_data *data)
static inline bool
rva2_apply_data(struct replay_gain_info *replay_gain_info,
- const struct rva2_data *data)
+ const struct rva2_data *data, const id3_latin1_t *id)
{
if (data->type != CHANNEL_MASTER_VOLUME)
return false;
float volume_adjustment = rva2_float_volume_adjustment(data);
- replay_gain_info->tuples[REPLAY_GAIN_TRACK].gain = volume_adjustment;
- replay_gain_info->tuples[REPLAY_GAIN_ALBUM].gain = volume_adjustment;
+ if (strcmp((const char *)id, "album") == 0) {
+ replay_gain_info->tuples[REPLAY_GAIN_ALBUM].gain = volume_adjustment;
+ } else if (strcmp((const char *)id, "track") == 0) {
+ replay_gain_info->tuples[REPLAY_GAIN_TRACK].gain = volume_adjustment;
+ } else {
+ replay_gain_info->tuples[REPLAY_GAIN_ALBUM].gain = volume_adjustment;
+ replay_gain_info->tuples[REPLAY_GAIN_TRACK].gain = volume_adjustment;
+ }
return true;
}
@@ -115,7 +122,7 @@ rva2_apply_frame(struct replay_gain_info *replay_gain_info,
if (4 + peak_bytes > length)
break;
- if (rva2_apply_data(replay_gain_info, d))
+ if (rva2_apply_data(replay_gain_info, d, id))
return true;
data += 4 + peak_bytes;