Fix json-c depreacted macro (is_error) usage. 40/176440/1 submit/tizen/20180419.083101
authorSeungbae Shin <seungbae.shin@samsung.com>
Thu, 19 Apr 2018 08:00:19 +0000 (17:00 +0900)
committerSeungbae Shin <seungbae.shin@samsung.com>
Thu, 19 Apr 2018 08:00:19 +0000 (17:00 +0900)
[Version] 11.1.2
[Issue Type] Deprecation

Change-Id: I7c21aaf4af36b5de3eeadc17182eaf616b1ffd28

packaging/pulseaudio-modules-tizen.spec
src/device-manager.c
src/stream-manager.c

index e0f373ee93cd6fe11fb54495e3b2c8e51f1209ea..e6fb21b668bd27aae4e583545097488ce3902070 100644 (file)
@@ -1,6 +1,6 @@
 Name:             pulseaudio-modules-tizen
 Summary:          Pulseaudio modules for Tizen
-Version:          11.1.1
+Version:          11.1.2
 Release:          0
 Group:            Multimedia/Audio
 License:          LGPL-2.1+
index cd90bf34c7d8127ae75f673cc9a5e9339ca12bfb..55486b0b1a1bca7b86ba04c2e54fcccd3056d0d3 100644 (file)
@@ -2264,7 +2264,7 @@ static struct device_file_map *parse_device_file_map() {
 
     o = json_object_from_file(DEVICE_MAP_FILE);
 
-    if (is_error(o)) {
+    if (o == NULL) {
         pa_log_error("Read device-map file failed");
         return NULL;
     }
@@ -2345,7 +2345,7 @@ static pa_idxset* parse_device_type_infos() {
     pa_idxset *type_infos = NULL;
 
     o = json_object_from_file(DEVICE_MAP_FILE);
-    if (is_error(o)) {
+    if (o == NULL) {
         pa_log_error("Read device-map file failed");
         return NULL;
     }
index c6a7d2645071fc163975490e17f079781ffa4491..0e8e88551ad0c2d82e459cc65458b1d83cbcef57 100644 (file)
@@ -633,7 +633,7 @@ static int init_stream_map(pa_stream_manager *m) {
     pa_assert(m);
 
     o = json_object_from_file(STREAM_MAP_FILE);
-    if (is_error(o)) {
+    if (o == NULL) {
         pa_log_error("Read stream-map file(%s) failed", STREAM_MAP_FILE);
         return -1;
     }