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

* AudioEngine::play( QUrl ) to directly start playback of a local file (or in the future network urls).

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-09-09 17:31:15 +02:00
parent 1bd9d02ee2
commit cda5d833dd
2 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@
#include "config.h"
#include "filemetadata/MusicScanner.h"
#include "jobview/JobStatusView.h"
#include "jobview/JobStatusModel.h"
#include "jobview/ErrorStatusMessage.h"
@@ -36,6 +37,7 @@
#include "Artist.h"
#include "Pipeline.h"
#include "PlaylistEntry.h"
#include "SourceList.h"
#include "TomahawkSettings.h"
#include "UrlHandler.h"
@@ -193,7 +195,6 @@ AudioEnginePrivate::onAudioDataArrived( QMap<Phonon::AudioDataOutput::Channel, Q
}
AudioEngine* AudioEnginePrivate::s_instance = 0;
@@ -670,7 +671,7 @@ AudioEngine::onNowPlayingInfoReady( const Tomahawk::InfoSystem::InfoType type )
playInfo["trackinfo"] = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( trackInfo );
playInfo["private"] = TomahawkSettings::instance()->privateListeningMode();
Tomahawk::InfoSystem::InfoPushData pushData ( s_aeInfoIdentifier, type, playInfo, Tomahawk::InfoSystem::PushShortUrlFlag );
Tomahawk::InfoSystem::InfoPushData pushData( s_aeInfoIdentifier, type, playInfo, Tomahawk::InfoSystem::PushShortUrlFlag );
Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( pushData );
}
@@ -929,6 +930,41 @@ AudioEngine::loadNextTrack()
}
void
AudioEngine::play( const QUrl& url )
{
tDebug() << Q_FUNC_INFO << url;
result_ptr result = Result::get( url.toString() );
const QVariantMap tags = MusicScanner::readTags( QFileInfo( url.toLocalFile() ) ).toMap();
track_ptr t;
if ( !tags.isEmpty() )
{
t = Track::get( tags["artist"].toString(), tags["track"].toString(), tags["album"].toString(),
tags["duration"].toInt(), tags["composer"].toString(),
tags["albumpos"].toUInt(), tags["discnumber"].toUInt() );
result->setSize( tags["size"].toUInt() );
result->setBitrate( tags["bitrate"].toUInt() );
result->setModificationTime( tags["mtime"].toUInt() );
result->setMimetype( tags["mimetype"].toString() );
}
else
{
t = Tomahawk::Track::get( "Unknown Artist", "Unknown Track" );
}
result->setTrack( t );
result->setScore( 1.0 );
result->setCollection( SourceList::instance()->getLocal()->collections().first(), false );
// Tomahawk::query_ptr qry = Tomahawk::Query::get( t );
playItem( playlistinterface_ptr(), result, query_ptr() );
}
void
AudioEngine::playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk::result_ptr& result, const Tomahawk::query_ptr& fromQuery )
{

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

@@ -136,6 +136,7 @@ public slots:
void mute();
void toggleMute();
void play( const QUrl& url );
void playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk::result_ptr& result, const Tomahawk::query_ptr& fromQuery = Tomahawk::query_ptr() );
void playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk::query_ptr& query );
void playItem( const Tomahawk::artist_ptr& artist );