mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-24 01:39:42 +01:00
Code Issues Releases Wiki Activity

* PlaylistInterface now provides getSharedPointer(). AudioEngine makes use of it and doesn't crash when encountering a deleted playlist.

Browse Source
This commit is contained in:
Christian Muehlhaeuser 2011-07-19 17:54:10 +02:00
parent 63aa26f607
commit 4098cc2709
4 changed files with 52 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/libtomahawk/audio/audioengine.cpp
View File

@ -46,8 +46,8 @@ AudioEngine::instance()
AudioEngine::AudioEngine()
: QObject()
, m_isPlayingHttp( false )
, m_playlist( 0 )
, m_currentTrackPlaylist( 0 )
// , m_playlist( 0 )
// , m_currentTrackPlaylist( 0 )
, m_queue( 0 )
, m_timeElapsed( 0 )
, m_expectStop( false )
@ -141,8 +141,8 @@ AudioEngine::stop()
m_mediaObject->stop();
if ( m_playlist )
m_playlist->reset();
if ( !m_playlist.isNull() )
m_playlist.data()->reset();
setCurrentTrack( Tomahawk::result_ptr() );
emit stopped();
@ -168,11 +168,11 @@ AudioEngine::previous()
{
qDebug() << Q_FUNC_INFO;
if ( !m_playlist )
if ( m_playlist.isNull() )
return;
if ( m_playlist->skipRestrictions() == PlaylistInterface::NoSkip ||
m_playlist->skipRestrictions() == PlaylistInterface::NoSkipBackwards )
if ( m_playlist.data()->skipRestrictions() == PlaylistInterface::NoSkip ||
m_playlist.data()->skipRestrictions() == PlaylistInterface::NoSkipBackwards )
return;
loadPreviousTrack();
@ -184,15 +184,15 @@ AudioEngine::next()
{
qDebug() << Q_FUNC_INFO;
if ( !m_playlist )
if ( m_playlist.isNull() )
return;
if ( m_playlist->skipRestrictions() == PlaylistInterface::NoSkip ||
m_playlist->skipRestrictions() == PlaylistInterface::NoSkipForwards )
if ( m_playlist.data()->skipRestrictions() == PlaylistInterface::NoSkip ||
m_playlist.data()->skipRestrictions() == PlaylistInterface::NoSkipForwards )
return;
if ( !m_currentTrack.isNull() && !m_playlist->hasNextItem() &&
m_currentTrack->id() == m_playlist->currentItem()->id() )
if ( !m_currentTrack.isNull() && !m_playlist.data()->hasNextItem() &&
m_currentTrack->id() == m_playlist.data()->currentItem()->id() )
{
//For instance, when doing a catch-up while listening along, but the person
//you're following hasn't started a new track yet...don't do anything
@ -206,10 +206,7 @@ AudioEngine::next()
void
AudioEngine::seek( int ms )
{
if ( !m_playlist )
return;
if ( m_playlist->seekRestrictions() == PlaylistInterface::NoSeek )
if ( !m_playlist.isNull() && m_playlist.data()->seekRestrictions() == PlaylistInterface::NoSeek )
return;
if ( isPlaying() || isPaused() )
@ -424,13 +421,13 @@ AudioEngine::loadPreviousTrack()
{
qDebug() << Q_FUNC_INFO;
if ( !m_playlist )
if ( m_playlist.isNull() )
{
stop();
return;
}
Tomahawk::result_ptr result = m_playlist->previousItem();
Tomahawk::result_ptr result = m_playlist.data()->previousItem();
if ( !result.isNull() )
loadTrack( result );
else
@ -450,16 +447,16 @@ AudioEngine::loadNextTrack()
result = m_queue->nextItem();
}
if ( m_playlist && result.isNull() )
if ( !m_playlist.isNull() && result.isNull() )
{
result = m_playlist->nextItem();
result = m_playlist.data()->nextItem();
}
if ( !result.isNull() )
loadTrack( result );
else
{
if ( m_playlist && m_playlist->retryMode() == Tomahawk::PlaylistInterface::Retry )
if ( !m_playlist.isNull() && m_playlist.data()->retryMode() == Tomahawk::PlaylistInterface::Retry )
m_waitingOnNewTrack = true;
stop();
}
@ -471,15 +468,15 @@ AudioEngine::playItem( Tomahawk::PlaylistInterface* playlist, const Tomahawk::re
{
qDebug() << Q_FUNC_INFO;
if ( m_playlist )
m_playlist->reset();
if ( !m_playlist.isNull() )
m_playlist.data()->reset();
setPlaylist( playlist );
m_currentTrackPlaylist = playlist;
m_currentTrackPlaylist = playlist->getSharedPointer();
if ( !result.isNull() )
loadTrack( result );
else if ( m_playlist && m_playlist->retryMode() == PlaylistInterface::Retry )
else if ( !m_playlist.isNull() && m_playlist.data()->retryMode() == PlaylistInterface::Retry )
{
m_waitingOnNewTrack = true;
stop();
@ -557,13 +554,15 @@ AudioEngine::timerTriggered( qint64 time )
void
AudioEngine::setPlaylist( PlaylistInterface* playlist )
{
if ( m_playlist )
m_playlist->reset();
if ( !m_playlist.isNull() )
m_playlist.data()->reset();
m_playlist = playlist;
if ( !playlist )
return;
m_playlist = playlist->getSharedPointer();
if ( m_playlist && m_playlist->object() && m_playlist->retryMode() == PlaylistInterface::Retry )
connect( m_playlist->object(), SIGNAL( nextTrackReady() ), SLOT( playlistNextTrackReady() ) );
if ( m_playlist.data()->object() && m_playlist.data()->retryMode() == PlaylistInterface::Retry )
connect( m_playlist.data()->object(), SIGNAL( nextTrackReady() ), SLOT( playlistNextTrackReady() ) );
emit playlistChanged( playlist );
}

10
src/libtomahawk/audio/audioengine.h
View File

@ -56,13 +56,13 @@ public:
bool isPaused() const { return m_mediaObject->state() == Phonon::PausedState; }
/* Returns the PlaylistInterface of the currently playing track. Note: This might be different to the current playlist! */
Tomahawk::PlaylistInterface* currentTrackPlaylist() const { return m_currentTrackPlaylist; }
Tomahawk::PlaylistInterface* currentTrackPlaylist() const { return m_currentTrackPlaylist.data(); }
/* Returns the PlaylistInterface of the current playlist. Note: The currently playing track might still be from a different playlist! */
Tomahawk::PlaylistInterface* playlist() const { return m_playlist; }
Tomahawk::PlaylistInterface* playlist() const { return m_playlist.data(); }
Tomahawk::result_ptr currentTrack() const { return m_currentTrack; }
public slots:
void playPause();
void play();
@ -130,8 +130,8 @@ private:
Tomahawk::result_ptr m_currentTrack;
Tomahawk::result_ptr m_lastTrack;
Tomahawk::PlaylistInterface* m_playlist;
Tomahawk::PlaylistInterface* m_currentTrackPlaylist;
QWeakPointer< Tomahawk::PlaylistInterface > m_playlist;
QWeakPointer< Tomahawk::PlaylistInterface > m_currentTrackPlaylist;
Tomahawk::PlaylistInterface* m_queue;
Phonon::MediaObject* m_mediaObject;

18
src/libtomahawk/playlistinterface.h
View File

@ -19,6 +19,7 @@
#ifndef PLAYLISTINTERFACE_H
#define PLAYLISTINTERFACE_H
#include <QDebug>
#include <QModelIndex>
#include <QWidget>
@ -62,7 +63,7 @@ public:
virtual PlaylistInterface::RetryMode retryMode() const { return NoRetry; }
virtual quint32 retryInterval() const { return 30000; }
virtual QString filter() const { return m_filter; }
virtual void setFilter( const QString& pattern ) { m_filter = pattern; }
@ -70,6 +71,20 @@ public:
QObject* object() const { return m_object; }
static void dontDelete( Tomahawk::PlaylistInterface* obj )
{
qDebug() << Q_FUNC_INFO << obj;
}
virtual Tomahawk::playlistinterface_ptr getSharedPointer()
{
if ( m_sharedPtr.isNull() )
{
m_sharedPtr = Tomahawk::playlistinterface_ptr( this, dontDelete );
}
return m_sharedPtr;
}
public slots:
virtual void setRepeatMode( RepeatMode mode ) = 0;
virtual void setShuffled( bool enabled ) = 0;
@ -83,6 +98,7 @@ signals:
private:
QObject* m_object;
Tomahawk::playlistinterface_ptr m_sharedPtr;
QString m_filter;
};

1
src/libtomahawk/source.cpp
View File

@ -282,6 +282,7 @@ Source::getPlaylistInterface()
return m_playlistInterface;
}
void
Source::onPlaybackStarted( const Tomahawk::query_ptr& query )
{