Removed unused code [#if 0]

Change-Id: Ie80bd8355ddddd0debe18ef735bd7147104d577b
Signed-off-by: bhutani.92 <bhutani.92@samsung.com>

diff --git a/music-chooser/src/mc-index.c b/music-chooser/src/mc-index.c
index 755f9ddb5653c6db789b1f7efce24f3d54335c1b..caf3c30e4b5107782383f3ba6702c67d2fd53e1e 100755 (executable)
--- a/music-chooser/src/mc-index.c
+++ b/music-chooser/src/mc-index.c
@@ -175,17 +175,6 @@ _mc_index_item_selected_cb(void *data, Evas_Object *obj, void *event_info)
                        ERROR_TRACE("ERROR :label is not found");
                        return;
                }
-#if 0 //print code
-               char *text = NULL;
-               char code[16] = {0,};
-               text = g_strconcat("0x", NULL);
-               for (i = 0; i < strlen(uni) ; i++) {
-                       snprintf(code, 16, "%x", uni[i]);
-                       code[15] = 0;
-                       text = g_strconcat(text, code, NULL);
-               }
-               DEBUG_TRACE("uni: %s, code: %s, A: 0x%x", uni, code, 'A');
-#endif
                if (!g_strcmp0(index_letter, wd->first)) {
                        if (uni[0] < 'A' || uni[0] > 'z') {
                                elm_genlist_item_bring_in(gl_item, ELM_GENLIST_ITEM_SCROLLTO_TOP);

diff --git a/music-chooser/src/mc-list-play.c b/music-chooser/src/mc-list-play.c
index 8fc358c67408347de6c7e41d723eadf9045571c9..34253ac36ee64883c8f81e0d58c1d3992e7c1ef2 100755 (executable)
--- a/music-chooser/src/mc-list-play.c
+++ b/music-chooser/src/mc-list-play.c
@@ -250,40 +250,6 @@ void mc_player_play(void)
        player_state_e play_status = mc_pre_play_get_player_state();
 
        if (PLAYER_STATE_PLAYING == play_status) {
-#if 0  //Enable notification post for play and pause in indicator
-               MP_CHECK(cur_item_data->ad);
-
-               struct app_data *ad = cur_item_data->ad;
-               MP_CHECK(ad);
-               if (!ad->noti) {
-                       DEBUG_TRACE("notification create");
-
-                       int applist = NOTIFICATION_DISPLAY_APP_INDICATOR;
-                       notification_type_e noti_type = NOTIFICATION_TYPE_NOTI;
-                       notification_image_type_e img_type = NOTIFICATION_IMAGE_TYPE_ICON_FOR_INDICATOR;
-                       int ret = NOTIFICATION_ERROR_NONE;
-
-                       char *path = app_get_shared_resource_path();
-
-                       char icon_path[1024] = {0};
-                       snprintf(icon_path, 1024, "%sshared_images/T02_control_circle_icon_play.png", path);
-                       DEBUG_TRACE("Icon Path is : %s", icon_path);
-                       free(path);
-
-                       notification_delete_all(NOTIFICATION_TYPE_NOTI);
-                       ad->noti = notification_create(noti_type);
-                       ret = notification_set_image(ad->noti, img_type, icon_path);
-                       if (ret != NOTIFICATION_ERROR_NONE) {
-                               DEBUG_TRACE("Cannot set the notification image");
-                       }
-                       ret = notification_set_display_applist(ad->noti, applist);
-                       if (ret != NOTIFICATION_ERROR_NONE) {
-                               DEBUG_TRACE("Cannot set the display applist");
-                               notification_free(ad->noti);
-                       }
-                       notification_post(ad->noti);
-               }
-#endif
                _mc_pre_play_mgr_player_start();
        }
        _mc_pre_play_mgr_update_play_button_status(cur_item_data);

diff --git a/music-chooser/src/mc-track-list.c b/music-chooser/src/mc-track-list.c
index 65f8a0753ce696b9ba0ca396975a27d7534083b6..82da2149434fbfd405861802a8d371af6d0f6c5a 100755 (executable)
--- a/music-chooser/src/mc-track-list.c
+++ b/music-chooser/src/mc-track-list.c
@@ -184,11 +184,6 @@ static Evas_Object *_gl_content_get(void *data, Evas_Object *obj, const char *pa
                        } else {
                                elm_object_signal_emit(part_content, "show_pause", "*");
                        }
-#if 0          //Posts play and pause icon in notification indicator area
-                       mc_post_notification_indicator(it_data, state);
-#endif
-
-                       //elm_object_item_signal_emit(cur_item_data->it, "show_color" ,"*");
                }
        }
 
@@ -761,31 +756,6 @@ _set_cb(void *data, Evas_Object *obj, void *event_info)
 
 }
 
