summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDebian Multimedia Maintainers <debian-multimedia@lists.debian.org>2023-01-30 16:55:31 +0100
committerIOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>2023-01-30 16:55:31 +0100
commit4e98288f1295eb22fdb4cf40c3c361e1c2ac16a4 (patch)
treed949d0ade607c27535ee2a9c4c32b223366b8398
parentfb8f3ce0b2489a252c0400b7ea2bd81ac1dd1a13 (diff)
Fix logging invocation
Origin: Debian Forwarded: no Last-Update: 2021-08-31 bg_log -> gavl_log Last-Update: 2021-08-31 Gbp-Pq: Name logging.patch
-rw-r--r--plugins/ffmpeg/ffmpeg_common.c2
-rw-r--r--plugins/yuv4mpeg/e_mpeg.c14
-rw-r--r--plugins/yuv4mpeg/e_mpegaudio.c4
-rw-r--r--plugins/yuv4mpeg/e_mpegvideo.c2
-rw-r--r--plugins/yuv4mpeg/mpa_common.c6
-rw-r--r--plugins/yuv4mpeg/mpv_common.c10
-rw-r--r--plugins/yuv4mpeg/y4m_common.c2
7 files changed, 20 insertions, 20 deletions
diff --git a/plugins/ffmpeg/ffmpeg_common.c b/plugins/ffmpeg/ffmpeg_common.c
index e9365a6..7bfe0f9 100644
--- a/plugins/ffmpeg/ffmpeg_common.c
+++ b/plugins/ffmpeg/ffmpeg_common.c
@@ -237,7 +237,7 @@ static void set_chapters(AVFormatContext * ctx,
#else
if(!chapter_list || !chapter_list->num_chapters)
return;
- bg_log(BG_LOG_WARNING, LOG_DOMAIN,
+ gavl_log(GAVL_LOG_WARNING, LOG_DOMAIN,
"Not writing chapters (ffmpeg version too old)");
#endif
}
diff --git a/plugins/yuv4mpeg/e_mpeg.c b/plugins/yuv4mpeg/e_mpeg.c
index 8ecba27..e045116 100644
--- a/plugins/yuv4mpeg/e_mpeg.c
+++ b/plugins/yuv4mpeg/e_mpeg.c
@@ -124,17 +124,17 @@ static int open_mpeg(void * data, const char * filename,
if(!bg_search_file_exec("mpeg2enc", NULL))
{
- bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot find mpeg2enc executable");
+ gavl_log(GAVL_LOG_ERROR, LOG_DOMAIN, "Cannot find mpeg2enc executable");
return 0;
}
if(!bg_search_file_exec("mp2enc", NULL))
{
- bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot find mp2enc executable");
+ gavl_log(GAVL_LOG_ERROR, LOG_DOMAIN, "Cannot find mp2enc executable");
return 0;
}
if(!bg_search_file_exec("mplex", NULL))
{
- bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot find mplex executable");
+ gavl_log(GAVL_LOG_ERROR, LOG_DOMAIN, "Cannot find mplex executable");
return 0;
}
return 1;
@@ -565,7 +565,7 @@ static int close_mpeg(void * data, int do_delete)
if(!bg_search_file_exec("mplex", &commandline))
{
- bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot find mplex executable");
+ gavl_log(GAVL_LOG_ERROR, LOG_DOMAIN, "Cannot find mplex executable");
return 0;
}
/* Options */
@@ -576,7 +576,7 @@ static int close_mpeg(void * data, int do_delete)
if(sync_offset)
{
- bg_log(BG_LOG_DEBUG, LOG_DOMAIN,
+ gavl_log(GAVL_LOG_DEBUG, LOG_DOMAIN,
"Video sync offset: %"PRId64, sync_offset);
tmp_string = bg_sprintf(" --sync-offset %"PRId64"mpt", sync_offset);
@@ -640,7 +640,7 @@ static int close_mpeg(void * data, int do_delete)
{
if(e->audio_streams[i].filename)
{
- bg_log(BG_LOG_INFO, LOG_DOMAIN,
+ gavl_log(GAVL_LOG_INFO, LOG_DOMAIN,
"Removing %s", e->audio_streams[i].filename);
#ifndef DEBUG_MPLEX
remove(e->audio_streams[i].filename);
@@ -656,7 +656,7 @@ static int close_mpeg(void * data, int do_delete)
{
if(e->video_streams[i].filename)
{
- bg_log(BG_LOG_INFO, LOG_DOMAIN,
+ gavl_log(GAVL_LOG_INFO, LOG_DOMAIN,
"Removing %s", e->video_streams[i].filename);
#ifndef DEBUG_MPLEX
remove(e->video_streams[i].filename);
diff --git a/plugins/yuv4mpeg/e_mpegaudio.c b/plugins/yuv4mpeg/e_mpegaudio.c
index 3356993..5e469d3 100644
--- a/plugins/yuv4mpeg/e_mpegaudio.c
+++ b/plugins/yuv4mpeg/e_mpegaudio.c
@@ -126,7 +126,7 @@ static int start_mpa(void * data)
e_mpa_t * e = data;
result = bg_mpa_start(&e->com, e->filename);
if(!result)
- bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot find mp2enc executable");
+ gavl_log(GAVL_LOG_ERROR, LOG_DOMAIN, "Cannot find mp2enc executable");
return result;
}
@@ -170,7 +170,7 @@ static int close_mpa(void * data, int do_delete)
if(do_delete)
{
- bg_log(BG_LOG_INFO, LOG_DOMAIN, "Removing %s", mpa->filename);
+ gavl_log(GAVL_LOG_INFO, LOG_DOMAIN, "Removing %s", mpa->filename);
remove(mpa->filename);
}
if(mpa->filename)
diff --git a/plugins/yuv4mpeg/e_mpegvideo.c b/plugins/yuv4mpeg/e_mpegvideo.c
index cc47f9b..93971ac 100644
--- a/plugins/yuv4mpeg/e_mpegvideo.c
+++ b/plugins/yuv4mpeg/e_mpegvideo.c
@@ -158,7 +158,7 @@ static int close_mpv(void * data, int do_delete)
ret = bg_mpv_close(&e->mpv);
if(do_delete)
{
- bg_log(BG_LOG_INFO, LOG_DOMAIN, "Removing %s", e->filename);
+ gavl_log(GAVL_LOG_INFO, LOG_DOMAIN, "Removing %s", e->filename);
remove(e->filename);
}
return ret;
diff --git a/plugins/yuv4mpeg/mpa_common.c b/plugins/yuv4mpeg/mpa_common.c
index 16bcd03..f18b10f 100644
--- a/plugins/yuv4mpeg/mpa_common.c
+++ b/plugins/yuv4mpeg/mpa_common.c
@@ -97,7 +97,7 @@ static char * bg_mpa_make_commandline(bg_mpa_common_t * com,
if(!bg_search_file_exec("mp2enc", &mp2enc_path))
{
- bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot find mp2enc executable");
+ gavl_log(GAVL_LOG_ERROR, LOG_DOMAIN, "Cannot find mp2enc executable");
return NULL;
}
@@ -196,7 +196,7 @@ static int get_bitrate(int in_rate, int layer, int channels,
}
if(ret != in_rate)
{
- bg_log(BG_LOG_WARNING, LOG_DOMAIN,
+ gavl_log(GAVL_LOG_WARNING, LOG_DOMAIN,
"Bitrate %d kbps unsupported, switching to %d kbps", in_rate, ret);
}
return ret;
@@ -252,7 +252,7 @@ static int get_samplerate(int in_rate, int vcd)
}
if(ret != in_rate)
- bg_log(BG_LOG_WARNING, LOG_DOMAIN,
+ gavl_log(GAVL_LOG_WARNING, LOG_DOMAIN,
"Samplerate %d unsupported, switching to %d", in_rate, ret);
return ret;
}
diff --git a/plugins/yuv4mpeg/mpv_common.c b/plugins/yuv4mpeg/mpv_common.c
index ee7a913..9f3d9db 100644
--- a/plugins/yuv4mpeg/mpv_common.c
+++ b/plugins/yuv4mpeg/mpv_common.c
@@ -199,7 +199,7 @@ static char * bg_mpv_make_commandline(bg_mpv_common_t * com, const char * filena
if(!bg_search_file_exec("mpeg2enc", &mpeg2enc_path))
{
- bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Cannot find mpeg2enc executable");
+ gavl_log(GAVL_LOG_ERROR, LOG_DOMAIN, "Cannot find mpeg2enc executable");
return NULL;
}
@@ -297,7 +297,7 @@ static int bg_mpv_get_chroma_mode(bg_mpv_common_t * com)
return Y4M_CHROMA_420MPEG2;
break;
default:
- bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Unknown MPEG format");
+ gavl_log(GAVL_LOG_ERROR, LOG_DOMAIN, "Unknown MPEG format");
}
return -1;
}
@@ -316,13 +316,13 @@ static void bg_mpv_adjust_interlacing(gavl_video_format_t * format,
case FORMAT_DVD:
if(format->interlace_mode == GAVL_INTERLACE_MIXED)
{
- bg_log(BG_LOG_WARNING, LOG_DOMAIN,
+ gavl_log(GAVL_LOG_WARNING, LOG_DOMAIN,
"Mixed interlacing not supported (yet)");
format->interlace_mode = GAVL_INTERLACE_NONE;
}
break;
default:
- bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Unknown MPEG format");
+ gavl_log(GAVL_LOG_ERROR, LOG_DOMAIN, "Unknown MPEG format");
}
}
@@ -458,7 +458,7 @@ int bg_mpv_close(bg_mpv_common_t * com)
if(com->out)
{
if(fwrite(sequence_end, 1, 4, com->out) < 4)
- bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Inserting sequence end code failed");
+ gavl_log(GAVL_LOG_ERROR, LOG_DOMAIN, "Inserting sequence end code failed");
fclose(com->out);
}
diff --git a/plugins/yuv4mpeg/y4m_common.c b/plugins/yuv4mpeg/y4m_common.c
index e0a54f7..6159a41 100644
--- a/plugins/yuv4mpeg/y4m_common.c
+++ b/plugins/yuv4mpeg/y4m_common.c
@@ -221,7 +221,7 @@ int bg_y4m_write_header(bg_y4m_common_t * com)
if(err != Y4M_OK)
{
- bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Writing stream header failed: %s",
+ gavl_log(GAVL_LOG_ERROR, LOG_DOMAIN, "Writing stream header failed: %s",
((err == Y4M_ERR_SYSTEM) ? strerror(errno) : y4m_strerr(err)));
return 0;
}