jsonrpc: rename "album_label" to "albumlabel" and "streamDetails" to …

…"streamdetails"
JoWa · Sep 19, 2011 · 5ecc7aa · 5ecc7aa
1 parent 4cdac98
commit 5ecc7aa
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 26 deletions.
diff --git a/xbmc/interfaces/json-rpc/FileItemHandler.cpp b/xbmc/interfaces/json-rpc/FileItemHandler.cpp
@@ -57,7 +57,7 @@ void CFileItemHandler::FillDetails(ISerializable* info, CFileItemPtr item, const
         if (field == "rating")
           result[field] = item->GetPropertyInt("album_rating");
         else if (field == "label")
-          result["album_label"] = item->GetProperty("album_label");
+          result["albumlabel"] = item->GetProperty("album_label");
         else
           result[field] = item->GetProperty("album_" + field);
 

diff --git a/xbmc/interfaces/json-rpc/ServiceDescription.h b/xbmc/interfaces/json-rpc/ServiceDescription.h
@@ -186,7 +186,7 @@ namespace JSONRPC
         "\"mood\": { \"type\": \"string\" },"
         "\"style\": { \"type\": \"string\" },"
         "\"type\": { \"type\": \"string\" },"
-        "\"album_label\": { \"type\": \"string\" },"
+        "\"albumlabel\": { \"type\": \"string\" },"
         "\"rating\": { \"type\": \"integer\" },"
         "\"year\": { \"type\": \"integer\" },"
         "\"musicbrainzalbumid\": { \"type\": \"string\" },"
@@ -231,7 +231,7 @@ namespace JSONRPC
                   "\"tagline\", \"plot\", \"plotoutline\", \"originaltitle\", \"lastplayed\","
                   "\"playcount\", \"writer\", \"studio\", \"mpaa\", \"cast\", \"country\","
                   "\"imdbnumber\", \"premiered\", \"productioncode\", \"runtime\", \"set\","
-                  "\"showlink\", \"streamDetails\", \"top250\", \"votes\", \"fanart\","
+                  "\"showlink\", \"streamdetails\", \"top250\", \"votes\", \"fanart\","
                   "\"thumbnail\", \"file\", \"sorttitle\", \"resume\", \"setid\" ]"
       "}"
     "}",
@@ -269,7 +269,7 @@ namespace JSONRPC
         "\"enum\": [ \"title\", \"plot\", \"votes\", \"rating\", \"writer\","
                   "\"firstaired\", \"playcount\", \"runtime\", \"director\","
                   "\"productioncode\", \"season\", \"episode\", \"originaltitle\","
-                  "\"showtitle\", \"cast\", \"streamDetails\", \"lastplayed\", \"fanart\","
+                  "\"showtitle\", \"cast\", \"streamdetails\", \"lastplayed\", \"fanart\","
                   "\"thumbnail\", \"file\", \"resume\", \"tvshowid\" ]"
       "}"
     "}",
@@ -280,7 +280,7 @@ namespace JSONRPC
         "\"description\": \"Requesting the resume field will result in increased response times\","
         "\"enum\": [ \"title\", \"playcount\", \"runtime\", \"director\","
                   "\"studio\", \"year\", \"plot\", \"album\", \"artist\","
-                  "\"genre\", \"track\", \"streamDetails\", \"lastplayed\","
+                  "\"genre\", \"track\", \"streamdetails\", \"lastplayed\","
                   "\"fanart\", \"thumbnail\", \"file\", \"resume\" ]"
       "}"
     "}",
@@ -365,7 +365,7 @@ namespace JSONRPC
         "\"runtime\": { \"type\": \"string\" },"
         "\"set\": { \"$ref\": \"Array.String\" },"
         "\"showlink\": { \"type\": \"string\" },"
-        "\"streamDetails\": { \"$ref\": \"Video.Streams\" },"
+        "\"streamdetails\": { \"$ref\": \"Video.Streams\" },"
         "\"top250\": { \"type\": \"integer\" },"
         "\"votes\": { \"type\": \"string\" },"
         "\"resume\": { \"$ref\": \"Video.Resume\" },"
@@ -460,7 +460,7 @@ namespace JSONRPC
         "\"originaltitle\": { \"type\": \"string\" },"
         "\"showtitle\": { \"type\": \"string\" },"
         "\"cast\": { \"$ref\": \"Video.Cast\" },"
-        "\"streamDetails\": { \"$ref\": \"Video.Streams\" },"
+        "\"streamdetails\": { \"$ref\": \"Video.Streams\" },"
         "\"lastplayed\": { \"type\": \"string\" },"
         "\"resume\": { \"$ref\": \"Video.Resume\" },"
         "\"tvshowid\": { \"$ref\": \"Library.Id\" }"
@@ -485,7 +485,7 @@ namespace JSONRPC
         "\"artist\": { \"type\": \"string\" },"
         "\"genre\": { \"type\": \"string\" },"
         "\"track\": { \"type\": \"integer\" },"
-        "\"streamDetails\": { \"$ref\": \"Video.Streams\" },"
+        "\"streamdetails\": { \"$ref\": \"Video.Streams\" },"
         "\"lastplayed\": { \"type\": \"string\" },"
         "\"resume\": { \"$ref\": \"Video.Resume\" }"
       "}"
@@ -586,7 +586,7 @@ namespace JSONRPC
                   "\"playcount\", \"fanart\", \"director\", \"trailer\", \"tagline\", \"plot\","
                   "\"plotoutline\", \"originaltitle\", \"lastplayed\", \"writer\", \"studio\","
                   "\"mpaa\", \"cast\", \"country\", \"imdbnumber\", \"premiered\", \"productioncode\","
-                  "\"runtime\", \"set\", \"showlink\", \"streamDetails\", \"top250\", \"votes\","
+                  "\"runtime\", \"set\", \"showlink\", \"streamdetails\", \"top250\", \"votes\","
                   "\"firstaired\", \"season\", \"episode\", \"showtitle\", \"thumbnail\", \"file\","
                   "\"resume\", \"artistid\", \"albumid\", \"tvshowid\", \"setid\" ]"
       "}"
@@ -599,7 +599,7 @@ namespace JSONRPC
                     "\"playcount\", \"fanart\", \"director\", \"trailer\", \"tagline\", \"plot\","
                     "\"plotoutline\", \"originaltitle\", \"lastplayed\", \"writer\", \"studio\","
                     "\"mpaa\", \"country\", \"imdbnumber\", \"premiered\", \"productioncode\","
-                    "\"runtime\", \"showlink\", \"streamDetails\", \"top250\", \"votes\","
+                    "\"runtime\", \"showlink\", \"streamdetails\", \"top250\", \"votes\","
                     "\"firstaired\", \"season\", \"episode\", \"showtitle\", \"thumbnail\","
                     "\"file\", \"sorttitle\", \"episodeguide\", \"resume\", \"tvshowid\", \"setid\" ]"
       "}"
@@ -648,7 +648,7 @@ namespace JSONRPC
           "\"runtime\": { \"type\": \"string\" },"
           "\"set\": { \"$ref\": \"Array.String\" },"
           "\"showlink\": { \"type\": \"string\" },"
-          "\"streamDetails\": { \"$ref\": \"Video.Streams\" },"
+          "\"streamdetails\": { \"$ref\": \"Video.Streams\" },"
           "\"top250\": { \"type\": \"integer\" },"
           "\"votes\": { \"type\": \"string\" },"
           "\"firstaired\": { \"type\": \"string\" },"
@@ -698,7 +698,7 @@ namespace JSONRPC
           "\"productioncode\": { \"type\": \"string\" },"
           "\"runtime\": { \"type\": \"string\" },"
           "\"showlink\": { \"type\": \"string\" },"
-          "\"streamDetails\": { \"$ref\": \"Video.Streams\" },"
+          "\"streamdetails\": { \"$ref\": \"Video.Streams\" },"
           "\"top250\": { \"type\": \"integer\" },"
           "\"votes\": { \"type\": \"string\" },"
           "\"firstaired\": { \"type\": \"string\" },"
@@ -797,7 +797,7 @@ namespace JSONRPC
           "\"runtime\": { \"type\": \"string\" },"
           "\"set\": { \"$ref\": \"Array.String\" },"
           "\"showlink\": { \"type\": \"string\" },"
-          "\"streamDetails\": { \"$ref\": \"Video.Streams\" },"
+          "\"streamdetails\": { \"$ref\": \"Video.Streams\" },"
           "\"top250\": { \"type\": \"integer\" },"
           "\"votes\": { \"type\": \"string\" },"
           "\"firstaired\": { \"type\": \"string\" },"

diff --git a/xbmc/interfaces/json-rpc/types.json b/xbmc/interfaces/json-rpc/types.json
@@ -158,7 +158,7 @@
       "mood": { "type": "string" },
       "style": { "type": "string" },
       "type": { "type": "string" },
-      "album_label": { "type": "string" },
+      "albumlabel": { "type": "string" },
       "rating": { "type": "integer" },
       "year": { "type": "integer" },
       "musicbrainzalbumid": { "type": "string" },
@@ -203,7 +203,7 @@
                 "tagline", "plot", "plotoutline", "originaltitle", "lastplayed",
                 "playcount", "writer", "studio", "mpaa", "cast", "country",
                 "imdbnumber", "premiered", "productioncode", "runtime", "set",
-                "showlink", "streamDetails", "top250", "votes", "fanart",
+                "showlink", "streamdetails", "top250", "votes", "fanart",
                 "thumbnail", "file", "sorttitle", "resume", "setid" ]
     }
   },
