Merging code from tizen_3.0 branch

Change-Id: I762ed16774d9155d4f95b4591f4702cd7c03e547
Signed-off-by: Rahul Dadhich <r.dadhich@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7a12b4..f8c5d64 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,7 +100,6 @@ pkg_check_modules(pkgs REQUIRED
        capi-telephony
        capi-appfw-preference
        libtzplatform-config
-       capi-network-wifi-manager
 )
 
 FOREACH(flag ${pkgs_CFLAGS})

diff --git a/common/src/vp-media-content-util.c b/common/src/vp-media-content-util.c
index 0e9adc3..0b2c440 100644 (file)
--- a/common/src/vp-media-content-util.c
+++ b/common/src/vp-media-content-util.c
@@ -16,8 +16,6 @@
 
 #include "vp-db-common.h"
 
-#include "vp-media-content-util.h"
-
 
 
 /* callback functions */

diff --git a/common/src/vp-util.c b/common/src/vp-util.c
index 6c58ff4..57fc67d 100644 (file)
--- a/common/src/vp-util.c
+++ b/common/src/vp-util.c
@@ -15,8 +15,6 @@
  */
 
 #include <glib.h>
-#include <string.h>
-#include <libintl.h>
 #include <device/power.h>
 #include <storage/storage.h>
 

