chris/harbour-sailfin
chris/harbour-sailfin
1
0
Fork 0
mirror of https://github.com/HenkKalkwater/harbour-sailfin.git synced 2024-11-22 01:05:17 +00:00
Code Issues Releases Wiki Activity

Improve PlaybackManager stability, added PlaybackBar

Browse source 
- PlaybackManager now takes ownership of set items
- PlaybackManager can play items just by their itemId, avoids useless
  item creation on the QML side of things.
- Allow calling Jellyfin::registerTypes with a different URI
- Minor code cleanup
This commit is contained in:
Chris Josten 2021-02-14 18:40:46 +01:00
parent 7e77abc173
commit b699f6e74d
12 changed files with 170 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/include/JellyfinQt/jellyfin.h
View file

@ -10,7 +10,7 @@
#include "JellyfinQt/jellyfinplaybackmanager.h"
namespace Jellyfin {
void registerTypes();
void registerTypes(const char *uri = "nl.netsoj.chris.Jellyfin");
}
#endif // JELLYFIN_H

3
core/include/JellyfinQt/jellyfinitem.h
View file

@ -302,6 +302,7 @@ class Item : public RemoteData {
Q_OBJECT
public:
Q_INVOKABLE explicit Item(QObject *parent = nullptr);
Item(QString itemId, ApiClient *apiClient, QObject *parent = nullptr);
Q_PROPERTY(QString jellyfinId READ jellyfinId WRITE setJellyfinId NOTIFY jellyfinIdChanged)
@ -473,7 +474,7 @@ protected:
QString getDataUrl() const override;
bool canReload() const override;
QString m_id;
QString m_id = QStringLiteral("");
QString m_name;
QString m_originalTitle;
QString m_serverId;

6
core/include/JellyfinQt/jellyfinplaybackmanager.h
View file

@ -89,6 +89,12 @@ signals:
public slots:
void updatePlaybackInfo();
/**
* @brief playItem Plays the item with the given id. This will construct the Jellyfin::Item internally
* and delete it later.
* @param itemId The id of the item to play.
*/
void playItem(const QString &itemId);
private slots:
void mediaPlayerStateChanged(QMediaPlayer::State newState);
void mediaPlayerPositionChanged(qint64 position);

13
core/src/jellyfin.cpp
View file

@ -19,19 +19,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include "JellyfinQt/jellyfin.h"
namespace Jellyfin {
void registerTypes() {
const char* QML_NAMESPACE = "nl.netsoj.chris.Jellyfin";
void registerTypes(const char *uri) {
// Singletons are perhaps bad, but they are convenient :)
qmlRegisterSingletonType<Jellyfin::ApiClient>(QML_NAMESPACE, 1, 0, "ApiClient", [](QQmlEngine *eng, QJSEngine *js) {
qmlRegisterSingletonType<Jellyfin::ApiClient>(uri, 1, 0, "ApiClient", [](QQmlEngine *eng, QJSEngine *js) {
Q_UNUSED(eng)
Q_UNUSED(js)
return dynamic_cast<QObject*>(new Jellyfin::ApiClient());
});
qmlRegisterType<Jellyfin::ServerDiscoveryModel>(QML_NAMESPACE, 1, 0, "ServerDiscoveryModel");
qmlRegisterType<Jellyfin::PlaybackManager>(QML_NAMESPACE, 1, 0, "PlaybackManager");
qmlRegisterType<Jellyfin::ServerDiscoveryModel>(uri, 1, 0, "ServerDiscoveryModel");
qmlRegisterType<Jellyfin::PlaybackManager>(uri, 1, 0, "PlaybackManager");
// API models
Jellyfin::registerModels(QML_NAMESPACE);
Jellyfin::registerSerializableJsonTypes(QML_NAMESPACE);
Jellyfin::registerModels(uri);
Jellyfin::registerSerializableJsonTypes(uri);
}
}

2
core/src/jellyfinapiclient.cpp
View file

@ -25,8 +25,6 @@ ApiClient::ApiClient(QObject *parent)
: QObject(parent),
m_webSocket(new WebSocket(this)) {
m_deviceName = QHostInfo::localHostName();
uint uuid1 = qHash(m_deviceName);
uint uuid2 = qHash(QSysInfo::productVersion());
m_deviceId = QUuid::createUuid().toString(); // TODO: make this not random?
m_credManager = CredentialsManager::newInstance(this);

10
core/src/jellyfinitem.cpp
View file

@ -54,7 +54,7 @@ void JsonSerializable::deserialize(const QJsonObject &jObj) {
QMetaProperty realProp = obj->property(obj->indexOfProperty(prop.name() + 8));
if (!realProp.write(this, jsonToVariant(prop, val, jObj))) {
qDebug() << "Write to " << prop.name() << "failed";
};
}
}
}
}
@ -328,6 +328,14 @@ Item::Item(QObject *parent) : RemoteData(parent) {
});
}
Item::Item(QString id, ApiClient *apiClient, QObject *parent)
: RemoteData(parent), m_id(id) {
connect(this, &RemoteData::apiClientChanged, this, [this](ApiClient *newApiClient) {
connect(newApiClient, &ApiClient::userDataChanged, this, &Item::onUserDataChanged);
});
setApiClient(apiClient);
}
QString Item::getDataUrl() const {
return QString("/Users/") + m_apiClient->userId() + "/Items/" + m_id;
}

