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

* Use result and added comment as to why we require this parameter.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-04-05 15:53:33 +02:00
parent 4a76b561c4
commit 102633803a
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/libtomahawk/network/StreamConnection.cpp
View File

@@ -89,7 +89,7 @@ StreamConnection::StreamConnection( Servent* s, ControlConnection* cc, QString f
StreamConnection::~StreamConnection() StreamConnection::~StreamConnection()
{ {
qDebug() << Q_FUNC_INFO << "TX/RX:" << bytesSent() << bytesReceived(); qDebug() << Q_FUNC_INFO << "TX/RX:" << bytesSent() << bytesReceived();
if( m_type == RECEIVING && !m_allok ) if ( m_type == RECEIVING && !m_allok )
{ {
qDebug() << "FTConnection closing before last data msg received, shame."; qDebug() << "FTConnection closing before last data msg received, shame.";
//TODO log the fact that our peer was bad-mannered enough to not finish the upload //TODO log the fact that our peer was bad-mannered enough to not finish the upload
@@ -120,10 +120,11 @@ StreamConnection::source() const
return m_source; return m_source;
} }
void void
StreamConnection::showStats( qint64 tx, qint64 rx ) StreamConnection::showStats( qint64 tx, qint64 rx )
{ {
if( tx > 0 || rx > 0 ) if ( tx > 0 || rx > 0 )
{ {
qDebug() << id() qDebug() << id()
<< QString( "Down: %L1 bytes/sec," ).arg( rx ) << QString( "Down: %L1 bytes/sec," ).arg( rx )
@@ -139,10 +140,10 @@ void
StreamConnection::setup() StreamConnection::setup()
{ {
QList<source_ptr> sources = SourceList::instance()->sources(); QList<source_ptr> sources = SourceList::instance()->sources();
foreach( const source_ptr& src, sources ) foreach ( const source_ptr& src, sources )
{ {
// local src doesnt have a control connection, skip it: // local src doesnt have a control connection, skip it:
if( src.isNull() || src->isLocal() ) if ( src.isNull() || src->isLocal() )
continue; continue;
if ( src->controlConnection() == m_cc ) if ( src->controlConnection() == m_cc )
@@ -153,7 +154,7 @@ StreamConnection::setup()
} }
connect( this, SIGNAL( statsTick( qint64, qint64 ) ), SLOT( showStats( qint64, qint64 ) ) ); connect( this, SIGNAL( statsTick( qint64, qint64 ) ), SLOT( showStats( qint64, qint64 ) ) );
if( m_type == RECEIVING ) if ( m_type == RECEIVING )
{ {
qDebug() << "in RX mode"; qDebug() << "in RX mode";
emit updated(); emit updated();
@@ -190,9 +191,11 @@ StreamConnection::startSending( const Tomahawk::result_ptr& result )
void void
StreamConnection::reallyStartSending( const Tomahawk::result_ptr& result, QSharedPointer< QIODevice >& io ) StreamConnection::reallyStartSending( const Tomahawk::result_ptr& result, QSharedPointer< QIODevice >& io )
{ {
if( !io || io.isNull() ) // Note: We don't really need to pass in 'result' here, since we already have it stored
// as a member variable. The callback-signature of getIODeviceForUrl requires it, though.
if ( !io || io.isNull() )
{ {
qDebug() << "Couldn't read from source:" << m_result->url(); qDebug() << "Couldn't read from source:" << result->url();
shutdown(); shutdown();
return; return;
} }
@@ -269,7 +272,7 @@ StreamConnection::sendSome()
ba.append( m_readdev->read( BufferIODevice::blockSize() ) ); ba.append( m_readdev->read( BufferIODevice::blockSize() ) );
m_bsent += ba.length() - 4; m_bsent += ba.length() - 4;
if( m_readdev->atEnd() ) if ( m_readdev->atEnd() )
{ {
sendMsg( Msg::factory( ba, Msg::RAW ) ); sendMsg( Msg::factory( ba, Msg::RAW ) );
return; return;