Remove module-hw-keysound which is no longer supported 04/225804/2 accepted/tizen/unified/20200304.123928 submit/tizen/20200303.010146
authorSeungbae Shin <seungbae.shin@samsung.com>
Mon, 24 Feb 2020 11:49:58 +0000 (20:49 +0900)
committerSeungbae Shin <seungbae.shin@samsung.com>
Mon, 24 Feb 2020 11:53:34 +0000 (20:53 +0900)
[Version] 13.0.2
[Issue Type] Dependencies

Change-Id: I2eb24577bd68fe6ce6cadb84b90ba3c63c057e00

Makefile.am
packaging/pulseaudio-modules-tizen.spec
src/module-hw-keysound.c [deleted file]

index cef1ea0b1a2e3bb6ee8486c2d54838a9a98f5c2c..795753d94db7640cea330103a6189cbfb21cbd25 100644 (file)
@@ -37,7 +37,6 @@ pulsemodlibexec_LTLIBRARIES = \
                module-tizenaudio-source.la \
                module-tizenaudio-policy.la \
                module-sound-player.la \
-               module-hw-keysound.la \
                module-poweroff.la
 if ENABLE_HALTC
 pulsemodlibexec_LTLIBRARIES += \
@@ -57,7 +56,6 @@ SYMDEF_FILES = \
                module-tizenaudio-source-symdef.h \
                module-tizenaudio-policy-symdef.h \
                module-sound-player-symdef.h \
-               module-hw-keysound-symdef.h \
                module-poweroff-symdef.h
 if ENABLE_HALTC
 SYMDEF_FILES += \
@@ -136,11 +134,6 @@ module_tizenaudio_haltc_la_LIBADD = $(MODULE_LIBADD) libhal-interface.la
 module_tizenaudio_haltc_la_CFLAGS = $(MODULE_CFLAGS)
 endif
 
-module_hw_keysound_la_SOURCES = src/module-hw-keysound.c
-module_hw_keysound_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_hw_keysound_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) $(VCONF_LIBS)
-module_hw_keysound_la_CFLAGS = $(MODULE_CFLAGS) $(DBUS_CFLAGS) $(VCONF_CFLAGS)
-
 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
index 274ce85d409ca12c33cd876b8bfff86640ad405e..769b8627b9617cf08955ec261bd7545fe70f00ca 100644 (file)
@@ -1,6 +1,6 @@
 Name:             pulseaudio-modules-tizen
 Summary:          Pulseaudio modules for Tizen
-Version:          13.0.1
+Version:          13.0.2
 Release:          0
 Group:            Multimedia/Audio
 License:          LGPL-2.1+
@@ -68,7 +68,6 @@ 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-hw-keysound.so
 %{_libdir}/pulse-13.0/modules/module-poweroff.so
 %{_libdir}/pulse-13.0/modules/module-sound-player.so
 %{_libdir}/pulse-13.0/modules/module-tizenaudio-policy.so