-#if 0
-static Eina_Bool
-_back_cb(void *data, Elm_Object_Item *it)
-{
-       startfunc;
-       track_list_data_t *ld  = (track_list_data_t *)data;
-       MP_CHECK_FALSE(ld);
-
-       if (ld->t_type == MP_TRACK_ALL) {
-
-               Elm_Object_Item *selected_item = _get_select_radio(ld);
-
-               if (selected_item != NULL) {
-                       _set_cb(ld, NULL, NULL);
-               } else {
-                       _cancel_cb(ld, NULL, NULL);
-               }
-       } else {
-               _mc_popup_view(ld);
-       }
-
-       return EINA_FALSE;
-}
-#endif
-
 void _mc_popup_view(void *data)
 {
        startfunc;
@@ -1029,28 +999,7 @@ int mc_track_list_update(Evas_Object *list, Elm_Object_Item *navi_it, Evas_Objec
        }
 
        if (ad->select_type == MC_SELECT_MULTI) {
-#if 0
-               Evas_Object *toolbar = mc_widget_create_naviframe_toolbar(ld->win_navi_it);
-               ld->btn_done = mc_widget_create_toolbar_item_btn(toolbar,
-                              "naviframe/toolbar/default", GET_SYS_STR("IDS_COM_POP_DONE"), _done_cb, ld);
-
-               elm_object_item_disabled_set(ld->btn_done, true);
-
-               Evas_Object *ic;
-               Evas_Object *select_btn = elm_button_add(ad->navi_bar);
-               elm_object_style_set(select_btn, "naviframe/title_icon");
-               ic = elm_icon_add(ad->navi_bar);
-               elm_image_file_set(ic, IMAGE_EDJ_NAME, "00_icon_edit.png");
-               evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-               elm_image_resizable_set(ic, EINA_TRUE, EINA_TRUE);
-               elm_object_part_content_set(select_btn, "icon", ic);
-               evas_object_smart_callback_add(select_btn, "clicked", _mc_track_list_select_cb, ld);
-               evas_object_show(select_btn);
-               elm_object_item_part_content_set(ld->win_navi_it, "title_right_btn", select_btn);
-#endif
-
                if (ld->win_navi_it && ad->navi_bar) {
-
                        ld->btn_done = mc_widget_create_navi_right_btn(ad->navi_bar, ld->win_navi_it, _done_cb, ld);
                }
        } else if (ld->ad->select_type == MC_SELECT_SINGLE_RINGTONE || ld->ad->select_type == MC_SELECT_SINGLE) {

diff --git a/music-chooser/src/music-chooser.c b/music-chooser/src/music-chooser.c
index 62e7aea0f482dd94bf6f53a5477d793d8d1a5712..322d0605fac271ece5fa66cd5de0ff6b2423a362 100755 (executable)
--- a/music-chooser/src/music-chooser.c
+++ b/music-chooser/src/music-chooser.c
@@ -90,23 +90,7 @@ _parse_service(struct app_data *ad, app_control_h service)
 
        if (!g_strcmp0(operation, APP_CONTROL_OPERATION_PICK)) {
                ad->max_count = 0;
-#if 0
-               app_control_get_extra_data(service, APP_CONTROL_DATA_TOTAL_COUNT, &value);
-               if (value) {
-                       ad->max_count = atoi(value);
-                       DEBUG_TRACE("Maximum Count is: %d", ad->max_count);
-                       IF_FREE(value);
-               }
-#endif
                ad->limitsize = -1;
-#if 0
-               app_control_get_extra_data(service, APP_CONTROL_DATA_TOTAL_SIZE, &value);
-               if (value) {
-                       ad->limitsize = atoi(value);
-                       DEBUG_TRACE("Maximum Size is: %lld", ad->limitsize);
-                       IF_FREE(value);
-               }
-#endif
                app_control_get_extra_data(service, MC_SELECT_MODE_KEY, &value);
                DEBUG_TRACE("Operation: %s", value);
 
@@ -287,41 +271,6 @@ mc_resume(void *data)
        return;
 }
 
-#if 0
-static void
-mc_device_orientation(app_event_info_h event_info, void *data)
-{
-       struct app_data *ad = data;
-
-       int angle;
-
-       app_device_orientation_e orientation = APP_DEVICE_ORIENTATION_0;
-       app_event_get_device_orientation(event_info, &orientation);
-
-       switch (orientation) {
-       case APP_DEVICE_ORIENTATION_270:
-               angle = -90;
-               break;
-
-       case APP_DEVICE_ORIENTATION_90:
-               angle = 90;
-               break;
-
-       case APP_DEVICE_ORIENTATION_180:
-               angle = 180;
-               break;
-
-       case APP_DEVICE_ORIENTATION_0:
-       default:
-               angle = 0;
-               break;
-       }
-
-       ad->win_angle = angle;
-
-       DEBUG_TRACE("window angle: %d", ad->win_angle);
-}
-#endif
 
 static void
 mc_destroy(void *data)
@@ -345,14 +294,6 @@ mc_destroy(void *data)
                        ecore_pipe_del(ad->smat_pipe);
                        ad->smat_pipe = NULL;
                }
-
-#if 0          //Free notification handle
-               if (ad->noti) {
-                       notification_delete(ad->noti);
-                       notification_free(ad->noti);
-               }
-#endif
-
        }
 }
 

