Changeset 5301:f3e9cd30574d in roaraudio
- Timestamp:
- 11/25/11 18:20:03 (12 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
plugins/roard/protocol-gopher.c
r5242 r5301 691 691 } 692 692 693 clients_add_output(client, buf);693 clients_add_output(client, &buf); 694 694 } 695 695 … … 711 711 //memcpy(data+len, "\r\n.\r\n\0", 6); 712 712 memcpy(data+len, "\0", 1); 713 clients_add_output(client, buf);713 clients_add_output(client, &buf); 714 714 715 715 return 0; -
roard/clients.c
r5295 r5301 798 798 } 799 799 800 int clients_add_output (int id, struct roar_buffer * buf) {800 int clients_add_output (int id, struct roar_buffer ** buf) { 801 801 struct roar_client_server * cs; 802 802 … … 805 805 806 806 if ( cs->outbuf == NULL ) { 807 cs->outbuf = buf;807 cs->outbuf = *buf; 808 808 } else { 809 return roar_buffer_ add(cs->outbuf, buf);809 return roar_buffer_moveinto(cs->outbuf, buf); 810 810 } 811 811 -
roard/codecfilter_fishsound.c
r5242 r5301 84 84 self->buffer = buf; 85 85 } else { 86 if ( roar_buffer_ add(self->buffer,buf) == -1 ) {86 if ( roar_buffer_moveinto(self->buffer, &buf) == -1 ) { 87 87 roar_buffer_free(buf); 88 88 return -1; -
roard/codecfilter_flac.c
r5242 r5301 101 101 self->decoder.written = buf; 102 102 } else { 103 if ( roar_buffer_ add(self->decoder.written,buf) == -1 ) {103 if ( roar_buffer_moveinto(self->decoder.written, &buf) == -1 ) { 104 104 roar_buffer_free(buf); 105 105 return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT; -
roard/include/client.h
r5275 r5301 113 113 int clients_send_filter(struct roar_audio_info * sa, uint32_t pos); 114 114 115 int clients_add_output (int id, struct roar_buffer * buf);115 int clients_add_output (int id, struct roar_buffer ** buf); 116 116 117 117 // proto support -
roard/include/streams.h
r5288 r5301 187 187 int streams_ctl (int id, int_least32_t cmd, void * data); 188 188 189 int stream_add_buffer (int id, struct roar_buffer * buf);189 int stream_add_buffer (int id, struct roar_buffer ** buf); 190 190 //int stream_get_buffer (int id, struct roar_buffer ** buf); 191 191 int stream_shift_out_buffer (int id, void * data, size_t * len); … … 196 196 int stream_outputbuffer_destroy(int id); 197 197 198 int stream_prethru_add(int id, struct roar_buffer * buf);198 int stream_prethru_add(int id, struct roar_buffer ** buf); 199 199 int stream_prethru_add_data(int id, void ** buf, size_t len); 200 200 int stream_prethru_destroy(int id); -
roard/midi.c
r5278 r5301 186 186 } 187 187 188 if ( stream_add_buffer(id, b) == -1 ) {188 if ( stream_add_buffer(id, &b) == -1 ) { 189 189 roar_buffer_free(b); 190 190 streams_delete(id); … … 714 714 g_midi_mess.buf = buf; 715 715 } else { 716 if ( roar_buffer_ add(g_midi_mess.buf,buf) == -1 ) {716 if ( roar_buffer_moveinto(g_midi_mess.buf, &buf) == -1 ) { 717 717 ROAR_DBG("midi_add_buf(*) = -1"); 718 718 return -1; -
roard/req.c
r5295 r5301 1762 1762 } 1763 1763 1764 if ( stream_add_buffer(mes->stream, b) == -1 ) {1764 if ( stream_add_buffer(mes->stream, &b) == -1 ) { 1765 1765 roar_buffer_free(b); 1766 1766 return -1; -
roard/sample.c
r5192 r5301 114 114 c->data = new; 115 115 } else { 116 if ( roar_buffer_ add(c->data,new) == -1 ) {116 if ( roar_buffer_moveinto(c->data, &new) == -1 ) { 117 117 save_err = roar_error; 118 118 roar_buffer_free(new); -
roard/ssynth.c
r5194 r5301 181 181 } 182 182 183 if ( stream_add_buffer(g_ssynth.stream, outbuf) == -1 ) {183 if ( stream_add_buffer(g_ssynth.stream, &outbuf) == -1 ) { 184 184 roar_buffer_free(outbuf); 185 185 return -1; -
roard/streams.c
r5288 r5301 1945 1945 1946 1946 1947 int stream_add_buffer (int id, struct roar_buffer * buf) {1947 int stream_add_buffer (int id, struct roar_buffer ** buf) { 1948 1948 ROAR_DBG("stream_add_buffer(id=%i, buf=%p) = ?", id, buf); 1949 1949 … … 1951 1951 1952 1952 if ( g_streams[id]->buffer == NULL ) { 1953 g_streams[id]->buffer = buf; 1953 g_streams[id]->buffer = *buf; 1954 *buf = NULL; 1954 1955 ROAR_DBG("stream_add_buffer(id=%i, buf=%p) = 0", id, buf); 1955 1956 return 0; … … 1957 1958 1958 1959 ROAR_DBG("stream_add_buffer(id=%i, buf=%p) = ?", id, buf); 1959 return roar_buffer_ add(g_streams[id]->buffer, buf);1960 return roar_buffer_moveinto(g_streams[id]->buffer, buf); 1960 1961 } 1961 1962 … … 2041 2042 } 2042 2043 2043 int stream_prethru_add(int id, struct roar_buffer * buf) {2044 int stream_prethru_add(int id, struct roar_buffer ** buf) { 2044 2045 register struct roar_stream_server * ss; 2045 2046 … … 2050 2051 2051 2052 if ( ss->prethru == NULL ) { 2052 ss->prethru = buf; 2053 ss->prethru = *buf; 2054 *buf = NULL; 2053 2055 return 0; 2054 2056 } 2055 2057 2056 if ( roar_buffer_ add(ss->prethru, buf) == -1 ) {2058 if ( roar_buffer_moveinto(ss->prethru, buf) == -1 ) { 2057 2059 return -1; 2058 2060 } … … 2066 2068 _CHECK_SID(id); 2067 2069 2068 if ( roar_buffer_new(&buffer, len) == -1 ) 2069 return -1; 2070 2071 if ( roar_buffer_get_data(buffer, buf) == -1 ) { 2072 roar_buffer_free(buffer); 2073 return -1; 2074 } 2075 2076 if ( stream_prethru_add(id, buffer) == -1 ) { 2070 if ( roar_buffer_new_data(&buffer, len, buf) == -1 ) 2071 return -1; 2072 2073 if ( stream_prethru_add(id, &buffer) == -1 ) { 2077 2074 roar_buffer_free(buffer); 2078 2075 return -1; … … 2263 2260 2264 2261 if ( roar_buffer_set_len(b, req) != -1 ) { 2265 if ( stream_add_buffer(id, b) != -1 )2262 if ( stream_add_buffer(id, &b) != -1 ) 2266 2263 return 0; 2267 2264 -
roard/waveform.c
r5194 r5301 133 133 } 134 134 135 if ( stream_add_buffer(g_waveform_recbridge.stream, buf) == -1 ) {135 if ( stream_add_buffer(g_waveform_recbridge.stream, &buf) == -1 ) { 136 136 ROAR_ERR("waveform_update_inputs(void): Can not attach a new buffer object to the Record Bridge. Bad."); 137 137 roar_buffer_free(buf);
Note: See TracChangeset
for help on using the changeset viewer.