/*
* Copyright (C) 2016 The Qt Company Ltd.
+ * Copyright (C) 2017 Toyota Motor Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import QtMultimedia 5.6
import AGL.Demo.Controls 1.0
import MediaPlayer 1.0
+import QtQml.StateMachine 1.0 as MPSM
import 'api' as API
ApplicationWindow {
id: root
+
+ property int sourceID: 0
+ property int connectionID
+ property int sourceIndex
- Item {
- id: bluetooth
- property bool connected: false
- property string state
-
- property string artist
- property string title
- property int duration: 0
- property int position: 0
- property int pos_offset: 0
-
- function disableBluetooth() {
- bluetooth.artist = ''
- bluetooth.title = ''
- bluetooth.duration = 0
- bluetooth.position = 0
- bluetooth.pos_offset = 0
- bluetooth.connected = false
- }
- }
+ signal playMediaplayer
+ signal stopMediaplayer
+ signal disconnected
+ signal paused
+ signal connected
API.LightMediaScanner {
id: binding
url: bindingAddress
}
- Connections {
- target: dbus
-
- onProcessPlaylistHide: {
- playlistview.visible = false
- player.stop()
- }
-
- onProcessPlaylistShow: {
- playlistview.visible = true
- bluetooth.disableBluetooth()
- }
-
- onDisplayBluetoothMetadata: {
- if (avrcp_artist)
- bluetooth.artist = avrcp_artist
- if (avrcp_title)
- bluetooth.title = avrcp_title
- bluetooth.duration = avrcp_duration
- bluetooth.pos_offset = 0
- }
-
- onUpdatePlayerStatus: {
- bluetooth.connected = true
- bluetooth.state = status
- }
-
- onUpdatePosition: {
- slider.value = current_position
- bluetooth.position = current_position
- }
+ API.BluetoothManager {
+ id: bluetooth
+ url: bindingAddress
}
MediaPlayer {
autoLoad: true
playlist: playlist
- property bool is_bluetooth: false
function time2str(value) {
return Qt.formatTime(new Date(value), 'mm:ss')
}
- onPositionChanged: slider.value = player.position
+ }
+
+ MPSM.StateMachine{
+ id: mediaplayerState
+ initialState: stop
+ running: true
+ MPSM.State{
+ id: haveSoundRight
+ MPSM.SignalTransition{
+ targetState: stop
+ signal: disconnected
+ }
+ MPSM.SignalTransition{
+ targetState: pause
+ signal: paused
+ }
+ MPSM.SignalTransition{
+ targetState: playing
+ signal: playMediaplayer
+ }
+ onEntered: {
+ console.log("enter haveSoundRight")
+ }
+ onExited : {
+ // Nothing to do
+ }
+ }
+ MPSM.State{
+ id: stop
+ MPSM.SignalTransition{
+ targetState: haveSoundRight
+ signal: connected
+ }
+ onEntered: {
+ console.log("enter stop state")
+ }
+ onExited : {
+ // Nothing to do
+ }
+ }
+ MPSM.State{
+ id: pause
+ MPSM.SignalTransition{
+ targetState: haveSoundRight
+ signal: connected
+ }
+ MPSM.SignalTransition{
+ targetState: stop
+ signal: disconnected
+ }
+ onEntered: {
+ console.log("enter pause state")
+ }
+ onExited : {
+ // Nothing to do
+ }
+ }
+ MPSM.State{
+ id: playing
+ MPSM.SignalTransition{
+ targetState: haveSoundRight
+ signal: stopMediaplayer
+ }
+ MPSM.SignalTransition{
+ targetState: lostSoundRight
+ signal: disconnected
+ }
+ onEntered: {
+ console.log("enter playing state")
+ player.play()
+ }
+ onExited : {
+ player.pause()
+ }
+ }
+ MPSM.State{
+ id: lostSoundRight
+ MPSM.SignalTransition{
+ targetState: playing
+ signal: connected
+ }
+ onEntered: {
+ console.log("enter lostSoundRight")
+ }
+ onExited : {
+ }
+ }
+ MPSM.State{
+ id: temporaryLostSoundRight
+ MPSM.SignalTransition{
+ targetState: playing
+ signal: connected
+ }
+ MPSM.SignalTransition{
+ targetState: lostSoundRight
+ signal: disconnected
+ }
+ onEntered: {
+ console.log("enter lostSoundRight")
+ }
+ onExited : {
+ }
+ }
+ }
+
+ function slotReply(msg){
+ var jstr = JSON.stringify(msg)
+ var content = JSON.parse(jstr);
+ var verb = content.response.verb
+ var err = content.response.error
+ switch(verb)
+ {
+ case "connect":
+ if(err == 0){
+ connectionID = content.response.mainConnectionID
+ }
+ break;
+ case "registerSource":
+ if(err == 0){
+ sourceID = content.response.sourceID
+ }
+ }
+ }
+
+ function slotEvent(event,msg){
+ var jstr = JSON.stringify(msg)
+ var content = JSON.parse(jstr);
+ var eventName = content.event
+ switch(eventName)
+ {
+ case "soundmanager\/asyncSetSourceState":
+ // This event doesn't come for now
+ if(sourceID == content.data.sourceID){
+ console.log("mediaplayer: call ackSetSourceState")
+ smw.ackSetSourceState(content.data.handle, 0)
+ switch(content.data.sourceState){
+ case "on":
+ connected()
+ break;
+ case "off":
+ disconnected()
+ break;
+ case "paused":
+ paused()
+ break;
+ default:
+ break;
+ }
+ }
+ break;
+ default:
+ break;
+ }
}
Timer {
id: timer
interval: 250
- running: (bluetooth.connected && bluetooth.state == "playing")
+ running: (bluetooth.av_connected && bluetooth.state == "playing")
repeat: true
onTriggered: {
- bluetooth.position = dbus.getCurrentPosition() - bluetooth.pos_offset
+ bluetooth.position = bluetooth.position + 250
slider.value = bluetooth.position
}
}
height: sourceSize.height * width / sourceSize.width
fillMode: Image.PreserveAspectCrop
source: player.metaData.coverArtImage ? player.metaData.coverArtImage : ''
- visible: bluetooth.connected == false
+ visible: bluetooth.av_connected == false
}
Item {
Label {
id: title
Layout.alignment: Layout.Center
- text: bluetooth.title ? bluetooth.title : (player.metaData.title ? player.metaData.title : '')
+ text: bluetooth.av_connected ? bluetooth.title : (player.metaData.title ? player.metaData.title : '')
horizontalAlignment: Label.AlignHCenter
verticalAlignment: Label.AlignVCenter
}
Label {
Layout.alignment: Layout.Center
- text: bluetooth.artist ? bluetooth.artist : (player.metaData.contributingArtist ? player.metaData.contributingArtist : '')
+ text: bluetooth.av_connected ? bluetooth.artist : (player.metaData.contributingArtist ? player.metaData.contributingArtist : '')
horizontalAlignment: Label.AlignHCenter
verticalAlignment: Label.AlignVCenter
font.pixelSize: title.font.pixelSize * 0.6
Slider {
id: slider
Layout.fillWidth: true
- to: bluetooth.connected ? bluetooth.duration : player.duration
- enabled: bluetooth.connected == false
+ to: bluetooth.av_connected ? bluetooth.duration : player.duration
+ enabled: bluetooth.av_connected == false
+ value: bluetooth.av_connected ? bluetooth.position : player.position
function getPosition() {
- if (bluetooth.connected && bluetooth.position) {
+ if (bluetooth.av_connected) {
return player.time2str(bluetooth.position)
}
return player.time2str(player.position)
anchors.right: parent.right
anchors.bottom: parent.top
font.pixelSize: 32
- text: bluetooth.connected ? player.time2str(bluetooth.duration) : player.time2str(player.duration)
+ text: bluetooth.av_connected ? player.time2str(bluetooth.duration) : player.time2str(player.duration)
}
onPressedChanged: player.seek(value)
}
id: previous
offImage: './images/AGL_MediaPlayer_BackArrow.svg'
onClicked: {
- if (bluetooth.connected) {
- bluetooth.pos_offset = dbus.getCurrentPosition()
- dbus.processQMLEvent("Previous")
+ if (bluetooth.av_connected) {
+ bluetooth.sendMediaCommand("Previous")
+ bluetooth.position = 0
} else {
playlist.previous()
}
id: play
offImage: './images/AGL_MediaPlayer_Player_Play.svg'
onClicked: {
- if (bluetooth.connected) {
- dbus.processQMLEvent("Play")
+ if (bluetooth.av_connected) {
+ bluetooth.sendMediaCommand("Play")
} else {
- player.play()
+ playMediaplayer()
}
}
states: [
PropertyChanges {
target: play
offImage: './images/AGL_MediaPlayer_Player_Pause.svg'
- onClicked: player.pause()
+ onClicked: {
+ stopMediaplayer()
+ }
}
},
State {
- when: bluetooth.connected && bluetooth.state == "playing"
+ when: bluetooth.av_connected && bluetooth.state == "playing"
PropertyChanges {
target: play
offImage: './images/AGL_MediaPlayer_Player_Pause.svg'
- onClicked: dbus.processQMLEvent("Pause")
+ onClicked: bluetooth.sendMediaCommand("Pause")
}
}
id: forward
offImage: './images/AGL_MediaPlayer_ForwardArrow.svg'
onClicked: {
- if (bluetooth.connected) {
- dbus.processQMLEvent("Next")
+ if (bluetooth.av_connected) {
+ bluetooth.sendMediaCommand("Next")
} else {
playlist.next()
}
}
Item { Layout.fillWidth: true }
-// Image {
-// source: './images/AGL_MediaPlayer_Bluetooth_Inactive.svg'
-// }
-// Image {
-// source: './images/AGL_MediaPlayer_Radio_Inactive.svg'
-// }
+
+ ToggleButton {
+ visible: bluetooth.connected
+ checked: bluetooth.av_connected
+ offImage: './images/AGL_MediaPlayer_Bluetooth_Inactive.svg'
+ onImage: './images/AGL_MediaPlayer_Bluetooth_Active.svg'
+
+ onClicked: {
+ if (bluetooth.av_connected) {
+ bluetooth.disconnect_profiles()
+ } else {
+ bluetooth.connect_profiles()
+ }
+ }
+ }
}
}
}
Layout.fillHeight: true
Layout.preferredHeight: 407
- PlaylistWithMetadata {
- id: playlistmodel
+ PlaylistWithMetadata {
+ id: playlistmodel
source: playlist
}
ListView {
anchors.fill: parent
id: playlistview
+ visible: bluetooth.av_connected == false
clip: true
header: Label {
x: 50
}
onClicked: {
playlist.currentIndex = model.index
- player.play()
+ sourceIndex = model.index;
+ console.log("mediaplayer: call connect")
+ playMediaplayer()
}
}
}
}
}
+ Component.onCompleted: {
+ smw.registerSource("mediaplayer")
+ }
}
}
Code Review / apps / mediaplayer.git / blobdiff