opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

rtmp-services: Add format_version to services.json

Browse Source 
The entire services file had to be restructured, but this allows us to
be able to change the format of the json file safely (if ever needed).
This commit is contained in:
jp9000
2015-08-19 16:19:03 -07:00
parent d3eaeda27c
commit b5f1bbdd4c
4 changed files with 453 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/rtmp-services/rtmp-common.c
+26 -1
View File
@@ -2,6 +2,8 @@
#include <obs-module.h>
#include <jansson.h>
#include "rtmp-format-ver.h"
struct rtmp_common {
char *service;
char *server;
@@ -129,6 +131,8 @@ static json_t *open_json_file(const char *file)
char *file_data = os_quick_read_utf8_file(file);
json_error_t error;
json_t *root;
json_t *list;
int format_ver;
if (!file_data)
return NULL;
@@ -143,7 +147,28 @@ static json_t *open_json_file(const char *file)
return NULL;
}
return root;
format_ver = get_int_val(root, "format_version");
if (format_ver != RTMP_SERVICES_FORMAT_VERSION) {
blog(LOG_WARNING, "rtmp-common.c: [open_json_file] "
"Wrong format version (%d), expected %d",
format_ver, RTMP_SERVICES_FORMAT_VERSION);
json_decref(root);
return NULL;
}
list = json_object_get(root, "services");
if (list)
json_incref(list);
json_decref(root);
if (!list) {
blog(LOG_WARNING, "rtmp-common.c: [open_json_file] "
"No services list");
return NULL;
}
return list;
}
static void build_service_list(obs_property_t *list, json_t *root,