diff --git a/janus/src/config.h b/janus/src/config.h new file mode 100644 index 0000000..337b810 --- /dev/null +++ b/janus/src/config.h @@ -0,0 +1,26 @@ +/***************************************************************************** +# # +# uStreamer - Lightweight and fast MJPEG-HTTP streamer. # +# # +# Copyright (C) 2018-2022 Maxim Devaev # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +*****************************************************************************/ + + +#pragma once + +#define PLUGIN_NAME "ustreamer" +#define PLUGIN_PACKAGE "janus.plugin.ustreamer" diff --git a/janus/src/jlogging.h b/janus/src/jlogging.h index 52bba97..80f60d2 100644 --- a/janus/src/jlogging.h +++ b/janus/src/jlogging.h @@ -24,13 +24,15 @@ #include "uslibs/tools.h" +#include "config.h" -#define JLOG_INFO(_prefix, _msg, ...) JANUS_LOG(LOG_INFO, "== ustreamer/%-9s -- " _msg "\n", _prefix, ##__VA_ARGS__) -#define JLOG_WARN(_prefix, _msg, ...) JANUS_LOG(LOG_WARN, "== ustreamer/%-9s -- " _msg "\n", _prefix, ##__VA_ARGS__) -#define JLOG_ERROR(_prefix, _msg, ...) JANUS_LOG(LOG_ERR, "== ustreamer/%-9s -- " _msg "\n", _prefix, ##__VA_ARGS__) + +#define JLOG_INFO(_prefix, _msg, ...) JANUS_LOG(LOG_INFO, "== %s/%-9s -- " _msg "\n", PLUGIN_NAME, _prefix, ##__VA_ARGS__) +#define JLOG_WARN(_prefix, _msg, ...) JANUS_LOG(LOG_WARN, "== %s/%-9s -- " _msg "\n", PLUGIN_NAME, _prefix, ##__VA_ARGS__) +#define JLOG_ERROR(_prefix, _msg, ...) JANUS_LOG(LOG_ERR, "== %s/%-9s -- " _msg "\n", PLUGIN_NAME, _prefix, ##__VA_ARGS__) #define JLOG_PERROR(_prefix, _msg, ...) { \ char _perror_buf[1024] = {0}; \ char *_perror_ptr = errno_to_string(errno, _perror_buf, 1023); \ - JANUS_LOG(LOG_ERR, "[ustreamer/%-9s] " _msg ": %s\n", _prefix, ##__VA_ARGS__, _perror_ptr); \ + JANUS_LOG(LOG_ERR, "[%s/%-9s] " _msg ": %s\n", PLUGIN_NAME, _prefix, ##__VA_ARGS__, _perror_ptr); \ } diff --git a/janus/src/plugin.c b/janus/src/plugin.c index b84eef6..9b88b1d 100644 --- a/janus/src/plugin.c +++ b/janus/src/plugin.c @@ -44,6 +44,7 @@ #include "uslibs/list.h" #include "uslibs/memsinksh.h" +#include "config.h" #include "jlogging.h" #include "audio.h" #include "tc358743.h" @@ -69,9 +70,9 @@ static int _plugin_get_api_compatibility(void) { return JANUS_PLUGIN_API_VERSIO static int _plugin_get_version(void) { return VERSION_U; } static const char *_plugin_get_version_string(void) { return VERSION; } static const char *_plugin_get_description(void) { return "PiKVM uStreamer Janus plugin for H.264 video"; } -static const char *_plugin_get_name(void) { return "ustreamer"; } +static const char *_plugin_get_name(void) { return PLUGIN_NAME; } static const char *_plugin_get_author(void) { return "Maxim Devaev "; } -static const char *_plugin_get_package(void) { return "janus.plugin.ustreamer"; } +static const char *_plugin_get_package(void) { return PLUGIN_PACKAGE; } // Just a stub to avoid logging spam about the plugin's purpose. static void _plugin_incoming_rtp(UNUSED janus_plugin_session *handle, UNUSED janus_plugin_rtp *packet) {} @@ -350,7 +351,7 @@ static int _read_config(const char *config_dir_path) { char *config_file_path; janus_config *config = NULL; - A_ASPRINTF(config_file_path, "%s/%s.jcfg", config_dir_path, _plugin_get_package()); + A_ASPRINTF(config_file_path, "%s/%s.jcfg", config_dir_path, PLUGIN_PACKAGE); JLOG_INFO("main", "Reading config file '%s' ...", config_file_path); config = janus_config_parse(config_file_path);