Merge branch 'tizen' into tizen_line_coverage

Change-Id: I35670c14b02e01718d77f9c60f8d60d9eb6a5d61

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00bbf88..297c610 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(INC_DIR include)
 INCLUDE_DIRECTORIES(${INC_DIR})
 
-SET(dependents "dlog mm-sound capi-base-common capi-media-sound-manager mm-common libpulse dpm capi-system-info")
+SET(dependents "dlog capi-base-common capi-media-sound-manager libpulse dpm capi-system-info")
 SET(pc_dependents "capi-base-common capi-media-sound-manager")
 
 INCLUDE(FindPkgConfig)

diff --git a/packaging/capi-media-audio-io.spec b/packaging/capi-media-audio-io.spec
index 28484c7..742b39c 100644 (file)
--- 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.5.10
+Version:        0.5.11
 Release:        0
 Group:          Multimedia/API
 License:        Apache-2.0
@@ -8,9 +8,6 @@ Source0:        %{name}-%{version}.tar.gz
 Source1001:     capi-media-audio-io.manifest
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(mm-common)
-BuildRequires:  pkgconfig(mm-session)
-BuildRequires:  pkgconfig(mm-sound)
 BuildRequires:  pkgconfig(capi-media-sound-manager)
 BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires:  pkgconfig(libpulse)

diff --git a/src/audio_io.c b/src/audio_io.c
index 7a5d1d0..af5ebb3 100644 (file)
--- a/src/audio_io.c
+++ b/src/audio_io.c
@@ -15,7 +15,6 @@
 */
 
 
-#include <mm.h>
 #include <cpp_audio_io.h>
 #include <dlog.h>
 

diff --git a/src/cpp/CAudioIO.cpp b/src/cpp/CAudioIO.cpp
index e8b6ab7..93e192f 100644 (file)
--- a/src/cpp/CAudioIO.cpp
+++ b/src/cpp/CAudioIO.cpp
@@ -15,7 +15,6 @@
  */
 
 
-#include <mm.h>
 #include <pthread.h>
 #include <assert.h>
 #include "CAudioIODef.h"

diff --git a/src/cpp/CPulseAudioClient.cpp b/src/cpp/CPulseAudioClient.cpp
index 2cf9209..19201ef 100644 (file)
--- a/src/cpp/CPulseAudioClient.cpp
+++ b/src/cpp/CPulseAudioClient.cpp
@@ -15,7 +15,6 @@
  */
 
 
-#include <mm.h>
 #include "CAudioIODef.h"
 #include <unistd.h>
 #include <inttypes.h>