Changeset 4516:f2314a12d62a in roaraudio
- Timestamp:
- 10/16/10 15:31:48 (13 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
ChangeLog
r4515 r4516 10 10 * Wrote authfile API. 11 11 * Changed SONAME version to 1. 12 * Changed buffer interface, no public struct anymore. 12 13 13 14 v. 0.4beta0 - Fri Oct 01 2010 13:36 CEST -
include/libroar/buffer.h
r3764 r4516 47 47 #define ROAR_BUFFER_RESET 1 48 48 49 struct roar_buffer_ring { 50 size_t read_pos; 51 size_t write_pos; 49 struct roar_buffer; 50 51 struct roar_buffer_stats { 52 size_t parts; 53 size_t bytes; 54 size_t memory_usage; 52 55 }; 53 56 54 struct roar_buffer { 55 size_t len; 56 size_t user_len; 57 int flags; 58 void * data; 59 void * user_data; 60 union { 61 void * vp; 62 int32_t i32; 63 struct roar_buffer_ring ring; 64 } meta; 65 struct roar_buffer * next; 66 }; 57 #define roar_buffer_next(a) roar_buffer_delete(*(a), (a)) 67 58 68 struct roar_buffer_stats { 69 int parts; 70 int bytes; 71 int memory_usage; 72 }; 59 #define roar_buffer_new(a,len) roar_buffer_new_data((a), (len), NULL) 73 60 74 #define roar_buffer_next(a) roar_buffer_delete(*(a), (a))75 76 int roar_buffer_new (struct roar_buffer ** buf, size_t len);77 61 int roar_buffer_new_no_ma(struct roar_buffer ** buf, size_t len, void * data); // no internal malloc 78 62 int roar_buffer_free (struct roar_buffer * buf); … … 84 68 int roar_buffer_ring_new (struct roar_buffer ** buf, size_t len, int free_running); 85 69 86 int roar_buffer_get_next (struct roar_buffer * buf, struct roar_buffer ** next); 70 int roar_buffer_clear_next (struct roar_buffer * buf); 71 int roar_buffer_get_next (struct roar_buffer * buf, struct roar_buffer ** next); 87 72 88 73 int roar_buffer_get_data (struct roar_buffer * buf, void ** data); -
include/libroar/vio_magic.h
r3811 r4516 40 40 41 41 struct roar_vio_magic { 42 struct roar_buffer inp;43 struct roar_stack vios;42 struct roar_buffer * inp; 43 struct roar_stack vios; 44 44 }; 45 45 -
libroar/buffer.c
r3811 r4516 36 36 #include "libroar.h" 37 37 38 // TODO: convert this to a macro. 39 // TODO: but still provide a function->symbol 40 // TODO: so we do not need to change SONAME-Version 41 // TODO: Clean this up in next SONAME-Version 42 int roar_buffer_new (struct roar_buffer ** buf, size_t len) { 43 return roar_buffer_new_data(buf, len, NULL); 44 } 38 struct roar_buffer_ring { 39 size_t read_pos; 40 size_t write_pos; 41 }; 42 43 struct roar_buffer { 44 size_t refc; 45 size_t len; 46 size_t user_len; 47 int flags; 48 void * data; 49 void * user_data; 50 union { 51 void * vp; 52 int32_t i32; 53 struct roar_buffer_ring ring; 54 } meta; 55 struct roar_buffer * next; 56 }; 45 57 46 58 int roar_buffer_new_data (struct roar_buffer ** buf, size_t len, void ** data) { … … 171 183 172 184 ROAR_DBG("buffer_add(*): adding buffer at deep %u", deep); 185 186 return 0; 187 } 188 189 int roar_buffer_clear_next (struct roar_buffer * buf) { 190 if ( buf == NULL ) 191 return -1; 192 193 buf->next = NULL; 173 194 174 195 return 0; -
libroar/vio_magic.c
r3811 r4516 51 51 return -1; 52 52 53 inp = &(self->inp);53 inp = self->inp; 54 54 55 55 if ( roar_buffer_get_len(inp, &len) == -1 ) -
roarclients/roartypes.c
r3811 r4516 29 29 int main (void) { 30 30 struct { char * name; int len; } types[] = { 31 { "roar_buffer", sizeof(struct roar_buffer) },31 // { "roar_buffer", sizeof(struct roar_buffer) }, 32 32 { "roar_stack", sizeof(struct roar_stack) }, 33 33 { "roar_message", sizeof(struct roar_message) }, -
roard/streams.c
r4417 r4516 1547 1547 } 1548 1548 1549 buf->next = NULL;1549 roar_buffer_clear_next(buf); 1550 1550 1551 1551 roar_buffer_add(buf, g_streams[id]->buffer);
Note: See TracChangeset
for help on using the changeset viewer.