fix invalid album rating (maximum is 5)

xbmc · Jun 27, 2012 · 3dce2ac · 3dce2ac
1 parent 4d74486
commit 3dce2ac
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/xbmc/music/Album.cpp b/xbmc/music/Album.cpp
@@ -61,6 +61,8 @@ bool CAlbum::Load(const TiXmlElement *album, bool append, bool prioritise)
     XMLUtils::GetFloat(album, "rating", rating);
     if (rElement->QueryFloatAttribute("max", &max_rating) == TIXML_SUCCESS && max_rating>=1)
       rating *= (5.f / max_rating); // Normalise the Rating to between 0 and 5 
+    if (rating > 5.f)
+      rating = 5.f;
     iRating = MathUtils::round_int(rating);
   }
 

diff --git a/xbmc/music/dialogs/GUIDialogMusicInfo.cpp b/xbmc/music/dialogs/GUIDialogMusicInfo.cpp
@@ -158,7 +158,7 @@ void CGUIDialogMusicInfo::SetAlbum(const CAlbum& album, const CStdString &path)
   m_albumItem->GetMusicInfoTag()->SetArtist(m_album.artist);
   m_albumItem->GetMusicInfoTag()->SetYear(m_album.iYear);
   m_albumItem->GetMusicInfoTag()->SetLoaded(true);
-  m_albumItem->GetMusicInfoTag()->SetRating('0' + (m_album.iRating + 1) / 2);
+  m_albumItem->GetMusicInfoTag()->SetRating('0' + m_album.iRating);
   m_albumItem->GetMusicInfoTag()->SetGenre(m_album.genre);
   m_albumItem->GetMusicInfoTag()->SetDatabaseId(m_album.idAlbum);
   CMusicDatabase::SetPropertiesFromAlbum(*m_albumItem,m_album);

diff --git a/xbmc/music/tags/MusicInfoTag.cpp b/xbmc/music/tags/MusicInfoTag.cpp
@@ -383,7 +383,7 @@ void CMusicInfoTag::SetAlbum(const CAlbum& album)
   SetAlbum(album.strAlbum);
   SetAlbumArtist(StringUtils::Join(album.artist, g_advancedSettings.m_musicItemSeparator));
   SetGenre(album.genre);
-  SetRating('0' + (album.iRating + 1) / 2);
+  SetRating('0' + album.iRating);
   SYSTEMTIME stTime;
   stTime.wYear = album.iYear;
   SetReleaseDate(stTime);