21
core/src/jellyfinplaybackmanager.cpp
View file

@ -99,7 +99,13 @@ void PlaybackManager::fetchStreamUrl() {
void PlaybackManager::setItem(Item *newItem) {
if (m_mediaPlayer != nullptr) m_mediaPlayer->stop();
// If we own the item, delete it.
if (m_item != nullptr && m_item->parent() == this) {
m_item->deleteLater();
}
this->m_item = newItem;
emit itemChanged(newItem);
// Don't try to start fetching when we're not completely parsed yet.
if (m_qmlIsParsingComponent) return;
@ -110,6 +116,16 @@ void PlaybackManager::setItem(Item *newItem) {
// Deinitialize the streamUrl
setStreamUrl("");
if (newItem != nullptr) {
if (newItem->parent() != this) {
// The new item may outlive the lifetime of the element it was created on. In the Sailfish
// application for example, the player is given an Jellyfin::Item that sits on a Page on a PageStack.
// As soon as the user pops the Page from the PageStack, newItem would be destroyed. Therefore, we
// take ownership of the given newItem, as this object will usually exist throughout the lifetime of
// the application. A better solution would be to create a copy of the newItem, but no way I'm going
// to create an handwritten copy of that.
QQmlEngine::setObjectOwnership(newItem, QQmlEngine::ObjectOwnership::CppOwnership);
newItem->setParent(this);
}
if (m_item->status() == RemoteData::Ready) {
fetchStreamUrl();
} else {
@ -192,6 +208,11 @@ void PlaybackManager::updatePlaybackInfo() {
postPlaybackInfo(Progress);
}
void PlaybackManager::playItem(const QString &itemId) {
Item *newItem = new Item(itemId, m_apiClient, this);
setItem(newItem);
}
void PlaybackManager::postPlaybackInfo(PlaybackInfoType type) {
QJsonObject root;

1
sailfish/CMakeLists.txt
View file

@ -29,6 +29,7 @@ set(sailfin_QML_SOURCES
qml/components/LibraryItemDelegate.qml
qml/components/MoreSection.qml
qml/components/PlainLabel.qml
qml/components/PlaybackBar.qml
qml/components/PlayToolbar.qml
qml/components/RemoteImage.qml
qml/components/Shim.qml

106
sailfish/qml/components/PlaybackBar.qml Normal file
View file

@ -0,0 +1,106 @@
/*
Sailfin: a Jellyfin client written using Qt
Copyright (C) 2021 Chris Josten
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
import QtQuick 2.6
import QtQuick.Layouts 1.1
import QtMultimedia 5.6
import Sailfish.Silica 1.0
import nl.netsoj.chris.Jellyfin 1.0
import "../"
/**
*
* +---+--------------------------------------+
* |\ /| +---+ |
* | \ / | Media title | | |
* | X | | ⏸︎| |
* | / \ | Artist 1, artist 2 | | |
* |/ \| +---+ |
* +-----+------------------------------------+
*/
DockedPanel {
height: content.height
width: parent.width
property PlaybackManager manager
RowLayout {
id: content
width: parent.width
height: Theme.itemSizeLarge
RemoteImage {
Layout.fillHeight: true
Layout.preferredWidth: content.height
blurhash: manager.item.imageBlurHashes["Primary"][manager.item.imageTags["Primary"]]
source: Utils.itemImageUrl(ApiClient.baseUrl, manager.item, "Primary", {"maxWidth": parent.width})
fillMode: Image.PreserveAspectCrop
}
Item { height: 1; Layout.preferredWidth: Theme.paddingMedium; } // Padding
Column {
Layout.fillWidth: true
Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
Layout.minimumWidth: 10 * Theme.pixelRatio
Label {
text: manager.item == null ? qsTr("No media selected") : manager.item.name
width: parent.width
font.pixelSize: Theme.fontSizeMedium
truncationMode: TruncationMode.Fade
}
Label {
text: {
if (manager.item == null) return qsTr("Play some media!")
console.log(manager.item.type)
switch(manager.item.type) {
case "Audio":
return manager.item.artists.join(", ")
}
}
width: parent.width
font.pixelSize: Theme.fontSizeSmall
truncationMode: TruncationMode.Fade
color: highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor
}
}
Item { height: 1; Layout.preferredWidth: Theme.paddingMedium; } // Padding
IconButton {
id: playButton
Layout.preferredHeight: Theme.iconSizeMedium
Layout.preferredWidth: Theme.iconSizeMedium
icon.source: appWindow.mediaPlayer.playbackState === MediaPlayer.PlayingState
? "image://theme/icon-m-pause" : "image://theme/icon-m-play"
onClicked: appWindow.mediaPlayer.playbackState === MediaPlayer.PlayingState
? appWindow.mediaPlayer.pause()
: appWindow.mediaPlayer.play()
}
Item { height: 1; Layout.preferredWidth: Theme.paddingMedium; } // Padding
}
ProgressBar {
anchors.verticalCenter: parent.top
width: parent.width
leftMargin: Theme.itemSizeLarge
rightMargin: 0
minimumValue: 0
value: appWindow.mediaPlayer.position
maximumValue: appWindow.mediaPlayer.duration
indeterminate: [MediaPlayer.Loading, MediaPlayer.Buffering].indexOf(appWindow.mediaPlayer.status) >= 0
}
}

18
sailfish/qml/harbour-sailfin.qml
View file

@ -43,6 +43,18 @@ ApplicationWindow {
// Bad way to implement settings, but it'll do for now.
property bool showDebugInfo: false
property bool _hidePlaybackBar: false
Connections {
target: pageStack
onCurrentPageChanged: {
_hidePlaybackBar = "__videoPlaybackPage" in pageStack.currentPage
console.log("Current page changed: " + _hidePlaybackBar)
}
}
bottomMargin: playbackBar.visibleSize
//FIXME: proper error handling
Connections {
target: ApiClient
@ -119,7 +131,9 @@ ApplicationWindow {
preventBlanking: _mediaPlayer.playbackState == MediaPlayer.PlayingState && _mediaPlayer.hasVideo
}
DockedPanel {
PlaybackBar {
id: playbackBar
open: !_hidePlaybackBar//_mediaPlayer.playbackState != MediaPlayer.StoppedState
manager: _playbackManager
}
}

1
sailfish/qml/pages/VideoPage.qml
View file

@ -31,6 +31,7 @@ import nl.netsoj.chris.Jellyfin 1.0
Page {
id: videoPage
property bool __videoPlaybackPage: true
property JellyfinItem itemData
property int audioTrack
property int subtitleTrack

3
sailfish/qml/pages/itemdetails/MusicAlbumPage.qml
View file

@ -78,8 +78,7 @@ BaseDetailPage {
artists: model.artists
duration: model.runTimeTicks
indexNumber: model.indexNumber
onClicked: window.playbackManager.item = Qt.createQmlObject("import nl.netsoj.chris.Jellyfin 1.0;"
+ "JellyfinItem { jellyfinId: \"" + model.id + "\"; apiClient: ApiClient; }", songDelegate, "nonexistent.qml");
onClicked: window.playbackManager.playItem(model.id)
}
VerticalScrollDecorator {}