From: Volodymyr Brynza Date: Thu, 28 Sep 2017 07:19:41 +0000 (+0300) Subject: Remove unused function and file X-Git-Tag: submit/tizen_4.0/20170929.104638~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0affcd0a506c02c7c65ed35b5da8ef8a8df2828f;p=platform%2Fcore%2Fapi%2Fmediastreamer.git Remove unused function and file Change-Id: I6537488b937bc2c242fd03c483830646a9b11a7b Signed-off-by: Volodymyr Brynza (cherry picked from commit 3d9c36f2ea7017774e8b10f581eac583a9de9a2d) --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a05d39..649690e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,8 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(INC_DIR include) INCLUDE_DIRECTORIES(${INC_DIR}) -SET(dependents "dlog glib-2.0 mm-common capi-media-tool iniparser bundle libtbm gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-app-1.0 gstreamer-video-1.0 cynara-client capi-system-info ecore elementary murphy-resource murphy-glib dpm capi-network-connection capi-content-mime-type libsoup-2.4") -SET(pc_dependents "capi-base-common capi-media-tool gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-app-1.0 gstreamer-video-1.0 cynara-client capi-system-info ecore evas elementary murphy-resource murphy-glib dpm capi-system-info capi-network-connection capi-content-mime-type libsoup-2.4") +SET(dependents "dlog glib-2.0 mm-common capi-media-tool iniparser bundle libtbm gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-app-1.0 gstreamer-video-1.0 cynara-client capi-system-info ecore elementary murphy-resource murphy-glib dpm capi-content-mime-type libsoup-2.4") +SET(pc_dependents "capi-base-common capi-media-tool gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-app-1.0 gstreamer-video-1.0 cynara-client capi-system-info ecore evas elementary murphy-resource murphy-glib dpm capi-system-info capi-content-mime-type libsoup-2.4") INCLUDE(FindPkgConfig) pkg_check_modules(${fw_name} REQUIRED ${dependents}) diff --git a/include/media_streamer_net_util.h b/include/media_streamer_net_util.h deleted file mode 100644 index 76f72e9..0000000 --- a/include/media_streamer_net_util.h +++ /dev/null @@ -1,31 +0,0 @@ - -/* - * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef __MEDIA_STREAMER_NET_UTIL_H__ -#define __MEDIA_STREAMER_NET_UTIL_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -int __ms_get_local_network_address(char **ip_address); - -#ifdef __cplusplus -} -#endif - -#endif /* __MEDIA_STREAMER_NET_UTIL_H__ */ diff --git a/packaging/capi-media-streamer.spec b/packaging/capi-media-streamer.spec index 5a5793b..bae1aab 100644 --- a/packaging/capi-media-streamer.spec +++ b/packaging/capi-media-streamer.spec @@ -32,7 +32,6 @@ BuildRequires: pkgconfig(appcore-efl) BuildRequires: pkgconfig(murphy-resource) BuildRequires: pkgconfig(murphy-glib) BuildRequires: pkgconfig(dpm) -BuildRequires: pkgconfig(capi-network-connection) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(capi-content-mime-type) diff --git a/src/media_streamer_http_server.c b/src/media_streamer_http_server.c index 5d35bc2..fa60577 100644 --- a/src/media_streamer_http_server.c +++ b/src/media_streamer_http_server.c @@ -24,7 +24,6 @@ #include #include -#include #include diff --git a/src/media_streamer_net_util.c b/src/media_streamer_net_util.c deleted file mode 100644 index 71a92e0..0000000 --- a/src/media_streamer_net_util.c +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include - -#include - -int __ms_get_local_network_address(char **ip_address) -{ - connection_h conn = NULL; - connection_type_e conn_type = CONNECTION_TYPE_DISCONNECTED; - - if (CONNECTION_ERROR_NONE != connection_create(&conn)) { - ms_error("Failed to create connection"); - return MEDIA_STREAMER_ERROR_INVALID_OPERATION; - } - - if (CONNECTION_ERROR_NONE != connection_get_type(conn, &conn_type)) { - ms_error("Failed to acquire connection type"); - return MEDIA_STREAMER_ERROR_INVALID_OPERATION; - } - - if (conn_type != CONNECTION_TYPE_WIFI) { - ms_error("Wrong connection type"); - return MEDIA_STREAMER_ERROR_INVALID_OPERATION; - } - - if (CONNECTION_ERROR_NONE != connection_get_ip_address(conn, CONNECTION_ADDRESS_FAMILY_IPV4, ip_address)) { - ms_error("Failed to acquire connection ip address"); - return MEDIA_STREAMER_ERROR_INVALID_OPERATION; - } - - return MEDIA_STREAMER_ERROR_NONE; -} diff --git a/src/media_streamer_node.c b/src/media_streamer_node.c index bbeba0c..1c5a0fb 100644 --- a/src/media_streamer_node.c +++ b/src/media_streamer_node.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include