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

roard/streams.c

@@ -234 +234 @@
    s->mixerstream =  NULL;
 #endif
+
+   s->rpgmode = ROAR_RPGMODE_DEFAULT;
 
    //roardsp_fchain_init(&(s->fc));
@@ -1508 +1510 @@
 }
 
+int streams_get_rpg      (int id, struct roar_stream_rpg * rpg) {
+ _CHECK_SID(id);
+
+ if ( rpg == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ rpg->mode = g_streams[id]->rpgmode;
+ rpg->mul  = g_streams[id]->mixer.rpg_mul;
+ rpg->div  = g_streams[id]->mixer.rpg_div;
+
+ if ( rpg->mode == ROAR_RPGMODE_DEFAULT )
+  rpg->mode = g_config->streams[ROAR_STREAM(g_streams[id])->dir].rpgmode;
+
+ return 0;
+}
+
+int streams_set_rpg      (int id, const struct roar_stream_rpg * rpg) {
+ int mode;
+
+ _CHECK_SID(id);
+
+ if ( rpg == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ // test if we have a valid value at all.
+ if ( rpg->mode > ROAR_RPGMODE_TRACKALBUM || rpg->mode < ROAR_RPGMODE_DEFAULT ) {
+  roar_err_set(ROAR_ERROR_RANGE);
+  return -1;
+ }
+
+ mode = g_streams[id]->rpgmode = rpg->mode;
+
+ if ( mode == ROAR_RPGMODE_DEFAULT )
+  mode = g_config->streams[ROAR_STREAM(g_streams[id])->dir].rpgmode;
+
+ switch (mode) {
+  case ROAR_RPGMODE_NONE:
+    g_streams[id]->mixer.rpg_mul = 1;
+    g_streams[id]->mixer.rpg_div = 1;
+   break;
+  case ROAR_RPGMODE_USER:
+    g_streams[id]->mixer.rpg_mul = rpg->mul;
+    g_streams[id]->mixer.rpg_div = rpg->div;
+   break;
+ }
+
+ return 0;
+}
+
+
 int streams_ltm_ctl      (int id, int mt, int window, int cmd) {
  struct roar_stream_server * ss;