Changeset 382:46b315ef4767 in roaraudio for roard
- Timestamp:
- 08/06/08 00:08:59 (16 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/codecfilter_vorbis.c
r362 r382 15 15 self->current_section = -1; 16 16 self->last_section = -1; 17 self->opened = 0; 17 self->opened = 0; 18 self->got_it_running = 0; 18 19 self->stream = info; 19 20 // self->outlen = ROAR_OUTPUT_BUFFER_SAMPLES * s->info.channels * s->info.bits / 8; // optimal size … … 37 38 return -1; 38 39 39 ov_clear(&(self->vf)); 40 if ( self->got_it_running ) 41 ov_clear(&(self->vf)); 40 42 41 43 free(inst); … … 55 57 //printf("cf_vorbis_read(*): opening...\n"); 56 58 if ( ov_open(self->in, &(self->vf), NULL, 0) < 0 ) { 57 free((void*)self);59 // free((void*)self); 58 60 return 0; 59 61 } … … 63 65 return -1; 64 66 } 67 68 69 self->got_it_running = 1; 65 70 66 71 while (todo) { -
roard/include/codecfilter_vorbis.h
r362 r382 19 19 struct roar_stream_server * stream; 20 20 OggVorbis_File vf; 21 int got_it_running; 21 22 }; 22 23 -
roard/streams.c
r381 r382 82 82 if ( g_streams[id]->codecfilter != -1 ) { 83 83 codecfilter_close(g_streams[id]->codecfilter_inst, g_streams[id]->codecfilter); 84 g_streams[id]->codecfilter_inst = NULL; 84 85 g_streams[id]->codecfilter = -1; 85 86 }
Note: See TracChangeset
for help on using the changeset viewer.