Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[musicdb] cosmetic: rename song.iAlbumId to song.idAlbum

  • Loading branch information...
commit 0175bfd4bda5255fb4b19616bf554ff119aadc87 1 parent 80edd8f
@night199uk night199uk authored
View
2  xbmc/music/MusicDatabase.cpp
@@ -896,7 +896,7 @@ CSong CMusicDatabase::GetSongFromDataset(bool bWithMusicDbPath/*=false*/)
song.genre = StringUtils::Split(m_pDS->fv(song_strGenres).get_asString(), g_advancedSettings.m_musicItemSeparator);
// and the rest...
song.strAlbum = m_pDS->fv(song_strAlbum).get_asString();
- song.iAlbumId = m_pDS->fv(song_idAlbum).get_asInt();
+ song.idAlbum = m_pDS->fv(song_idAlbum).get_asInt();
song.iTrack = m_pDS->fv(song_iTrack).get_asInt() ;
song.iDuration = m_pDS->fv(song_iDuration).get_asInt() ;
song.iYear = m_pDS->fv(song_iYear).get_asInt() ;
View
6 xbmc/music/Song.cpp
@@ -54,7 +54,7 @@ CSong::CSong(CMusicInfoTag& tag)
iTimesPlayed = 0;
iKaraokeNumber = 0;
iKaraokeDelay = 0; //! Karaoke song lyrics-music delay in 1/10 seconds.
- iAlbumId = -1;
+ idAlbum = -1;
}
CSong::CSong()
@@ -83,7 +83,7 @@ void CSong::Serialize(CVariant& value) const
value["timesplayed"] = iTimesPlayed;
value["lastplayed"] = lastPlayed.IsValid() ? lastPlayed.GetAsDBDateTime() : "";
value["karaokenumber"] = (int64_t) iKaraokeNumber;
- value["albumid"] = iAlbumId;
+ value["albumid"] = idAlbum;
}
void CSong::Clear()
@@ -113,7 +113,7 @@ void CSong::Clear()
iKaraokeNumber = 0;
strKaraokeLyrEncoding.Empty();
iKaraokeDelay = 0;
- iAlbumId = -1;
+ idAlbum = -1;
bCompilation = false;
embeddedArt.clear();
}
View
2  xbmc/music/Song.h
@@ -78,6 +78,7 @@ class CSong: public ISerializable
bool ArtMatches(const CSong &right) const;
long idSong;
+ int idAlbum;
CStdString strFileName;
CStdString strTitle;
std::vector<std::string> artist;
@@ -100,7 +101,6 @@ class CSong: public ISerializable
CDateTime lastPlayed;
int iStartOffset;
int iEndOffset;
- int iAlbumId;
bool bCompilation;
// Karaoke-specific information
View
2  xbmc/music/tags/MusicInfoTag.cpp
@@ -560,7 +560,7 @@ void CMusicInfoTag::SetSong(const CSong& song)
m_type = "song";
m_bLoaded = true;
m_iTimesPlayed = song.iTimesPlayed;
- m_iAlbumId = song.iAlbumId;
+ m_iAlbumId = song.idAlbum;
}
void CMusicInfoTag::Serialize(CVariant& value) const
Please sign in to comment.
Something went wrong with that request. Please try again.