mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

DRY on playback api commands

Browse Source
This commit is contained in:
Uwe L. Korn
2013-06-18 20:57:29 +02:00
parent ea8fec15d3
commit aebc8bcb8a
2 changed files with 35 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/tomahawk/web/Api_v2_0.cpp
View File

@@ -27,7 +27,8 @@
#include <QxtWeb/QxtWebPageEvent> #include <QxtWeb/QxtWebPageEvent>
#include <QxtWeb/QxtWebSlotService> #include <QxtWeb/QxtWebSlotService>
#define JSON_ERROR( event, message ) { tLog( LOGVERBOSE ) << Q_FUNC_INFO << message; m_service->sendJsonError( event, message ); } // Assumptions: QxtWebRequestEvent instance is called event and result is true on success
#define JSON_REPLY( result, message ) jsonReply( event, Q_FUNC_INFO, message, !result )
Api_v2_0::Api_v2_0( Api_v2* parent ) Api_v2_0::Api_v2_0( Api_v2* parent )
: QObject( parent ) : QObject( parent )
@@ -48,90 +49,53 @@ Api_v2_0::playback( QxtWebRequestEvent* event, const QString& command )
{ {
if ( command == "next ") if ( command == "next ")
{ {
if ( QMetaObject::invokeMethod( AudioEngine::instance(), "next", Qt::QueuedConnection ) ) JSON_REPLY( QMetaObject::invokeMethod( AudioEngine::instance(), "next", Qt::QueuedConnection ) , "Skipping to the next track failed." );
{
m_service->sendJsonOk( event );
}
else
{
JSON_ERROR( event, "Skipping to the next track failed." );
}
} }
else if ( command == "previous" ) else if ( command == "previous" )
{ {
if ( QMetaObject::invokeMethod( AudioEngine::instance(), "previous", Qt::QueuedConnection ) ) JSON_REPLY( QMetaObject::invokeMethod( AudioEngine::instance(), "previous", Qt::QueuedConnection ), "Rewinding to the previous track failed." );
{
m_service->sendJsonOk( event );
}
else
{
JSON_ERROR( event, "Rewinding to the previous track failed." );
}
} }
else if ( command == "playpause" ) else if ( command == "playpause" )
{ {
if ( QMetaObject::invokeMethod( AudioEngine::instance(), "playpause", Qt::QueuedConnection ) ) JSON_REPLY( QMetaObject::invokeMethod( AudioEngine::instance(), "playpause", Qt::QueuedConnection ), "Play/Pause failed." );
{
m_service->sendJsonOk( event );
}
else
{
JSON_ERROR( event, "Play/Pause failed." );
}
} }
else if ( command == "play" ) else if ( command == "play" )
{ {
if ( QMetaObject::invokeMethod( AudioEngine::instance(), "play", Qt::QueuedConnection ) ) JSON_REPLY( QMetaObject::invokeMethod( AudioEngine::instance(), "play", Qt::QueuedConnection ), "Starting the playback failed." );
{
m_service->sendJsonOk( event );
}
else
{
JSON_ERROR( event, "Starting the playback failed." );
}
} }
else if ( command == "pause" ) else if ( command == "pause" )
{ {
if ( QMetaObject::invokeMethod( AudioEngine::instance(), "pause", Qt::QueuedConnection ) ) JSON_REPLY( QMetaObject::invokeMethod( AudioEngine::instance(), "pause", Qt::QueuedConnection ), "Pausing the current track failed." );
{
m_service->sendJsonOk( event );
}
else
{
JSON_ERROR( event, "Pausing the current track failed." );
}
} }
else if ( command == "stop" ) else if ( command == "stop" )
{ {
if ( QMetaObject::invokeMethod( AudioEngine::instance(), "stop", Qt::QueuedConnection ) ) JSON_REPLY( QMetaObject::invokeMethod( AudioEngine::instance(), "stop", Qt::QueuedConnection ), "Stopping the current track failed." );
{
m_service->sendJsonOk( event );
}
else
{
JSON_ERROR( event, "Stopping the current track failed." );
}
} }
else if ( command == "lowervolume" ) else if ( command == "lowervolume" )
{ {
if ( QMetaObject::invokeMethod( AudioEngine::instance(), "lowerVolume", Qt::QueuedConnection ) ) JSON_REPLY( QMetaObject::invokeMethod( AudioEngine::instance(), "lowerVolume", Qt::QueuedConnection ), "Lowering volume failed." );
{
m_service->sendJsonOk( event );
}
else
{
JSON_ERROR( event, "Lowering volume failed." );
}
} }
else if ( command == "raisevolume" ) else if ( command == "raisevolume" )
{ {
if ( QMetaObject::invokeMethod( AudioEngine::instance(), "raiseVolume", Qt::QueuedConnection ) ) JSON_REPLY( QMetaObject::invokeMethod( AudioEngine::instance(), "raiseVolume", Qt::QueuedConnection ), "Raising volume failed." );
{ }
m_service->sendJsonOk( event ); else
} {
else m_service->sendJsonError( event, "No such playback command." );
{ }
JSON_ERROR( event, "Raising volume failed." ); }
}
void Api_v2_0::jsonReply( QxtWebRequestEvent* event, const char* funcInfo, const QString& errorMessage, bool isError )
{
if ( isError )
{
tLog( LOGVERBOSE ) << funcInfo << errorMessage;
m_service->sendJsonError( event, errorMessage );
}
else
{
m_service->sendJsonOk( event );
} }
} }

6
src/tomahawk/web/Api_v2_0.h
View File

@@ -48,6 +48,12 @@ public slots:
*/ */
void playback( QxtWebRequestEvent* event, const QString& command ); void playback( QxtWebRequestEvent* event, const QString& command );
private: private:
/**
* Send a simple reply to a (write-only) method call.
*
* On failure send a custom error message.
*/
void jsonReply( QxtWebRequestEvent* event, const char* funcInfo, const QString& errorMessage, bool isError );
Api_v2* m_service; Api_v2* m_service;
}; };