diff --git a/.bumpversion.cfg b/.bumpversion.cfg index b369846..c01ba71 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -6,13 +6,13 @@ parse = (?P\d+)\.(?P\d+) serialize = {major}.{minor} -[bumpversion:file:src/libs/config.h] +[bumpversion:file:src/libs/const.h] parse = (?P\d+) serialize = {major} search = VERSION_MAJOR {current_version} replace = VERSION_MAJOR {new_version} -[bumpversion:file:./src/libs/config.h] +[bumpversion:file:./src/libs/const.h] parse = \d+\.(?P\d+) serialize = {minor} search = VERSION_MINOR {current_version} diff --git a/janus/src/config.h b/janus/src/const.h similarity index 100% rename from janus/src/config.h rename to janus/src/const.h diff --git a/janus/src/jlogging.h b/janus/src/jlogging.h index 80f60d2..e238f7e 100644 --- a/janus/src/jlogging.h +++ b/janus/src/jlogging.h @@ -24,7 +24,7 @@ #include "uslibs/tools.h" -#include "config.h" +#include "const.h" #define JLOG_INFO(_prefix, _msg, ...) JANUS_LOG(LOG_INFO, "== %s/%-9s -- " _msg "\n", PLUGIN_NAME, _prefix, ##__VA_ARGS__) diff --git a/janus/src/plugin.c b/janus/src/plugin.c index 2253a85..8e6291f 100644 --- a/janus/src/plugin.c +++ b/janus/src/plugin.c @@ -37,13 +37,13 @@ #include #include -#include "uslibs/config.h" +#include "uslibs/const.h" #include "uslibs/tools.h" #include "uslibs/threading.h" #include "uslibs/list.h" #include "uslibs/memsinksh.h" -#include "config.h" +#include "const.h" #include "jlogging.h" #include "audio.h" #include "tc358743.h" diff --git a/janus/src/uslibs/config.h b/janus/src/uslibs/config.h deleted file mode 120000 index b2ea182..0000000 --- a/janus/src/uslibs/config.h +++ /dev/null @@ -1 +0,0 @@ -../../../src/libs/config.h \ No newline at end of file diff --git a/janus/src/uslibs/const.h b/janus/src/uslibs/const.h new file mode 120000 index 0000000..137d311 --- /dev/null +++ b/janus/src/uslibs/const.h @@ -0,0 +1 @@ +../../../src/libs/const.h \ No newline at end of file diff --git a/src/dump/main.c b/src/dump/main.c index b71b0ca..5602841 100644 --- a/src/dump/main.c +++ b/src/dump/main.c @@ -31,7 +31,7 @@ #include #include -#include "../libs/config.h" +#include "../libs/const.h" #include "../libs/tools.h" #include "../libs/logging.h" #include "../libs/frame.h" diff --git a/src/libs/config.h b/src/libs/const.h similarity index 100% rename from src/libs/config.h rename to src/libs/const.h diff --git a/src/ustreamer/data/index_html.h b/src/ustreamer/data/index_html.h index 45b2716..f2e976e 100644 --- a/src/ustreamer/data/index_html.h +++ b/src/ustreamer/data/index_html.h @@ -24,7 +24,7 @@ #include -#include "../../libs/config.h" +#include "../../libs/const.h" extern const char *const HTML_INDEX_PAGE; diff --git a/src/ustreamer/options.h b/src/ustreamer/options.h index af2c590..cd8f74d 100644 --- a/src/ustreamer/options.h +++ b/src/ustreamer/options.h @@ -32,7 +32,7 @@ #include #include -#include "../libs/config.h" +#include "../libs/const.h" #include "../libs/logging.h" #include "../libs/process.h" #include "../libs/frame.h"