From 76a24a0a28194491e8ab298f8be1090dd558e873 Mon Sep 17 00:00:00 2001
From: Jim Broadus <jbroadus@gmail.com>
Date: Tue, 16 Jun 2020 17:08:23 -0700
Subject: [PATCH] Use DbPlaylistItem base class for Jamendo and Magnatune

Moving these from LibraryPlaylistItem removes local file specific
implementations of IsLocalLibraryItem and Reload. Returning true for
IsLocalLibraryItem caused ratings to be set on unrelated library songs.
---
 src/internet/jamendo/jamendoplaylistitem.cpp     | 8 ++------
 src/internet/jamendo/jamendoplaylistitem.h       | 6 ++----
 src/internet/magnatune/magnatuneplaylistitem.cpp | 8 ++------
 src/internet/magnatune/magnatuneplaylistitem.h   | 6 ++----
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/internet/jamendo/jamendoplaylistitem.cpp b/src/internet/jamendo/jamendoplaylistitem.cpp
index 8eb1b2ad0..f8a482594 100644
--- a/src/internet/jamendo/jamendoplaylistitem.cpp
+++ b/src/internet/jamendo/jamendoplaylistitem.cpp
@@ -20,12 +20,10 @@
 #include "jamendoplaylistitem.h"
 
 JamendoPlaylistItem::JamendoPlaylistItem(const QString& type)
-    : LibraryPlaylistItem(type) {}
+    : DbPlaylistItem(type) {}
 
 JamendoPlaylistItem::JamendoPlaylistItem(const Song& song)
-    : LibraryPlaylistItem("Jamendo") {
-  song_ = song;
-}
+    : DbPlaylistItem("Jamendo", song) {}
 
 bool JamendoPlaylistItem::InitFromQuery(const SqlRow& query) {
   // Rows from the songs tables come first
@@ -33,5 +31,3 @@ bool JamendoPlaylistItem::InitFromQuery(const SqlRow& query) {
 
   return song_.is_valid();
 }
-
-QUrl JamendoPlaylistItem::Url() const { return song_.url(); }
diff --git a/src/internet/jamendo/jamendoplaylistitem.h b/src/internet/jamendo/jamendoplaylistitem.h
index a0b273645..85eef5800 100644
--- a/src/internet/jamendo/jamendoplaylistitem.h
+++ b/src/internet/jamendo/jamendoplaylistitem.h
@@ -20,16 +20,14 @@
 #ifndef INTERNET_JAMENDO_JAMENDOPLAYLISTITEM_H_
 #define INTERNET_JAMENDO_JAMENDOPLAYLISTITEM_H_
 
-#include "library/libraryplaylistitem.h"
+#include "playlist/dbplaylistitem.h"
 
-class JamendoPlaylistItem : public LibraryPlaylistItem {
+class JamendoPlaylistItem : public DbPlaylistItem {
  public:
   explicit JamendoPlaylistItem(const QString& type);
   explicit JamendoPlaylistItem(const Song& song);
 
   bool InitFromQuery(const SqlRow& query);
-
-  QUrl Url() const;
 };
 
 #endif  // INTERNET_JAMENDO_JAMENDOPLAYLISTITEM_H_
diff --git a/src/internet/magnatune/magnatuneplaylistitem.cpp b/src/internet/magnatune/magnatuneplaylistitem.cpp
index 20da67965..ee1669173 100644
--- a/src/internet/magnatune/magnatuneplaylistitem.cpp
+++ b/src/internet/magnatune/magnatuneplaylistitem.cpp
@@ -21,12 +21,10 @@
 #include "internet/core/internetmodel.h"
 
 MagnatunePlaylistItem::MagnatunePlaylistItem(const QString& type)
-    : LibraryPlaylistItem(type) {}
+    : DbPlaylistItem(type) {}
 
 MagnatunePlaylistItem::MagnatunePlaylistItem(const Song& song)
-    : LibraryPlaylistItem("Magnatune") {
-  song_ = song;
-}
+    : DbPlaylistItem("Magnatune", song) {}
 
 bool MagnatunePlaylistItem::InitFromQuery(const SqlRow& query) {
   // Rows from the songs tables come first
@@ -34,5 +32,3 @@ bool MagnatunePlaylistItem::InitFromQuery(const SqlRow& query) {
 
   return song_.is_valid();
 }
-
-QUrl MagnatunePlaylistItem::Url() const { return song_.url(); }
diff --git a/src/internet/magnatune/magnatuneplaylistitem.h b/src/internet/magnatune/magnatuneplaylistitem.h
index eb8858bf0..f41fb5465 100644
--- a/src/internet/magnatune/magnatuneplaylistitem.h
+++ b/src/internet/magnatune/magnatuneplaylistitem.h
@@ -20,16 +20,14 @@
 #ifndef INTERNET_MAGNATUNE_MAGNATUNEPLAYLISTITEM_H_
 #define INTERNET_MAGNATUNE_MAGNATUNEPLAYLISTITEM_H_
 
-#include "library/libraryplaylistitem.h"
+#include "playlist/dbplaylistitem.h"
 
-class MagnatunePlaylistItem : public LibraryPlaylistItem {
+class MagnatunePlaylistItem : public DbPlaylistItem {
  public:
   explicit MagnatunePlaylistItem(const QString& type);
   explicit MagnatunePlaylistItem(const Song& song);
 
   bool InitFromQuery(const SqlRow& query);
-
-  QUrl Url() const;
 };
 
 #endif  // INTERNET_MAGNATUNE_MAGNATUNEPLAYLISTITEM_H_