Fix build warnings

[Version] 13.0.33
[Issue Type] Build

Change-Id: Idf96facb42ef0260e96ac1d1af4e9ec131c999a7

diff --git a/Makefile.am b/Makefile.am
index 90d1260..e529cae 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,22 +65,22 @@ libcommunicator_la_CFLAGS = $(AM_CFLAGS) $(PACORE_CFLAGS) $(PA_CFLAGS)
 module_tizenaudio_sink_la_SOURCES = src/module-tizenaudio-sink.c
 module_tizenaudio_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_tizenaudio_sink_la_LIBADD = $(MODULE_LIBADD) libhal-interface.la
-module_tizenaudio_sink_la_CFLAGS = $(MODULE_CFLAGS)
+module_tizenaudio_sink_la_CFLAGS = $(MODULE_CFLAGS) -DPA_MODULE_NAME=module_tizenaudio_sink
 
 module_tizenaudio_source_la_SOURCES = src/module-tizenaudio-source.c
 module_tizenaudio_source_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_tizenaudio_source_la_LIBADD = $(MODULE_LIBADD) libhal-interface.la
-module_tizenaudio_source_la_CFLAGS = $(MODULE_CFLAGS)
+module_tizenaudio_source_la_CFLAGS = $(MODULE_CFLAGS) -DPA_MODULE_NAME=module_tizenaudio_source
 
 module_sound_player_la_SOURCES = src/module-sound-player.c
 module_sound_player_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_sound_player_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS)
-module_sound_player_la_CFLAGS = $(MODULE_CFLAGS) $(DBUS_CFLAGS)
+module_sound_player_la_CFLAGS = $(MODULE_CFLAGS) $(DBUS_CFLAGS) -DPA_MODULE_NAME=module_sound_player
 
 module_tone_player_la_SOURCES = src/module-tone-player.c
 module_tone_player_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_tone_player_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS)
-module_tone_player_la_CFLAGS = $(MODULE_CFLAGS) $(DBUS_CFLAGS)
+module_tone_player_la_CFLAGS = $(MODULE_CFLAGS) $(DBUS_CFLAGS) -DPA_MODULE_NAME=module_tone_player
 
 module_tizenaudio_policy_la_SOURCES = \
           src/module-tizenaudio-policy.c   \
@@ -96,36 +96,36 @@ module_tizenaudio_policy_la_SOURCES = \
           src/subscribe-observer.c   src/subscribe-observer.h
 module_tizenaudio_policy_la_LDFLAGS = $(MODULE_LDFLAGS) -L$(pulsemodlibexecdir)
 module_tizenaudio_policy_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) $(VCONF_LIBS) $(INIPARSER_LIBS) $(LIBJSON_LIBS) libhal-interface.la libcommunicator.la
-module_tizenaudio_policy_la_CFLAGS = $(MODULE_CFLAGS) $(DBUS_CFLAGS) $(VCONF_CFLAGS) $(INIPARSER_CFLAGS) $(LIBJSON_CFLAGS)
+module_tizenaudio_policy_la_CFLAGS = $(MODULE_CFLAGS) $(DBUS_CFLAGS) $(VCONF_CFLAGS) $(INIPARSER_CFLAGS) $(LIBJSON_CFLAGS) -DPA_MODULE_NAME=module_tizenaudio_policy
 
 if ENABLE_HALTC
 module_tizenaudio_haltc_la_SOURCES = src/module-tizenaudio-haltc.c
 module_tizenaudio_haltc_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_tizenaudio_haltc_la_LIBADD = $(MODULE_LIBADD) libhal-interface.la
-module_tizenaudio_haltc_la_CFLAGS = $(MODULE_CFLAGS)
+module_tizenaudio_haltc_la_CFLAGS = $(MODULE_CFLAGS) -DPA_MODULE_NAME=module_tizenaudio_haltc
 endif
 
 module_poweroff_la_SOURCES = src/module-poweroff.c
 module_poweroff_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_poweroff_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libhal-interface.la