@@ -241,7 +241,7 @@
       "enum": [ "title", "plot", "votes", "rating", "writer",
                 "firstaired", "playcount", "runtime", "director",
                 "productioncode", "season", "episode", "originaltitle",
-                "showtitle", "cast", "streamDetails", "lastplayed", "fanart",
+                "showtitle", "cast", "streamdetails", "lastplayed", "fanart",
                 "thumbnail", "file", "resume", "tvshowid" ]
     }
   },
@@ -252,7 +252,7 @@
       "description": "Requesting the resume field will result in increased response times",
       "enum": [ "title", "playcount", "runtime", "director",
                 "studio", "year", "plot", "album", "artist",
-                "genre", "track", "streamDetails", "lastplayed",
+                "genre", "track", "streamdetails", "lastplayed",
                 "fanart", "thumbnail", "file", "resume" ]
     }
   },
@@ -337,7 +337,7 @@
       "runtime": { "type": "string" },
       "set": { "$ref": "Array.String" },
       "showlink": { "type": "string" },
-      "streamDetails": { "$ref": "Video.Streams" },
+      "streamdetails": { "$ref": "Video.Streams" },
       "top250": { "type": "integer" },
       "votes": { "type": "string" },
       "resume": { "$ref": "Video.Resume" },
@@ -432,7 +432,7 @@
       "originaltitle": { "type": "string" },
       "showtitle": { "type": "string" },
       "cast": { "$ref": "Video.Cast" },
