Changeset 5624:ec1593cc8525 in roaraudio for roard/codecfilter_flac.c

Timestamp:

08/18/12 02:04:07 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added support for RePlayGain? (RPG) control (See: #300)

File:

• roard/codecfilter_flac.c (modified) (2 diffs)

roard/codecfilter_flac.c

@@ -116 +116 @@
  const FLAC__StreamMetadata_VorbisComment * vc;
  FLAC__uint32 i;
+ struct roar_stream_rpg rpg;
  const char * key, * value;
  char keycopy[ROAR_META_MAX_NAMELEN];
  int type;
- float rpg_track = 0, rpg_album = 0;
+ float rpg_track = 0, rpg_album = 0, rpg_final = 0;
 
  if ( metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT ) {
@@ -171 +172 @@
   }
 
- if ( rpg_album ) {
-  self->ss->mixer.rpg_div = 2718;  // = int(exp(1)*1000)
-  self->ss->mixer.rpg_mul = (float)rpg_album*2718;
- } else if ( rpg_track ) {
-  self->ss->mixer.rpg_div = 2718;
-  self->ss->mixer.rpg_mul = (float)rpg_track*2718;
+ if ( streams_get_rpg(ROAR_STREAM(self->ss)->id, &rpg) != -1 ) {
+  rpg_final = 0;
+
+  switch (rpg.mode) {
+   case ROAR_RPGMODE_NONE: rpg_final =  0.; break;
+   case ROAR_RPGMODE_USER: rpg_final = -1.; break;
+   case ROAR_RPGMODE_ALBUM: rpg_final = rpg_album; break;
+   case ROAR_RPGMODE_TRACK: rpg_final = rpg_track; break;
+   case ROAR_RPGMODE_ALBUMTRACK: rpg_final = rpg_album ? rpg_album : rpg_track; break;
+   case ROAR_RPGMODE_TRACKALBUM: rpg_final = rpg_track ? rpg_track : rpg_album; break;
+  }
+
+  if ( rpg_final > 0 ) {
+   self->ss->mixer.rpg_div = 2718;
+   self->ss->mixer.rpg_mul = (float)rpg_final*2718;
+  } else if ( !rpg_final ) {
+   self->ss->mixer.rpg_div = 1;
+   self->ss->mixer.rpg_mul = 1;
+  }
  }