hal-interface: Use /usr/include/tizen-audio.h instead of local tizen-audio.h

removed src/tizen-audio.h file.

[Version] 5.0.60
[Profile] Common
[Issue Type] Clean-up

Change-Id: I5bbbb5c9855e38395bb235a6deccbe2965b834ef
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/packaging/pulseaudio-modules-tizen.spec b/packaging/pulseaudio-modules-tizen.spec
index 0e9b8064744d4a34c156106aba34b242fd7030de..89aa328bf0a2b89a4376b298b4d434de14c73ce9 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:          5.0.59
+Version:          5.0.60
 Release:          0
 Group:            Multimedia/Audio
 License:          LGPL-2.1+
@@ -12,6 +12,7 @@ BuildRequires:    pkgconfig(dbus-1)
 BuildRequires:    pkgconfig(iniparser)
 BuildRequires:    pkgconfig(json-c)
 BuildRequires:    pkgconfig(vconf)
+BuildRequires:    mm-hal-interface
 BuildRequires:    pkgconfig(libpulse)
 BuildRequires:    pkgconfig(pulsecore)
 BuildRequires:    pulseaudio

diff --git a/src/hal-interface.c b/src/hal-interface.c
index 658a78d6fe5f788020cd618ee27f16e221060070..f7ef78655f00c1c58b02e5723bf3ae2c25916424 100644 (file)
--- a/src/hal-interface.c
+++ b/src/hal-interface.c
@@ -24,7 +24,7 @@
 #endif
 
 #include "hal-interface.h"
-#include "tizen-audio.h"
+#include <tizen-audio.h>
 #include <pulsecore/shared.h>
 
 #define SHARED_HAL_INTF "tizen-hal-interface"

