remove dependency
authorJisung Ahn <jcastle.ahn@samsung.com>
Mon, 10 Dec 2012 02:13:24 +0000 (11:13 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Mon, 10 Dec 2012 02:39:18 +0000 (11:39 +0900)
Change-Id: Iee753a55f70e39d18560d0c23a051f66ebe41f25

17 files changed:
common/CMakeLists.txt [changed mode: 0644->0755]
common/include/ivug-config.h [changed mode: 0644->0755]
common/src/ivug-config.c [changed mode: 0644->0755]
feature/CMakeLists.txt [changed mode: 0644->0755]
main/CMakeLists.txt [changed mode: 0644->0755]
main/src/slider/ivug-slider-mouse.cpp [changed mode: 0644->0755]
main/src/slider/ivug-slider.cpp [changed mode: 0644->0755]
main/src/view/ivug-main-view-menu.cpp [changed mode: 0644->0755]
medialist/CMakeLists.txt [changed mode: 0644->0755]
packaging/ug-image-viewer-efl.spec [changed mode: 0644->0755]
slideshow/CMakeLists.txt [changed mode: 0644->0755]
slideshow/include/ivug-slideshow.h [changed mode: 0644->0755]
slideshow/src/control/ivug-dali-util.cpp [deleted file]
slideshow/src/control/ivug-dali-util.h [deleted file]
slideshow/src/control/ivug-slideshow.cpp [changed mode: 0644->0755]
slideshow/src/dali_effect/src/ivug-slideshow-control.cpp [changed mode: 0644->0755]
slideshow/src/include/ivug-slideshow-priv.h [changed mode: 0644->0755]

old mode 100644 (file)
new mode 100755 (executable)
index 60e6f51..dcda72b
@@ -34,9 +34,7 @@ pkg_check_modules(${PROJECT_NAME}_pkgs REQUIRED
        ecore-file
        efreet-mime
        dlog
-       libweb-media                    # needed by ivug-db.h
        drm-client
-       drm-trusted
        libexif
        vconf
        icu-i18n
old mode 100644 (file)
new mode 100755 (executable)
index b6b978d..c6f237b
@@ -53,13 +53,6 @@ void ivug_config_get_slideshow_setting(slide_show_mode * /* OUT */ mode,
                                                        double * /* OUT */ interval_time,
                                                        ivug_effect_type * /* OUT */ effect_type);
 
-
-bool ivug_config_get_use_inlineplay(bool *bUse);
-
-bool ivug_config_get_slideshow_music_state(void);
-char *ivug_config_get_slideshow_music_path(void);
-
-
 #ifdef __cplusplus
 }
 #endif
old mode 100644 (file)
new mode 100755 (executable)
index eaa4645..99b291d
@@ -241,53 +241,3 @@ ivug_config_get_slideshow_setting(slide_show_mode *mode,
        }
 }
 
-
-
-bool ivug_config_get_use_inlineplay(bool *state)
-{
-       int value = STATE_FALSE;
-
-       if(vconf_get_bool("db/private/setting/gallery/inline_video_state", &value) < 0)
-       {
-               MSG_IMAGEVIEW_ERROR("vconf_get_bool failed, set as inline video state as default: false");
-               *state = false;
-               return true;
-       }
-
-       if(value == STATE_TRUE)
-       {
-               *state = true;
-       }
-       else
-       {
-               *state = false;
-       }
-
-       return true;
-}
-
-char *ivug_config_get_slideshow_music_path(void)
-{
-       char *music_str = NULL;
-       music_str = vconf_get_str(VCONFKEY_GALLERY_MUSIC_PATH);
-       if(!music_str)
-       {
-               MSG_IMAGEVIEW_ERROR("vconf_get_str failed");
-       }
-       MSG_IMAGEVIEW_HIGH("music is: %s", music_str);
-       return music_str;
-}
-
-bool ivug_config_get_slideshow_music_state(void)
-{
-       int music_state = STATE_FALSE;
-       if(vconf_get_bool(VCONFKEY_GALLERY_MUSIC_STATE, &music_state) < 0)
-       {
-               MSG_IMAGEVIEW_ERROR("vconf_get_bool failed, set as default: false");
-               return false;
-       }
-
-       MSG_IMAGEVIEW_HIGH("music state is: %d", music_state);
-       return (music_state == STATE_TRUE ? true : false);
-}
-
old mode 100644 (file)
new mode 100755 (executable)
index 9c7f505..99addc7
@@ -23,17 +23,8 @@ pkg_check_modules(${PROJECT_NAME}_pkgs REQUIRED
        elementary
        dlog
        ui-gadget-1                                                             # Motion
-       libface-svc
-       liballshare
-       liballshare-core
-       contacts-service2
-       capi-network-nfc
        haptic
-       capi-messaging-email
-       capi-messaging-messages
        capi-system-sensor
-       capi-web-url-download
-       capi-media-player
 )
 
 FOREACH(flag ${${PROJECT_NAME}_pkgs_CFLAGS})
