mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-06 14:16:32 +02:00
* DynamicPlaylist needs to store its own weak-ptr so we can access the dynplaylist_ptr (instead of only the playlist_ptr) internally.
This commit is contained in:
@@ -50,7 +50,6 @@ DynamicPlaylist::DynamicPlaylist( const Tomahawk::source_ptr& author, const QStr
|
|||||||
|
|
||||||
DynamicPlaylist::~DynamicPlaylist()
|
DynamicPlaylist::~DynamicPlaylist()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -172,10 +171,19 @@ DynamicPlaylist::create( const Tomahawk::source_ptr& author,
|
|||||||
Database::instance()->enqueue( Tomahawk::dbcmd_ptr(cmd) );
|
Database::instance()->enqueue( Tomahawk::dbcmd_ptr(cmd) );
|
||||||
if ( autoLoad )
|
if ( autoLoad )
|
||||||
dynplaylist->reportCreated( dynplaylist );
|
dynplaylist->reportCreated( dynplaylist );
|
||||||
|
|
||||||
return dynplaylist;
|
return dynplaylist;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void
|
||||||
|
DynamicPlaylist::setWeakSelf( QWeakPointer< DynamicPlaylist > self )
|
||||||
|
{
|
||||||
|
Q_D( DynamicPlaylist );
|
||||||
|
d->weakSelf = self;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
DynamicPlaylist::createNewRevision( const QString& newUuid )
|
DynamicPlaylist::createNewRevision( const QString& newUuid )
|
||||||
{
|
{
|
||||||
@@ -505,8 +513,11 @@ DynamicPlaylist::setRevision( const QString& rev,
|
|||||||
void
|
void
|
||||||
DynamicPlaylist::removeFromDatabase()
|
DynamicPlaylist::removeFromDatabase()
|
||||||
{
|
{
|
||||||
|
Q_D( DynamicPlaylist );
|
||||||
|
|
||||||
|
emit aboutToBeDeleted( d->weakSelf.toStrongRef() );
|
||||||
DatabaseCommand_DeletePlaylist* cmd = new DatabaseCommand_DeleteDynamicPlaylist( author(), guid() ) ;
|
DatabaseCommand_DeletePlaylist* cmd = new DatabaseCommand_DeleteDynamicPlaylist( author(), guid() ) ;
|
||||||
Database::instance()->enqueue( Tomahawk::dbcmd_ptr(cmd) );
|
Database::instance()->enqueue( Tomahawk::dbcmd_ptr( cmd ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -32,8 +32,6 @@
|
|||||||
#include <QList>
|
#include <QList>
|
||||||
#include <QSharedPointer>
|
#include <QSharedPointer>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
namespace Tomahawk
|
namespace Tomahawk
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -156,6 +154,8 @@ public slots:
|
|||||||
const QList< Tomahawk::dyncontrol_ptr>& controls,
|
const QList< Tomahawk::dyncontrol_ptr>& controls,
|
||||||
bool applied );
|
bool applied );
|
||||||
|
|
||||||
|
void setWeakSelf( QWeakPointer< DynamicPlaylist > self );
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void removeFromDatabase();
|
virtual void removeFromDatabase();
|
||||||
|
|
||||||
|
@@ -72,6 +72,8 @@ public:
|
|||||||
Q_DECLARE_PUBLIC( DynamicPlaylist )
|
Q_DECLARE_PUBLIC( DynamicPlaylist )
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
QWeakPointer< DynamicPlaylist > weakSelf;
|
||||||
|
|
||||||
geninterface_ptr generator;
|
geninterface_ptr generator;
|
||||||
bool autoLoad;
|
bool autoLoad;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user