Changeset 2940:543bd9f7fef6 in roaraudio

Timestamp:

10/16/09 22:56:44 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added basic add_mixer()

Location:

roard

Files:

• include/mixer.h (modified) (1 diff)
• mixer.c (modified) (1 diff)

roard/include/mixer.h

@@ -28 +28 @@
 #include <roaraudio.h>
 
+#define _MIXER_NAME_PREFIX ""
+#define _MIXER_NAME_SUFFIX " Mixer"
+#define _MIXER_NAME(x)     (_MIXER_NAME_PREFIX x _MIXER_NAME_SUFFIX)
+
 int need_vol_change  (int channels, struct roar_mixer_settings * set);
+
+int add_mixer (int subsys, char * name, struct roar_stream_server ** ss_ptr);
 
 #endif

roard/mixer.c

@@ -41 +41 @@
 }
 
+#define _err() streams_delete(stream); return -1
+int add_mixer (int subsys, char * name, struct roar_stream_server ** ss_ptr) {
+ struct roar_stream_server * ss;
+ int stream;
+
+ if ( (stream = streams_new()) == -1 )
+  return -1;
+
+ if ( streams_get(stream, &ss) == -1 ) {
+  _err();
+ }
+
+ if ( streams_set_name(stream, name) == -1 ) {
+  _err();
+ }
+
+ if ( client_stream_add(g_self_client, stream) == -1 ) {
+  _err();
+ }
+
+ if ( streams_set_dir(stream, ROAR_DIR_MIXING, 1) == -1 ) {
+  _err();
+ }
+
+ if ( streams_set_flag(stream, ROAR_FLAG_PRIMARY) == -1 ) {
+  _err();
+ }
+
+ switch (subsys) {
+  case ROAR_SUBSYS_WAVEFORM:
+   break;
+ }
+
+ return stream;
+}
+
 //ll