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

Style fixes in AudioEngine and -Output.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2015-04-18 09:45:36 +02:00
parent d50104cce7
commit a062787db8
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -644,13 +644,13 @@ AudioEngine::performLoadTrack( const Tomahawk::result_ptr result, const QString
if ( !( TomahawkUtils::isLocalResult( url ) || TomahawkUtils::isHttpResult( url ) || TomahawkUtils::isRtmpResult( url ) ) if ( !( TomahawkUtils::isLocalResult( url ) || TomahawkUtils::isHttpResult( url ) || TomahawkUtils::isRtmpResult( url ) )
&& ( !io || io.isNull() ) ) && ( !io || io.isNull() ) )
{ {
tLog() << "Error getting iodevice for" << result->url(); tLog() << Q_FUNC_INFO << "Error getting iodevice for" << result->url();
err = true; err = true;
} }
if ( !err ) if ( !err )
{ {
tLog() << "Starting new song:" << url; tLog() << Q_FUNC_INFO << "Starting new song:" << url;
d->state = Loading; d->state = Loading;
emit loading( d->currentTrack ); emit loading( d->currentTrack );
@@ -690,7 +690,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 VLC:" << furl; tLog( LOGVERBOSE ) << Q_FUNC_INFO << "Passing to VLC:" << furl;
d->audioOutput->setCurrentSource( furl ); d->audioOutput->setCurrentSource( furl );
} }
else else
@@ -699,7 +699,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 VLC:" << QUrl::fromLocalFile( furl ); tLog( LOGVERBOSE ) << Q_FUNC_INFO << "Passing to VLC:" << QUrl::fromLocalFile( furl );
d->audioOutput->setCurrentSource( QUrl::fromLocalFile( furl ) ); d->audioOutput->setCurrentSource( QUrl::fromLocalFile( furl ) );
} }
@@ -760,7 +760,7 @@ AudioEngine::loadPreviousTrack()
setCurrentTrackPlaylist( d->playlist ); setCurrentTrackPlaylist( d->playlist );
} }
if ( !result.isNull() ) if ( result )
loadTrack( result ); loadTrack( result );
else else
stop(); stop();
@@ -810,7 +810,7 @@ AudioEngine::loadNextTrack()
} }
} }
if ( !result.isNull() ) if ( result )
{ {
tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Got next item, loading track"; tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Got next item, loading track";
loadTrack( result ); loadTrack( result );
@@ -873,7 +873,7 @@ AudioEngine::playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk:
setPlaylist( playlist ); setPlaylist( playlist );
if ( playlist.isNull() && !fromQuery.isNull() ) if ( !playlist && fromQuery )
{ {
setCurrentTrackPlaylist( playlistinterface_ptr( new SingleTrackPlaylistInterface( fromQuery ) ) ); setCurrentTrackPlaylist( playlistinterface_ptr( new SingleTrackPlaylistInterface( fromQuery ) ) );
} }
@@ -882,7 +882,7 @@ AudioEngine::playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk:
setCurrentTrackPlaylist( playlist ); setCurrentTrackPlaylist( playlist );
} }
if ( !result.isNull() ) if ( result )
{ {
loadTrack( result ); loadTrack( result );
} }

6
src/libtomahawk/audio/AudioOutput.cpp
View File

@@ -228,9 +228,11 @@ AudioOutput::setCurrentSource( MediaStream* stream )
case MediaStream::Url: case MediaStream::Url:
tDebug() << Q_FUNC_INFO << "MediaStream::Url:" << stream->url(); tDebug() << Q_FUNC_INFO << "MediaStream::Url:" << stream->url();
if ( stream->url().scheme().isEmpty() ) { if ( stream->url().scheme().isEmpty() )
{
url = "file:///"; url = "file:///";
if ( stream->url().isRelative() ) { if ( stream->url().isRelative() )
{
url.append( QFile::encodeName( QDir::currentPath() ) + '/' ); url.append( QFile::encodeName( QDir::currentPath() ) + '/' );
} }
} }