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

* Result shouldn't handle track attributes.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-05-16 11:35:20 +02:00
parent 216d440206
commit 5acf94d9cd
2 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libtomahawk/Result.cpp
View File

@@ -88,9 +88,7 @@ Result::Result( const QString& url )
, m_bitrate( 0 ) , m_bitrate( 0 )
, m_size( 0 ) , m_size( 0 )
, m_modtime( 0 ) , m_modtime( 0 )
, m_year( 0 )
, m_score( 0 ) , m_score( 0 )
, m_trackId( 0 )
, m_fileId( 0 ) , m_fileId( 0 )
{ {
connect( Pipeline::instance(), SIGNAL( resolverRemoved( Tomahawk::Resolver* ) ), SLOT( onResolverRemoved( Tomahawk::Resolver* ) ), Qt::QueuedConnection ); connect( Pipeline::instance(), SIGNAL( resolverRemoved( Tomahawk::Resolver* ) ), SLOT( onResolverRemoved( Tomahawk::Resolver* ) ), Qt::QueuedConnection );
@@ -250,16 +248,6 @@ Result::toQuery()
} }
void
Result::updateAttributes()
{
if ( m_attributes.contains( "releaseyear" ) )
{
m_year = m_attributes.value( "releaseyear" ).toInt();
}
}
void void
Result::onOnline() Result::onOnline()
{ {

13
src/libtomahawk/Result.h
View File

@@ -84,10 +84,8 @@ public:
unsigned int bitrate() const { return m_bitrate; } unsigned int bitrate() const { return m_bitrate; }
unsigned int size() const { return m_size; } unsigned int size() const { return m_size; }
unsigned int modificationTime() const { return m_modtime; } unsigned int modificationTime() const { return m_modtime; }
int year() const { return m_year; }
void setScore( float score ) { m_score = score; } void setScore( float score ) { m_score = score; }
void setTrackId( unsigned int id ) { m_trackId = id; }
void setFileId( unsigned int id ) { m_fileId = id; } void setFileId( unsigned int id ) { m_fileId = id; }
void setRID( RID id ) { m_rid = id; } void setRID( RID id ) { m_rid = id; }
void setCollection( const Tomahawk::collection_ptr& collection ); void setCollection( const Tomahawk::collection_ptr& collection );
@@ -98,14 +96,9 @@ public:
void setBitrate( unsigned int bitrate ) { m_bitrate = bitrate; } void setBitrate( unsigned int bitrate ) { m_bitrate = bitrate; }
void setSize( unsigned int size ) { m_size = size; } void setSize( unsigned int size ) { m_size = size; }
void setModificationTime( unsigned int modtime ) { m_modtime = modtime; } void setModificationTime( unsigned int modtime ) { m_modtime = modtime; }
void setYear( unsigned int year ) { m_year = year; }
void setTrack( const track_ptr& track ) { m_track = track; } void setTrack( const track_ptr& track ) { m_track = track; }
QVariantMap attributes() const { return m_attributes; }
void setAttributes( const QVariantMap& map ) { m_attributes = map; updateAttributes(); }
unsigned int trackId() const { return m_trackId; }
unsigned int fileId() const { return m_fileId; } unsigned int fileId() const { return m_fileId; }
track_ptr track() const; track_ptr track() const;
@@ -130,8 +123,6 @@ private:
explicit Result( const QString& url ); explicit Result( const QString& url );
explicit Result(); explicit Result();
void updateAttributes();
mutable RID m_rid; mutable RID m_rid;
collection_ptr m_collection; collection_ptr m_collection;
QPointer< Tomahawk::Resolver > m_resolvedBy; QPointer< Tomahawk::Resolver > m_resolvedBy;
@@ -145,11 +136,9 @@ private:
unsigned int m_bitrate; unsigned int m_bitrate;
unsigned int m_size; unsigned int m_size;
unsigned int m_modtime; unsigned int m_modtime;
int m_year;
float m_score; float m_score;
QVariantMap m_attributes; unsigned int m_fileId;
unsigned int m_trackId, m_fileId;
track_ptr m_track; track_ptr m_track;
query_wptr m_query; query_wptr m_query;