diff options
Diffstat (limited to 'src/liana')
| -rw-r--r-- | src/liana/client.c | 3 | ||||
| -rw-r--r-- | src/liana/handlers/cdio_server.c | 3 | ||||
| -rw-r--r-- | src/liana/vcr.c | 16 |
3 files changed, 12 insertions, 10 deletions
diff --git a/src/liana/client.c b/src/liana/client.c index 0aec3e5..d926f9e 100644 --- a/src/liana/client.c +++ b/src/liana/client.c @@ -1,3 +1,4 @@ +#define AL_LOG_SECTION "liana" #include <al/log.h> #include <nnwt/multiplex.h> @@ -185,7 +186,7 @@ static bool connection_callback(void *userdata, struct nn_packet_stream *stream) }; if (rec.unconfigured) { al_assert(client->connection_id == 0); - al_log_warn("liana", "Handling reconnect on unconfigured client."); + log_warn("Handling reconnect on unconfigured client."); } client->callback(client->userdata, LIANA_CLIENT_RECONNECTED, NULL, &rec); } else { diff --git a/src/liana/handlers/cdio_server.c b/src/liana/handlers/cdio_server.c index 6ea1422..e1d574d 100644 --- a/src/liana/handlers/cdio_server.c +++ b/src/liana/handlers/cdio_server.c @@ -1,3 +1,4 @@ +#define AL_LOG_SECTION "cdio" #include <al/log.h> #include "../../cache/entry.h" @@ -51,7 +52,7 @@ static u64 cdio_server_get_duration(struct lia_server_handler *handler) struct cch_chapter *first = &al_array_at(cdio->handle->entry->chapters, 0); struct cch_chapter *last = &al_array_last(cdio->handle->entry->chapters); u64 length = camu_audio_format_bytes_to_usec(&cdio->fmt, (last->end - first->start) * CDIO_CD_FRAMESIZE_RAW); - al_log_info("cdio", "Length: %.2fs.", length / 1000000.0); + log_info("Length: %.2fs.", length / 1000000.0); return length; } diff --git a/src/liana/vcr.c b/src/liana/vcr.c index ef2406c..c3adddf 100644 --- a/src/liana/vcr.c +++ b/src/liana/vcr.c @@ -104,7 +104,7 @@ static nn_thread_result NNWT_THREADCALL vcr_track_thread(void *userdata) // NULL packet means flush. bool success = track->client->handle_packet(track->client, packet); if (!success) { - error("Error handling packet, exiting track thread."); + log_error("Error handling packet, exiting track thread."); return_entire_cache(track); track->cache.disabled = true; nn_packet_cache_unlock(&track->cache); @@ -220,7 +220,7 @@ static void cork_if_buffered(struct lia_vcr *vcr, u64 buffer) if (vcr->expand == VCR_EXPAND_UNTOUCHED) { vcr->mark.buffered = buffer * 2; vcr->expand = VCR_EXPAND_GROWN; - info("Expanded buffer to size %.2fMB.", vcr->mark.buffered / (f32)MB(1)); + log_info("Expanded buffer to size %.2fMB.", vcr->mark.buffered / (f32)MB(1)); return; } else if (vcr->expand == VCR_EXPAND_GROWN) { vcr->mark.low = vcr->mark.buffered - MB(2); @@ -253,7 +253,7 @@ static void update_metrics(struct lia_vcr *vcr, u32 size) f32 kbps = (frame / 125.f) / (diff / 1000000.f); f32 capacity = vcr->mark.buffered / (f32)MB(1); f32 buffered = al_atomic_load(u64)(&vcr->count, AL_ATOMIC_RELAXED) / (f32)MB(1); - info("Receiving packets at %.2fkbps (%.2f/%.2fMB).", kbps, buffered, capacity); + log_info("Receiving packets at %.2fkbps (%.2f/%.2fMB).", kbps, buffered, capacity); } } @@ -267,7 +267,7 @@ void lia_vcr_push_packet(struct lia_vcr *vcr, struct nn_packet *packet) update_metrics(vcr, size); track = get_track_from_index(vcr, nn_packet_read_s32(packet)); if (!track) { - debug("Received data from errored or unknown track."); + log_debug("Received data from errored or unknown track."); break; } if (VCR_TRACK_THREADED(track)) { @@ -284,7 +284,7 @@ void lia_vcr_push_packet(struct lia_vcr *vcr, struct nn_packet *packet) return; } else { if (!track->client->handle_packet(track->client, packet)) { - warn("Error handling non-buffered packet."); + log_warn("Error handling non-buffered packet."); } } break; @@ -296,13 +296,13 @@ void lia_vcr_push_packet(struct lia_vcr *vcr, struct nn_packet *packet) #ifndef CAMU_DIRECT_MODE nn_signal_stop(&vcr->signal); #endif - debug("Received EOF."); + log_debug("Received EOF."); break; case LIANA_PACKET_ERROR: - warn("Unhandled error packet."); + log_warn("Unhandled error packet."); break; default: - warn("Erroneous packet."); + log_warn("Erroneous packet."); break; } nn_packet_stream_return_packet(vcr->data, packet); |