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

Fixed starting Tomahawk with a track as cli-arg.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2015-04-13 07:00:03 +02:00
parent d301bcd588
commit e1ad5291b1
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/tomahawk/TomahawkApp.cpp
View File

@@ -694,7 +694,7 @@ TomahawkApp::onInfoSystemReady()
QNetworkRequest request( QUrl( SPOTIFY_PLAYLIST_API_URL "/pong" ) ); QNetworkRequest request( QUrl( SPOTIFY_PLAYLIST_API_URL "/pong" ) );
QByteArray userAgent = TomahawkUtils::userAgentString( TOMAHAWK_APPLICATION_NAME, TOMAHAWK_VERSION ).toUtf8(); QByteArray userAgent = TomahawkUtils::userAgentString( TOMAHAWK_APPLICATION_NAME, TOMAHAWK_VERSION ).toUtf8();
tLog() << "User-Agent: " << userAgent; tLog() << "User-Agent:" << userAgent;
request.setRawHeader( "User-Agent", userAgent ); request.setRawHeader( "User-Agent", userAgent );
QNetworkReply* r = Tomahawk::Utils::nam()->get( request ); QNetworkReply* r = Tomahawk::Utils::nam()->get( request );
@@ -706,6 +706,10 @@ TomahawkApp::onInfoSystemReady()
#endif #endif
initEnergyEventHandler(); initEnergyEventHandler();
if ( arguments().count() > 1 )
loadUrl( arguments().last() );
emit tomahawkLoaded(); emit tomahawkLoaded();
} }
@@ -879,35 +883,31 @@ TomahawkApp::instanceStarted( KDSingleApplicationGuard::Instance instance )
tDebug( LOGINFO ) << "Instance started!" << instance.pid() << instance.arguments(); tDebug( LOGINFO ) << "Instance started!" << instance.pid() << instance.arguments();
const QStringList arguments = instance.arguments(); const QStringList arguments = instance.arguments();
if ( arguments.size() < 2 ) if ( arguments.count() > 1 )
{ {
activate(); if ( loadUrl( arguments.last() ) )
return; {
activate();
}
else if ( arguments.contains( "--next" ) )
AudioEngine::instance()->next();
else if ( arguments.contains( "--prev" ) )
AudioEngine::instance()->previous();
else if ( arguments.contains( "--playpause" ) )
AudioEngine::instance()->playPause();
else if ( arguments.contains( "--play" ) )
AudioEngine::instance()->play();
else if ( arguments.contains( "--pause" ) )
AudioEngine::instance()->pause();
else if ( arguments.contains( "--stop" ) )
AudioEngine::instance()->stop();
else if ( arguments.contains( "--voldown" ) )
AudioEngine::instance()->lowerVolume();
else if ( arguments.contains( "--volup" ) )
AudioEngine::instance()->raiseVolume();
else
activate();
} }
QString lastArg = arguments[ arguments.size() - 1 ];
if ( loadUrl( lastArg ) )
{
activate();
return;
}
if ( arguments.contains( "--next" ) )
AudioEngine::instance()->next();
else if ( arguments.contains( "--prev" ) )
AudioEngine::instance()->previous();
else if ( arguments.contains( "--playpause" ) )
AudioEngine::instance()->playPause();
else if ( arguments.contains( "--play" ) )
AudioEngine::instance()->play();
else if ( arguments.contains( "--pause" ) )
AudioEngine::instance()->pause();
else if ( arguments.contains( "--stop" ) )
AudioEngine::instance()->stop();
else if ( arguments.contains( "--voldown" ) )
AudioEngine::instance()->lowerVolume();
else if ( arguments.contains( "--volup" ) )
AudioEngine::instance()->raiseVolume();
else else
activate(); activate();
} }