[PATCH 2/3] Tie in Scrobbler skeleton into MythMusic
Jonathan Martens
jonathan at lpt-093-cos6.snetram.nl
Thu Mar 29 20:34:21 UTC 2012
---
mythplugins/mythmusic/mythmusic/musicplayer.cpp | 27 +++++++++++++++++++++++
mythplugins/mythmusic/mythmusic/musicplayer.h | 4 +++
mythplugins/mythmusic/mythmusic/mythmusic.pro | 4 +++
3 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/mythplugins/mythmusic/mythmusic/musicplayer.cpp b/mythplugins/mythmusic/mythmusic/musicplayer.cpp
index b0cccf5..16def4a 100644
--- a/mythplugins/mythmusic/mythmusic/musicplayer.cpp
+++ b/mythplugins/mythmusic/mythmusic/musicplayer.cpp
@@ -26,6 +26,7 @@
#include "mainvisual.h"
#include "miniplayer.h"
#include "playlistcontainer.h"
+#include "scrobbler.h"
// how long to wait before updating the lastplay and playcount fields
#define LASTPLAY_DELAY 15
@@ -195,6 +196,19 @@ void MusicPlayer::addVisual(MainVisual *visual)
}
}
+void MusicPlayer::addScrobbler(Scrobbler *scrobbler)
+{
+ if (scrobbler)
+ {
+ if (m_output)
+ {
+ m_output->addListener(scrobbler);
+ }
+
+// m_scrobblers.insert(scrobbler);
+ }
+}
+
void MusicPlayer::removeVisual(MainVisual *visual)
{
if (visual)
@@ -209,6 +223,19 @@ void MusicPlayer::removeVisual(MainVisual *visual)
}
}
+void MusicPlayer::removeScrobbler(Scrobbler *scrobbler)
+{
+ if (scrobbler)
+ {
+ if (m_output)
+ {
+ m_output->removeListener(scrobbler);
+ }
+
+// m_scrobblers.remove(scrobbler);
+ }
+}
+
void MusicPlayer::loadSettings(void )
{
QString resumestring = gCoreContext->GetSetting("ResumeMode", "off");
diff --git a/mythplugins/mythmusic/mythmusic/musicplayer.h b/mythplugins/mythmusic/mythmusic/musicplayer.h
index b40585b..f2f244e 100644
--- a/mythplugins/mythmusic/mythmusic/musicplayer.h
+++ b/mythplugins/mythmusic/mythmusic/musicplayer.h
@@ -14,6 +14,7 @@ class AudioOutput;
class MainVisual;
class Playlist;
class CDWatcherThread;
+class Scrobbler;
class MusicPlayerEvent : public MythEvent
{
@@ -63,6 +64,9 @@ class MusicPlayer : public QObject, public MythObservable
void addVisual(MainVisual *visual);
void removeVisual(MainVisual *visual);
+ void addScrobbler(Scrobbler *scrobbler);
+ void removeScrobbler(Scrobbler *scrobbler);
+
void setCDDevice(const QString &dev) { m_CDdevice = dev; }
void toggleMute(void);
diff --git a/mythplugins/mythmusic/mythmusic/mythmusic.pro b/mythplugins/mythmusic/mythmusic/mythmusic.pro
index 585d991..0bfe7f1 100644
--- a/mythplugins/mythmusic/mythmusic/mythmusic.pro
+++ b/mythplugins/mythmusic/mythmusic/mythmusic.pro
@@ -43,6 +43,8 @@ HEADERS += visualizerview.h searchview.h musicutils.h
HEADERS += generalsettings.h visualizationsettings.h
HEADERS += importsettings.h playersettings.h ratingsettings.h
+HEADERS += scrobbler.h
+
SOURCES += decoder.cpp
SOURCES += flacencoder.cpp main.cpp
SOURCES += mainvisual.cpp metadata.cpp playlist.cpp
@@ -65,6 +67,8 @@ SOURCES += visualizerview.cpp searchview.cpp musicutils.cpp
SOURCES += generalsettings.cpp visualizationsettings.cpp
SOURCES += importsettings.cpp playersettings.cpp ratingsettings.cpp
+SOURCES += scrobbler.cpp
+
cdio {
INCLUDEPATH -= $${SYSROOT}/usr/include/cdda
INCLUDEPATH *= $${SYSROOT}/usr/include/cdio
--
1.7.1
--------------080001040401040101060503
Content-Type: text/plain;
name="0003-Make-the-customEvent-function-only-trigger-on-TrackC.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename*0="0003-Make-the-customEvent-function-only-trigger-on-TrackC.pa";
filename*1="tch"
More information about the mythtv-dev
mailing list