Renamed MusicLibrary to AudioLibrary

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@29856 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

7 files changed, 18 insertions, 18 deletions

diff --git a/web/poc_jsonrpc/albums.html b/web/poc_jsonrpc/albums.html
index edfc36cadd..6bc856156c 100644
--- a/web/poc_jsonrpc/albums.html
+++ b/web/poc_jsonrpc/albums.html
@@ -35,7 +35,7 @@ function CallPlay(album) {
 <script type="text/javascript">
 var http_request = new XMLHttpRequest();
 http_request.open( "POST", "jsonrpc", false );
-http_request.send('{"jsonrpc": "2.0", "method": "MusicLibrary.GetAlbums", "id": 1}');
+http_request.send('{"jsonrpc": "2.0", "method": "AudioLibrary.GetAlbums", "id": 1}');
 
 var the_object = JSON.parse(http_request.responseText);
 var result = the_object["result"];
diff --git a/web/poc_jsonrpc/artists.html b/web/poc_jsonrpc/artists.html
index d7b545d531..5ae0e189e7 100644
--- a/web/poc_jsonrpc/artists.html
+++ b/web/poc_jsonrpc/artists.html
@@ -15,7 +15,7 @@ function writeArtist(artist) {
 
   var http_request = new XMLHttpRequest();
   http_request.open( "POST", "jsonrpc", false );
-  http_request.send('{"jsonrpc": "2.0", "method": "MusicLibrary.GetAlbums", "params": { "artistid": ' + artist["artistid"] + ' }, "id": 1}');
+  http_request.send('{"jsonrpc": "2.0", "method": "AudioLibrary.GetAlbums", "params": { "artistid": ' + artist["artistid"] + ' }, "id": 1}');
 
   var the_object = JSON.parse(http_request.responseText);
   var result = the_object["result"];
@@ -55,7 +55,7 @@ function writeArtist(artist) {
 <script type="text/javascript">
 var http_request = new XMLHttpRequest();
 http_request.open( "POST", "jsonrpc", false );
-http_request.send('{"jsonrpc": "2.0", "method": "MusicLibrary.GetArtists", "id": 1}');
+http_request.send('{"jsonrpc": "2.0", "method": "AudioLibrary.GetArtists", "id": 1}');
 
 var the_object = JSON.parse(http_request.responseText);
 var result = the_object["result"];
diff --git a/xbmc/lib/libjsonrpc/MusicLibrary.cpp b/xbmc/lib/libjsonrpc/AudioLibrary.cpp
index 170bf54bf0..09d30eb229 100644
--- a/xbmc/lib/libjsonrpc/MusicLibrary.cpp
+++ b/xbmc/lib/libjsonrpc/AudioLibrary.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "MusicLibrary.h"
+#include "AudioLibrary.h"
 #include "../MusicDatabase.h"
 #include "../FileItem.h"
 #include "../Util.h"
@@ -31,7 +31,7 @@ using namespace MUSIC_INFO;
 using namespace Json;
 using namespace JSONRPC;
 
-JSON_STATUS CMusicLibrary::GetArtists(const CStdString &method, ITransportLayer *transport, IClient *client, const Value &parameterObject, Value &result)
+JSON_STATUS CAudioLibrary::GetArtists(const CStdString &method, ITransportLayer *transport, IClient *client, const Value &parameterObject, Value &result)
 {
   if (!(parameterObject.isObject() || parameterObject.isNull()))
     return InvalidParams;
@@ -54,7 +54,7 @@ JSON_STATUS CMusicLibrary::GetArtists(const CStdString &method, ITransportLayer
   return OK;
 }
 
-JSON_STATUS CMusicLibrary::GetAlbums(const CStdString &method, ITransportLayer *transport, IClient *client, const Value &parameterObject, Value &result)
+JSON_STATUS CAudioLibrary::GetAlbums(const CStdString &method, ITransportLayer *transport, IClient *client, const Value &parameterObject, Value &result)
 {
   if (!(parameterObject.isObject() || parameterObject.isNull()))
     return InvalidParams;
@@ -78,7 +78,7 @@ JSON_STATUS CMusicLibrary::GetAlbums(const CStdString &method, ITransportLayer *
   return OK;
 }
 
-JSON_STATUS CMusicLibrary::GetSongs(const CStdString &method, ITransportLayer *transport, IClient *client, const Value &parameterObject, Value &result)
+JSON_STATUS CAudioLibrary::GetSongs(const CStdString &method, ITransportLayer *transport, IClient *client, const Value &parameterObject, Value &result)
 {
   if (!(parameterObject.isObject() || parameterObject.isNull()))
     return InvalidParams;
@@ -103,13 +103,13 @@ JSON_STATUS CMusicLibrary::GetSongs(const CStdString &method, ITransportLayer *t
   return OK;
 }
 
-JSON_STATUS CMusicLibrary::ScanForContent(const CStdString &method, ITransportLayer *transport, IClient *client, const Value &parameterObject, Value &result)
+JSON_STATUS CAudioLibrary::ScanForContent(const CStdString &method, ITransportLayer *transport, IClient *client, const Value &parameterObject, Value &result)
 {
   g_application.getApplicationMessenger().ExecBuiltIn("updatelibrary(music)");
   return ACK;
 }
 
-bool CMusicLibrary::FillFileItemList(const Value &parameterObject, CFileItemList &list)
+bool CAudioLibrary::FillFileItemList(const Value &parameterObject, CFileItemList &list)
 {
   CMusicDatabase musicdatabase;
   if ((parameterObject["artistid"].isInt() || parameterObject["albumid"].isInt() || parameterObject["genreid"].isInt()) && musicdatabase.Open())
diff --git a/xbmc/lib/libjsonrpc/MusicLibrary.h b/xbmc/lib/libjsonrpc/AudioLibrary.h
index c35b42453a..cd746a9e6d 100644
--- a/xbmc/lib/libjsonrpc/MusicLibrary.h
+++ b/xbmc/lib/libjsonrpc/AudioLibrary.h
@@ -26,7 +26,7 @@
 
 namespace JSONRPC
 {
-  class CMusicLibrary : public CFileItemHandler
+  class CAudioLibrary : public CFileItemHandler
   {
   public:
     static JSON_STATUS GetArtists(const CStdString &method, ITransportLayer *transport, IClient *client, const Json::Value &parameterObject, Json::Value &result);
diff --git a/xbmc/lib/libjsonrpc/FileItemHandler.cpp b/xbmc/lib/libjsonrpc/FileItemHandler.cpp
index 59e79cf4c1..1973c422ce 100644
--- a/xbmc/lib/libjsonrpc/FileItemHandler.cpp
+++ b/xbmc/lib/libjsonrpc/FileItemHandler.cpp
@@ -21,7 +21,7 @@
 
 #include "FileItemHandler.h"
 #include "PlaylistOperations.h"
-#include "MusicLibrary.h"
+#include "AudioLibrary.h"
 #include "VideoLibrary.h"
 #include "../Util.h"
 
@@ -193,7 +193,7 @@ bool CFileItemHandler::FillFileItemList(const Value &parameterObject, CFileItemL
   }
 
   CPlaylistOperations::FillFileItemList(param, list);
-  CMusicLibrary::FillFileItemList(param, list);
+  CAudioLibrary::FillFileItemList(param, list);
   CVideoLibrary::FillFileItemList(param, list);
 
   return true;
diff --git a/xbmc/lib/libjsonrpc/JSONRPC.cpp b/xbmc/lib/libjsonrpc/JSONRPC.cpp
index 7abeb5357a..3ce6cceafe 100644
--- a/xbmc/lib/libjsonrpc/JSONRPC.cpp
+++ b/xbmc/lib/libjsonrpc/JSONRPC.cpp
@@ -26,7 +26,7 @@
 #include "AVPlaylistOperations.h"
 #include "PlaylistOperations.h"
 #include "FileOperations.h"
-#include "MusicLibrary.h"
+#include "AudioLibrary.h"
 #include "VideoLibrary.h"
 #include "SystemOperations.h"
 #include "XBMCOperations.h"
@@ -147,11 +147,11 @@ Command CJSONRPC::m_commands[] = {
   { "Files.GetDirectory",                           CFileOperations::GetDirectory,                       Response,     ReadData,        "Retrieve the specified directory" },
 
 // Music library
-  { "MusicLibrary.GetArtists",                      CMusicLibrary::GetArtists,                           Response,     ReadData,        "Retrieve all artists" },
-  { "MusicLibrary.GetAlbums",                       CMusicLibrary::GetAlbums,                            Response,     ReadData,        "Retrieve all albums from specified artist or genre" },
-  { "MusicLibrary.GetSongs",                        CMusicLibrary::GetSongs,                             Response,     ReadData,        "Retrieve all songs from specified album, artist or genre" },
+  { "AudioLibrary.GetArtists",                      CAudioLibrary::GetArtists,                           Response,     ReadData,        "Retrieve all artists" },
+  { "AudioLibrary.GetAlbums",                       CAudioLibrary::GetAlbums,                            Response,     ReadData,        "Retrieve all albums from specified artist or genre" },
+  { "AudioLibrary.GetSongs",                        CAudioLibrary::GetSongs,                             Response,     ReadData,        "Retrieve all songs from specified album, artist or genre" },
 
-  { "MusicLibrary.ScanForContent",                  CMusicLibrary::ScanForContent,                       Response,     ScanLibrary,     "" },
+  { "AudioLibrary.ScanForContent",                  CAudioLibrary::ScanForContent,                       Response,     ScanLibrary,     "" },
 
 // Video library
   { "VideoLibrary.GetMovies",                       CVideoLibrary::GetMovies,                            Response,     ReadData,        "Retrieve all movies. Parameter example { \"fields\": [\"plot\"], \"sortmethod\": \"title\", \"sortorder\": \"ascending\", \"start\": 0, \"end\": 3}. fields, sortorder, sortmethod, start and end are optional" },
diff --git a/xbmc/lib/libjsonrpc/Makefile.in b/xbmc/lib/libjsonrpc/Makefile.in
index dbaf2b2ef9..c2842bb7a1 100644
--- a/xbmc/lib/libjsonrpc/Makefile.in
+++ b/xbmc/lib/libjsonrpc/Makefile.in
@@ -1,6 +1,6 @@
 INCLUDES=-I. -I../ -I../../ -I../../../ -I../../utils -I../../FileSystem -I../../linux -I../../cores -I../../../guilib -I../../../lib/jsoncpp/jsoncpp/include
 
-SRCS=JSONRPC.cpp PlayerOperations.cpp AVPlayerOperations.cpp PicturePlayerOperations.cpp AVPlaylistOperations.cpp PlaylistOperations.cpp FileOperations.cpp MusicLibrary.cpp VideoLibrary.cpp FileItemHandler.cpp SystemOperations.cpp XBMCOperations.cpp TCPServer.cpp
+SRCS=JSONRPC.cpp PlayerOperations.cpp AVPlayerOperations.cpp PicturePlayerOperations.cpp AVPlaylistOperations.cpp PlaylistOperations.cpp FileOperations.cpp AudioLibrary.cpp VideoLibrary.cpp FileItemHandler.cpp SystemOperations.cpp XBMCOperations.cpp TCPServer.cpp
 
 LIB= libjsonrpc.a