Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port audioplayer delegate to use gui media service #114

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Port audioplayer delegate to use gui media service #114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
256 changes: 199 additions & 57 deletions import/qml/AudioPlayer.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
*
*/

import QtQuick 2.4
import QtQuick.Controls 2.2 as Controls
import QtQuick 2.12
import QtQuick.Controls 2.12 as Controls
import QtQuick.Layouts 1.3
import QtMultimedia 5.9
import org.kde.kirigami 2.5 as Kirigami
import Mycroft 1.0 as Mycroft

import QtQuick.Templates 2.12 as T

Item {
id: root

property alias source: player.source
property var source
property string status: "stop"
property int switchWidth: Kirigami.Units.gridUnit * 22
property alias thumbnail: albumimg.source
Expand All @@ -37,11 +37,32 @@ Item {
property bool titleVisible: true
property var nextAction
property var previousAction
property alias currentState: player.status
readonly property bool horizontal: width > switchWidth
readonly property var audioService: Mycroft.MediaService

//Mediaplayer Related Properties To Be Set By Probe MediaPlayer
property var currentState: audioService.playbackState
property var playerDuration: 0
property var playerPosition: 0

//Spectrum Related Properties
property var spectrum: [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
property var soundModelLength: audioService.spectrum.length
property color spectrumColorNormal: Qt.rgba(33/255, 148/255, 190/255, 0.7)
property color spectrumColorMid: spectrumColorNormal
property color spectrumColorPeak: Qt.rgba(33/255, 190/255, 166/255, 0.7)
property real spectrumScale: 1
property bool spectrumVisible: true
readonly property real spectrumHeight: (rep.parent.height / normalize(spectrumScale))

onEnabledChanged: syncStatusTimer.restart()
onSourceChanged: syncStatusTimer.restart()
onSourceChanged: {
syncStatusTimer.restart()
if (!root.title) {
fetchMetaTitleFromFile()
}
play()
}
Component.onCompleted: syncStatusTimer.restart()

// Sometimes can't be restarted reliably immediately, put it in a timer
Expand All @@ -51,56 +72,104 @@ Item {
}
}

function msToTime(duration) {
var seconds = parseInt((duration/1000)%60);
var minutes = parseInt((duration/(1000*60))%60);
Component.onDestruction: stop()

function formatedDuration(millis){
var minutes = Math.floor(millis / 60000);
var seconds = ((millis % 60000) / 1000).toFixed(0);
return minutes + ":" + (seconds < 10 ? '0' : '') + seconds;
}

function formatedPosition(millis){
var minutes = Math.floor(millis / 60000);
var seconds = ((millis % 60000) / 1000).toFixed(0);
return minutes + ":" + (seconds < 10 ? '0' : '') + seconds;
}

function normalize(e){
switch(e){case.1:return 10;case.2:return 9;case.3:return 8;
case.4:return 7;case.5:return 6;case.6:return 5;case.7:return 4;case.8:return 3; case.9:return 2;case 1:return 1; default: return 1}
}

function fetchMetaTitleFromFile() {
var playerMeta = audioService.getPlayerMeta()
var title = playerMeta.Title
if(title !== "" || title !== " ") {
songtitle.text = root.playerMeta.Title
}
}

Connections {
target: Mycroft.MediaService

onDurationChanged: {
playerDuration = dur
seekableslider.to = playerDuration
}
onPositionChanged: {
playerPosition = pos
}

minutes = (minutes < 10) ? "0" + minutes : minutes;
seconds = (seconds < 10) ? "0" + seconds : seconds;
onMediaStatusChanged: {
if (status == MediaPlayer.EndOfMedia) {
pause()
}
}
}

return minutes + ":" + seconds;
Timer {
id: sampler
running: true
interval: 100
repeat: true
onTriggered: {
spectrum = audioService.spectrum
}
}

Timer {
id: syncStatusTimer
interval: 0
onTriggered: {
if (enabled && status == "play") {
player.play();
play();
} else if (status == "stop") {
player.stop();
stop();
} else {
player.pause();
pause();
}
}
}
MediaPlayer {
id: player
autoPlay: false
readonly property string currentStatus: root.enabled ? root.status : "pause"

onCurrentStatusChanged: {
switch(currentStatus){
case "stop":
player.stop();
break;
case "pause":
player.pause()
break;
case "play":
player.play()
break;
}
}

function play(){
audioService.playURL(source)
}

function pause(){
audioService.playerPause()
}

function stop(){
audioService.playerStop()
}

function resume(){
audioService.playerContinue()
}

function seek(val){
audioService.playerSeek(val)
}

GridLayout {
anchors {
top: root.horizontal ? undefined : parent.top
left: parent.left
right: parent.right
bottom: parent.bottom
bottomMargin: Mycroft.Units.gridUnit * 2
leftMargin: Mycroft.Units.gridUnit * 2
rightMargin: Mycroft.Units.gridUnit * 2
}
columns: root.horizontal ? 2 : 1
height: implicitHeight
Expand Down Expand Up @@ -152,13 +221,13 @@ Item {
onClicked: {
triggerGuiEvent(previousAction, {})
}

background: Rectangle {
Kirigami.Theme.colorSet: Kirigami.Theme.Button
radius: width
color: previousButton.activeFocus ? Kirigami.Theme.highlightColor : Kirigami.Theme.backgroundColor
}

Keys.onReturnPressed: {
clicked()
}
Expand All @@ -173,20 +242,20 @@ Item {
Layout.maximumWidth: Kirigami.Units.gridUnit * 4
Layout.maximumHeight: width
focus: false
icon.name: player.playbackState === MediaPlayer.PlayingState ? "media-playback-pause" : "media-playback-start"
icon.name: root.currentState === MediaPlayer.PlayingState ? "media-playback-pause" : "media-playback-start"
KeyNavigation.left: previousButton
KeyNavigation.right: nextButton
KeyNavigation.down: seekableslider
onClicked: {
player.playbackState === MediaPlayer.PlayingState ? player.pause() : player.play()
root.currentState === MediaPlayer.PlayingState ? root.pause() : root.currentState === MediaPlayer.PausedState ? root.resume() : root.play()
}

background: Rectangle {
Kirigami.Theme.colorSet: Kirigami.Theme.Button
radius: width
color: playButton.activeFocus ? Kirigami.Theme.highlightColor : Kirigami.Theme.backgroundColor
}

Keys.onReturnPressed: {
clicked()
}
Expand All @@ -207,64 +276,137 @@ Item {
onClicked: {
triggerGuiEvent(nextAction, {})
}

background: Rectangle {
Kirigami.Theme.colorSet: Kirigami.Theme.Button
radius: width
color: nextButton.activeFocus ? Kirigami.Theme.highlightColor : Kirigami.Theme.backgroundColor
}

Keys.onReturnPressed: {
clicked()
}
}
}

Rectangle {
id: spectrumAreaCentered
Layout.fillWidth: true
Layout.fillHeight: true
Layout.alignment: Qt.AlignHCenter
color: "transparent"

Row {
id: repRows
height: parent.height
anchors.horizontalCenter: parent.horizontalCenter
spacing: 4
visible: spectrumVisible
enabled: spectrumVisible
z: -5

Repeater {
id: rep
model: root.soundModelLength - 1

delegate: Rectangle {
width: (spectrumAreaCentered.width - (repRows.spacing * root.soundModelLength)) / root.soundModelLength
radius: 3
opacity: root.currentState === MediaPlayer.PlayingState ? 1 : 0
height: 15 + root.spectrum[modelData] * root.spectrumHeight
anchors.bottom: parent.bottom

gradient: Gradient {
GradientStop {position: 0.05; color: height > root.spectrumHeight / 1.25 ? spectrumColorPeak : spectrumColorNormal}
GradientStop {position: 0.25; color: spectrumColorMid}
GradientStop {position: 0.50; color: spectrumColorNormal}
GradientStop {position: 0.85; color: spectrumColorMid}
}

Behavior on height {
NumberAnimation {
duration: 150
easing.type: Easing.Linear
}
}
Behavior on opacity {
NumberAnimation{
duration: 1500 + root.spectrum[modelData] * parent.height
easing.type: Easing.Linear
}
}
}
}
}
}

RowLayout {
spacing: Kirigami.Units.smallSpacing
Layout.fillWidth: true
visible: root.progressBar ? 1 : 0
enabled: root.progressBar ? 1 : 0

Controls.Slider {
T.Slider {
id: seekableslider
to: player.duration
//to: root.playerDuration
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to be handled up on L106-107 is that right? Can we delete this now?

Layout.fillWidth: true
Layout.preferredHeight: Mycroft.Units.gridUnit
property bool sync: false
value: root.playerPosition

handle: Item {
x: seekableslider.visualPosition * (parent.width - (Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've been playing with this a little as I've been seeing the positionMarker move slightly beyond the end of the seek bar at the end of tracks.

This seems to work for me:

x: seekableslider.visualPosition / (parent.width + {implicitWidth_of_hand}) * parent.width ** 2

maybe easier to reason as:

(visualPosition * parent.width) / (parent.width + hand.width) * parent.width

Does that make sense?

anchors.verticalCenter: parent.verticalCenter
height: parent.height + Mycroft.Units.gridUnit

onValueChanged: {
if (!sync)
player.seek(value)
Rectangle {
id: hand
anchors.verticalCenter: parent.verticalCenter
implicitWidth: Kirigami.Units.iconSizes.small + Kirigami.Units.smallSpacing
implicitHeight: parent.height
color: seekableslider.activeFocus ?"#21bea6" : Qt.rgba(0.2, 0.2, 0.2, 1)
border.color: "#21bea6"
}
}

Connections {
target: player
onPositionChanged: {
seekableslider.sync = true
seekableslider.value = player.position
seekableslider.sync = false
background: Rectangle {
color: Qt.rgba(55/255, 214/255, 250/255, 0.6)

Rectangle {
width: seekableslider.visualPosition * parent.width
height: parent.height
gradient: Gradient {
orientation: Gradient.Horizontal
GradientStop { position: 0.0; color: "#21bea6" }
GradientStop { position: 1.0; color: "#2194be" }
}
}
}


onPressedChanged: {
root.seek(value)
resume()
}

Keys.onLeftPressed: {
var l = 0
l = seekableslider.position - 0.05
seekableslider.value = seekableslider.valueAt(l);
root.seek(seekableslider.valueAt(l));
}

Keys.onRightPressed: {
var l = 0
l = seekableslider.position + 0.05
seekableslider.value = seekableslider.valueAt(l);
root.seek(seekableslider.valueAt(l));
}
}

Controls.Label {
id: positionLabel
text: msToTime(player.position) + " / " + msToTime(player.duration)
text: formatedPosition(root.playerPosition) + " / " + formatedDuration(root.playerDuration)
}
}
}
}
}