Changeset 494:e2c5683de088 in roaraudio for roard/streams.c
- Timestamp:
- 08/14/08 05:16:55 (16 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/streams.c
r491 r494 27 27 int streams_new (void) { 28 28 int i, j; 29 struct roar_stream * n = NULL; 29 struct roar_stream * n = NULL; 30 struct roar_stream_server * s = NULL; 30 31 31 32 for (i = 0; i < ROAR_STREAMS_MAX; i++) { 32 33 if ( g_streams[i] == NULL ) { 33 n = malloc(sizeof(struct roar_stream_server));34 s = ROAR_STREAM_SERVER(n = ROAR_STREAM(malloc(sizeof(struct roar_stream_server)))); 34 35 if ( n == NULL ) { 35 36 ROAR_ERR("streams_new(void): can not allocate memory for new stream: %s", strerror(errno)); … … 47 48 n->pos = 0; 48 49 49 ((struct roar_stream_server*)n)->client = -1; 50 ((struct roar_stream_server*)n)->socktype = ROAR_SOCKET_TYPE_UNKNOWN; 51 ((struct roar_stream_server*)n)->buffer = NULL; 52 ((struct roar_stream_server*)n)->need_extra = 0; 53 ((struct roar_stream_server*)n)->output = NULL; 54 ((struct roar_stream_server*)n)->is_new = 1; 55 ((struct roar_stream_server*)n)->codecfilter = -1; 56 ((struct roar_stream_server*)n)->mixer.scale = 65535; 57 ((struct roar_stream_server*)n)->mixer.rpg_mul = 1; 58 ((struct roar_stream_server*)n)->mixer.rpg_div = 1; 50 s->client = -1; 51 s->socktype = ROAR_SOCKET_TYPE_UNKNOWN; 52 s->buffer = NULL; 53 s->need_extra = 0; 54 s->output = NULL; 55 s->is_new = 1; 56 s->codecfilter = -1; 57 s->pre_underruns = 0; 58 s->post_underruns = 0; 59 60 s->mixer.scale = 65535; 61 s->mixer.rpg_mul = 1; 62 s->mixer.rpg_div = 1; 59 63 for (j = 0; j < ROAR_MAX_CHANNELS; j++) 60 ((struct roar_stream_server*)n)->mixer.mixer[j] = 65535; 64 s->mixer.mixer[j] = 65535; 65 61 66 for (j = 0; j < ROAR_META_MAX_PER_STREAM; j++) { 62 ((struct roar_stream_server*)n)->meta[j].type = ROAR_META_TYPE_NONE;63 ((struct roar_stream_server*)n)->meta[j].key[0] = 0;64 ((struct roar_stream_server*)n)->meta[j].value = NULL;65 } 66 67 g_streams[i] = (struct roar_stream_server*)n;67 s->meta[j].type = ROAR_META_TYPE_NONE; 68 s->meta[j].key[0] = 0; 69 s->meta[j].value = NULL; 70 } 71 72 g_streams[i] = s; 68 73 ROAR_DBG("streams_new(void): n->id=%i", n->id); 69 74 ROAR_DBG("streams_new(void) = %i", i);
Note: See TracChangeset
for help on using the changeset viewer.