Set 'display_type' except tv profile

Change-Id: Ibc4c15948263eaa288dd7702d17c8ec689d5ff20
Signed-off-by: Hyunsoo Park <hance.park@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ac91fd220aabc1f792dca41096d2dc43ba84aff..d7a11dcbc26e332820588bd8790755ef81636d42 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,10 @@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DTIZEN_DEBUG")
 ADD_DEFINITIONS("-D_FILE_OFFSET_BITS=64")
 
+IF(TIZEN_FEATURE_MM_DISPLAY_TYPE)
+ADD_DEFINITIONS("-DUSE_DISPLAY_TYPE")
+ENDIF(TIZEN_FEATURE_MM_DISPLAY_TYPE)
+
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/${LIB_INSTALL_DIR}")
 
 aux_source_directory(src SOURCES)

diff --git a/packaging/capi-media-screen-mirroring.spec b/packaging/capi-media-screen-mirroring.spec
index d3b54e4711fa00c18e6239a655fcf2321d47ca37..e6964f134c82ad7db6916b6d17845fb85561be82 100644 (file)
--- a/packaging/capi-media-screen-mirroring.spec
+++ b/packaging/capi-media-screen-mirroring.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-screen-mirroring
 Summary:    A screen mirroring library in Tizen C API
-Version:    0.2.24
+Version:    0.2.25
 Release:    1
 Group:      Multimedia/API
 License:    Apache-2.0
@@ -76,12 +76,18 @@ export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
 export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
 export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 %endif
+
 %cmake . \
          -DFULLVER=%{version} \
          -DMAJORVER=${MAJORVER} \
          -DTZ_SYS_BIN=%TZ_SYS_BIN \
          -DTZ_SYS_RO_SHARE=%TZ_SYS_RO_SHARE \
-         -DTZ_SYS_RO_ETC=%TZ_SYS_RO_ETC
+         -DTZ_SYS_RO_ETC=%TZ_SYS_RO_ETC \
+%if "%{tizen_profile_name}" == "tv"
+  -DTIZEN_FEATURE_MM_DISPLAY_TYPE=NO
+%else
+  -DTIZEN_FEATURE_MM_DISPLAY_TYPE=YES
+%endif
 
 make %{?jobs:-j%jobs}
 

diff --git a/src/scmirroring_util.c b/src/scmirroring_util.c
index 7146b74affe6ee1cc2b0e2ac133a5f68ecd3ccec..f66897f6a78b72c8bd000645ba4d1830b8463b48 100644 (file)
--- a/src/scmirroring_util.c
+++ b/src/scmirroring_util.c
@@ -196,11 +196,13 @@ int _scmirroring_sink_set_display(MMHandleType handle, scmirroring_display_type_
                return _scmirroring_error_convert(__func__, ret);
        }
 
+#ifdef USE_DISPLAY_TYPE
        ret = mm_wfd_sink_set_attribute(handle, NULL, "display_type", display_type, NULL);
        if (ret != MM_ERROR_NONE) {
                scmirroring_error("Fail to Set Display Type");
                return _scmirroring_error_convert(__func__, ret);
        }
+#endif
 
        ret = mm_wfd_sink_set_attribute(handle, NULL, "display_surface_type", type, NULL);
        if (ret != MM_ERROR_NONE) {