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

* DRY code in PlayableItem.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-08-22 20:16:38 +02:00
parent 437fa2b77b
commit bbe1f8c663
2 changed files with 31 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/libtomahawk/playlist/PlayableItem.cpp
View File

@@ -78,17 +78,7 @@ PlayableItem::PlayableItem( const Tomahawk::result_ptr& result, PlayableItem* pa
{ {
init( parent, row ); init( parent, row );
connect( result->track().data(), SIGNAL( socialActionsLoaded() ), connect( result.data(), SIGNAL( updated() ), SIGNAL( dataChanged() ) );
SIGNAL( dataChanged() ) );
connect( result->track().data(), SIGNAL( attributesLoaded() ),
SIGNAL( dataChanged() ) );
connect( result->track().data(), SIGNAL( updated() ),
SIGNAL( dataChanged() ) );
connect( result.data(), SIGNAL( updated() ),
SIGNAL( dataChanged() ) );
} }
@@ -97,39 +87,15 @@ PlayableItem::PlayableItem( const Tomahawk::query_ptr& query, PlayableItem* pare
, m_query( query ) , m_query( query )
{ {
init( parent, row ); init( parent, row );
connect( query->track().data(), SIGNAL( socialActionsLoaded() ),
SIGNAL( dataChanged() ) );
connect( query->track().data(), SIGNAL( attributesLoaded() ),
SIGNAL( dataChanged() ) );
connect( query->track().data(), SIGNAL( updated() ),
SIGNAL( dataChanged() ) );
connect( query.data(), SIGNAL( resultsChanged() ),
SLOT( onResultsChanged() ) );
} }
PlayableItem::PlayableItem( const Tomahawk::plentry_ptr& entry, PlayableItem* parent, int row ) PlayableItem::PlayableItem( const Tomahawk::plentry_ptr& entry, PlayableItem* parent, int row )
: QObject( parent ) : QObject( parent )
, m_entry( entry ) , m_entry( entry )
, m_query( entry->query() )
{ {
m_query = entry->query();
init( parent, row ); init( parent, row );
connect( m_query->track().data(), SIGNAL( socialActionsLoaded() ),
SIGNAL( dataChanged() ) );
connect( m_query->track().data(), SIGNAL( attributesLoaded() ),
SIGNAL( dataChanged() ) );
connect( m_query->track().data(), SIGNAL( updated() ),
SIGNAL( dataChanged() ) );
connect( m_query.data(), SIGNAL( resultsChanged() ),
SLOT( onResultsChanged() ) );
} }
@@ -148,6 +114,24 @@ PlayableItem::init( PlayableItem* parent, int row )
m_isPlaying = false; m_isPlaying = false;
m_parent = parent; m_parent = parent;
track_ptr track;
if ( m_query )
{
connect( m_query.data(), SIGNAL( resultsChanged() ), SLOT( onResultsChanged() ) );
track = m_query->track();
}
else if ( m_result )
{
track = m_result->track();
}
if ( track )
{
connect( track.data(), SIGNAL( socialActionsLoaded() ), SIGNAL( dataChanged() ) );
connect( track.data(), SIGNAL( attributesLoaded() ), SIGNAL( dataChanged() ) );
connect( track.data(), SIGNAL( updated() ), SIGNAL( dataChanged() ) );
}
if ( parent ) if ( parent )
{ {
if ( row < 0 ) if ( row < 0 )
@@ -161,7 +145,7 @@ PlayableItem::init( PlayableItem* parent, int row )
} }
} }
if ( !m_query.isNull() ) if ( m_query )
{ {
onResultsChanged(); onResultsChanged();
} }
@@ -183,19 +167,19 @@ PlayableItem::onResultsChanged()
QString QString
PlayableItem::name() const PlayableItem::name() const
{ {
if ( !m_artist.isNull() ) if ( m_artist )
{ {
return m_artist->name(); return m_artist->name();
} }
else if ( !m_album.isNull() ) else if ( m_album )
{ {
return m_album->name(); return m_album->name();
} }
else if ( !m_result.isNull() ) else if ( m_result )
{ {
return m_result->track()->track(); return m_result->track()->track();
} }
else if ( !m_query.isNull() ) else if ( m_query )
{ {
return m_query->track()->track(); return m_query->track()->track();
} }
@@ -208,11 +192,11 @@ PlayableItem::name() const
QString QString
PlayableItem::artistName() const PlayableItem::artistName() const
{ {
if ( !m_result.isNull() ) if ( m_result )
{ {
return m_result->track()->artist(); return m_result->track()->artist();
} }
else if ( !m_query.isNull() ) else if ( m_query )
{ {
return m_query->track()->artist(); return m_query->track()->artist();
} }
@@ -224,11 +208,11 @@ PlayableItem::artistName() const
QString QString
PlayableItem::albumName() const PlayableItem::albumName() const
{ {
if ( !m_result.isNull() ) if ( m_result )
{ {
return m_result->track()->album(); return m_result->track()->album();
} }
else if ( !m_query.isNull() ) else if ( m_query )
{ {
return m_query->track()->album(); return m_query->track()->album();
} }
@@ -240,7 +224,7 @@ PlayableItem::albumName() const
const Tomahawk::result_ptr& const Tomahawk::result_ptr&
PlayableItem::result() const PlayableItem::result() const
{ {
if ( m_result.isNull() && !m_query.isNull() ) if ( !m_result && m_query )
{ {
if ( m_query->numResults() ) if ( m_query->numResults() )
return m_query->results().first(); return m_query->results().first();

2
src/libtomahawk/playlist/PlayableItem.h
View File

@@ -81,9 +81,9 @@ private:
Tomahawk::artist_ptr m_artist; Tomahawk::artist_ptr m_artist;
Tomahawk::album_ptr m_album; Tomahawk::album_ptr m_album;
Tomahawk::plentry_ptr m_entry;
Tomahawk::result_ptr m_result; Tomahawk::result_ptr m_result;
Tomahawk::query_ptr m_query; Tomahawk::query_ptr m_query;
Tomahawk::plentry_ptr m_entry;
Tomahawk::source_ptr m_source; Tomahawk::source_ptr m_source;
PlayableItem* m_parent; PlayableItem* m_parent;