-      "streamDetails": { "$ref": "Video.Streams" },
+      "streamdetails": { "$ref": "Video.Streams" },
       "lastplayed": { "type": "string" },
       "resume": { "$ref": "Video.Resume" },
       "tvshowid": { "$ref": "Library.Id" }
@@ -457,7 +457,7 @@
       "artist": { "type": "string" },
       "genre": { "type": "string" },
       "track": { "type": "integer" },
-      "streamDetails": { "$ref": "Video.Streams" },
+      "streamdetails": { "$ref": "Video.Streams" },
       "lastplayed": { "type": "string" },
       "resume": { "$ref": "Video.Resume" }
     }
@@ -558,7 +558,7 @@
                 "playcount", "fanart", "director", "trailer", "tagline", "plot",
                 "plotoutline", "originaltitle", "lastplayed", "writer", "studio",
                 "mpaa", "cast", "country", "imdbnumber", "premiered", "productioncode",
-                "runtime", "set", "showlink", "streamDetails", "top250", "votes",
+                "runtime", "set", "showlink", "streamdetails", "top250", "votes",
                 "firstaired", "season", "episode", "showtitle", "thumbnail", "file",
                 "resume", "artistid", "albumid", "tvshowid", "setid" ]
     }
@@ -571,7 +571,7 @@
                   "playcount", "fanart", "director", "trailer", "tagline", "plot",
                   "plotoutline", "originaltitle", "lastplayed", "writer", "studio",
                   "mpaa", "country", "imdbnumber", "premiered", "productioncode",
-                  "runtime", "showlink", "streamDetails", "top250", "votes",
+                  "runtime", "showlink", "streamdetails", "top250", "votes",
                   "firstaired", "season", "episode", "showtitle", "thumbnail",
                   "file", "sorttitle", "episodeguide", "resume", "tvshowid", "setid" ]
     }
@@ -620,7 +620,7 @@
         "runtime": { "type": "string" },
         "set": { "$ref": "Array.String" },
         "showlink": { "type": "string" },
-        "streamDetails": { "$ref": "Video.Streams" },
+        "streamdetails": { "$ref": "Video.Streams" },
         "top250": { "type": "integer" },
         "votes": { "type": "string" },
         "firstaired": { "type": "string" },
@@ -670,7 +670,7 @@
         "productioncode": { "type": "string" },
         "runtime": { "type": "string" },
         "showlink": { "type": "string" },
-        "streamDetails": { "$ref": "Video.Streams" },
+        "streamdetails": { "$ref": "Video.Streams" },
         "top250": { "type": "integer" },
         "votes": { "type": "string" },
         "firstaired": { "type": "string" },
@@ -769,7 +769,7 @@
         "runtime": { "type": "string" },
         "set": { "$ref": "Array.String" },
         "showlink": { "type": "string" },
-        "streamDetails": { "$ref": "Video.Streams" },
+        "streamdetails": { "$ref": "Video.Streams" },
         "top250": { "type": "integer" },
         "votes": { "type": "string" },
         "firstaired": { "type": "string" },

diff --git a/xbmc/video/VideoInfoTag.cpp b/xbmc/video/VideoInfoTag.cpp
@@ -480,7 +480,7 @@ void CVideoInfoTag::Serialize(CVariant& value)
   value["fileid"] = m_iFileId;
   value["track"] = m_iTrack;
   value["showlink"] = m_strShowLink;
-  m_streamDetails.Serialize(value["streamDetails"]);
+  m_streamDetails.Serialize(value["streamdetails"]);
   CVariant resume = CVariant(CVariant::VariantTypeObject);
   resume["position"] = (float)m_resumePoint.timeInSeconds;
   resume["total"] = (float)m_resumePoint.totalTimeInSeconds;