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

Saner check for db collection.

This commit is contained in:
Teo Mrnjavac
2013-01-21 16:47:05 +01:00
parent e36d9294cc
commit 28e681329e
4 changed files with 11 additions and 2 deletions

View File

@@ -48,6 +48,7 @@ public:
virtual ~Collection(); virtual ~Collection();
virtual QString name() const; virtual QString name() const;
virtual QString type() const { return QString(); }
virtual void loadPlaylists() { qDebug() << Q_FUNC_INFO; } virtual void loadPlaylists() { qDebug() << Q_FUNC_INFO; }
virtual void loadAutoPlaylists() { qDebug() << Q_FUNC_INFO; } virtual void loadAutoPlaylists() { qDebug() << Q_FUNC_INFO; }

View File

@@ -105,7 +105,11 @@ collection_ptr
Source::collection() const Source::collection() const
{ {
if ( m_collections.length() ) if ( m_collections.length() )
return m_collections.first(); {
foreach ( const collection_ptr& collection, m_collections )
if ( collection->type() == "databasecollection" )
return collection; // We assume only one is a db collection. Now get off my lawn.
}
collection_ptr tmp; collection_ptr tmp;
return tmp; return tmp;

View File

@@ -39,6 +39,8 @@ public:
qDebug() << Q_FUNC_INFO; qDebug() << Q_FUNC_INFO;
} }
virtual QString type() const { return "databasecollection"; }
virtual void loadPlaylists(); virtual void loadPlaylists();
virtual void loadAutoPlaylists(); virtual void loadAutoPlaylists();
virtual void loadStations(); virtual void loadStations();

View File

@@ -40,6 +40,8 @@ public:
QObject* parent = 0 ); QObject* parent = 0 );
virtual ~ScriptCollection(); virtual ~ScriptCollection();
virtual QString type() const { return "scriptcollection"; }
private: private:
ExternalResolver* m_resolver; ExternalResolver* m_resolver;