aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Arrskog <topfs2@xbmc.org>2011-05-20 18:13:04 +0200
committerTobias Arrskog <topfs2@xbmc.org>2011-05-20 18:18:10 +0200
commitfee62a4d040f6eb3e44e703f2f80846a6aaa57ea (patch)
tree92c62c42b05a508bac5a1ad144de97713584f8ce
parentdc28e9fd7ef14c7e382d161d2fbd90f86db8c153 (diff)
Fix. Added explicit typecast to platform int to quench warnings for variant use in jsonrpc
-rw-r--r--xbmc/interfaces/json-rpc/AVPlayerOperations.cpp2
-rw-r--r--xbmc/interfaces/json-rpc/AVPlaylistOperations.cpp8
-rw-r--r--xbmc/interfaces/json-rpc/AudioLibrary.cpp28
-rw-r--r--xbmc/interfaces/json-rpc/FileItemHandler.cpp4
-rw-r--r--xbmc/interfaces/json-rpc/FileOperations.cpp4
-rw-r--r--xbmc/interfaces/json-rpc/PicturePlayerOperations.cpp2
-rw-r--r--xbmc/interfaces/json-rpc/PlaylistOperations.cpp4
-rw-r--r--xbmc/interfaces/json-rpc/VideoLibrary.cpp26
8 files changed, 39 insertions, 39 deletions
diff --git a/xbmc/interfaces/json-rpc/AVPlayerOperations.cpp b/xbmc/interfaces/json-rpc/AVPlayerOperations.cpp
index 8c751acaaa..ad1868a289 100644
--- a/xbmc/interfaces/json-rpc/AVPlayerOperations.cpp
+++ b/xbmc/interfaces/json-rpc/AVPlayerOperations.cpp
@@ -159,7 +159,7 @@ JSON_STATUS CAVPlayerOperations::SeekTime(const CStdString &method, ITransportLa
if (!IsCorrectPlayer(method))
return FailedToExecute;
- g_application.SeekTime(parameterObject["value"].asInteger());
+ g_application.SeekTime((int)parameterObject["value"].asInteger());
return ACK;
}
diff --git a/xbmc/interfaces/json-rpc/AVPlaylistOperations.cpp b/xbmc/interfaces/json-rpc/AVPlaylistOperations.cpp
index 5ca6a30d3a..df770d9998 100644
--- a/xbmc/interfaces/json-rpc/AVPlaylistOperations.cpp
+++ b/xbmc/interfaces/json-rpc/AVPlaylistOperations.cpp
@@ -38,8 +38,8 @@ JSON_STATUS CAVPlaylistOperations::Play(const CStdString &method, ITransportLaye
if (g_playlistPlayer.GetCurrentPlaylist() != playlist)
g_playlistPlayer.SetCurrentPlaylist(playlist);
- int item = parameterObject["item"].asInteger();
- int songId = parameterObject["songid"].asInteger();
+ int item = (int)parameterObject["item"].asInteger();
+ int songId = (int)parameterObject["songid"].asInteger();
if (item >= 0)
g_application.getApplicationMessenger().PlayListPlayerPlay(item);
@@ -125,7 +125,7 @@ JSON_STATUS CAVPlaylistOperations::Insert(const CStdString &method, ITransportLa
if (!FillFileItemList(params["item"], list))
return InvalidParams;
- g_application.getApplicationMessenger().PlayListPlayerInsert(GetPlaylist(method), list, parameterObject["index"].asInteger());
+ g_application.getApplicationMessenger().PlayListPlayerInsert(GetPlaylist(method), list, (int)parameterObject["index"].asInteger());
NotifyAll();
return ACK;
@@ -133,7 +133,7 @@ JSON_STATUS CAVPlaylistOperations::Insert(const CStdString &method, ITransportLa
JSON_STATUS CAVPlaylistOperations::Remove(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
{
- g_application.getApplicationMessenger().PlayListPlayerRemove(GetPlaylist(method), parameterObject["item"].asInteger());
+ g_application.getApplicationMessenger().PlayListPlayerRemove(GetPlaylist(method), (int)parameterObject["item"].asInteger());
NotifyAll();
return ACK;
diff --git a/xbmc/interfaces/json-rpc/AudioLibrary.cpp b/xbmc/interfaces/json-rpc/AudioLibrary.cpp
index 15309fa542..a5679f0bde 100644
--- a/xbmc/interfaces/json-rpc/AudioLibrary.cpp
+++ b/xbmc/interfaces/json-rpc/AudioLibrary.cpp
@@ -39,7 +39,7 @@ JSON_STATUS CAudioLibrary::GetArtists(const CStdString &method, ITransportLayer
if (!musicdatabase.Open())
return InternalError;
- int genreID = parameterObject["genreid"].asInteger();
+ int genreID = (int)parameterObject["genreid"].asInteger();
// Add "artist" to "fields" array by default
CVariant param = parameterObject;
@@ -61,10 +61,10 @@ JSON_STATUS CAudioLibrary::GetAlbums(const CStdString &method, ITransportLayer *
if (!musicdatabase.Open())
return InternalError;
- int artistID = parameterObject["artistid"].asInteger();
- int genreID = parameterObject["genreid"].asInteger();
- int start = parameterObject["limits"]["start"].asInteger();
- int end = parameterObject["limits"]["end"].asInteger();
+ int artistID = (int)parameterObject["artistid"].asInteger();
+ int genreID = (int)parameterObject["genreid"].asInteger();
+ int start = (int)parameterObject["limits"]["start"].asInteger();
+ int end = (int)parameterObject["limits"]["end"].asInteger();
if (end == 0)
end = -1;
@@ -78,7 +78,7 @@ JSON_STATUS CAudioLibrary::GetAlbums(const CStdString &method, ITransportLayer *
JSON_STATUS CAudioLibrary::GetAlbumDetails(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
{
- int albumID = parameterObject["albumid"].asInteger();
+ int albumID = (int)parameterObject["albumid"].asInteger();
CMusicDatabase musicdatabase;
if (!musicdatabase.Open())
@@ -113,9 +113,9 @@ JSON_STATUS CAudioLibrary::GetSongs(const CStdString &method, ITransportLayer *t
if (!musicdatabase.Open())
return InternalError;
- int artistID = parameterObject["artistid"].asInteger();
- int albumID = parameterObject["albumid"].asInteger();
- int genreID = parameterObject["genreid"].asInteger();
+ int artistID = (int)parameterObject["artistid"].asInteger();
+ int albumID = (int)parameterObject["albumid"].asInteger();
+ int genreID = (int)parameterObject["genreid"].asInteger();
CFileItemList items;
if (musicdatabase.GetSongsNav("", items, genreID, artistID, albumID))
@@ -127,7 +127,7 @@ JSON_STATUS CAudioLibrary::GetSongs(const CStdString &method, ITransportLayer *t
JSON_STATUS CAudioLibrary::GetSongDetails(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
{
- int idSong = parameterObject["songid"].asInteger();
+ int idSong = (int)parameterObject["songid"].asInteger();
CMusicDatabase musicdatabase;
if (!musicdatabase.Open())
@@ -201,9 +201,9 @@ bool CAudioLibrary::FillFileItemList(const CVariant &parameterObject, CFileItemL
if (musicdatabase.Open())
{
CStdString file = parameterObject["file"].asString();
- int artistID = parameterObject["artistid"].asInteger();
- int albumID = parameterObject["albumid"].asInteger();
- int genreID = parameterObject["genreid"].asInteger();
+ int artistID = (int)parameterObject["artistid"].asInteger();
+ int albumID = (int)parameterObject["albumid"].asInteger();
+ int genreID = (int)parameterObject["genreid"].asInteger();
CFileItem fileItem;
if (FillFileItem(file, fileItem))
@@ -215,7 +215,7 @@ bool CAudioLibrary::FillFileItemList(const CVariant &parameterObject, CFileItemL
if (artistID != -1 || albumID != -1 || genreID != -1)
success |= musicdatabase.GetSongsNav("", list, genreID, artistID, albumID);
- int songID = parameterObject["songid"].asInteger(-1);
+ int songID = (int)parameterObject["songid"].asInteger(-1);
if (songID != -1)
{
CSong song;
diff --git a/xbmc/interfaces/json-rpc/FileItemHandler.cpp b/xbmc/interfaces/json-rpc/FileItemHandler.cpp
index 1afb74f121..cc684f31e7 100644
--- a/xbmc/interfaces/json-rpc/FileItemHandler.cpp
+++ b/xbmc/interfaces/json-rpc/FileItemHandler.cpp
@@ -101,8 +101,8 @@ void CFileItemHandler::MakeFieldsList(const CVariant &parameterObject, CVariant
void CFileItemHandler::HandleFileItemList(const char *ID, bool allowFile, const char *resultname, CFileItemList &items, const CVariant &parameterObject, CVariant &result)
{
int size = items.Size();
- int start = parameterObject["limits"]["start"].asInteger();
- int end = parameterObject["limits"]["end"].asInteger();
+ int start = (int)parameterObject["limits"]["start"].asInteger();
+ int end = (int)parameterObject["limits"]["end"].asInteger();
end = (end <= 0 || end > size) ? size : end;
start = start > end ? end : start;
diff --git a/xbmc/interfaces/json-rpc/FileOperations.cpp b/xbmc/interfaces/json-rpc/FileOperations.cpp
index 416dfc599f..dc19232e8e 100644
--- a/xbmc/interfaces/json-rpc/FileOperations.cpp
+++ b/xbmc/interfaces/json-rpc/FileOperations.cpp
@@ -141,14 +141,14 @@ JSON_STATUS CFileOperations::GetDirectory(const CStdString &method, ITransportLa
{
result["files"][index]["filetype"] = "directory";
}
- int count = result["limits"]["total"].asInteger();
+ int count = (int)result["limits"]["total"].asInteger();
HandleFileItemList("id", true, "files", filteredFiles, param, result);
for (unsigned int index = count; index < result["files"].size(); index++)
{
result["files"][index]["filetype"] = "file";
}
- count += result["limits"]["total"].asInteger();
+ count += (int)result["limits"]["total"].asInteger();
result["limits"]["end"] = count;
result["limits"]["total"] = count;
diff --git a/xbmc/interfaces/json-rpc/PicturePlayerOperations.cpp b/xbmc/interfaces/json-rpc/PicturePlayerOperations.cpp
index b5db0a7b67..0093a4c9dc 100644
--- a/xbmc/interfaces/json-rpc/PicturePlayerOperations.cpp
+++ b/xbmc/interfaces/json-rpc/PicturePlayerOperations.cpp
@@ -77,7 +77,7 @@ JSON_STATUS CPicturePlayerOperations::ZoomIn(const CStdString &method, ITranspor
JSON_STATUS CPicturePlayerOperations::Zoom(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
{
- return SendAction(ACTION_ZOOM_LEVEL_NORMAL + (parameterObject["value"].asInteger() - 1));
+ return SendAction(ACTION_ZOOM_LEVEL_NORMAL + ((int)parameterObject["value"].asInteger() - 1));
}
JSON_STATUS CPicturePlayerOperations::Rotate(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
diff --git a/xbmc/interfaces/json-rpc/PlaylistOperations.cpp b/xbmc/interfaces/json-rpc/PlaylistOperations.cpp
index 43b28dc66e..13b003b8a0 100644
--- a/xbmc/interfaces/json-rpc/PlaylistOperations.cpp
+++ b/xbmc/interfaces/json-rpc/PlaylistOperations.cpp
@@ -132,7 +132,7 @@ JSON_STATUS CPlaylistOperations::Remove(const CStdString &method, ITransportLaye
if (playlist)
{
if (parameterObject["item"].isInteger())
- playlist->Remove(parameterObject["item"].asInteger());
+ playlist->Remove((int)parameterObject["item"].asInteger());
else if (parameterObject["item"].isString())
playlist->Remove(parameterObject["item"].asString());
@@ -147,7 +147,7 @@ JSON_STATUS CPlaylistOperations::Swap(const CStdString &method, ITransportLayer
CSingleLock lock(VirtualCriticalSection);
CPlayListPtr playlist = GetPlaylist(parameterObject);
- if (playlist && playlist->Swap(parameterObject["item1"].asInteger(), parameterObject["item2"].asInteger()))
+ if (playlist && playlist->Swap((int)parameterObject["item1"].asInteger(), (int)parameterObject["item2"].asInteger()))
return ACK;
return InvalidParams;
diff --git a/xbmc/interfaces/json-rpc/VideoLibrary.cpp b/xbmc/interfaces/json-rpc/VideoLibrary.cpp
index bd4f079ff5..70eb13f627 100644
--- a/xbmc/interfaces/json-rpc/VideoLibrary.cpp
+++ b/xbmc/interfaces/json-rpc/VideoLibrary.cpp
@@ -44,7 +44,7 @@ JSON_STATUS CVideoLibrary::GetMovies(const CStdString &method, ITransportLayer *
JSON_STATUS CVideoLibrary::GetMovieDetails(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
{
- int id = parameterObject["movieid"].asInteger();
+ int id = (int)parameterObject["movieid"].asInteger();
CVideoDatabase videodatabase;
if (!videodatabase.Open())
@@ -82,7 +82,7 @@ JSON_STATUS CVideoLibrary::GetMovieSets(const CStdString &method, ITransportLaye
JSON_STATUS CVideoLibrary::GetMovieSetDetails(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
{
- int id = parameterObject["setid"].asInteger();
+ int id = (int)parameterObject["setid"].asInteger();
CVideoDatabase videodatabase;
if (!videodatabase.Open())
@@ -146,7 +146,7 @@ JSON_STATUS CVideoLibrary::GetTVShows(const CStdString &method, ITransportLayer
JSON_STATUS CVideoLibrary::GetTVShowDetails(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
{
- int id = parameterObject["tvshowid"].asInteger();
+ int id = (int)parameterObject["tvshowid"].asInteger();
CVideoDatabase videodatabase;
if (!videodatabase.Open())
@@ -170,7 +170,7 @@ JSON_STATUS CVideoLibrary::GetTVShowDetails(const CStdString &method, ITransport
JSON_STATUS CVideoLibrary::GetSeasons(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
{
- int tvshowID = parameterObject["tvshowid"].asInteger();
+ int tvshowID = (int)parameterObject["tvshowid"].asInteger();
CVideoDatabase videodatabase;
if (!videodatabase.Open())
@@ -186,8 +186,8 @@ JSON_STATUS CVideoLibrary::GetSeasons(const CStdString &method, ITransportLayer
JSON_STATUS CVideoLibrary::GetEpisodes(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
{
- int tvshowID = parameterObject["tvshowid"].asInteger();
- int season = parameterObject["season"].asInteger();
+ int tvshowID = (int)parameterObject["tvshowid"].asInteger();
+ int season = (int)parameterObject["season"].asInteger();
CVideoDatabase videodatabase;
if (!videodatabase.Open())
@@ -220,7 +220,7 @@ JSON_STATUS CVideoLibrary::GetEpisodes(const CStdString &method, ITransportLayer
JSON_STATUS CVideoLibrary::GetEpisodeDetails(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
{
- int id = parameterObject["episodeid"].asInteger();
+ int id = (int)parameterObject["episodeid"].asInteger();
CVideoDatabase videodatabase;
if (!videodatabase.Open())
@@ -244,8 +244,8 @@ JSON_STATUS CVideoLibrary::GetEpisodeDetails(const CStdString &method, ITranspor
JSON_STATUS CVideoLibrary::GetMusicVideos(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
{
- int artistID = parameterObject["artistid"].asInteger();
- int albumID = parameterObject["albumid"].asInteger();
+ int artistID = (int)parameterObject["artistid"].asInteger();
+ int albumID = (int)parameterObject["albumid"].asInteger();
CVideoDatabase videodatabase;
if (!videodatabase.Open())
@@ -261,7 +261,7 @@ JSON_STATUS CVideoLibrary::GetMusicVideos(const CStdString &method, ITransportLa
JSON_STATUS CVideoLibrary::GetMusicVideoDetails(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
{
- int id = parameterObject["musicvideoid"].asInteger();
+ int id = (int)parameterObject["musicvideoid"].asInteger();
CVideoDatabase videodatabase;
if (!videodatabase.Open())
@@ -390,9 +390,9 @@ bool CVideoLibrary::FillFileItemList(const CVariant &parameterObject, CFileItemL
if (videodatabase.Open())
{
CStdString file = parameterObject["file"].asString();
- int movieID = parameterObject["movieid"].asInteger();
- int episodeID = parameterObject["episodeid"].asInteger();
- int musicVideoID = parameterObject["musicvideoid"].asInteger();
+ int movieID = (int)parameterObject["movieid"].asInteger();
+ int episodeID = (int)parameterObject["episodeid"].asInteger();
+ int musicVideoID = (int)parameterObject["musicvideoid"].asInteger();
bool success = false;
CFileItem fileItem;