making the window close and stop audio properly
This commit is contained in:
parent
9a180f7df0
commit
9f9026105f
3 changed files with 20 additions and 14 deletions
|
@ -97,10 +97,8 @@ Controls.Page {
|
|||
}
|
||||
}
|
||||
|
||||
Loader {
|
||||
id: presentLoader
|
||||
active: presenting
|
||||
source: "PresentationWindow.qml"
|
||||
Presenter.PresentationWindow {
|
||||
id: pWindow
|
||||
}
|
||||
|
||||
SongSqlModel {
|
||||
|
@ -186,8 +184,11 @@ Controls.Page {
|
|||
|
||||
function present(present) {
|
||||
if (present)
|
||||
presentationWindow.showFullScreen();
|
||||
{
|
||||
presentation.loadVideo();
|
||||
pWindow.showFullScreen();
|
||||
}
|
||||
else
|
||||
presentationWindow.close();
|
||||
pWindow.close();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -13,12 +13,19 @@ Window {
|
|||
height: maximumHeight
|
||||
width: maximumWidth
|
||||
screen: presentationScreen
|
||||
opacity: 1.0
|
||||
transientParent: null
|
||||
/* flags: Qt.X11BypassWindowManagerHint */
|
||||
onClosing: close()
|
||||
onClosing: {
|
||||
presentationSlide.stopVideo();
|
||||
SlideObject.pause();
|
||||
presenting = false;
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
presentationWindow.showFullScreen();
|
||||
/* presentationWindow.showFullScreen(); */
|
||||
print(screen.name);
|
||||
showMinimized();
|
||||
}
|
||||
|
||||
Presenter.Slide {
|
||||
|
@ -52,10 +59,4 @@ Window {
|
|||
function pauseVideo() {
|
||||
presentationSlide.pauseVideo();
|
||||
}
|
||||
|
||||
function close() {
|
||||
presentationSlide.stopVideo();
|
||||
SlideObject.pause();
|
||||
presenting = false;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -171,6 +171,10 @@ Item {
|
|||
showPassiveNotification("Black is: " + black.visible);
|
||||
}
|
||||
|
||||
function quitMpv() {
|
||||
mpv.quit();
|
||||
}
|
||||
|
||||
function pauseVideo() {
|
||||
mpv.pause();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue