use photocam at slideshow

Change-Id: I2d363401ceb78e6dc356108bb1408d4260c98451

diff --git a/slideshow/src/control/ivug-slideshow.cpp b/slideshow/src/control/ivug-slideshow.cpp
index ca266f9..be98380 100755 (executable)
--- a/slideshow/src/control/ivug-slideshow.cpp
+++ b/slideshow/src/control/ivug-slideshow.cpp
@@ -39,8 +39,6 @@
 
 #undef USE_IVUG_IMAGE
 
-#define USE_IVUG_PHOTO
-
 #undef LOG_LVL
 #define LOG_LVL DBG_MSG_LVL_MED
 
@@ -211,13 +209,7 @@ static bool _ivug_ss_set_content(Slide_Layout *pSlide, Media_Item *item)
 #ifdef USE_IVUG_IMAGE
                ret = ivug_image_file_set(pSlide->photocam, mdata->thumbnail_path, NULL);
 #else
-       #ifdef USE_IVUG_PHOTO
-                       ret = elm_photo_file_set(pSlide->photocam, mdata->thumbnail_path);
-
-       #else
-                       ret = elm_photocam_file_set(pSlide->photocam, mdata->thumbnail_path);
-       #endif
-
+               ret = elm_photocam_file_set(pSlide->photocam, mdata->thumbnail_path);
 #endif
                if(EVAS_LOAD_ERROR_NONE != ret) {
                        MSG_HIGH("elm_photocam_file_set failed");
@@ -233,12 +225,7 @@ static bool _ivug_ss_set_content(Slide_Layout *pSlide, Media_Item *item)
 #ifdef USE_IVUG_IMAGE
                ret = ivug_image_file_set(pSlide->photocam, mdata->filepath, NULL);
 #else
-       #ifdef USE_IVUG_PHOTO
-               ret = elm_photo_file_set(pSlide->photocam, mdata->filepath);
-
-       #else
                ret = elm_photocam_file_set(pSlide->photocam, mdata->filepath);
-       #endif
 #endif
                if(EVAS_LOAD_ERROR_NONE != ret) {
                        MSG_HIGH("elm_photocam_file_set failed");
@@ -620,13 +607,7 @@ static bool _ivug_ss_create_image_layout(Evas_Object *parent, Slide_Layout *sLay
 #ifdef USE_IVUG_IMAGE
        sLayout->photocam = ivug_image_create(sLayout->layout);
 #else
-
-       #ifdef USE_IVUG_PHOTO
-       sLayout->photocam = elm_photo_add(sLayout->layout);
-       #else
        sLayout->photocam = elm_photocam_add(sLayout->layout);
-       #endif
-
 #endif
        evas_object_size_hint_expand_set(sLayout->photocam, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(sLayout->photocam, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -639,13 +620,8 @@ static bool _ivug_ss_create_image_layout(Evas_Object *parent, Slide_Layout *sLay
 
 #ifdef USE_IVUG_IMAGE
 #else
-       #ifdef USE_IVUG_PHOTO
-       elm_object_style_set(sLayout->photocam, "shadow");
-       elm_photo_fill_inside_set(sLayout->photocam, EINA_TRUE);
-       #else
        elm_photocam_zoom_mode_set(sLayout->photocam, ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT);
        elm_photocam_paused_set(sLayout->photocam, EINA_TRUE);
-       #endif
 #endif
 
        evas_object_smart_callback_add(sLayout->photocam,
@@ -653,9 +629,6 @@ static bool _ivug_ss_create_image_layout(Evas_Object *parent, Slide_Layout *sLay
                                        _ivug_ss_photocam_loaded_cb,
                                        sLayout);
 
-       evas_object_smart_member_add(sLayout->photocam, sLayout->layout);
-       evas_object_smart_member_add(sLayout->thumbnail, sLayout->layout);
-
        evas_object_show(sLayout->photocam);
        evas_object_show(sLayout->layout);