Skip to content
This repository
Browse code

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

  • Loading branch information...
commit 0175bfd4bda5255fb4b19616bf554ff119aadc87 1 parent 80edd8f
night199uk authored April 15, 2013
2  xbmc/music/MusicDatabase.cpp
@@ -896,7 +896,7 @@ CSong CMusicDatabase::GetSongFromDataset(bool bWithMusicDbPath/*=false*/)
896 896
   song.genre = StringUtils::Split(m_pDS->fv(song_strGenres).get_asString(), g_advancedSettings.m_musicItemSeparator);
897 897
   // and the rest...
898 898
   song.strAlbum = m_pDS->fv(song_strAlbum).get_asString();
899  
-  song.iAlbumId = m_pDS->fv(song_idAlbum).get_asInt();
  899
+  song.idAlbum = m_pDS->fv(song_idAlbum).get_asInt();
900 900
   song.iTrack = m_pDS->fv(song_iTrack).get_asInt() ;
901 901
   song.iDuration = m_pDS->fv(song_iDuration).get_asInt() ;
902 902
   song.iYear = m_pDS->fv(song_iYear).get_asInt() ;
6  xbmc/music/Song.cpp
@@ -54,7 +54,7 @@ CSong::CSong(CMusicInfoTag& tag)
54 54
   iTimesPlayed = 0;
55 55
   iKaraokeNumber = 0;
56 56
   iKaraokeDelay = 0;         //! Karaoke song lyrics-music delay in 1/10 seconds.
57  
-  iAlbumId = -1;
  57
+  idAlbum = -1;
58 58
 }
59 59
 
60 60
 CSong::CSong()
@@ -83,7 +83,7 @@ void CSong::Serialize(CVariant& value) const
83 83
   value["timesplayed"] = iTimesPlayed;
84 84
   value["lastplayed"] = lastPlayed.IsValid() ? lastPlayed.GetAsDBDateTime() : "";
85 85
   value["karaokenumber"] = (int64_t) iKaraokeNumber;
86  
-  value["albumid"] = iAlbumId;
  86
+  value["albumid"] = idAlbum;
87 87
 }
88 88
 
89 89
 void CSong::Clear()
@@ -113,7 +113,7 @@ void CSong::Clear()
113 113
   iKaraokeNumber = 0;
114 114
   strKaraokeLyrEncoding.Empty();
115 115
   iKaraokeDelay = 0;
116  
-  iAlbumId = -1;
  116
+  idAlbum = -1;
117 117
   bCompilation = false;
118 118
   embeddedArt.clear();
119 119
 }
2  xbmc/music/Song.h
@@ -78,6 +78,7 @@ class CSong: public ISerializable
78 78
   bool ArtMatches(const CSong &right) const;
79 79
 
80 80
   long idSong;
  81
+  int idAlbum;
81 82
   CStdString strFileName;
82 83
   CStdString strTitle;
83 84
   std::vector<std::string> artist;
@@ -100,7 +101,6 @@ class CSong: public ISerializable
100 101
   CDateTime lastPlayed;
101 102
   int iStartOffset;
102 103
   int iEndOffset;
103  
-  int iAlbumId;
104 104
   bool bCompilation;
105 105
 
106 106
   // Karaoke-specific information
2  xbmc/music/tags/MusicInfoTag.cpp
@@ -560,7 +560,7 @@ void CMusicInfoTag::SetSong(const CSong& song)
560 560
   m_type = "song";
561 561
   m_bLoaded = true;
562 562
   m_iTimesPlayed = song.iTimesPlayed;
563  
-  m_iAlbumId = song.iAlbumId;
  563
+  m_iAlbumId = song.idAlbum;
564 564
 }
565 565
 
566 566
 void CMusicInfoTag::Serialize(CVariant& value) const

0 notes on commit 0175bfd

Please sign in to comment.
Something went wrong with that request. Please try again.