Changeset 4753:fae4e9e389bc in roaraudio

Timestamp:

02/05/11 17:30:53 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed depends

Location:

roard

Files:

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

roard/include/streams.h

@@ -111 +111 @@
  int parent_stream;
  struct roar_stream_ltm ltm[MAX_LTM_WINDOWS_PER_STREAM];
+#ifndef ROAR_WITHOUT_DCOMP_MIXER
  struct hwmixer_stream * mixerstream;
+#endif
  size_t single_sink_c;
  size_t single_sink_self_c;

roard/streams.c

@@ -152 +152 @@
    s->flags     =  ROAR_FLAG_NONE;
 
+#ifndef ROAR_WITHOUT_DCOMP_MIXER
    s->mixerstream =  NULL;
+#endif
 
    //roardsp_fchain_init(&(s->fc));
@@ -260 +262 @@
  }
 
+#ifndef ROAR_WITHOUT_DCOMP_MIXER
  if ( s->mixerstream != NULL ) {
   hwmixer_close(id);
  }
+#endif
 
  //roardsp_fchain_uninit(&(s->fc));
@@ -1175 +1179 @@
  if ( ss->driver_id != -1 ) {
   return driver_set_volume(id, &(ss->mixer));
+#ifndef ROAR_WITHOUT_DCOMP_MIXER
  } else if ( ss->mixerstream != NULL ) {
   return hwmixer_set_volume(id, ss, ss->mixerstream, &(ss->mixer));
+#endif
  } else {
   return 0;
@@ -1380 +1386 @@
 }
 
+#ifndef ROAR_WITHOUT_DCOMP_MIXER
 struct hwmixer_stream * streams_get_mixerstream(int id) {
  _CHECK_SID_RET(id, NULL);
@@ -1407 +1414 @@
  return hwmixer_get_volume(id, ss, ss->mixerstream, &(ss->mixer));
 }
+#endif
 
 int streams_ctl          (int id, int_least32_t cmd, void * data) {