Changeset 1590:07fa8c4493e4 in roaraudio

Timestamp:

04/16/09 16:33:51 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added first try of support for hwmixer flag

Files:

• include/libroar/vio.h (modified) (1 diff)
• roard/driver.c (modified) (1 diff)
• roard/include/driver.h (modified) (1 diff)
• roard/include/streams.h (modified) (1 diff)
• roard/req.c (modified) (1 diff)
• roard/streams.c (modified) (3 diffs)

include/libroar/vio.h

@@ -85 +85 @@
 #define ROAR_VIO_CTL_GET_DBLKSIZE  (ROAR_VIO_CTL_DRIVER|0x0003) /* get Driver Blocks size (in byte) */
 #define ROAR_VIO_CTL_SET_DBLKSIZE  (ROAR_VIO_CTL_DRIVER|0x0004) /* set Driver Blocks size (in byte) */
+#define ROAR_VIO_CTL_GET_VOLUME    (ROAR_VIO_CTL_DRIVER|ROAR_VIO_CTL_GET|0x10)
+#define ROAR_VIO_CTL_SET_VOLUME    (ROAR_VIO_CTL_DRIVER|ROAR_VIO_CTL_SET|0x10)
 
 // sys io:

roard/driver.c

@@ -219 +219 @@
 }
 
+int driver_set_volume(int stream, struct roar_mixer_settings * mixer) {
+ struct roar_stream_server * ss;
+
+ if ( (ss = g_streams[stream]) == NULL )
+  return -1;
+
+ if ( !streams_get_flag(stream, ROAR_FLAG_HWMIXER) )
+  return 0;
+
+ if ( ss->driver_id == -1 )
+  return -1;
+
+ return roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_VOLUME, (void*)mixer);
+}
+
 //ll

roard/include/driver.h

@@ -111 +111 @@
 int driver_read (DRIVER_USERDATA_T   inst, int driver, char * buf, int len);
 int driver_flush(DRIVER_USERDATA_T   inst, int driver);
+int driver_set_volume(int stream, struct roar_mixer_settings * mixer);
 
 #endif

roard/include/streams.h

@@ -98 +98 @@
 
 int streams_calc_delay   (int id);
+int streams_set_mixer    (int id);
 
 int streams_ctl          (int id, int_least32_t cmd, void * data);

roard/req.c

@@ -666 +666 @@
  }
 
+ if ( streams_set_mixer(stream) == -1 )
+  return -1;
+
  mes->cmd     = ROAR_CMD_OK;
  mes->datalen = 0;

roard/streams.c

@@ -328 +328 @@
 
  if ( flag & ROAR_FLAG_HWMIXER ) { // currently not supported -> ignored
-  flag -= ROAR_FLAG_HWMIXER;
+  g_streams[id]->flags |= flag;
+  if ( streams_set_mixer(id) == -1 ) {
+   g_streams[id]->flags -= flag;
+   return -1;
+  }
  }
 
@@ -399 +403 @@
 
  return 0;
+}
+
+int streams_set_mixer    (int id) {
+ struct roar_stream_server * ss;
+
+ if ( (ss = g_streams[id]) == NULL )
+  return -1;
+
+ if ( !streams_get_flag(id, ROAR_FLAG_HWMIXER) )
+  return 0;
+
+ if ( ss->driver_id == -1 )
+  return 0;
+
+ return driver_set_volume(id, &(ss->mixer));
 }
 
@@ -619 +638 @@
   }
 
-  if ( change_vol(rest, info->bits, rest, 8*outlen / info->bits, info->channels, &(stream->mixer)) == -1 )
-   return -1;
+  if ( !streams_get_flag(id, ROAR_FLAG_HWMIXER) ) {
+   if ( change_vol(rest, info->bits, rest, 8*outlen / info->bits, info->channels, &(stream->mixer)) == -1 )
+    return -1;
+  }
 
   // we habe outlen bytes more...