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

Proposed by Victor Thompson
Status: Merged
Approved by: David Planella
Approved revision: 10
Merged at revision: 10
Proposed branch: lp:~vthompson/qtgrilo/changes-from-upstream
Merge into: lp:qtgrilo
Diff against target: 58 lines (+10/-10)
2 files modified
declarative/grilomedia.cpp (+6/-6)
declarative/grilomedia.h (+4/-4)
To merge this branch: bzr merge lp:~vthompson/qtgrilo/changes-from-upstream
Reviewer Review Type Date Requested Status
David Planella Approve
Review via email: mp+185611@code.launchpad.net

Commit message

Recommended changes from upstream.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
David Planella (dpm) wrote :

Looks good to me!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'declarative/grilomedia.cpp'
2--- declarative/grilomedia.cpp 2013-09-12 00:05:05 +0000
3+++ declarative/grilomedia.cpp 2013-09-14 02:13:44 +0000
4@@ -100,22 +100,22 @@
5 return QString();
6 }
7
8-QString GriloMedia::thumbnail() const
9+QUrl GriloMedia::thumbnail() const
10 {
11 if (GRL_IS_MEDIA(m_media)) {
12- return QString::fromUtf8(grl_media_get_thumbnail(GRL_MEDIA(m_media)));
13+ return QUrl(grl_media_get_thumbnail(GRL_MEDIA(m_media)));
14 }
15
16- return QString();
17+ return QUrl();
18 }
19
20-QString GriloMedia::year() const
21+int GriloMedia::year() const
22 {
23 if (GRL_IS_MEDIA(m_media)) {
24- return QString::number(g_date_time_get_year(grl_media_get_creation_date(GRL_MEDIA(m_media))));
25+ return g_date_time_get_year(grl_media_get_creation_date(GRL_MEDIA(m_media)));
26 }
27
28- return QString();
29+ return 0;
30 }
31
32 int GriloMedia::trackNumber() const
33
34=== modified file 'declarative/grilomedia.h'
35--- declarative/grilomedia.h 2013-09-12 00:05:05 +0000
36+++ declarative/grilomedia.h 2013-09-14 02:13:44 +0000
37@@ -40,8 +40,8 @@
38 Q_PROPERTY(QString album READ album CONSTANT);
39 Q_PROPERTY(QString artist READ artist CONSTANT);
40 Q_PROPERTY(QString genre READ genre CONSTANT);
41- Q_PROPERTY(QString thumbnail READ thumbnail CONSTANT);
42- Q_PROPERTY(QString year READ year CONSTANT);
43+ Q_PROPERTY(QUrl thumbnail READ thumbnail CONSTANT);
44+ Q_PROPERTY(int year READ year CONSTANT);
45 Q_PROPERTY(int trackNumber READ trackNumber CONSTANT);
46 Q_PROPERTY(int childCount READ childCount CONSTANT);
47 Q_PROPERTY(QString mimeType READ mimeType CONSTANT);
48@@ -58,8 +58,8 @@
49 QString album() const;
50 QString artist() const;
51 QString genre() const;
52- QString thumbnail() const;
53- QString year() const;
54+ QUrl thumbnail() const;
55+ int year() const;
56 int trackNumber() const;
57 int childCount() const;
58 QString mimeType() const;

Subscribers

People subscribed via source and target branches