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

Replace Phonon mentions with new components

Browse Source
This commit is contained in:
Uwe L. Korn
2014-10-22 17:02:55 +02:00
parent 2b3b48f47f
commit bbcec494d6
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -675,7 +675,7 @@ AudioEngine::performLoadTrack( const Tomahawk::result_ptr result, const QString
{ {
d->audioOutput->setCurrentSource( new QNR_IODeviceStream( qnr, this ) ); d->audioOutput->setCurrentSource( new QNR_IODeviceStream( qnr, this ) );
// We keep track of the QNetworkReply in QNR_IODeviceStream // We keep track of the QNetworkReply in QNR_IODeviceStream
// and Phonon handles the deletion of the // and AudioOutput handles the deletion of the
// QNR_IODeviceStream object // QNR_IODeviceStream object
ioToKeep.clear(); ioToKeep.clear();
d->audioOutput->setAutoDelete( true ); d->audioOutput->setAutoDelete( true );
@@ -691,7 +691,7 @@ AudioEngine::performLoadTrack( const Tomahawk::result_ptr result, const QString
{ {
/* /*
* TODO: Do we need this anymore as we now do HTTP streaming ourselves? * TODO: Do we need this anymore as we now do HTTP streaming ourselves?
* Maybe this can be useful for letting phonon do other protocols? * Maybe this can be useful for letting VLC do other protocols?
*/ */
if ( !TomahawkUtils::isLocalResult( url ) ) if ( !TomahawkUtils::isLocalResult( url ) )
{ {
@@ -702,7 +702,7 @@ AudioEngine::performLoadTrack( const Tomahawk::result_ptr result, const QString
TomahawkUtils::urlSetQuery( furl, QString( url.mid( url.indexOf( '?' ) + 1 ) ) ); TomahawkUtils::urlSetQuery( furl, QString( url.mid( url.indexOf( '?' ) + 1 ) ) );
} }
tLog( LOGVERBOSE ) << "Passing to Phonon:" << furl; tLog( LOGVERBOSE ) << "Passing to VLC:" << furl;
d->audioOutput->setCurrentSource( furl ); d->audioOutput->setCurrentSource( furl );
} }
else else
@@ -711,7 +711,7 @@ AudioEngine::performLoadTrack( const Tomahawk::result_ptr result, const QString
if ( furl.startsWith( "file://" ) ) if ( furl.startsWith( "file://" ) )
furl = furl.right( furl.length() - 7 ); furl = furl.right( furl.length() - 7 );
tLog( LOGVERBOSE ) << "Passing to Phonon:" << QUrl::fromLocalFile( furl ); tLog( LOGVERBOSE ) << "Passing to VLC:" << QUrl::fromLocalFile( furl );
d->audioOutput->setCurrentSource( QUrl::fromLocalFile( furl ) ); d->audioOutput->setCurrentSource( QUrl::fromLocalFile( furl ) );
} }

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

@@ -29,7 +29,7 @@
using namespace Tomahawk; using namespace Tomahawk;
// Feed Phonon in 1MiB blocks // Feed VLC in 1MiB blocks
#define BLOCK_SIZE 1048576 #define BLOCK_SIZE 1048576
QNR_IODeviceStream::QNR_IODeviceStream( const QSharedPointer<QNetworkReply>& reply, QObject* parent ) QNR_IODeviceStream::QNR_IODeviceStream( const QSharedPointer<QNetworkReply>& reply, QObject* parent )