1 files changed, 12 insertions, 9 deletions
diff --git a/src/components/media_manager/CMakeLists.txt b/src/components/media_manager/CMakeLists.txt
index 9a8618fa60..69af6e7841 100644
--- a/src/components/media_manager/CMakeLists.txt
+++ b/src/components/media_manager/CMakeLists.txt
@@ -45,11 +45,14 @@ set(default_sources
     ${COMPONENTS_DIR}/media_manager/src/audio/from_mic_to_file_recorder_thread.cc
     ${COMPONENTS_DIR}/media_manager/src/audio/socket_audio_streamer_adapter.cc
     ${COMPONENTS_DIR}/media_manager/src/audio/pipe_audio_streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/audio/file_audio_streamer_adapter.cc
     ${COMPONENTS_DIR}/media_manager/src/video/socket_video_streamer_adapter.cc
     ${COMPONENTS_DIR}/media_manager/src/video/pipe_video_streamer_adapter.cc
-    ${COMPONENTS_DIR}/media_manager/src/video/video_stream_to_file_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/video/file_video_streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/streamer_adapter.cc
     ${COMPONENTS_DIR}/media_manager/src/pipe_streamer_adapter.cc
     ${COMPONENTS_DIR}/media_manager/src/socket_streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/file_streamer_adapter.cc
 )
 set(LIBRARIES
     ${GSTREAMER_gstreamer_LIBRARY}
@@ -60,17 +63,18 @@ set(LIBRARIES
     glib-2.0
 )
 else(EXTENDED_MEDIA_MODE)
-set(default_includes
-)
+
 set(default_sources
-    ${COMPONENTS_DIR}/media_manager/src/video/video_stream_to_file_adapter.cc
     ${COMPONENTS_DIR}/media_manager/src/audio/socket_audio_streamer_adapter.cc
     ${COMPONENTS_DIR}/media_manager/src/audio/pipe_audio_streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/audio/file_audio_streamer_adapter.cc
     ${COMPONENTS_DIR}/media_manager/src/video/socket_video_streamer_adapter.cc
     ${COMPONENTS_DIR}/media_manager/src/video/pipe_video_streamer_adapter.cc
-    ${COMPONENTS_DIR}/media_manager/src/video/video_stream_to_file_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/video/file_video_streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/streamer_adapter.cc
     ${COMPONENTS_DIR}/media_manager/src/pipe_streamer_adapter.cc
     ${COMPONENTS_DIR}/media_manager/src/socket_streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/file_streamer_adapter.cc
 )
 set(LIBRARIES
     ProtocolLibrary
@@ -91,9 +95,7 @@ include_directories (
     ${COMPONENTS_DIR}/config_profile/include/
     ${JSONCPP_INCLUDE_DIRECTORY}
     ${CMAKE_BINARY_DIR}/src/components/
-    ${CMAKE_SOURCE_DIR}/src/components/policy/src/policy/include/
-    ${CMAKE_SOURCE_DIR}/src/components/policy/src/policy/usage_statistics/include/
-    ${default_includes}
+    ${COMPONENTS_DIR}/policy/include/
     ${LOG4CXX_INCLUDE_DIRECTORY}
 )
 
@@ -109,5 +111,6 @@ add_library("MediaManager" ${SOURCES} ${default_sources})
 target_link_libraries("MediaManager" ${LIBRARIES})
 
 if(BUILD_TESTS)
-    add_subdirectory(test)
+  add_subdirectory(test)
 endif()
+