Changeset 4850:fe9aec03046c in roaraudio

Timestamp:

04/09/11 21:45:29 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

allow amps > 1.0 for VS API in some kind of expert mode (needed by VLC, requested by maister)

Files:

• include/libroar/vs.h (modified) (1 diff)
• libroar/vs.c (modified) (4 diffs)

include/libroar/vs.h

@@ -284 +284 @@
  ROAR_VS_CMD_GET_LATC_MINLAG,
 #define ROAR_VS_CMD_GET_LATC_MINLAG ROAR_VS_CMD_GET_LATC_MINLAG
+ ROAR_VS_CMD_SET_FREE_VOLUME,
+#define ROAR_VS_CMD_SET_FREE_VOLUME ROAR_VS_CMD_SET_FREE_VOLUME
+ ROAR_VS_CMD_GET_FREE_VOLUME,
+#define ROAR_VS_CMD_GET_FREE_VOLUME ROAR_VS_CMD_GET_FREE_VOLUME
 };
 

libroar/vs.c

@@ -45 +45 @@
 #define FLAG_BUFFERED  0x0004
 #define FLAG_CLOSEFILE 0x0008
+#define FLAG_FREE_VOL  0x0010
 #define FLAG_DIR_IN    0x1000
 #define FLAG_DIR_OUT   0x2000
@@ -805 +806 @@
  struct roar_mixer_settings mixer;
  size_t i;
- register float s;
+ register float s, max_s = -100.0, scale = 65535.0;
  int oldchannels;
  int mode = ROAR_SET_VOL_ALL;
@@ -828 +829 @@
  }
 
+ if ( vss->flags & FLAG_FREE_VOL ) {
+  for (i = 0; i < channels; i++) {
+   if ( c[i] > max_s ) {
+    max_s = c[i];
+   } else if ( c[i] < -0.01 ) {
+    _seterr(ROAR_ERROR_RANGE);
+    return -1;
+   }
+  }
+
+  if ( max_s > 1.00 ) {
+   scale = 65535.0 / max_s;
+  }
+ }
+
  for (i = 0; i < channels; i++) {
-  s = c[i] * 65535.0;
-  if ( s > 66190.0 || s < -655.0 ) {
-   _seterr(ROAR_ERROR_RANGE);
-   return -1;
-  } else if ( s > 65535.0 ) {
-   s = 65535.0;
-  } else if ( s <     0.0 ) {
-   s = 0.0;
+  if ( vss->flags & FLAG_FREE_VOL ) {
+   s = c[i] * scale;
+   if ( s < 0.0 )
+    s = 0.0;
+  } else {
+   s = c[i] * 65535.0;
+   if ( s > 66190.0 || s < -655.0 ) {
+    _seterr(ROAR_ERROR_RANGE);
+    return -1;
+   } else if ( s > 65535.0 ) {
+    s = 65535.0;
+   } else if ( s <     0.0 ) {
+    s = 0.0;
+   }
   }
   mixer.mixer[i] = s;
  }
 
- mixer.scale = 65535;
+ if ( vss->flags & FLAG_FREE_VOL ) {
+  mixer.scale = scale;
+ } else {
+  mixer.scale = 65535;
+ }
 
  if ( channels != oldchannels )
@@ -1344 +1370 @@
    break;
 #endif
+  case ROAR_VS_CMD_SET_FREE_VOLUME:
+    vss->flags |= FLAG_FREE_VOL;
+    if ( !*(int*)argp ) {
+     vss->flags -= FLAG_FREE_VOL;
+    }
+   break;
+  case ROAR_VS_CMD_GET_FREE_VOLUME:
+    *(int*)argp = vss->flags & FLAG_FREE_VOL ? 1 : 0;
+   break;
 // use ifndef here so warnings of unhandled enum values will be shown in DEBUG mode.
 #ifndef DEBUG