Remove audio-io dependency

[Version] 0.3.3
[Profile] Common
[Issue Type] Update
[Dependency module] N/A

Change-Id: I4a807e06db46feda1a4775e040886502462c45ba
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/legacy/CMakeLists.txt b/legacy/CMakeLists.txt
index efba09ef963542ccbf965f1510b12a4fe31f28b9..ea00465596167ab31b4d5a222e2cb514f43bf2b0 100644 (file)
--- a/legacy/CMakeLists.txt
+++ b/legacy/CMakeLists.txt
@@ -5,10 +5,8 @@ SET(submodule "recorder")
 
 # for package file
 SET(dependents "dlog mm-camcorder legacy-camera")
-SET(dependents2 "capi-media-audio-io")
 
 SET(fw_name "${service}-${submodule}")
-SET(fw_name2 "only_cflags")
 
 PROJECT(${fw_name})
 
@@ -23,10 +21,6 @@ pkg_check_modules(${fw_name} REQUIRED ${dependents})
 FOREACH(flag ${${fw_name}_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
-pkg_check_modules(${fw_name2} REQUIRED ${dependents2})
-FOREACH(flag2 ${${fw_name2}_CFLAGS})
-    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag2}")
-ENDFOREACH(flag2)
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Wextra -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")

diff --git a/legacy/include/legacy_recorder.h b/legacy/include/legacy_recorder.h
index 1be06e3405ad7a92217c4e92871a9af0fe86f4bd..ed033a104f7a66bf0eefd97a79046f1d7a7448ca 100644 (file)
--- a/legacy/include/legacy_recorder.h
+++ b/legacy/include/legacy_recorder.h
@@ -18,7 +18,6 @@
 #define __TIZEN_MULTIMEDIA_RECORDER_H__
 #include <tizen.h>
 #include <legacy_camera.h>
-#include <audio_io.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -177,6 +176,17 @@ typedef enum {
        RECORDER_DEVICE_STATE_PAUSED        /**< All recordings are paused */
 } recorder_device_state_e;
 
+
+/**
+ * @brief Enumeration for recorder sample type with bit depth.
+ * @since_tizen 4.0
+ */
+typedef enum {
+       RECORDER_SAMPLE_TYPE_U8 = 0x70,    /**< Unsigned 8-bit audio samples */
+       RECORDER_SAMPLE_TYPE_S16_LE        /**< Signed 16-bit audio samples */
+} recorder_sample_type_e;
+
+
 /**
  * @}
 */
@@ -267,7 +277,7 @@ typedef void (*recorder_interrupt_started_cb)(recorder_policy_e policy, recorder
  * @param[in] user_data The user data passed from the callback registration function
  * @see legacy_recorder_set_audio_stream_cb()
  */
-typedef void (*recorder_audio_stream_cb)(void *stream, int size, audio_sample_type_e format, int channel, unsigned int timestamp, void *user_data);
+typedef void (*recorder_audio_stream_cb)(void *stream, int size, recorder_sample_type_e format, int channel, unsigned int timestamp, void *user_data);
 
 /**
  * @brief Called when muxed stream data was being delivered just before storing in the recorded file.

diff --git a/legacy/src/legacy_recorder.c b/legacy/src/legacy_recorder.c
index 89777e2a4abe8e171b0bfe8a9460631d12e70db8..fbd90a930362af22fae87ec8233ea84565a23673 100644 (file)
--- a/legacy/src/legacy_recorder.c
+++ b/legacy/src/legacy_recorder.c
@@ -409,7 +409,7 @@ static int __mm_recorder_msg_cb(int message, void *param, void *user_data)
 static int __mm_audio_stream_cb(MMCamcorderAudioStreamDataType *stream, void *user_param)
 {
        recorder_s *handle = NULL;
-       audio_sample_type_e format = AUDIO_SAMPLE_TYPE_U8;
+       recorder_sample_type_e format = RECORDER_SAMPLE_TYPE_U8;
        int type = _RECORDER_EVENT_TYPE_AUDIO_STREAM;
 
        if (!user_param || !stream) {
@@ -420,7 +420,7 @@ static int __mm_audio_stream_cb(MMCamcorderAudioStreamDataType *stream, void *us
        handle = (recorder_s *)user_param;
 
        if (stream->format == MM_CAMCORDER_AUDIO_FORMAT_PCM_S16_LE)
-               format = AUDIO_SAMPLE_TYPE_S16_LE;
+               format = RECORDER_SAMPLE_TYPE_S16_LE;
 
        if (handle->user_cb[type]) {
                ((recorder_audio_stream_cb)(handle->user_cb[type]))(stream->data, stream->length, format,

diff --git a/muse/src/muse_recorder_dispatcher.c b/muse/src/muse_recorder_dispatcher.c
index a676d79a70a58103bf051a1f48c72effa61247b3..f43260810a8bb1488cf1efbdea6619db3877c532 100644 (file)
--- a/muse/src/muse_recorder_dispatcher.c
+++ b/muse/src/muse_recorder_dispatcher.c
@@ -261,7 +261,7 @@ void _recorder_disp_error_cb(recorder_error_e error, recorder_state_e current_st
        return;
 }
 
-void _recorder_disp_audio_stream_cb(void* stream, int size, audio_sample_type_e format, int channel, unsigned int timestamp, void *user_data)
+void _recorder_disp_audio_stream_cb(void* stream, int size, recorder_sample_type_e format, int channel, unsigned int timestamp, void *user_data)
 {
        muse_module_h module = (muse_module_h)user_data;
        muse_recorder_handle_s *muse_recorder = NULL;

diff --git a/packaging/mmsvc-recorder.spec b/packaging/mmsvc-recorder.spec
index 4e981984fc0609591b180888bcff97bd2c40587e..ea6fb16cce28823d3512210610b2a5c184d1887f 100644 (file)
--- a/packaging/mmsvc-recorder.spec
+++ b/packaging/mmsvc-recorder.spec
@@ -1,6 +1,6 @@
 Name:       mmsvc-recorder
 Summary:    A Recorder module for muse server
-Version:    0.3.2
+Version:    0.3.3
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0
@@ -15,7 +15,6 @@ BuildRequires:  pkgconfig(legacy-camera)
 BuildRequires:  pkgconfig(mm-common)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(mused)
-BuildRequires:  pkgconfig(capi-media-audio-io)
 
 
 %description