diff --git a/src/base/reg.c b/src/base/reg.c
index d02577c4306ed3c7b8158b67138627ac710ccfec..379a133413a581f7994ac54b8cf0402f48133e06 100644
--- a/src/base/reg.c
+++ b/src/base/reg.c
@@ -20,7 +20,7 @@ reg_global(struct module_reg **reg_ptr)
}
PRIVATE_FUNCTION void *
-__reg_get(struct module_reg *reg, const char *name)
+reg_internal_get(struct module_reg *reg, const char *name)
{
for (int i = 0; (reg + i) && (reg + i)->name && (reg + i)->obj; ++i) {
if (STR_MATCH((reg + i)->name, name))
@@ -30,7 +30,7 @@ __reg_get(struct module_reg *reg, const char *name)
}
PRIVATE_FUNCTION reg_func
-__reg_func(struct module_reg *reg, const char *name)
+reg_internal_func(struct module_reg *reg, const char *name)
{
for (int i = 0; (reg + i) && (reg + i)->name && (reg + i)->func; ++i) {
if (STR_MATCH((reg + i)->name, name))
@@ -40,7 +40,7 @@ __reg_func(struct module_reg *reg, const char *name)
}
PRIVATE_FUNCTION void *
-__from_file(const char *file, void **handle, const char *symbol)
+reg_internal_from_file(const char *file, void **handle, const char *symbol)
{
void *sym = NULL;
char *error = NULL;
@@ -68,16 +68,16 @@ reg_import(const char *mod, struct module_reg **ret, void **handle)
{
if (strcspn(mod, "/.\'\"\\") != strlen(mod)) {
LOG_INFO("REG", "Using the dlsym to find '" REG_EXPORT_NAME "' in %s", mod);
- *ret = __from_file(mod, handle, REG_EXPORT_NAME);
+ *ret = reg_internal_from_file(mod, handle, REG_EXPORT_NAME);
}
else {
LOG_INFO("REG", "Using the reg structure to find %s", mod);
- *ret = __reg_get(__reg__, mod);
+ *ret = reg_internal_get(__reg__, mod);
if (!*ret) {
LOG_INFO("REG",
- "Not found in reg '" REG_EXPORT_NAME
- "', using the dlsym to find reg '" REG_EXPORT_NAME "' in file %s",
+ "Not found in reg '" REG_EXPORT_NAME "', "
+ "using the dlsym to find reg '" REG_EXPORT_NAME "' in file %s",
mod);
}
}
@@ -87,7 +87,7 @@ reg_import(const char *mod, struct module_reg **ret, void **handle)
int
reg_call(struct module_reg *reg, const char *name, int count, ...)
{
- reg_func func = __reg_func(reg, name);
+ reg_func func = reg_internal_func(reg, name);
if (!func) {
LOG_ERROR("REG", "No function named '%s'", name);
return 2;
diff --git a/src/main/lkt.c b/src/main/lkt.c
index b673e2c5584abae578243267ad4ffcba0ac6deb1..e738d8e3518e26b74c0f9dc911b272eb46ce7c79 100644
--- a/src/main/lkt.c
+++ b/src/main/lkt.c
@@ -1386,7 +1386,10 @@ main(int argc, const char **argv)
RETURN_UNLESS(setlocale(LC_ALL, ""), "Failed to set LC_ALL to UTF-8", 1);
RETURN_UNLESS(setlocale(LC_CTYPE, ""), "Failed to set LC_CTYPE", 1);
RETURN_UNLESS(setlocale(LC_NUMERIC, ""), "Failed to set LC_NUMERIC for mpv", 1);
- RETURN_UNLESS(STR_MATCH(nl_langinfo(CODESET), "UTF-8"), "Your locale is not set to an UTF-8 one. " "Consider using en_US.UTF-8 or fr_FR.UTF-8!", 1);
+ RETURN_UNLESS(STR_MATCH(nl_langinfo(CODESET), "UTF-8"),
+ "Your locale is not set to an UTF-8 one. "
+ "Consider using en_US.UTF-8 or fr_FR.UTF-8!",
+ 1);
if (signal(SIGPIPE, sigpipe__))
LOG_ERROR("SYS", "Failed to install handler for SIGPIPE signal (you may be using php...)");
diff --git a/src/main/luka.c b/src/main/luka.c
index 43f20460d587e84f10023fdedd0b393745afb3d0..5a0eb574c34a39c4f29d73d6468af03eca38c1cf 100644
--- a/src/main/luka.c
+++ b/src/main/luka.c
@@ -460,7 +460,10 @@ main(const int argc, const char **argv)
RETURN_UNLESS(setlocale(LC_ALL, ""), "Failed to set LC_ALL to UTF-8", 1);
RETURN_UNLESS(setlocale(LC_CTYPE, ""), "Failed to set LC_CTYPE", 1);
RETURN_UNLESS(setlocale(LC_NUMERIC, ""), "Failed to set LC_NUMERIC for mpv", 1);
- RETURN_UNLESS(STR_MATCH(nl_langinfo(CODESET), "UTF-8"), "Your locale is not set to an UTF-8 one. " "Consider using en_US.UTF-8 or fr_FR.UTF-8!", 1);
+ RETURN_UNLESS(STR_MATCH(nl_langinfo(CODESET), "UTF-8"),
+ "Your locale is not set to an UTF-8 one. "
+ "Consider using en_US.UTF-8 or fr_FR.UTF-8!",
+ 1);
if (signal(SIGPIPE, __sigpipe))
LOG_ERROR("SYS", "Failed to install handler for SIGPIPE signal (you may be using php...)");
diff --git a/src/main/server.c b/src/main/server.c
index f795ff028d05dc65c3ac01c7c7e59df64b505c79..a1de40db68c692a09bb0fbfb573ef09254b1f54e 100644
--- a/src/main/server.c
+++ b/src/main/server.c
@@ -48,7 +48,10 @@ main(int argc, char *argv[])
RETURN_UNLESS(setlocale(LC_ALL, ""), "Failed to set LC_ALL to UTF-8", 1);
RETURN_UNLESS(setlocale(LC_CTYPE, ""), "Failed to set LC_CTYPE", 1);
RETURN_UNLESS(setlocale(LC_NUMERIC, ""), "Failed to set LC_NUMERIC for mpv", 1);
- RETURN_UNLESS(STR_MATCH(nl_langinfo(CODESET), "UTF-8"), "Your locale is not set to an UTF-8 one. " "Consider using en_US.UTF-8 or fr_FR.UTF-8!", 1);
+ RETURN_UNLESS(STR_MATCH(nl_langinfo(CODESET), "UTF-8"),
+ "Your locale is not set to an UTF-8 one. "
+ "Consider using en_US.UTF-8 or fr_FR.UTF-8!",
+ 1);
int autoclear;
int opt;
diff --git a/src/module/module_qt_window.cc b/src/module/module_qt_window.cc
index 20794c08563792d60635aec777ea105c155df2b0..69a14b7b32b11a40814ff084509553f2cd442b48 100644
--- a/src/module/module_qt_window.cc
+++ b/src/module/module_qt_window.cc
@@ -30,11 +30,10 @@ mod_new(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- module_qt_window_s **win =
- reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
- queue *queue = va_arg(copy, struct queue *);
- lkt_db *db = va_arg(copy, lkt_db *);
- bool ret = module_qt_window_new(win, queue, db);
+ module_qt_window_s **win = reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
+ queue *queue = va_arg(copy, struct queue *);
+ lkt_db *db = va_arg(copy, lkt_db *);
+ bool ret = module_qt_window_new(win, queue, db);
va_end(copy);
return !ret;
}
@@ -44,8 +43,7 @@ mod_close(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- module_qt_window_s **win =
- reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
+ module_qt_window_s **win = reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
module_qt_window_close(*win);
va_end(copy);
return 0;
@@ -56,8 +54,7 @@ mod_free(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- module_qt_window_s **win =
- reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
+ module_qt_window_s **win = reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
module_qt_window_free(*win);
va_end(copy);
return 0;
@@ -68,9 +65,8 @@ mod_toggle_pause(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- module_qt_window_s **win =
- reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
- bool ret = (*win)->mpv_widget->toggle_pause();
+ module_qt_window_s **win = reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
+ bool ret = (*win)->mpv_widget->toggle_pause();
va_end(copy);
return !ret;
}
@@ -80,10 +76,9 @@ mod_load_file(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- module_qt_window_s **win =
- reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
- const char *file = va_arg(copy, const char *);
- const bool ret = (*win)->mpv_widget->load_file(file);
+ module_qt_window_s **win = reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
+ const char *file = va_arg(copy, const char *);
+ const bool ret = (*win)->mpv_widget->load_file(file);
va_end(copy);
return !ret;
}
@@ -93,10 +88,9 @@ mod_set_volume(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- module_qt_window_s **win =
- reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
- const int volume = va_arg(copy, int);
- const bool ret = (*win)->mpv_widget->set_volume(volume);
+ module_qt_window_s **win = reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
+ const int volume = va_arg(copy, int);
+ const bool ret = (*win)->mpv_widget->set_volume(volume);
va_end(copy);
return !ret;
}
@@ -106,10 +100,9 @@ mod_set_paused(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- module_qt_window_s **win =
- reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
- const int state = va_arg(copy, int);
- const bool ret = (*win)->mpv_widget->set_paused(state);
+ module_qt_window_s **win = reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
+ const int state = va_arg(copy, int);
+ const bool ret = (*win)->mpv_widget->set_paused(state);
va_end(copy);
return !ret;
}
@@ -119,10 +112,9 @@ mod_set_position(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- module_qt_window_s **win =
- reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
- const int seconds = va_arg(copy, int);
- const bool ret = (*win)->mpv_widget->set_position(seconds);
+ module_qt_window_s **win = reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
+ const int seconds = va_arg(copy, int);
+ const bool ret = (*win)->mpv_widget->set_position(seconds);
va_end(copy);
return !ret;
}
@@ -132,10 +124,9 @@ mod_get_duration(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- module_qt_window_s **win =
- reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
- int *duration = va_arg(copy, int *);
- bool ret = (*win)->mpv_widget->get_duration(duration);
+ module_qt_window_s **win = reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
+ int *duration = va_arg(copy, int *);
+ bool ret = (*win)->mpv_widget->get_duration(duration);
va_end(copy);
return !ret;
}
diff --git a/src/module/qt_window/mpvwidget.cc b/src/module/qt_window/mpvwidget.cc
index 7024f133bd3eb24674f61ce374b5359d0e459b39..e7140409c3a66606989f4faa08fd61e3900e3c49 100644
--- a/src/module/qt_window/mpvwidget.cc
+++ b/src/module/qt_window/mpvwidget.cc
@@ -28,8 +28,7 @@ get_proc_address(void *ctx, const char *name)
return reinterpret_cast<void *>(glctx->getProcAddress(QByteArray(name)));
}
-MpvWidget::MpvWidget(queue *queue, lkt_db *db, module_reg *reg, bool *launched,
- QWidget *parent)
+MpvWidget::MpvWidget(queue *queue, lkt_db *db, module_reg *reg, bool *launched, QWidget *parent)
: QOpenGLWidget(parent)
, m_queue(queue)
, m_db(db)