diff --git a/src/module-hw-keysound.c b/src/module-hw-keysound.c
deleted file mode 100644 (file)
index 4c03fba..0000000
+++ /dev/null
@@ -1,257 +0,0 @@
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2016 Seungbae Shin <seungbae.shin@samsung.com>
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-#include <pulse/xmalloc.h>
-#include <pulse/proplist.h>
-
-#include <pulsecore/module.h>
-#include <pulsecore/log.h>
-#include <pulsecore/namereg.h>
-#include <pulsecore/sink.h>
-#include <pulsecore/modargs.h>
-#include <pulsecore/macro.h>
-#include <pulsecore/core-util.h>
-#include <pulsecore/core-error.h>
-#include <pulsecore/dbus-shared.h>
-#include <pulsecore/protocol-dbus.h>
-#include <pulsecore/dbus-util.h>
-#include <pulsecore/core-scache.h>
-
-#include <vconf.h>
-
-#include "module-hw-keysound-symdef.h"
-
-PA_MODULE_AUTHOR("Seungbae Shin");
-PA_MODULE_DESCRIPTION("H/W Keysound play module");
-PA_MODULE_VERSION(PACKAGE_VERSION);
-PA_MODULE_LOAD_ONCE(true);
-
-#define INTERFACE_NAME "org.tizen.system.deviced.Key"
-#define SIGNAL_NAME    "ChangeHardkey"
-#define DBUS_HW_KEYTONE "/usr/share/sounds/sound-server/Tizen_HW_Touch.ogg"
-#define FILTER_HARDKEY  "type='signal', interface='"INTERFACE_NAME"', member='"SIGNAL_NAME"'"
-#define MAX_NAME_LEN 256
-#define DEFAULT_ROLE "system"
-#define DEFAULT_VOLUME_GAIN "touch"
-
-struct userdata {
-    pa_module *module;
-    pa_dbus_connection *dbus_conn;
-};
-
-static void _hw_keysound_play(struct userdata *u, const char *file_path) {
-    int ret = 0;
-    pa_proplist *p = NULL;
-    const char *name_prefix = "HWKEY";
-    char name[MAX_NAME_LEN] = {0};
-    uint32_t stream_idx = 0;
-    uint32_t scache_idx = 0;
-
-    /* Load if not cached */
-    pa_snprintf(name, sizeof(name), "%s_%s", name_prefix, file_path);
-
-    scache_idx = pa_scache_get_id_by_name(u->module->core, name);
-    if (scache_idx != PA_IDXSET_INVALID) {
-        pa_log_debug("found cached index [%u] for name [%s]", scache_idx, file_path);
-    } else {
-        /* for more precision, need to update volume value here */
-        if ((ret = pa_scache_add_file_lazy(u->module->core, name, file_path, &scache_idx)) != 0) {
-            pa_log_error("failed to add file [%s]", file_path);
-            return;
-        }
-        pa_log_debug("success to add file [%s], index [%u]", file_path, scache_idx);
-    }
-
-    /* Set role type / volume gain of stream */
-    p = pa_proplist_new();
-    if (!p) {
-        pa_log_error("failed to create proplist...");
-        return;
-    }
-    pa_proplist_sets(p, PA_PROP_MEDIA_ROLE, DEFAULT_ROLE);
-    pa_proplist_sets(p, PA_PROP_MEDIA_TIZEN_VOLUME_GAIN_TYPE, DEFAULT_VOLUME_GAIN);
-    pa_log_debug("role[%s], volume_gain_type[%s]", DEFAULT_ROLE, DEFAULT_VOLUME_GAIN);
-
-    /* Play sample */
-    pa_log_debug("pa_scache_play_item() start");
-    ret = pa_scache_play_item(u->module->core, name, pa_namereg_get(u->module->core, NULL, PA_NAMEREG_SINK), PA_VOLUME_NORM, p, &stream_idx);
-    if (ret < 0)
-        pa_log_error("pa_scache_play_item fail, ret[%d]", ret);
-    else
-        pa_log_info("pa_scache_play_item() end, stream_idx(%u)", stream_idx);
-
-    /* clean-up */
-    pa_proplist_free(p);
-}
-
-static bool _is_mute_sound () {
-    int setting_sound_status = true;
-    int setting_touch_sound = true;
-
-    vconf_get_bool(VCONFKEY_SETAPPL_SOUND_STATUS_BOOL, &setting_sound_status);
-    vconf_get_bool(VCONFKEY_SETAPPL_TOUCH_SOUNDS_BOOL, &setting_touch_sound);
-
-    return !(setting_sound_status & setting_touch_sound);
-}
-
-static DBusHandlerResult _dbus_filter_device_detect_handler(DBusConnection *c, DBusMessage *s, void *userdata) {
-    struct userdata *u = (struct userdata *)userdata;
-
-    pa_assert(u);
-
-    if (dbus_message_get_type(s) != DBUS_MESSAGE_TYPE_SIGNAL)
-        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
-    pa_log_debug("DBus device detect handler received msg");
-    pa_log_debug("path       : %s", dbus_message_get_path(s));
-    pa_log_debug("interface  : %s", dbus_message_get_interface(s));
-    pa_log_debug("member     : %s", dbus_message_get_member(s));
-    pa_log_debug("signature  : %s", dbus_message_get_signature(s));
-
-    if (dbus_message_is_signal(s, INTERFACE_NAME, SIGNAL_NAME)) {
-        if (!_is_mute_sound())
-            _hw_keysound_play(u, DBUS_HW_KEYTONE);
-        else
-            pa_log_debug("Skip playing keytone due to mute sound mode");
-
-        return DBUS_HANDLER_RESULT_HANDLED;
-    }
-
-    pa_log_info("Unknown message, do not handle this");
-    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-static int _watch_signals(struct userdata *u) {
-    DBusError error;
-
-    pa_assert(u);
-    pa_assert(u->dbus_conn);
-
-    dbus_error_init(&error);
-
-    pa_log_debug("Watch Dbus signals");
-
-    if (!dbus_connection_add_filter(pa_dbus_connection_get(u->dbus_conn), _dbus_filter_device_detect_handler, u, NULL)) {
-        pa_log_error("Unable to add D-Bus filter");
-        return -1;
-    }
-
-    if (pa_dbus_add_matches(pa_dbus_connection_get(u->dbus_conn), &error, FILTER_HARDKEY, NULL) < 0) {
-        pa_log_error("Unable to subscribe to signals: %s: %s", error.name, error.message);
-        dbus_error_free(&error);
-        return -1;
-    }
-
-    return 0;
-}
-
-static void _unwatch_signals(struct userdata *u) {
-    pa_log_debug("Unwatch Dbus signals");
-
-    pa_assert(u);
-    pa_assert(u->dbus_conn);
-
-    pa_dbus_remove_matches(pa_dbus_connection_get(u->dbus_conn), FILTER_HARDKEY, NULL);
-    dbus_connection_remove_filter(pa_dbus_connection_get(u->dbus_conn), _dbus_filter_device_detect_handler, u);
-}
-
-static int _dbus_init(struct userdata *u) {
-    DBusError error;
-    pa_dbus_connection *connection = NULL;
-
-    pa_assert(u);
-
-    dbus_error_init(&error);
-
-    pa_log_debug("Dbus init");
-
-    if (!(connection = pa_dbus_bus_get(u->module->core, DBUS_BUS_SYSTEM, &error)) || dbus_error_is_set(&error)) {
-        if (connection)
-            pa_dbus_connection_unref(connection);
-
-        pa_log_error("Unable to contact D-Bus system bus: %s: %s", error.name, error.message);
-        dbus_error_free(&error);
-        return -1;
-    }
-    pa_log_debug("Got dbus connection %p", connection);
-    u->dbus_conn = connection;
-
-    if (_watch_signals(u) < 0)
-        pa_log_error("dbus watch signals failed");
-    else
-        pa_log_debug("dbus ready to get signals");
-
-    return 0;
-}
-
-static void _dbus_deinit(struct userdata *u) {
-    pa_assert(u);
-
-    pa_log_debug("Dbus deinit");
-
-    _unwatch_signals(u);
-
-    if (u->dbus_conn) {
-        pa_dbus_connection_unref(u->dbus_conn);
-        u->dbus_conn = NULL;
-    }
-}
-
-int pa__init(pa_module *m) {
-    struct userdata *u;
-
-    pa_assert(m);
-
-    m->userdata = u = pa_xnew0(struct userdata, 1);
-    u->module = m;
-    u->dbus_conn = NULL;
-
-    if (_dbus_init(u) == -1) {
-        pa__done(m);
-        return -1;
-    }
-    return 0;
-}
-
-void pa__done(pa_module *m) {
-    struct userdata *u;
-
-    pa_assert(m);
-
-    if (!(u = m->userdata))
-        return;
-
-    _dbus_deinit(u);
-
-    pa_xfree(u);
-}