Changeset 3558:1ba539c79abb in roaraudio for roard
- Timestamp:
- 02/20/10 04:19:03 (14 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/midi.c
r3547 r3558 46 46 int midi_init (void) { 47 47 struct roar_stream_server * ss; 48 char cmap[16]; 48 49 int i; 49 50 … … 71 72 } 72 73 73 roardsp_chanlist_init(ss->chanmap.in, 16, ROARDSP_CHANLIST_MAP_MIDI); 74 memcpy(ss->chanmap.out, ss->chanmap.in, sizeof(ss->chanmap.out)); 75 streams_set_map(g_midi_mixer.stream, NULL, 0); 74 roardsp_chanlist_init(cmap, 16, ROARDSP_CHANLIST_MAP_MIDI); 75 streams_set_map(g_midi_mixer.stream, cmap, 16); 76 76 77 77 ss->state = ROAR_STREAMSTATE_OLD; -
roard/waveform.c
r3547 r3558 30 30 struct roar_stream * s; 31 31 int i; 32 char cmap[ROAR_MAX_CHANNELS]; 32 33 33 34 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)); 41 42 42 roardsp_chanlist_init(ss->chanmap.in, s->info.channels, ROARDSP_CHANLIST_MAP_ROARAUDIO); 43 memcpy(ss->chanmap.out, ss->chanmap.in, sizeof(ss->chanmap.out)); 44 streams_set_map(g_waveform_mixer.stream, NULL, 0); 43 roardsp_chanlist_init(cmap, s->info.channels, ROARDSP_CHANLIST_MAP_ROARAUDIO); 44 streams_set_map(g_waveform_mixer.stream, cmap, s->info.channels); 45 45 46 46 ss->state = ROAR_STREAMSTATE_OLD;
Note: See TracChangeset
for help on using the changeset viewer.