From 7a939633418192dc3516a201fe41ce4494734e50 Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Fri, 24 Dec 2021 10:35:25 +0100
Subject: [PATCH] FMT
---
inc/lektor/common.h | 10 +-
inc/lektor/net.h | 4 +-
src/module/module_qt_window.cc | 51 ++++----
src/module/mpv.h | 2 +-
src/module/qt_window/mainwindow.cc | 4 +-
src/module/qt_window/mpvwidget.cc | 132 +++++++++++---------
src/module/qt_window/mpvwidget_interface.cc | 21 ++--
src/module/thread.h | 7 +-
8 files changed, 126 insertions(+), 105 deletions(-)
diff --git a/inc/lektor/common.h b/inc/lektor/common.h
index 8acd54cc..5517fbaa 100644
--- a/inc/lektor/common.h
+++ b/inc/lektor/common.h
@@ -43,18 +43,18 @@ extern EXIT_FUNCTION ___not_implemented(const char *func, char *file, int line);
#endif
#define RETURN_IF(cond, msg, ret) \
- if (___LKT_TO_BOOL(cond)) { \
+ if (___LKT_TO_BOOL(cond)) { \
LOG_DEBUG("DEBUG", "%s", msg); \
return ret; \
}
#define GOTO_IF(cond, msg, label) \
- if (___LKT_TO_BOOL(cond)) { \
+ if (___LKT_TO_BOOL(cond)) { \
LOG_DEBUG("DEBUG", "%s", msg); \
goto label; \
}
#define FAIL_IF(cond, ...) \
{ \
- if (___LKT_TO_BOOL(cond)) { \
+ if (___LKT_TO_BOOL(cond)) { \
LOG_FATAL(__VA_ARGS__); \
} \
}
@@ -278,14 +278,14 @@ char *safe_strncpy(char *dest, const char *src, size_t n);
static_cast<___struct___ *>(safe_malloc(sizeof(___struct___) * (size_t)(___count___)))
#define LKT_ALLOC_STRUCT_ARRAY(___struct___, ___count___) \
LKT_ALLOC_ARRAY(struct ___struct___, ___count___)
- #else
+#else
#define LKT_ALLOC(___struct___) (___struct___ *)safe_malloc(sizeof(___struct___))
#define LKT_ALLOC_STRUCT(___struct___) LKT_ALLOC(struct ___struct___)
#define LKT_ALLOC_ARRAY(___struct___, ___count___) \
(___struct___ *)safe_malloc(sizeof(___struct___) * (size_t)(___count___))
#define LKT_ALLOC_STRUCT_ARRAY(___struct___, ___count___) \
LKT_ALLOC_ARRAY(struct ___struct___, ___count___)
- #endif
+#endif
/* Iterate throught a string, copy each element in the dest string.
The save ptr must contains a null integer. */
diff --git a/inc/lektor/net.h b/inc/lektor/net.h
index 3005f427..a4d67275 100644
--- a/inc/lektor/net.h
+++ b/inc/lektor/net.h
@@ -37,8 +37,8 @@ struct lkt_message;
/* Create a message structure. */
struct lkt_message *lkt_message_new(void);
-struct lkt_message *lkt_message_new_str(const char * msg);
-struct lkt_message *lkt_message_new_fmt(const char * fmt, ...);
+struct lkt_message *lkt_message_new_str(const char *msg);
+struct lkt_message *lkt_message_new_fmt(const char *fmt, ...);
struct lkt_message *lkt_message_clone(struct lkt_message *msg);
/* Destruct a message structure. */
diff --git a/src/module/module_qt_window.cc b/src/module/module_qt_window.cc
index 6787e9f4..6110ff6d 100644
--- a/src/module/module_qt_window.cc
+++ b/src/module/module_qt_window.cc
@@ -20,7 +20,6 @@ static bool module_qt_window_new(struct module_qt_window_s **, struct queue *, l
* Private functions *
*********************/
-
/********************************
* va_list version of functions *
********************************/
@@ -30,7 +29,8 @@ mod_new(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- struct module_qt_window_s **win= reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
+ struct module_qt_window_s **win =
+ reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
struct queue *queue = va_arg(copy, struct queue *);
lkt_db *db = va_arg(copy, lkt_db *);
bool ret = module_qt_window_new(win, queue, db);
@@ -43,7 +43,8 @@ mod_close(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- struct module_qt_window_s **win = reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
+ struct module_qt_window_s **win =
+ reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
module_qt_window_close(*win);
va_end(copy);
return 0;
@@ -54,7 +55,8 @@ mod_free(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- struct module_qt_window_s **win = reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
+ struct module_qt_window_s **win =
+ reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
module_qt_window_free(*win);
va_end(copy);
return 0;
@@ -65,7 +67,8 @@ mod_toggle_pause(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- struct module_qt_window_s **win= reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
+ struct module_qt_window_s **win =
+ reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
bool ret = ___module_qt_window_toggle_pause(*win);
va_end(copy);
return !ret;
@@ -76,7 +79,8 @@ mod_load_file(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- struct module_qt_window_s **win = reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
+ struct module_qt_window_s **win =
+ reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
const char *file = va_arg(copy, const char *);
const bool ret = ___module_qt_window_load_file(*win, file);
va_end(copy);
@@ -88,9 +92,10 @@ mod_set_volume(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- struct module_qt_window_s **win = reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
- const int volume = va_arg(copy, int);
- const bool ret = ___module_qt_window_set_volume(*win, volume);
+ struct module_qt_window_s **win =
+ reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
+ const int volume = va_arg(copy, int);
+ const bool ret = ___module_qt_window_set_volume(*win, volume);
va_end(copy);
return !ret;
}
@@ -100,9 +105,10 @@ mod_set_paused(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- struct module_qt_window_s **win = reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
- const int state = va_arg(copy, int);
- const bool ret = ___module_qt_window_set_paussed(*win, state);
+ struct module_qt_window_s **win =
+ reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
+ const int state = va_arg(copy, int);
+ const bool ret = ___module_qt_window_set_paussed(*win, state);
va_end(copy);
return !ret;
}
@@ -112,9 +118,10 @@ mod_set_position(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- struct module_qt_window_s **win = reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
- const int seconds = va_arg(copy, int);
- const bool ret = ___module_qt_window_set_position(*win, seconds);
+ struct module_qt_window_s **win =
+ reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
+ const int seconds = va_arg(copy, int);
+ const bool ret = ___module_qt_window_set_position(*win, seconds);
va_end(copy);
return !ret;
}
@@ -124,7 +131,8 @@ mod_get_duration(va_list *va)
{
va_list copy;
va_copy(copy, *va);
- struct module_qt_window_s **win= reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
+ struct module_qt_window_s **win =
+ reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
int *duration = va_arg(copy, int *);
bool ret = ___module_qt_window_get_duration(*win, duration);
va_end(copy);
@@ -170,7 +178,6 @@ REG_EXPORT(qt_window_reg)
* Private helper functions *
****************************/
-
/***************************
* Function implementation *
***************************/
@@ -189,15 +196,15 @@ module_qt_window_new(struct module_qt_window_s **win, struct queue *queue, lkt_d
RETURN_UNLESS(*win, "Out of memory", false);
memset(*win, 0, sizeof(struct module_qt_window_s));
- (*win)->queue = queue;
- (*win)->db = db;
- (*win)->is_in_preparation = true;
+ (*win)->queue = queue;
+ (*win)->db = db;
+ (*win)->is_in_preparation = true;
arg = LKT_ALLOC_STRUCT(poller_thread_arg);
RETURN_UNLESS(arg, "Out of memory", false);
arg->args = *win;
- RETURN_IF(poller_new(&(*win)->self, ___create_mpv_widget, arg), "Failed to launch the SDL thread",
- false);
+ RETURN_IF(poller_new(&(*win)->self, ___create_mpv_widget, arg),
+ "Failed to launch the SDL thread", false);
}
return true;
diff --git a/src/module/mpv.h b/src/module/mpv.h
index 438986ee..70893763 100644
--- a/src/module/mpv.h
+++ b/src/module/mpv.h
@@ -1,6 +1,6 @@
#pragma once
-#if defined( __cplusplus)
+#if defined(__cplusplus)
extern "C" {
#endif
diff --git a/src/module/qt_window/mainwindow.cc b/src/module/qt_window/mainwindow.cc
index 46e56c04..ddffabfe 100644
--- a/src/module/qt_window/mainwindow.cc
+++ b/src/module/qt_window/mainwindow.cc
@@ -1,7 +1,7 @@
#include "mainwindow.hh"
-MainWindow::MainWindow(struct module_qt_window_s* qt_window, QWidget *parent) :
- QMainWindow(parent)
+MainWindow::MainWindow(struct module_qt_window_s *qt_window, QWidget *parent)
+ : QMainWindow(parent)
{
qt_window->mpv_widget = new MpvWidget(qt_window->queue, qt_window->db, this);
}
diff --git a/src/module/qt_window/mpvwidget.cc b/src/module/qt_window/mpvwidget.cc
index d89203fc..570896a6 100644
--- a/src/module/qt_window/mpvwidget.cc
+++ b/src/module/qt_window/mpvwidget.cc
@@ -7,12 +7,15 @@
#include "qthelper.hh"
#include "../mpv.h"
-static void wakeup(void *ctx)
+static void
+wakeup(void *ctx)
{
- QMetaObject::invokeMethod(static_cast<MpvWidget*>(ctx), "on_mpv_events", Qt::QueuedConnection);
+ QMetaObject::invokeMethod(static_cast<MpvWidget *>(ctx), "on_mpv_events", Qt::QueuedConnection);
}
-static void *get_proc_address(void *ctx, const char *name) {
+static void *
+get_proc_address(void *ctx, const char *name)
+{
Q_UNUSED(ctx);
QOpenGLContext *glctx = QOpenGLContext::currentContext();
if (!glctx)
@@ -20,10 +23,10 @@ static void *get_proc_address(void *ctx, const char *name) {
return reinterpret_cast<void *>(glctx->getProcAddress(QByteArray(name)));
}
-MpvWidget::MpvWidget(struct queue *queue, lkt_db *db, QWidget* parent)
- : QOpenGLWidget(parent),
- m_queue(queue),
- m_db(db)
+MpvWidget::MpvWidget(struct queue *queue, lkt_db *db, QWidget *parent)
+ : QOpenGLWidget(parent)
+ , m_queue(queue)
+ , m_db(db)
{
setFocusPolicy(Qt::StrongFocus);
mpv = mpv_create();
@@ -56,51 +59,55 @@ MpvWidget::~MpvWidget()
mpv_terminate_destroy(mpv);
}
-void MpvWidget::command(const QVariant& params)
+void
+MpvWidget::command(const QVariant ¶ms)
{
mpv::qt::command(mpv, params);
}
-void MpvWidget::setProperty(const QString& name, const QVariant& value)
+void
+MpvWidget::setProperty(const QString &name, const QVariant &value)
{
mpv::qt::set_property(mpv, name, value);
}
-QVariant MpvWidget::getProperty(const QString &name) const
+QVariant
+MpvWidget::getProperty(const QString &name) const
{
return mpv::qt::get_property(mpv, name);
}
-void MpvWidget::initializeGL()
+void
+MpvWidget::initializeGL()
{
- mpv_opengl_init_params gl_init_params{get_proc_address, nullptr, nullptr};
- mpv_render_param params[]{
- {MPV_RENDER_PARAM_API_TYPE, const_cast<char *>(MPV_RENDER_API_TYPE_OPENGL)},
- {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params},
- {MPV_RENDER_PARAM_INVALID, nullptr}
- };
+ mpv_opengl_init_params gl_init_params{ get_proc_address, nullptr, nullptr };
+ mpv_render_param params[]{ { MPV_RENDER_PARAM_API_TYPE,
+ const_cast<char *>(MPV_RENDER_API_TYPE_OPENGL) },
+ { MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params },
+ { MPV_RENDER_PARAM_INVALID, nullptr } };
if (mpv_render_context_create(&mpv_gl, mpv, params) < 0)
throw std::runtime_error("failed to initialize mpv GL context");
- mpv_render_context_set_update_callback(mpv_gl, MpvWidget::on_update, reinterpret_cast<void *>(this));
+ mpv_render_context_set_update_callback(mpv_gl, MpvWidget::on_update,
+ reinterpret_cast<void *>(this));
}
-void MpvWidget::paintGL()
+void
+MpvWidget::paintGL()
{
- mpv_opengl_fbo mpfbo{static_cast<int>(defaultFramebufferObject()), width(), height(), 0};
- int flip_y{1};
+ mpv_opengl_fbo mpfbo{ static_cast<int>(defaultFramebufferObject()), width(), height(), 0 };
+ int flip_y{ 1 };
- mpv_render_param params[] = {
- {MPV_RENDER_PARAM_OPENGL_FBO, &mpfbo},
- {MPV_RENDER_PARAM_FLIP_Y, &flip_y},
- {MPV_RENDER_PARAM_INVALID, nullptr}
- };
+ mpv_render_param params[] = { { MPV_RENDER_PARAM_OPENGL_FBO, &mpfbo },
+ { MPV_RENDER_PARAM_FLIP_Y, &flip_y },
+ { MPV_RENDER_PARAM_INVALID, nullptr } };
// See render_gl.h on what OpenGL environment mpv expects, and
// other API details.
mpv_render_context_render(mpv_gl, params);
}
-void MpvWidget::on_mpv_events()
+void
+MpvWidget::on_mpv_events()
{
// Process all events, until the event queue is empty.
while (mpv) {
@@ -112,7 +119,8 @@ void MpvWidget::on_mpv_events()
}
}
-void MpvWidget::handle_mpv_event(mpv_event *event)
+void
+MpvWidget::handle_mpv_event(mpv_event *event)
{
switch (event->event_id) {
case MPV_EVENT_PROPERTY_CHANGE: {
@@ -131,37 +139,40 @@ void MpvWidget::handle_mpv_event(mpv_event *event)
break;
}
- case MPV_EVENT_SHUTDOWN:
- case MPV_EVENT_LOG_MESSAGE:
- case MPV_EVENT_GET_PROPERTY_REPLY:
- case MPV_EVENT_SET_PROPERTY_REPLY:
- case MPV_EVENT_NONE:
- case MPV_EVENT_COMMAND_REPLY:
- case MPV_EVENT_START_FILE:
- case MPV_EVENT_END_FILE:
- case MPV_EVENT_FILE_LOADED:
- case MPV_EVENT_TRACKS_CHANGED:
- case MPV_EVENT_TRACK_SWITCHED:
- case MPV_EVENT_IDLE:
- case MPV_EVENT_PAUSE:
- case MPV_EVENT_UNPAUSE:
- case MPV_EVENT_TICK:
- case MPV_EVENT_SCRIPT_INPUT_DISPATCH:
- case MPV_EVENT_CLIENT_MESSAGE:
- case MPV_EVENT_VIDEO_RECONFIG:
- case MPV_EVENT_AUDIO_RECONFIG:
- case MPV_EVENT_METADATA_UPDATE:
- case MPV_EVENT_SEEK:
- case MPV_EVENT_CHAPTER_CHANGE:
- case MPV_EVENT_PLAYBACK_RESTART:
- case MPV_EVENT_QUEUE_OVERFLOW:
- case MPV_EVENT_HOOK:{ break; }
+ case MPV_EVENT_SHUTDOWN:
+ case MPV_EVENT_LOG_MESSAGE:
+ case MPV_EVENT_GET_PROPERTY_REPLY:
+ case MPV_EVENT_SET_PROPERTY_REPLY:
+ case MPV_EVENT_NONE:
+ case MPV_EVENT_COMMAND_REPLY:
+ case MPV_EVENT_START_FILE:
+ case MPV_EVENT_END_FILE:
+ case MPV_EVENT_FILE_LOADED:
+ case MPV_EVENT_TRACKS_CHANGED:
+ case MPV_EVENT_TRACK_SWITCHED:
+ case MPV_EVENT_IDLE:
+ case MPV_EVENT_PAUSE:
+ case MPV_EVENT_UNPAUSE:
+ case MPV_EVENT_TICK:
+ case MPV_EVENT_SCRIPT_INPUT_DISPATCH:
+ case MPV_EVENT_CLIENT_MESSAGE:
+ case MPV_EVENT_VIDEO_RECONFIG:
+ case MPV_EVENT_AUDIO_RECONFIG:
+ case MPV_EVENT_METADATA_UPDATE:
+ case MPV_EVENT_SEEK:
+ case MPV_EVENT_CHAPTER_CHANGE:
+ case MPV_EVENT_PLAYBACK_RESTART:
+ case MPV_EVENT_QUEUE_OVERFLOW:
+ case MPV_EVENT_HOOK: {
+ break;
+ }
// Ignore uninteresting or unknown events.
}
}
// Make Qt invoke mpv_render_context_render() to draw a new/updated video frame.
-void MpvWidget::maybeUpdate()
+void
+MpvWidget::maybeUpdate()
{
// If the Qt window is not visible, Qt's update() will just skip rendering.
// This confuses mpv's render API, and may lead to small occasional
@@ -180,20 +191,21 @@ void MpvWidget::maybeUpdate()
}
}
-void MpvWidget::on_update(void *ctx)
+void
+MpvWidget::on_update(void *ctx)
{
- QMetaObject::invokeMethod(static_cast<MpvWidget*>(ctx), "maybeUpdate");
+ QMetaObject::invokeMethod(static_cast<MpvWidget *>(ctx), "maybeUpdate");
}
bool
-MpvWidget::get_elapsed(int * elapsed_sec)
+MpvWidget::get_elapsed(int *elapsed_sec)
{
(void)elapsed_sec;
return true;
}
bool
-MpvWidget::get_duration(int * dur_sec)
+MpvWidget::get_duration(int *dur_sec)
{
(void)dur_sec;
return true;
@@ -221,9 +233,9 @@ MpvWidget::set_position(int sec)
}
bool
-MpvWidget::load_file(const char * filepath)
+MpvWidget::load_file(const char *filepath)
{
- const bool ret = !lmpv_load_file(mpv, filepath);
+ const bool ret = !lmpv_load_file(mpv, filepath);
if (ret) {
LOG_DEBUG("WINDOW", "Loaded file: %s", filepath);
diff --git a/src/module/qt_window/mpvwidget_interface.cc b/src/module/qt_window/mpvwidget_interface.cc
index 0c3423ef..e048844e 100644
--- a/src/module/qt_window/mpvwidget_interface.cc
+++ b/src/module/qt_window/mpvwidget_interface.cc
@@ -3,12 +3,13 @@
#include <QApplication>
-void*
-___create_mpv_widget(struct poller_thread_arg *arg){
+void *
+___create_mpv_widget(struct poller_thread_arg *arg)
+{
lkt_thread_set_name("lektord/qt-win");
/* Unsage reinterpret cast, but isok */
- struct module_qt_window_s* qt_window = reinterpret_cast<struct module_qt_window_s*>(arg->args);
+ struct module_qt_window_s *qt_window = reinterpret_cast<struct module_qt_window_s *>(arg->args);
int argc = 0;
QApplication a(argc, nullptr);
@@ -19,43 +20,43 @@ ___create_mpv_widget(struct poller_thread_arg *arg){
}
bool
-___module_qt_window_get_elapsed(struct module_qt_window_s * win, int * elapsed_sec)
+___module_qt_window_get_elapsed(struct module_qt_window_s *win, int *elapsed_sec)
{
return win->mpv_widget->get_elapsed(elapsed_sec);
}
bool
-___module_qt_window_get_duration(struct module_qt_window_s * win, int * dur_sec)
+___module_qt_window_get_duration(struct module_qt_window_s *win, int *dur_sec)
{
return win->mpv_widget->get_duration(dur_sec);
}
bool
-___module_qt_window_set_paussed(struct module_qt_window_s * win, int paused)
+___module_qt_window_set_paussed(struct module_qt_window_s *win, int paused)
{
return win->mpv_widget->set_paussed(paused);
}
bool
-___module_qt_window_set_volume(struct module_qt_window_s * win, int vol)
+___module_qt_window_set_volume(struct module_qt_window_s *win, int vol)
{
return win->mpv_widget->set_volume(vol);
}
bool
-___module_qt_window_set_position(struct module_qt_window_s * win, int sec)
+___module_qt_window_set_position(struct module_qt_window_s *win, int sec)
{
return win->mpv_widget->set_position(sec);
}
bool
-___module_qt_window_load_file(struct module_qt_window_s * win, const char * filepath)
+___module_qt_window_load_file(struct module_qt_window_s *win, const char *filepath)
{
return win->mpv_widget->load_file(filepath);
}
bool
-___module_qt_window_toggle_pause(struct module_qt_window_s * win)
+___module_qt_window_toggle_pause(struct module_qt_window_s *win)
{
return win->mpv_widget->toggle_pause();
}
diff --git a/src/module/thread.h b/src/module/thread.h
index 537ac63a..41f05975 100644
--- a/src/module/thread.h
+++ b/src/module/thread.h
@@ -1,7 +1,7 @@
#if !defined(__LKT_THREAD_H__)
#define __LKT_THREAD_H__
-#if defined( __cplusplus)
+#if defined(__cplusplus)
extern "C" {
#endif
@@ -32,9 +32,10 @@ struct ___poller_thread_args {
struct poller_thread_arg *arg;
};
-void * ___poller_thread_start(void *args__);
+void *___poller_thread_start(void *args__);
-UNUSED int poller_new(struct poller_thread *th, void *(*func)(struct poller_thread_arg *), void *args);
+UNUSED int poller_new(struct poller_thread *th, void *(*func)(struct poller_thread_arg *),
+ void *args);
UNUSED int poller_join(struct poller_thread *th, void **ret);
--
GitLab