Changeset 997:811183edb732 in roaraudio
- Timestamp:
- 12/18/08 23:56:54 (16 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/codecfilter_fishsound.c
r994 r997 40 40 } data; 41 41 42 ROAR_ WARN("cf_fishsound_decoded_float(fsound=%p, pcm=%p, frames=%li, user_data=%p) = ?", fsound, pcm, frames, user_data);43 44 ROAR_ WARN("cf_fishsound_decoded_float(*): self->opened=%i", self->opened);42 ROAR_DBG("cf_fishsound_decoded_float(fsound=%p, pcm=%p, frames=%li, user_data=%p) = ?", fsound, pcm, frames, user_data); 43 44 ROAR_DBG("cf_fishsound_decoded_float(*): self->opened=%i", self->opened); 45 45 46 46 if (!self->opened) { … … 156 156 size_t stlen; 157 157 158 ROAR_ WARN("cf_fishsound_read(inst=%p, buf=%p, len=%i) = ?", inst, buf, len);158 ROAR_DBG("cf_fishsound_read(inst=%p, buf=%p, len=%i) = ?", inst, buf, len); 159 159 160 160 /* … … 185 185 } 186 186 187 ROAR_WARN("cf_fishsound_read(*): need_data=%i, self->opened=%i", need_data, self->opened); 188 189 while (need_data) { 190 if ( (inlen = stream_vio_s_read(self->stream, buf, len)) == -1 ) 191 return -1; 192 193 oggz_read_input(self->oggz, (unsigned char *)buf, inlen); 194 195 if ( roar_buffer_ring_stats(self->buffer, &stats) == -1 ) 196 return -1; 197 198 if ( stats.bytes < len ) { 199 need_data = 1; 187 ROAR_DBG("cf_fishsound_read(*): need_data=%i, self->opened=%i", need_data, self->opened); 188 189 // while (need_data) { 190 if ( (inlen = stream_vio_s_read(self->stream, buf, len)) == -1 ) { 191 // if ( errno != EAGAIN ) { 192 return -1; 193 /* 194 } else { 195 return -1; 196 } 197 */ 200 198 } else { 201 need_data = 0; 199 if ( inlen == 0 ) 200 return 0; 201 202 oggz_read_input(self->oggz, (unsigned char *)buf, inlen); 203 204 if( self->buffer != NULL ) { 205 if ( roar_buffer_ring_stats(self->buffer, &stats) == -1 ) 206 return -1; 207 208 if ( stats.bytes < len ) { 209 need_data = 1; 210 } else { 211 need_data = 0; 212 } 213 } 202 214 } 203 } 204 205 ROAR_WARN("cf_fishsound_read(*): need_data=%i, self->opened=%i", need_data, self->opened); 215 // } 216 217 ROAR_DBG("cf_fishsound_read(*): need_data=%i, self->opened=%i", need_data, self->opened); 218 219 if ( need_data ) { 220 errno = EAGAIN; 221 return -1; 222 } 206 223 207 224 if ( !self->opened ) { … … 212 229 self->opened = 1; 213 230 errno = EAGAIN; 214 ROAR_ WARN("cf_fishsound_read(inst=%p, buf=%p, len=%i) = -1 // errno=EAGAIN", inst, buf, len);231 ROAR_DBG("cf_fishsound_read(inst=%p, buf=%p, len=%i) = -1 // errno=EAGAIN", inst, buf, len); 215 232 return -1; 216 233 } … … 220 237 stlen = len; 221 238 if ( roar_buffer_shift_out(&(self->buffer), buf, &stlen) == -1 ) { 222 ROAR_ WARN("cf_fishsound_read(inst=%p, buf=%p, len=%i) = -1 // roar_buffer_shift_out() failed", inst, buf, len);223 return -1; 224 } 225 226 ROAR_ WARN("cf_fishsound_read(inst=%p, buf=%p, len=%i) = %i", inst, buf, len, (int)stlen);239 ROAR_DBG("cf_fishsound_read(inst=%p, buf=%p, len=%i) = -1 // roar_buffer_shift_out() failed", inst, buf, len); 240 return -1; 241 } 242 243 ROAR_DBG("cf_fishsound_read(inst=%p, buf=%p, len=%i) = %i", inst, buf, len, (int)stlen); 227 244 return stlen; 228 245 }
Note: See TracChangeset
for help on using the changeset viewer.