Changeset 5624:ec1593cc8525 in roaraudio for libroar/stream.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:

• libroar/stream.c (modified) (2 diffs)

libroar/stream.c

@@ -743 +743 @@
 }
 
+int roar_stream_get_rpg   (struct roar_connection * con, struct roar_stream * s, struct roar_stream_rpg * rpg) {
+ struct roar_message m;
+ uint16_t * data = (uint16_t *) m.data;
+ size_t i;
+
+ memset(&m,  0, sizeof(m));
+
+ m.cmd     = ROAR_CMD_GET_STREAM_PARA;
+ m.stream  = s->id;
+ m.datalen = 2*2;
+ m.pos     = 0;
+
+ data[0] = 0; // Version and reserved
+ data[1] = ROAR_STREAM_PARA_RPG; // flags
+
+ for (i = 0; i < m.datalen/2; i++) {
+  data[i] = ROAR_HOST2NET16(data[i]);
+ }
+
+ if ( roar_req(con, &m, NULL) == -1 )
+  return -1;
+
+ if ( m.cmd != ROAR_CMD_OK )
+  return -1;
+
+ for (i = 0; i < m.datalen/2; i++) {
+  data[i] = ROAR_NET2HOST16(data[i]);
+ }
+
+ if ( m.datalen != 10 ) {
+  roar_err_set(ROAR_ERROR_MSGSIZE);
+  return -1;
+ }
+
+ if ( data[0] != 0 ) {
+  roar_err_set(ROAR_ERROR_NSVERSION);
+  return -1;
+ }
+
+ if ( data[1] != ROAR_STREAM_PARA_RPG ) {
+  roar_err_set(ROAR_ERROR_BADRQC);
+  return -1;
+ }
+
+ memset(rpg, 0, sizeof(struct roar_stream_rpg));
+
+ rpg->mode = data[2];
+ rpg->mul  = data[3];
+ rpg->div  = data[4];
+
+ if ( rpg->mode == 0xFFFF )
+  rpg->mode = -1;
+
+ return 0;
+}
+
+int roar_stream_set_rpg   (struct roar_connection * con, struct roar_stream * s, const struct roar_stream_rpg * rpg) {
+ struct roar_message m;
+ uint16_t * data = (uint16_t *) m.data;
+ size_t i;
+
+ memset(&m,  0, sizeof(m));
+
+ m.cmd     = ROAR_CMD_SET_STREAM_PARA;
+ m.stream  = s->id;
+ m.datalen = (2+3)*2;
+ m.pos     = 0;
+
+ data[0] = 0; // Version and reserved
+ data[1] = ROAR_STREAM_PARA_RPG; // flags
+ data[2] = rpg->mode;
+ data[3] = rpg->mul;
+ data[4] = rpg->div;
+
+ for (i = 0; i < m.datalen/2; i++) {
+  data[i] = ROAR_HOST2NET16(data[i]);
+ }
+
+ if ( roar_req(con, &m, NULL) == -1 )
+  return -1;
+
+ if ( m.cmd != ROAR_CMD_OK )
+  return -1;
+
+ return 0;
+}
 
 #ifdef DEBUG
@@ -1168 +1254 @@
 
  return "unknown";
+}
+
+const char * roar_rpgmode2str(const int rpgmode) {
+ switch (rpgmode) {
+  case ROAR_RPGMODE_DEFAULT:    return "default"; break;
+  case ROAR_RPGMODE_NONE:       return "none"; break;
+  case ROAR_RPGMODE_USER:       return "user"; break;
+  case ROAR_RPGMODE_ALBUM:      return "album"; break;
+  case ROAR_RPGMODE_TRACK:      return "track"; break;
+  case ROAR_RPGMODE_ALBUMTRACK: return "albumtrack"; break;
+  case ROAR_RPGMODE_TRACKALBUM: return "trackalbum"; break;
+  default:
+    roar_err_set(ROAR_ERROR_NOENT);
+    return NULL;
+   break;
+ }
 }