Get metadata from main window instead

kraxarn · Apr 12, 2020 · 2326ec9 · 2326ec9
1 parent 5c63d71
commit 2326ec9
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 16 deletions.
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -791,4 +791,9 @@ QStringList MainWindow::currentTracks()
 	for (int i = 0; i < songs->topLevelItemCount(); i++)
 		tracks.append(songs->topLevelItem(i)->data(0, RoleTrackId).toString());
 	return tracks;
-}
+}
+
+spt::Playback MainWindow::currentPlayback()
+{
+	return current;
+}
diff --git a/src/mainwindow.hpp b/src/mainwindow.hpp
@@ -65,6 +65,7 @@ class MainWindow : public QMainWindow
 	QPixmap getImage(const QString &type, const QString &url);
 	void refreshPlaylist(spt::Playlist &playlist, bool force = false);
 	bool loadPlaylist(spt::Playlist &playlist);
+	spt::Playback currentPlayback();
 	// I know these should be methods, I'm just lazy
 	QString					cacheLocation;
 	QVector<spt::Playlist>	*sptPlaylists;

diff --git a/src/mediaplayer/mediaplayerplayer.cpp b/src/mediaplayer/mediaplayerplayer.cpp
@@ -5,7 +5,6 @@ using namespace mp;
 MediaPlayerPlayer::MediaPlayerPlayer(spt::Spotify *spotify, QObject *parent)
 : spotify(spotify), dBus(QDBusConnection::sessionBus()), QDBusAbstractAdaptor(parent)
 {
-	currentPlayback = spotify->currentPlayback();
 }
 
 void MediaPlayerPlayer::Next() const
@@ -25,7 +24,7 @@ void MediaPlayerPlayer::Play() const
 
 void MediaPlayerPlayer::PlayPause() const
 {
-	if (spotify->currentPlayback().isPlaying)
+	if (currentPlayback().isPlaying)
 		spotify->pause();
 	else
 		spotify->resume();
@@ -57,12 +56,12 @@ bool MediaPlayerPlayer::canControl() const
 }
 QMap<QString, QVariant> MediaPlayerPlayer::metadata() const
 {
-	return spotify->currentPlayback().metadata();
+	return currentPlayback().metadata();
 }
 
 double MediaPlayerPlayer::getVolume() const
 {
-	return spotify->currentPlayback().volume / 100.0;
+	return currentPlayback().volume / 100.0;
 }
 
 void MediaPlayerPlayer::setVolume(double value) const
@@ -72,12 +71,12 @@ void MediaPlayerPlayer::setVolume(double value) const
 
 qint64 MediaPlayerPlayer::position() const
 {
-	return spotify->currentPlayback().progressMs * 1000;
+	return currentPlayback().progressMs * 1000;
 }
 
 QString MediaPlayerPlayer::playbackStatus() const
 {
-	return spotify->currentPlayback().isPlaying ? "Playing" : "Paused";
+	return currentPlayback().isPlaying ? "Playing" : "Paused";
 }
 
 void MediaPlayerPlayer::OpenUri(QString uri) const
@@ -98,7 +97,7 @@ void MediaPlayerPlayer::setPlaybackRate(double value) const
 
 bool MediaPlayerPlayer::shuffle() const
 {
-	return spotify->currentPlayback().shuffle;
+	return currentPlayback().shuffle;
 }
 
 void MediaPlayerPlayer::setShuffle(bool value) const
@@ -109,31 +108,31 @@ void MediaPlayerPlayer::setShuffle(bool value) const
 void MediaPlayerPlayer::emitMetadataChange() const
 {
 	QVariantMap properties;
-	properties["Metadata"] = spotify->currentPlayback().metadata();
+	properties["Metadata"] = currentPlayback().metadata();
 	Service::signalPropertiesChange(this, properties);
 }
 
 void MediaPlayerPlayer::currentSourceChanged() const
 {
 	QVariantMap properties;
-	properties["Metadata"] = currentPlayback.metadata();
-	properties["PlaybackStatus"] = currentPlayback.isPlaying ? "Playing" : "Paused";
+	properties["Metadata"] = currentPlayback().metadata();
+	properties["PlaybackStatus"] = currentPlayback().isPlaying ? "Playing" : "Paused";
 	//properties["CanSeek"] = true;
 	Service::signalPropertiesChange(this, properties);
 }
 
 void MediaPlayerPlayer::stateUpdated() const
 {
 	QVariantMap properties;
-	properties["PlaybackStatus"] = spotify->currentPlayback().isPlaying ? "Playing" : "Paused";
+	properties["PlaybackStatus"] = currentPlayback().isPlaying ? "Playing" : "Paused";
 	//properties["CanPause"] = true;
 	Service::signalPropertiesChange(this, properties);
 }
 
 void MediaPlayerPlayer::totalTimeChanged() const
 {
 	QVariantMap properties;
-	properties["Metadata"] = currentPlayback.metadata();
+	properties["Metadata"] = currentPlayback().metadata();
 	Service::signalPropertiesChange(this, properties);
 }
 
@@ -147,7 +146,7 @@ void MediaPlayerPlayer::seekableChanged(bool seekable) const
 void MediaPlayerPlayer::volumeChanged() const
 {
 	QVariantMap properties;
-	properties["Volume"] = spotify->currentPlayback().volume / 100.0;
+	properties["Volume"] = currentPlayback().volume / 100.0;
 	Service::signalPropertiesChange(this, properties);
 }
 
@@ -158,5 +157,9 @@ void MediaPlayerPlayer::tick(qint64 newPos)
 
 void MediaPlayerPlayer::setCurrentPlayback(const spt::Playback &playback)
 {
-	currentPlayback = playback;
+}
+
+spt::Playback MediaPlayerPlayer::currentPlayback() const
+{
+	return ((Service*) parent())->currentPlayback();
 }
diff --git a/src/mediaplayer/mediaplayerplayer.hpp b/src/mediaplayer/mediaplayerplayer.hpp
@@ -4,6 +4,7 @@ namespace mp { class MediaPlayerPlayer; }
 
 #include "../spotify/spotify.hpp"
 #include "../mainwindow.hpp"
+#include "service.hpp"
 
 #include <QDBusConnection>
 #include <QDebug>
@@ -81,6 +82,7 @@ namespace mp
 	private:
 		QDBusConnection	dBus;
 		spt::Spotify	*spotify;
-		spt::Playback	currentPlayback;
+
+		spt::Playback currentPlayback() const;
 	};
 }
diff --git a/src/mediaplayer/service.cpp b/src/mediaplayer/service.cpp
@@ -64,6 +64,11 @@ void Service::tick(qint64 newPos)
 	emit playerPlayer->tick(newPos);
 }
 
+spt::Playback Service::currentPlayback()
+{
+	return ((MainWindow*) parent())->currentPlayback();
+}
+
 /*void Service::updateMetadata(const QVariantMap &metadata)
 {
 	//properties->updateMetadata(metadata);

diff --git a/src/mediaplayer/service.hpp b/src/mediaplayer/service.hpp
@@ -18,6 +18,8 @@ namespace mp
 		Service(spt::Spotify *spotify, QObject *parent);
 		virtual ~Service();
 
+		spt::Playback currentPlayback();
+
 		static void signalPropertiesChange(const QObject* adaptor, const QVariantMap& properties);
 
 		void metadataChanged();