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

Use HTML5 base64 functions2

Browse Source
This commit is contained in:
Uwe L. Korn
2014-05-31 14:11:47 +01:00
parent fc4dd7ce1c
commit 1fd6b1bc21
3 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/js/tomahawk.js
View File

@@ -321,3 +321,5 @@ Tomahawk.hmac = function (key, message) {
// some aliases // some aliases
Tomahawk.setTimeout = Tomahawk.setTimeout || window.setTimeout; Tomahawk.setTimeout = Tomahawk.setTimeout || window.setTimeout;
Tomahawk.setInterval = Tomahawk.setInterval || window.setInterval; Tomahawk.setInterval = Tomahawk.setInterval || window.setInterval;
Tomahawk.base64Decode = window.atob;
Tomahawk.base64Encode = window.btoa;

14
src/libtomahawk/resolvers/JSResolverHelper.cpp
View File

@@ -466,20 +466,6 @@ JSResolverHelper::reportUrlTranslation( const QString& qid, const QString& strea
} }
QByteArray
JSResolverHelper::base64Encode( const QByteArray& input )
{
return input.toBase64();
}
QByteArray
JSResolverHelper::base64Decode( const QByteArray& input )
{
return QByteArray::fromBase64( input );
}
void void
JSResolverHelper::customIODeviceFactory( const Tomahawk::result_ptr&, const QString& url, JSResolverHelper::customIODeviceFactory( const Tomahawk::result_ptr&, const QString& url,
boost::function< void( QSharedPointer< QIODevice >& ) > callback ) boost::function< void( QSharedPointer< QIODevice >& ) > callback )

3
src/libtomahawk/resolvers/JSResolverHelper.h
View File

@@ -48,9 +48,6 @@ public:
Q_INVOKABLE void addCustomUrlTranslator( const QString& protocol, const QString& callbackFuncName, const QString& isAsynchronous = "false" ); Q_INVOKABLE void addCustomUrlTranslator( const QString& protocol, const QString& callbackFuncName, const QString& isAsynchronous = "false" );
Q_INVOKABLE void reportUrlTranslation( const QString& qid, const QString& streamUrl ); Q_INVOKABLE void reportUrlTranslation( const QString& qid, const QString& streamUrl );
Q_INVOKABLE QByteArray base64Encode( const QByteArray& input );
Q_INVOKABLE QByteArray base64Decode( const QByteArray& input );
void customIODeviceFactory( const Tomahawk::result_ptr&, const QString& url, void customIODeviceFactory( const Tomahawk::result_ptr&, const QString& url,
boost::function< void( QSharedPointer< QIODevice >& ) > callback ); // async boost::function< void( QSharedPointer< QIODevice >& ) > callback ); // async
void customUrlTranslator( const Tomahawk::result_ptr&, const QString& url, void customUrlTranslator( const Tomahawk::result_ptr&, const QString& url,