diff --git a/src/common/mp-common.c b/src/common/mp-common.c
index 6acf9e4d6fef965cf67484db2b946f44de0c66f7..e240f122bbc2b334ba708f55c0df4713a9f11a98 100755 (executable)
--- a/src/common/mp-common.c
+++ b/src/common/mp-common.c
@@ -1123,11 +1123,6 @@ static player_h g_tmp_player;
 void _play_uri(char *path)
 {
        player_create(&g_tmp_player);
-#if 0 /*rich audio is used for change play speed. as the feature is removed, we block it for avoid potential issue*/
-       if (mp_check_file_exist(RICH_AUDIO)) {
-               player_set_rich_audio(g_tmp_player);
-       }
-#endif
        player_set_sound_type(g_tmp_player, SOUND_TYPE_MEDIA);
 
        if (mp_check_file_exist(ALH)) {

diff --git a/src/common/mp-util.c b/src/common/mp-util.c
index 10b167e1fd711722aaf56fbb186e70d496fd6130..3f7d72ecf1b06d352df4dc78aecc73455678a8f9 100755 (executable)
--- a/src/common/mp-util.c
+++ b/src/common/mp-util.c
@@ -149,20 +149,6 @@ _mp_util_get_len(const char *p)
 {
        int r = -1;
 
-#if 0
-       int i;
-       unsigned char c;
-       if (p) {
-               c = *p;
-               for (i = 0; i < sizeof(mask_len) / sizeof(char); i = i + 2) {
-                       if ((c & mask_len[i]) == mask_len[i + 1]) {
-                               r = (i >> 1) + 1;
-                               break;
-                       }
-               }
-       }
-#endif
-
        return r;
 }
 
@@ -1347,56 +1333,9 @@ mp_check_mass_storage_mode(void)
        return 0;
 }
 
-/*static Eina_Bool
-_sleep_timer_cb(void *data)
-{
-       TIMER_TRACE();
-       struct appdata * ad = g_ad;
-       MP_CHECK_FALSE(ad);
-
-       EVENT_TRACE("sleep_unlock");
-       // TEMP_BLOCK
-       //power_unlock_state(POWER_STATE_SCREEN_OFF);
-       mp_player_mgr_safety_volume_set(ad->app_is_foreground);
-       ad->sleep_locked = false;
-       ad->sleep_unlock_timer = NULL;
-       return false;
-}*/
-
 bool
 mp_util_sleep_lock_set(bool lock, bool force_unlock)
 {
-// TEMP_BLOCK #if 0
-#if 0
-       int ret = POWER_ERROR_NONE;
-       struct appdata * ad = mp_util_get_appdata();
-
-       MP_CHECK_FALSE(ad);
-       mp_ecore_timer_del(ad->sleep_unlock_timer);
-
-       if (ad->sleep_locked == lock) {
-               return true;
-       }
-
-       if (lock) {
-               EVENT_TRACE("sleep_lock");
-               ret = power_lock_state(POWER_STATE_SCREEN_OFF, 0);
-               mp_player_mgr_safety_volume_set(ad->app_is_foreground);
-       } else {
-               if (!force_unlock) {
-                       ad->sleep_unlock_timer = ecore_timer_add(30, _sleep_timer_cb, ad);
-               } else {
-                       //unlock power state immediately
-                       _sleep_timer_cb(ad);
-               }
-       }
-       ad->sleep_locked = lock;
-
-       if (ret != POWER_ERROR_NONE) {
-               mp_error("pm_lock(un_lock) error.. [%d]", ret);
-               return FALSE;
-       }
-#endif
        return TRUE;
 }
 

diff --git a/src/core/include/mp-volume.h b/src/core/include/mp-volume.h
index dc61dcc64918470b073699a5324d7f24c2d4a8a6..b7067930b1a8f8f2b58b3d0eefa7bb8597f6d854 100644 (file)
--- a/src/core/include/mp-volume.h
+++ b/src/core/include/mp-volume.h
@@ -40,11 +40,7 @@ typedef void (*Mp_Volume_Change_Cb)(int volume, void *user_data);
 extern "C" {
 #endif
 
-#if 0
-void mp_volume_init(Ecore_X_Window xwin, Elm_Win *Win);
-#else
 void mp_volume_init(void *win);
-#endif
 void mp_volume_finalize(void);
 void mp_volume_key_grab_condition_set(mp_volume_key_grab_condition_e condition, bool enabled);
 bool mp_volume_key_grab_start();

diff --git a/src/core/mp-http-mgr.c b/src/core/mp-http-mgr.c
index 160414797fc173cf7249c8de3fc9a4805b99becc..3a999681384c3dcbd0f4f4da345c0e590381964c 100644 (file)
--- a/src/core/mp-http-mgr.c
+++ b/src/core/mp-http-mgr.c
@@ -104,11 +104,6 @@ static MpHttpState_t _mp_http_mgr_get_network_status()
        if (bwifi_on_off == true) {
                state = MP_HTTP_STATE_WIFI;
        }
-#if 0  /* 3g has issue when getting runtime_info despite SIM is not inserted, it also returns 1 */
-       else if (b3g_on_off == true) {
-               state = MP_HTTP_STATE_CELLULAR;
-       }
-#endif
        else {
                state = MP_HTTP_STATE_OFF;
        }

diff --git a/src/core/mp-volume.c b/src/core/mp-volume.c
index 861795ef6f9e2693ffcd02b60ac13f09de82a1f8..405d1d95de12c8a404bca4327b6d348955d77480 100755 (executable)
--- a/src/core/mp-volume.c
+++ b/src/core/mp-volume.c
@@ -23,11 +23,7 @@
 #include "mp-volume.h"
 
 typedef struct {
-#if 0
-       Ecore_X_Window xwin;
-#else
        void *xwin;
-#endif
        Elm_Win *win;
        bool condition[MP_VOLUME_KEY_GRAB_COND_MAX];
        bool grabbed;
@@ -50,25 +46,13 @@ static MpVolumeKeyMgr_t g_volume_key_mgr;
 
 void _mp_volume_changed_cb(sound_type_e type, unsigned int volume, void *user_data);
 
-#if 0
-void
-mp_volume_init(Ecore_X_Window xwin, Elm_Win *win)
-#else
 void
 mp_volume_init(void *win)
-#endif
 {
        startfunc;
        g_volume_key_mgr.xwin = win;
        g_volume_key_mgr.win = win;
 
-#if 0
-       int res;
-       res = sound_manager_set_volume_changed_cb(_mp_volume_changed_cb, &g_volume_key_mgr);
-       if (res != SOUND_MANAGER_ERROR_NONE) {
-               ERROR_TRACE("Error: sound_manager_set_volume_changed_cb");
-       }
-#endif
        endfunc;
 }
 
@@ -188,18 +172,6 @@ _mp_volume_key_pressed_timer(void *data)
        return ECORE_CALLBACK_RENEW;
 }
 
-#if 0
-void _mp_volume_changed_cb(sound_type_e type, unsigned int volume, void *user_data)
-{
-       EVENT_TRACE("type: %d, volume changed: %d", type, volume);
-       if (type == SOUND_TYPE_MEDIA) {
-               if (g_volume_key_mgr.volume_change_cb) {
-                       g_volume_key_mgr.volume_change_cb(volume, g_volume_key_mgr.user_data);
-               }
-       }
-}
-#endif
-
 void _mp_volume_handle_change(unsigned int volume)
 {
        if (g_volume_key_mgr.volume_change_cb) {

diff --git a/src/include/music.h b/src/include/music.h
index e1362e1d2d8ec0409129d5c1356f072d71c2e4bd..3996922741fdf7cd2c2871e3ee1895bdbd4973a7 100755 (executable)
--- a/src/include/music.h
+++ b/src/include/music.h
@@ -249,11 +249,7 @@ struct appdata
 
        char *lockscreen_wallpaper;
 
-#if 0
-       Ecore_X_Window xwin;
-#else
        void *xwin;
-#endif
 
 #ifdef MP_FEATURE_EXIT_ON_BACK
        Ecore_Event_Handler *callerWinEventHandler;

diff --git a/src/mp-main.c b/src/mp-main.c
index cfbd8917f7d564097e11bb41e325142faea2e72e..df1f9ed9aeef5675069d0b34d251d0921363f142 100755 (executable)
--- a/src/mp-main.c
+++ b/src/mp-main.c
@@ -196,26 +196,6 @@ static void _mp_main_win_visibility_withdrawn_cb(void *data, Evas_Object *obj, v
 {
        struct appdata *ad = (struct appdata *)data;
        mp_retm_if(ad == NULL, "ad is null");
-#if 0
-       Ecore_X_Event_Window_Visibility_Change* ev = (Ecore_X_Event_Window_Visibility_Change *)event;
-
-       if (ev->win == ad->xwin) {
-               main window
-               if (ev->fully_obscured == 1) {
-                       ad->app_is_foreground = false;
-                       mp_player_mgr_vol_type_unset();
-                       mp_player_mgr_safety_volume_set(ad->app_is_foreground);
-                       mp_view_view_pause(mp_view_mgr_get_top_view(GET_VIEW_MGR));
-               } else {
-
-                       ad->app_is_foreground = true;
-                       mp_player_mgr_vol_type_set();
-                       mp_player_mgr_safety_volume_set(ad->app_is_foreground);
-                       mp_view_view_resume(mp_view_mgr_get_top_view(GET_VIEW_MGR));
-               }
-               DEBUG_TRACE("ad->app_is_foreground: %d", ad->app_is_foreground);
-       }
-#endif
        ad->app_is_foreground = false;
        mp_player_mgr_vol_type_unset();
        mp_player_mgr_safety_volume_set(ad->app_is_foreground);
@@ -323,12 +303,8 @@ static void _mp_main_win_focus_out_cb(void *data, Evas_Object *obj, void *event)
                return ECORE_CALLBACK_PASS_ON;
        }
 #endif
-       /* TODO know about the event */
-       /*Ecore_X_Event_Window_Focus_Out *ev = (Ecore_X_Event_Window_Focus_Out *)event;
-       if (ev->win != ad->xwin)
-               return ECORE_CALLBACK_PASS_ON;*/
 
-       /* Testing Code. If a track is getting played or paused,
+       /* If a track is getting played or paused,
           the MiniController should be displayed as soon as the main window goes to back ground.
           When again the Music ICon in Main menu is pressed, the mini controller will be hidden and
           The Main Screen of the Music Application will be displayed. */
@@ -340,50 +316,8 @@ static void _mp_main_win_focus_out_cb(void *data, Evas_Object *obj, void *event)
        mp_voice_ctrl_mgr_stop_listening();
 #endif
 
-       /* return ECORE_CALLBACK_PASS_ON; */
 }
 
-/*static Eina_Bool _mp_main_client_message_cb(void *data, int type, void *event)
-{
-       startfunc;
-
-       struct appdata *ad = data;
-       MP_CHECK_FALSE(ad);
-
-       Ecore_X_Event_Client_Message *ev =
-               (Ecore_X_Event_Client_Message *) event;
-
-       if (ev->message_type == ECORE_X_ATOM_E_ILLUME_ROTATE_ROOT_ANGLE) {
-               ad->quickpanel_angle = ev->data.l[0];
-               DEBUG_TRACE("ROTATION: %d", ad->quickpanel_angle);
-               mp_minicontroller_rotate(ad, ad->quickpanel_angle);
-       } else if (ev->message_type == ECORE_X_ATOM_E_ILLUME_QUICKPANEL_STATE) {
-               bool visible = false;
-               if (ev->data.l[0] == ECORE_X_ATOM_E_ILLUME_QUICKPANEL_ON) {
-                       mp_debug("quickpanel show");
-                       visible = true;
-               } else {
-                       mp_debug("quickpanel hide");
-                       visible = false;
-               }
-//             mp_minicontroller_visible_set(ad, visible);
-               if (visible)
-                       mp_view_mgr_post_event(GET_VIEW_MGR, MP_QUICKPANNEL_SHOW);
-               else
-                       mp_view_mgr_post_event(GET_VIEW_MGR, MP_QUICKPANNEL_HIDE);
-
-#ifdef MP_SOUND_PLAYER
-               if (!visible && ad->player_state == PLAY_STATE_NONE) {
-                       mp_app_exit(ad);
-               }
-#endif
-
-       }
-
-       return ECORE_CALLBACK_PASS_ON;
-}*/
-/* TEMP_BLOCK #if 0 */
-#if 1 /* start */
 static void __mp_main_lcd_state_changed_cb(device_callback_e type, void *state_data, void *user_data)
 {
        struct appdata *ad = user_data;
@@ -438,7 +372,6 @@ static void __mp_main_lcd_state_changed_cb(device_callback_e type, void *state_d
                }
        }
 }
-#endif /* end */
 
 static bool _parse_widget_event(bundle *b, bool *activate_window)
 {
@@ -847,31 +780,6 @@ _mp_main_parse_request_type(struct appdata *ad, app_control_h app_control, const
        return ret;
 }
 
-/*
-#ifdef MP_FEATURE_EXIT_ON_BACK
-static Eina_Bool
-_mp_main_caller_win_destroy_cb(void *data, int type, void *event)
-{
-       startfunc;
-       Ecore_X_Event_Window_Hide *ev;
-       struct appdata *ad = data;
-       MP_CHECK_VAL(ad, ECORE_CALLBACK_RENEW);
-
-       ev = event;
-       if (ev == NULL) {
-               DEBUG_TRACE("ev is NULL");
-               return ECORE_CALLBACK_RENEW;
-       }
-        DEBUG_TRACE("win: %d, caller_win: %d", ev->win ,ad->caller_win_id);
-       if (ev->win == ad->caller_win_id) {
-               elm_exit();
-       }
-
-       return ECORE_CALLBACK_RENEW;
-}
-#endif
-*/
-
 #ifdef MP_SOUND_PLAYER
 static void
 _mp_main_set_transient(struct appdata *ad, app_control_h app_control)
@@ -879,29 +787,9 @@ _mp_main_set_transient(struct appdata *ad, app_control_h app_control)
 #ifdef MP_FEATURE_EXIT_ON_BACK
        if (ad->caller_win_id) {
                DEBUG_TRACE("unset transient for win: 0x%x", ad->caller_win_id);
-//             ecore_x_icccm_transient_for_unset(elm_win_xwindow_get(ad->win_main));
-//             ecore_event_handler_del(ad->callerWinEventHandler);
                ad->caller_win_id = 0;
                ad->callerWinEventHandler = NULL;
        }
-
-#if 0
-       unsigned int id = 0;
-       app_control_get_window(app_control, &id);
-       app_control_get_extra_data(app_control, MP_EXIT_ON_BACK, &value);
-
-       if (id && value && !strcasecmp(value, "true")) {
-//             ecore_x_icccm_transient_for_set(elm_win_xwindow_get(ad->win_main), id);
-//             ecore_x_window_client_manage(id);
-
-               /*ad->callerWinEventHandler =
-                       ecore_event_handler_add(ECORE_X_EVENT_WINDOW_DESTROY,
-                                               _mp_main_caller_win_destroy_cb, ad);
-               ad->caller_win_id = id;*/
-       }
-       IF_FREE(value);
-#endif
-
 #endif
 }
 #endif

diff --git a/src/setting/layout/ms-sound-alive.edc b/src/setting/layout/ms-sound-alive.edc
index b73977bbfa86601f4cbda114f580db8a445bb410..c3c8b449ece56902b14e40b6b62fa7c782dd2060 100644 (file)
--- a/src/setting/layout/ms-sound-alive.edc
+++ b/src/setting/layout/ms-sound-alive.edc
@@ -400,33 +400,6 @@ group { name: "ms-effect-layout";
                         align: 1 0;
                 }
            }
-          #if 0
-           part { name: "padding_top";
-                type: RECT;
-                scale: 1;
-                mouse_events: 0;
-                description { state: "default" 0.0;
-                        rel1 { relative: 0 1; to_x: "effect_area"; to_y: "sa_toolbar_box"; }
-                        rel2 { relative: 1 1; to_x: "effect_area"; to_y: "sa_toolbar_box"; }
-                        min: 0 0;
-                        fixed: 0 1;
-                        visible: 0;
-                }
-           }
-           part { name: "padding_bottom";
-                type: RECT;
-                scale: 1;
-                mouse_events: 0;
-                description { state: "default" 0.0;
-                        rel1 { relative: 0 1; to: "effect_area"; }
-                        rel2 { relative: 1 1; to: "effect_area"; }
-                        min: 0 40;
-                        align: 0.0 1.0;
-                        fixed: 0 1;
-                        visible: 0;
-                }
-           }
-          #endif
            part { name: "contain_area_bg";
                 type: RECT;
                 scale: 1;

diff --git a/src/view/mp-player-view.c b/src/view/mp-player-view.c
index 783b677f215406aa5c856af86c94a4121b9e8582..a287a7f0ea7850a6d70882d385e360a125c101a1 100755 (executable)
--- a/src/view/mp-player-view.c
+++ b/src/view/mp-player-view.c
@@ -189,11 +189,7 @@ static void _mp_player_view_destroy_queue_list(void *data)
        trans = elm_transit_add();
        elm_transit_object_add(trans, queue_title_list);
 
-#if 0 /*update effect from zoom to bottom-top*/
-       elm_transit_effect_zoom_add(trans, PLAYER_VIEW_ZOOM_TO, PLAYER_VIEW_ZOOM_FROM);
-#else
        elm_transit_effect_translation_add(trans, 0, y, 0, y + h);
-#endif
        elm_transit_tween_mode_set(trans, ELM_TRANSIT_TWEEN_MODE_ACCELERATE);
        elm_transit_duration_set(trans, PLAYER_VIEW_TRANSIT_INTERVAL);
        elm_transit_smooth_set(trans, EINA_FALSE);
@@ -268,11 +264,7 @@ static void _mp_player_view_create_queue_list_transit(void *data)
        Elm_Transit *trans;
        trans = elm_transit_add();
        elm_transit_object_add(trans, queue_title_list);
-#if 0 /*update effect from zoom to bottom-top*/
-       elm_transit_effect_zoom_add(trans, PLAYER_VIEW_ZOOM_FROM, PLAYER_VIEW_ZOOM_TO);
-#else
        elm_transit_effect_translation_add(trans, 0, y + h, 0, y);
-#endif
        elm_transit_objects_final_state_keep_set(trans, EINA_TRUE);
        elm_transit_tween_mode_set(trans, ELM_TRANSIT_TWEEN_MODE_ACCELERATE);
        elm_transit_duration_set(trans, PLAYER_VIEW_TRANSIT_INTERVAL);

diff --git a/src/widget/include/mp-mini-player.h b/src/widget/include/mp-mini-player.h
index ad3dfee19329073ae0920305770601c162700deb..6b0e73ca33f6d6c3f7fdee3bd540f9bfa27d4779 100644 (file)
--- a/src/widget/include/mp-mini-player.h
+++ b/src/widget/include/mp-mini-player.h
@@ -44,12 +44,8 @@ typedef struct
        bool mini_player_mode;
        int mini_player_current_size;
        Evas_Object *win_mini;
-        Evas_Object *bg;
-#if 0
-        Ecore_X_Window *xwin;
-#else
-        void *xwin;
-#endif
+       Evas_Object *bg;
+       void *xwin;
        Evas_Object *title;
        Evas_Object *event_box;
         Evas_Object *mini_lyric_view;

diff --git a/src/widget/mp-album-detail-list.c b/src/widget/mp-album-detail-list.c
index 00e9e20be61e3cd27f38127323c9f8360843c579..efd0aa0c223a7b03d84fed8889c526597d132589 100755 (executable)
--- a/src/widget/mp-album-detail-list.c
+++ b/src/widget/mp-album-detail-list.c
@@ -222,17 +222,6 @@ static void _mp_album_detail_list_append_item(MpAlbumDetailList_t *list, mp_medi
                item = mp_media_info_list_nth_item(svc_handle, index);
                mp_list_item_data_t *item_data;
 
-               /* check DRM FL */
-#if 0
-               if (mp_list_get_edit((MpList_t *)list) && mp_list_get_edit_type((MpList_t *)list) == MP_LIST_EDIT_TYPE_SHARE) {
-                       char *file_name = NULL;
-                       mp_media_info_get_file_path(item,  &file_name);
-
-                       if (mp_drm_check_foward_lock(file_name)) {
-                               continue;
-                       }
-               }
-#endif
 #ifdef MP_FEATURE_PERSONAL_PAGE
                char *path = NULL;
                mp_media_info_get_file_path(item, &path);

diff --git a/src/widget/mp-all-list.c b/src/widget/mp-all-list.c
index 66075417451db15e7807b0ef4f40f8c526f97def..1b4285ec9a636cbc86f4250c5b92906d88b5f98c 100755 (executable)
--- a/src/widget/mp-all-list.c
+++ b/src/widget/mp-all-list.c
@@ -1769,49 +1769,6 @@ END:
        endfunc;
 }
 
-#if 0
-static char *_mp_media_info_get_live_auto_playlist_thumbnail_by_name(const char *name)
-{
-       MP_CHECK_VAL(name, NULL);
-
-       char *thumb_path = (char *)malloc(1024*sizeof(char));
-       char *shared_path = app_get_shared_resource_path();
-
-       if (!g_strcmp0(name, STR_MP_FAVOURITES)) {
-               snprintf(thumb_path, 1024, "%s%s/%s", shared_path, "shared_images", LIVE_THUMBNAIL_QUICK_LIST);
-       } else if (!g_strcmp0(name, STR_MP_RECENTLY_PLAYED)) {
-               snprintf(thumb_path, 1024, "%s%s/%s", shared_path, "shared_images", LIVE_THUMBNAIL_RECENTLY_PLAYED);
-       } else if (!g_strcmp0(name, STR_MP_RECENTLY_ADDED)) {
-               snprintf(thumb_path, 1024, "%s%s/%s", shared_path, "shared_images", LIVE_THUMBNAIL_RECENTLY_ADDED);
-       } else if (!g_strcmp0(name, STR_MP_MOST_PLAYED)) {
-               snprintf(thumb_path, 1024, "%s%s/%s", shared_path, "shared_images", LIVE_THUMBNAIL_MOST_PLAYED);
-       }
-       free(shared_path);
-
-       return thumb_path;
-}
-
-static char *_mp_media_info_get_live_auto_playlist_icon_by_name(const char *name)
-{
-       MP_CHECK_VAL(name, NULL);
-
-       char *icon_path = (char *)malloc(1024*sizeof(char));
-       char *shared_path = app_get_shared_resource_path();
-
-       if (!g_strcmp0(name, STR_MP_FAVOURITES)) {
-               snprintf(icon_path, 1024, "%s%s/%s", shared_path, "shared_images", LIVE_ICON_QUICK_LIST);
-       } else if (!g_strcmp0(name, STR_MP_RECENTLY_PLAYED)) {
-               snprintf(icon_path, 1024, "%s%s/%s", shared_path, "shared_images", LIVE_ICON_RECENTLY_PLAYED);
-       } else if (!g_strcmp0(name, STR_MP_RECENTLY_ADDED)) {
-               snprintf(icon_path, 1024, "%s%s/%s", shared_path, "shared_images", LIVE_ICON_RECENTLY_ADDED);
-       } else if (!g_strcmp0(name, STR_MP_MOST_PLAYED)) {
-               snprintf(icon_path, 1024, "%s%s/%s", shared_path, "shared_images", LIVE_ICON_MOST_PLAYED);
-       }
-
-       return icon_path;
-}
-#endif
-
 #ifdef MP_FEATURE_ADD_TO_HOME
 static void mp_all_add_to_home_cb(void *data, Evas_Object * obj, void *event_info)
 {

diff --git a/src/widget/mp-lockscreenmini.c b/src/widget/mp-lockscreenmini.c
index aac4f1c39eaded00050cb8b36a6777866e74a64e..1ce4875fce9abe4feebec00f395bf2af3e2a215e 100755 (executable)
--- a/src/widget/mp-lockscreenmini.c
+++ b/src/widget/mp-lockscreenmini.c
@@ -372,75 +372,10 @@ _mp_lockscreenmini_progressarea_down_cb(void *data, Evas * e, Evas_Object * obj,
 
        ad->progress_dragging = true;
 
-#if 0
-       elm_object_signal_emit(ad->lockmini_progress_bar, "signal.lockscreenmini.progress.click", "*");
-
-       Evas_Object *progressbar = obj;
-       int w = 0, current = 0, x = 0;
-       double ratio = 0.0;
-
-       evas_object_geometry_get(progressbar, &x, NULL, &w, NULL);
-       current = ev->canvas.x - x;
-       if (current < 0) {
-               current = 0;
-       } else if (current > w) {
-               current = w;
-       }
-
-       ratio = (double)current / w;
-       DEBUG_TRACE("canvas.x:%d  x:%d  w:%d", ev->canvas.x, x, w);
-
-       int duration = mp_player_mgr_get_duration();
-       if (duration <= 0) {
-               mp_track_info_t *track_info = ad->current_track_info;
-               if (track_info) {
-                       duration = track_info->duration;
-               }
-       }
-
-       ad->music_length = duration / 1000.;
-
-       ad->music_pos = ratio * ad->music_length;
-
-       _mp_lockscreenmini_progress_val_set(ad, ratio);
-       _mp_lockscreenmini_update_elapsed_time(ad, false);
-#endif
        endfunc;
 }
 #endif
-#if 0
-static void
-_mp_lockscreenmini_progressarea_move_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
-{
-       startfunc;
-       struct appdata *ad = data;
-       MP_CHECK(ad);
-       MP_CHECK(ad->lockmini_progress_bar);
-
-       Evas_Event_Mouse_Down *ev = event_info;
-       Evas_Object *progressbar = obj;
-       int w = 0, current = 0, x = 0;
-       double ratio = 0.0;
-       int new_pos;
-
-       evas_object_geometry_get(progressbar, &x, NULL, &w, NULL);
-       current = ev->canvas.x - x;
-       if (current < 0) {
-               current = 0;
-       } else if (current > w) {
-               current = w;
-       }
-
-       ratio = (double)current / w;
-
-       new_pos = ratio * ad->music_length;
-       ad->music_pos = new_pos;
 
-       _mp_lockscreenmini_progress_val_set(ad, ratio);
-       _mp_lockscreenmini_update_elapsed_time(ad, false);
-       endfunc;
-}
-#endif
 #ifdef LOCKSCREEN_ENABLE_PROGRESS
 static void
 _mp_lockscreenmini_progressarea_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
@@ -520,10 +455,6 @@ static void _mp_lockscreenmini_create_progress_layout(struct appdata *ad)
                                       _mp_lockscreenmini_progressarea_down_cb, ad);
        evas_object_event_callback_add(ad->lockmini_progress_bar, EVAS_CALLBACK_MOUSE_UP,
                                       _mp_lockscreenmini_progressarea_up_cb, ad);
-#if 0
-       evas_object_event_callback_add(ad->lockmini_progress_bar, EVAS_CALLBACK_MOUSE_MOVE,
-                                      _mp_lockscreenmini_progressarea_move_cb, ad);
-#endif
 }
 #endif
 void

diff --git a/src/widget/mp-track-list.c b/src/widget/mp-track-list.c
index 3bccb0b9121aaa4018cddef7ce2614392a0cf1a9..e2b819f3ee6c3ca58961851bcde8d37bcfdd2a50 100644 (file)
--- a/src/widget/mp-track-list.c
+++ b/src/widget/mp-track-list.c
@@ -569,16 +569,7 @@ static void _mp_track_list_append_item(MpTrackList_t *list, mp_media_list_h svc_
                        }
                }
 #endif
-               /* check DRM FL */
-#if 0
-               if (mp_list_get_edit((MpList_t *)list) && mp_list_get_edit_type((MpList_t *)list) == MP_LIST_EDIT_TYPE_SHARE) {
-                       char *file_name = NULL;
-                       mp_media_info_get_file_path(item,  &file_name);
-                       if (mp_drm_check_foward_lock(file_name)) {
-                               continue;
-                       }
-               }
-#endif
+
 #ifdef MP_FEATURE_PERSONAL_PAGE
                char *path = NULL;
                mp_media_info_get_file_path(item, &path);

diff --git a/widget/src/mp-widget-main.c b/widget/src/mp-widget-main.c
index de32d4a02c31dc2ee6e685c5c1ffaaaaf179ecf3..4988b0490641c607c14ac3b338d6ad34a99dee73 100644 (file)
--- a/widget/src/mp-widget-main.c
+++ b/widget/src/mp-widget-main.c
@@ -79,11 +79,6 @@ int widget_Create(widget_context_h context, bundle *content, int w, int h, void
 
 int widget_Destroy(widget_context_h context, widget_app_destroy_type_e reason, bundle *content, void *data)
 {
-#if 0
-       if (reason != WIDGET_APP_DESTROY_TYPE_PERMANENT) {
-               // Save the current status at the bundle object.
-       }
-#endif
        DEBUG_TRACE("Widget Destroy");
        WidgetData *widget_data = NULL;