From 3de291394df90ecb9586041709b7942f3307cfcc Mon Sep 17 00:00:00 2001
From: EmmanuelMess <emmanuelbendavid@gmail.com>
Date: Fri, 10 Sep 2021 16:15:56 -0300
Subject: [PATCH] Fix narrowing conversions in song

---
 src/core/mpris_common.h |  4 ++--
 src/core/song.cpp       | 14 +++++++-------
 src/core/song.h         | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/core/mpris_common.h b/src/core/mpris_common.h
index 86a5c03b..4faa7b54 100644
--- a/src/core/mpris_common.h
+++ b/src/core/mpris_common.h
@@ -43,8 +43,8 @@ inline void AddMetadata(const QString &key, int metadata, QVariantMap *map) {
   if (metadata > 0) (*map)[key] = metadata;
 }
 
-inline void AddMetadata(const QString &key, qint64 metadata, QVariantMap *map) {
-  if (metadata > 0) (*map)[key] = metadata;
+inline void AddMetadata(const QString &key, quint64 metadata, QVariantMap *map) {
+  (*map)[key] = metadata;
 }
 
 inline void AddMetadata(const QString &key, double metadata, QVariantMap *map) {
diff --git a/src/core/song.cpp b/src/core/song.cpp
index 91173675..5c4a605f 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -190,8 +190,8 @@ struct Song::Private : public QSharedData {
   QString album_id_;
   QString song_id_;
 
-  qint64 beginning_;
-  qint64 end_;
+  quint64 beginning_;
+  quint64 end_;
 
   int bitrate_;
   int samplerate_;
@@ -318,9 +318,9 @@ const QString &Song::grouping() const { return d->grouping_; }
 const QString &Song::comment() const { return d->comment_; }
 const QString &Song::lyrics() const { return d->lyrics_; }
 
-qint64 Song::beginning_nanosec() const { return d->beginning_; }
-qint64 Song::end_nanosec() const { return d->end_; }
-qint64 Song::length_nanosec() const { return d->end_ - d->beginning_; }
+quint64 Song::beginning_nanosec() const { return d->beginning_; }
+quint64 Song::end_nanosec() const { return d->end_; }
+quint64 Song::length_nanosec() const { return d->end_ - d->beginning_; }
 
 int Song::bitrate() const { return d->bitrate_; }
 int Song::samplerate() const { return d->samplerate_; }
@@ -445,8 +445,8 @@ void Song::set_comment(const QString &v) { d->comment_ = v; }
 void Song::set_lyrics(const QString &v) { d->lyrics_ = v; }
 
 void Song::set_beginning_nanosec(qint64 v) { d->beginning_ = qMax(0LL, v); }
-void Song::set_end_nanosec(qint64 v) { d->end_ = v; }
-void Song::set_length_nanosec(qint64 v) { d->end_ = d->beginning_ + v; }
+void Song::set_end_nanosec(quint64 v) { d->end_ = v; }
+void Song::set_length_nanosec(quint64 v) { d->end_ = d->beginning_ + v; }
 
 void Song::set_bitrate(int v) { d->bitrate_ = v; }
 void Song::set_samplerate(int v) { d->samplerate_ = v; }
diff --git a/src/core/song.h b/src/core/song.h
index 7f6873d5..3bffd8a7 100644
--- a/src/core/song.h
+++ b/src/core/song.h
@@ -219,9 +219,9 @@ class Song {
   QString album_id() const;
   QString song_id() const;
 
-  qint64 beginning_nanosec() const;
-  qint64 end_nanosec() const;
-  qint64 length_nanosec() const;
+  quint64 beginning_nanosec() const;
+  quint64 end_nanosec() const;
+  quint64 length_nanosec() const;
 
   int bitrate() const;
   int samplerate() const;
@@ -336,8 +336,8 @@ class Song {
   void set_song_id(const QString &v);
 
   void set_beginning_nanosec(qint64 v);
-  void set_end_nanosec(qint64 v);
-  void set_length_nanosec(qint64 v);
+  void set_end_nanosec(quint64 v);
+  void set_length_nanosec(quint64 v);
 
   void set_bitrate(int v);
   void set_samplerate(int v);