chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moving to QT6: Read more

Browse source 
QT6 Apparently means a lot of changes, these are the changes I've
found to make at least CPP build. The problem is we just got rid of a
lot of CPP and I don't know if the application will work. On the other
hand, the QML isn't finished yet either, but this is the start of
updating the application for QT6 and using MpvQt which is being built
and maintained by KDE. This will be better as they'll keep the library
updated for future QT updates so long as I still track with Kirigami.
This commit is contained in:
Chris Cochrun 2024-09-09 13:02:11 -05:00
parent 398bc58525
commit 61aef5c48f
13 changed files with 1115 additions and 2302 deletions
Download patch file Download diff file Expand all files Collapse all files

37
CMakeLists.txt
View file

@ -4,8 +4,8 @@ set(APP_NAME ${PROJECT_NAME})
include(FeatureSummary) include(FeatureSummary)
set(QT5_MIN_VERSION 5.15) set(QT_MIN_VERSION 6.6.0)
set(KF5_MIN_VERSION 5.83) set(KF_MIN_VERSION 6.00)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
@ -14,7 +14,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
@ -27,8 +27,8 @@ include(ECMPoQmTools)
kde_enable_exceptions() kde_enable_exceptions()
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui QuickControls2 Widgets Sql X11Extras QmlImportScanner WebEngine) find_package(Qt6 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Core5Compat Quick Test Gui Qml QuickControls2 Widgets Sql QmlImportScanner WebEngineQuick)
find_package(KF5 ${KF_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 CoreAddons I18n Archive) find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS Kirigami CoreAddons I18n)
find_package(FFmpeg) find_package(FFmpeg)
set_package_properties(FFmpeg PROPERTIES TYPE REQUIRED) set_package_properties(FFmpeg PROPERTIES TYPE REQUIRED)
@ -36,6 +36,10 @@ set_package_properties(FFmpeg PROPERTIES TYPE REQUIRED)
find_package(Libmpv) find_package(Libmpv)
set_package_properties(Libmpv PROPERTIES TYPE REQUIRED) set_package_properties(Libmpv PROPERTIES TYPE REQUIRED)
find_package(MpvQt)
set_package_properties(MpvQt PROPERTIES TYPE REQUIRED
URL "https://invent.kde.org/libraries/mpvqt")
find_package(YouTubeDl) find_package(YouTubeDl)
set_package_properties(YouTubeDl PROPERTIES TYPE RUNTIME) set_package_properties(YouTubeDl PROPERTIES TYPE RUNTIME)
@ -86,18 +90,17 @@ target_include_directories(${APP_NAME}_lib INTERFACE "${CXXQT_EXPORT_DIR}/${CRAT
# executable which link the Rust library, for example tests, will also link Qt. # executable which link the Rust library, for example tests, will also link Qt.
target_link_libraries(${APP_NAME}_lib INTERFACE target_link_libraries(${APP_NAME}_lib INTERFACE
"$<LINK_LIBRARY:WHOLE_ARCHIVE,${CRATE}-static>" "$<LINK_LIBRARY:WHOLE_ARCHIVE,${CRATE}-static>"
Qt5::Quick Qt6::Quick
Qt5::Qml Qt6::Qml
Qt5::Gui Qt6::Gui
Qt5::QuickControls2 Qt6::QuickControls2
Qt5::Widgets Qt6::Widgets
Qt5::Sql Qt6::Sql
Qt5::X11Extras Qt6::WebEngineQuick
Qt5::WebEngine KF6::Kirigami
KF5::Kirigami2 KF6::I18n
KF5::I18n KF6::CoreAddons
KF5::Archive MpvQt::MpvQt
KF5::CoreAddons
mpv mpv
ssl ssl
crypto crypto

1456
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

16
flake.lock generated
View file

@ -23,11 +23,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1698420672, "lastModified": 1721727458,
"narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=", "narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "naersk", "repo": "naersk",
"rev": "aeb58d5e8faead8980a807c840232697982d47b9", "rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -39,8 +39,8 @@
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 0, "lastModified": 0,
"narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
"path": "/nix/store/j10523yhkcc34478azkgcl70yzcx6j2j-source", "path": "/nix/store/6inj491lsap4ia7mmvn2gbh53jb27zq0-source",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -50,11 +50,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1712439257, "lastModified": 1725634671,
"narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
"type": "github" "type": "github"
}, },
"original": { "original": {

29
shell.nix
View file

@ -14,9 +14,9 @@ mkShell rec {
gdb gdb
qtcreator qtcreator
cmake cmake
extra-cmake-modules kdePackages.extra-cmake-modules
pkg-config pkg-config
libsForQt5.wrapQtAppsHook qt6.wrapQtAppsHook
makeWrapper makeWrapper
openssl.dev openssl.dev
@ -27,20 +27,18 @@ mkShell rec {
libclang libclang
# libwebp # libwebp
# clang-format # clang-format
qt5.qtbase qt6.qtbase
qt5.qttools qt6.qttools
qt5.qtquickcontrols2 # qt6.qtquickcontrols2
qt5.qtx11extras # qt6.qtx11extras
qt5.qtmultimedia qt6.qtmultimedia
qt5.qtwayland qt6.qtwayland
qt5.qtwebengine qt6.qtwebengine
qt5.qtimageformats qt6.qtimageformats
libsForQt5.kirigami2 kdePackages.kirigami
# libsForQt5.breeze-icons # libsForQt5.breeze-icons
# libsForQt5.breeze-qt5 # libsForQt5.breeze-qt5
libsForQt5.qqc2-desktop-style kdePackages.qqc2-desktop-style
libsForQt5.karchive
libsForQt5.sonnet
# libsForQt5.kirigami-addons # libsForQt5.kirigami-addons
# libsForQt5.ki18n # libsForQt5.ki18n
# libsForQt5.kcoreaddons # libsForQt5.kcoreaddons
@ -49,7 +47,8 @@ mkShell rec {
# podofo # podofo
mpv mpv
ffmpeg_5-full kdePackages.mpvqt
ffmpeg-full
# yt-dlp # yt-dlp
# Rust tools # Rust tools

25
src/CMakeLists.txt
View file

@ -4,19 +4,18 @@ add_executable(lumina main.cpp resources.qrc)
target_sources(lumina target_sources(lumina
PRIVATE PRIVATE
main.cpp resources.qrc main.cpp resources.qrc
cpp/songsqlmodel.cpp cpp/songsqlmodel.h # cpp/songsqlmodel.cpp cpp/songsqlmodel.h
cpp/serviceitemmodel.cpp cpp/serviceitemmodel.h # cpp/serviceitemmodel.cpp cpp/serviceitemmodel.h
cpp/serviceitem.cpp cpp/serviceitem.h # cpp/serviceitem.cpp cpp/serviceitem.h
cpp/slidehelper.cpp cpp/slidehelper.h # cpp/slidehelper.cpp cpp/slidehelper.h
cpp/slidemodel.cpp cpp/slidemodel.h # cpp/slidemodel.cpp cpp/slidemodel.h
cpp/slide.cpp cpp/slide.h # cpp/slide.cpp cpp/slide.h
cpp/videosqlmodel.cpp cpp/videosqlmodel.h # cpp/videosqlmodel.cpp cpp/videosqlmodel.h
cpp/imagesqlmodel.cpp cpp/imagesqlmodel.h # cpp/imagesqlmodel.cpp cpp/imagesqlmodel.h
cpp/filemanager.cpp cpp/filemanager.h # cpp/filemanager.cpp cpp/filemanager.h
cpp/presentationsqlmodel.cpp cpp/presentationsqlmodel.h # cpp/presentationsqlmodel.cpp cpp/presentationsqlmodel.h
cpp/mpv/mpvobject.h cpp/mpv/mpvobject.cpp cpp/mpv/mpvitem.h cpp/mpv/mpvitem.cpp
cpp/mpv/qthelper.hpp cpp/mpv/mpvhelpers.h cpp/mpv/mpvproperties.h
cpp/framedecoder.h cpp/framedecoder.cpp
) )
target_compile_options (lumina PUBLIC -fexceptions) target_compile_options (lumina PUBLIC -fexceptions)

154
src/cpp/mpv/mpvhelpers.h
View file

@ -1,154 +0,0 @@
#pragma once
// MpvObject definition
#define READONLY_PROP_BOOL(p, varName) \
public: \
Q_PROPERTY(bool varName READ varName NOTIFY varName##Changed) \
public Q_SLOTS: \
bool varName() const { return getProperty(p).toBool(); } \
Q_SIGNALS: \
void varName##Changed(bool value);
#define WRITABLE_PROP_BOOL(p, varName) \
public: \
Q_PROPERTY(bool varName READ varName WRITE set_##varName NOTIFY varName##Changed) \
public Q_SLOTS: \
bool varName() const { return getProperty(p).toBool(); } \
void set_##varName(bool value) { setProperty(p, value); } \
Q_SIGNALS: \
void varName##Changed(bool value);
#define READONLY_PROP_INT(p, varName) \
public: \
Q_PROPERTY(int varName READ varName NOTIFY varName##Changed) \
public Q_SLOTS: \
int varName() { return getProperty(p).toInt(); } \
Q_SIGNALS: \
void varName##Changed(int value);
#define WRITABLE_PROP_INT(p, varName) \
public: \
Q_PROPERTY(int varName READ varName WRITE set_##varName NOTIFY varName##Changed) \
public Q_SLOTS: \
int varName() { return getProperty(p).toInt(); } \
void set_##varName(int value) { setProperty(p, value); } \
Q_SIGNALS: \
void varName##Changed(int value);
#define READONLY_PROP_DOUBLE(p, varName) \
public: \
Q_PROPERTY(double varName READ varName NOTIFY varName##Changed) \
public Q_SLOTS: \
double varName() { return getProperty(p).toDouble(); } \
Q_SIGNALS: \
void varName##Changed(double value);
#define WRITABLE_PROP_DOUBLE(p, varName) \
public: \
Q_PROPERTY(double varName READ varName WRITE set_##varName NOTIFY varName##Changed) \
public Q_SLOTS: \
double varName() { return getProperty(p).toDouble(); } \
void set_##varName(double value) { setProperty(p, value); } \
Q_SIGNALS: \
void varName##Changed(double value);
#define READONLY_PROP_STRING(p, varName) \
public: \
Q_PROPERTY(QString varName READ varName NOTIFY varName##Changed) \
public Q_SLOTS: \
QString varName() { return getProperty(p).toString(); } \
Q_SIGNALS: \
void varName##Changed(QString value);
#define WRITABLE_PROP_STRING(p, varName) \
public: \
Q_PROPERTY(QString varName READ varName WRITE set_##varName NOTIFY varName##Changed) \
public Q_SLOTS: \
QString varName() { return getProperty(p).toString(); } \
void set_##varName(QString value) { setProperty(p, value); } \
Q_SIGNALS: \
void varName##Changed(QString value);
#define READONLY_PROP_ARRAY(p, varName) \
public: \
Q_PROPERTY(QVariantList varName READ varName NOTIFY varName##Changed) \
public Q_SLOTS: \
QVariantList varName() { return getProperty(p).toList(); } \
Q_SIGNALS: \
void varName##Changed(QVariantList value);
#define WRITABLE_PROP_ARRAY(p, varName) \
public: \
Q_PROPERTY(QVariantList varName READ varName WRITE set_##varName NOTIFY varName##Changed) \
public Q_SLOTS: \
QVariantList varName() { return getProperty(p).toList(); } \
void set_##varName(QVariantList value) { setProperty(p, value); } \
Q_SIGNALS: \
void varName##Changed(QVariantList value);
#define READONLY_PROP_MAP(p, varName) \
public: \
Q_PROPERTY(QVariantMap varName READ varName NOTIFY varName##Changed) \
public Q_SLOTS: \
QVariantMap varName() { return getProperty(p).toMap(); } \
Q_SIGNALS: \
void varName##Changed(QVariantMap value);
#define WRITABLE_PROP_MAP(p, varName) \
public: \
Q_PROPERTY(QVariantMap varName READ varName WRITE set_##varName NOTIFY varName##Changed) \
public Q_SLOTS: \
QVariantMap varName() { return getProperty(p).toMap(); } \
void set_##varName(QVariantMap value) { setProperty(p, value); } \
Q_SIGNALS: \
void varName##Changed(QVariantMap value);
// MpvObject() constructor
#define WATCH_PROP_BOOL(p) \
mpv_observe_property(mpv, 0, p, MPV_FORMAT_FLAG);
#define WATCH_PROP_DOUBLE(p) \
mpv_observe_property(mpv, 0, p, MPV_FORMAT_DOUBLE);
#define WATCH_PROP_INT(p) \
mpv_observe_property(mpv, 0, p, MPV_FORMAT_INT64);
#define WATCH_PROP_STRING(p) \
mpv_observe_property(mpv, 0, p, MPV_FORMAT_STRING);
#define WATCH_PROP_ARRAY(p) \
mpv_observe_property(mpv, 0, p, MPV_FORMAT_NODE_ARRAY);
#define WATCH_PROP_MAP(p) \
mpv_observe_property(mpv, 0, p, MPV_FORMAT_NODE_MAP);
// MpvObject::handle_mpv_event()
#define HANDLE_PROP_NONE(p, varName) \
(strcmp(prop->name, p) == 0) { \
int64_t value = 0; \
Q_EMIT varName##Changed(value); \
}
#define HANDLE_PROP_BOOL(p, varName) \
(strcmp(prop->name, p) == 0) { \
bool value = *(bool *)prop->data; \
Q_EMIT varName##Changed(value); \
}
#define HANDLE_PROP_INT(p, varName) \
(strcmp(prop->name, p) == 0) { \
int64_t value = *(int64_t *)prop->data; \
Q_EMIT varName##Changed(value); \
}
#define HANDLE_PROP_DOUBLE(p, varName) \
(strcmp(prop->name, p) == 0) { \
double value = *(double *)prop->data; \
Q_EMIT varName##Changed(value); \
}
#define HANDLE_PROP_STRING(p, varName) \
(strcmp(prop->name, p) == 0) { \
char* charValue = *(char**)prop->data; \
QString value = QString::fromUtf8(charValue); \
Q_EMIT varName##Changed(value); \
}
#define HANDLE_PROP_ARRAY(p, varName) \
(strcmp(prop->name, p) == 0) { \
QVariantList value = getProperty(p).toList(); \
Q_EMIT varName##Changed(value); \
}
#define HANDLE_PROP_MAP(p, varName) \
(strcmp(prop->name, p) == 0) { \
QVariantMap value = getProperty(p).toMap(); \
Q_EMIT varName##Changed(value); \
}

573
src/cpp/mpv/mpvobject.cpp
View file

@ -1,573 +0,0 @@
#include "mpvobject.h"
// std
#include <mpv/render.h>
#include <qdir.h>
#include <qvariant.h>
#include <stdexcept>
#include <clocale>
// Qt
#include <QObject>
#include <QtGlobal>
#include <QOpenGLContext>
#include <QGuiApplication>
#include <QtQuick/QQuickWindow>
#include <QtQuick/QQuickView>
#include <QtQuick/QQuickFramebufferObject>
#include <QtGui/QOpenGLFramebufferObject>
#include <QtX11Extras/QX11Info>
#include <QDebug>
#include <QStandardPaths>
// libmpv
#include <mpv/client.h>
#include <mpv/render_gl.h>
// own
#include "qthelper.hpp"
const QDir writeDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
//--- MpvRenderer
void* MpvRenderer::get_proc_address(void *ctx, const char *name) {
(void)ctx;
QOpenGLContext *glctx = QOpenGLContext::currentContext();
if (!glctx)
return nullptr;
return reinterpret_cast<void *>(glctx->getProcAddress(QByteArray(name)));
}
MpvRenderer::MpvRenderer(const MpvObject *obj)
: obj(obj)
, mpv_gl(nullptr)
{
// https://github.com/mpv-player/mpv/blob/master/libmpv/render_gl.h#L106
#if MPV_CLIENT_API_VERSION >= MPV_MAKE_VERSION(2, 0)
mpv_opengl_init_params gl_init_params{
get_proc_address,
nullptr // get_proc_address_ctx
};
#else
mpv_opengl_init_params gl_init_params{
get_proc_address,
nullptr, // get_proc_address_ctx
nullptr // extra_exts (deprecated)
};
#endif
mpv_render_param display{
MPV_RENDER_PARAM_INVALID,
nullptr
};
if (QX11Info::isPlatformX11()) {
display.type = MPV_RENDER_PARAM_X11_DISPLAY;
display.data = QX11Info::display();
}
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 },
display,
{ MPV_RENDER_PARAM_INVALID, nullptr }
};
if (mpv_render_context_create(&mpv_gl, obj->mpv, params) < 0)
throw std::runtime_error("failed to initialize mpv GL context");
mpv_render_context_set_update_callback(mpv_gl, MpvObject::on_update, (void *)obj);
}
MpvRenderer::~MpvRenderer() {
if (mpv_gl)
mpv_render_context_free(mpv_gl);
// mpv_destroy(obj->mpv);
}
void MpvRenderer::render() {
QOpenGLFramebufferObject *fbo = framebufferObject();
// fbo->bind();
obj->window()->resetOpenGLState();
// https://github.com/mpv-player/mpv/blob/master/libmpv/render_gl.h#L133
mpv_opengl_fbo mpfbo{
.fbo = static_cast<int>(fbo->handle()),
.w = fbo->width(),
.h = fbo->height(),
.internal_format = 0 // 0=unknown
};
mpv_render_param params[] = {
{ MPV_RENDER_PARAM_OPENGL_FBO, &mpfbo },
{ MPV_RENDER_PARAM_INVALID, nullptr }
};
mpv_render_context_render(mpv_gl, params);
obj->window()->resetOpenGLState();
// fbo->release();
}
//--- MpvObject
static void wakeup(void *ctx)
{
QMetaObject::invokeMethod((MpvObject*)ctx, "onMpvEvents", Qt::QueuedConnection);
}
MpvObject::MpvObject(QQuickItem *parent)
: QQuickFramebufferObject(parent)
, m_enableAudio(true)
, m_useHwdec(false)
, m_duration(0)
, m_position(0)
, m_isPlaying(false)
{
mpv = mpv_create();
if (!mpv)
throw std::runtime_error("could not create mpv context");
// these are the terminal messages
// mpv_set_option_string(mpv, "terminal", "yes");
// mpv_set_option_string(mpv, "msg-level", "all=warn,ao/alsa=error");
// mpv_set_option_string(mpv, "msg-level", "all=debug");
//--- Hardware Decoding
mpv::qt::set_option_variant(mpv, "hwdec-codecs", "all");
if (mpv_initialize(mpv) < 0)
throw std::runtime_error("could not initialize mpv context");
mpv::qt::set_option_variant(mpv, "audio-client-name", "mpvz");
mpv_request_log_messages(mpv, "terminal-default");
//--- 60fps Interpolation
mpv::qt::set_option_variant(mpv, "interpolation", "yes");
mpv::qt::set_option_variant(mpv, "video-sync", "display-resample");
// mpv::qt::set_option_variant(mpv, "vf", "lavfi=\"fps=fps=60:round=down\"");
// mpv::qt::set_option_variant(mpv, "override-display-fps", "60");
//--- ytdl 1080p max
mpv::qt::set_option_variant(mpv, "ytdl-format", "ytdl-format=bestvideo[width<=?720]+bestaudio/best");
mpv::qt::set_option_variant(mpv, "quiet", "yes");
// Setup the callback that will make QtQuick update and redraw if there
// is a new video frame. Use a queued connection: this makes sure the
// doUpdate() function is run on the GUI thread.
// * MpvRender binds mpv_gl update function to MpvObject::on_update
// * MpvObject::on_update will emit MpvObject::mpvUpdated
connect(this, &MpvObject::mpvUpdated,
this, &MpvObject::doUpdate,
Qt::QueuedConnection);
WATCH_PROP_BOOL("idle-active")
WATCH_PROP_BOOL("mute")
WATCH_PROP_BOOL("pause")
WATCH_PROP_BOOL("paused-for-cache")
WATCH_PROP_BOOL("seekable")
WATCH_PROP_INT("chapter")
WATCH_PROP_INT("chapter-list/count")
WATCH_PROP_INT("decoder-frame-drop-count")
WATCH_PROP_INT("dheight")
WATCH_PROP_INT("dwidth")
WATCH_PROP_INT("estimated-frame-count")
WATCH_PROP_INT("estimated-frame-number")
WATCH_PROP_INT("frame-drop-count")
WATCH_PROP_INT("playlist-pos")
WATCH_PROP_INT("playlist/count")
WATCH_PROP_INT("vo-delayed-frame-count")
WATCH_PROP_INT("volume")
WATCH_PROP_INT("vid")
WATCH_PROP_INT("aid")
WATCH_PROP_INT("sid")
WATCH_PROP_INT("audio-params/channel-count")
WATCH_PROP_INT("audio-params/samplerate")
WATCH_PROP_INT("track-list/count")
WATCH_PROP_INT("contrast")
WATCH_PROP_INT("brightness")
WATCH_PROP_INT("gamma")
WATCH_PROP_INT("saturation")
WATCH_PROP_INT("sub-margin-y")
WATCH_PROP_DOUBLE("audio-bitrate")
WATCH_PROP_DOUBLE("avsync")
WATCH_PROP_DOUBLE("container-fps")
WATCH_PROP_DOUBLE("demuxer-cache-duration")
WATCH_PROP_DOUBLE("display-fps")
WATCH_PROP_DOUBLE("duration")
WATCH_PROP_DOUBLE("estimated-display-fps")
WATCH_PROP_DOUBLE("estimated-vf-fps")
WATCH_PROP_DOUBLE("fps")
WATCH_PROP_DOUBLE("speed")
WATCH_PROP_DOUBLE("time-pos")
WATCH_PROP_DOUBLE("video-bitrate")
WATCH_PROP_DOUBLE("video-params/aspect")
WATCH_PROP_DOUBLE("video-out-params/aspect")
WATCH_PROP_DOUBLE("window-scale")
WATCH_PROP_DOUBLE("current-window-scale")
WATCH_PROP_STRING("audio-codec")
WATCH_PROP_STRING("audio-codec-name")
WATCH_PROP_STRING("audio-params/format")
WATCH_PROP_STRING("filename")
WATCH_PROP_STRING("file-format")
WATCH_PROP_STRING("file-size")
WATCH_PROP_STRING("audio-format")
WATCH_PROP_STRING("hwdec")
WATCH_PROP_STRING("hwdec-current")
WATCH_PROP_STRING("hwdec-interop")
WATCH_PROP_STRING("loop")
WATCH_PROP_STRING("media-title")
WATCH_PROP_STRING("path")
WATCH_PROP_STRING("video-codec")
WATCH_PROP_STRING("video-format")
WATCH_PROP_STRING("video-params/pixelformat")
WATCH_PROP_STRING("video-out-params/pixelformat")
WATCH_PROP_STRING("ytdl-format")
WATCH_PROP_MAP("demuxer-cache-state")
connect(this, &MpvObject::idleActiveChanged,
this, &MpvObject::updateState);
connect(this, &MpvObject::pausedChanged,
this, &MpvObject::updateState);
mpv_set_wakeup_callback(mpv, wakeup, this);
}
MpvObject::~MpvObject()
{
// quit();
}
QQuickFramebufferObject::Renderer *MpvObject::createRenderer() const
{
window()->setPersistentOpenGLContext(true);
window()->setPersistentSceneGraph(true);
return new MpvRenderer(this);
}
void MpvObject::on_update(void *ctx)
{
MpvObject *self = (MpvObject *)ctx;
emit self->mpvUpdated();
}
// connected to mpvUpdated(); signal makes sure it runs on the GUI thread
void MpvObject::doUpdate()
{
update();
}
void MpvObject::command(const QVariant& params)
{
// qDebug() << params;
mpv::qt::command(mpv, params);
}
void MpvObject::commandAsync(const QVariant& params)
{
// qDebug() << params;
mpv::qt::command_async(mpv, params);
}
void MpvObject::setProperty(const QString& name, const QVariant& value)
{
mpv::qt::set_property_variant(mpv, name, value);
}
QVariant MpvObject::getProperty(const QString &name) const
{
return mpv::qt::get_property_variant(mpv, name);
}
void MpvObject::setOption(const QString& name, const QVariant& value)
{
mpv::qt::set_option_variant(mpv, name, value);
}
void MpvObject::onMpvEvents()
{
// Process all events, until the event queue is empty.
while (mpv) {
mpv_event *event = mpv_wait_event(mpv, 0);
if (event->event_id == MPV_EVENT_NONE) {
break;
}
handle_mpv_event(event);
}
}
void MpvObject::logPropChange(mpv_event_property *prop)
{
switch (prop->format) {
case MPV_FORMAT_NONE:
qDebug() << objectName() << "none" << prop->name << 0;
break;
case MPV_FORMAT_STRING:
qDebug() << objectName() << "str " << prop->name << *(char**)prop->data;
break;
case MPV_FORMAT_FLAG:
qDebug() << objectName() << "bool" << prop->name << *(bool *)prop->data;
break;
case MPV_FORMAT_INT64:
qDebug() << objectName() << "int " << prop->name << *(int64_t *)prop->data;
break;
case MPV_FORMAT_DOUBLE:
qDebug() << objectName() << "doub" << prop->name << *(double *)prop->data;
break;
case MPV_FORMAT_NODE_ARRAY:
qDebug() << objectName() << "arr " << prop->name; // TODO
break;
case MPV_FORMAT_NODE_MAP:
qDebug() << objectName() << "map " << prop->name; // TODO
break;
default:
qDebug() << objectName() << "prop(format=" << prop->format << ")" << prop->name;
break;
}
}
void MpvObject::handle_mpv_event(mpv_event *event)
{
// See: https://github.com/mpv-player/mpv/blob/master/libmpv/client.h
// See: https://github.com/mpv-player/mpv/blob/master/player/lua.c#L471
switch (event->event_id) {
case MPV_EVENT_SHUTDOWN: {
mpv_destroy(mpv);
break;
}
case MPV_EVENT_LOG_MESSAGE: {
mpv_event_log_message *logData = (mpv_event_log_message *)event->data;
Q_EMIT logMessage(
QString(logData->prefix),
QString(logData->level),
QString(logData->text)
);
break;
}
case MPV_EVENT_START_FILE: {
Q_EMIT fileStarted();
break;
}
case MPV_EVENT_END_FILE: {
mpv_event_end_file *eef = (mpv_event_end_file *)event->data;
const char *reason;
switch (eef->reason) {
case MPV_END_FILE_REASON_EOF: reason = "eof"; break;
case MPV_END_FILE_REASON_STOP: reason = "stop"; break;
case MPV_END_FILE_REASON_QUIT: reason = "quit"; break;
case MPV_END_FILE_REASON_ERROR: reason = "error"; break;
case MPV_END_FILE_REASON_REDIRECT: reason = "redirect"; break;
default:
reason = "unknown";
}
Q_EMIT fileEnded(QString(reason));
break;
}
case MPV_EVENT_FILE_LOADED: {
Q_EMIT fileLoaded();
break;
}
case MPV_EVENT_PROPERTY_CHANGE: {
mpv_event_property *prop = (mpv_event_property *)event->data;
// logPropChange(prop);
if (prop->format == MPV_FORMAT_NONE) {
if HANDLE_PROP_NONE("vid", vid)
else if HANDLE_PROP_NONE("aid", aid)
else if HANDLE_PROP_NONE("sid", sid)
else if HANDLE_PROP_NONE("track-list/count", trackListCount)
} else if (prop->format == MPV_FORMAT_DOUBLE) {
if (strcmp(prop->name, "time-pos") == 0) {
double time = *(double *)prop->data;
m_position = time;
Q_EMIT positionChanged(time);
} else if (strcmp(prop->name, "duration") == 0) {
double time = *(double *)prop->data;
m_duration = time;
Q_EMIT durationChanged(time);
}
else if HANDLE_PROP_DOUBLE("audio-bitrate", audioBitrate)
else if HANDLE_PROP_DOUBLE("avsync", avsync)
else if HANDLE_PROP_DOUBLE("container-fps", containerFps)
else if HANDLE_PROP_DOUBLE("demuxer-cache-duration", demuxerCacheDuration)
else if HANDLE_PROP_DOUBLE("display-fps", displayFps)
else if HANDLE_PROP_DOUBLE("estimated-display-fps", estimatedDisplayFps)
else if HANDLE_PROP_DOUBLE("estimated-vf-fps", estimatedVfFps)
else if HANDLE_PROP_DOUBLE("fps", fps)
else if HANDLE_PROP_DOUBLE("speed", speed)
else if HANDLE_PROP_DOUBLE("video-bitrate", videoBitrate)
else if HANDLE_PROP_DOUBLE("video-params/aspect", videoParamsAspect)
else if HANDLE_PROP_DOUBLE("video-out-params/aspect", videoOutParamsAspect)
else if HANDLE_PROP_DOUBLE("window-scale", windowScale)
else if HANDLE_PROP_DOUBLE("current-window-scale", currentWindowScale)
} else if (prop->format == MPV_FORMAT_FLAG) {
if HANDLE_PROP_BOOL("idle-active", idleActive)
else if HANDLE_PROP_BOOL("mute", muted)
else if HANDLE_PROP_BOOL("pause", paused)
else if HANDLE_PROP_BOOL("paused-for-cache", pausedForCache)
else if HANDLE_PROP_BOOL("seekable", seekable)
} else if (prop->format == MPV_FORMAT_STRING) {
if HANDLE_PROP_STRING("audio-codec", audioCodec)
else if HANDLE_PROP_STRING("audio-codec-name", audioCodecName)
else if HANDLE_PROP_STRING("audio-params/format", audioParamsFormat)
else if HANDLE_PROP_STRING("filename", filename)
else if HANDLE_PROP_STRING("file-format", fileFormat)
else if HANDLE_PROP_STRING("file-size", fileSize)
else if HANDLE_PROP_STRING("audio-format", audioFormat)
else if HANDLE_PROP_STRING("hwdec", hwdec)
else if HANDLE_PROP_STRING("hwdec-current", hwdecCurrent)
else if HANDLE_PROP_STRING("hwdec-interop", hwdecInterop)
else if HANDLE_PROP_STRING("loop", loop)
else if HANDLE_PROP_STRING("media-title", mediaTitle)
else if HANDLE_PROP_STRING("path", path)
else if HANDLE_PROP_STRING("video-codec", videoCodec)
else if HANDLE_PROP_STRING("video-format", videoFormat)
else if HANDLE_PROP_STRING("video-params/pixelformat", videoParamsPixelformat)
else if HANDLE_PROP_STRING("video-out-params/pixelformat", videoOutParamsPixelformat)
else if HANDLE_PROP_STRING("ytdl-format", ytdlFormat)
} else if (prop->format == MPV_FORMAT_INT64) {
if HANDLE_PROP_INT("chapter", chapter)
else if HANDLE_PROP_INT("chapter-list/count", chapterListCount)
else if HANDLE_PROP_INT("decoder-frame-drop-count", decoderFrameDropCount)
else if HANDLE_PROP_INT("dwidth", dwidth)
else if HANDLE_PROP_INT("dheight", dheight)
else if HANDLE_PROP_INT("estimated-frame-count", estimatedFrameCount)
else if HANDLE_PROP_INT("estimated-frame-number", estimatedFrameNumber)
else if HANDLE_PROP_INT("frame-drop-count", frameDropCount)
else if HANDLE_PROP_INT("playlist-pos", playlistPos)
else if HANDLE_PROP_INT("playlist/count", playlistCount)
else if HANDLE_PROP_INT("vo-delayed-frame-count", voDelayedFrameCount)
else if HANDLE_PROP_INT("volume", volume)
else if HANDLE_PROP_INT("vid", vid)
else if HANDLE_PROP_INT("aid", aid)
else if HANDLE_PROP_INT("sid", sid)
else if HANDLE_PROP_INT("audio-params/channel-count", audioParamsChannelCount)
else if HANDLE_PROP_INT("audio-params/samplerate", audioParamsSampleRate)
else if HANDLE_PROP_INT("track-list/count", trackListCount)
else if HANDLE_PROP_INT("contrast", contrast)
else if HANDLE_PROP_INT("brightness", brightness)
else if HANDLE_PROP_INT("gamma", gamma)
else if HANDLE_PROP_INT("saturation", saturation)
else if HANDLE_PROP_INT("sub-margin-y", subMarginY)
} else if (prop->format == MPV_FORMAT_NODE_MAP) {
if HANDLE_PROP_MAP("demuxer-cache-state", demuxerCacheState)
}
break;
}
default: ;
// Ignore uninteresting or unknown events.
}
}
void MpvObject::play()
{
// qDebug() << "play";
if (idleActive() && playlistCount() >= 1) { // File has finished playing.
// qDebug() << "\treload";
set_playlistPos(playlistPos()); // Reload and play file again.
}
if (!isPlaying()) {
// qDebug() << "\t!isPlaying";
set_paused(false);
}
}
void MpvObject::pause()
{
// qDebug() << "pause";
if (isPlaying()) {
qDebug() << "!isPlaying";
set_paused(true);
}
}
void MpvObject::playPause()
{
if (isPlaying()) {
pause();
} else {
play();
}
}
void MpvObject::stop()
{
command(QVariantList() << "stop");
}
void MpvObject::quit()
{
command(QVariantList() << "quit");
qDebug() << "We quit mpv";
}
void MpvObject::stepBackward()
{
command(QVariantList() << "frame-back-step");
}
void MpvObject::stepForward()
{
command(QVariantList() << "frame-step");
}
void MpvObject::seek(double pos)
{
qDebug() << "seek" << pos << m_duration;
pos = qMax(0.0, qMin(pos, m_duration));
qDebug() << "seek" << pos;
command(QVariantList() << "seek" << pos << "absolute");
}
void MpvObject::loadFile(QVariant urls)
{
qDebug() << "Url being loaded: " << urls;
command(QVariantList() << "loadfile" << urls);
}
void MpvObject::screenshotToFile(QString file) {
command(QVariantList() << "show-progress");
command(QVariantList() << "screenshot-to-file" << file << "video");
command(QVariantList() << "show-progress");
qDebug() << "screenshot-to-file" << file << "video";
qDebug() << "screenshot made: " << file;
quit();
}
void MpvObject::subAdd(QVariant urls)
{
command(QVariantList() << "sub-add" << urls);
}
void MpvObject::subRemove()
{
command(QVariantList() << "sub-remove");
}
void MpvObject::updateState()
{
bool isNowPlaying = !idleActive() && !paused();
if (m_isPlaying != isNowPlaying) {
m_isPlaying = isNowPlaying;
emit isPlayingChanged(m_isPlaying);
}
}

206
src/cpp/mpv/mpvobject.h
View file

@ -1,206 +0,0 @@
#pragma once
#include "mpvhelpers.h"
// Qt
#include <QtQuick/QQuickItem>
#include <QtQuick/QQuickFramebufferObject>
// libmpv
#include <mpv/client.h>
#include <mpv/render_gl.h>
// own
#include "qthelper.hpp"
class MpvObject;
class MpvRenderer;
class MpvRenderer : public QQuickFramebufferObject::Renderer
{
static void* get_proc_address(void *ctx, const char *name);
public:
MpvRenderer(const MpvObject *obj);
virtual ~MpvRenderer();
void render();
private:
const MpvObject *obj;
mpv_render_context *mpv_gl;
};
class MpvObject : public QQuickFramebufferObject
{
Q_OBJECT
friend class MpvRenderer;
Q_PROPERTY(bool enableAudio READ enableAudio WRITE setEnableAudio NOTIFY enableAudioChanged)
Q_PROPERTY(bool useHwdec READ useHwdec WRITE setUseHwdec NOTIFY useHwdecChanged)
READONLY_PROP_BOOL("idle-active", idleActive)
WRITABLE_PROP_BOOL("mute", muted)
WRITABLE_PROP_BOOL("pause", paused)
READONLY_PROP_BOOL("paused-for-cache", pausedForCache)
READONLY_PROP_BOOL("seekable", seekable)
READONLY_PROP_INT("chapter", chapter)
READONLY_PROP_INT("chapter-list/count", chapterListCount) // OR "chapters"
READONLY_PROP_INT("decoder-frame-drop-count", decoderFrameDropCount)
READONLY_PROP_INT("dheight", dheight)
READONLY_PROP_INT("dwidth", dwidth)
READONLY_PROP_INT("estimated-frame-count", estimatedFrameCount)
READONLY_PROP_INT("estimated-frame-number", estimatedFrameNumber)
READONLY_PROP_INT("frame-drop-count", frameDropCount)
WRITABLE_PROP_INT("playlist-pos", playlistPos)
READONLY_PROP_INT("playlist/count", playlistCount)
WRITABLE_PROP_INT("vo-delayed-frame-count", voDelayedFrameCount)
WRITABLE_PROP_INT("volume", volume)
WRITABLE_PROP_INT("contrast", contrast)
WRITABLE_PROP_INT("brightness", brightness)
WRITABLE_PROP_INT("gamma", gamma)
WRITABLE_PROP_INT("saturation", saturation)
WRITABLE_PROP_INT("sub-margin-y", subMarginY)
READONLY_PROP_INT("vid", vid)
READONLY_PROP_INT("aid", aid)
READONLY_PROP_INT("sid", sid)
READONLY_PROP_INT("audio-params/channel-count", audioParamsChannelCount)
READONLY_PROP_INT("audio-params/samplerate", audioParamsSampleRate)
READONLY_PROP_INT("track-list/count", trackListCount)
READONLY_PROP_DOUBLE("audio-bitrate", audioBitrate)
READONLY_PROP_DOUBLE("avsync", avsync)
READONLY_PROP_DOUBLE("container-fps", containerFps)
READONLY_PROP_DOUBLE("demuxer-cache-duration", demuxerCacheDuration)
READONLY_PROP_DOUBLE("display-fps", displayFps)
READONLY_PROP_DOUBLE("estimated-display-fps", estimatedDisplayFps)
READONLY_PROP_DOUBLE("estimated-vf-fps", estimatedVfFps)
READONLY_PROP_DOUBLE("fps", fps) // Deprecated, use "container-fps"
WRITABLE_PROP_DOUBLE("speed", speed)
READONLY_PROP_DOUBLE("video-bitrate", videoBitrate)
READONLY_PROP_DOUBLE("video-params/aspect", videoParamsAspect)
READONLY_PROP_DOUBLE("video-out-params/aspect", videoOutParamsAspect)
WRITABLE_PROP_DOUBLE("window-scale", windowScale)
READONLY_PROP_DOUBLE("current-window-scale", currentWindowScale)
READONLY_PROP_STRING("audio-params/format", audioParamsFormat)
READONLY_PROP_STRING("audio-codec", audioCodec)
READONLY_PROP_STRING("audio-codec-name", audioCodecName)
READONLY_PROP_STRING("filename", filename)
READONLY_PROP_STRING("file-format", fileFormat)
READONLY_PROP_STRING("file-size", fileSize)
READONLY_PROP_STRING("audio-format", audioFormat)
WRITABLE_PROP_STRING("hwdec", hwdec)
READONLY_PROP_STRING("hwdec-current", hwdecCurrent)
READONLY_PROP_STRING("hwdec-interop", hwdecInterop)
WRITABLE_PROP_STRING("loop", loop)
READONLY_PROP_STRING("media-title", mediaTitle)
READONLY_PROP_STRING("path", path)
READONLY_PROP_STRING("video-codec", videoCodec)
READONLY_PROP_STRING("video-format", videoFormat)
READONLY_PROP_STRING("video-params/pixelformat", videoParamsPixelformat)
READONLY_PROP_STRING("video-out-params/pixelformat", videoOutParamsPixelformat)
READONLY_PROP_STRING("ytdl-format", ytdlFormat)
READONLY_PROP_MAP("demuxer-cache-state", demuxerCacheState)
public:
Q_PROPERTY(bool isPlaying READ isPlaying NOTIFY isPlayingChanged)
Q_PROPERTY(double duration READ duration NOTIFY durationChanged)
Q_PROPERTY(double position READ position NOTIFY positionChanged)
public:
MpvObject(QQuickItem *parent = nullptr);
virtual ~MpvObject();
virtual Renderer *createRenderer() const;
Q_INVOKABLE void setProperty(const QString& name, const QVariant& value);
Q_INVOKABLE QVariant getProperty(const QString& name) const;
Q_INVOKABLE void setOption(const QString& name, const QVariant& value);
Q_INVOKABLE QString getPlaylistFilename(int playlistIndex) const { return getProperty(QString("playlist/%1/filename").arg(playlistIndex)).toString(); }
Q_INVOKABLE QString getPlaylistTitle(int playlistIndex) const { return getProperty(QString("playlist/%1/title").arg(playlistIndex)).toString(); }
Q_INVOKABLE QString getChapterTitle(int chapterIndex) const { return getProperty(QString("chapter-list/%1/title").arg(chapterIndex)).toString(); }
Q_INVOKABLE double getChapterTime(int chapterIndex) const { return getProperty(QString("chapter-list/%1/time").arg(chapterIndex)).toDouble(); }
public slots:
void command(const QVariant& params);
void commandAsync(const QVariant& params);
void playPause();
void play();
void pause();
void stop();
void quit();
void stepBackward();
void stepForward();
void seek(double pos);
void loadFile(QVariant urls);
void screenshotToFile(QString file);
void subAdd(QVariant urls);
void subRemove();
bool enableAudio() const { return m_enableAudio; }
void setEnableAudio(bool value) {
if (m_enableAudio != value) {
m_enableAudio = value;
Q_EMIT enableAudioChanged(value);
}
if (!m_enableAudio) {
mpv::qt::set_option_variant(mpv, "ao", "null");
}
}
bool useHwdec() const { return m_useHwdec; }
void setUseHwdec(bool value) {
if (m_useHwdec != value) {
m_useHwdec = value;
if (m_useHwdec) {
mpv::qt::set_option_variant(mpv, "hwdec", "auto-copy");
} else {
mpv::qt::set_option_variant(mpv, "hwdec", "no");
}
Q_EMIT useHwdecChanged(value);
}
}
bool isPlaying() const { return m_isPlaying; }
void updateState();
double duration() const { return m_duration; }
double position() const { return m_position; }
signals:
void enableAudioChanged(bool value);
void useHwdecChanged(bool value);
void isPlayingChanged(bool value);
void durationChanged(double value); // Unit: seconds
void positionChanged(double value); // Unit: seconds
void mpvUpdated();
void logMessage(QString prefix, QString level, QString text);
void fileStarted();
void fileEnded(QString reason);
void fileLoaded();
private slots:
void onMpvEvents();
void doUpdate();
protected:
mpv_handle *mpv;
private:
void logPropChange(mpv_event_property *prop);
void handle_mpv_event(mpv_event *event);
static void on_update(void *ctx);
bool m_enableAudio;
bool m_useHwdec;
double m_duration;
double m_position;
bool m_isPlaying;
};

370
src/cpp/mpv/qthelper.hpp
View file

@ -1,370 +0,0 @@
#pragma once
// libmpv
#include <mpv/client.h>
// std
#include <cstring>
// Qt
#include <QVariant>
#include <QString>
#include <QList>
#include <QHash>
#include <QSharedPointer>
#include <QMetaType>
namespace mpv {
namespace qt {
// Wrapper around mpv_handle. Does refcounting under the hood.
class Handle
{
struct container {
container(mpv_handle *h) : mpv(h) {}
~container() { mpv_terminate_destroy(mpv); }
mpv_handle *mpv;
};
QSharedPointer<container> sptr;
public:
// Construct a new Handle from a raw mpv_handle with refcount 1. If the
// last Handle goes out of scope, the mpv_handle will be destroyed with
// mpv_terminate_destroy().
// Never destroy the mpv_handle manually when using this wrapper. You
// will create dangling pointers. Just let the wrapper take care of
// destroying the mpv_handle.
// Never create multiple wrappers from the same raw mpv_handle; copy the
// wrapper instead (that's what it's for).
static Handle FromRawHandle(mpv_handle *handle) {
Handle h;
h.sptr = QSharedPointer<container>(new container(handle));
return h;
}
// Return the raw handle; for use with the libmpv C API.
operator mpv_handle*() const { return sptr ? (*sptr).mpv : 0; }
};
static inline QVariant node_to_variant(const mpv_node *node)
{
switch (node->format) {
case MPV_FORMAT_STRING:
return QVariant(QString::fromUtf8(node->u.string));
case MPV_FORMAT_FLAG:
return QVariant(static_cast<bool>(node->u.flag));
case MPV_FORMAT_INT64:
return QVariant(static_cast<qlonglong>(node->u.int64));
case MPV_FORMAT_DOUBLE:
return QVariant(node->u.double_);
case MPV_FORMAT_NODE_ARRAY: {
mpv_node_list *list = node->u.list;
QVariantList qlist;
for (int n = 0; n < list->num; n++)
qlist.append(node_to_variant(&list->values[n]));
return QVariant(qlist);
}
case MPV_FORMAT_NODE_MAP: {
mpv_node_list *list = node->u.list;
QVariantMap qmap;
for (int n = 0; n < list->num; n++) {
qmap.insert(QString::fromUtf8(list->keys[n]),
node_to_variant(&list->values[n]));
}
return QVariant(qmap);
}
default: // MPV_FORMAT_NONE, unknown values (e.g. future extensions)
return QVariant();
}
}
struct node_builder {
node_builder(const QVariant& v) {
set(&node_, v);
}
~node_builder() {
free_node(&node_);
}
mpv_node *node() { return &node_; }
private:
Q_DISABLE_COPY(node_builder)
mpv_node node_;
mpv_node_list *create_list(mpv_node *dst, bool is_map, int num) {
dst->format = is_map ? MPV_FORMAT_NODE_MAP : MPV_FORMAT_NODE_ARRAY;
mpv_node_list *list = new mpv_node_list();
dst->u.list = list;
if (!list)
goto err;
list->values = new mpv_node[num]();
if (!list->values)
goto err;
if (is_map) {
list->keys = new char*[num]();
if (!list->keys)
goto err;
}
return list;
err:
free_node(dst);
return NULL;
}
char *dup_qstring(const QString &s) {
QByteArray b = s.toUtf8();
char *r = new char[b.size() + 1];
if (r)
std::memcpy(r, b.data(), b.size() + 1);
return r;
}
bool test_type(const QVariant &v, QMetaType::Type t) {
// The Qt docs say: "Although this function is declared as returning
// "QVariant::Type(obsolete), the return value should be interpreted
// as QMetaType::Type."
// So a cast really seems to be needed to avoid warnings (urgh).
return static_cast<int>(v.type()) == static_cast<int>(t);
}
void set(mpv_node *dst, const QVariant &src) {
if (test_type(src, QMetaType::QString)) {
dst->format = MPV_FORMAT_STRING;
dst->u.string = dup_qstring(src.toString());
if (!dst->u.string)
goto fail;
} else if (test_type(src, QMetaType::Bool)) {
dst->format = MPV_FORMAT_FLAG;
dst->u.flag = src.toBool() ? 1 : 0;
} else if (test_type(src, QMetaType::Int) ||
test_type(src, QMetaType::LongLong) ||
test_type(src, QMetaType::UInt) ||
test_type(src, QMetaType::ULongLong))
{
dst->format = MPV_FORMAT_INT64;
dst->u.int64 = src.toLongLong();
} else if (test_type(src, QMetaType::Double)) {
dst->format = MPV_FORMAT_DOUBLE;
dst->u.double_ = src.toDouble();
} else if (src.canConvert<QVariantList>()) {
QVariantList qlist = src.toList();
mpv_node_list *list = create_list(dst, false, qlist.size());
if (!list)
goto fail;
list->num = qlist.size();
for (int n = 0; n < qlist.size(); n++)
set(&list->values[n], qlist[n]);
} else if (src.canConvert<QVariantMap>()) {
QVariantMap qmap = src.toMap();
mpv_node_list *list = create_list(dst, true, qmap.size());
if (!list)
goto fail;
list->num = qmap.size();
for (int n = 0; n < qmap.size(); n++) {
list->keys[n] = dup_qstring(qmap.keys()[n]);
if (!list->keys[n]) {
free_node(dst);
goto fail;
}
set(&list->values[n], qmap.values()[n]);
}
} else {
goto fail;
}
return;
fail:
dst->format = MPV_FORMAT_NONE;
}
void free_node(mpv_node *dst) {
switch (dst->format) {
case MPV_FORMAT_STRING:
delete[] dst->u.string;
break;
case MPV_FORMAT_NODE_ARRAY:
case MPV_FORMAT_NODE_MAP: {
mpv_node_list *list = dst->u.list;
if (list) {
for (int n = 0; n < list->num; n++) {
if (list->keys)
delete[] list->keys[n];
if (list->values)
free_node(&list->values[n]);
}
delete[] list->keys;
delete[] list->values;
}
delete list;
break;
}
default: ;
}
dst->format = MPV_FORMAT_NONE;
}
};
/**
* RAII wrapper that calls mpv_free_node_contents() on the pointer.
*/
struct node_autofree {
mpv_node *ptr;
node_autofree(mpv_node *a_ptr) : ptr(a_ptr) {}
~node_autofree() { mpv_free_node_contents(ptr); }
};
/**
* Return the given property as mpv_node converted to QVariant, or QVariant()
* on error.
*
* @deprecated use get_property() instead
*
* @param name the property name
*/
static inline QVariant get_property_variant(mpv_handle *ctx, const QString &name)
{
mpv_node node;
if (mpv_get_property(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, &node) < 0)
return QVariant();
node_autofree f(&node);
return node_to_variant(&node);
}
/**
* Set the given property as mpv_node converted from the QVariant argument.
* @deprecated use set_property() instead
*/
static inline int set_property_variant(mpv_handle *ctx, const QString &name,
const QVariant &v)
{
node_builder node(v);
return mpv_set_property(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, node.node());
}
/**
* Set the given option as mpv_node converted from the QVariant argument.
*
* @deprecated use set_property() instead
*/
static inline int set_option_variant(mpv_handle *ctx, const QString &name,
const QVariant &v)
{
node_builder node(v);
return mpv_set_option(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, node.node());
}
/**
* mpv_command_node() equivalent. Returns QVariant() on error (and
* unfortunately, the same on success).
*
* @deprecated use command() instead
*/
static inline QVariant command_variant(mpv_handle *ctx, const QVariant &args)
{
node_builder node(args);
mpv_node res;
if (mpv_command_node(ctx, node.node(), &res) < 0)
return QVariant();
node_autofree f(&res);
return node_to_variant(&res);
}
/**
* This is used to return error codes wrapped in QVariant for functions which
* return QVariant.
*
* You can use get_error() or is_error() to extract the error status from a
* QVariant value.
*/
struct ErrorReturn
{
/**
* enum mpv_error value (or a value outside of it if ABI was extended)
*/
int error;
ErrorReturn() : error(0) {}
explicit ErrorReturn(int err) : error(err) {}
};
/**
* Return the mpv error code packed into a QVariant, or 0 (success) if it's not
* an error value.
*
* @return error code (<0) or success (>=0)
*/
static inline int get_error(const QVariant &v)
{
if (!v.canConvert<ErrorReturn>())
return 0;
return v.value<ErrorReturn>().error;
}
/**
* Return whether the QVariant carries a mpv error code.
*/
static inline bool is_error(const QVariant &v)
{
return get_error(v) < 0;
}
/**
* Return the given property as mpv_node converted to QVariant, or QVariant()
* on error.
*
* @param name the property name
* @return the property value, or an ErrorReturn with the error code
*/
static inline QVariant get_property(mpv_handle *ctx, const QString &name)
{
mpv_node node;
int err = mpv_get_property(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, &node);
if (err < 0)
return QVariant::fromValue(ErrorReturn(err));
node_autofree f(&node);
return node_to_variant(&node);
}
/**
* Set the given property as mpv_node converted from the QVariant argument.
*
* @return mpv error code (<0 on error, >= 0 on success)
*/
static inline int set_property(mpv_handle *ctx, const QString &name,
const QVariant &v)
{
node_builder node(v);
return mpv_set_property(ctx, name.toUtf8().data(), MPV_FORMAT_NODE, node.node());
}
/**
* mpv_command_node() equivalent.
*
* @param args command arguments, with args[0] being the command name as string
* @return the property value, or an ErrorReturn with the error code
*/
static inline QVariant command(mpv_handle *ctx, const QVariant &args)
{
node_builder node(args);
mpv_node res;
int err = mpv_command_node(ctx, node.node(), &res);
if (err < 0)
return QVariant::fromValue(ErrorReturn(err));
node_autofree f(&res);
return node_to_variant(&res);
}
/**
* mpv_command_node_async() equivalent.
*
* @param args command arguments, with args[0] being the command name as string
* @return empty QVariant, or an ErrorReturn with the error code
*/
static inline QVariant command_async(mpv_handle *ctx, const QVariant &args)
{
node_builder node(args);
quint64 replyUserdata = 0; // TODO: Bomi casted args[0] to int. Bomi's args was a QByteArray however.
int err = mpv_command_node_async(ctx, replyUserdata, node.node());
if (err < 0)
return QVariant::fromValue(ErrorReturn(err));
// TODO: Return unique replyUserdata so the app can wait for
// the result in an MPV_EVENT_COMMAND_REPLY event.
return QVariant();
}
}
}
Q_DECLARE_METATYPE(mpv::qt::ErrorReturn)

380
src/cpp/serviceitemmodel.cpp
View file

@ -6,11 +6,11 @@
#include <qglobal.h> #include <qglobal.h>
#include <qnamespace.h> #include <qnamespace.h>
#include <qvariant.h> #include <qvariant.h>
#include <ktar.h> // #include <ktar.h>
#include <KCompressionDevice> // #include <KCompressionDevice>
#include <KArchiveDirectory> // #include <KArchiveDirectory>
#include <KArchiveFile> // #include <KArchiveFile>
#include <KArchiveEntry> // #include <KArchiveEntry>
#include <QDebug> #include <QDebug>
#include <QJsonArray> #include <QJsonArray>
#include <QJsonObject> #include <QJsonObject>
@ -544,241 +544,241 @@ bool ServiceItemModelCpp::deactivate(int id) {
return true; return true;
} }
bool ServiceItemModelCpp::save(QUrl file) { // bool ServiceItemModelCpp::save(QUrl file) {
qDebug() << "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"; // qDebug() << "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@";
qDebug() << "Saving..."; // qDebug() << "Saving...";
qDebug() << "File path is: " << file.toString(); // qDebug() << "File path is: " << file.toString();
qDebug() << "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"; // qDebug() << "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@";
//first we'll get a json representation of our serviceList // //first we'll get a json representation of our serviceList
//save that to a temp file in case we need it but also convert // //save that to a temp file in case we need it but also convert
//it to a byte array just before putting it into the archive // //it to a byte array just before putting it into the archive
QJsonArray jsonData; // QJsonArray jsonData;
// save all the data and files in jsonData as just the base name // // save all the data and files in jsonData as just the base name
// so that they are properly mapped in the resulting archive // // so that they are properly mapped in the resulting archive
for (int i = 0; i < m_items.length(); i++) { // for (int i = 0; i < m_items.length(); i++) {
// qDebug() << serviceList[i]; // // qDebug() << serviceList[i];
QMap<QString, QVariant> item; // QMap<QString, QVariant> item;
qDebug() << m_items[i]->name(); // qDebug() << m_items[i]->name();
item.insert("name", m_items[i]->name()); // item.insert("name", m_items[i]->name());
item.insert("background", m_items[i]->background()); // item.insert("background", m_items[i]->background());
item.insert("backgroundType", m_items[i]->backgroundType()); // item.insert("backgroundType", m_items[i]->backgroundType());
item.insert("audio", m_items[i]->audio()); // item.insert("audio", m_items[i]->audio());
item.insert("font", m_items[i]->font()); // item.insert("font", m_items[i]->font());
item.insert("fontSize", m_items[i]->fontSize()); // item.insert("fontSize", m_items[i]->fontSize());
item.insert("slideNumber", m_items[i]->slideNumber()); // item.insert("slideNumber", m_items[i]->slideNumber());
item.insert("text", m_items[i]->text()); // item.insert("text", m_items[i]->text());
item.insert("type", m_items[i]->type()); // item.insert("type", m_items[i]->type());
item.insert("loop", m_items[i]->loop()); // item.insert("loop", m_items[i]->loop());
qDebug() << "AUDIO IS: " << item.value("audio").toString(); // qDebug() << "AUDIO IS: " << item.value("audio").toString();
QFileInfo audioFile = item.value("audio").toString(); // QFileInfo audioFile = item.value("audio").toString();
qDebug() << audioFile.fileName(); // qDebug() << audioFile.fileName();
item["flatAudio"] = audioFile.fileName(); // item["flatAudio"] = audioFile.fileName();
qDebug() << "AUDIO IS NOW: " << item.value("audio").toString(); // qDebug() << "AUDIO IS NOW: " << item.value("audio").toString();
QFileInfo backgroundFile = item.value("background").toString(); // QFileInfo backgroundFile = item.value("background").toString();
item["flatBackground"] = backgroundFile.fileName(); // item["flatBackground"] = backgroundFile.fileName();
qDebug() << "BACKGRUOND IS: " << item.value("background").toString(); // qDebug() << "BACKGRUOND IS: " << item.value("background").toString();
// qDebug() << serviceList[i].value(); // // qDebug() << serviceList[i].value();
QJsonObject obj = QJsonObject::fromVariantMap(item); // QJsonObject obj = QJsonObject::fromVariantMap(item);
qDebug() << obj; // qDebug() << obj;
jsonData.insert(i, obj); // jsonData.insert(i, obj);
} // }
qDebug() << jsonData; // qDebug() << jsonData;
QJsonDocument jsonText(jsonData); // QJsonDocument jsonText(jsonData);
QTemporaryFile jsonFile; // QTemporaryFile jsonFile;
if (!jsonFile.exists()) // if (!jsonFile.exists())
qDebug() << "NOT EXISTS!"; // qDebug() << "NOT EXISTS!";
if (!jsonFile.open()) // if (!jsonFile.open())
return false; // return false;
//finalize the temp json file, in case something goes wrong in the // //finalize the temp json file, in case something goes wrong in the
//archive, we'll have this to jump back to // //archive, we'll have this to jump back to
jsonFile.write(jsonText.toJson()); // jsonFile.write(jsonText.toJson());
qDebug() << jsonFile.fileName(); // qDebug() << jsonFile.fileName();
jsonFile.close(); // jsonFile.close();
//now we create our archive file and set it's parameters // //now we create our archive file and set it's parameters
QString filename = file.toString().right(file.toString().size() - 7); // QString filename = file.toString().right(file.toString().size() - 7);
qDebug() << filename; // qDebug() << filename;
QString tarname; // QString tarname;
if (filename.endsWith(".pres")) { // if (filename.endsWith(".pres")) {
qDebug() << "Perfect just go with it!"; // qDebug() << "Perfect just go with it!";
tarname = filename; // tarname = filename;
} else // } else
tarname = filename + ".pres"; // tarname = filename + ".pres";
KTar tar(tarname, "application/zstd"); // KTar tar(tarname, "application/zstd");
if (tar.open(QIODevice::WriteOnly)) { // if (tar.open(QIODevice::WriteOnly)) {
qDebug() << tar.isOpen(); // qDebug() << tar.isOpen();
//write our json data to the archive // //write our json data to the archive
tar.writeFile("servicelist.json", // tar.writeFile("servicelist.json",
jsonText.toJson()); // jsonText.toJson());
//let's add the backgrounds and audios to the archive // //let's add the backgrounds and audios to the archive
for (int i = 0; i < m_items.size(); i++) { // for (int i = 0; i < m_items.size(); i++) {
qDebug() << m_items[i]->name(); // qDebug() << m_items[i]->name();
QString background = m_items[i]->background(); // QString background = m_items[i]->background();
QString backgroundFile = background.right(background.size() - 5); // QString backgroundFile = background.right(background.size() - 5);
qDebug() << backgroundFile; // qDebug() << backgroundFile;
QString audio = m_items[i]->audio(); // QString audio = m_items[i]->audio();
QString audioFile = audio.right(audio.size() - 5); // QString audioFile = audio.right(audio.size() - 5);
qDebug() << audioFile; // qDebug() << audioFile;
//here we need to cut off all the directories before // //here we need to cut off all the directories before
//adding into the archive // //adding into the archive
tar.addLocalFile(backgroundFile, // tar.addLocalFile(backgroundFile,
backgroundFile.right(backgroundFile.size() - // backgroundFile.right(backgroundFile.size() -
backgroundFile.lastIndexOf("/") - 1)); // backgroundFile.lastIndexOf("/") - 1));
tar.addLocalFile(audioFile, // tar.addLocalFile(audioFile,
audioFile.right(audioFile.size() - // audioFile.right(audioFile.size() -
audioFile.lastIndexOf("/") - 1)); // audioFile.lastIndexOf("/") - 1));
} // }
//close the archive so that everything is done // //close the archive so that everything is done
tar.close(); // tar.close();
QSettings settings; // QSettings settings;
settings.setValue("lastSaveFile", file); // settings.setValue("lastSaveFile", file);
settings.sync(); // settings.sync();
qDebug() << settings.value("lastSaveFile"); // qDebug() << settings.value("lastSaveFile");
return true; // return true;
} // }
return false; // return false;
} // }
bool ServiceItemModelCpp::load(QUrl file) { // bool ServiceItemModelCpp::load(QUrl file) {
qDebug() << "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"; // qDebug() << "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@";
qDebug() << "Loading..."; // qDebug() << "Loading...";
qDebug() << "File path is: " << file.toString(); // qDebug() << "File path is: " << file.toString();
qDebug() << "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"; // qDebug() << "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@";
QFileInfo loadInfo = QFileInfo(file.toLocalFile()); // QFileInfo loadInfo = QFileInfo(file.toLocalFile());
if (!loadInfo.exists()) // if (!loadInfo.exists())
return false; // return false;
QString fileUrl = file.toString().right(file.toString().size() - 7); // QString fileUrl = file.toString().right(file.toString().size() - 7);
KTar tar(fileUrl); // KTar tar(fileUrl);
if (tar.open(QIODevice::ReadOnly)){ // if (tar.open(QIODevice::ReadOnly)){
qDebug() << tar.isOpen(); // qDebug() << tar.isOpen();
const KArchiveDirectory *dir = tar.directory(); // const KArchiveDirectory *dir = tar.directory();
const KArchiveEntry *e = dir->entry("servicelist.json"); // const KArchiveEntry *e = dir->entry("servicelist.json");
if (!e) { // if (!e) {
qDebug() << "File not found!"; // qDebug() << "File not found!";
} // }
const KArchiveFile *f = static_cast<const KArchiveFile *>(e); // const KArchiveFile *f = static_cast<const KArchiveFile *>(e);
QByteArray arr(f->data()); // QByteArray arr(f->data());
QJsonDocument jsonText = QJsonDocument::fromJson(arr); // QJsonDocument jsonText = QJsonDocument::fromJson(arr);
qDebug() << jsonText; // the file contents // qDebug() << jsonText; // the file contents
QJsonArray array = jsonText.array(); // QJsonArray array = jsonText.array();
QVariantList serviceList = array.toVariantList(); // QVariantList serviceList = array.toVariantList();
qDebug() << serviceList; // qDebug() << serviceList;
// now lets remove all items from current list and add loaded ones // // now lets remove all items from current list and add loaded ones
clearAll(); // clearAll();
for (int i = 0; i < serviceList.length(); i++) { // for (int i = 0; i < serviceList.length(); i++) {
// int id = serviceList // // int id = serviceList
qDebug() << "*********************************"; // qDebug() << "*********************************";
qDebug() << serviceList[i].toMap(); // qDebug() << serviceList[i].toMap();
qDebug() << "*********************************"; // qDebug() << "*********************************";
QMap item = serviceList[i].toMap(); // QMap item = serviceList[i].toMap();
QString backgroundString = item.value("background").toString(); // QString backgroundString = item.value("background").toString();
QFileInfo backgroundFile = backgroundString.right(backgroundString.size() - 7); // QFileInfo backgroundFile = backgroundString.right(backgroundString.size() - 7);
QString audioString = item.value("audio").toString(); // QString audioString = item.value("audio").toString();
QFileInfo audioFile = audioString.right(audioString.size() - 7); // QFileInfo audioFile = audioString.right(audioString.size() - 7);
qDebug() << "POOPPOPOPOPOPOPOPOPOPOPOPOPO"; // qDebug() << "POOPPOPOPOPOPOPOPOPOPOPOPOPO";
qDebug() << backgroundFile; // qDebug() << backgroundFile;
qDebug() << backgroundFile.exists(); // qDebug() << backgroundFile.exists();
qDebug() << audioFile; // qDebug() << audioFile;
qDebug() << audioFile.exists(); // qDebug() << audioFile.exists();
qDebug() << "POOPPOPOPOPOPOPOPOPOPOPOPOPO"; // qDebug() << "POOPPOPOPOPOPOPOPOPOPOPOPOPO";
QString realBackground; // QString realBackground;
QString realAudio; // QString realAudio;
QFileInfo serviceFile = file.toString().right(file.toString().size() - 7); // QFileInfo serviceFile = file.toString().right(file.toString().size() - 7);
QString serviceName = serviceFile.baseName(); // QString serviceName = serviceFile.baseName();
QDir localDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); // QDir localDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
localDir.mkdir(serviceName); // localDir.mkdir(serviceName);
QDir serviceDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) // QDir serviceDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)
+ "/" + serviceName; // + "/" + serviceName;
qDebug() << serviceDir.path(); // qDebug() << serviceDir.path();
realBackground = backgroundString; // realBackground = backgroundString;
realAudio = audioString; // realAudio = audioString;
// If the background file is on disk use that, else use the one in archive // // If the background file is on disk use that, else use the one in archive
if (!backgroundFile.exists() && backgroundString.length() > 0) { // if (!backgroundFile.exists() && backgroundString.length() > 0) {
const KArchiveEntry *e = dir->entry(backgroundFile.fileName()); // const KArchiveEntry *e = dir->entry(backgroundFile.fileName());
if (!e) { // if (!e) {
qDebug() << "Background File not found!"; // qDebug() << "Background File not found!";
continue; // continue;
} // }
const KArchiveFile *f = static_cast<const KArchiveFile *>(e); // const KArchiveFile *f = static_cast<const KArchiveFile *>(e);
if (!f->copyTo(serviceDir.path())) // if (!f->copyTo(serviceDir.path()))
qDebug() << "FILE COULDN'T BE CREATED!"; // qDebug() << "FILE COULDN'T BE CREATED!";
QFileInfo bgFile = serviceDir.path() + "/" + backgroundFile.fileName(); // QFileInfo bgFile = serviceDir.path() + "/" + backgroundFile.fileName();
qDebug() << bgFile.filePath(); // qDebug() << bgFile.filePath();
realBackground = bgFile.filePath(); // realBackground = bgFile.filePath();
} // }
// If the audio file is on disk use that, else use the one in archive // // If the audio file is on disk use that, else use the one in archive
if (!audioFile.exists() && audioString.length() > 0) { // if (!audioFile.exists() && audioString.length() > 0) {
const KArchiveEntry *e = dir->entry(audioFile.fileName()); // const KArchiveEntry *e = dir->entry(audioFile.fileName());
if (!e) { // if (!e) {
qDebug() << "Audio File not found!"; // qDebug() << "Audio File not found!";
continue; // continue;
} // }
const KArchiveFile *f = static_cast<const KArchiveFile *>(e); // const KArchiveFile *f = static_cast<const KArchiveFile *>(e);
if (!f->copyTo(serviceDir.path())) // if (!f->copyTo(serviceDir.path()))
qDebug() << "FILE COULDN'T BE CREATED!"; // qDebug() << "FILE COULDN'T BE CREATED!";
QFileInfo audFile = serviceDir.path() + "/" + audioFile.fileName(); // QFileInfo audFile = serviceDir.path() + "/" + audioFile.fileName();
qDebug() << audFile.filePath(); // qDebug() << audFile.filePath();
realAudio = audFile.filePath(); // realAudio = audFile.filePath();
} // }
addItem(item.value("name").toString(), item.value("type").toString(), // addItem(item.value("name").toString(), item.value("type").toString(),
realBackground, // realBackground,
item.value("backgroundType").toString(), // item.value("backgroundType").toString(),
item.value("text").toStringList(), realAudio, // item.value("text").toStringList(), realAudio,
item.value("font").toString(), item.value("fontSize").toInt(), // item.value("font").toString(), item.value("fontSize").toInt(),
item.value("slideNumber").toInt(), item.value("loop").toBool()); // item.value("slideNumber").toInt(), item.value("loop").toBool());
} // }
return true; // return true;
} // }
return false; // return false;
} // }
void ServiceItemModelCpp::clearAll() { void ServiceItemModelCpp::clearAll() {
for (int i = m_items.size(); i >= 0; i--) { for (int i = m_items.size(); i >= 0; i--) {

4
src/cpp/serviceitemmodel.h
View file

@ -78,8 +78,8 @@ public:
Q_INVOKABLE QVariantList getItems(); Q_INVOKABLE QVariantList getItems();
Q_INVOKABLE void clearAll(); Q_INVOKABLE void clearAll();
Q_INVOKABLE bool save(QUrl file); // Q_INVOKABLE bool save(QUrl file);
Q_INVOKABLE bool load(QUrl file); // Q_INVOKABLE bool load(QUrl file);
Q_INVOKABLE bool loadLastSaved(); Q_INVOKABLE bool loadLastSaved();
signals: signals:

165
src/main.cpp
View file

@ -1,5 +1,6 @@
#include <QApplication> #include <QApplication>
#include <QQmlApplicationEngine> #include <QQmlApplicationEngine>
#include <QtCore/qstringliteral.h>
#include <QtQml> #include <QtQml>
#include <QUrl> #include <QUrl>
#include <QSql> #include <QSql>
@ -10,10 +11,10 @@
// #include <KWindowSystem> // #include <KWindowSystem>
#include <iostream> #include <iostream>
#include <QQmlEngine> #include <QQmlEngine>
#include <QtSql> // #include <QtSql>
#include <QSqlDatabase> // #include <QSqlDatabase>
#include <QSqlTableModel> // #include <QSqlTableModel>
#include <QtWebEngine> #include <QtWebEngineQuick>
#include <QObject> #include <QObject>
#include <QtGlobal> #include <QtGlobal>
@ -37,15 +38,16 @@
#include <qsqlquery.h> #include <qsqlquery.h>
#include <qstringliteral.h> #include <qstringliteral.h>
#include "cpp/mpv/mpvobject.h" #include "cpp/mpv/mpvitem.h"
#include "cpp/serviceitemmodel.h" #include "cpp/mpv/mpvproperties.h"
#include "cpp/slidemodel.h" // #include "cpp/serviceitemmodel.h"
#include "cpp/songsqlmodel.h" // #include "cpp/slidemodel.h"
#include "cpp/videosqlmodel.h" // #include "cpp/songsqlmodel.h"
#include "cpp/imagesqlmodel.h" // #include "cpp/videosqlmodel.h"
#include "cpp/presentationsqlmodel.h" // #include "cpp/imagesqlmodel.h"
#include "cpp/filemanager.h" // #include "cpp/presentationsqlmodel.h"
#include "cpp/slidehelper.h" // #include "cpp/filemanager.h"
// #include "cpp/slidehelper.h"
// RUST // RUST
// #include "cxx-qt-gen/service_thing.cxxqt.h" // #include "cxx-qt-gen/service_thing.cxxqt.h"
@ -71,83 +73,87 @@ static QWindow *windowFromEngine(QQmlApplicationEngine *engine)
return window; return window;
} }
static void connectToDatabase() { // static void connectToDatabase() {
// let's setup our sql database // // let's setup our sql database
QSqlDatabase db = QSqlDatabase::database(); // QSqlDatabase db = QSqlDatabase::database();
if (!db.isValid()){ // if (!db.isValid()){
db = QSqlDatabase::addDatabase("QSQLITE"); // db = QSqlDatabase::addDatabase("QSQLITE");
if (!db.isValid()) // if (!db.isValid())
qFatal("Cannot add database: %s", qPrintable(db.lastError().text())); // qFatal("Cannot add database: %s", qPrintable(db.lastError().text()));
} // }
const QDir writeDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); // const QDir writeDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
qDebug() << "dir location " << writeDir.absolutePath(); // qDebug() << "dir location " << writeDir.absolutePath();
if (!writeDir.mkpath(".")) { // if (!writeDir.mkpath(".")) {
qFatal("Failed to create writable location at %s", qPrintable(writeDir.absolutePath())); // qFatal("Failed to create writable location at %s", qPrintable(writeDir.absolutePath()));
} // }
const QString dbName = writeDir.absolutePath() + "/library-db.sqlite3"; // const QString dbName = writeDir.absolutePath() + "/library-db.sqlite3";
db.setHostName("localhost"); // db.setHostName("localhost");
db.setDatabaseName(dbName); // db.setDatabaseName(dbName);
db.setUserName("presenter"); // db.setUserName("presenter");
// TODO change password system before launch // // TODO change password system before launch
db.setPassword("i393jkf782djyr98302j"); // db.setPassword("i393jkf782djyr98302j");
if (!db.open()) { // if (!db.open()) {
qFatal("Cannot open database: %s", qPrintable(db.lastError().text())); // qFatal("Cannot open database: %s", qPrintable(db.lastError().text()));
QFile::remove(dbName); // QFile::remove(dbName);
} // }
qDebug() << "Finished connecting to db"; // qDebug() << "Finished connecting to db";
} // }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
// qDebug() << QSurfaceFormat::defaultFormat(); // qDebug() << QSurfaceFormat::defaultFormat();
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("video-display"))); QGuiApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("video-display")));
QtWebEngine::initialize(); QtWebEngineQuick::initialize();
QGuiApplication app(argc, argv); QGuiApplication app(argc, argv);
KLocalizedString::setApplicationDomain("lumina"); KLocalizedString::setApplicationDomain("lumina");
KAboutData aboutData("lumina", i18n("lumina"), "0.1", KAboutData about;
i18n("A church presentation app built with KDE tech."), about.setComponentName(QStringLiteral("lumina"));
KAboutLicense::GPL_V3, about.setDisplayName(i18n("lumina"));
i18n("Copyright 2017 Bar Foundation"), QString(), about.setVersion(QByteArray("0.1"));
"https://www.foo-the-app.net"); about.setShortDescription(i18n("A churchpresentation app build with KDE tech."));
about.setLicense(KAboutLicense::GPL_V3);
// overwrite default-generated values of organizationDomain & desktopFileName // overwrite default-generated values of organizationDomain & desktopFileName
aboutData.setOrganizationDomain("tfcconnection.org"); about.setOrganizationDomain("tfcconnection.org");
aboutData.setDesktopFileName("org.tfcconnection.lumina"); about.setDesktopFileName(QStringLiteral("org.tfcconneciton.lumina"));
QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGL);
// set the application metadata // set the application metadata
KAboutData::setApplicationData(aboutData); KAboutData::setApplicationData(about);
QCoreApplication::setOrganizationName(QStringLiteral("lumina")); QCoreApplication::setOrganizationName(QStringLiteral("lumina"));
QCoreApplication::setOrganizationDomain(QStringLiteral("tfcconnection.org")); QCoreApplication::setOrganizationDomain(QStringLiteral("tfcconnection.org"));
QCoreApplication::setApplicationName(QStringLiteral("lumina")); QCoreApplication::setApplicationName(QStringLiteral("lumina"));
qSetMessagePattern("%{category}: %{time h:m:s ap} %{type} %{function}: %{message}\n %{file}"); qSetMessagePattern(QString::fromUtf8("%{category}: %{time h:m:s ap} %{type} %{function}: %{message}\n %{file}"));
#ifdef Q_OS_WINDOWS #ifdef Q_OS_WINDOWS
QIcon::setFallbackThemeName("breeze"); QIcon::setFallbackThemeName(QStringLiteral("breeze"));
QQuickStyle::setStyle(QStringLiteral("org.kde.breeze")); QQuickStyle::setStyle(QStringLiteral("org.kde.breeze"));
// QApplication::setStyle(QStringLiteral("breeze")); // QApplication::setStyle(QStringLiteral("breeze"));
#else #else
QIcon::setFallbackThemeName("breeze"); QIcon::setFallbackThemeName(QStringLiteral("breeze"));
QQuickStyle::setStyle(QStringLiteral("org.kde.desktop")); QQuickStyle::setStyle(QStringLiteral("org.kde.desktop"));
QQuickStyle::setFallbackStyle(QStringLiteral("Default")); QQuickStyle::setFallbackStyle(QStringLiteral("Default"));
#endif #endif
qDebug() << QQuickStyle::availableStyles(); // qDebug() << QQuickStyle::availableStyles();
qDebug() << QIcon::themeName(); qDebug() << QIcon::themeName();
qDebug() << QApplication::platformName(); qDebug() << QApplication::platformName();
//Need to instantiate our slide //Need to instantiate our slide
// QScopedPointer<Utils> utils(new Utils); // QScopedPointer<Utils> utils(new Utils);
QScopedPointer<SlideModel> slideModel(new SlideModel); QScopedPointer<SlideModel> slideModel(new SlideModel);
QScopedPointer<SlideModelCpp> slideMod(new SlideModelCpp); // QScopedPointer<SlideModelCpp> slideMod(new SlideModelCpp);
QScopedPointer<File> filemanager(new File); // QScopedPointer<File> filemanager(new File);
// QScopedPointer<QQuickView> preswin(new QQuickView); // QScopedPointer<QQuickView> preswin(new QQuickView);
QScopedPointer<ServiceItemModel> serviceItemModel(new ServiceItemModel); QScopedPointer<ServiceItemModel> serviceItemModel(new ServiceItemModel);
QScopedPointer<ServiceItemModelCpp> serviceItemC(new ServiceItemModelCpp); // QScopedPointer<ServiceItemModelCpp> serviceItemC(new ServiceItemModelCpp);
QScopedPointer<SlideObject> slideobject(new SlideObject); QScopedPointer<SlideObject> slideobject(new SlideObject);
QScopedPointer<ObsModel> obsModel(new ObsModel); QScopedPointer<ObsModel> obsModel(new ObsModel);
obsModel.get()->getObs(); obsModel.get()->getObs();
@ -162,14 +168,14 @@ int main(int argc, char *argv[])
// PresWindow->setSource(QUrl(QStringLiteral("qrc://qml/presenter/PresentationWindow.qml"))); // PresWindow->setSource(QUrl(QStringLiteral("qrc://qml/presenter/PresentationWindow.qml")));
qDebug() << PresWindow->isVisible(); qDebug() << PresWindow->isVisible();
QObject::connect(serviceItemC.get(), // QObject::connect(serviceItemC.get(),
SIGNAL(itemInserted(const int&, const ServiceItem&)), // SIGNAL(itemInserted(const int&, const ServiceItem&)),
slideMod.get(), // slideMod.get(),
SLOT(insertItemFromService(const int&, const ServiceItem&))); // SLOT(insertItemFromService(const int&, const ServiceItem&)));
QObject::connect(serviceItemC.get(), // QObject::connect(serviceItemC.get(),
SIGNAL(itemAdded(const int&, const ServiceItem&)), // SIGNAL(itemAdded(const int&, const ServiceItem&)),
slideMod.get(), // slideMod.get(),
SLOT(addItemFromService(const int&, const ServiceItem&))); // SLOT(addItemFromService(const int&, const ServiceItem&)));
QObject::connect(serviceItemModel.get(), QObject::connect(serviceItemModel.get(),
&ServiceItemModel::itemAdded, &ServiceItemModel::itemAdded,
@ -206,22 +212,23 @@ int main(int argc, char *argv[])
if (!serviceItemModel.get()->load(settings->getLastSaveFile())) { if (!serviceItemModel.get()->load(settings->getLastSaveFile())) {
qDebug() << "Last saved file is missing or there isn't a last saved file."; qDebug() << "Last saved file is missing or there isn't a last saved file.";
serviceItemModel.get()->addItem("Black", "image", serviceItemModel.get()->addItem(QString::fromUtf8("Black"), QString::fromUtf8("image"),
"qrc:/assets/black.jpg", QString::fromUtf8("qrc:/assets/black.jpg"),
"image", QStringList(""), QString::fromUtf8("image"), QStringList() << QStringLiteral(""),
"", "", 0, 1, false, 0, 0, 0); QString::fromUtf8(""), QString::fromUtf8(""), 0, 1, false, 0, 0, 0);
} }
// apparently mpv needs this class set // apparently mpv needs this class set
// let's register mpv as well // let's register mpv as well
std::setlocale(LC_NUMERIC, "C"); std::setlocale(LC_NUMERIC, "C");
qmlRegisterType<MpvObject>("mpv", 1, 0, "MpvObject"); qmlRegisterType<MpvItem>("mpv", 1, 0, "MpvItem");
qmlRegisterSingletonInstance("org.presenter", 1, 0, "MpvProperties", MpvProperties::self());
//register our models //register our models
qmlRegisterType<SongProxyModel>("org.presenter", 1, 0, "SongProxyModel"); // qmlRegisterType<SongProxyModel>("org.presenter", 1, 0, "SongProxyModel");
qmlRegisterType<VideoProxyModel>("org.presenter", 1, 0, "VideoProxyModel"); // qmlRegisterType<VideoProxyModel>("org.presenter", 1, 0, "VideoProxyModel");
qmlRegisterType<ImageProxyModel>("org.presenter", 1, 0, "ImageProxyModel"); // qmlRegisterType<ImageProxyModel>("org.presenter", 1, 0, "ImageProxyModel");
qmlRegisterType<PresentationProxyModel>("org.presenter", 1, 0, "PresentationProxyModel"); // qmlRegisterType<PresentationProxyModel>("org.presenter", 1, 0, "PresentationProxyModel");
qmlRegisterType<SongModel>("org.presenter", 1, 0, "SongModel"); qmlRegisterType<SongModel>("org.presenter", 1, 0, "SongModel");
qmlRegisterType<SongEditor>("org.presenter", 1, 0, "SongEditor"); qmlRegisterType<SongEditor>("org.presenter", 1, 0, "SongEditor");
qmlRegisterType<VideoModel>("org.presenter", 1, 0, "VideoModel"); qmlRegisterType<VideoModel>("org.presenter", 1, 0, "VideoModel");
@ -237,13 +244,13 @@ int main(int argc, char *argv[])
qmlRegisterType<SlideHelper>("org.presenter", 1, 0, "SlideHelper"); qmlRegisterType<SlideHelper>("org.presenter", 1, 0, "SlideHelper");
qmlRegisterSingletonInstance("org.presenter", 1, 0, qmlRegisterSingletonInstance("org.presenter", 1, 0,
"ServiceItemModel", serviceItemModel.get()); "ServiceItemModel", serviceItemModel.get());
qmlRegisterSingletonInstance("org.presenter", 1, 0, // qmlRegisterSingletonInstance("org.presenter", 1, 0,
"ServiceItemC", serviceItemC.get()); // "ServiceItemC", serviceItemC.get());
qmlRegisterSingletonInstance("org.presenter", 1, 0, "SlideModel", slideModel.get()); qmlRegisterSingletonInstance("org.presenter", 1, 0, "SlideModel", slideModel.get());
qmlRegisterSingletonInstance("org.presenter", 1, 0, "SlideMod", slideMod.get()); // qmlRegisterSingletonInstance("org.presenter", 1, 0, "SlideMod", slideMod.get());
qmlRegisterSingletonInstance("org.presenter", 1, 0, "Utils", utils); qmlRegisterSingletonInstance("org.presenter", 1, 0, "Utils", utils);
qmlRegisterSingletonInstance("org.presenter", 1, 0, "SlideObject", slideobject.get()); qmlRegisterSingletonInstance("org.presenter", 1, 0, "SlideObject", slideobject.get());
qmlRegisterSingletonInstance("org.presenter", 1, 0, "FileManager", filemanager.get()); // qmlRegisterSingletonInstance("org.presenter", 1, 0, "FileManager", filemanager.get());
qmlRegisterSingletonInstance("org.presenter", 1, 0, "PresWindow", PresWindow); qmlRegisterSingletonInstance("org.presenter", 1, 0, "PresWindow", PresWindow);
qmlRegisterSingletonInstance("org.presenter", 1, 0, "RSettings", settings); qmlRegisterSingletonInstance("org.presenter", 1, 0, "RSettings", settings);
qmlRegisterSingletonInstance("org.presenter", 1, 0, "ObsModel", obsModel.get()); qmlRegisterSingletonInstance("org.presenter", 1, 0, "ObsModel", obsModel.get());
@ -253,10 +260,10 @@ int main(int argc, char *argv[])
// we need to set it as a separate context so that it can change it's slides too. // we need to set it as a separate context so that it can change it's slides too.
// This is because SlideObject singleton is started before the window is shown // This is because SlideObject singleton is started before the window is shown
// thus it doesn't exist in this window's context. So we set it here. // thus it doesn't exist in this window's context. So we set it here.
PresWindow->rootContext()->setContextProperty("SlideObj", slideobject.get()); PresWindow->rootContext()->setContextProperty(QStringLiteral("SlideObj"), slideobject.get());
PresWindow->setTitle("presentation-window"); PresWindow->setTitle(QStringLiteral("presentation-window"));
connectToDatabase(); // connectToDatabase();
qDebug() << "Starting engine"; qDebug() << "Starting engine";
QQmlApplicationEngine engine; QQmlApplicationEngine engine;

2
src/qml/presenter/Slide.qml
View file

@ -86,7 +86,7 @@ Item {
Timer { Timer {
id: mpvLoadingTimer id: mpvLoadingTimer
interval: 100 interval: 500
onTriggered: { onTriggered: {
/* showPassiveNotification("YIPPEEE!") */ /* showPassiveNotification("YIPPEEE!") */
mpv.stop(); mpv.stop();