Merge lp:~vthompson/qtgrilo/changes-from-upstream into lp:qtgrilo

[Victor Thompson]

Recommended changes from upstream.

The added properties (genre, cover art, year, and track number) have merged upstream--with the changes proposed in this branch. No changes to the Music app are necessary to utilize the plugin with these modifications.

[David Planella (dpm)]

Looks good to me!

review: Approve

=== modified file 'declarative/grilomedia.cpp'
--- declarative/grilomedia.cpp	2013-09-12 00:05:05 +0000
+++ declarative/grilomedia.cpp	2013-09-14 02:13:44 +0000
@@ -100,22 +100,22 @@
   return QString();
 }
 
-QString GriloMedia::thumbnail() const
+QUrl GriloMedia::thumbnail() const
 {
   if (GRL_IS_MEDIA(m_media)) {
-    return QString::fromUtf8(grl_media_get_thumbnail(GRL_MEDIA(m_media)));
+    return QUrl(grl_media_get_thumbnail(GRL_MEDIA(m_media)));
   }
 
-  return QString();
+  return QUrl();
 }
 
-QString GriloMedia::year() const
+int GriloMedia::year() const
 {
   if (GRL_IS_MEDIA(m_media)) {
-    return QString::number(g_date_time_get_year(grl_media_get_creation_date(GRL_MEDIA(m_media))));
+    return g_date_time_get_year(grl_media_get_creation_date(GRL_MEDIA(m_media)));
   }
 
-  return QString();
+  return 0;
 }
 
 int GriloMedia::trackNumber() const
 
=== modified file 'declarative/grilomedia.h'
--- declarative/grilomedia.h	2013-09-12 00:05:05 +0000
+++ declarative/grilomedia.h	2013-09-14 02:13:44 +0000
@@ -40,8 +40,8 @@
   Q_PROPERTY(QString album READ album CONSTANT);
   Q_PROPERTY(QString artist READ artist CONSTANT);
   Q_PROPERTY(QString genre READ genre CONSTANT);
-  Q_PROPERTY(QString thumbnail READ thumbnail CONSTANT);
-  Q_PROPERTY(QString year READ year CONSTANT);
+  Q_PROPERTY(QUrl thumbnail READ thumbnail CONSTANT);
+  Q_PROPERTY(int year READ year CONSTANT);
   Q_PROPERTY(int trackNumber READ trackNumber CONSTANT);
   Q_PROPERTY(int childCount READ childCount CONSTANT);
   Q_PROPERTY(QString mimeType READ mimeType CONSTANT);
@@ -58,8 +58,8 @@
   QString album() const;
   QString artist() const;
   QString genre() const;
-  QString thumbnail() const;
-  QString year() const;
+  QUrl thumbnail() const;
+  int year() const;
   int trackNumber() const;
   int childCount() const;
   QString mimeType() const;