Changeset 4544:d8158852ff37 in roaraudio for roard/streams.c
- Timestamp:
- 10/24/10 15:55:19 (14 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/streams.c
r4543 r4544 190 190 roar_notify_core_emit_snoargs(ROAR_OE_BASICS_DELETE, -1, id, ROAR_OT_STREAM); 191 191 192 if ( s->flags & ROAR_FLAG_SINGLESINK ) 193 streams_set_single_sink(id, 1); 194 192 195 counters_inc(streams, -1); 193 196 … … 796 799 * If the flag is unset on the mixer but got set by the sources the counter 797 800 * may/will become corrupted. 798 *799 * TODO: If a stream is deleted and this flag is set this rutine must be called to800 * maintain a correct count.801 801 */ 802 802 … … 841 841 if ( (s = ROAR_STREAM((ss = g_streams[i]))) != NULL ) { 842 842 if ( s->dir == ROAR_DIR_THRU ) 843 if ( s->pos_rel_id == id || s->pos_rel_id == mixer )843 if ( s->pos_rel_id == id || s->pos_rel_id == mixer || g_streams[s->pos_rel_id]->mixer_stream == mixer ) 844 844 return -1; 845 845 … … 849 849 ssdir = streams_get_ssdir(i); 850 850 851 if ( ssdir & STREAM_DIR_OUT ) {851 if ( ssdir & STREAM_DIR_OUT ) 852 852 count++; 853 if ( streams_thru_num ) {854 return -1;855 }856 }857 853 } 858 854 }
Note: See TracChangeset
for help on using the changeset viewer.