-module_poweroff_la_CFLAGS = $(MODULE_CFLAGS) $(DBUS_CFLAGS)
+module_poweroff_la_CFLAGS = $(MODULE_CFLAGS) $(DBUS_CFLAGS) -DPA_MODULE_NAME=module_poweroff
 
 if ENABLE_ACM
 module_acm_sink_la_SOURCES = src/module-acm-sink.c   src/acm.c   src/acm.h
 module_acm_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_acm_sink_la_LIBADD = $(MODULE_LIBADD)
-module_acm_sink_la_CFLAGS = $(MODULE_CFLAGS)
+module_acm_sink_la_CFLAGS = $(MODULE_CFLAGS) -DPA_MODULE_NAME=module_acm_sink
 endif
 
 module_tizenaudio_discover_la_SOURCES = src/module-tizenaudio-discover.c
 module_tizenaudio_discover_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_tizenaudio_discover_la_LIBADD = $(MODULE_LIBADD) $(DNSSD_LIBS) $(VCONF_LIBS)
-module_tizenaudio_discover_la_CFLAGS = $(MODULE_CFLAGS) $(DNSSD_CFLAGS) $(VCONF_CFLAGS)
+module_tizenaudio_discover_la_CFLAGS = $(MODULE_CFLAGS) $(DNSSD_CFLAGS) $(VCONF_CFLAGS) -DPA_MODULE_NAME=module_tizenaudio_discover
 
 module_tizenaudio_publish_la_SOURCES = src/module-tizenaudio-publish.c
 module_tizenaudio_publish_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_tizenaudio_publish_la_LIBADD = $(MODULE_LIBADD) $(DNSSD_LIBS)
-module_tizenaudio_publish_la_CFLAGS = $(AM_CFLAGS) $(DNSSD_CFLAGS)
+module_tizenaudio_publish_la_CFLAGS = $(AM_CFLAGS) $(DNSSD_CFLAGS) -DPA_MODULE_NAME=module_tizenaudio_publish
 
 if ENABLE_VCONF_HELPER
 pulsemodlibexec_LTLIBRARIES += module-vconf.la
@@ -133,7 +133,7 @@ pulsemodlibexec_LTLIBRARIES += module-vconf.la
 module_vconf_la_SOURCES = src/vconf/module-vconf.c
 module_vconf_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_vconf_la_LIBADD = $(MODULE_LIBADD) libcommunicator.la
-module_vconf_la_CFLAGS = $(MODULE_CFLAGS) -DPA_VCONF_HELPER=\"$(pulselibexecdir)/vconf-helper\"
+module_vconf_la_CFLAGS = $(MODULE_CFLAGS) -DPA_VCONF_HELPER=\"$(pulselibexecdir)/vconf-helper\" -DPA_MODULE_NAME=module_vconf
 
 pulselibexec_PROGRAMS = vconf-helper
 

diff --git a/packaging/pulseaudio-modules-tizen.spec b/packaging/pulseaudio-modules-tizen.spec
index a622af5..0a6f996 100644 (file)
--- a/packaging/pulseaudio-modules-tizen.spec
+++ b/packaging/pulseaudio-modules-tizen.spec
@@ -1,6 +1,6 @@
 Name:             pulseaudio-modules-tizen
 Summary:          Pulseaudio modules for Tizen
-Version:          13.0.32
+Version:          13.0.33
 Release:          0
 Group:            Multimedia/Audio
 License:          LGPL-2.1+

diff --git a/src/module-tizenaudio-discover.c b/src/module-tizenaudio-discover.c
index e507e39..e75e452 100644 (file)
--- a/src/module-tizenaudio-discover.c
+++ b/src/module-tizenaudio-discover.c
@@ -688,30 +688,6 @@ static int dnssd_browse_dns_service(struct userdata *u, const char *service_type
     return 0;
 }
 
-void pa__done(pa_module *m) {
-    struct userdata *u;
-    pa_assert(m);
-
-    if (!(u = m->userdata))
-        return;
-
-    if (u->tunnels) {
-        struct tunnel *t;
-
-        while ((t = pa_hashmap_steal_first(u->tunnels))) {
-            pa_module_unload_request_by_index(u->core, t->module_index, true);
-            tunnel_free(t);
-        }
-
-        pa_hashmap_free(u->tunnels);
-    }
-
-    request_clear(u->module->core->mainloop, &u->browse_sink);
-    request_clear(u->module->core->mainloop, &u->browse_source);
-
-    pa_xfree(u);
-}
-
 int pa__init(pa_module *m) {
 
     struct userdata *u;
@@ -748,3 +724,27 @@ fail:
 
     return -1;
 }
