mirror of
https://github.com/HenkKalkwater/harbour-sailfin.git
synced 2025-09-05 18:22:46 +00:00
Added videoplayer and many unrelated things
This commit is contained in:
parent
53b3eac213
commit
92a18c4fa5
28 changed files with 889 additions and 51 deletions
|
@ -71,6 +71,6 @@ Item {
|
|||
right: parent.right
|
||||
}
|
||||
width: parent.width
|
||||
height: children[0].height
|
||||
height: children.length > 0 ? children[0].height : 0
|
||||
}
|
||||
}
|
||||
|
|
|
@ -17,13 +17,13 @@ Image {
|
|||
GradientStop { position: 0.0; color: Theme.highlightColor; }
|
||||
GradientStop { position: 1.0; color: Theme.highlightDimmerColor; }
|
||||
}
|
||||
visible: parent.status == Image.Error
|
||||
visible: parent.status == Image.Error || parent.status == Image.Null
|
||||
}
|
||||
|
||||
Image {
|
||||
id: fallbackImageItem
|
||||
anchors.centerIn: parent
|
||||
visible: parent.status == Image.Error
|
||||
visible: parent.status == Image.Error || parent.status == Image.Null
|
||||
source: fallbackImage ? fallbackImage : "image://theme/icon-m-question"
|
||||
}
|
||||
}
|
||||
|
|
64
qml/components/VideoPlayer.qml
Normal file
64
qml/components/VideoPlayer.qml
Normal file
|
@ -0,0 +1,64 @@
|
|||
import QtQuick 2.6
|
||||
import QtMultimedia 5.6
|
||||
import Sailfish.Silica 1.0
|
||||
|
||||
import nl.netsoj.chris.Jellyfin 1.0
|
||||
|
||||
import "videoplayer"
|
||||
|
||||
Item {
|
||||
id: playerRoot
|
||||
property string itemId
|
||||
property string title
|
||||
property int progress
|
||||
readonly property bool landscape: videoOutput.contentRect.width > videoOutput.contentRect.height
|
||||
property MediaPlayer player
|
||||
readonly property bool hudVisible: !hud.hidden
|
||||
|
||||
MediaSource {
|
||||
id: mediaSource
|
||||
apiClient: ApiClient
|
||||
itemId: playerRoot.itemId
|
||||
autoOpen: true
|
||||
//autoPlay: true
|
||||
onStreamUrlChanged: {
|
||||
if (mediaSource.streamUrl != "") {
|
||||
player.source = streamUrl
|
||||
//mediaPlayer.play()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
VideoOutput {
|
||||
id: videoOutput
|
||||
source: player
|
||||
anchors.fill: parent
|
||||
}
|
||||
|
||||
VideoHud {
|
||||
id: hud
|
||||
anchors.fill: parent
|
||||
player: playerRoot.player
|
||||
title: videoPlayer.title
|
||||
|
||||
Label {
|
||||
anchors.fill: parent
|
||||
anchors.margins: Theme.horizontalPageMargin
|
||||
text: itemId + "\n" + mediaSource.streamUrl + "\n"
|
||||
+ player.status + "\n"
|
||||
+ player.bufferProgress + "\n"
|
||||
+ player.metaData.videoCodec + "@" + player.metaData.videoFrameRate + "(" + player.metaData.videoBitRate + ")" + "\n"
|
||||
+ player.metaData.audioCodec + "(" + player.metaData.audioBitRate + ")" + "\n"
|
||||
+ player.errorString + "\n"
|
||||
font.pixelSize: Theme.fontSizeExtraSmall
|
||||
wrapMode: "WordWrap"
|
||||
visible: false
|
||||
}
|
||||
}
|
||||
|
||||
function stop() {
|
||||
player.stop()
|
||||
player.source = ""
|
||||
}
|
||||
}
|
5
qml/components/itemdetails/FilmDetails.qml
Normal file
5
qml/components/itemdetails/FilmDetails.qml
Normal file
|
@ -0,0 +1,5 @@
|
|||
import QtQuick 2.0
|
||||
|
||||
Item {
|
||||
|
||||
}
|
5
qml/components/itemdetails/SeriesDetails.qml
Normal file
5
qml/components/itemdetails/SeriesDetails.qml
Normal file
|
@ -0,0 +1,5 @@
|
|||
import QtQuick 2.0
|
||||
|
||||
Item {
|
||||
|
||||
}
|
166
qml/components/videoplayer/VideoHud.qml
Normal file
166
qml/components/videoplayer/VideoHud.qml
Normal file
|
@ -0,0 +1,166 @@
|
|||
import QtQuick 2.6
|
||||
import QtMultimedia 5.6
|
||||
import Sailfish.Silica 1.0
|
||||
|
||||
Item {
|
||||
id: videoHud
|
||||
property MediaPlayer player
|
||||
property string title
|
||||
property bool _manuallyActivated: false
|
||||
readonly property bool hidden: opacity == 0.0
|
||||
|
||||
Behavior on opacity { FadeAnimator {} }
|
||||
Rectangle {
|
||||
id: topBar
|
||||
anchors.top: parent.top
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
height: pageTitle.height
|
||||
|
||||
gradient: Gradient {
|
||||
GradientStop { position: 1.0; color: Theme.rgba(palette.overlayBackgroundColor, 0.15); }
|
||||
GradientStop { position: 0.0; color: Theme.rgba(palette.overlayBackgroundColor, 0.30); }
|
||||
}
|
||||
PageHeader {
|
||||
id: pageTitle
|
||||
title: videoHud.title
|
||||
anchors.fill: parent
|
||||
titleColor: palette.primaryColor
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
anchors.top: topBar.bottom
|
||||
anchors.bottom: bottomBar.top
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
color: Theme.rgba(palette.overlayBackgroundColor, 0.15)
|
||||
}
|
||||
|
||||
MouseArea {
|
||||
id: wakeupArea
|
||||
enabled: true
|
||||
anchors.fill: parent
|
||||
onClicked: hidden ? videoHud.show(true) : videoHud.hide(true)
|
||||
}
|
||||
|
||||
BusyIndicator {
|
||||
id: busyIndicator
|
||||
anchors.centerIn: parent
|
||||
size: BusyIndicatorSize.Medium
|
||||
running: [MediaPlayer.Loading, MediaPlayer.Stalled].indexOf(player.status) >= 0
|
||||
}
|
||||
|
||||
IconButton {
|
||||
id: playPause
|
||||
enabled: !hidden
|
||||
anchors.centerIn: parent
|
||||
icon.source: player.playbackState == MediaPlayer.PausedState ? "image://theme/icon-l-play" : "image://theme/icon-l-pause"
|
||||
onClicked: {
|
||||
if (player.playbackState == MediaPlayer.PlayingState) {
|
||||
player.pause()
|
||||
} else {
|
||||
player.play()
|
||||
}
|
||||
}
|
||||
visible: !busyIndicator.running
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
id: bottomBar
|
||||
anchors.bottom: parent.bottom
|
||||
width: parent.width
|
||||
height: progress.height
|
||||
visible: [MediaPlayer.Unavailable, MediaPlayer.Loading, MediaPlayer.NoMedia].indexOf(player.status) == -1
|
||||
|
||||
gradient: Gradient {
|
||||
GradientStop { position: 0.0; color: Theme.rgba(palette.overlayBackgroundColor, 0.15); }
|
||||
GradientStop { position: 1.0; color: Theme.rgba(palette.overlayBackgroundColor, 0.30); }
|
||||
}
|
||||
|
||||
Item {
|
||||
id: progress
|
||||
height: progressSlider.height + 2 * Theme.paddingMedium
|
||||
width: parent.width
|
||||
|
||||
Label {
|
||||
id: playedTime
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: Theme.horizontalPageMargin
|
||||
anchors.verticalCenter: progressSlider.verticalCenter
|
||||
text: timeToText(player.position)
|
||||
}
|
||||
|
||||
Slider {
|
||||
id: progressSlider
|
||||
enabled: player.seekable
|
||||
value: player.position
|
||||
maximumValue: player.duration
|
||||
stepSize: 1000
|
||||
anchors.left: playedTime.right
|
||||
anchors.right: totalTime.left
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
onDownChanged: if (!down) { player.seek(value) }
|
||||
}
|
||||
|
||||
Label {
|
||||
id: totalTime
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: Theme.horizontalPageMargin
|
||||
anchors.verticalCenter: progress.verticalCenter
|
||||
text: timeToText(player.duration)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function timeToText(time) {
|
||||
if (time < 0) return "??:??:??"
|
||||
var hours = Math.floor(time / (60 * 60 * 1000))
|
||||
var left = time % (60 * 60 * 1000)
|
||||
var minutes = Math.floor(left / (60 * 1000))
|
||||
left = time % (60 * 1000)
|
||||
var seconds = Math.floor(left / 1000)
|
||||
|
||||
return hours + ":" + (minutes < 10 ? "0" : "") + minutes + ":" + (seconds < 10 ? "0" : "")+ seconds
|
||||
}
|
||||
|
||||
Connections {
|
||||
target: player
|
||||
onStatusChanged: {
|
||||
console.log("New mediaPlayer status: " + player.status)
|
||||
switch(player.status) {
|
||||
case MediaPlayer.Loaded:
|
||||
case MediaPlayer.Buffering:
|
||||
show(false)
|
||||
break;
|
||||
case MediaPlayer.Buffered:
|
||||
hide(false)
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function show(manual) {
|
||||
if (manual) {
|
||||
_manuallyActivated = true
|
||||
inactivityTimer.restart()
|
||||
} else {
|
||||
_manuallyActivated = false
|
||||
}
|
||||
opacity = 1
|
||||
}
|
||||
|
||||
function hide(manual) {
|
||||
// Don't hide if the user decided on their own to show the hud
|
||||
if (!manual && _manuallyActivated) return;
|
||||
opacity = 0
|
||||
}
|
||||
|
||||
Timer {
|
||||
id: inactivityTimer
|
||||
interval: 5000
|
||||
onTriggered: {
|
||||
hide(true)
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue