From a14294372a40292da58f5d10c93f929ac0b29bcf Mon Sep 17 00:00:00 2001 From: Paul Harrison Date: Mon, 27 May 2013 00:02:22 +0100 Subject: [PATCH] MythMusic: remove some redundant CD stuff from PlaylistContainer --- .../mythmusic/mythmusic/playlistcontainer.cpp | 22 ------------------- .../mythmusic/mythmusic/playlistcontainer.h | 7 +----- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/mythplugins/mythmusic/mythmusic/playlistcontainer.cpp b/mythplugins/mythmusic/mythmusic/playlistcontainer.cpp index 2c350681d20..7b89f8f4c0d 100644 --- a/mythplugins/mythmusic/mythmusic/playlistcontainer.cpp +++ b/mythplugins/mythmusic/mythmusic/playlistcontainer.cpp @@ -26,26 +26,6 @@ void PlaylistLoadingThread::run() #define LOC_WARN QString("PlaylistContainer, Warning: ") #define LOC_ERR QString("PlaylistContainer, Error: ") -void PlaylistContainer::clearCDList() -{ - m_cdPlaylist.clear(); -} - -void PlaylistContainer::addCDTrack(int track) -{ - m_cdPlaylist.push_back(track); -} - -void PlaylistContainer::removeCDTrack(int track) -{ - m_cdPlaylist.removeAll(track); -} - -bool PlaylistContainer::checkCDTrack(int track) -{ - return m_cdPlaylist.contains(track); -} - PlaylistContainer::PlaylistContainer(AllMusic *all_music) : m_activePlaylist(NULL), m_streamPlaylist(NULL), m_allPlaylists(NULL), m_allMusic(all_music), @@ -102,8 +82,6 @@ void PlaylistContainer::load() m_allPlaylists = new QList; - m_cdPlaylist.clear(); - m_activePlaylist->loadPlaylist("default_playlist_storage", m_myHost); m_streamPlaylist->loadPlaylist("stream_playlist", m_myHost); diff --git a/mythplugins/mythmusic/mythmusic/playlistcontainer.h b/mythplugins/mythmusic/mythmusic/playlistcontainer.h index 7550713bc71..0d3ab15bb1b 100644 --- a/mythplugins/mythmusic/mythmusic/playlistcontainer.h +++ b/mythplugins/mythmusic/mythmusic/playlistcontainer.h @@ -31,10 +31,6 @@ class PlaylistContainer Playlist* getPlaylist(const QString &name); Playlist* getStreamPlaylist(void) { return m_streamPlaylist; } - void clearCDList(); - void addCDTrack(int x); - void removeCDTrack(int x); - bool checkCDTrack(int x); void save(); void createNewPlaylist(QString name); @@ -59,10 +55,9 @@ class PlaylistContainer QList *getPlaylists(void) { return m_allPlaylists; } QStringList getPlaylistNames(void); - private: + private: Playlist *m_activePlaylist; Playlist *m_streamPlaylist; - QList m_cdPlaylist; QList *m_allPlaylists; AllMusic *m_allMusic;