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

Merge remote branch 'origin' into phonon

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-02-27 20:33:25 +01:00
parent 23e6670edf ce2db3aefd
commit 2e0f72650a
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk/network/controlconnection.cpp
View File

@@ -110,7 +110,7 @@ ControlConnection::setupDbSyncConnection( bool ondemand )
qDebug() << Q_FUNC_INFO << ondemand << m_source->id(); qDebug() << Q_FUNC_INFO << ondemand << m_source->id();
Q_ASSERT( m_source->id() > 0 ); Q_ASSERT( m_source->id() > 0 );
if( ! m_dbconnkey.isEmpty() ) if( !m_dbconnkey.isEmpty() )
{ {
qDebug() << "Connecting to DBSync offer from peer..."; qDebug() << "Connecting to DBSync offer from peer...";
m_dbsyncconn = new DBSyncConnection( m_servent, m_source ); m_dbsyncconn = new DBSyncConnection( m_servent, m_source );

2
src/libtomahawk/network/servent.cpp
View File

@@ -609,7 +609,7 @@ Servent::remoteIODeviceFactory( const result_ptr& result )
const QString sourceName = parts.at( 0 ); const QString sourceName = parts.at( 0 );
const QString fileId = parts.at( 1 ); const QString fileId = parts.at( 1 );
source_ptr s = SourceList::instance()->get( sourceName ); source_ptr s = SourceList::instance()->get( sourceName );
if ( s.isNull() ) if ( s.isNull() || !s->controlConnection() )
return sp; return sp;
ControlConnection* cc = s->controlConnection(); ControlConnection* cc = s->controlConnection();

2
src/libtomahawk/playlist/dynamic/DynamicView.cpp
View File

@@ -300,7 +300,7 @@ DynamicView::paintEvent( QPaintEvent* event )
bg.moveTo( m_fadingPointAnchor ); // cover up the background bg.moveTo( m_fadingPointAnchor ); // cover up the background
if( m_fadebg ) { if( m_fadebg ) {
p.save(); p.save();
p.fillRect( bg, Qt::white );
p.setOpacity( 1 - m_fadeOutAnim.currentValue() ); p.setOpacity( 1 - m_fadeOutAnim.currentValue() );
} }
p.drawPixmap( bg, m_bg ); p.drawPixmap( bg, m_bg );