mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 15:47:38 +02:00
Code Issues Releases Wiki Activity

Convert sip plugin to a weak pointer so we can check its validity before running invokeMethod on it

Browse Source
This commit is contained in:
Jeff Mitchell
2012-04-10 18:36:35 -04:00
parent 619373c2e5
commit 2b09915a0d
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/accounts/xmpp/XmppInfoPlugin.cpp
View File

@@ -33,7 +33,7 @@
// remove now playing status after PAUSE_TIMEOUT seconds // remove now playing status after PAUSE_TIMEOUT seconds
static const int PAUSE_TIMEOUT = 60; static const int PAUSE_TIMEOUT = 60;
Tomahawk::InfoSystem::XmppInfoPlugin::XmppInfoPlugin(XmppSipPlugin* sipPlugin) Tomahawk::InfoSystem::XmppInfoPlugin::XmppInfoPlugin( XmppSipPlugin* sipPlugin )
: m_sipPlugin( sipPlugin ) : m_sipPlugin( sipPlugin )
, m_pubSubManager( 0 ) , m_pubSubManager( 0 )
, m_pauseTimer( this ) , m_pauseTimer( this )
@@ -67,11 +67,11 @@ Tomahawk::InfoSystem::XmppInfoPlugin::~XmppInfoPlugin()
void void
Tomahawk::InfoSystem::XmppInfoPlugin::pushInfo( Tomahawk::InfoSystem::InfoPushData pushData ) Tomahawk::InfoSystem::XmppInfoPlugin::pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
{ {
tDebug() << Q_FUNC_INFO << m_sipPlugin->m_client->jid().full(); tDebug() << Q_FUNC_INFO << m_sipPlugin.data()->m_client->jid().full();
if( m_sipPlugin->m_account->configuration().value("publishtracks").toBool() == false ) if( m_sipPlugin.data()->m_account->configuration().value("publishtracks").toBool() == false )
{ {
tDebug() << Q_FUNC_INFO << m_sipPlugin->m_client->jid().full() << "Not publishing now playing info (disabled in account config)"; tDebug() << Q_FUNC_INFO << m_sipPlugin.data()->m_client->jid().full() << "Not publishing now playing info (disabled in account config)";
return; return;
} }
@@ -121,7 +121,7 @@ Tomahawk::InfoSystem::XmppInfoPlugin::audioStarted( const Tomahawk::InfoSystem::
} }
Tomahawk::InfoSystem::InfoStringHash info = map[ "trackinfo" ].value< Tomahawk::InfoSystem::InfoStringHash >(); Tomahawk::InfoSystem::InfoStringHash info = map[ "trackinfo" ].value< Tomahawk::InfoSystem::InfoStringHash >();
tDebug() << Q_FUNC_INFO << m_sipPlugin->m_client->jid().full() << info; tDebug() << Q_FUNC_INFO << m_sipPlugin.data()->m_client->jid().full() << info;
Jreen::Tune::Ptr tune( new Jreen::Tune() ); Jreen::Tune::Ptr tune( new Jreen::Tune() );
@@ -147,13 +147,13 @@ Tomahawk::InfoSystem::XmppInfoPlugin::audioStarted( const Tomahawk::InfoSystem::
void void
Tomahawk::InfoSystem::XmppInfoPlugin::audioPaused() Tomahawk::InfoSystem::XmppInfoPlugin::audioPaused()
{ {
tDebug() << Q_FUNC_INFO << m_sipPlugin->m_client->jid().full(); tDebug() << Q_FUNC_INFO << m_sipPlugin.data()->m_client->jid().full();
} }
void void
Tomahawk::InfoSystem::XmppInfoPlugin::audioStopped() Tomahawk::InfoSystem::XmppInfoPlugin::audioStopped()
{ {
tDebug() << Q_FUNC_INFO << m_sipPlugin->m_client->jid().full(); tDebug() << Q_FUNC_INFO << m_sipPlugin.data()->m_client->jid().full();
Jreen::Tune::Ptr tune( new Jreen::Tune() ); Jreen::Tune::Ptr tune( new Jreen::Tune() );
m_pubSubManager->publishItems(QList<Jreen::Payload::Ptr>() << tune, Jreen::JID()); m_pubSubManager->publishItems(QList<Jreen::Payload::Ptr>() << tune, Jreen::JID());

2
src/accounts/xmpp/XmppInfoPlugin.h
View File

@@ -57,7 +57,7 @@ namespace Tomahawk {
void audioPaused(); void audioPaused();
private: private:
XmppSipPlugin* m_sipPlugin; QWeakPointer< XmppSipPlugin > m_sipPlugin;
Jreen::PubSub::Manager* m_pubSubManager; Jreen::PubSub::Manager* m_pubSubManager;
QTimer m_pauseTimer; QTimer m_pauseTimer;
}; };