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

adding some more todos and refactoring getSong so it's more future proof

Browse source
This commit is contained in:
Chris Cochrun 2022-04-05 08:21:16 -05:00
parent e52d44f937
commit deb620a2eb
6 changed files with 89 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,10 +47,12 @@ Item {
enableAudio: !preview
Component.onCompleted: mpvLoadingTimer.start()
onFileLoaded: {
showPassiveNotification(videoSource + " has been loaded");
/* showPassiveNotification(videoSource + " has been loaded"); */
if (itemType == "song")
mpv.setProperty("loop", "inf");
showPassiveNotification(mpv.getProperty("loop"));
else
mpv.setProperty("loop", "no");
/* showPassiveNotification(mpv.getProperty("loop")); */
}
MouseArea {
@ -148,4 +150,8 @@ Item {
black.visible = true;
showPassiveNotification("Black is: " + black.visible);
}
function pauseVideo() {
mpv.pause();
}
}

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

@ -27,6 +27,11 @@ Item {
Component.onCompleted: updateHAlignment(textAlignment)
function loadVideo() {
representation.loadVideo();
representation.pause();
}
function updateHAlignment(alignment) {
switch (alignment) {
case "left" :

19
src/qml/presenter/SongEditor.qml
View file

@ -277,21 +277,22 @@ Item {
function changeSong(index) {
const song = songsqlmodel.getSong(index);
songIndex = index;
songTitle = song[0];
songLyrics = song[1];
songAuthor = song[2];
songCcli = song[3];
songAudio = song[4];
songVorder = song[5];
songBackground = song[6];
songBackgroundType = song[7];
songHAlignment = song[8];
songTitle = song.title;
songLyrics = song.lyrics;
songAuthor = song.author;
songCcli = song.ccli;
songAudio = song.audio;
songVorder = song.vorder;
songBackground = song.background;
songBackgroundType = song.backgroundType;
songHAlignment = song.textAlignment;
if (songBackgroundType == "image") {
slideEditor.videoBackground = "";
slideEditor.imageBackground = songBackground;
} else {
slideEditor.imageBackground = "";
slideEditor.videoBackground = songBackground;
slideEditor.loadVideo();
}
print(song);
}