diff --git a/lib/http_handlers.h b/lib/http_handlers.h index 3801c2a..d19e73d 100644 --- a/lib/http_handlers.h +++ b/lib/http_handlers.h @@ -293,7 +293,6 @@ static void http_handler_playback_info(raop_conn_t *conn, http_request_t *request, http_response_t *response, char **response_data, int *response_datalen) { - logger_log(conn->raop->logger, LOGGER_DEBUG, "http_handler_playback_info"); //const char *session_id = http_request_get_header(request, "X-Apple-Session-ID"); playback_info_t playback_info; diff --git a/lib/raop.c b/lib/raop.c index ad1571e..ea26889 100644 --- a/lib/raop.c +++ b/lib/raop.c @@ -198,6 +198,7 @@ conn_request(void *ptr, http_request_t *request, http_response_t **response) { bool hls_request = false; logger_log(conn->raop->logger, LOGGER_DEBUG, "conn_request"); bool logger_debug = (logger_get_level(conn->raop->logger) >= LOGGER_DEBUG); + bool logger_debug_data = (logger_get_level(conn->raop->logger) >= LOGGER_DEBUG_DATA); /* All requests arriving here have been parsed by llhttp to obtain @@ -322,16 +323,19 @@ conn_request(void *ptr, http_request_t *request, http_response_t **response) { } logger_log(conn->raop->logger, LOGGER_DEBUG, "\n%s %s %s", method, url, protocol); + if (!strcmp(url,"/playback-info")) { + logger_debug = logger_debug_data; + } char *header_str= NULL; http_request_get_header_string(request, &header_str); - if (header_str) { + if (header_str && logger_debug) { logger_log(conn->raop->logger, LOGGER_DEBUG, "%s", header_str); bool data_is_plist = (strstr(header_str,"apple-binary-plist") != NULL); bool data_is_text = (strstr(header_str,"text/") != NULL); free(header_str); int request_datalen; const char *request_data = http_request_get_data(request, &request_datalen); - if (request_data && logger_debug) { + if (request_data) { if (request_datalen > 0) { /* logger has a buffer limit of 4096 */ if (data_is_plist) { @@ -469,11 +473,15 @@ conn_request(void *ptr, http_request_t *request, http_response_t **response) { len -= 2; } header_str = utils_data_to_text(data, len); - logger_log(conn->raop->logger, LOGGER_DEBUG, "\n%s", header_str); - bool data_is_plist = (strstr(header_str,"apple-binary-plist") != NULL); bool data_is_text = (strstr(header_str,"text/") != NULL || strstr(header_str, "x-mpegURL") != NULL); + + if (!logger_debug) { + char *ptr = strchr(header_str, '\n'); + *(++ptr) = '\0'; + } + logger_log(conn->raop->logger, LOGGER_DEBUG, "%s", header_str); free(header_str); if (response_data) { if (response_datalen > 0 && logger_debug) { diff --git a/renderers/video_renderer.c b/renderers/video_renderer.c index 02774f3..d79d75d 100644 --- a/renderers/video_renderer.c +++ b/renderers/video_renderer.c @@ -1047,8 +1047,8 @@ bool video_get_playback_info(double *duration, double *position, float *rate, bo } } - logger_log(logger, LOGGER_DEBUG, "********* video_get_playback_info: position %" GST_TIME_FORMAT " duration %" GST_TIME_FORMAT " %s *********", - GST_TIME_ARGS (pos), GST_TIME_ARGS (hls_duration), gst_element_state_get_name(state)); + logger_log(logger, LOGGER_DEBUG, "******* video_get_playback_info: position %" GST_TIME_FORMAT " duration %" GST_TIME_FORMAT " %s rate %f *****", + GST_TIME_ARGS (pos), GST_TIME_ARGS (hls_duration), gst_element_state_get_name(state), *rate); return true; } diff --git a/uxplay.cpp b/uxplay.cpp index d11d32d..686bc7a 100644 --- a/uxplay.cpp +++ b/uxplay.cpp @@ -2491,7 +2491,6 @@ extern "C" void on_video_stop(void *cls) { extern "C" void on_video_acquire_playback_info (void *cls, playback_info_t *playback_info) { int buffering_level; - LOGD("on_video_acquire_playback info\n"); bool still_playing = video_get_playback_info(&playback_info->duration, &playback_info->position, &playback_info->rate, &playback_info->playback_buffer_empty, @@ -2499,7 +2498,6 @@ extern "C" void on_video_acquire_playback_info (void *cls, playback_info_t *play playback_info->ready_to_play = true; //? playback_info->playback_likely_to_keep_up = true; //? - LOGD("on_video_acquire_playback info done\n"); if (!still_playing) { LOGI(" video has finished, %f", playback_info->position); playback_info->position = -1.0;