From 0ca821af8b3cc1c81d7d306737d6b25a96b5dfd3 Mon Sep 17 00:00:00 2001
From: KimJeongYeon <jeongyeon.kim@samsung.com>
Date: Thu, 30 Jul 2015 17:02:15 +0900
Subject: [PATCH] audio-io changed latency type to string

[Version] 0.3.11
[Profile] Common
[Issue Type] Features
[Dependency module] NA
[Dependency commit] NA
[Comment]

Signed-off-by: KimJeongYeon <jeongyeon.kim@samsung.com>
Change-Id: Iec1d205888b1fc5322efe6460c2abfa3a416d50d
---
 CMakeLists.txt                     |  1 +
 include/CPulseStreamSpec.h         |  1 +
 packaging/capi-media-audio-io.spec |  2 +-
 src/cpp/CPulseAudioClient.cpp      |  6 ++----
 src/cpp/CPulseAudioVolume.cpp      |  2 +-
 src/cpp/CPulseStreamSpec.cpp       | 37 +++++++++++++++++++++++++++++++++++--
 6 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af36fad..c14c67e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,6 +31,7 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DTIZEN_DEBUG")
+#ADD_DEFINITIONS("-D_AUDIO_IO_DEBUG_TIMING_")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
 
diff --git a/include/CPulseStreamSpec.h b/include/CPulseStreamSpec.h
index ca3bcec..131ecdc 100644
--- a/include/CPulseStreamSpec.h
+++ b/include/CPulseStreamSpec.h
@@ -65,6 +65,7 @@ namespace tizen_media_audio {
 
         /* Setter & Getter */
         EStreamLatency getStreamLatency();
+        const char*    getStreamLatencyToString();
         CAudioInfo     getAudioInfo();
         pa_sample_spec getSampleSpec();
         pa_channel_map getChannelMap();
diff --git a/packaging/capi-media-audio-io.spec b/packaging/capi-media-audio-io.spec
index fb81cf8..8c4d24e 100644
--- a/packaging/capi-media-audio-io.spec
+++ b/packaging/capi-media-audio-io.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-audio-io
 Summary:    An Audio Input & Audio Output library in Tizen Native API
-Version:    0.3.10
+Version:    0.3.11
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
diff --git a/src/cpp/CPulseAudioClient.cpp b/src/cpp/CPulseAudioClient.cpp
index c301802..ae8e4e8 100644
--- a/src/cpp/CPulseAudioClient.cpp
+++ b/src/cpp/CPulseAudioClient.cpp
@@ -180,10 +180,8 @@ void CPulseAudioClient::initialize() throw (CAudioError) {
         }
 
         // Adds latency on proplist for delivery to PULSEAUDIO
-        CPulseStreamSpec::EStreamLatency latency = mSpec.getStreamLatency();
-        AUDIO_IO_LOGD("LATENCY : %d", latency);
-
-        pa_proplist_setf(mpPropList, PA_PROP_MEDIA_TIZEN_AUDIO_LATENCY, "%d", latency);
+        AUDIO_IO_LOGD("LATENCY : %s(%d)", mSpec.getStreamLatencyToString(), mSpec.getStreamLatency());
+        pa_proplist_setf(mpPropList, PA_PROP_MEDIA_TIZEN_AUDIO_LATENCY, "%s", mSpec.getStreamLatencyToString());
 
         // Allocates PA mainloop
         mpMainloop = pa_threaded_mainloop_new();
diff --git a/src/cpp/CPulseAudioVolume.cpp b/src/cpp/CPulseAudioVolume.cpp
index 1a5743d..a8467c2 100644
--- a/src/cpp/CPulseAudioVolume.cpp
+++ b/src/cpp/CPulseAudioVolume.cpp
@@ -26,7 +26,7 @@ using namespace tizen_media_audio;
 /**
  * class CPulseAudioVolume
  */
-CPulseAudioVolume/::CPulseAudioVolume() : mVolume(VOLUME_MEDIA), mVolumeGain(VOLUME_GAIN_DEFAULT) {
+CPulseAudioVolume::CPulseAudioVolume() : mVolume(VOLUME_MEDIA), mVolumeGain(VOLUME_GAIN_DEFAULT) {
 }
 
 CPulseAudioVolume::CPulseAudioVolume(EVolume volume, EVolumeGain gain) :
diff --git a/src/cpp/CPulseStreamSpec.cpp b/src/cpp/CPulseStreamSpec.cpp
index 8a38acf..d2ab34c 100644
--- a/src/cpp/CPulseStreamSpec.cpp
+++ b/src/cpp/CPulseStreamSpec.cpp
@@ -32,6 +32,11 @@ static const char* STREAM_NAME_OUTPUT_LOW_LATENCY  = "LOW LATENCY PLAYBACK";
 static const char* STREAM_NAME_OUTPUT_HIGH_LATENCY = "HIGH LATENCY PLAYBACK";
 static const char* STREAM_NAME_OUTPUT_VOIP         = "VOIP PLAYBACK";
 
+static const char* STREAM_LATENCY_LOW  = "low";
+static const char* STREAM_LATENCY_MID  = "mid";
+static const char* STREAM_LATENCY_HIGH = "high";
+static const char* STREAM_LATENCY_VOIP = "voip";
+
 
 CPulseStreamSpec::CPulseStreamSpec() throw (CAudioError) :
     mLatency(STREAM_LATENCY_INPUT_MID),
@@ -102,8 +107,8 @@ void CPulseStreamSpec::_adjustSpec() throw (CAudioError) {
         break;
 
     case STREAM_LATENCY_OUTPUT_VOIP:
-         mStreamName = STREAM_NAME_OUTPUT_VOIP;
-         break;
+        mStreamName = STREAM_NAME_OUTPUT_VOIP;
+        break;
 
     case STREAM_LATENCY_INPUT_HIGH:
         mStreamName = STREAM_NAME_INPUT_HIGH_LATENCY;
@@ -128,6 +133,34 @@ CPulseStreamSpec::EStreamLatency CPulseStreamSpec::getStreamLatency() {
     return mLatency;
 }
 
+const char* CPulseStreamSpec::getStreamLatencyToString() {
+    const char* latency;
+
+    switch (mLatency) {
+    case STREAM_LATENCY_INPUT_LOW:
+    case STREAM_LATENCY_OUTPUT_LOW:
+        latency = STREAM_LATENCY_LOW;
+        break;
+    case STREAM_LATENCY_INPUT_MID:
+    case STREAM_LATENCY_OUTPUT_MID:
+        latency = STREAM_LATENCY_MID;
+        break;
+    case STREAM_LATENCY_INPUT_HIGH:
+    case STREAM_LATENCY_OUTPUT_HIGH:
+        latency = STREAM_LATENCY_HIGH;
+        break;
+    case STREAM_LATENCY_INPUT_VOIP:
+    case STREAM_LATENCY_OUTPUT_VOIP:
+        latency = STREAM_LATENCY_VOIP;
+        break;
+    default:
+        latency = STREAM_LATENCY_MID;
+        break;
+    }
+
+    return latency;
+}
+
 CAudioInfo CPulseStreamSpec::getAudioInfo() {
     return mAudioInfo;
 }
-- 
2.7.4