diff --git a/src/tizen-audio.h b/src/tizen-audio.h
deleted file mode 100644 (file)
index 6c52e71..0000000
--- a/src/tizen-audio.h
+++ /dev/null
@@ -1,139 +0,0 @@
-#ifndef foopulsetizenaudiofoo
-#define foopulsetizenaudiofoo
-
-/***
-  This file is part of PulseAudio.
-
-  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.
-***/
-
-#include <stdint.h>
-
-/* Error code */
-#define AUDIO_IS_ERROR(ret)             (ret < 0)
-typedef enum audio_return {
-    AUDIO_RET_OK                        = 0,
-    AUDIO_ERR_UNDEFINED                 = (int32_t)0x80001000,
-    AUDIO_ERR_RESOURCE                  = (int32_t)0x80001001,
-    AUDIO_ERR_PARAMETER                 = (int32_t)0x80001002,
-    AUDIO_ERR_IOCTL                     = (int32_t)0x80001003,
-    AUDIO_ERR_INVALID_STATE             = (int32_t)0x80001004,
-    AUDIO_ERR_INTERNAL                  = (int32_t)0x80001005,
-
-    AUDIO_ERR_NOT_IMPLEMENTED           = (int32_t)0x80001100,
-} audio_return_t ;
-
-typedef enum audio_direction {
-    AUDIO_DIRECTION_IN,                 /**< Capture */
-    AUDIO_DIRECTION_OUT,                /**< Playback */
-} audio_direction_t;
-
-typedef struct device_info {
-    const char *type;
-    uint32_t direction;
-    uint32_t id;
-} device_info_t;
-
-typedef struct audio_volume_info {
-    const char *type;
-    const char *gain;
-    uint32_t direction;
-} audio_volume_info_t ;
-
-typedef struct audio_route_info {
-    const char *role;
-    device_info_t *device_infos;
-    uint32_t num_of_devices;
-} audio_route_info_t;
-
-typedef struct audio_route_option {
-    const char *role;
-    const char *name;
-    int32_t value;
-} audio_route_option_t;
-
-typedef struct audio_stream_info {
-    const char *role;
-    uint32_t direction;
-    uint32_t idx;
-} audio_stream_info_t ;
-
-typedef void (*message_cb)(const char *name, int value, void *user_data);
-
-/* Overall */
-typedef struct audio_interface {
-    /* Initialization & de-initialization */
-    audio_return_t (*init)(void **audio_handle);
-    audio_return_t (*deinit)(void *audio_handle);
-    /* Volume */
-    audio_return_t (*get_volume_level_max)(void *audio_handle, audio_volume_info_t *info, uint32_t *level);
-    audio_return_t (*get_volume_level)(void *audio_handle, audio_volume_info_t *info, uint32_t *level);
-    audio_return_t (*set_volume_level)(void *audio_handle, audio_volume_info_t *info, uint32_t level);
-    audio_return_t (*get_volume_value)(void *audio_handle, audio_volume_info_t *info, uint32_t level, double *value);
-    audio_return_t (*get_volume_mute)(void *audio_handle, audio_volume_info_t *info, uint32_t *mute);
-    audio_return_t (*set_volume_mute)(void *audio_handle, audio_volume_info_t *info, uint32_t mute);
-    /* Routing */
-    audio_return_t (*update_route)(void *audio_handle, audio_route_info_t *info);
-    audio_return_t (*update_route_option)(void *audio_handle, audio_route_option_t *option);
-    /* Stream */
-    audio_return_t (*notify_stream_connection_changed)(void *audio_handle, audio_stream_info_t *info, uint32_t is_connected);
-    /* Buffer attribute */
-    audio_return_t (*get_buffer_attr)(void *audio_handle, uint32_t direction, const char *latency, uint32_t samplerate, int format, uint32_t channels,
-                                      uint32_t *maxlength, uint32_t *tlength, uint32_t *prebuf, uint32_t* minreq, uint32_t *fragsize);
-    /* PCM device */
-    audio_return_t (*pcm_open)(void *audio_handle, void **pcm_handle, uint32_t direction, void *sample_spec, uint32_t period_size, uint32_t periods);
-    audio_return_t (*pcm_start)(void *audio_handle, void *pcm_handle);
-    audio_return_t (*pcm_stop)(void *audio_handle, void *pcm_handle);
-    audio_return_t (*pcm_close)(void *audio_handle, void *pcm_handle);
-    audio_return_t (*pcm_avail)(void *audio_handle, void *pcm_handle, uint32_t *avail);
-    audio_return_t (*pcm_write)(void *audio_handle, void *pcm_handle, const void *buffer, uint32_t frames);
-    audio_return_t (*pcm_read)(void *audio_handle, void *pcm_handle, void *buffer, uint32_t frames);
-    audio_return_t (*pcm_get_fd)(void *audio_handle, void *pcm_handle, int *fd);
-    audio_return_t (*pcm_recover)(void *audio_handle, void *pcm_handle, int revents);
-    audio_return_t (*pcm_get_params)(void *audio_handle, void *pcm_handle, uint32_t direction, void **sample_spec, uint32_t *period_size, uint32_t *periods);
-    audio_return_t (*pcm_set_params)(void *audio_handle, void *pcm_handle, uint32_t direction, void *sample_spec, uint32_t period_size, uint32_t periods);
-    /* Message callback (optional) */
-    audio_return_t (*add_message_cb)(void *audio_handle, message_cb callback, void *user_data);
-    audio_return_t (*remove_message_cb)(void *audio_handle, message_cb callback);
-} audio_interface_t;
-
-audio_return_t audio_init(void **audio_handle);
-audio_return_t audio_deinit(void *audio_handle);
-audio_return_t audio_get_volume_level_max(void *audio_handle, audio_volume_info_t *info, uint32_t *level);
-audio_return_t audio_get_volume_level(void *audio_handle, audio_volume_info_t *info, uint32_t *level);
-audio_return_t audio_set_volume_level(void *audio_handle, audio_volume_info_t *info, uint32_t level);
-audio_return_t audio_get_volume_value(void *audio_handle, audio_volume_info_t *info, uint32_t level, double *value);
-audio_return_t audio_get_volume_mute(void *audio_handle, audio_volume_info_t *info, uint32_t *mute);
-audio_return_t audio_set_volume_mute(void *audio_handle, audio_volume_info_t *info, uint32_t mute);
-audio_return_t audio_update_route(void *audio_handle, audio_route_info_t *info);
-audio_return_t audio_update_route_option(void *audio_handle, audio_route_option_t *option);
-audio_return_t audio_notify_stream_connection_changed(void *audio_handle, audio_stream_info_t *info, uint32_t is_connected);
-audio_return_t audio_get_buffer_attr(void *audio_handle, uint32_t direction, const char *latency, uint32_t samplerate, int format, uint32_t channels,
-                                     uint32_t *maxlength, uint32_t *tlength, uint32_t *prebuf, uint32_t* minreq, uint32_t *fragsize);
-audio_return_t audio_pcm_open(void *audio_handle, void **pcm_handle, uint32_t direction, void *sample_spec, uint32_t period_size, uint32_t periods);
-audio_return_t audio_pcm_start(void *audio_handle, void *pcm_handle);
-audio_return_t audio_pcm_stop(void *audio_handle, void *pcm_handle);
-audio_return_t audio_pcm_close(void *audio_handle, void *pcm_handle);
-audio_return_t audio_pcm_avail(void *audio_handle, void *pcm_handle, uint32_t *avail);
-audio_return_t audio_pcm_write(void *audio_handle, void *pcm_handle, const void *buffer, uint32_t frames);
-audio_return_t audio_pcm_read(void *audio_handle, void *pcm_handle, void *buffer, uint32_t frames);
-audio_return_t audio_pcm_get_fd(void *audio_handle, void *pcm_handle, int *fd);
-audio_return_t audio_pcm_recover(void *audio_handle, void *pcm_handle, int revents);
-audio_return_t audio_pcm_get_params(void *audio_handle, void *pcm_handle, uint32_t direction, void **sample_spec, uint32_t *period_size, uint32_t *periods);
-audio_return_t audio_pcm_set_params(void *audio_handle, void *pcm_handle, uint32_t direction, void *sample_spec, uint32_t period_size, uint32_t periods);
-audio_return_t audio_add_message_cb(void *audio_handle, message_cb callback, void *user_data);
-audio_return_t audio_remove_message_cb(void *audio_handle, message_cb callback);
-#endif