mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

Detect duplicate ControlConnections

Browse Source
This commit is contained in:
Uwe L. Korn
2013-05-27 15:37:41 +02:00
parent 097a377500
commit c4ab018ae6
3 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/libtomahawk/Source.cpp
View File

@@ -30,6 +30,7 @@
#include "database/DatabaseCommand_LoadAllSources.h" #include "database/DatabaseCommand_LoadAllSources.h"
#include "database/DatabaseCommand_SourceOffline.h" #include "database/DatabaseCommand_SourceOffline.h"
#include "database/DatabaseCommand_UpdateSearchIndex.h" #include "database/DatabaseCommand_UpdateSearchIndex.h"
#include "database/DatabaseImpl.h"
#include "database/Database.h" #include "database/Database.h"
#include <QCoreApplication> #include <QCoreApplication>
@@ -81,10 +82,29 @@ Source::~Source()
} }
void bool
Source::setControlConnection( ControlConnection* cc ) Source::setControlConnection( ControlConnection* cc )
{ {
m_cc = cc; if ( !m_cc.isNull() && m_cc->isReady() && m_cc->isRunning() )
{
const QString& nodeid = Database::instance()->impl()->dbid();
if ( cc->id() < nodeid && m_cc->outbound() )
{
m_cc = cc;
// This ControlConnection is not needed anymore, get rid of it!
m_cc->deleteLater();
return true;
}
else
{
return false;
}
}
else
{
m_cc = cc;
return true;
}
} }

2
src/libtomahawk/Source.h
View File

@@ -87,7 +87,7 @@ public:
int id() const { return m_id; } int id() const { return m_id; }
ControlConnection* controlConnection() const { return m_cc.data(); } ControlConnection* controlConnection() const { return m_cc.data(); }
void setControlConnection( ControlConnection* cc ); bool setControlConnection( ControlConnection* cc );
const QSet< Tomahawk::peerinfo_ptr > peerInfos() const; const QSet< Tomahawk::peerinfo_ptr > peerInfos() const;

30
src/libtomahawk/network/ControlConnection.cpp
View File

@@ -100,20 +100,28 @@ ControlConnection::setup()
// setup source and remote collection for this peer // setup source and remote collection for this peer
m_source = SourceList::instance()->get( id(), friendlyName, true ); m_source = SourceList::instance()->get( id(), friendlyName, true );
m_source->setControlConnection( this ); if ( m_source->setControlConnection( this ) )
{
// We are the new ControlConnection for this source
// delay setting up collection/etc until source is synced. // delay setting up collection/etc until source is synced.
// we need it DB synced so it has an ID + exists in DB. // we need it DB synced so it has an ID + exists in DB.
connect( m_source.data(), SIGNAL( syncedWithDatabase() ), connect( m_source.data(), SIGNAL( syncedWithDatabase() ),
SLOT( registerSource() ), Qt::QueuedConnection ); SLOT( registerSource() ), Qt::QueuedConnection );
m_source->setOnline(); m_source->setOnline();
m_pingtimer = new QTimer; m_pingtimer = new QTimer;
m_pingtimer->setInterval( 5000 ); m_pingtimer->setInterval( 5000 );
connect( m_pingtimer, SIGNAL( timeout() ), SLOT( onPingTimer() ) ); connect( m_pingtimer, SIGNAL( timeout() ), SLOT( onPingTimer() ) );
m_pingtimer->start(); m_pingtimer->start();
m_pingtimer_mark.start(); m_pingtimer_mark.start();
}
else
{
// There is already another ControlConnection in use, we are useless.
deleteLater();
}
} }