diff --git a/feature/src/vp-feature-util.c b/feature/src/vp-feature-util.c
index 0ecc8d7..61705a1 100644 (file)
--- a/feature/src/vp-feature-util.c
+++ b/feature/src/vp-feature-util.c
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 #include "vp-feature-common.h"
-#include "vp-feature-util.h"
 
 
 bool vp_feature_util_calc_aspect_size(int nSrcW, int nSrcH, int nDestW,

diff --git a/packaging/org.tizen.videos.spec b/packaging/org.tizen.videos.spec
index 4b7b575..951c80c 100644 (file)
--- a/packaging/org.tizen.videos.spec
+++ b/packaging/org.tizen.videos.spec
@@ -35,6 +35,7 @@ BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(capi-system-runtime-info)
 BuildRequires: pkgconfig(capi-network-wifi)
 BuildRequires: pkgconfig(capi-network-wifi-direct)
+BuildRequires: pkgconfig(capi-network-wifi-manager)
 BuildRequires: boost-devel
 BuildRequires: boost-thread
 BuildRequires: boost-system
@@ -61,7 +62,6 @@ BuildRequires: pkgconfig(tapi)
 BuildRequires: pkgconfig(efl-extension)
 BuildRequires: pkgconfig(capi-telephony)
 BuildRequires: pkgconfig(libtzplatform-config)
-BuildRequires: pkgconfig(capi-network-wifi-manager)
 
 %description
 video library

diff --git a/playview/CMakeLists.txt b/playview/CMakeLists.txt
index 01bba27..4e31b65 100755 (executable)
--- a/playview/CMakeLists.txt
+++ b/playview/CMakeLists.txt
@@ -93,6 +93,7 @@ pkg_check_modules(${PROJECT_NAME}_pkgs REQUIRED
        capi-appfw-preference
        capi-media-player
        capi-media-image-util
+       capi-network-wifi-manager
        capi-network-wifi-direct
        capi-system-media-key
        capi-content-media-content
@@ -117,7 +118,6 @@ pkg_check_modules(${PROJECT_NAME}_pkgs REQUIRED
        capi-network-wifi
        efl-extension
        capi-telephony
-       capi-network-wifi-manager
 )
 
 FOREACH(flag ${${PROJECT_NAME}_pkgs_CFLAGS})

diff --git a/playview/src/common/vp-play-config.c b/playview/src/common/vp-play-config.c
index c72cbcf..f79560b 100644 (file)
--- a/playview/src/common/vp-play-config.c
+++ b/playview/src/common/vp-play-config.c
@@ -13,20 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <system_settings.h>
-#include <runtime_info.h>
 #include <app_preference.h>
 #include <telephony.h>
 #include <wifi-direct.h>
-#include <wifi-manager.h>
 #include <device/display.h>
 #include "vp-play-config.h"
-#include "vp-mm-player.h"
 
 /* check temp */
 #include "vp-play-log.h"
-#include "vp-play-type-define.h"
-#include "vp-play-view-priv.h"
 #include "vp-play-normal-view.h"
 
 #define PREF_VP_VIDEO_PREVIEW_URL_VIDEOS "preference/org.tizen.videos/preview_url_videos"

diff --git a/playview/src/common/vp-play-ug.c b/playview/src/common/vp-play-ug.c
index 6e0aeb3..83bee6e 100644 (file)
--- a/playview/src/common/vp-play-ug.c
+++ b/playview/src/common/vp-play-ug.c
@@ -14,17 +14,10 @@
  * limitations under the License.
  */
 
-#include <app.h>
-#include <glib.h>
-
 #include "vp-play-macro-define.h"
 #include "vp-play-string-define.h"
 #include "vp-play-value-define.h"
 
-#include "vp-play-util.h"
-
-#include "vp-play-ug.h"
-
 /* check temp */
 #include "vp-play-log.h"
 #include "vp-play-normal-view.h"

diff --git a/playview/src/common/vp-play-util.c b/playview/src/common/vp-play-util.c
index b7daa24..f870b2c 100644 (file)
--- a/playview/src/common/vp-play-util.c
+++ b/playview/src/common/vp-play-util.c
@@ -23,18 +23,10 @@
 #include <app.h>
 #include <app_manager.h>
 #include <glib/gstdio.h>
-#include <metadata_extractor.h>
-#include <storage.h>
 #include <system_settings.h>
 
 #include <sys/statvfs.h>
-#include <unicode/udat.h>
-#include <unicode/ustring.h>
 #include <unicode/uloc.h>
-#include <unicode/ucal.h>
-#include <unicode/udatpg.h>
-#include <unicode/utmscale.h>
-#include <runtime_info.h>
 
 #include "vp-play-type-define.h"
 #include "vp-play-string-define.h"

diff --git a/playview/src/core/vp-avrcp.c b/playview/src/core/vp-avrcp.c
index 9da7f74..0c183d0 100644 (file)
--- a/playview/src/core/vp-avrcp.c
+++ b/playview/src/core/vp-avrcp.c
@@ -17,7 +17,6 @@
 #include <network/bluetooth.h>
 
 #include "vp-play-macro-define.h"
-#include "vp-play-type-define.h"
 #include "vp-play-normal-view.h"
 #include "vp-play-view.h"
 #include "vp-avrcp.h"

diff --git a/playview/src/core/vp-device-language.c b/playview/src/core/vp-device-language.c
index 60c406a..2c15ac0 100644 (file)
--- a/playview/src/core/vp-device-language.c
+++ b/playview/src/core/vp-device-language.c
@@ -14,17 +14,10 @@
  * limitations under the License.
  */
 
-#include <app.h>
 #include <glib.h>
 #include <stdlib.h>
-#include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <Elementary.h>
 
-#include "vp-play-type-define.h"
-#include "vp-play-string-define.h"
-#include "vp-play-value-define.h"
 #include "vp-play-macro-define.h"
 #include "vp-device-language.h"
 

diff --git a/playview/src/core/vp-hollic.c b/playview/src/core/vp-hollic.c
index ef4afde..fad5135 100644 (file)
--- a/playview/src/core/vp-hollic.c
+++ b/playview/src/core/vp-hollic.c
@@ -15,7 +15,6 @@
  */
 
 #include "vp-hollic.h"
-#include "vp-play-macro-define.h"
 #include "vp-play-log.h"
 
 #define OBJECT_PATH                    "/Org/Tizen/System/DeviceD"

diff --git a/playview/src/core/vp-media-contents.c b/playview/src/core/vp-media-contents.c
index 304ca0e..f1c9a63 100644 (file)
--- a/playview/src/core/vp-media-contents.c
+++ b/playview/src/core/vp-media-contents.c
@@ -18,7 +18,6 @@
 
 
 #include "vp-play-type-define.h"
-#include "vp-play-string-define.h"
 #include "vp-play-value-define.h"
 #include "vp-play-macro-define.h"
 

diff --git a/playview/src/core/vp-media-key.c b/playview/src/core/vp-media-key.c
index 549bf52..70924f3 100644 (file)
--- a/playview/src/core/vp-media-key.c
+++ b/playview/src/core/vp-media-key.c
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 #include <media_key.h>
-#include <efl_extension.h>
 
 #include "vp-play-macro-define.h"
 #include "vp-media-key.h"

diff --git a/playview/src/core/vp-mm-player.c b/playview/src/core/vp-mm-player.c
index 8a76122..3279348 100644 (file)
--- a/playview/src/core/vp-mm-player.c
+++ b/playview/src/core/vp-mm-player.c
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <glib.h>
 #include <Ecore.h>
 #include <player.h>
 #include "vp-mm-player.h"
@@ -158,6 +157,7 @@ static int _vp_mm_player_priv_convert_error(int nCode, bool bAppToFW)
                case PLAYER_ERROR_SOUND_POLICY:
                        return VP_MM_PLAYER_ERR_SOUND_POLICY;
                case PLAYER_ERROR_CONNECTION_FAILED:
+               case PLAYER_ERROR_SERVICE_DISCONNECTED:
                        return VP_MM_PLAYER_ERR_CONNECTION_FAILED;
                case PLAYER_ERROR_VIDEO_CAPTURE_FAILED:
                        return VP_MM_PLAYER_ERR_VIDEO_CAPTUR_FAILED;

diff --git a/playview/src/core/vp-multi-path.c b/playview/src/core/vp-multi-path.c
index 6c75b97..8397866 100644 (file)
--- a/playview/src/core/vp-multi-path.c
+++ b/playview/src/core/vp-multi-path.c
@@ -15,9 +15,7 @@
  */
 
 
-#include "vp-play-type-define.h"
 #include "vp-play-string-define.h"
-#include "vp-play-value-define.h"
 #include "vp-play-macro-define.h"
 
 #include "vp-play-util.h"

diff --git a/playview/src/feature/vp-audio-track.c b/playview/src/feature/vp-audio-track.c
index 4472368..6f8f2f7 100644 (file)
--- a/playview/src/feature/vp-audio-track.c
+++ b/playview/src/feature/vp-audio-track.c
@@ -17,7 +17,6 @@
 
 #include "vp-play-string-define.h"
 #include "vp-play-value-define.h"
-#include "vp-play-type-define.h"
 #include "vp-play-macro-define.h"
 
 #include "vp-audio-track.h"

diff --git a/playview/src/feature/vp-capture.c b/playview/src/feature/vp-capture.c
index c6e0844..895771e 100644 (file)
--- a/playview/src/feature/vp-capture.c
+++ b/playview/src/feature/vp-capture.c
@@ -15,7 +15,6 @@
  */
 #include "vp-play-string-define.h"
 #include "vp-play-value-define.h"
-#include "vp-play-type-define.h"
 #include "vp-play-macro-define.h"
 #include "vp-capture.h"
 

diff --git a/playview/src/feature/vp-play-speed.c b/playview/src/feature/vp-play-speed.c
index 7eaa4a6..4eda19b 100644 (file)
--- a/playview/src/feature/vp-play-speed.c
+++ b/playview/src/feature/vp-play-speed.c
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <glib.h>
 
 #include "vp-play-string-define.h"
 #include "vp-play-value-define.h"

diff --git a/playview/src/feature/vp-setting.c b/playview/src/feature/vp-setting.c
index 8285b44..445864b 100644 (file)
--- a/playview/src/feature/vp-setting.c
+++ b/playview/src/feature/vp-setting.c
@@ -24,9 +24,6 @@
 #include "vp-setting.h"
 #include "vp-device-language.h"
 
-#include "vp-play-preference.h"
-#include "vp-device.h"
-
 /* check temp */
 #include "vp-play-log.h"
 

diff --git a/playview/src/feature/vp-subtitle-alignment.c b/playview/src/feature/vp-subtitle-alignment.c
index 16dd97a..fb4f331 100644 (file)
--- a/playview/src/feature/vp-subtitle-alignment.c
+++ b/playview/src/feature/vp-subtitle-alignment.c
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <glib.h>
 
 #include "vp-play-string-define.h"
 #include "vp-play-value-define.h"
@@ -21,7 +20,6 @@
 #include "vp-play-macro-define.h"
 
 #include "vp-subtitle-alignment.h"
-#include "vp-play-button.h"
 
 /* check temp */
 #include "vp-play-log.h"

diff --git a/playview/src/feature/vp-subtitle-bg-color.c b/playview/src/feature/vp-subtitle-bg-color.c
index c83fdf3..0b6b4ef 100644 (file)
--- a/playview/src/feature/vp-subtitle-bg-color.c
+++ b/playview/src/feature/vp-subtitle-bg-color.c
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <glib.h>
 
 #include "vp-play-string-define.h"
 #include "vp-play-value-define.h"

diff --git a/playview/src/feature/vp-subtitle-color.c b/playview/src/feature/vp-subtitle-color.c
index fc798f1..ca161e0 100644 (file)
--- a/playview/src/feature/vp-subtitle-color.c
+++ b/playview/src/feature/vp-subtitle-color.c
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <glib.h>
 
 #include "vp-play-string-define.h"
 #include "vp-play-value-define.h"

diff --git a/playview/src/feature/vp-subtitle-select.c b/playview/src/feature/vp-subtitle-select.c
index eb7f744..9dda094 100644 (file)
--- a/playview/src/feature/vp-subtitle-select.c
+++ b/playview/src/feature/vp-subtitle-select.c
@@ -17,7 +17,6 @@
 
 #include "vp-play-string-define.h"
 #include "vp-play-value-define.h"
-#include "vp-play-type-define.h"
 #include "vp-play-macro-define.h"
 
 #include "vp-subtitle-select.h"

diff --git a/playview/src/feature/vp-subtitle-size.c b/playview/src/feature/vp-subtitle-size.c
index 91fd674..011f100 100644 (file)
--- a/playview/src/feature/vp-subtitle-size.c
+++ b/playview/src/feature/vp-subtitle-size.c
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <glib.h>
 
 #include "vp-play-string-define.h"
 #include "vp-play-value-define.h"

diff --git a/playview/src/feature/vp-subtitle-sync.c b/playview/src/feature/vp-subtitle-sync.c
index 68e4712..95b2378 100644 (file)
--- a/playview/src/feature/vp-subtitle-sync.c
+++ b/playview/src/feature/vp-subtitle-sync.c
@@ -13,15 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <glib.h>
 
 #include "vp-play-string-define.h"
-#include "vp-play-value-define.h"
-#include "vp-play-type-define.h"
 #include "vp-play-macro-define.h"
 
 #include "vp-subtitle-sync.h"
-#include "vp-play-util.h"
 #include "vp-play-button.h"
 
 /* check temp */

diff --git a/playview/src/feature/vp-subtitle-track.c b/playview/src/feature/vp-subtitle-track.c
index 24ec1b3..3b50c45 100644 (file)
--- a/playview/src/feature/vp-subtitle-track.c
+++ b/playview/src/feature/vp-subtitle-track.c
@@ -17,7 +17,6 @@
 
 #include "vp-play-string-define.h"
 #include "vp-play-value-define.h"
-#include "vp-play-type-define.h"
 #include "vp-play-macro-define.h"
 #include "vp-play-util.h"
 #include "vp-subtitle-track.h"

diff --git a/playview/src/feature/vp-subtitle.c b/playview/src/feature/vp-subtitle.c
index 252256f..7ed4892 100644 (file)
--- a/playview/src/feature/vp-subtitle.c
+++ b/playview/src/feature/vp-subtitle.c
@@ -15,7 +15,6 @@
  */
 
 #include <glib.h>
-#include <efl_extension.h>
 
 #include "vp-play-string-define.h"
 #include "vp-play-value-define.h"

diff --git a/playview/src/feature/vp-zoom-guide.c b/playview/src/feature/vp-zoom-guide.c
index 474dc24..455a3b4 100644 (file)
--- a/playview/src/feature/vp-zoom-guide.c
+++ b/playview/src/feature/vp-zoom-guide.c
@@ -13,17 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <glib.h>
 
-#include "vp-play-type-define.h"
 #include "vp-play-string-define.h"
-#include "vp-play-value-define.h"
 #include "vp-play-macro-define.h"
 
 #include "vp-zoom-guide.h"
 
-#include "vp-play-util.h"
-
 /* check temp */
 #include "vp-play-log.h"
 

diff --git a/playview/src/view/vp-play-normal-view.c b/playview/src/view/vp-play-normal-view.c
index a322857..8b052a2 100644 (file)
--- a/playview/src/view/vp-play-normal-view.c
+++ b/playview/src/view/vp-play-normal-view.c
@@ -15,9 +15,6 @@
  */
 
 
-#include <math.h>
-#include <sound_manager.h>
-#include "vp-play-type-define.h"
 #include "vp-play-string-define.h"
 #include "vp-play-value-define.h"
 #include "vp-play-macro-define.h"
@@ -35,14 +32,12 @@
 #include "vp-play-preference.h"
 #include "vp-play-config.h"
 #include "vp-play-util.h"
-#include "vp-play-button.h"
 #include "vp-play-volume.h"
 #include "vp-play-volume-popup.h"
 #include "vp-play-brightness-popup.h"
 #include "vp-play-minicontroller.h"
 #include "vp-play-lockscreenmc.h"
 
-#include "vp-image-util.h"
 #include "vp-media-contents.h"
 
 #include "vp-share.h"

diff --git a/playview/src/vp-play-view.c b/playview/src/vp-play-view.c
index 673b5ff..7003757 100644 (file)
--- a/playview/src/vp-play-view.c
+++ b/playview/src/vp-play-view.c
@@ -14,12 +14,9 @@
  * limitations under the License.
  */
 
-#include <runtime_info.h>
-#include <network/wifi.h>
 #include <media_key.h>
 #include <sound_manager.h>
 
-#include "vp-play-type-define.h"
 #include "vp-play-string-define.h"
 #include "vp-play-value-define.h"
 #include "vp-play-macro-define.h"
@@ -31,8 +28,6 @@
 #include "vp-play-minicontroller.h"
 #include "vp-play-lockscreenmc.h"
 
-#include "vp-play-popup.h"
-#include "vp-play-button.h"
 #include "vp-play-ug.h"
 
 #include "vp-play-util.h"
@@ -40,10 +35,8 @@
 #include "vp-play-preference.h"
 #include "vp-hollic.h"
 #include "vp-sound.h"
-#include "vp-device.h"
 #include "vp-sensor.h"
 #include "vp-mm-player.h"
-#include "vp-media-key.h"
 
 #ifdef ENABLE_DRM_FEATURE
 #include "vp-drm.h"

diff --git a/playview/src/widget/vp-play-bookmark.c b/playview/src/widget/vp-play-bookmark.c
index b130ce8..42c3ab4 100644 (file)
--- a/playview/src/widget/vp-play-bookmark.c
+++ b/playview/src/widget/vp-play-bookmark.c
@@ -15,15 +15,12 @@
  */
 #include <glib.h>
 
-#include "vp-play-type-define.h"
 #include "vp-play-string-define.h"
-#include "vp-play-value-define.h"
 #include "vp-play-macro-define.h"
 
 #include "vp-play-bookmark.h"
 
 #include "vp-play-button.h"
-#include "vp-play-util.h"
 
 #include "vp-media-contents.h"
 

diff --git a/playview/src/widget/vp-play-brightness-popup.c b/playview/src/widget/vp-play-brightness-popup.c
index 9eac5d8..f97c592 100644 (file)
--- a/playview/src/widget/vp-play-brightness-popup.c
+++ b/playview/src/widget/vp-play-brightness-popup.c
@@ -16,9 +16,7 @@
 
 #include <pthread.h>
 
-#include "vp-play-type-define.h"
 #include "vp-play-string-define.h"
-#include "vp-play-value-define.h"
 #include "vp-play-macro-define.h"
 
 #include "vp-play-brightness-popup.h"

diff --git a/playview/src/widget/vp-play-lockscreenmc.c b/playview/src/widget/vp-play-lockscreenmc.c
index 98f3501..1c8b73f 100644 (file)
--- a/playview/src/widget/vp-play-lockscreenmc.c
+++ b/playview/src/widget/vp-play-lockscreenmc.c
@@ -14,26 +14,17 @@
  * limitations under the License.
  */
 
-#include <runtime_info.h>
-#include <network/wifi.h>
-#include <media_key.h>
-#include <sound_manager.h>
 #include <sys/time.h>
 #include <minicontrol-provider.h>
 #include <minicontrol-type.h>
 #include <device/display.h>
-#include <device/callback.h>
 #include <system_settings.h>
 
 
-#include "vp-play-type-define.h"
 #include "vp-play-string-define.h"
-#include "vp-play-value-define.h"
 #include "vp-play-macro-define.h"
 
 #include "vp-play-lockscreenmc.h"
-#include "vp-play-minicontroller.h"
-#include "vp-play-view.h"
 #include "vp-play-view-priv.h"
 #include "vp-play-normal-view.h"
 #include "vp-mm-player.h"
@@ -41,9 +32,6 @@
 #include "vp-media-contents.h"
 /* check temp */
 #include "vp-play-log.h"
-#include "vp-util.h"
-#include "vp-file-util.h"
-#include "vp-avrcp.h"
 #include "Ecore.h"
 
 int LOCKSCREEN_MINI_CONTROLLER_WIDTH;

diff --git a/playview/src/widget/vp-play-minicontroller.c b/playview/src/widget/vp-play-minicontroller.c
index c37666e..abeafa6 100644 (file)
--- a/playview/src/widget/vp-play-minicontroller.c
+++ b/playview/src/widget/vp-play-minicontroller.c
@@ -14,22 +14,16 @@
  * limitations under the License.
  */
 
-#include <runtime_info.h>
-#include <network/wifi.h>
-#include <media_key.h>
 #include <sound_manager.h>
 #include <sys/time.h>
 #include <minicontrol-provider.h>
 #include <minicontrol-type.h>
 
-#include "vp-play-type-define.h"
 #include "mp-video-value-define.h"
 #include "vp-play-string-define.h"
-#include "vp-play-value-define.h"
 #include "vp-play-macro-define.h"
 
 #include "vp-play-minicontroller.h"
-#include "vp-play-view.h"
 #include "vp-play-view-priv.h"
 #include "vp-play-normal-view.h"
 #include "vp-mm-player.h"
@@ -39,9 +33,6 @@
 
 /* check temp */
 #include "vp-play-log.h"
-#include "vp-util.h"
-#include "vp-file-util.h"
-#include "vp-avrcp.h"
 
 #define MINI_CONTROLLER_HEIGHT (93)
 #define WL_INDI_H 27                   //Window Layout Indicator Height

diff --git a/playview/src/widget/vp-play-popup.c b/playview/src/widget/vp-play-popup.c
index ebb12c3..ed8f11a 100644 (file)
--- a/playview/src/widget/vp-play-popup.c
+++ b/playview/src/widget/vp-play-popup.c
@@ -21,7 +21,6 @@
 
 /* check temp */
 #include "vp-play-log.h"
-#include "vp-util.h"
 
 Evas_Object *vp_popup_create(Evas_Object * pParent,
                                                         video_popup_style_t nStyle, char *szTitle,

diff --git a/playview/src/widget/vp-play-progressbar.c b/playview/src/widget/vp-play-progressbar.c
index dea57f1..10cb75d 100644 (file)
--- a/playview/src/widget/vp-play-progressbar.c
+++ b/playview/src/widget/vp-play-progressbar.c
@@ -13,9 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <glib.h>
 
-#include "vp-play-type-define.h"
 #include "vp-play-string-define.h"
 #include "vp-play-value-define.h"
 #include "vp-play-macro-define.h"
@@ -23,7 +21,6 @@
 
 #include "vp-play-progressbar.h"
 
-#include "vp-play-util.h"
 
 /* check temp */
 #include "vp-play-log.h"

diff --git a/playview/src/widget/vp-play-subtitle.c b/playview/src/widget/vp-play-subtitle.c
index f2a0623..55aee92 100644 (file)
--- a/playview/src/widget/vp-play-subtitle.c
+++ b/playview/src/widget/vp-play-subtitle.c
@@ -16,7 +16,6 @@
 
 #include <glib.h>
 
-#include "vp-play-type-define.h"
 #include "vp-play-string-define.h"
 #include "vp-play-value-define.h"
 #include "vp-play-macro-define.h"

diff --git a/playview/src/widget/vp-play-volume-popup.c b/playview/src/widget/vp-play-volume-popup.c
index 9b4fe18..9390986 100644 (file)
--- a/playview/src/widget/vp-play-volume-popup.c
+++ b/playview/src/widget/vp-play-volume-popup.c
@@ -15,15 +15,12 @@
  */
 
 
-#include "vp-play-type-define.h"
 #include "vp-play-string-define.h"
-#include "vp-play-value-define.h"
 #include "vp-play-macro-define.h"
 
 #include "vp-play-volume-popup.h"
 
 #include "vp-sound.h"
-#include "vp-play-util.h"
 
 /* check temp */
 #include "vp-play-log.h"

diff --git a/playview/src/widget/vp-play-volume.c b/playview/src/widget/vp-play-volume.c
index f269e54..339297e 100644 (file)
--- a/playview/src/widget/vp-play-volume.c
+++ b/playview/src/widget/vp-play-volume.c
@@ -14,20 +14,16 @@
  * limitations under the License.
  */
 
-#include "vp-play-type-define.h"
 #include "vp-play-string-define.h"
-#include "vp-play-value-define.h"
 #include "vp-play-macro-define.h"
 
 #include "vp-play-volume.h"
 #include "vp-play-button.h"
 
 #include "vp-sound.h"
-#include "vp-play-util.h"
 
 /* check temp */
 #include "vp-play-log.h"
-#include "vp-mm-player.h"
 
 #define VP_VOLUME_HIDE_LAYOUT_TIMER_INTERVAL   5.0
 

diff --git a/src/common/mp-util-config.c b/src/common/mp-util-config.c
index 04251ad..79a9d62 100644 (file)
--- a/src/common/mp-util-config.c
+++ b/src/common/mp-util-config.c
@@ -21,9 +21,6 @@
 #include "mp-drm-ctrl.h"
 #endif
 #include "mp-video-log.h"
-#include "mp-util-media-service.h"
-#include "mp-video-value-define.h"
-#include "mp-video-string-define.h"
 #include "mp-util-config.h"
 
 #define PREF_MP_MULTI_PLAY_FLAG  "preference/org.tizen.videos/multi_play"

diff --git a/src/common/mp-util-media-service.c b/src/common/mp-util-media-service.c
index c19a535..e889d4b 100644 (file)
--- a/src/common/mp-util-media-service.c
+++ b/src/common/mp-util-media-service.c
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-#include <app.h>
 #include <glib.h>
-#include <stdbool.h>
 #include <Elementary.h>
 #include <media_content.h>
 
@@ -27,10 +25,7 @@
 #include "mp-video-log.h"
 #include "mp-video-value-define.h"
 #include "mp-util-media-service.h"
-#include "mp-video-string-define.h"
 #include "mp-video-view-popup-ctrl.h"
-#include "mp-video-type-define.h"
-#include "vp-file-util.h"
 #include "vp-util.h"
 
 #define CAMERA_FOLDER_PATH     "/opt/usr/media/Camera"

diff --git a/src/common/mp-util.c b/src/common/mp-util.c
index f528838..01d79e5 100644 (file)
--- a/src/common/mp-util.c
+++ b/src/common/mp-util.c
@@ -15,26 +15,17 @@
  */
 
 
-#include <app.h>
 #include <glib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <signal.h>
-#include <stdbool.h>
-#include <media_key.h>
 #include <Elementary.h>
 
 #include <notification.h>
-#include <media_content.h>
 #include <metadata_extractor.h>
 #include <app_preference.h>
 
 #include <sys/statvfs.h>
 
-#include <runtime_info.h>
 #include <net_connection.h>
 #include <telephony.h>
-#include <wifi-direct.h>
 
 #include "mp-util.h"
 #include "mp-video-log.h"
@@ -45,7 +36,6 @@
 #ifdef ENABLE_DRM_FEATURE
 #include "vp-drm.h"
 #endif
-#include "vp-util.h"
 #include "vp-file-util.h"
 
 enum VIDEO_PLAYER_FILE_SIZE_TYPE {

diff --git a/src/common/mp-video-info-ctrl.c b/src/common/mp-video-info-ctrl.c
index ad69f84..6056164 100644 (file)
--- a/src/common/mp-video-info-ctrl.c
+++ b/src/common/mp-video-info-ctrl.c
@@ -18,11 +18,6 @@
 #include <metadata_extractor.h>
 #include <mime_type.h>
 
-#include <unicode/udat.h>
-#include <unicode/ustring.h>
-#include <unicode/uloc.h>
-#include <unicode/ucal.h>
-#include <unicode/udatpg.h>
 #include <unicode/utmscale.h>
 #include <system_settings.h>
 
@@ -31,9 +26,7 @@
 #include "mp-drm-ctrl.h"
 #endif
 #include "mp-video-log.h"
-#include "video-player.h"
 #include "mp-video-info-ctrl.h"
-#include "mp-video-string-define.h"
 #include "utils_i18n.h"
 
 enum VIDEO_PLAYER_FILE_SIZE_TYPE {

diff --git a/src/common/mp-video-util-db-controller.c b/src/common/mp-video-util-db-controller.c
index b737b5f..33925c0 100644 (file)
--- a/src/common/mp-video-util-db-controller.c
+++ b/src/common/mp-video-util-db-controller.c
@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-#include "mp-util.h"
 #ifdef ENABLE_DRM_FEATURE
 #include "mp-drm-ctrl.h"
 #endif
 #include "mp-video-log.h"
 #include "mp-video-value-define.h"
-#include "mp-video-string-define.h"
 #include "mp-video-util-db-controller.h"
 
 /*used after mediadb update*/

diff --git a/src/video-player.c b/src/video-player.c
index 98fb1c3..f519a1d 100644 (file)
--- a/src/video-player.c
+++ b/src/video-player.c
@@ -20,14 +20,11 @@
 #include <system_settings.h>
 #include "video-player.h"
 #include "videos-view-mgr.h"
-#include "mp-video-value-define.h"
 #include "mp-util.h"
 #include "mp-video-log.h"
 #include "mp-library-view-mgr.h"
-#include "mp-launching-video-displayer.h"
 #include "mp-video-sound-manager.h"
 #include "mp-video-list-view-main.h"
-#include "vp-util.h"
 
 #define VIDEOS_WIN_NAME "videos"