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

Add getStreamUrl translation step in AudioEngine

Browse Source
This commit is contained in:
Dominik Schmidt
2015-11-17 03:12:12 +01:00
parent 64f71fe453
commit 30789bcb9b
4 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libtomahawk/ResultProvider.cpp
View File

@@ -17,8 +17,24 @@
*/
#include "ResultProvider.h"
#include "Result.h"
#include "resolvers/SyncScriptJob.h"
using namespace Tomahawk;
ResultProvider::~ResultProvider()
{
}
ScriptJob*
ResultProvider::getStreamUrl( const result_ptr& result )
{
QUrl url = result->url();
QVariantMap data;
data[ "result" ] = QVariant::fromValue( result );
data[ "url" ] = url;
return new SyncScriptJob( data );
}

4
src/libtomahawk/ResultProvider.h
View File

@@ -20,6 +20,7 @@
#define TOMAHAWK_RESULTPROVIDER_H
#include "DllMacro.h"
#include "Typedefs.h"
class QPixmap;
class QString;
@@ -27,6 +28,7 @@ class QSize;
namespace Tomahawk
{
class ScriptJob;
class DLLEXPORT ResultProvider
{
@@ -35,6 +37,8 @@ public:
virtual QString name() const = 0;
virtual QPixmap icon( const QSize& size ) const = 0;
virtual ScriptJob* getStreamUrl( const result_ptr& result );
};
}

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

@@ -40,6 +40,7 @@
#include "SourceList.h"
#include "TomahawkSettings.h"
#include "UrlHandler.h"
#include "resolvers/ScriptJob.h"
#include <QDir>
@@ -574,10 +575,21 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
setCurrentTrack( result );
if ( !TomahawkUtils::isLocalResult( d->currentTrack->url() ) && !TomahawkUtils::isHttpResult( d->currentTrack->url() )
&& !TomahawkUtils::isRtmpResult( d->currentTrack->url() ) )
ScriptJob* job = result->resolvedBy()->getStreamUrl( result );
connect( job, SIGNAL( done( QVariantMap ) ), SLOT( gotStreamUrl( QVariantMap ) ) );
job->start();
}
void
AudioEngine::gotStreamUrl( const QVariantMap& data )
{
performLoadIODevice( d->currentTrack, d->currentTrack->url() );
QString url = data[ "url" ].toString();
result_ptr result = data[ "result" ].value<result_ptr>();
if ( !TomahawkUtils::isLocalResult( url ) && !TomahawkUtils::isHttpResult( url )
&& !TomahawkUtils::isRtmpResult( url ) )
{
performLoadIODevice( result, url );
}
else
{

1
src/libtomahawk/audio/AudioEngine.h
View File

@@ -180,6 +180,7 @@ signals:
private slots:
void loadTrack( const Tomahawk::result_ptr& result ); //async!
void gotStreamUrl( const QVariantMap& data );
void performLoadIODevice( const Tomahawk::result_ptr& result, const QString& url ); //only call from loadTrack kthxbi
void performLoadTrack( const Tomahawk::result_ptr result, const QString url, QSharedPointer< QIODevice > io ); //only call from loadTrack or performLoadIODevice kthxbi
void loadPreviousTrack();