Fix for pulseaudio 15.0 upgrade

[Version] 15.0.0
[Issue Type] Core Upgrade

Change-Id: Ie55fa522a3d1e08c8e898ce626a1a199c0f994e6

diff --git a/Makefile.am b/Makefile.am
index 6869eaa..260a272 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-pulsemodlibexecdir= $(libdir)/pulse-13.0/modules
+pulsemodlibexecdir= $(libdir)/pulse-15.0/modules
 pulselibexecdir=$(libexecdir)/pulse
 
 AM_CFLAGS = \

diff --git a/configure.ac b/configure.ac
index d1720a3..acaaf3d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.63)
 
-AC_INIT([pulseaudio-module-tizen],[0.1])
+AC_INIT([pulseaudio-module-tizen],[15.0])
 AC_CONFIG_SRCDIR([src/module-tizenaudio-policy.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])

diff --git a/packaging/pulseaudio-modules-tizen.spec b/packaging/pulseaudio-modules-tizen.spec
index 57aea54..2194382 100644 (file)
--- a/packaging/pulseaudio-modules-tizen.spec
+++ b/packaging/pulseaudio-modules-tizen.spec
@@ -1,6 +1,8 @@
+%define module_ver 15.0
+
 Name:             pulseaudio-modules-tizen
 Summary:          Pulseaudio modules for Tizen
-Version:          13.0.81
+Version:          15.0.0
 Release:          0
 Group:            Multimedia/Audio
 License:          LGPL-2.1+
@@ -76,21 +78,21 @@ install -m 0644 %SOURCE1 %{buildroot}%{_tmpfilesdir}/pulseaudio.conf
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %license LICENSE.LGPL-2.1+
-%{_libdir}/pulse-13.0/modules/module-poweroff.so
-%{_libdir}/pulse-13.0/modules/module-sound-player.so
-%{_libdir}/pulse-13.0/modules/module-tone-player.so
-%{_libdir}/pulse-13.0/modules/module-tizenaudio-policy.so
-%{_libdir}/pulse-13.0/modules/module-tizenaudio-sink.so
-%{_libdir}/pulse-13.0/modules/module-tizenaudio-source.so
-%{_libdir}/pulse-13.0/modules/module-tizenaudio-sink2.so
-%{_libdir}/pulse-13.0/modules/module-tizenaudio-source2.so
-%{_libdir}/pulse-13.0/modules/module-tizenaudio-discover.so
-%{_libdir}/pulse-13.0/modules/module-tizenaudio-publish.so
-%{_libdir}/pulse-13.0/modules/libhal-interface.so
-%{_libdir}/pulse-13.0/modules/libcommunicator.so
+%{_libdir}/pulse-%{module_ver}/modules/module-poweroff.so
+%{_libdir}/pulse-%{module_ver}/modules/module-sound-player.so
+%{_libdir}/pulse-%{module_ver}/modules/module-tone-player.so
+%{_libdir}/pulse-%{module_ver}/modules/module-tizenaudio-policy.so
+%{_libdir}/pulse-%{module_ver}/modules/module-tizenaudio-sink.so
+%{_libdir}/pulse-%{module_ver}/modules/module-tizenaudio-source.so
+%{_libdir}/pulse-%{module_ver}/modules/module-tizenaudio-sink2.so
+%{_libdir}/pulse-%{module_ver}/modules/module-tizenaudio-source2.so
+%{_libdir}/pulse-%{module_ver}/modules/module-tizenaudio-discover.so
+%{_libdir}/pulse-%{module_ver}/modules/module-tizenaudio-publish.so
+%{_libdir}/pulse-%{module_ver}/modules/libhal-interface.so
+%{_libdir}/pulse-%{module_ver}/modules/libcommunicator.so
 %{_tmpfilesdir}/pulseaudio.conf
 %if "%{tizen_profile_name}" == "tv"
-%{_libdir}/pulse-13.0/modules/module-vconf.so
+%{_libdir}/pulse-%{module_ver}/modules/module-vconf.so
 %{_libexecdir}/pulse/vconf-helper
 %endif
 %{_libdir}/ladspa/*.so
@@ -100,5 +102,5 @@ install -m 0644 %SOURCE1 %{buildroot}%{_tmpfilesdir}/pulseaudio.conf
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %license LICENSE.LGPL-2.1+
-%{_libdir}/pulse-13.0/modules/module-acm-sink.so
+%{_libdir}/pulse-%{module_ver}/modules/module-acm-sink.so
 

diff --git a/src/device-manager-db.c b/src/device-manager-db.c
index f1cfaa8..40d0350 100644 (file)
--- a/src/device-manager-db.c
+++ b/src/device-manager-db.c
@@ -36,23 +36,23 @@ static void dump_prefer_entry(prefer_entry *e) {
 }
 
 int32_t init_database(pa_device_manager *dm) {
-    char *db_path;
+    char *state_path;
 
     pa_assert(dm);
 
-    if (!(db_path = pa_state_path("device-preferences", true))) {
+    if (!(state_path = pa_state_path(NULL, true))) {
         pa_log_error("failed to get path for database");
         return -1;
     }
 
-    if (!(dm->database = pa_database_open(db_path, true))) {
-        pa_log_error("failed to open database '%s': %s", db_path, pa_cstrerror(errno));
-        pa_xfree(db_path);
+    if (!(dm->database = pa_database_open(state_path, "device-preferences", true, true))) {
+        pa_log_error("failed to open database '%s': %s", state_path, pa_cstrerror(errno));
+        pa_xfree(state_path);
         return -1;
     }
-    pa_log_info("database file '%s'", db_path);
+    pa_log_info("database file '%s'", state_path);
 
-    pa_xfree(db_path);
+    pa_xfree(state_path);
 
     return 0;
 }