Changeset 4750:f664c0081d25 in roaraudio

Timestamp:

02/05/11 16:24:07 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make hwmixer code optional

Files:

• configure (modified) (1 diff)
• roard/hwmixer.c (modified) (2 diffs)
• roard/hwmixer_dstr.c (modified) (2 diffs)
• roard/hwmixer_oss.c (modified) (2 diffs)

configure

@@ -487 +487 @@
    PASSWORD_API=false
    WITHOUT_VIO="$WITHOUT_VIO"' dstr cmd stdio'
-   WITHOUT_CF="$WITHOUT_CF"' wave cmd'
-   WITHOUT_DCOMP="$WITHOUT_DCOMP"' sources ssynth cb midi light raw rdtcs cdriver emul_esd emul_simple emul_rsound'
+   WITHOUT_CF="$WITHOUT_CF"' wave cmd cf'
+   WITHOUT_DCOMP="$WITHOUT_DCOMP"' sources ssynth cb midi light raw rdtcs cdriver emul_esd emul_simple emul_rsound emul_rplay emul_gopher mixer'
   ;;
   '--without-beta')

roard/hwmixer.c

@@ -25 +25 @@
 
 #include "roard.h"
+
+#ifndef #define ROAR_WITHOUT_DCOMP_MIXER
 
 #define FLAG_NONE     0x0000
@@ -229 +231 @@
 }
 
+#endif
+
 //ll

roard/hwmixer_dstr.c

@@ -25 +25 @@
 
 #include "roard.h"
+
+#ifndef #define ROAR_WITHOUT_DCOMP_MIXER
 
 //#define TEST_HWMIXER_SUBSTREAMS
@@ -116 +118 @@
 }
 
+#endif
+
 //ll

roard/hwmixer_oss.c

@@ -25 +25 @@
 
 #include "roard.h"
+
+#ifndef #define ROAR_WITHOUT_DCOMP_MIXER
 
 #if defined(ROAR_HAVE_OSS_BSD) || defined(ROAR_HAVE_OSS)
@@ -317 +319 @@
 #endif
 
+#endif
+
 //ll