Changeset 5162:85c55ccd12a9 in roaraudio for roard/midi.c
- Timestamp:
- 10/16/11 20:12:40 (12 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/midi.c
r5090 r5162 158 158 159 159 if ( roar_buffer_new_data(&b, MIDI_READ_SIZE, &buf) == -1 ) { 160 ROAR_ERR("midi_check_stream( *): Can not alloc buffer space!");161 ROAR_DBG("midi_check_stream( *) = -1");160 ROAR_ERR("midi_check_stream(id=%i): Can not alloc buffer space!", id); 161 ROAR_DBG("midi_check_stream(id=%i) = -1", id); 162 162 return -1; 163 163 } … … 169 169 } 170 170 171 roar_buffer_set_len(b, len); 171 if ( roar_buffer_set_len(b, len) == -1 ) { 172 ROAR_WARN("midi_check_stream(id=%i): Can not set buffer size. BAD.", id); 173 roar_buffer_free(b); 174 streams_delete(id); 175 return -1; 176 } 172 177 173 178 if ( stream_add_buffer(id, b) == -1 ) { … … 348 353 } 349 354 350 roar_buffer_next(&(ss->buffer)); 355 if ( roar_buffer_next(&(ss->buffer)) == -1 ) { 356 ROAR_WARN("midi_conv_midi2mes(id=%i): Can not move to next buffer segment. BAD.", id); 357 break; 358 } 351 359 } 352 360 … … 672 680 673 681 int midi_add_buf (int id, struct roar_buffer * buf) { 682 #ifdef DEBUG 674 683 struct midi_message * mes; 675 684 void * bufdata; 685 #endif 676 686 677 687 if ( id == -1 || buf == NULL ) 678 688 return -1; 679 689 690 #ifdef DEBUG 680 691 if ( roar_buffer_get_data(buf, &bufdata) == -1 ) 681 692 return -1; … … 688 699 ROAR_DBG("midi_add_buf(*): flags=0x%.2X", mes->flags); 689 700 ROAR_DBG("midi_add_buf(*): kk=0x%.2X, vv=0x%.2X", mes->kk, mes->vv); 701 #endif 690 702 691 703 if ( g_midi_mess.buf == NULL ) { 692 704 g_midi_mess.buf = buf; 693 705 } else { 694 roar_buffer_add(g_midi_mess.buf, buf); 706 if ( roar_buffer_add(g_midi_mess.buf, buf) == -1 ) { 707 ROAR_DBG("midi_add_buf(*) = -1"); 708 return -1; 709 } 695 710 } 696 711
Note: See TracChangeset
for help on using the changeset viewer.