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

Let Phonon delete QNR_IODeviceStream but do all QIODevices still by ourselves

Browse Source
This commit is contained in:
Uwe L. Korn
2013-09-16 22:54:28 +02:00
parent d99d12ad73
commit 8f8736c965
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libtomahawk/audio/AudioEngine.cpp
View File

@@ -664,6 +664,7 @@ AudioEngine::performLoadTrack( const Tomahawk::result_ptr& result, QSharedPointe
return; return;
} }
tDebug( LOGEXTRA ) << Q_FUNC_INFO << ( result.isNull() ? QString() : result->url() ); tDebug( LOGEXTRA ) << Q_FUNC_INFO << ( result.isNull() ? QString() : result->url() );
QSharedPointer< QIODevice > ioToKeep = io;
bool err = false; bool err = false;
{ {
@@ -681,11 +682,22 @@ AudioEngine::performLoadTrack( const Tomahawk::result_ptr& result, QSharedPointe
if ( !TomahawkUtils::isLocalResult( d->currentTrack->url() ) ) if ( !TomahawkUtils::isLocalResult( d->currentTrack->url() ) )
{ {
if ( QNetworkReply* qnr_io = qobject_cast< QNetworkReply* >( io.data() ) ) QSharedPointer<QNetworkReply> qnr = io.objectCast<QNetworkReply>();
d->mediaObject->setCurrentSource( new QNR_IODeviceStream( qnr_io, this ) ); if ( !qnr.isNull() )
{
d->mediaObject->setCurrentSource( new QNR_IODeviceStream( qnr, this ) );
// We keep track of the QNetworkReply in QNR_IODeviceStream
// and Phonon handles the deletion of the
// QNR_IODeviceStream object
ioToKeep.clear();
d->mediaObject->currentSource().setAutoDelete( true );
}
else else
{
d->mediaObject->setCurrentSource( io.data() ); d->mediaObject->setCurrentSource( io.data() );
d->mediaObject->currentSource().setAutoDelete( false ); // We handle the deletion via tracking in d->input
d->mediaObject->currentSource().setAutoDelete( false );
}
} }
else else
{ {
@@ -722,7 +734,7 @@ AudioEngine::performLoadTrack( const Tomahawk::result_ptr& result, QSharedPointe
d->input->close(); d->input->close();
d->input.clear(); d->input.clear();
} }
d->input = io; d->input = ioToKeep;
queueState( Playing ); queueState( Playing );
if ( TomahawkSettings::instance()->privateListeningMode() != TomahawkSettings::FullyPrivate ) if ( TomahawkSettings::instance()->privateListeningMode() != TomahawkSettings::FullyPrivate )

4
src/libtomahawk/utils/Qnr_IoDeviceStream.cpp
View File

@@ -32,7 +32,7 @@ using namespace Tomahawk;
// Feed Phonon in 1MiB blocks // Feed Phonon in 1MiB blocks
#define BLOCK_SIZE 1048576 #define BLOCK_SIZE 1048576
QNR_IODeviceStream::QNR_IODeviceStream( QNetworkReply* reply, QObject* parent ) QNR_IODeviceStream::QNR_IODeviceStream( const QSharedPointer<QNetworkReply>& reply, QObject* parent )
: Phonon::AbstractMediaStream( parent ) : Phonon::AbstractMediaStream( parent )
, m_networkReply( reply ) , m_networkReply( reply )
, m_pos( 0 ) , m_pos( 0 )
@@ -63,7 +63,7 @@ QNR_IODeviceStream::QNR_IODeviceStream( QNetworkReply* reply, QObject* parent )
} }
// Just consume all data that is already available. // Just consume all data that is already available.
m_data = m_networkReply->readAll(); m_data = m_networkReply->readAll();
connect( m_networkReply, SIGNAL( readyRead() ), SLOT( readyRead() ) ); connect( m_networkReply.data(), SIGNAL( readyRead() ), SLOT( readyRead() ) );
} }
m_timer->setInterval( 0 ); m_timer->setInterval( 0 );

7
src/libtomahawk/utils/Qnr_IoDeviceStream.h
View File

@@ -27,8 +27,9 @@
#include <phonon/abstractmediastream.h> #include <phonon/abstractmediastream.h>
#include <QByteArray> #include <QByteArray>
#include <QNetworkReply>
#include <QSharedPointer>
class QNetworkReply;
class QIODevice; class QIODevice;
class QTimer; class QTimer;
@@ -39,7 +40,7 @@ class DLLEXPORT QNR_IODeviceStream : public Phonon::AbstractMediaStream
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit QNR_IODeviceStream( QNetworkReply* reply, QObject *parent = 0 ); explicit QNR_IODeviceStream( const QSharedPointer<QNetworkReply>& reply, QObject *parent = 0 );
~QNR_IODeviceStream(); ~QNR_IODeviceStream();
virtual void enoughData(); virtual void enoughData();
@@ -53,7 +54,7 @@ private slots:
private: private:
QByteArray m_data; QByteArray m_data;
QNetworkReply *m_networkReply; QSharedPointer<QNetworkReply> m_networkReply;
qint64 m_pos; qint64 m_pos;
QTimer* m_timer; QTimer* m_timer;
}; };