Code Review
/
apps
/
mediaplayer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Rename of mediaplayer to 'Music'
[apps/mediaplayer.git]
/
app
/
MediaPlayer.qml
diff --git
a/app/MediaPlayer.qml
b/app/MediaPlayer.qml
index
77538a6
..
ebd5324
100644
(file)
--- a/
app/MediaPlayer.qml
+++ b/
app/MediaPlayer.qml
@@
-19,14
+19,13
@@
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.0
import QtMultimedia 5.6
import AGL.Demo.Controls 1.0
import QtQuick.Controls 2.0
import QtMultimedia 5.6
import AGL.Demo.Controls 1.0
-import MediaPlayer 1.0
import 'api' as API
ApplicationWindow {
id: root
import 'api' as API
ApplicationWindow {
id: root
- API.
LightMediaScann
er {
- id:
binding
+ API.
MediaPlay
er {
+ id:
player
url: bindingAddress
}
url: bindingAddress
}
@@
-35,17
+34,6
@@
ApplicationWindow {
url: bindingAddress
}
url: bindingAddress
}
- MediaPlayer {
- id: player
- audioRole: MediaPlayer.MusicRole
- autoLoad: true
- playlist: playlist
-
- function time2str(value) {
- return Qt.formatTime(new Date(value), 'mm:ss')
- }
- }
-
Timer {
id: timer
interval: 250
Timer {
id: timer
interval: 250
@@
-53,16
+41,13
@@
ApplicationWindow {
repeat: true
onTriggered: {
bluetooth.position = bluetooth.position + 250
repeat: true
onTriggered: {
bluetooth.position = bluetooth.position + 250
- slider.value = bluetooth.position
}
}
}
}
-
Playlist
{
+
ListModel
{
id: playlist
id: playlist
- playbackMode: random.checked ? Playlist.Random : loop.checked ? Playlist.Loop : Playlist.Sequential
}
}
-
ColumnLayout {
anchors.fill: parent
Item {
ColumnLayout {
anchors.fill: parent
Item {
@@
-77,7
+62,7
@@
ApplicationWindow {
anchors.bottom: parent.bottom
height: sourceSize.height * width / sourceSize.width
fillMode: Image.PreserveAspectCrop
anchors.bottom: parent.bottom
height: sourceSize.height * width / sourceSize.width
fillMode: Image.PreserveAspectCrop
- source: player.
metaData.coverArtImage ? player.metaData.coverArtImage
: ''
+ source: player.
cover_art ? player.cover_art
: ''
visible: bluetooth.av_connected == false
}
visible: bluetooth.av_connected == false
}
@@
-100,17
+85,19
@@
ApplicationWindow {
Layout.fillHeight: true
Row {
spacing: 20
Layout.fillHeight: true
Row {
spacing: 20
- ToggleButton {
- id: random
- visible: bluetooth.connected == false
- offImage: './images/AGL_MediaPlayer_Shuffle_Inactive.svg'
- onImage: './images/AGL_MediaPlayer_Shuffle_Active.svg'
- }
+
//
ToggleButton {
+
//
id: random
+
//
visible: bluetooth.connected == false
+
//
offImage: './images/AGL_MediaPlayer_Shuffle_Inactive.svg'
+
//
onImage: './images/AGL_MediaPlayer_Shuffle_Active.svg'
+
//
}
ToggleButton {
id: loop
visible: bluetooth.connected == false
ToggleButton {
id: loop
visible: bluetooth.connected == false
+ checked: player.loop_state
offImage: './images/AGL_MediaPlayer_Loop_Inactive.svg'
onImage: './images/AGL_MediaPlayer_Loop_Active.svg'
offImage: './images/AGL_MediaPlayer_Loop_Inactive.svg'
onImage: './images/AGL_MediaPlayer_Loop_Active.svg'
+ onClicked: { player.loop(checked) }
}
}
ColumnLayout {
}
}
ColumnLayout {
@@
-118,13
+105,13
@@
ApplicationWindow {
Label {
id: title
Layout.alignment: Layout.Center
Label {
id: title
Layout.alignment: Layout.Center
- text: bluetooth.av_connected ? bluetooth.title : (player.
metaData.title ? player.metaData
.title : '')
+ text: bluetooth.av_connected ? bluetooth.title : (player.
title ? player
.title : '')
horizontalAlignment: Label.AlignHCenter
verticalAlignment: Label.AlignVCenter
}
Label {
Layout.alignment: Layout.Center
horizontalAlignment: Label.AlignHCenter
verticalAlignment: Label.AlignVCenter
}
Label {
Layout.alignment: Layout.Center
- text: bluetooth.av_connected ? bluetooth.artist : (player.
metaData.contributingArtist ? player.metaData.contributingA
rtist : '')
+ text: bluetooth.av_connected ? bluetooth.artist : (player.
artist ? player.a
rtist : '')
horizontalAlignment: Label.AlignHCenter
verticalAlignment: Label.AlignVCenter
font.pixelSize: title.font.pixelSize * 0.6
horizontalAlignment: Label.AlignHCenter
verticalAlignment: Label.AlignVCenter
font.pixelSize: title.font.pixelSize * 0.6
@@
-176,7
+163,7
@@
ApplicationWindow {
bluetooth.sendMediaCommand("Previous")
bluetooth.position = 0
} else {
bluetooth.sendMediaCommand("Previous")
bluetooth.position = 0
} else {
- play
list
.previous()
+ play
er
.previous()
}
}
}
}
}
}
@@
-192,7
+179,7
@@
ApplicationWindow {
}
states: [
State {
}
states: [
State {
- when: player.
playbackState === MediaPlayer.PlayingStat
e
+ when: player.
running === tru
e
PropertyChanges {
target: play
offImage: './images/AGL_MediaPlayer_Player_Pause.svg'
PropertyChanges {
target: play
offImage: './images/AGL_MediaPlayer_Player_Pause.svg'
@@
-217,7
+204,7
@@
ApplicationWindow {
if (bluetooth.av_connected) {
bluetooth.sendMediaCommand("Next")
} else {
if (bluetooth.av_connected) {
bluetooth.sendMediaCommand("Next")
} else {
- play
list
.next()
+ play
er
.next()
}
}
}
}
}
}
@@
-247,11
+234,6
@@
ApplicationWindow {
Layout.fillHeight: true
Layout.preferredHeight: 407
Layout.fillHeight: true
Layout.preferredHeight: 407
- PlaylistWithMetadata {
- id: playlistmodel
- source: playlist
- }
-
ListView {
anchors.fill: parent
id: playlistview
ListView {
anchors.fill: parent
id: playlistview
@@
-262,8
+244,8
@@
ApplicationWindow {
text: 'PLAYLIST'
opacity: 0.5
}
text: 'PLAYLIST'
opacity: 0.5
}
- model: playlist
model
- currentIndex:
playlist.currentIndex
+ model: playlist
+ currentIndex:
-1
delegate: MouseArea {
id: delegate
delegate: MouseArea {
id: delegate
@@
-273,12
+255,6
@@
ApplicationWindow {
anchors.fill: parent
anchors.leftMargin: 50
anchors.rightMargin: 50
anchors.fill: parent
anchors.leftMargin: 50
anchors.rightMargin: 50
- Image {
- source: model.coverArt
- fillMode: Image.PreserveAspectFit
- Layout.preferredWidth: delegate.height
- Layout.preferredHeight: delegate.height
- }
ColumnLayout {
Layout.fillWidth: true
Label {
ColumnLayout {
Layout.fillWidth: true
Label {
@@
-288,18
+264,18
@@
ApplicationWindow {
Label {
Layout.fillWidth: true
text: model.artist
Label {
Layout.fillWidth: true
text: model.artist
- color: '#
66FF99
'
+ color: '#
00ADDC
'
font.pixelSize: 32
}
}
font.pixelSize: 32
}
}
- Label {
- text: player.time2str(model.duration)
-
color: '#66FF99
'
- font.pixelSize: 32
- }
+
//
Label {
+
//
text: player.time2str(model.duration)
+
// color: '#00ADDC
'
+
//
font.pixelSize: 32
+
//
}
}
onClicked: {
}
onClicked: {
- play
list.currentIndex = model.index
+ play
er.pick_track(playlistview.model.get(index).index)
player.play()
}
}
player.play()
}
}