Permalink
Browse files

fix some warnings concerning type mismatches

  • Loading branch information...
Montellese authored and popcornmix committed Jun 28, 2015
1 parent 156616a commit 13494efbe9f7eee5147a7611bcd6669883e91b20
Showing with 5 additions and 5 deletions.
  1. +1 −1 xbmc/interfaces/json-rpc/AudioLibrary.cpp
  2. +4 −4 xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
@@ -515,7 +515,7 @@ JSONRPC_STATUS CAudioLibrary::SetSongDetails(const std::string &method, ITranspo
if (ParameterNotNull(parameterObject, "musicbrainztrackid"))
song.strMusicBrainzTrackID = parameterObject["musicbrainztrackid"].asString();
if (ParameterNotNull(parameterObject, "playcount"))
song.iTimesPlayed = parameterObject["playcount"].asInteger();
song.iTimesPlayed = static_cast<int>(parameterObject["playcount"].asInteger());
if (ParameterNotNull(parameterObject, "lastplayed"))
song.lastPlayed.SetFromDBDateTime(parameterObject["lastplayed"].asString());
@@ -317,7 +317,7 @@ void CGUIDialogVideoBookmarks::OnRefreshList()
// add items to file list and mark the proper item as selected if the current playtime is above
int selectedItemIndex = 0;
int playTime = g_application.GetTime();
double playTime = g_application.GetTime();
for (auto& item : items)
{
m_vecItems->Add(item);
@@ -379,14 +379,14 @@ void CGUIDialogVideoBookmarks::GotoBookmark(int item)
return;
CFileItemPtr fileItem = m_vecItems->Get(item);
int chapter = fileItem->GetProperty("chapter").asInteger();
if (!chapter)
int chapter = static_cast<int>(fileItem->GetProperty("chapter").asInteger());
if (chapter <= 0)
{
g_application.m_pPlayer->SetPlayerState(fileItem->GetProperty("playerstate").asString());
g_application.SeekTime(fileItem->GetProperty("resumepoint").asDouble());
}
else
g_application.m_pPlayer->SeekChapter(fileItem->GetProperty("chapter").asInteger());
g_application.m_pPlayer->SeekChapter(chapter);
Close();
}

0 comments on commit 13494ef

Please sign in to comment.