+
+void pa__done(pa_module *m) {
+    struct userdata *u;
+    pa_assert(m);
+
+    if (!(u = m->userdata))
+        return;
+
+    if (u->tunnels) {
+        struct tunnel *t;
+
+        while ((t = pa_hashmap_steal_first(u->tunnels))) {
+            pa_module_unload_request_by_index(u->core, t->module_index, true);
+            tunnel_free(t);
+        }
+
+        pa_hashmap_free(u->tunnels);
+    }
+
+    request_clear(u->module->core->mainloop, &u->browse_sink);
+    request_clear(u->module->core->mainloop, &u->browse_source);
+
+    pa_xfree(u);
+}
\ No newline at end of file

diff --git a/src/module-tizenaudio-publish.c b/src/module-tizenaudio-publish.c
index 0fb0602..1c502f2 100644 (file)
--- a/src/module-tizenaudio-publish.c
+++ b/src/module-tizenaudio-publish.c
@@ -450,38 +450,6 @@ static void unpublish_all_services(struct userdata *u) {
         DNSServiceRefDeallocate(u->main_service);
 }
 
-void pa__done(pa_module *m) {
-    struct userdata *u;
-    pa_assert(m);
-
-    if (!(u = m->userdata))
-        return;
-
-    unpublish_all_services(u);
-
-    if (u->services)
-        pa_hashmap_free(u->services);
-
-    if (u->sink_new_slot)
-        pa_hook_slot_free(u->sink_new_slot);
-    if (u->source_new_slot)
-        pa_hook_slot_free(u->source_new_slot);
-    if (u->sink_changed_slot)
-        pa_hook_slot_free(u->sink_changed_slot);
-    if (u->source_changed_slot)
-        pa_hook_slot_free(u->source_changed_slot);
-    if (u->sink_unlink_slot)
-        pa_hook_slot_free(u->sink_unlink_slot);
-    if (u->source_unlink_slot)
-        pa_hook_slot_free(u->source_unlink_slot);
-
-    if (u->native)
-        pa_native_protocol_unref(u->native);
-
-    pa_xfree(u->service_name);
-    pa_xfree(u);
-}
-
 int pa__init(pa_module *m) {
     struct userdata *u;
     pa_modargs *ma = NULL;
@@ -527,3 +495,35 @@ fail:
 
     return -1;
 }
+
+void pa__done(pa_module *m) {
+    struct userdata *u;
+    pa_assert(m);
+
+    if (!(u = m->userdata))
+        return;
+
+    unpublish_all_services(u);
+
+    if (u->services)
+        pa_hashmap_free(u->services);
+
+    if (u->sink_new_slot)
+        pa_hook_slot_free(u->sink_new_slot);
+    if (u->source_new_slot)
+        pa_hook_slot_free(u->source_new_slot);
+    if (u->sink_changed_slot)
+        pa_hook_slot_free(u->sink_changed_slot);
+    if (u->source_changed_slot)
+        pa_hook_slot_free(u->source_changed_slot);
+    if (u->sink_unlink_slot)
+        pa_hook_slot_free(u->sink_unlink_slot);
+    if (u->source_unlink_slot)
+        pa_hook_slot_free(u->source_unlink_slot);
+
+    if (u->native)
+        pa_native_protocol_unref(u->native);
+
+    pa_xfree(u->service_name);
+    pa_xfree(u);
+}
\ No newline at end of file

diff --git a/src/stream-manager.c b/src/stream-manager.c
index e8f107d..4507a71 100644 (file)
--- a/src/stream-manager.c
+++ b/src/stream-manager.c
@@ -44,7 +44,7 @@
 #include <pulsecore/macro.h>
 #include <pulsecore/shared.h>
 #include <pulsecore/core-util.h>
-
+#include <pulsecore/proplist-util.h>
 
 #include <json.h>
 #include "stream-manager.h"