Skip to content

Commit

Permalink
jsonrpc: avoid unnecessary warnings because of bad order in JSON sche…
Browse files Browse the repository at this point in the history 
…ma type definitions
  • Loading branch information
@Montellese
Montellese committed Oct 14, 2012
1 parent af503a5 commit 5fc16bd
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 72 deletions.
72 changes: 36 additions & 36 deletions xbmc/interfaces/json-rpc/ServiceDescription.h
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -95,6 +95,42 @@ namespace JSONRPC
"\"notifications\": { \"$ref\": \"Configuration.Notifications\", \"required\": true }" "\"notifications\": { \"$ref\": \"Configuration.Notifications\", \"required\": true }"
"}" "}"
"}", "}",
"\"List.Amount\": {"
"\"type\": \"integer\","
"\"default\": -1,"
"\"minimum\": 0"
"}",
"\"List.Limits\": {"
"\"type\": \"object\","
"\"properties\": {"
"\"start\": { \"type\": \"integer\", \"minimum\": 0, \"default\": 0, \"description\": \"Index of the first item to return\" },"
"\"end\": { \"$ref\": \"List.Amount\", \"description\": \"Index of the last item to return\" }"
"},"
"\"additionalProperties\": false"
"}",
"\"List.LimitsReturned\": {"
"\"type\": \"object\","
"\"properties\": {"
"\"start\": { \"type\": \"integer\", \"minimum\": 0, \"default\": 0 },"
"\"end\": { \"$ref\": \"List.Amount\" },"
"\"total\": { \"type\": \"integer\", \"minimum\": 0, \"required\": true }"
"},"
"\"additionalProperties\": false"
"}",
"\"List.Sort\": {"
"\"type\": \"object\","
"\"properties\": {"
"\"method\": { \"type\": \"string\", \"default\": \"none\","
"\"enum\": [ \"none\", \"label\", \"date\", \"size\", \"file\", \"path\", \"drivetype\", \"title\", \"track\", \"time\", \"artist\","
"\"album\", \"albumtype\", \"genre\", \"country\", \"year\", \"rating\", \"votes\", \"top250\", \"programcount\","
"\"playlist\", \"episode\", \"season\", \"totalepisodes\", \"watchedepisodes\", \"tvshowstatus\", \"tvshowtitle\","
"\"sorttitle\", \"productioncode\", \"mpaa\", \"studio\", \"dateadded\", \"lastplayed\", \"playcount\", \"listeners\","
"\"bitrate\", \"random\" ]"
"},"
"\"order\": { \"type\": \"string\", \"default\": \"ascending\", \"enum\": [ \"ascending\", \"descending\" ] },"
"\"ignorearticle\": { \"type\": \"boolean\", \"default\": false }"
"}"
"}",
"\"Library.Id\": {" "\"Library.Id\": {"
"\"type\": \"integer\"," "\"type\": \"integer\","
"\"default\": -1," "\"default\": -1,"
Expand Down Expand Up @@ -702,42 +738,6 @@ namespace JSONRPC
"\"type\": \"string\"," "\"type\": \"string\","
"\"enum\": [ \"video\", \"music\", \"pictures\", \"files\", \"programs\" ]" "\"enum\": [ \"video\", \"music\", \"pictures\", \"files\", \"programs\" ]"
"}", "}",
"\"List.Amount\": {"
"\"type\": \"integer\","
"\"default\": -1,"
"\"minimum\": 0"
"}",
"\"List.Limits\": {"
"\"type\": \"object\","
"\"properties\": {"
"\"start\": { \"type\": \"integer\", \"minimum\": 0, \"default\": 0, \"description\": \"Index of the first item to return\" },"
"\"end\": { \"type\": \"integer\", \"minimum\": 0, \"default\": -1, \"description\": \"Index of the last item to return\" }"
"},"
"\"additionalProperties\": false"
"}",
"\"List.Sort\": {"
"\"type\": \"object\","
"\"properties\": {"
"\"method\": { \"type\": \"string\", \"default\": \"none\","
"\"enum\": [ \"none\", \"label\", \"date\", \"size\", \"file\", \"path\", \"drivetype\", \"title\", \"track\", \"time\", \"artist\","
"\"album\", \"albumtype\", \"genre\", \"country\", \"year\", \"rating\", \"votes\", \"top250\", \"programcount\","
"\"playlist\", \"episode\", \"season\", \"totalepisodes\", \"watchedepisodes\", \"tvshowstatus\", \"tvshowtitle\","
"\"sorttitle\", \"productioncode\", \"mpaa\", \"studio\", \"dateadded\", \"lastplayed\", \"playcount\", \"listeners\","
"\"bitrate\", \"random\" ]"
"},"
"\"order\": { \"type\": \"string\", \"default\": \"ascending\", \"enum\": [ \"ascending\", \"descending\" ] },"
"\"ignorearticle\": { \"type\": \"boolean\", \"default\": false }"
"}"
"}",
"\"List.LimitsReturned\": {"
"\"type\": \"object\","
"\"properties\": {"
"\"start\": { \"type\": \"integer\", \"minimum\": 0, \"default\": 0 },"
"\"end\": { \"type\": \"integer\", \"minimum\": 0, \"default\": -1 },"
"\"total\": { \"type\": \"integer\", \"minimum\": 0, \"required\": true }"
"},"
"\"additionalProperties\": false"
"}",
"\"List.Filter.Rule\": {" "\"List.Filter.Rule\": {"
"\"type\": \"object\"," "\"type\": \"object\","
"\"properties\": {" "\"properties\": {"
Expand Down
72 changes: 36 additions & 36 deletions xbmc/interfaces/json-rpc/types.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -68,6 +68,42 @@
"notifications": { "$ref": "Configuration.Notifications", "required": true } "notifications": { "$ref": "Configuration.Notifications", "required": true }
} }
}, },
"List.Amount": {
"type": "integer",
"default": -1,
"minimum": 0
},
"List.Limits": {
"type": "object",
"properties": {
"start": { "type": "integer", "minimum": 0, "default": 0, "description": "Index of the first item to return" },
"end": { "$ref": "List.Amount", "description": "Index of the last item to return" }
},
"additionalProperties": false
},
"List.LimitsReturned": {
"type": "object",
"properties": {
"start": { "type": "integer", "minimum": 0, "default": 0 },
"end": { "$ref": "List.Amount" },
"total": { "type": "integer", "minimum": 0, "required": true }
},
"additionalProperties": false
},
"List.Sort": {
"type": "object",
"properties": {
"method": { "type": "string", "default": "none",
"enum": [ "none", "label", "date", "size", "file", "path", "drivetype", "title", "track", "time", "artist",
"album", "albumtype", "genre", "country", "year", "rating", "votes", "top250", "programcount",
"playlist", "episode", "season", "totalepisodes", "watchedepisodes", "tvshowstatus", "tvshowtitle",
"sorttitle", "productioncode", "mpaa", "studio", "dateadded", "lastplayed", "playcount", "listeners",
"bitrate", "random" ]
},
"order": { "type": "string", "default": "ascending", "enum": [ "ascending", "descending" ] },
"ignorearticle": { "type": "boolean", "default": false }
}
},
"Library.Id": { "Library.Id": {
"type": "integer", "type": "integer",
"default": -1, "default": -1,
Expand Down Expand Up @@ -675,42 +711,6 @@
"type": "string", "type": "string",
"enum": [ "video", "music", "pictures", "files", "programs" ] "enum": [ "video", "music", "pictures", "files", "programs" ]
}, },
"List.Amount": {
"type": "integer",
"default": -1,
"minimum": 0
},
"List.Limits": {
"type": "object",
"properties": {
"start": { "type": "integer", "minimum": 0, "default": 0, "description": "Index of the first item to return" },
"end": { "type": "integer", "minimum": 0, "default": -1, "description": "Index of the last item to return" }
},
"additionalProperties": false
},
"List.Sort": {
"type": "object",
"properties": {
"method": { "type": "string", "default": "none",
"enum": [ "none", "label", "date", "size", "file", "path", "drivetype", "title", "track", "time", "artist",
"album", "albumtype", "genre", "country", "year", "rating", "votes", "top250", "programcount",
"playlist", "episode", "season", "totalepisodes", "watchedepisodes", "tvshowstatus", "tvshowtitle",
"sorttitle", "productioncode", "mpaa", "studio", "dateadded", "lastplayed", "playcount", "listeners",
"bitrate", "random" ]
},
"order": { "type": "string", "default": "ascending", "enum": [ "ascending", "descending" ] },
"ignorearticle": { "type": "boolean", "default": false }
}
},
"List.LimitsReturned": {
"type": "object",
"properties": {
"start": { "type": "integer", "minimum": 0, "default": 0 },
"end": { "type": "integer", "minimum": 0, "default": -1 },
"total": { "type": "integer", "minimum": 0, "required": true }
},
"additionalProperties": false
},
"List.Filter.Rule": { "List.Filter.Rule": {
"type": "object", "type": "object",
"properties": { "properties": {
Expand Down

0 comments on commit 5fc16bd

Please sign in to comment.