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

removing mpv pieces

Browse source
This commit is contained in:
Chris Cochrun 2024-09-14 07:31:42 -05:00
parent e9d0bdb5c5
commit 8ae9911ee3
5 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -43,9 +43,9 @@ 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) # find_package(MpvQt)
set_package_properties(MpvQt PROPERTIES TYPE REQUIRED # set_package_properties(MpvQt PROPERTIES TYPE REQUIRED
URL "https://invent.kde.org/libraries/mpvqt") # 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)
@ -108,7 +108,7 @@ target_link_libraries(${APP_NAME}_lib INTERFACE
KF6::I18n KF6::I18n
KF6::CoreAddons KF6::CoreAddons
# KF6::FileMetaData # KF6::FileMetaData
MpvQt::MpvQt # MpvQt::MpvQt
# mpv # mpv
ssl ssl
crypto crypto

4
src/CMakeLists.txt
View file

@ -14,8 +14,8 @@ target_sources(lumina
# 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/mpvitem.h cpp/mpv/mpvitem.cpp # cpp/mpv/mpvitem.h cpp/mpv/mpvitem.cpp
cpp/mpv/mpvproperties.h # cpp/mpv/mpvproperties.h
) )
target_compile_options (lumina PUBLIC -fexceptions) target_compile_options (lumina PUBLIC -fexceptions)

10
src/main.cpp
View file

@ -37,9 +37,9 @@
#include <qsqldatabase.h> #include <qsqldatabase.h>
#include <qsqlquery.h> #include <qsqlquery.h>
#include <qstringliteral.h> #include <qstringliteral.h>
#include <MpvAbstractItem> // #include <MpvAbstractItem>
#include "cpp/mpv/mpvitem.h" // #include "cpp/mpv/mpvitem.h"
#include "cpp/mpv/mpvproperties.h" // #include "cpp/mpv/mpvproperties.h"
// #include "cpp/serviceitemmodel.h" // #include "cpp/serviceitemmodel.h"
// #include "cpp/slidemodel.h" // #include "cpp/slidemodel.h"
// #include "cpp/songsqlmodel.h" // #include "cpp/songsqlmodel.h"
@ -199,8 +199,8 @@ int main(int argc, char *argv[])
qmlRegisterType<Ytdl>("org.presenter", 1, 0, "Ytdl"); qmlRegisterType<Ytdl>("org.presenter", 1, 0, "Ytdl");
qmlRegisterType<ServiceThing>("org.presenter", 1, 0, "ServiceThing"); qmlRegisterType<ServiceThing>("org.presenter", 1, 0, "ServiceThing");
// qmlRegisterType<SlideHelper>("org.presenter", 1, 0, "SlideHelper"); // qmlRegisterType<SlideHelper>("org.presenter", 1, 0, "SlideHelper");
qmlRegisterType<MpvItem>("mpv", 1, 0, "MpvItem"); // qmlRegisterType<MpvItem>("mpv", 1, 0, "MpvItem");
qmlRegisterSingletonInstance("mpv", 1, 0, "MpvProperties", MpvProperties::self()); // qmlRegisterSingletonInstance("mpv", 1, 0, "MpvProperties", MpvProperties::self());
qmlRegisterSingletonInstance("org.presenter", 1, 0, qmlRegisterSingletonInstance("org.presenter", 1, 0,

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

@ -177,11 +177,6 @@ Item {
console.log("revealPrev") console.log("revealPrev")
web.runJavaScript("Reveal.prev()") web.runJavaScript("Reveal.prev()")
} }
/* function onSlideChanged() { */
/* video.stop(); */
/* video.seek(); */
/* } */
} }
function changeText(text) { function changeText(text) {

1
src/qml/presenter/VideoEditor.qml
View file

@ -5,7 +5,6 @@ import org.kde.kirigami 2.13 as Kirigami
import QtMultimedia import QtMultimedia
import "./" as Presenter import "./" as Presenter
import org.presenter 1.0 import org.presenter 1.0
import mpv 1.0
Item { Item {
id: root id: root