Changeset 5624:ec1593cc8525 in roaraudio for roard/codecfilter_vorbis.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_vorbis.c (modified) (2 diffs)

roard/codecfilter_vorbis.c

@@ -305 +305 @@
  char key[ROAR_META_MAX_NAMELEN] = {0}, value[LIBROAR_BUFFER_MSGDATA] = {0};
  struct roar_stream * s = ROAR_STREAM(self->stream);
+ struct roar_stream_rpg rpg;
  int type;
  int j, h = 0;
- float rpg_track = 0, rpg_album = 0;
+ float rpg_track = 0, rpg_album = 0, rpg_final;
  int meta_ok;
 
@@ -373 +374 @@
  }
 
- if ( rpg_album ) {
-  self->stream->mixer.rpg_div = 2718;  // = int(exp(1)*1000)
-  self->stream->mixer.rpg_mul = (float)rpg_album*2718;
- } else if ( rpg_track ) {
-  self->stream->mixer.rpg_div = 2718;
-  self->stream->mixer.rpg_mul = (float)rpg_track*2718;
+ if ( streams_get_rpg(ROAR_STREAM(self->stream)->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->stream->mixer.rpg_div = 2718;
+   self->stream->mixer.rpg_mul = (float)rpg_final*2718;
+  } else if ( !rpg_final ) {
+   self->stream->mixer.rpg_div = 1;
+   self->stream->mixer.rpg_mul = 1;
+  }
  }