Changeset 1498:0e9ec20bf506 in roaraudio
- Timestamp:
- 03/31/09 20:47:44 (15 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/streams.c
r1245 r1498 52 52 struct roar_stream_server * s = NULL; 53 53 54 #ifdef ROAR_SUPPORT_LISTEN 54 55 if ( g_terminate && !g_no_listen ) // don't accept new streams in case of termination state 55 56 return -1; 57 #else 58 if ( g_terminate ) // don't accept new streams in case of termination state 59 return -1; 60 #endif 56 61 57 62 for (i = 0; i < ROAR_STREAMS_MAX; i++) { … … 92 97 s->mixer.mixer[j] = 65535; 93 98 99 #ifdef ROAR_SUPPORT_META 94 100 for (j = 0; j < ROAR_META_MAX_PER_STREAM; j++) { 95 101 s->meta[j].type = ROAR_META_TYPE_NONE; … … 97 103 s->meta[j].value = NULL; 98 104 } 105 #endif 99 106 100 107 roar_vio_init_calls(&(s->vio)); … … 125 132 ROAR_DBG("streams_delete(id=%i): g_streams[id]->id=%i", id, ROAR_STREAM(s)->id); 126 133 134 #ifdef ROAR_SUPPORT_META 127 135 // delete meta data form other meta streams if needed 128 136 if ( streams_get_flag(id, ROAR_FLAG_META) == 1 ) { … … 131 139 stream_meta_finalize(id); 132 140 } 141 #endif 133 142 134 143 if ( s->codecfilter != -1 ) { … … 229 238 230 239 if ( dir == ROAR_DIR_MONITOR || dir == ROAR_DIR_RECORD || dir == ROAR_DIR_OUTPUT ) { 231 shutdown(fh, SHUT_RD);240 ROAR_SHUTDOWN(fh, SHUT_RD); 232 241 } 233 242 … … 294 303 return -1; 295 304 305 #ifdef ROAR_FDATASYNC 296 306 ROAR_FDATASYNC(fh); 307 #endif 297 308 298 309 return 0; … … 318 329 g_streams[id]->flags |= flag; 319 330 331 #ifdef ROAR_SUPPORT_META 320 332 if ( flag & ROAR_FLAG_META ) 321 333 stream_meta_finalize(id); 334 #endif 322 335 323 336 return 0;
Note: See TracChangeset
for help on using the changeset viewer.