Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

jsonrpc: rename (Video|Audio)Library.ScanForContent to (Video|Audio)L…

…ibrary.Scan
  • Loading branch information...
commit d8e43a2a5399e7fe5ba9a7801a25197a4aaec850 1 parent 570da53
@Montellese Montellese authored
View
2  xbmc/interfaces/json-rpc/AudioLibrary.cpp
@@ -240,7 +240,7 @@ JSON_STATUS CAudioLibrary::GetGenres(const CStdString &method, ITransportLayer *
return OK;
}
-JSON_STATUS CAudioLibrary::ScanForContent(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
+JSON_STATUS CAudioLibrary::Scan(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
{
g_application.getApplicationMessenger().ExecBuiltIn("updatelibrary(music)");
return ACK;
View
3  xbmc/interfaces/json-rpc/AudioLibrary.h
@@ -38,7 +38,8 @@ namespace JSONRPC
static JSON_STATUS GetRecentlyAddedAlbums(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
static JSON_STATUS GetRecentlyAddedSongs(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
static JSON_STATUS GetGenres(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
- static JSON_STATUS ScanForContent(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
+
+ static JSON_STATUS Scan(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
static JSON_STATUS Export(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
static bool FillFileItem(const CStdString &strFilename, CFileItem &item);
View
4 xbmc/interfaces/json-rpc/JSONServiceDescription.cpp
@@ -197,7 +197,7 @@ JsonRpcMethodMap CJSONServiceDescription::m_methodMaps[] = {
{ "AudioLibrary.GetRecentlyAddedAlbums", CAudioLibrary::GetRecentlyAddedAlbums },
{ "AudioLibrary.GetRecentlyAddedSongs", CAudioLibrary::GetRecentlyAddedSongs },
{ "AudioLibrary.GetGenres", CAudioLibrary::GetGenres },
- { "AudioLibrary.ScanForContent", CAudioLibrary::ScanForContent },
+ { "AudioLibrary.Scan", CAudioLibrary::Scan },
{ "AudioLibrary.Export", CAudioLibrary::Export },
// Video Library
@@ -216,7 +216,7 @@ JsonRpcMethodMap CJSONServiceDescription::m_methodMaps[] = {
{ "VideoLibrary.GetRecentlyAddedMovies", CVideoLibrary::GetRecentlyAddedMovies },
{ "VideoLibrary.GetRecentlyAddedEpisodes", CVideoLibrary::GetRecentlyAddedEpisodes },
{ "VideoLibrary.GetRecentlyAddedMusicVideos", CVideoLibrary::GetRecentlyAddedMusicVideos },
- { "VideoLibrary.ScanForContent", CVideoLibrary::ScanForContent },
+ { "VideoLibrary.Scan", CVideoLibrary::Scan },
{ "VideoLibrary.Export", CVideoLibrary::Export },
// System operations
View
4 xbmc/interfaces/json-rpc/ServiceDescription.h
@@ -1733,7 +1733,7 @@ namespace JSONRPC
"}"
"}"
"}",
- "\"AudioLibrary.ScanForContent\": {"
+ "\"AudioLibrary.Scan\": {"
"\"type\": \"method\","
"\"description\": \"Scans the audio sources for new library items\","
"\"transport\": \"Response\","
@@ -2034,7 +2034,7 @@ namespace JSONRPC
"}"
"}"
"}",
- "\"VideoLibrary.ScanForContent\": {"
+ "\"VideoLibrary.Scan\": {"
"\"type\": \"method\","
"\"description\": \"Scans the video sources for new library items\","
"\"transport\": \"Response\","
View
2  xbmc/interfaces/json-rpc/VideoLibrary.cpp
@@ -385,7 +385,7 @@ JSON_STATUS CVideoLibrary::GetGenres(const CStdString &method, ITransportLayer *
return OK;
}
-JSON_STATUS CVideoLibrary::ScanForContent(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
+JSON_STATUS CVideoLibrary::Scan(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
{
g_application.getApplicationMessenger().ExecBuiltIn("updatelibrary(video)");
return ACK;
View
2  xbmc/interfaces/json-rpc/VideoLibrary.h
@@ -49,7 +49,7 @@ namespace JSONRPC
static JSON_STATUS GetGenres(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
- static JSON_STATUS ScanForContent(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
+ static JSON_STATUS Scan(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
static JSON_STATUS Export(const CStdString &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
static bool FillFileItem(const CStdString &strFilename, CFileItem &item);
View
4 xbmc/interfaces/json-rpc/methods.json
@@ -976,7 +976,7 @@
}
}
},
- "AudioLibrary.ScanForContent": {
+ "AudioLibrary.Scan": {
"type": "method",
"description": "Scans the audio sources for new library items",
"transport": "Response",
@@ -1277,7 +1277,7 @@
}
}
},
- "VideoLibrary.ScanForContent": {
+ "VideoLibrary.Scan": {
"type": "method",
"description": "Scans the video sources for new library items",
"transport": "Response",
Please sign in to comment.
Something went wrong with that request. Please try again.