diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2018-07-05 13:33:46 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2018-07-05 13:45:17 -0400 |
commit | 1a25672239d66ac53f91f0bcbed1955f0c959931 (patch) | |
tree | 46a98b9977c363bb52b39e491864a0c6d72f1efe /libs/evoral | |
parent | 7af016b089de825f67bceb5f85c92a3c520e251f (diff) |
change all use of g_critical() in libsmf() to g_warning()
g_critical translates to a fatal error in ardour, which is not true for any of these
errors.
Diffstat (limited to 'libs/evoral')
-rw-r--r-- | libs/evoral/src/libsmf/smf.c | 30 | ||||
-rw-r--r-- | libs/evoral/src/libsmf/smf_decode.c | 32 | ||||
-rw-r--r-- | libs/evoral/src/libsmf/smf_load.c | 74 | ||||
-rw-r--r-- | libs/evoral/src/libsmf/smf_save.c | 24 | ||||
-rw-r--r-- | libs/evoral/src/libsmf/smf_tempo.c | 12 |
5 files changed, 86 insertions, 86 deletions
diff --git a/libs/evoral/src/libsmf/smf.c b/libs/evoral/src/libsmf/smf.c index 79b355c7dc..f88c85ffab 100644 --- a/libs/evoral/src/libsmf/smf.c +++ b/libs/evoral/src/libsmf/smf.c @@ -58,7 +58,7 @@ smf_new(void) smf_t *smf = (smf_t*)malloc(sizeof(smf_t)); if (smf == NULL) { - g_critical("Cannot allocate smf_t structure: %s", strerror(errno)); + g_warning("Cannot allocate smf_t structure: %s", strerror(errno)); return (NULL); } @@ -111,7 +111,7 @@ smf_track_new(void) { smf_track_t *track = (smf_track_t*)malloc(sizeof(smf_track_t)); if (track == NULL) { - g_critical("Cannot allocate smf_track_t structure: %s", strerror(errno)); + g_warning("Cannot allocate smf_track_t structure: %s", strerror(errno)); return (NULL); } @@ -239,7 +239,7 @@ smf_event_new(void) { smf_event_t *event = (smf_event_t*)malloc(sizeof(smf_event_t)); if (event == NULL) { - g_critical("Cannot allocate smf_event_t structure: %s", strerror(errno)); + g_warning("Cannot allocate smf_event_t structure: %s", strerror(errno)); return (NULL); } @@ -272,7 +272,7 @@ smf_event_new_from_pointer(const void *midi_data, size_t len) event->midi_buffer_length = len; event->midi_buffer = (uint8_t*)malloc(event->midi_buffer_length); if (event->midi_buffer == NULL) { - g_critical("Cannot allocate MIDI buffer structure: %s", strerror(errno)); + g_warning("Cannot allocate MIDI buffer structure: %s", strerror(errno)); smf_event_delete(event); return (NULL); @@ -311,19 +311,19 @@ smf_event_new_from_bytes(int first_byte, int second_byte, int third_byte) return (NULL); if (first_byte < 0) { - g_critical("First byte of MIDI message cannot be < 0"); + g_warning("First byte of MIDI message cannot be < 0"); smf_event_delete(event); return (NULL); } if (first_byte > 255) { - g_critical("smf_event_new_from_bytes: first byte is %d, which is larger than 255.", first_byte); + g_warning("smf_event_new_from_bytes: first byte is %d, which is larger than 255.", first_byte); return (NULL); } if (!is_status_byte(first_byte)) { - g_critical("smf_event_new_from_bytes: first byte is not a valid status byte."); + g_warning("smf_event_new_from_bytes: first byte is not a valid status byte."); return (NULL); } @@ -337,24 +337,24 @@ smf_event_new_from_bytes(int first_byte, int second_byte, int third_byte) if (len > 1) { if (second_byte > 255) { - g_critical("smf_event_new_from_bytes: second byte is %d, which is larger than 255.", second_byte); + g_warning("smf_event_new_from_bytes: second byte is %d, which is larger than 255.", second_byte); return (NULL); } if (is_status_byte(second_byte)) { - g_critical("smf_event_new_from_bytes: second byte cannot be a status byte."); + g_warning("smf_event_new_from_bytes: second byte cannot be a status byte."); return (NULL); } } if (len > 2) { if (third_byte > 255) { - g_critical("smf_event_new_from_bytes: third byte is %d, which is larger than 255.", third_byte); + g_warning("smf_event_new_from_bytes: third byte is %d, which is larger than 255.", third_byte); return (NULL); } if (is_status_byte(third_byte)) { - g_critical("smf_event_new_from_bytes: third byte cannot be a status byte."); + g_warning("smf_event_new_from_bytes: third byte cannot be a status byte."); return (NULL); } } @@ -362,7 +362,7 @@ smf_event_new_from_bytes(int first_byte, int second_byte, int third_byte) event->midi_buffer_length = len; event->midi_buffer = (uint8_t*)malloc(event->midi_buffer_length); if (event->midi_buffer == NULL) { - g_critical("Cannot allocate MIDI buffer structure: %s", strerror(errno)); + g_warning("Cannot allocate MIDI buffer structure: %s", strerror(errno)); smf_event_delete(event); return (NULL); @@ -675,7 +675,7 @@ smf_set_format(smf_t *smf, int format) assert(format == 0 || format == 1); if (smf->number_of_tracks > 1 && format == 0) { - g_critical("There is more than one track, cannot set format to 0."); + g_warning("There is more than one track, cannot set format to 0."); return (-1); } @@ -1008,7 +1008,7 @@ smf_seek_to_seconds(smf_t *smf, double seconds) event = smf_peek_next_event(smf); if (event == NULL) { - g_critical("Trying to seek past the end of song."); + g_warning("Trying to seek past the end of song."); return (-1); } @@ -1042,7 +1042,7 @@ smf_seek_to_pulses(smf_t *smf, size_t pulses) event = smf_peek_next_event(smf); if (event == NULL) { - g_critical("Trying to seek past the end of song."); + g_warning("Trying to seek past the end of song."); return (-1); } diff --git a/libs/evoral/src/libsmf/smf_decode.c b/libs/evoral/src/libsmf/smf_decode.c index 5555fdcace..4bd774f345 100644 --- a/libs/evoral/src/libsmf/smf_decode.c +++ b/libs/evoral/src/libsmf/smf_decode.c @@ -120,7 +120,7 @@ smf_event_decode_textual(const smf_event_t *event, const char *name) buf = (char*)malloc(BUFFER_SIZE); if (buf == NULL) { - g_critical("smf_event_decode_textual: malloc failed."); + g_warning("smf_event_decode_textual: malloc failed."); return (NULL); } @@ -183,7 +183,7 @@ smf_event_decode_metadata(const smf_event_t *event) buf = (char*)malloc(BUFFER_SIZE); if (buf == NULL) { - g_critical("smf_event_decode_metadata: malloc failed."); + g_warning("smf_event_decode_metadata: malloc failed."); return (NULL); } @@ -195,7 +195,7 @@ smf_event_decode_metadata(const smf_event_t *event) /* http://music.columbia.edu/pipermail/music-dsp/2004-August/061196.html */ case 0x20: if (event->midi_buffer_length < 4) { - g_critical("smf_event_decode_metadata: truncated MIDI message."); + g_warning("smf_event_decode_metadata: truncated MIDI message."); goto error; } @@ -204,7 +204,7 @@ smf_event_decode_metadata(const smf_event_t *event) case 0x21: if (event->midi_buffer_length < 4) { - g_critical("smf_event_decode_metadata: truncated MIDI message."); + g_warning("smf_event_decode_metadata: truncated MIDI message."); goto error; } @@ -217,7 +217,7 @@ smf_event_decode_metadata(const smf_event_t *event) case 0x51: if (event->midi_buffer_length < 6) { - g_critical("smf_event_decode_metadata: truncated MIDI message."); + g_warning("smf_event_decode_metadata: truncated MIDI message."); goto error; } @@ -233,7 +233,7 @@ smf_event_decode_metadata(const smf_event_t *event) case 0x58: if (event->midi_buffer_length < 7) { - g_critical("smf_event_decode_metadata: truncated MIDI message."); + g_warning("smf_event_decode_metadata: truncated MIDI message."); goto error; } @@ -245,7 +245,7 @@ smf_event_decode_metadata(const smf_event_t *event) case 0x59: if (event->midi_buffer_length < 5) { - g_critical("smf_event_decode_metadata: truncated MIDI message."); + g_warning("smf_event_decode_metadata: truncated MIDI message."); goto error; } @@ -253,7 +253,7 @@ smf_event_decode_metadata(const smf_event_t *event) isminor = event->midi_buffer[4]; if (isminor != 0 && isminor != 1) { - g_critical("smf_event_decode_metadata: last byte of the Key Signature event has invalid value %d.", isminor); + g_warning("smf_event_decode_metadata: last byte of the Key Signature event has invalid value %d.", isminor); goto error; } @@ -303,13 +303,13 @@ smf_event_decode_system_realtime(const smf_event_t *event) assert(smf_event_is_system_realtime(event)); if (event->midi_buffer_length != 1) { - g_critical("smf_event_decode_system_realtime: event length is not 1."); + g_warning("smf_event_decode_system_realtime: event length is not 1."); return (NULL); } buf = (char*)malloc(BUFFER_SIZE); if (buf == NULL) { - g_critical("smf_event_decode_system_realtime: malloc failed."); + g_warning("smf_event_decode_system_realtime: malloc failed."); return (NULL); } @@ -356,13 +356,13 @@ smf_event_decode_sysex(const smf_event_t *event) assert(smf_event_is_sysex(event)); if (event->midi_buffer_length < 5) { - g_critical("smf_event_decode_sysex: truncated MIDI message."); + g_warning("smf_event_decode_sysex: truncated MIDI message."); return (NULL); } buf = (char*)malloc(BUFFER_SIZE); if (buf == NULL) { - g_critical("smf_event_decode_sysex: malloc failed."); + g_warning("smf_event_decode_sysex: malloc failed."); return (NULL); } @@ -465,7 +465,7 @@ smf_event_decode_system_common(const smf_event_t *event) buf = (char*)malloc(BUFFER_SIZE); if (buf == NULL) { - g_critical("smf_event_decode_system_realtime: malloc failed."); + g_warning("smf_event_decode_system_realtime: malloc failed."); return (NULL); } @@ -531,13 +531,13 @@ smf_event_decode(const smf_event_t *event) return (smf_event_decode_system_common(event)); if (!smf_event_length_is_valid(event)) { - g_critical("smf_event_decode: incorrect MIDI message length."); + g_warning("smf_event_decode: incorrect MIDI message length."); return (NULL); } buf = (char*)malloc(BUFFER_SIZE); if (buf == NULL) { - g_critical("smf_event_decode: malloc failed."); + g_warning("smf_event_decode: malloc failed."); return (NULL); } @@ -609,7 +609,7 @@ smf_decode(const smf_t *smf) buf = (char*)malloc(BUFFER_SIZE); if (buf == NULL) { - g_critical("smf_event_decode: malloc failed."); + g_warning("smf_event_decode: malloc failed."); return (NULL); } diff --git a/libs/evoral/src/libsmf/smf_load.c b/libs/evoral/src/libsmf/smf_load.c index 3d8627811d..f8b4158004 100644 --- a/libs/evoral/src/libsmf/smf_load.c +++ b/libs/evoral/src/libsmf/smf_load.c @@ -62,7 +62,7 @@ next_chunk(smf_t *smf) assert(smf->file_buffer_length > 0); if (smf->next_chunk_offset + sizeof(struct chunk_header_struct) >= smf->file_buffer_length) { - g_critical("SMF warning: no more chunks left."); + g_warning("SMF warning: no more chunks left."); return (NULL); } @@ -71,7 +71,7 @@ next_chunk(smf_t *smf) chunk = (struct chunk_header_struct *)next_chunk_ptr; if (!isalpha(chunk->id[0]) || !isalpha(chunk->id[1]) || !isalpha(chunk->id[2]) || !isalpha(chunk->id[3])) { - g_critical("SMF error: chunk signature contains at least one non-alphanumeric byte."); + g_warning("SMF error: chunk signature contains at least one non-alphanumeric byte."); return (NULL); } @@ -82,7 +82,7 @@ next_chunk(smf_t *smf) smf->next_chunk_offset += sizeof(struct chunk_header_struct) + ntohl(chunk->length); if (smf->next_chunk_offset > smf->file_buffer_length) { - g_critical("SMF error: malformed chunk; truncated file?"); + g_warning("SMF error: malformed chunk; truncated file?"); } return (chunk); @@ -117,7 +117,7 @@ parse_mthd_header(smf_t *smf) * get useful error messages. */ if (smf->file_buffer_length < 6) { - g_critical("SMF error: file is too short, it cannot be a MIDI file."); + g_warning ("SMF error: file is too short, it cannot be a MIDI file."); return (-1); } @@ -125,7 +125,7 @@ parse_mthd_header(smf_t *smf) tmp_mthd = (struct chunk_header_struct*)smf->file_buffer; if (!chunk_signature_matches(tmp_mthd, "MThd")) { - g_critical("SMF error: MThd signature not found, is that a MIDI file?"); + g_warning("SMF error: MThd signature not found, is that a MIDI file?"); return (-2); } @@ -139,7 +139,7 @@ parse_mthd_header(smf_t *smf) len = ntohl(mthd->length); if (len != 6) { - g_critical("SMF error: MThd chunk length %d, must be 6.", len); + g_warning("SMF error: MThd chunk length %d, must be 6.", len); return (-4); } @@ -166,18 +166,18 @@ parse_mthd_chunk(smf_t *smf) smf->format = ntohs(mthd->format); if (smf->format < 0 || smf->format > 2) { - g_critical("SMF error: bad MThd format field value: %d, valid values are 0-2, inclusive.", smf->format); + g_warning("SMF error: bad MThd format field value: %d, valid values are 0-2, inclusive.", smf->format); return (-1); } if (smf->format == 2) { - g_critical("SMF file uses format #2, no support for that yet."); + g_warning("SMF file uses format #2, no support for that yet."); return (-2); } smf->expected_number_of_tracks = ntohs(mthd->number_of_tracks); if (smf->expected_number_of_tracks <= 0) { - g_critical("SMF error: bad number of tracks: %d, must be greater than zero.", smf->expected_number_of_tracks); + g_warning("SMF error: bad number of tracks: %d, must be greater than zero.", smf->expected_number_of_tracks); return (-3); } @@ -196,7 +196,7 @@ parse_mthd_chunk(smf_t *smf) } if (smf->ppqn == 0) { - g_critical("SMF file uses FPS timing instead of PPQN, no support for that yet."); + g_warning("SMF file uses FPS timing instead of PPQN, no support for that yet."); return (-4); } @@ -218,12 +218,12 @@ smf_extract_vlq(const unsigned char *buf, const size_t buffer_length, uint32_t * for (;; ++i) { if (c >= buf + buffer_length) { - g_critical("End of buffer in extract_vlq()."); + g_warning("End of buffer in extract_vlq()."); return (-1); } if (i == 4 && (val & 0xfe000000)) { - g_critical("SMF error: Variable Length Quantities longer than four bytes are not supported yet."); + g_warning("SMF error: Variable Length Quantities longer than four bytes are not supported yet."); return (-2); } @@ -240,7 +240,7 @@ smf_extract_vlq(const unsigned char *buf, const size_t buffer_length, uint32_t * *len = c - buf + 1; if (*len > 5) { - g_critical("SMF error: Variable Length Quantities longer than four bytes are not supported yet."); + g_warning("SMF error: Variable Length Quantities longer than four bytes are not supported yet."); return (-2); } @@ -294,7 +294,7 @@ expected_sysex_length(const unsigned char status, const unsigned char *second_by #endif if (buffer_length < 3) { - g_critical("SMF error: end of buffer in expected_sysex_length()."); + g_warning("SMF error: end of buffer in expected_sysex_length()."); return (-1); } @@ -334,7 +334,7 @@ expected_message_length(unsigned char status, const unsigned char *second_byte, /* Is this a metamessage? */ if (status == 0xFF) { if (buffer_length < 2) { - g_critical("SMF error: end of buffer in expected_message_length()."); + g_warning("SMF error: end of buffer in expected_message_length()."); return (-1); } @@ -377,7 +377,7 @@ expected_message_length(unsigned char status, const unsigned char *second_byte, return (1); default: - g_critical("SMF error: unknown 0xFx-type status byte '0x%x'.", status); + g_warning("SMF error: unknown 0xFx-type status byte '0x%x'.", status); return (-2); } } @@ -398,7 +398,7 @@ expected_message_length(unsigned char status, const unsigned char *second_byte, return (2); default: - g_critical("SMF error: unknown status byte '0x%x'.", status); + g_warning("SMF error: unknown status byte '0x%x'.", status); return (-3); } } @@ -415,7 +415,7 @@ extract_sysex_event(const unsigned char *buf, const size_t buffer_length, smf_ev status = *buf; if (!(is_sysex_byte(status))) { - g_critical("Corrupt sysex status byte in extract_sysex_event()."); + g_warning("Corrupt sysex status byte in extract_sysex_event()."); return (-6); } @@ -429,14 +429,14 @@ extract_sysex_event(const unsigned char *buf, const size_t buffer_length, smf_ev c += vlq_length; if (vlq_length + (size_t)message_length >= buffer_length) { - g_critical("End of buffer in extract_sysex_event()."); + g_warning("End of buffer in extract_sysex_event()."); return (-5); } event->midi_buffer_length = message_length; event->midi_buffer = (uint8_t*)malloc(event->midi_buffer_length); if (event->midi_buffer == NULL) { - g_critical("Cannot allocate memory in extract_sysex_event(): %s", strerror(errno)); + g_warning("Cannot allocate memory in extract_sysex_event(): %s", strerror(errno)); return (-4); } @@ -461,7 +461,7 @@ extract_escaped_event(const unsigned char *buf, const size_t buffer_length, smf_ status = *buf; if (!(is_escape_byte(status))) { - g_critical("Corrupt escape status byte in extract_escaped_event()."); + g_warning("Corrupt escape status byte in extract_escaped_event()."); return (-6); } @@ -475,21 +475,21 @@ extract_escaped_event(const unsigned char *buf, const size_t buffer_length, smf_ c += vlq_length; if (vlq_length + (size_t)message_length >= buffer_length) { - g_critical("End of buffer in extract_escaped_event()."); + g_warning("End of buffer in extract_escaped_event()."); return (-5); } event->midi_buffer_length = message_length; event->midi_buffer = (uint8_t*)malloc(event->midi_buffer_length); if (event->midi_buffer == NULL) { - g_critical("Cannot allocate memory in extract_escaped_event(): %s", strerror(errno)); + g_warning("Cannot allocate memory in extract_escaped_event(): %s", strerror(errno)); return (-4); } memcpy(event->midi_buffer, c, message_length); if (smf_event_is_valid(event)) { - g_critical("Escaped event is invalid."); + g_warning("Escaped event is invalid."); return (-1); } @@ -528,7 +528,7 @@ extract_midi_event(const unsigned char *buf, const size_t buffer_length, smf_eve } if (!is_status_byte(status)) { - g_critical("SMF error: bad status byte (MSB is zero)."); + g_warning("SMF error: bad status byte (MSB is zero)."); return (-1); } @@ -545,14 +545,14 @@ extract_midi_event(const unsigned char *buf, const size_t buffer_length, smf_eve return (-3); if ((size_t)message_length > buffer_length - (c - buf) + 1) { - g_critical("End of buffer in extract_midi_event()."); + g_warning("End of buffer in extract_midi_event()."); return (-5); } event->midi_buffer_length = message_length; event->midi_buffer = (uint8_t*)malloc(event->midi_buffer_length); if (event->midi_buffer == NULL) { - g_critical("Cannot allocate memory in extract_midi_event(): %s", strerror(errno)); + g_warning("Cannot allocate memory in extract_midi_event(): %s", strerror(errno)); return (-4); } @@ -641,14 +641,14 @@ make_string(const unsigned char *buf, const size_t buffer_length, uint32_t len) assert(len > 0); if (len > buffer_length) { - g_critical("End of buffer in make_string()."); + g_warning("End of buffer in make_string()."); len = buffer_length; } str = (char*)malloc(len + 1); if (str == NULL) { - g_critical("Cannot allocate memory in make_string()."); + g_warning("Cannot allocate memory in make_string()."); return (NULL); } @@ -700,7 +700,7 @@ smf_event_extract_text(const smf_event_t *event) smf_extract_vlq((const unsigned char*)(void *)&(event->midi_buffer[2]), event->midi_buffer_length - 2, &string_length, &length_length); if (string_length <= 0) { - g_critical("smf_event_extract_text: truncated MIDI message."); + g_warning("smf_event_extract_text: truncated MIDI message."); return (NULL); } @@ -793,7 +793,7 @@ smf_event_is_valid(const smf_event_t *event) assert(event->midi_buffer_length >= 1); if (!is_status_byte(event->midi_buffer[0])) { - g_critical("First byte of MIDI message is not a valid status byte."); + g_warning("First byte of MIDI message is not a valid status byte."); return (0); } @@ -859,40 +859,40 @@ load_file_into_buffer(void **file_buffer, size_t *file_buffer_length, FILE* stre long offset; if (stream == NULL) { - g_critical("Cannot open input file: %s", strerror(errno)); + g_warning("Cannot open input file: %s", strerror(errno)); return (-1); } if (fseek(stream, 0, SEEK_END)) { - g_critical("fseek(3) failed: %s", strerror(errno)); + g_warning("fseek(3) failed: %s", strerror(errno)); return (-2); } offset = ftell(stream); if (offset < 0) { - g_critical("ftell(3) failed: %s", strerror(errno)); + g_warning("ftell(3) failed: %s", strerror(errno)); return (-3); } *file_buffer_length = (size_t)offset; if (fseek(stream, 0, SEEK_SET)) { - g_critical("fseek(3) failed: %s", strerror(errno)); + g_warning("fseek(3) failed: %s", strerror(errno)); return (-4); } *file_buffer = malloc(*file_buffer_length); if (*file_buffer == NULL) { - g_critical("malloc(3) failed: %s", strerror(errno)); + g_warning("malloc(3) failed: %s", strerror(errno)); return (-5); } if (fread(*file_buffer, 1, *file_buffer_length, stream) != *file_buffer_length) { - g_critical("fread(3) failed: %s", strerror(errno)); + g_warning("fread(3) failed: %s", strerror(errno)); free (*file_buffer); *file_buffer = NULL; return (-6); diff --git a/libs/evoral/src/libsmf/smf_save.c b/libs/evoral/src/libsmf/smf_save.c index 555881ab08..12eb879c4e 100644 --- a/libs/evoral/src/libsmf/smf_save.c +++ b/libs/evoral/src/libsmf/smf_save.c @@ -64,7 +64,7 @@ smf_extend(smf_t *smf, const int length) smf->file_buffer_length += length; smf->file_buffer = realloc(smf->file_buffer, smf->file_buffer_length); if (smf->file_buffer == NULL) { - g_critical("realloc(3) failed: %s", strerror(errno)); + g_warning("realloc(3) failed: %s", strerror(errno)); smf->file_buffer_length = 0; return (NULL); } @@ -91,7 +91,7 @@ smf_append(smf_t *smf, const void *buffer, const int buffer_length) dest = smf_extend(smf, buffer_length); if (dest == NULL) { - g_critical("Cannot extend track buffer."); + g_warning("Cannot extend track buffer."); return (-1); } @@ -151,7 +151,7 @@ track_append(smf_track_t *track, const void *buffer, const int buffer_length) dest = track_extend(track, buffer_length); if (dest == NULL) { - g_critical("Cannot extend track buffer."); + g_warning("Cannot extend track buffer."); return (-1); } @@ -207,7 +207,7 @@ smf_event_new_textual(int type, const char *text) event->midi_buffer_length = 2 + text_length + MAX_VLQ_LENGTH; event->midi_buffer = (uint8_t*)malloc(event->midi_buffer_length); if (event->midi_buffer == NULL) { - g_critical("Cannot allocate MIDI buffer structure: %s", strerror(errno)); + g_warning("Cannot allocate MIDI buffer structure: %s", strerror(errno)); smf_event_delete(event); return (NULL); @@ -428,7 +428,7 @@ static int write_file(smf_t *smf, FILE* stream) { if (fwrite(smf->file_buffer, 1, smf->file_buffer_length, stream) != smf->file_buffer_length) { - g_critical("fwrite(3) failed: %s", strerror(errno)); + g_warning("fwrite(3) failed: %s", strerror(errno)); return (-2); } @@ -515,22 +515,22 @@ smf_validate(smf_t *smf) smf_event_t *event; if (smf->format < 0 || smf->format > 2) { - g_critical("SMF error: smf->format is less than zero of greater than two."); + g_warning("SMF error: smf->format is less than zero of greater than two."); return (-1); } if (smf->number_of_tracks < 1) { - g_critical("SMF error: number of tracks is less than one."); + g_warning("SMF error: number of tracks is less than one."); return (-2); } if (smf->format == 0 && smf->number_of_tracks > 1) { - g_critical("SMF error: format is 0, but number of tracks is more than one."); + g_warning("SMF error: format is 0, but number of tracks is more than one."); return (-3); } if (smf->ppqn <= 0) { - g_critical("SMF error: PPQN has to be > 0."); + g_warning("SMF error: PPQN has to be > 0."); return (-4); } @@ -545,13 +545,13 @@ smf_validate(smf_t *smf) assert(event); if (!smf_event_is_valid(event)) { - g_critical("Event #%" G_GSIZE_FORMAT " on track #%d is invalid.", eventno, trackno); + g_warning("Event #%" G_GSIZE_FORMAT " on track #%d is invalid.", eventno, trackno); return (-5); } if (smf_event_is_eot(event)) { if (eot_found) { - g_critical("Duplicate End Of Track event on track #%d.", trackno); + g_warning("Duplicate End Of Track event on track #%d.", trackno); return (-6); } @@ -561,7 +561,7 @@ smf_validate(smf_t *smf) if (!eot_found) { if (smf_track_add_eot_delta_pulses(track, 0)) { - g_critical("smf_track_add_eot_delta_pulses failed."); + g_warning("smf_track_add_eot_delta_pulses failed."); return (-6); } } diff --git a/libs/evoral/src/libsmf/smf_tempo.c b/libs/evoral/src/libsmf/smf_tempo.c index b2549d5511..eaa1b0ef34 100644 --- a/libs/evoral/src/libsmf/smf_tempo.c +++ b/libs/evoral/src/libsmf/smf_tempo.c @@ -61,7 +61,7 @@ new_tempo(smf_t *smf, size_t pulses) tempo = (smf_tempo_t*)malloc(sizeof(smf_tempo_t)); if (tempo == NULL) { - g_critical("Cannot allocate smf_tempo_t."); + g_warning("Cannot allocate smf_tempo_t."); return (NULL); } @@ -135,7 +135,7 @@ maybe_add_to_tempo_map(smf_event_t *event) if (event->midi_buffer[1] == 0x51) { int ntempo = (event->midi_buffer[3] << 16) + (event->midi_buffer[4] << 8) + event->midi_buffer[5]; if (ntempo <= 0) { - g_critical("Ignoring invalid tempo change."); + g_warning("Ignoring invalid tempo change."); return; } @@ -147,7 +147,7 @@ maybe_add_to_tempo_map(smf_event_t *event) int numerator, denominator, clocks_per_click, notes_per_note; if (event->midi_buffer_length < 7) { - g_critical("Time Signature event seems truncated."); + g_warning("Time Signature event seems truncated."); return; } @@ -368,7 +368,7 @@ smf_fini_tempo(smf_t *smf) * * Remove any existing tempos and add default one. * - * \bug This will abort (by calling g_error) if new_tempo() (memory allocation there) fails. + * \bug This will abort (by calling g_warning) if new_tempo() (memory allocation there) fails. */ void smf_init_tempo(smf_t *smf) @@ -379,7 +379,7 @@ smf_init_tempo(smf_t *smf) tempo = new_tempo(smf, 0); if (tempo == NULL) { - g_error("tempo_init failed, sorry."); + g_warning("tempo_init failed, sorry."); } } @@ -413,7 +413,7 @@ smf_track_add_event_delta_pulses(smf_track_t *track, smf_event_t *event, uint32_ assert(track->smf != NULL); if (!smf_event_is_valid(event)) { - g_critical("Added event is invalid"); + g_warning("Added event is invalid"); } smf_track_add_event_pulses(track, event, last_event_pulses(track) + delta); |