Changeset 4365:7502b11fcb8a in roaraudio

Timestamp:

09/14/10 18:02:43 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make things work

Location:

roard

Files:

• hwmixer.c (modified) (1 diff)
• include/hwmixer.h (modified) (2 diffs)
• streams.c (modified) (1 diff)

roard/hwmixer.c

@@ -153 +153 @@
 }
 
+int hwmixer_set_volume(int id, struct roar_stream_server * ss, struct hwmixer_stream * mstream, struct roar_mixer_settings *
+settings) {
+ if ( mstream->hwmixer->set_vol != NULL )
+  return mstream->hwmixer->set_vol(mstream, ROAR_STREAM(ss)->info.channels, HWMIXER_MODE_SET, settings);
+
+ return 0;
+}
+
 //ll

roard/include/hwmixer.h

@@ -29 +29 @@
 #include <roaraudio.h>
 
+#define HWMIXER_MODE_SET        1
+
 struct hwmixer;
 
@@ -43 +45 @@
 int hwmixer_close(int stream);
 
+int hwmixer_set_volume(int id, struct roar_stream_server * ss, struct hwmixer_stream * mstream, struct roar_mixer_settings * settings);
+
 // Mixers:
 

roard/streams.c

@@ -1000 +1000 @@
   return 0;
 
- if ( ss->driver_id == -1 )
-  return 0;
-
- return driver_set_volume(id, &(ss->mixer));
+ if ( ss->driver_id != -1 ) {
+  return driver_set_volume(id, &(ss->mixer));
+ } else if ( ss->mixerstream != NULL ) {
+  return hwmixer_set_volume(id, ss, ss->mixerstream, &(ss->mixer));
+ } else {
+  return 0;
+ }
 }