From 9610a7a85e0ce5b34ae70fffec2aaceaf3cf5e76 Mon Sep 17 00:00:00 2001
From: Kevin Whitaker <eyecreate@eyecreate.org>
Date: Tue, 9 Apr 2019 12:05:36 -0400
Subject: [PATCH] Move TCP service to after rest inits. Give playlist a key for
 stringlist.

---
 src/minimediaplayer.cpp  | 1 +
 src/simplecastengine.cpp | 7 ++++---
 src/simplecastengine.h   | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/minimediaplayer.cpp b/src/minimediaplayer.cpp
index b4ed120..59a79a7 100644
--- a/src/minimediaplayer.cpp
+++ b/src/minimediaplayer.cpp
@@ -29,6 +29,7 @@ MiniMediaPlayer::MiniMediaPlayer(QObject *parent) : QObject(parent)
     connect(m_player,SIGNAL(positionChanged(qint64)),this,SLOT(positionChanged(qint64)));
 }
 
+
 bool MiniMediaPlayer::isPlaying()
 {
     return m_player->state() == QMediaPlayer::State::PlayingState;
diff --git a/src/simplecastengine.cpp b/src/simplecastengine.cpp
index 040e801..6d5b5cf 100644
--- a/src/simplecastengine.cpp
+++ b/src/simplecastengine.cpp
@@ -22,15 +22,16 @@
 #include "simplecastservice.h"
 
 SimpleCastEngine::SimpleCastEngine(QObject *parent, const QVariantList &args)
-    : Plasma::DataEngine(parent,args), player(new MiniMediaPlayer(this)), tcpService(player,this)
+    : Plasma::DataEngine(parent,args), player(new MiniMediaPlayer(this))
 {
     Q_UNUSED(args)
+    tcpService = new SimpleCastTcpService(player,this);
     setMinimumPollingInterval(333);
     connect(player,SIGNAL(playStateChanged(bool)),this,SLOT(playStateChanged(bool)));
     connect(player,SIGNAL(trackDurationChanged(qint64)),this,SLOT(durationChanged(qint64)));
     connect(player,SIGNAL(trackPositionChanged(qint64)),this,SLOT(positionChanged(qint64)));
     connect(player,SIGNAL(playlistChanged(QStringList)),this,SLOT(playlistChanged(QStringList)));
-    tcpService.listen(QHostAddress::Any,54634);
+    tcpService->listen(QHostAddress::Any,54634);
 }
 
 void SimpleCastEngine::durationChanged(qint64 length)
@@ -55,7 +56,7 @@ bool SimpleCastEngine::sourceRequestEvent(const QString& source)
 
 void SimpleCastEngine::playlistChanged(QStringList playlist)
 {
-    setData("Playlist",playlist);
+    setData("Playlist","trackNames",playlist);
 }
 
 bool SimpleCastEngine::updateSourceEvent(const QString& source)
diff --git a/src/simplecastengine.h b/src/simplecastengine.h
index a7ed0cd..e0fdaab 100644
--- a/src/simplecastengine.h
+++ b/src/simplecastengine.h
@@ -46,8 +46,8 @@ private slots:
 protected:
     bool sourceRequestEvent(const QString &source) override;
     bool updateSourceEvent(const QString &source) override;
-    MiniMediaPlayer *player;
-    SimpleCastTcpService tcpService;    
+    SimpleCastTcpService *tcpService; 
+    MiniMediaPlayer *player;   
 };
 
 #endif // SIMPLECASTENGINE_H
-- 
GitLab