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

* DbCmd_ShareTrack operates on a track(-id) basis.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-05-16 11:52:37 +02:00
parent 9ef160826a
commit daa8a2c6ef
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libtomahawk/database/DatabaseCommand_ShareTrack.cpp
View File

@@ -33,7 +33,7 @@ DatabaseCommand_ShareTrack::DatabaseCommand_ShareTrack( QObject* parent )
{} {}
DatabaseCommand_ShareTrack::DatabaseCommand_ShareTrack( const Tomahawk::track_ptr& track, DatabaseCommand_ShareTrack::DatabaseCommand_ShareTrack( const Tomahawk::trackdata_ptr& track,
const QString& recipientDbid, const QString& recipientDbid,
QObject* parent ) QObject* parent )
: DatabaseCommand_SocialAction( track, "Inbox", "", parent ) : DatabaseCommand_SocialAction( track, "Inbox", "", parent )
@@ -70,7 +70,7 @@ DatabaseCommand_ShareTrack::postCommitHook()
if ( source()->isLocal() ) if ( source()->isLocal() )
Servent::instance()->triggerDBSync(); Servent::instance()->triggerDBSync();
if ( !m_track.isNull() ) if ( m_track )
return; return;
QString myDbid = SourceList::instance()->getLocal()->nodeId(); QString myDbid = SourceList::instance()->getLocal()->nodeId();
@@ -79,9 +79,8 @@ DatabaseCommand_ShareTrack::postCommitHook()
return; return;
//From here on, everything happens only on the recipient, and only if recipient!=source //From here on, everything happens only on the recipient, and only if recipient!=source
m_track = Tomahawk::Track::get( artist(), track(), QString() ); m_track = Tomahawk::TrackData::get( 0, artist(), track() );
if ( !m_track )
if ( m_track.isNull() )
return; return;
Tomahawk::SocialAction action; Tomahawk::SocialAction action;
@@ -101,7 +100,7 @@ DatabaseCommand_ShareTrack::postCommitHook()
Q_ARG( int, 0 ) /*row*/ ); Q_ARG( int, 0 ) /*row*/ );
QString friendlyName = source()->friendlyName(); QString friendlyName = source()->friendlyName();
if( ViewManager::instance()->currentPage() != ViewManager::instance()->inboxWidget() ) if ( ViewManager::instance()->currentPage() != ViewManager::instance()->inboxWidget() )
JobStatusView::instance()->model()->addJob( new InboxJobItem( friendlyName, m_track ) ); JobStatusView::instance()->model()->addJob( new InboxJobItem( friendlyName, m_track ) );
} }

2
src/libtomahawk/database/DatabaseCommand_ShareTrack.h
View File

@@ -36,7 +36,7 @@ class DLLEXPORT DatabaseCommand_ShareTrack : public DatabaseCommand_SocialAction
public: public:
explicit DatabaseCommand_ShareTrack( QObject* parent = 0 ); explicit DatabaseCommand_ShareTrack( QObject* parent = 0 );
explicit DatabaseCommand_ShareTrack( const Tomahawk::track_ptr& track, explicit DatabaseCommand_ShareTrack( const Tomahawk::trackdata_ptr& track,
const QString& recipientDbid, const QString& recipientDbid,
QObject* parent = 0 ); QObject* parent = 0 );