From 8ae9911ee318ff75e347b6f748699cb6032b6c73 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Sat, 14 Sep 2024 07:31:42 -0500 Subject: [PATCH] removing mpv pieces --- CMakeLists.txt | 8 ++++---- src/CMakeLists.txt | 4 ++-- src/main.cpp | 10 +++++----- src/qml/presenter/Slide.qml | 5 ----- src/qml/presenter/VideoEditor.qml | 1 - 5 files changed, 11 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fbb0f6..2f1493f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,9 +43,9 @@ set_package_properties(FFmpeg PROPERTIES TYPE REQUIRED) # find_package(Libmpv) # 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(MpvQt) +# set_package_properties(MpvQt PROPERTIES TYPE REQUIRED +# URL "https://invent.kde.org/libraries/mpvqt") find_package(YouTubeDl) set_package_properties(YouTubeDl PROPERTIES TYPE RUNTIME) @@ -108,7 +108,7 @@ target_link_libraries(${APP_NAME}_lib INTERFACE KF6::I18n KF6::CoreAddons # KF6::FileMetaData - MpvQt::MpvQt + # MpvQt::MpvQt # mpv ssl crypto diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e250740..11a45ee 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,8 +14,8 @@ target_sources(lumina # cpp/imagesqlmodel.cpp cpp/imagesqlmodel.h # cpp/filemanager.cpp cpp/filemanager.h # cpp/presentationsqlmodel.cpp cpp/presentationsqlmodel.h - cpp/mpv/mpvitem.h cpp/mpv/mpvitem.cpp - cpp/mpv/mpvproperties.h + # cpp/mpv/mpvitem.h cpp/mpv/mpvitem.cpp + # cpp/mpv/mpvproperties.h ) target_compile_options (lumina PUBLIC -fexceptions) diff --git a/src/main.cpp b/src/main.cpp index 6af8c07..6550c4c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -37,9 +37,9 @@ #include #include #include -#include -#include "cpp/mpv/mpvitem.h" -#include "cpp/mpv/mpvproperties.h" +// #include +// #include "cpp/mpv/mpvitem.h" +// #include "cpp/mpv/mpvproperties.h" // #include "cpp/serviceitemmodel.h" // #include "cpp/slidemodel.h" // #include "cpp/songsqlmodel.h" @@ -199,8 +199,8 @@ int main(int argc, char *argv[]) qmlRegisterType("org.presenter", 1, 0, "Ytdl"); qmlRegisterType("org.presenter", 1, 0, "ServiceThing"); // qmlRegisterType("org.presenter", 1, 0, "SlideHelper"); - qmlRegisterType("mpv", 1, 0, "MpvItem"); - qmlRegisterSingletonInstance("mpv", 1, 0, "MpvProperties", MpvProperties::self()); + // qmlRegisterType("mpv", 1, 0, "MpvItem"); + // qmlRegisterSingletonInstance("mpv", 1, 0, "MpvProperties", MpvProperties::self()); qmlRegisterSingletonInstance("org.presenter", 1, 0, diff --git a/src/qml/presenter/Slide.qml b/src/qml/presenter/Slide.qml index 201a76c..87c8c6f 100644 --- a/src/qml/presenter/Slide.qml +++ b/src/qml/presenter/Slide.qml @@ -177,11 +177,6 @@ Item { console.log("revealPrev") web.runJavaScript("Reveal.prev()") } - - /* function onSlideChanged() { */ - /* video.stop(); */ - /* video.seek(); */ - /* } */ } function changeText(text) { diff --git a/src/qml/presenter/VideoEditor.qml b/src/qml/presenter/VideoEditor.qml index 2294299..f87ef26 100644 --- a/src/qml/presenter/VideoEditor.qml +++ b/src/qml/presenter/VideoEditor.qml @@ -5,7 +5,6 @@ import org.kde.kirigami 2.13 as Kirigami import QtMultimedia import "./" as Presenter import org.presenter 1.0 -import mpv 1.0 Item { id: root