old mode 100644 (file)
new mode 100755 (executable)
index 7a679e1..d0c71af
@@ -79,18 +79,13 @@ pkg_check_modules(pkgs REQUIRED
        ecore-evas
        utilX
        ui-gadget-1
-       libweb-media
        libmedia-utils
        media-thumbnail
        drm-client
        glib-2.0
        vconf
-       liballshare
-       liballshare-core
-       shortcut
        capi-appfw-application
        capi-appfw-app-manager
-       capi-media-player
 )
 
 FOREACH(flag ${pkgs_CFLAGS})
old mode 100644 (file)
new mode 100755 (executable)
index 60a0934..8dd4c10
@@ -812,28 +812,7 @@ Evas_Event_Flags n_finger_tap_end(void *data , void *event_info)
 
        if ( ivug_slider_item_icon_click_check(si, p->x, p->y ) == true )
        {
-               bool bUseInline = false;
-
-               if ( ivug_config_get_use_inlineplay(&bUseInline) == false )
-               {
-                       bUseInline = false;
-               }
-
-               if ( bUseInline == true )
-               {
-                       if ( ivug_slider_item_video_is_playing(si) == EINA_TRUE )
-                       {
-                               ivug_slider_item_video_pause(si);
-                       }
-                       else
-                       {
-                               ivug_slider_item_video_play(si);
-                       }
-               }
-               else
-               {
-                       evas_object_smart_callback_call(sd->obj, "slider,clicked,icon", si);    // Clicked video icon
-               }
+               evas_object_smart_callback_call(sd->obj, "slider,clicked,icon", si);    // Clicked video icon
        }
        else
        {
old mode 100644 (file)
new mode 100755 (executable)
index 38dc662..1949d45
@@ -330,17 +330,7 @@ _ivug_slider_smart_add(Evas_Object *obj)
        sd->bPassEvent = false;
        sd->bLongtapEnable = true;
 
-
-       bool bUseInline = false;
-
-       if ( ivug_config_get_use_inlineplay(&bUseInline) == true )
-       {
-               evas_object_data_set(obj, "conf-use-inline", (void *)bUseInline);
-       }
-       else
-       {
-               evas_object_data_set(obj, "conf-use-inline", (void *)0);
-       }
+       evas_object_data_set(obj, "conf-use-inline", (void *)0);
 
        PERF_CHECK_END(LVL5, "initialize memory");
 
old mode 100644 (file)
new mode 100755 (executable)
index a8810f8..ececeee
@@ -34,7 +34,6 @@
 #include "ivug-exif.h"
 
 #include <ui-gadget-module.h>          // ug_destroy_me, ug_send_result
-#include <shortcut.h>
 #include <media-thumbnail.h>
 #include <app_manager.h>               //app_manager_get_app_name
 
@@ -450,27 +449,6 @@ void _on_setas_selected(void *data, Evas_Object *obj, void *event_info)
        {
                pMainView->ext_ug = ivug_ext_launch_contact(mdata->filepath, _on_ext_ug_destroy_cb, data);
        }
-       else if(strncmp(label, IDS_ADD_TO_HOME, strlen(label)) == 0)
-       {
-               char str[IVUG_MAX_FILE_PATH_LEN+SHORTCUT_PREFIX_LEN] = {0,};
-               snprintf(str, IVUG_MAX_FILE_PATH_LEN+SHORTCUT_PREFIX_LEN,
-                       SHORTCUT_PREFIX"%s", mdata->fileurl);
-
-               int ret = add_to_home_shortcut(GALLERY_PKG_NAME, mdata->fileurl,
-                                          SHORTCUT_PACKAGE,
-                                          str,
-                                           mdata->thumbnail_path,
-                                          _on_addhome_result_cb, NULL);
-
-               if (ret < 0) {
-                       MSG_MAIN_ERROR("Add to home failed, error: %d", ret);
-                       ivug_selectioninfo_create(pMainView->layout, IDS_FAILED);
-               }
-               else
-               {
-                       ivug_selectioninfo_create(pMainView->layout, IDS_ADDED);
-               }
-       }
 
        evas_object_del(pMainView->ctx_popup2);
        pMainView->ctx_popup2 = NULL;
@@ -956,12 +934,6 @@ void on_btn_setas_clicked(void *data, Evas_Object *obj, void *event_info)
                {
                        ivug_listpopup_item_disabled_set(it);
                }
-
-               it = ivug_listpopup_item_append(popup, NULL, IDS_ADD_TO_HOME, IDS_ADD_TO_HOME);
-               if(bDisableWallpaper == true)
-               {
-                       ivug_listpopup_item_disabled_set(it);
-               }
        }
        else
        {
old mode 100644 (file)
new mode 100755 (executable)
index fc0d9b2..1b255fb
@@ -24,9 +24,6 @@ pkg_check_modules(${PROJECT_NAME}_pkgs REQUIRED
        elementary
        dlog
        ui-gadget-1
-       liballshare
-       liballshare-core
-       libweb-media
        eina
        ecore
        capi-content-media-content
old mode 100644 (file)
new mode 100755 (executable)
index 1b40e5a..22788d8
@@ -25,10 +25,8 @@ BuildRequires: pkgconfig(evas)
 BuildRequires: pkgconfig(ecore)
 BuildRequires: pkgconfig(utilX)
 BuildRequires: pkgconfig(libmedia-utils)
-BuildRequires: pkgconfig(libweb-media)
 BuildRequires: pkgconfig(ui-gadget-1)
 BuildRequires: pkgconfig(drm-client)
-BuildRequires: pkgconfig(drm-trusted)
 BuildRequires: pkgconfig(vconf)
 BuildRequires: pkgconfig(libexif)
 BuildRequires: pkgconfig(efreet)
@@ -37,12 +35,8 @@ BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(xext)
 BuildRequires: pkgconfig(xcomposite)
-BuildRequires: pkgconfig(liballshare)
-BuildRequires: pkgconfig(liballshare-core)
-BuildRequires: pkgconfig(shortcut)
 BuildRequires: pkgconfig(media-thumbnail)
 BuildRequires: pkgconfig(libface-svc)
-BuildRequires: pkgconfig(contacts-service2)
 BuildRequires: pkgconfig(capi-system-power)
 BuildRequires: pkgconfig(capi-appfw-application)
 BuildRequires: pkgconfig(capi-appfw-app-manager)
@@ -50,14 +44,8 @@ BuildRequires: pkgconfig(capi-system-runtime-info)
 BuildRequires: pkgconfig(capi-system-sensor)
 BuildRequires: pkgconfig(haptic)
 BuildRequires: pkgconfig(capi-media-metadata-extractor)
-BuildRequires: pkgconfig(capi-web-url-download)
 BuildRequires: pkgconfig(capi-content-mime-type)
-BuildRequires: pkgconfig(capi-media-player)
 BuildRequires: pkgconfig(capi-content-media-content)
-BuildRequires: pkgconfig(capi-network-nfc)
-BuildRequires: pkgconfig(capi-messaging-email)
-BuildRequires: pkgconfig(capi-messaging-messages)
-BuildRequires: pkgconfig(capi-media-sound-manager)
 BuildRequires: pkgconfig(capi-system-system-settings)
 
 %description
@@ -96,8 +84,6 @@ execstack -c %{buildroot}%{_ugdir}/lib/libug-image-viewer-efl.so.0.1.0
 
 %post
 chown -R 5000:5000 %{_datadir}/ug-image-viewer-efl
-/usr/bin/vconftool set -t bool file/private/ug-image-viewer-efl/motion_popup 0 -g 5000
-/usr/bin/vconftool set -t bool file/private/ug-image-viewer-efl/face_tag 0 -g 5000
 mkdir -p /usr/ug/bin/
 ln -sf /usr/bin/ug-client /usr/ug/bin/image-viewer-efl
 
old mode 100644 (file)
new mode 100755 (executable)
index 57e3037..2704038
@@ -7,7 +7,6 @@ SET(VERSION 0.1.0)
 SET(SRCS
 # Effect files
        src/control/ivug-slideshow.cpp
-       src/control/ivug-dali-util.cpp
 
        src/effect/ivug-xcapture.c
        src/effect/ivug-blind.c
@@ -44,16 +43,10 @@ pkg_check_modules(${PROJECT_NAME}_pkgs REQUIRED
        ecore-x
        xext
        xcomposite
-       libweb-media
        vconf
        ui-gadget-1
-       liballshare
-       liballshare-core
-       libface-svc
        capi-system-power
        capi-appfw-application
-       capi-media-player
-       capi-media-sound-manager
 )
 
 FOREACH(flag ${${PROJECT_NAME}_pkgs_CFLAGS})
old mode 100644 (file)
new mode 100755 (executable)
index 85e735e..fcbabd3
@@ -70,9 +70,6 @@ ivug_ss_item_get(SlideShow *pSlideShow);
 Evas_Object *
 ivug_ss_object_get(SlideShow *pSlideShow);
 
-bool
-ivug_ss_set_music(SlideShow *pSlideShow, const char *path);
-
 Media_Item *
 ivug_ss_get_next_item(Media_List *mList,
                        Media_Item *header,
diff --git a/slideshow/src/control/ivug-dali-util.cpp b/slideshow/src/control/ivug-dali-util.cpp
deleted file mode 100644 (file)
index 78e5e0f..0000000
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- *  com.samsung.gallery
- *
- * Copyright (c) 2000 - 2011 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 <ui-gadget.h>
-#include <face-svc.h>
-#include <face-svc-types.h>
-#include "ivug-dali-util.h"
-#include "ivug-debug.h"
-#include "ivug-file-info.h"
-#include "ivug-slideshow-priv.h"
-
-bool ivug_ss_create_player_handle(SlideShow *ss_handle)
-{
-       MSG_IVUG_HIGH("");
-       if (!ss_handle) {
-               return false;
-       }
-       if (ss_handle->vmpHandle) {
-               return true;
-       }
-
-       sound_manager_set_session_type(SOUND_SESSION_TYPE_EXCLUSIVE);
-
-       int nErr = PLAYER_ERROR_NONE;
-       if (!ss_handle->vmpHandle) {
-               nErr = player_create(&ss_handle->vmpHandle);
-       }
-       if(nErr != PLAYER_ERROR_NONE)
-       {
-               MSG_IVUG_HIGH("Fail to create player handle. Error code : %x", nErr);
-               return false;
-       }
-       if (ss_handle->vmpHandle) {
-               nErr = player_set_sound_type(ss_handle->vmpHandle, SOUND_TYPE_MEDIA);
-       }
-       if(nErr != PLAYER_ERROR_NONE)
-       {
-               MSG_IVUG_HIGH("Fail to set attribute (%x)", nErr);
-               return false;
-       }
-       return true;
-}
-
-bool ivug_ss_destory_player_handle(SlideShow *ss_handle)
-{
-       MSG_IVUG_HIGH("");
-       bool bSucess = true;
-       if (ss_handle && ss_handle->vmpHandle) {
-               ivug_ss_stop_player(ss_handle);
-               MSG_IVUG_HIGH ("destory video");
-               if (player_destroy(ss_handle->vmpHandle) != PLAYER_ERROR_NONE) {
-                       MSG_IVUG_HIGH ("player_destroy failed");
-                       bSucess = false;
-               }
-               ss_handle->vmpHandle = NULL;
-       }
-
-       sound_manager_set_session_type(SOUND_SESSION_TYPE_SHARE);
-
-       return bSucess;
-}
-
-bool ivug_ss_init_player(const char *path, SlideShow *ss_handle, bool bVideo)
-{
-       if (path == NULL || !ss_handle) {
-               return false;
-       }
-       if (!ss_handle->vmpHandle) {
-               return false;
-       }
-       int result = PLAYER_ERROR_NONE;
-       result = player_set_uri(ss_handle->vmpHandle, path);
-       if (result != PLAYER_ERROR_NONE) {
-               MSG_IVUG_HIGH ("player_set_uri error");
-       }
-       if (bVideo) {
-               result = player_set_looping(ss_handle->vmpHandle, false);
-               if (result != PLAYER_ERROR_NONE) {
-                       MSG_IVUG_HIGH ("player_set_looping error");
-               }
-       } else {
-               result = player_set_looping(ss_handle->vmpHandle, true);
-               if (result != PLAYER_ERROR_NONE) {
-                       MSG_IVUG_HIGH ("player_set_looping error");
-               }
-       }
-       if (player_prepare(ss_handle->vmpHandle) != PLAYER_ERROR_NONE) {
-               MSG_IVUG_HIGH ("realize is failed");
-               return false;
-       }
-       return true;
-}
-
-bool ivug_ss_play_player(SlideShow *ss_handle)
-{
-       if (!ss_handle) {
-               return false;
-       }
-       if (ss_handle->vmpHandle){
-               if (player_start(ss_handle->vmpHandle) != PLAYER_ERROR_NONE) {
-                       MSG_IVUG_HIGH ("mm_player_start failed");
-                       return false;
-               } else {
-                       return true;
-               }
-       }
-       return false;
-}
-
-bool ivug_ss_stop_player(SlideShow* ss_handle)
-{
-       bool bSucess = true;
-       if (!ss_handle || !ss_handle->vmpHandle) {
-               bSucess = true;
-       }
-       if (ss_handle->vmpHandle) {
-               player_unset_completed_cb(ss_handle->vmpHandle);
-               MSG_IVUG_HIGH ("stop video");
-               if (player_stop(ss_handle->vmpHandle) != PLAYER_ERROR_NONE) {
-                       MSG_IVUG_HIGH ("mm_player_stop failed");
-                       bSucess = false;
-               }
-               if (player_unprepare(ss_handle->vmpHandle) != PLAYER_ERROR_NONE) {
-                       MSG_IVUG_HIGH ("mm_player_unrealize failed");
-                       bSucess = false;
-               }
-       }
-       return bSucess;
-}
-
-bool ivug_ss_pause_player(SlideShow* ss_handle)
-{
-       bool bSucess = true;
-       if (!ss_handle || !ss_handle->vmpHandle) {
-               bSucess = true;
-       }
-       if (ss_handle->vmpHandle) {
-               MSG_IVUG_HIGH ("stop video");
-               if (player_pause(ss_handle->vmpHandle) != PLAYER_ERROR_NONE) {
-                       MSG_IVUG_HIGH ("mm_player_pause failed");
-                       bSucess = false;
-               }
-       }
-       return bSucess;
-}
-
-bool ivug_ss_get_player_attribute(SlideShow *ss_handle,
-       int *width, int *height)
-{
-       int result = PLAYER_ERROR_NONE;
-       if (!ss_handle->vmpHandle) {
-               return false;
-       }
-       result = player_get_video_size(ss_handle->vmpHandle, width, height);
-       if (result != PLAYER_ERROR_NONE) {
-               MSG_IVUG_HIGH ("ivug_ss_get_video_attribute_capi failed");
-               return false;
-       }
-       return true;
-}
-
diff --git a/slideshow/src/control/ivug-dali-util.h b/slideshow/src/control/ivug-dali-util.h
deleted file mode 100644 (file)
index e40a74b..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  com.samsung.gallery
- *
- * Copyright (c) 2000 - 2011 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 _IVUG_DALI_UTIL_H_
-#define _IVUG_DALI_UTIL_H_
-
-#include <Elementary.h>
-#include <app.h>
-#include "ivug-config.h"
-#include "ivug-medialist.h"
-#include "ivug-slideshow.h"
-
-/* Defined in header image-view.h */
-typedef enum _ivug_dali_changeview_id {
-       GL_DALI_CHANGE_SLIDE = 0,
-       GL_DALI_CHANGE_SLIDE_TO_SLIDESHOW,
-       GL_DALI_CHANGE_SLIDESHOW,
-       GL_DALI_CHANGE_SLIDESHOW_TO_SLIDE,
-} ivug_dali_changeview_id;
-
-bool ivug_ss_create_player_handle(SlideShow *ss_handle);
-bool ivug_ss_destory_player_handle(SlideShow *ss_handle);
-bool ivug_ss_init_player(const char *path, SlideShow *ss_handle, bool bVideo);
-bool ivug_ss_play_player(SlideShow *ss_handle);
-bool ivug_ss_stop_player(SlideShow *ss_handle);
-bool ivug_ss_pause_player(SlideShow* ss_handle);
-bool ivug_ss_get_player_attribute(SlideShow *ss_handle,
-       int *width, int *height);
-
-#endif
-
old mode 100644 (file)
new mode 100755 (executable)
index dffb4d1..9e23c59
@@ -695,10 +695,6 @@ SlideShow *ivug_ss_create(Evas_Object *parent)
                pSlideShow = NULL;
                return NULL;
        }
-       pSlideShow->bMusicState = ivug_config_get_slideshow_music_state();
-       if (pSlideShow->bMusicState) {
-               pSlideShow->music_path = ivug_config_get_slideshow_music_path();
-       }
 
        pSlideShow->effect_type = _ivug_ss_get_trans_effect(ivug_effect);
 
@@ -783,15 +779,6 @@ bool ivug_ss_start(SlideShow *pSlideShow , Media_Item *current, Media_List *list
                return false;
        }
 
-
-       if(pSlideShow->bMusicState)
-       {
-               MSG_HIGH("music:%s", pSlideShow->music_path);
-                if (pSlideShow->music_path) {
-                        ivug_ss_set_music(pSlideShow, pSlideShow->music_path);
-                }
-       }
-
        pSlideShow->sCurrent = 0;
        pSlideShow->bSS_StopFlag = EINA_FALSE;
        pSlideShow->ss_Header = current;
@@ -850,11 +837,6 @@ bool ivug_ss_start(SlideShow *pSlideShow , Media_Item *current, Media_List *list
        }
        pSlideShow->ss_timer = ecore_timer_add(pSlideShow->ss_interval_time, _ivug_ss_on_slide_interval, pSlideShow);
 
-       if(pSlideShow->vmpHandle)
-       {
-               ivug_ss_play_player(pSlideShow);
-       }
-
        MSG_HIGH("Slide show started!");
 
        return true;
@@ -889,9 +871,7 @@ bool ivug_ss_stop(SlideShow *pSlideShow)
                evas_object_del(pSlideShow->event);
                pSlideShow->event = NULL;
        }
-       if(pSlideShow->vmpHandle) {
-               ivug_ss_stop_player(pSlideShow);
-       }
+
        if(pSlideShow->effect_engine == NULL)
        {
                MSG_HIGH("Slide effect_engine = NULL");
@@ -916,11 +896,6 @@ bool ivug_ss_resume(SlideShow *pSlideShow)
                ecore_timer_thaw(pSlideShow->ss_timer);
        }
 
-       if(pSlideShow->vmpHandle)
-       {
-               ivug_ss_play_player(pSlideShow);
-       }
-
        pSlideShow->state = SLIDE_SHOW_RUNNING;
        //MSG_HIGH("ivug_resume_slideshow");
 
@@ -938,11 +913,6 @@ bool ivug_ss_pause(SlideShow *pSlideShow)
                ecore_timer_freeze(pSlideShow->ss_timer);
        }
 
-       if(pSlideShow->vmpHandle)
-       {
-               ivug_ss_pause_player(pSlideShow);
-       }
-
        pSlideShow->state = SLIDE_SHOW_PAUSE;
 
        return true;
@@ -968,17 +938,6 @@ void ivug_ss_delete(SlideShow *pSlideShow)
        evas_object_event_callback_del(pSlideShow->event, EVAS_CALLBACK_MOUSE_MOVE, _ivug_ss_on_mouse_move);
        evas_object_event_callback_del(pSlideShow->event, EVAS_CALLBACK_MOUSE_UP, _ivug_ss_on_mouse_up);
 
-       if (pSlideShow->vmpHandle) {
-               ivug_ss_destory_player_handle(pSlideShow);
-               pSlideShow->vmpHandle = NULL;
-       }
-
-       if(pSlideShow->music_path)
-       {
-               free(pSlideShow->music_path);
-               pSlideShow->music_path = NULL;
-       }
-
        if(pSlideShow->effect_engine)
                ivug_effect_finalize(pSlideShow->effect_engine);
 
@@ -1086,24 +1045,6 @@ Evas_Object *ivug_ss_object_get(SlideShow *pSlideShow)
        return pSlideShow->obj;
 }
 
