Changeset 3558:1ba539c79abb in roaraudio

Timestamp:

02/20/10 04:19:03 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

install cmap via stream_set_map()

Location:

roard

Files:

• midi.c (modified) (2 diffs)
• waveform.c (modified) (2 diffs)

roard/midi.c

@@ -46 +46 @@
 int midi_init (void) {
  struct roar_stream_server * ss;
+ char cmap[16];
  int i;
 
@@ -71 +72 @@
  }
 
- roardsp_chanlist_init(ss->chanmap.in,   16, ROARDSP_CHANLIST_MAP_MIDI);
- memcpy(ss->chanmap.out, ss->chanmap.in, sizeof(ss->chanmap.out));
- streams_set_map(g_midi_mixer.stream, NULL, 0);
+ roardsp_chanlist_init(cmap,   16, ROARDSP_CHANLIST_MAP_MIDI);
+ streams_set_map(g_midi_mixer.stream, cmap, 16);
 
  ss->state = ROAR_STREAMSTATE_OLD;

roard/waveform.c

@@ -30 +30 @@
  struct roar_stream        *  s;
  int                          i;
+ char                      cmap[ROAR_MAX_CHANNELS];
 
  if ( (g_waveform_mixer.stream = add_mixer(ROAR_SUBSYS_WAVEFORM, _MIXER_NAME("Waveform"), &ss)) == -1 )
@@ -40 +41 @@
  memcpy(&(s->info), g_sa, sizeof(struct roar_audio_info));
 
- roardsp_chanlist_init(ss->chanmap.in,   s->info.channels, ROARDSP_CHANLIST_MAP_ROARAUDIO);
- memcpy(ss->chanmap.out, ss->chanmap.in, sizeof(ss->chanmap.out));
- streams_set_map(g_waveform_mixer.stream, NULL, 0);
+ roardsp_chanlist_init(cmap,   s->info.channels, ROARDSP_CHANLIST_MAP_ROARAUDIO);
+ streams_set_map(g_waveform_mixer.stream, cmap, s->info.channels);
 
  ss->state = ROAR_STREAMSTATE_OLD;