Permalink
Browse files

[song/musicinfotag] remove artist id from CSong and CMusicInfoTag

  • Loading branch information...
1 parent 4182f70 commit 2e569578860ab67ebdefa59a96f9d38c33b31406 Jonathan Marshall committed Jul 2, 2012
Showing with 0 additions and 23 deletions.
  1. +0 −3 xbmc/music/Song.cpp
  2. +0 −1 xbmc/music/Song.h
  3. +0 −16 xbmc/music/tags/MusicInfoTag.cpp
  4. +0 −3 xbmc/music/tags/MusicInfoTag.h
View
@@ -55,7 +55,6 @@ CSong::CSong(CMusicInfoTag& tag)
iTimesPlayed = 0;
iKaraokeNumber = 0;
iKaraokeDelay = 0; //! Karaoke song lyrics-music delay in 1/10 seconds.
- iArtistId = -1;
iAlbumId = -1;
}
@@ -85,7 +84,6 @@ void CSong::Serialize(CVariant& value)
value["timesplayed"] = iTimesPlayed;
value["lastplayed"] = lastPlayed.IsValid() ? lastPlayed.GetAsDBDateTime() : "";
value["karaokenumber"] = (int64_t) iKaraokeNumber;
- value["artistid"] = iArtistId;
value["albumid"] = iAlbumId;
}
@@ -116,7 +114,6 @@ void CSong::Clear()
iKaraokeNumber = 0;
strKaraokeLyrEncoding.Empty();
iKaraokeDelay = 0;
- iArtistId = -1;
iAlbumId = -1;
bCompilation = false;
embeddedArt.clear();
View
@@ -101,7 +101,6 @@ class CSong: public ISerializable
CDateTime lastPlayed;
int iStartOffset;
int iEndOffset;
- int iArtistId;
int iAlbumId;
bool bCompilation;
@@ -107,7 +107,6 @@ const CMusicInfoTag& CMusicInfoTag::operator =(const CMusicInfoTag& tag)
m_iTimesPlayed = tag.m_iTimesPlayed;
m_iDbId = tag.m_iDbId;
m_type = tag.m_type;
- m_iArtistId = tag.m_iArtistId;
m_iAlbumId = tag.m_iAlbumId;
memcpy(&m_dwReleaseDate, &tag.m_dwReleaseDate, sizeof(m_dwReleaseDate) );
m_coverArt = tag.m_coverArt;
@@ -168,11 +167,6 @@ const std::vector<std::string>& CMusicInfoTag::GetArtist() const
return m_artist;
}
-int CMusicInfoTag::GetArtistId() const
-{
- return m_iArtistId;
-}
-
const CStdString& CMusicInfoTag::GetAlbum() const
{
return m_strAlbum;
@@ -280,11 +274,6 @@ void CMusicInfoTag::SetArtist(const std::vector<std::string>& artists)
m_artist = artists;
}
-void CMusicInfoTag::SetArtistId(const int iArtistId)
-{
- m_iArtistId = iArtistId;
-}
-
void CMusicInfoTag::SetAlbum(const CStdString& strAlbum)
{
m_strAlbum = Trim(strAlbum);
@@ -500,7 +489,6 @@ void CMusicInfoTag::SetSong(const CSong& song)
m_type = "song";
m_bLoaded = true;
m_iTimesPlayed = song.iTimesPlayed;
- m_iArtistId = song.iArtistId;
m_iAlbumId = song.iAlbumId;
}
@@ -530,7 +518,6 @@ void CMusicInfoTag::Serialize(CVariant& value)
value["playcount"] = m_iTimesPlayed;
value["lastplayed"] = m_lastPlayed.IsValid() ? m_lastPlayed.GetAsDBDateTime() : StringUtils::EmptyString;
value["lyrics"] = m_strLyrics;
- value["artistid"] = m_iArtistId;
value["albumid"] = m_iAlbumId;
}
@@ -575,7 +562,6 @@ void CMusicInfoTag::Archive(CArchive& ar)
ar << m_strComment;
ar << m_rating;
ar << m_iTimesPlayed;
- ar << m_iArtistId;
ar << m_iAlbumId;
}
else
@@ -599,7 +585,6 @@ void CMusicInfoTag::Archive(CArchive& ar)
ar >> m_strComment;
ar >> m_rating;
ar >> m_iTimesPlayed;
- ar >> m_iArtistId;
ar >> m_iAlbumId;
}
}
@@ -628,7 +613,6 @@ void CMusicInfoTag::Clear()
m_type.clear();
m_iTimesPlayed = 0;
memset(&m_dwReleaseDate, 0, sizeof(m_dwReleaseDate) );
- m_iArtistId = -1;
m_iAlbumId = -1;
m_coverArt.clear();
}
@@ -69,7 +69,6 @@ class CMusicInfoTag : public IArchivable, public ISerializable, public ISortable
const CStdString& GetTitle() const;
const CStdString& GetURL() const;
const std::vector<std::string>& GetArtist() const;
- int GetArtistId() const;
const CStdString& GetAlbum() const;
int GetAlbumId() const;
const std::vector<std::string>& GetAlbumArtist() const;
@@ -102,7 +101,6 @@ class CMusicInfoTag : public IArchivable, public ISerializable, public ISortable
void SetTitle(const CStdString& strTitle);
void SetArtist(const CStdString& strArtist);
void SetArtist(const std::vector<std::string>& artists);
- void SetArtistId(const int iArtistId);
void SetAlbum(const CStdString& strAlbum);
void SetAlbumId(const int iAlbumId);
void SetAlbumArtist(const CStdString& strAlbumArtist);
@@ -187,7 +185,6 @@ class CMusicInfoTag : public IArchivable, public ISerializable, public ISortable
char m_rating;
int m_listeners;
int m_iTimesPlayed;
- int m_iArtistId;
int m_iAlbumId;
SYSTEMTIME m_dwReleaseDate;

0 comments on commit 2e56957

Please sign in to comment.