-bool ivug_ss_set_music(SlideShow *pSlideShow, const char *path)
-{
-       MSG_ASSERT(pSlideShow != NULL);
-       MSG_ASSERT(path != NULL);
-       bool result = true;
-       if (!pSlideShow->vmpHandle) {
-               result = ivug_ss_create_player_handle(pSlideShow);
-               if (!result) {
-                       return false;
-               }
-       }
-       result = ivug_ss_init_player(path, pSlideShow, false);
-       if (!result) {
-               return false;
-       }
-       return true;
-}
-
 void
 ivug_ss_set_stop(SlideShow *pSlideShow)
 {
old mode 100644 (file)
new mode 100755 (executable)
index 0768b7e..1e3c14e
@@ -913,72 +913,4 @@ void SlideshowControl::CreateXHPixmap()
 
 }
 
-void SlideshowControl::StartVideoPlay(const char *path)
-{
-       IVUG_FUNC_ENTER();
-
-       if (path == NULL) return;
-       if (mImageActor && !mPreIsVideo) {
-               mImageActor.SetVisible(true);
-       }
-
-       if (mInView) {
-               if (mInView.GetParent()) {
-                       mInView.GetParent().Remove(mInView);
-               }
-       }
-       if ( mFadingIn) {
-               if(mFadingIn.GetParent()) {
-                       mFadingIn.GetParent().Remove(mFadingIn);
-               }
-       }
-       mVideoLayer.RaiseToTop();
-       int width = (int)mVideoWidth;
-       int height = (int)mVideoHeight;
-       if (mSSHandle->bMusicState) {
-               ivug_ss_stop_player(mSSHandle);
-       }
-       ivug_ss_init_player(path, mSSHandle, true);
-       MSG_IVUG_HIGH("***************width:height=%d:%d",width,height);
-       ivug_ss_play_player(mSSHandle);
-       bool bsucess = true;
-       bsucess = ivug_ss_player_message_callback(mSSHandle, this);
-       if (mAnimVideo) {
-               mAnimVideo.Play();
-       }
-       ivug_ss_dali_set_current_item(mCurItem, mSSHandle);
-       if (!bsucess) {
-               mTransitionTimer.Start();
-       }
-
-       IVUG_FUNC_LEAVE();
-}
-
-void SlideshowControl::EndVideoPlay()
-{
-       IVUG_FUNC_ENTER();
-       if (mCurIsVideo) {
-               ivug_ss_stop_player(mSSHandle);
-               if (mAnimVideo) {
-                       mAnimVideo.Stop();
-               }
-       }
-       if (mSSHandle->bMusicState) {
-               ivug_ss_init_player(mSSHandle->music_path, mSSHandle, false);
-               ivug_ss_play_player(mSSHandle);
-       }
-       if (mCurIsVideo) {
-               if (mFirstImage) {
-                       mFirstImage = false;
-               }
-               LoadNextImage();
-               mTimerReady = false;
-               //mViewTimer.Start();
-               MSG_IVUG_HIGH("stop video");
-       }
-       //TransitionCompleted();
-
-       IVUG_FUNC_LEAVE();
-}
-
 } // namespace Imageview3D
old mode 100644 (file)
new mode 100755 (executable)
index cd6f270..1351e0f
 */
 #include <Elementary.h>
 #include <Ecore_X.h>
-#include <player.h>
 
 #include "ivug-medialist.h"
 #include "ivug-config.h"
 #include "ivug-effect.h"
 
-//#include "ivug-player.h"
-
 #define DATA_PATH                                              DATADIR"/"PACKAGE
 
 typedef struct
@@ -61,7 +58,6 @@ typedef struct _SlideShow
        Evas_Object *event;             // Mouse event
 
        /* slide show setting */
-       char *music_path;
        double ss_interval_time;
        Effect_Engine* effect_engine;
 
@@ -77,7 +73,6 @@ typedef struct _SlideShow
        int screen_h;
 
        Ecore_Idler *load_idler;
-       player_h vmpHandle;                     /*Used for video and music*/
 
        Slide_Layout sLayout[2];
        slide_show_mode ss_mode;
@@ -87,6 +82,5 @@ typedef struct _SlideShow
        slideshow_state_t state;
        Eina_Bool bSS_StopFlag; /* request slide show stop flag */
        bool bMouse_event;
-       bool bMusicState;
 }SlideShow;