[Code Cleanup] Removed MINICONTROLLER_ENABLE_PROGRESS LOCKSCREEN_ENABLE_PROGRESS... 23/101523/1
authorbhutani.92 <bhutani.92@samsung.com>
Thu, 1 Dec 2016 10:27:43 +0000 (15:57 +0530)
committerbhutani.92 <bhutani.92@samsung.com>
Thu, 1 Dec 2016 10:27:43 +0000 (15:57 +0530)
Change-Id: I50c4311eea87a754e72c746e950030c2f3bbdb02
Signed-off-by: bhutani.92 <bhutani.92@samsung.com>
src/core/mp-player-control.c
src/core/mp-setting-ctrl.c
src/view/mp-player-view.c
src/widget/include/mp-lockscreenmini.h
src/widget/include/mp-minicontroller.h
src/widget/mp-lockscreenmini.c
src/widget/mp-minicontroller.c

index da2aa6d..5b5754f 100644 (file)
 #include "mp-streaming-mgr.h"
 #include "mp-ug-launch.h"
 
-#ifdef MP_SOUND_PLAYER
-
-#else
 #include "mp-common.h"
-#endif
 #include "mp-view-mgr.h"
 
 #include "mp-player-view.h"
@@ -121,13 +117,6 @@ _mp_play_control_long_press_seek_done_cb(void *data)
        if (view) {
                mp_player_view_progress_timer_thaw(view);
        }
-
-       struct appdata *ad = mp_util_get_appdata();
-       MP_CHECK(ad);
-       mp_minicontroller_update_progressbar(ad);
-#ifdef MP_FEATURE_LOCKSCREEN
-       mp_lockscreenmini_update_progressbar(ad);
-#endif
 }
 
 static void
@@ -806,15 +795,6 @@ mp_play_control_menu_cb(void *data, Evas_Object * o, const char *emission, const
                mp_setting_set_repeat_state(MP_SETTING_REP_NON);
                mp_playlist_mgr_set_repeat(ad->playlist_mgr, MP_PLST_REPEAT_NONE);
        }
-       if (ad->win_minicon) {
-               mp_minicontroller_update_shuffle_and_repeat_btn(ad);
-       }
-
-#ifdef MP_FEATURE_LOCKSCREEN
-       if (ad->win_lockmini) {
-               mp_lockscreenmini_update_shuffle_and_repeat_btn(ad);
-       }
-#endif
 }
 
 
@@ -827,7 +807,6 @@ mp_play_control_end_of_stream(void *data)
 
        ad->music_pos = ad->music_length;
        mp_player_view_update_progressbar(GET_PLAYER_VIEW);
-       mp_minicontroller_update_progressbar(ad);
 #ifdef MP_SOUND_PLAYER
        mp_plst_item *plst_item = NULL;
 
index f556fa3..9a0a438 100644 (file)
@@ -155,7 +155,6 @@ _mp_setting_shuffle_changed_cb(const char *key, void *user_data)
        mp_playlist_mgr_set_shuffle(ad->playlist_mgr, val);
 
        mp_player_view_update_state(GET_PLAYER_VIEW);
-       mp_minicontroller_update_shuffle_and_repeat_btn(ad);
 }
 
 static void
@@ -169,7 +168,6 @@ _mp_setting_repeat_changed_cb(const char *key, void *user_data)
        mp_playlist_mgr_set_repeat(ad->playlist_mgr, val);
 
        mp_player_view_update_state(GET_PLAYER_VIEW);
-       mp_minicontroller_update_shuffle_and_repeat_btn(ad);
 }
 
 static int
index 9ae8067..6906ab4 100644 (file)
@@ -2220,9 +2220,6 @@ static void _mp_player_view_shuffle_btn_clicked_cb(void *data, Evas_Object *obj,
        shuffle_state = !shuffle_state;
        _mp_player_view_set_shuffle_image(data, shuffle_state);
        mp_play_control_shuffle_set(ad, shuffle_state);
-       if (ad->win_minicon) {
-               mp_minicontroller_update_shuffle_and_repeat_btn(ad);
-       }
        mp_view_mgr_post_event(GET_VIEW_MGR, MP_UPDATE_NOW_PLAYING);
 }
 
@@ -2262,9 +2259,6 @@ static void _mp_player_view_repeat_btn_clicked_cb(void *data, Evas_Object *obj,
        mp_setting_set_repeat_state(repeat_state);
        _mp_player_view_set_rep_image(view, repeat_state);
        mp_playlist_mgr_set_repeat(ad->playlist_mgr, repeat_state);
-       if (ad->win_minicon) {
-               mp_minicontroller_update_shuffle_and_repeat_btn(ad);
-       }
        mp_view_mgr_post_event(GET_VIEW_MGR, MP_UPDATE_NOW_PLAYING);
 }
 
index 92fc31d..79090c0 100644 (file)
@@ -33,12 +33,10 @@ int mp_lockscreenmini_hide(struct appdata *ad);
 int mp_lockscreenmini_show(struct appdata *ad);
 int mp_lockscreenmini_destroy(struct appdata *ad);
 void mp_lockscreenmini_update_control(struct appdata *ad);
-void mp_lockscreenmini_update_shuffle_and_repeat_btn(struct appdata *ad);
 void mp_lockscreenmini_update(struct appdata *ad);
 void mp_lockscreenmini_visible_set(struct appdata *ad, bool visible);
 bool mp_lockscreenmini_visible_get(struct appdata *ad);
 void mp_lockscreenmini_on_lcd_event(struct appdata *ad, bool lcd_on);
-void mp_lockscreenmini_update_progressbar(struct appdata *ad);
 Eina_Bool _mp_lockscreenmini_hide_music_controller(void *data);
 
 #endif
index 210324b..7183707 100644 (file)
@@ -31,13 +31,11 @@ int mp_minicontroller_hide(struct appdata *ad);
 int mp_minicontroller_show(struct appdata *ad);
 int mp_minicontroller_destroy(struct appdata *ad);
 void mp_minicontroller_update_control(struct appdata *ad);
-void mp_minicontroller_update_shuffle_and_repeat_btn(struct appdata *ad);
 void mp_minicontroller_update(struct appdata *ad, bool with_title);
 void mp_minicontroller_rotate(struct appdata *ad, int angle);
 void mp_minicontroller_visible_set(struct appdata *ad, bool visible);
 bool mp_minicontroller_visible_get(struct appdata *ad);
 void mp_minicontroller_on_lcd_event(struct appdata *ad, bool lcd_on);
-void mp_minicontroller_update_progressbar(struct appdata *ad);
 int _mp_is_current_focus_available(struct appdata *ad);
 
 #endif
index 18d4d03..979ca59 100644 (file)
@@ -51,16 +51,8 @@ static time_t press_time;
 static time_t release_time;
 static Evas_Object *_load_edj(Evas_Object * parent, const char *file, const char *group);
 static void _load_lockscreenmini(struct appdata *ad);
-#ifdef LOCKSCREEN_ENABLE_PROGRESS
-static void _mp_lockscreenmini_progress_val_set(struct appdata *ad, double position);
-#endif
 static void _mp_lockscreenmini_update_layout(struct appdata *ad, bool landscape);
-#ifdef MP_FEATURE_LOCKSCREEN
-static void _mp_lockscreenmini_set_repeate_image(void *data, int repeate_state);
-static void _mp_lockscreenmini_set_shuffle_image(void *data, int shuffle_state);
 static int port_id;
-#endif
-
 
 static void lockscreen_message_port_cb(int trusted_local_port_id, const char *remote_app_id,
     const char *remote_port, bool trusted_remote_port, bundle *message, void *data)
@@ -101,167 +93,6 @@ static bool _mp_lockscreenmini_is_long_press()
        return result;
 }
 
-#ifdef LOCKSCREEN_ENABLE_PROGRESS
-static inline void
-_mp_lockscreenmini_update_elapsed_time(struct appdata *ad, bool get_pos)
-{
-       MP_CHECK(ad);
-       MP_CHECK(ad->lockmini_layout);
-
-       double played_ratio = 0.;
-       double music_pos = 0.;
-       if (get_pos) {
-               music_pos = mp_player_mgr_get_position() / 1000;
-       } else {
-               music_pos = ad->music_pos;
-       }
-
-       char play_time[16] = { 0, };
-       char total_time[16] = { 0, };
-
-       double duration = ad->music_length;
-
-       if (duration > 0.) {
-               if (duration > 3600.) {
-                       snprintf(total_time, sizeof(total_time), "%" MUSIC_TIME_FORMAT,
-                                MUSIC_TIME_ARGS(duration));
-                       snprintf(play_time, sizeof(play_time), "%" MUSIC_TIME_FORMAT, MUSIC_TIME_ARGS(music_pos));
-               } else {
-                       snprintf(total_time, sizeof(total_time), "%" PLAY_TIME_FORMAT,
-                                PLAY_TIME_ARGS(duration));
-                       snprintf(play_time, sizeof(play_time), "%" PLAY_TIME_FORMAT, PLAY_TIME_ARGS(music_pos));
-               }
-       } else {
-               if (ad->current_track_info) {
-                       snprintf(total_time, sizeof(total_time), "%" PLAY_TIME_FORMAT,
-                                PLAY_TIME_ARGS(ad->current_track_info->duration / 1000.));
-               }
-               snprintf(play_time, sizeof(play_time), "%" PLAY_TIME_FORMAT, PLAY_TIME_ARGS(music_pos));
-       }
-
-       edje_object_part_text_set(_EDJ(ad->lockmini_layout), "np_progress_text_total", total_time);
-       edje_object_part_text_set(_EDJ(ad->lockmini_layout), "np_progress_text_playing", play_time);
-
-       if (ad->music_length > 0. && music_pos > 0.) {
-               played_ratio = music_pos / ad->music_length;
-       }
-       _mp_lockscreenmini_progress_val_set(ad, played_ratio);
-}
-
-static Eina_Bool
-_lockscreenmini_update_progresstime_cb(void *data)
-{
-       TIMER_TRACE();
-       struct appdata *ad = data;
-       mp_retvm_if(ad == NULL, ECORE_CALLBACK_CANCEL, "appdata is NULL");
-
-       if (ad->is_lcd_off) {
-               mp_ecore_timer_del(ad->lockmini_progress_timer);
-               return ECORE_CALLBACK_CANCEL;
-       }
-       if (ad->progress_dragging) {
-               return ECORE_CALLBACK_RENEW;
-       }
-
-       if (ad->player_state == PLAY_STATE_PLAYING) {
-               _mp_lockscreenmini_update_elapsed_time(ad, true);
-       }
-
-       return ECORE_CALLBACK_RENEW;
-}
-
-static void
-_lockscreenmini_progress_timer_add(void *data)
-{
-       struct appdata *ad = data;
-       mp_retm_if(ad == NULL, "appdata is NULL");
-       DEBUG_TRACE();
-
-       mp_ecore_timer_del(ad->lockmini_progress_timer);
-
-       _mp_lockscreenmini_update_elapsed_time(ad, true);
-       if (ad->player_state == PLAY_STATE_PLAYING) {
-               ad->lockmini_progress_timer = ecore_timer_add(1.0, _lockscreenmini_update_progresstime_cb, ad);
-       }
-}
-#endif
-
-#ifdef LOCKSCREEN_ENABLE_SHUFFLE_REPEAT
-static char *_mp_lockscreenmini_shuffle_access_info_cb(void *data, Evas_Object *obj)
-{
-       startfunc;
-       DEBUG_TRACE("shuffle button clicked");
-       struct appdata *ad = mp_util_get_appdata();
-       MP_CHECK_NULL(ad);
-
-       char *operation_txt = NULL;
-       int shuffle_state = 0;
-       mp_setting_get_shuffle_state(&shuffle_state);
-
-       if (shuffle_state == 1) {
-               operation_txt = GET_SYS_STR(MP_TTS_SHUFFLE_OFF_BUTTON);
-       } else {
-               operation_txt = GET_SYS_STR(MP_TTS_SHUFFLE_ON_BUTTON);
-       }
-
-       return g_strdup(operation_txt);
-}
-#endif
-
-#ifdef LOCKSCREEN_ENABLE_SHUFFLE_REPEAT
-static char *_mp_lockscreenmini_repeat_access_info_cb(void *data, Evas_Object *obj)
-{
-       startfunc;
-       DEBUG_TRACE("repeat button clicked");
-       struct appdata *ad = mp_util_get_appdata();
-       MP_CHECK_NULL(ad);
-
-       char *operation_txt = NULL;
-       int repeat_state = 0;
-       mp_setting_get_repeat_state(&repeat_state);
-       if (MP_PLST_REPEAT_ONE == repeat_state) {
-               operation_txt = GET_SYS_STR(MP_TTS_REPEAT_ONE_BUTTON);
-       } else if (MP_PLST_REPEAT_NONE == repeat_state) {
-               operation_txt = GET_SYS_STR(MP_TTS_REPEAT_OFF_BUTTON);
-       } else {
-               /*repeat all*/
-               operation_txt = GET_SYS_STR(MP_TTS_REPEAT_ALL_BUTTON);
-       }
-       return g_strdup(operation_txt);
-}
-#endif
-
-#ifdef MP_FEATURE_LOCKSCREEN
-static void _mp_lockscreenmini_set_shuffle_image(void *data, int shuffle_state)
-{
-       struct appdata *ad = (struct appdata *)data;
-       MP_CHECK(ad);
-       MP_CHECK(ad->lockmini_layout);
-       ERROR_TRACE("");
-
-       if (shuffle_state) {
-               elm_object_signal_emit(ad->lockmini_layout, "set_shuffle_on", "*");
-       } else {
-               elm_object_signal_emit(ad->lockmini_layout, "set_shuffle_off", "*");
-       }
-}
-static void _mp_lockscreenmini_set_repeate_image(void *data, int repeate_state)
-{
-       struct appdata *ad = (struct appdata *)data;
-       MP_CHECK(ad);
-       MP_CHECK(ad->lockmini_layout);
-       ERROR_TRACE("");
-
-       if (MP_PLST_REPEAT_ONE == repeate_state) {
-               elm_object_signal_emit(ad->lockmini_layout, "set_repeat_btn_1", "*");
-       } else if (MP_PLST_REPEAT_NONE == repeate_state) {
-               elm_object_signal_emit(ad->lockmini_layout, "set_repeat_btn_a", "*");
-       } else {
-               elm_object_signal_emit(ad->lockmini_layout, "set_repeat_btn_all", "*");
-       }
-
-}
-#endif
 static Evas_Object *
 _load_edj(Evas_Object *parent, const char *file, const char *group)
 {
@@ -338,124 +169,6 @@ _load_lockscreenmini(struct appdata *ad)
        return;
 }
 
-static void
-_mp_lockscreenmini_register_reader(void *data)
-{
-       struct appdata *ad = data;
-       MP_CHECK(ad);
-}
-
-#ifdef LOCKSCREEN_ENABLE_PROGRESS
-static void
-_mp_lockscreenmini_progess_box_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-       startfunc;
-
-       struct appdata *ad = data;
-       MP_CHECK(ad->lockmini_progress_box);
-
-       ad->lockmini_progress_box = NULL;
-}
-static void
-_mp_lockscreenmini_progressarea_down_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_data_set(obj, "pressed_x", (void *)ev->canvas.x);
-       evas_object_data_set(obj, "timestamp", (void *)ev->timestamp);
-
-       ad->progress_dragging = true;
-
-       endfunc;
-}
-#endif
-
-#ifdef LOCKSCREEN_ENABLE_PROGRESS
-static void
-_mp_lockscreenmini_progressarea_up_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);
-
-       elm_object_signal_emit(ad->lockmini_progress_bar, "signal.lockscreenmini.progress.unclick", "*");
-
-       if (ad->progress_dragging == false) {
-               return;
-       }
-
-       int pressed_x = (int)evas_object_data_get(obj, "pressed_x");
-       unsigned int timestamp = (unsigned int)evas_object_data_get(obj, "timestamp");
-       Evas_Event_Mouse_Up *ev = event_info;
-       if (abs(ev->canvas.x - pressed_x) > 10 || (ev->timestamp - timestamp) > 500) {
-               return;
-       }
-
-       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;
-
-       DEBUG_TRACE("canvas.x:%d  x:%d  w:%d", ev->canvas.x, x, w);
-       if (current < 0) {
-               current = 0;
-       } else if (current > w) {
-               current = w;
-       }
-
-       ratio = (double)current / w;
-
-       ad->music_pos = ratio * ad->music_length;
-
-       DEBUG_TRACE("ad->music_pos=%lf", ad->music_pos);
-       mp_player_mgr_set_position(ad->music_pos * 1000, NULL, NULL);
-
-       ad->progress_dragging = false;
-
-       _mp_lockscreenmini_progress_val_set(ad, ratio);
-       _mp_lockscreenmini_update_elapsed_time(ad, false);
-       endfunc;
-}
-
-static void
-_mp_lockscreenmini_progress_val_set(struct appdata *ad, double position)
-{
-       MP_CHECK(ad);
-       MP_CHECK(ad->lockmini_layout);
-       MP_CHECK(ad->lockmini_progress_bar);
-
-       edje_object_part_drag_value_set(_EDJ(ad->lockmini_progress_bar), "progressbar_playing", position, 0.0);
-       return;
-}
-
-static void _mp_lockscreenmini_create_progress_layout(struct appdata *ad)
-{
-       startfunc;
-
-       ad->lockmini_progress_box = mp_common_load_edj(ad->lockmini_layout, LOCKSCREENMINI_EDJ_NAME, "lockscreenmini_progress_box");
-       MP_CHECK(ad->lockmini_progress_box);
-       evas_object_event_callback_add(ad->lockmini_progress_box, EVAS_CALLBACK_DEL, _mp_lockscreenmini_progess_box_del_cb, ad);
-       elm_object_part_content_set(ad->lockmini_layout, "progress_box", ad->lockmini_progress_box);
-
-       ad->lockmini_progress_bar = mp_common_load_edj(ad->lockmini_progress_box, LOCKSCREENMINI_EDJ_NAME, "lockscreenmini_player_progressbar");
-       MP_CHECK(ad->lockmini_progress_bar);
-       elm_object_part_content_set(ad->lockmini_progress_box, "progress_bar", ad->lockmini_progress_bar);
-       _mp_lockscreenmini_progress_val_set(ad, 0.0);
-
-       evas_object_event_callback_add(ad->lockmini_progress_bar, EVAS_CALLBACK_MOUSE_DOWN,
-                                      _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);
-}
-#endif
 void
 mp_lockscreenmini_update_winmini_size(struct appdata *ad)
 {
@@ -495,7 +208,6 @@ mp_lockscreenmini_create(struct appdata *ad)
                        DEBUG_TRACE("ERROR");
                        return -1;
                }
-               _mp_lockscreenmini_register_reader(ad);
        }
 
        mp_lockscreenmini_update_winmini_size(ad);
@@ -536,15 +248,6 @@ mp_lockscreenmini_show(struct appdata *ad)
        return 0;
 }
 
-#ifdef LOCKSCREEN_ENABLE_PROGRESS
-static void _mp_lockscreenmini_update_progressbar_state(struct appdata *ad)
-{
-       startfunc;
-       mp_retm_if(ad == NULL, "appdata is NULL");
-       MP_CHECK(ad->lockmini_progress_bar);
-}
-#endif
-
 static void _mp_lockscreenmini_update_btn(struct appdata *ad)
 {
        startfunc;
@@ -560,10 +263,6 @@ static void _mp_lockscreenmini_update_btn(struct appdata *ad)
                edje_object_signal_emit(elm_layout_edje_get(ad->lockmini_layout), "play_btn_invisible", "play_btn");
                edje_object_signal_emit(elm_layout_edje_get(ad->lockmini_layout), "pause_btn_visible", "pause_btn");
        }
-
-#ifdef LOCKSCREEN_ENABLE_PROGRESS
-       _mp_lockscreenmini_update_progressbar_state(ad);
-#endif
 }
 
 static Eina_Bool
@@ -600,26 +299,6 @@ mp_lockscreenmini_update_control(struct appdata *ad)
        _mp_lockscreenmini_update_playpause_btn(ad);
 }
 
-#ifdef MP_FEATURE_LOCKSCREEN
-void
-mp_lockscreenmini_update_shuffle_and_repeat_btn(struct appdata *ad)
-{
-       startfunc;
-       mp_retm_if(ad == NULL, "appdata is NULL");
-       MP_CHECK(ad->win_lockmini);
-       MP_CHECK(!ad->is_lcd_off);
-
-       int shuffle_state = 0;
-       int repeat_state = 0;
-       mp_setting_get_shuffle_state(&shuffle_state);
-       mp_setting_get_repeat_state(&repeat_state);
-
-       _mp_lockscreenmini_set_shuffle_image((void *)ad, shuffle_state);
-       _mp_lockscreenmini_set_repeate_image((void *)ad, repeat_state);
-
-}
-#endif
-
 Eina_Bool _mp_lockscreenmini_hide_music_controller(void *data)
 {
        struct appdata *ad = data;
@@ -657,24 +336,7 @@ static void _mp_lockscreenmini_play_pause_btn_clicked_cb(void *data, Evas_Object
                mp_play_control_play_pause(ad, true);
        }
 }
-#ifdef LOCKSCREEN_ENABLE_SHUFFLE_REPEAT
-static void _mp_lockscreenmini_repeat_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       DEBUG_TRACE("repeat button clicked");
 
-       struct appdata *ad = mp_util_get_appdata();
-       MP_CHECK(ad);
-
-       int repeat_state = 0;
-       mp_setting_get_repeat_state(&repeat_state);
-       repeat_state++;
-       repeat_state %= 3;
-       mp_setting_set_repeat_state(repeat_state);
-       _mp_lockscreenmini_set_repeate_image(ad, repeat_state);
-       mp_playlist_mgr_set_repeat(ad->playlist_mgr, repeat_state);
-       mp_player_view_update_state(GET_PLAYER_VIEW);
-}
-#endif
 static void _mp_lockscreenmini_ff_rew_btn_pressed_cb(void *data, Evas_Object *obj, void *event_info)
 {
        DEBUG_TRACE("button pressed");
@@ -740,19 +402,9 @@ _mp_lockscreenmini_update_layout(struct appdata *ad, bool landscape)
                return ;
        }
 
-#ifdef LOCKSCREEN_ENABLE_PROGRESS
-       _mp_lockscreenmini_create_progress_layout(ad);
-#endif
        elm_win_resize_object_add(ad->win_lockmini, ad->lockmini_layout);
 
        /*add focused UI related*/
-#ifdef LOCKSCREEN_ENABLE_SHUFFLE_REPEAT
-       /*-------> shuffle button ------->*/
-       Evas_Object *shuffle_focus_btn = elm_button_add(ad->lockmini_layout);
-       elm_object_style_set(shuffle_focus_btn, "focus");
-       elm_object_part_content_set(ad->lockmini_layout, "shuffle_focus", shuffle_focus_btn);
-       elm_object_focus_custom_chain_append(ad->lockmini_layout, shuffle_focus_btn, NULL);
-#endif
        /*-------> REW button ------->*/
        Evas_Object *rew_focus_btn = elm_button_add(ad->lockmini_layout);
        elm_object_style_set(rew_focus_btn, "focus");
@@ -778,14 +430,6 @@ _mp_lockscreenmini_update_layout(struct appdata *ad, bool landscape)
        evas_object_smart_callback_add(ff_focus_btn, "pressed", _mp_lockscreenmini_ff_rew_btn_pressed_cb, CONTROLLER_FF_SOURCE);
        evas_object_smart_callback_add(ff_focus_btn, "unpressed", _mp_lockscreenmini_ff_rew_btn_unpressed_cb, CONTROLLER_FF_SOURCE);
 
-#ifdef LOCKSCREEN_ENABLE_SHUFFLE_REPEAT
-       /*-------> repeat button ------->*/
-       Evas_Object *repeat_focus_btn = elm_button_add(ad->lockmini_layout);
-       elm_object_style_set(repeat_focus_btn, "focus");
-       elm_object_part_content_set(ad->lockmini_layout, "repeat_focus", repeat_focus_btn);
-       elm_object_focus_custom_chain_append(ad->lockmini_layout, repeat_focus_btn, NULL);
-       evas_object_smart_callback_add(repeat_focus_btn, "clicked", _mp_lockscreenmini_repeat_btn_clicked_cb, NULL);
-#endif
        _mp_lockscreenmini_update_btn(ad);
 }
 
@@ -857,7 +501,6 @@ mp_lockscreenmini_update(struct appdata *ad)
 
        if (ad->current_track_info->thumbnail_path) {
                DEBUG_TRACE("Thumbnail Location: %s", ad->current_track_info->thumbnail_path);
-               //              ret = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_WALLPAPER_LOCK_SCREEN, ad->current_track_info->thumbnail_path);
                ret = bundle_add_str(b,"lockscreen/background/file_path", ad->current_track_info->thumbnail_path);
                if (ret != BUNDLE_ERROR_NONE) {
                        ERROR_TRACE("failed bundle_add_str in ad->current_track_info->thumbnail_path");
@@ -866,7 +509,6 @@ mp_lockscreenmini_update(struct appdata *ad)
                }
        }
        else {
-               //              ret = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_WALLPAPER_LOCK_SCREEN, ad->lockscreen_wallpaper);
                if(ad->lockscreen_wallpaper) {
                        ret = bundle_add_str(b,"lockscreen/background/file_path", ad->lockscreen_wallpaper);
                        if (ret != BUNDLE_ERROR_NONE) {
@@ -885,21 +527,9 @@ mp_lockscreenmini_update(struct appdata *ad)
        }
        bundle_free(b);
        mp_lockscreenmini_update_control(ad);
-       if (ad->player_state == PLAY_STATE_PLAYING) {
-#ifdef LOCKSCREEN_ENABLE_PROGRESS
-               _lockscreenmini_progress_timer_add(ad);
-#endif
-       }
 
        mp_track_info_t *current_item = ad->current_track_info;
        if (current_item) {
-#ifdef LOCKSCREEN_ENABLE_PROGRESS
-               _mp_lockscreenmini_update_elapsed_time(ad, true);
-#endif
-#ifdef LOCKSCREEN_ENABLE_SHUFFLE_REPEAT
-               mp_lockscreenmini_update_shuffle_and_repeat_btn(ad);
-#endif
-
                _mp_lockscreenmini_title_set(ad);
 
                evas_object_show(ad->lockmini_layout);
@@ -962,22 +592,16 @@ mp_lockscreenmini_visible_set(struct appdata *ad, bool visible)
        _mp_lockscreenmini_title_set(ad);
        mp_lockscreenmini_update_control(ad);
 
-       if (visible) {
-#ifdef LOCKSCREEN_ENABLE_PROGRESS
-               _lockscreenmini_progress_timer_add(ad);
-#endif
+       display_state_e lock_state;
+       int ret = device_display_get_state(&lock_state);
+       if (ret == DEVICE_ERROR_NONE) {
+               ERROR_TRACE("[SUCCESSFULL] Return value is %d", ret);
        } else {
-               display_state_e lock_state;
-               int ret = device_display_get_state(&lock_state);
-               if (ret == DEVICE_ERROR_NONE) {
-                       ERROR_TRACE("[SUCCESSFULL] Return value is %d", ret);
-               } else {
-                       ERROR_TRACE("[ERROR] Return value is %d", ret);
-               }
-               if (lock_state == DISPLAY_STATE_SCREEN_OFF || lock_state == DISPLAY_STATE_SCREEN_DIM) {
-                       ERROR_TRACE("timer locks deleted");
-                       mp_ecore_timer_del(ad->lockmini_progress_timer);
-               }
+               ERROR_TRACE("[ERROR] Return value is %d", ret);
+       }
+       if (lock_state == DISPLAY_STATE_SCREEN_OFF || lock_state == DISPLAY_STATE_SCREEN_DIM) {
+               ERROR_TRACE("timer locks deleted");
+               mp_ecore_timer_del(ad->lockmini_progress_timer);
        }
 }
 
@@ -1004,11 +628,4 @@ void mp_lockscreenmini_on_lcd_event(struct appdata *ad, bool lcd_on)
        mp_lockscreenmini_visible_set(ad, lcd_on);
 }
 
-void mp_lockscreenmini_update_progressbar(struct appdata *ad)
-{
-#ifdef LOCKSCREEN_ENABLE_PROGRESS
-       _mp_lockscreenmini_update_elapsed_time(ad, true);
-#endif
-}
-
 #endif
index e1483cd..95ee10a 100644 (file)
@@ -52,14 +52,7 @@ bool hide_from_mp = false;
 static void _minicontroller_action_cb(void *data, Evas_Object * obj, const char *emission, const char *source);
 static Evas_Object *_load_edj(Evas_Object * parent, const char *file, const char *group);
 static void _load_minicontroller(struct appdata *ad);
-#ifdef MINICONTROLLER_ENABLE_PROGRESS
-static void _mp_minicontroller_progress_val_set(struct appdata *ad, double position);
-#endif
 static void _mp_minicontroller_update_layout(struct appdata *ad, bool landscape);
-#ifdef MINICONTROLLER_ENABLE_SHUFFLLE_REPEAT
-static void _mp_minicontroller_set_repeate_image(void *data, int repeate_state);
-static void _mp_minicontroller_set_shuffle_image(void *data, int shuffle_state);
-#endif
 static void _mp_minicontroller_title_set(struct appdata *ad);
 
 static bool _mp_minicontroller_is_long_press()
@@ -78,100 +71,6 @@ static bool _mp_minicontroller_is_long_press()
        return result;
 }
 
-#ifdef MINICONTROLLER_ENABLE_PROGRESS
-static inline void
-_mp_minicontroller_update_elapsed_time(struct appdata *ad, bool get_position)
-{
-       MP_CHECK(ad);
-       MP_CHECK(ad->minicontroller_layout);
-
-       double played_ratio = 0.;
-       double music_pos = 0.;
-       if (get_position) {
-               music_pos = mp_player_mgr_get_position() / 1000;
-       } else {
-               music_pos = ad->music_pos;
-       }
-       /*
-               int sec = mp_player_mgr_get_position() / 1000;
-               int min = sec / 60;
-               sec = sec % 60;
-
-
-               char *time_text = g_strdup_printf("%02d:%02d", min, sec);
-               if (time_text) {
-                       edje_object_part_text_set(_EDJ(ad->minicontroller_layout), "elm.elapsed_time", time_text);
-                       free(time_text);
-                       time_text = NULL;
-               }
-       */
-       char play_time[16] = { 0, };
-       char total_time[16] = { 0, };
-
-       double duration = ad->music_length;
-
-       if (duration > 0.) {
-               if (duration > 3600.) {
-                       snprintf(total_time, sizeof(total_time), "%" MUSIC_TIME_FORMAT,
-                                MUSIC_TIME_ARGS(duration));
-                       snprintf(play_time, sizeof(play_time), "%" MUSIC_TIME_FORMAT, MUSIC_TIME_ARGS(music_pos));
-               } else {
-                       snprintf(total_time, sizeof(total_time), "%" PLAY_TIME_FORMAT,
-                                PLAY_TIME_ARGS(duration));
-                       snprintf(play_time, sizeof(play_time), "%" PLAY_TIME_FORMAT, PLAY_TIME_ARGS(music_pos));
-               }
-       } else {
-               if (ad->current_track_info)
-                       snprintf(total_time, sizeof(total_time), "%" PLAY_TIME_FORMAT,
-                                PLAY_TIME_ARGS(ad->current_track_info->duration / 1000.));
-               snprintf(play_time, sizeof(play_time), "%" PLAY_TIME_FORMAT, PLAY_TIME_ARGS(music_pos));
-       }
-
-       edje_object_part_text_set(_EDJ(ad->minicontroller_layout), "np_progress_text_total", total_time);
-       edje_object_part_text_set(_EDJ(ad->minicontroller_layout), "np_progress_text_playing", play_time);
-
-       if (ad->music_length > 0. && music_pos > 0.) {
-               played_ratio = music_pos / ad->music_length;
-       }
-       _mp_minicontroller_progress_val_set(ad, played_ratio);
-}
-
-static Eina_Bool
-_minicontroller_update_progresstime_cb(void *data)
-{
-       TIMER_TRACE();
-       struct appdata *ad = data;
-       mp_retvm_if(ad == NULL, ECORE_CALLBACK_CANCEL, "appdata is NULL");
-
-       if (ad->is_lcd_off) {
-               mp_ecore_timer_del(ad->minicon_progress_timer);
-               return ECORE_CALLBACK_CANCEL;
-       }
-
-       if (ad->player_state == PLAY_STATE_PLAYING) {
-               _mp_minicontroller_update_elapsed_time(ad, true);
-       }
-
-       return ECORE_CALLBACK_RENEW;
-}
-
-static void
-_minicontroller_progress_timer_add(void *data)
-{
-       struct appdata *ad = data;
-       mp_retm_if(ad == NULL, "appdata is NULL");
-       DEBUG_TRACE();
-
-       mp_ecore_timer_del(ad->minicon_progress_timer);
-
-       _mp_minicontroller_update_elapsed_time(ad, true);
-
-       if (ad->player_state == PLAY_STATE_PLAYING) {
-               ad->minicon_progress_timer = ecore_timer_add(1.0, _minicontroller_update_progresstime_cb, ad);
-       }
-
-}
-#endif
 static bool
 _mp_minicontroller_landscape_is(struct appdata *ad, int angle)
 {
@@ -188,51 +87,6 @@ _mp_minicontroller_landscape_is(struct appdata *ad, int angle)
        return landscape;
 }
 
-#ifdef MINICONTROLLER_ENABLE_SHUFFLLE_REPEAT
-static char * _mp_minicontroller_shuffle_access_info_cb(void *data, Evas_Object *obj)
-{
-       startfunc;
-       DEBUG_TRACE("shuffle button clicked");
-       struct appdata *ad = mp_util_get_appdata();
-       MP_CHECK_NULL(ad);
-
-       char *operation_txt = NULL;
-       int shuffle_state = 0;
-       mp_setting_get_shuffle_state(&shuffle_state);
-
-       if (shuffle_state == 1) {
-               operation_txt = GET_SYS_STR(MP_TTS_SHUFFLE_OFF_BUTTON);
-       } else {
-               operation_txt = GET_SYS_STR(MP_TTS_SHUFFLE_ON_BUTTON);
-       }
-
-       return g_strdup(operation_txt);
-}
-#endif
-
-#ifdef MINICONTROLLER_ENABLE_SHUFFLLE_REPEAT
-static char * _mp_minicontroller_repeat_access_info_cb(void *data, Evas_Object *obj)
-{
-       startfunc;
-       DEBUG_TRACE("repeat button clicked");
-       struct appdata *ad = mp_util_get_appdata();
-       MP_CHECK_NULL(ad);
-
-       char *operation_txt = NULL;
-       int repeat_state = 0;
-       mp_setting_get_repeat_state(&repeat_state);
-       if (MP_PLST_REPEAT_ONE == repeat_state) {
-               operation_txt = GET_SYS_STR(MP_TTS_REPEAT_ONE_BUTTON);
-       } else if (MP_PLST_REPEAT_NONE == repeat_state) {
-               operation_txt = GET_SYS_STR(MP_TTS_REPEAT_OFF_BUTTON);
-       } else {
-               //repeat all
-               operation_txt = GET_SYS_STR(MP_TTS_REPEAT_ALL_BUTTON);
-       }
-       return g_strdup(operation_txt);
-}
-#endif
-
 static void
 _mp_minicontroller_action_show_player_view(struct appdata *ad)
 {
@@ -257,56 +111,6 @@ _mp_minicontroller_action_show_player_view(struct appdata *ad)
        }
 }
 
-#ifdef MINICONTROLLER_ENABLE_SHUFFLLE_REPEAT
-static void _mp_minicontroller_set_shuffle_image(void *data, int shuffle_state)
-{
-       struct appdata *ad = (struct appdata*)data;
-       MP_CHECK(ad);
-       MP_CHECK(ad->minicontroller_layout);
-       ERROR_TRACE("");
-       bool landscape = _mp_minicontroller_landscape_is(ad, ad->quickpanel_angle);
-       if (landscape) {
-               if (shuffle_state) {
-                       elm_object_signal_emit(ad->minicontroller_layout, "set_shuffle_on_ld", "*");
-               } else {
-                       elm_object_signal_emit(ad->minicontroller_layout, "set_shuffle_off_ld", "*");
-               }
-       } else {
-               if (shuffle_state) {
-                       elm_object_signal_emit(ad->minicontroller_layout, "set_shuffle_on", "*");
-               } else {
-                       elm_object_signal_emit(ad->minicontroller_layout, "set_shuffle_off", "*");
-               }
-       }
-}
-static void _mp_minicontroller_set_repeate_image(void *data, int repeate_state)
-{
-       struct appdata *ad = (struct appdata*)data;
-       MP_CHECK(ad);
-       MP_CHECK(ad->minicontroller_layout);
-       ERROR_TRACE("");
-       bool landscape = _mp_minicontroller_landscape_is(ad, ad->quickpanel_angle);
-       if (landscape) {
-               if (MP_PLST_REPEAT_ONE == repeate_state) {
-                       elm_object_signal_emit(ad->minicontroller_layout, "set_repeat_btn_1_ld", "*");
-               } else if (MP_PLST_REPEAT_NONE == repeate_state) {
-                       elm_object_signal_emit(ad->minicontroller_layout, "set_repeat_btn_a_ld", "*");
-               } else {
-                       elm_object_signal_emit(ad->minicontroller_layout, "set_repeat_btn_all_ld", "*");
-               }
-       } else {
-               if (MP_PLST_REPEAT_ONE == repeate_state) {
-                       elm_object_signal_emit(ad->minicontroller_layout, "set_repeat_btn_1", "*");
-               } else if (MP_PLST_REPEAT_NONE == repeate_state) {
-                       elm_object_signal_emit(ad->minicontroller_layout, "set_repeat_btn_a", "*");
-               } else {
-                       elm_object_signal_emit(ad->minicontroller_layout, "set_repeat_btn_all", "*");
-               }
-       }
-
-}
-#endif
-
 static void
 _minicontroller_action_cb(void *data, Evas_Object * obj, const char *emission, const char *source)
 {
@@ -439,47 +243,6 @@ _mp_minicontroller_register_reader(void *data)
        MP_CHECK(ad);
 }
 
-#ifdef MINICONTROLLER_ENABLE_PROGRESS
-
-static void
-_mp_minicontroller_progess_box_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-       startfunc;
-
-       struct appdata *ad = data;
-       MP_CHECK(ad->progress_box);
-
-       ad->progress_box = NULL;
-}
-
-static void
-_mp_minicontroller_progress_val_set(struct appdata *ad, double position)
-{
-       MP_CHECK(ad);
-       MP_CHECK(ad->minicontroller_layout);
-
-       if (ad->progress_bar) {
-               edje_object_part_drag_value_set(_EDJ(ad->progress_bar), "progressbar_playing", position, 0.0);
-       }
-       return;
-}
-
-static void _mp_minicontroller_create_progress_layout(struct appdata *ad)
-{
-       startfunc;
-
-       ad->progress_box = mp_common_load_edj(ad->minicontroller_layout, MINICON_EDJ_NAME, "minicontroller_progress_box");
-       MP_CHECK(ad->progress_box);
-       evas_object_event_callback_add(ad->progress_box, EVAS_CALLBACK_DEL, _mp_minicontroller_progess_box_del_cb, ad);
-       elm_object_part_content_set(ad->minicontroller_layout, "progress_box", ad->progress_box);
-
-       ad->progress_bar = mp_common_load_edj(ad->progress_box, MINICON_EDJ_NAME, "mc_player_progressbar");
-       MP_CHECK(ad->progress_bar);
-       elm_object_part_content_set(ad->progress_box, "progress_bar", ad->progress_bar);
-       _mp_minicontroller_progress_val_set(ad, 0.0);
-}
-#endif
-
 void
 mp_minicontroller_update_winmini_size(struct appdata *ad)
 {
@@ -611,42 +374,6 @@ mp_minicontroller_update_control(struct appdata *ad)
        _mp_minicontroller_update_playpause_btn(ad);
 }
 
-void
-mp_minicontroller_update_shuffle_and_repeat_btn(struct appdata *ad)
-{
-#ifdef MINICONTROLLER_ENABLE_SHUFFLLE_REPEAT
-       startfunc;
-       mp_retm_if(ad == NULL, "appdata is NULL");
-       MP_CHECK(ad->win_minicon);
-       MP_CHECK(!ad->is_lcd_off);
-
-       int shuffle_state = 0;
-       int repeat_state = 0;
-       mp_setting_get_shuffle_state(&shuffle_state);
-       mp_setting_get_repeat_state(&repeat_state);
-
-       _mp_minicontroller_set_shuffle_image((void *)ad, shuffle_state);
-       _mp_minicontroller_set_repeate_image((void *)ad, repeat_state);
-#endif
-}
-
-#ifdef MINICONTROLLER_ENABLE_SHUFFLLE_REPEAT
-/*focused UI callbacks*/
-static void _mp_minicontroller_shuffle_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       DEBUG_TRACE("shuffle button clicked");
-
-       struct appdata *ad = mp_util_get_appdata();
-       MP_CHECK(ad);
-
-       int shuffle_state = 0;
-       mp_setting_get_shuffle_state(&shuffle_state);
-       shuffle_state = !shuffle_state;
-       mp_play_control_shuffle_set(ad, shuffle_state);
-       _mp_minicontroller_set_shuffle_image(ad, shuffle_state);
-}
-#endif
-
 int _mp_is_current_focus_available(struct appdata *ad)
 {
        sound_stream_focus_change_reason_e changed_by = SOUND_STREAM_FOCUS_CHANGED_BY_MEDIA;
@@ -721,25 +448,6 @@ static void _mp_minicontroller_play_pause_btn_clicked_cb(void *data, Evas_Object
        }
 }
 
-#ifdef MINICONTROLLER_ENABLE_SHUFFLLE_REPEAT
-static void _mp_minicontroller_repeat_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       DEBUG_TRACE("repeat button clicked");
-
-       struct appdata *ad = mp_util_get_appdata();
-       MP_CHECK(ad);
-
-       int repeat_state = 0;
-       mp_setting_get_repeat_state(&repeat_state);
-       repeat_state++;
-       repeat_state %= 3;
-       mp_setting_set_repeat_state(repeat_state);
-       _mp_minicontroller_set_repeate_image(ad, repeat_state);
-       mp_playlist_mgr_set_repeat(ad->playlist_mgr, repeat_state);
-       mp_player_view_update_state(GET_PLAYER_VIEW);
-}
-#endif
-
 static void _mp_minicontroller_ff_rew_btn_pressed_cb(void *data, Evas_Object *obj, void *event_info)
 {
        DEBUG_TRACE("button pressed");
@@ -839,15 +547,6 @@ _mp_minicontroller_update_layout(struct appdata *ad, bool landscape)
        elm_object_focus_custom_chain_append(ad->minicontroller_layout, ad->minicon_icon, NULL);
        elm_object_focus_allow_set(ad->minicon_icon, EINA_TRUE);
 
-#ifdef MINICONTROLLER_ENABLE_SHUFFLLE_REPEAT
-       /*-------> shuffle button ------->*/
-       Evas_Object *shuffle_focus_btn = elm_button_add(ad->minicontroller_layout);
-       elm_object_style_set(shuffle_focus_btn, "focus");
-       elm_object_part_content_set(ad->minicontroller_layout, "shuffle_focus", shuffle_focus_btn);
-       elm_object_focus_custom_chain_append(ad->minicontroller_layout, shuffle_focus_btn, NULL);
-       evas_object_smart_callback_add(shuffle_focus_btn, "clicked", _mp_minicontroller_shuffle_btn_clicked_cb, NULL);
-#endif
-
        /*-------> REW button ------->*/
        Evas_Object *rew_focus_btn = elm_button_add(ad->minicontroller_layout);
        elm_object_style_set(rew_focus_btn, "focus");
@@ -877,15 +576,6 @@ _mp_minicontroller_update_layout(struct appdata *ad, bool landscape)
        evas_object_smart_callback_add(ff_focus_btn, "unpressed", _mp_minicontroller_ff_rew_btn_unpressed_cb, CONTROLLER_FF_SOURCE);
        evas_object_event_callback_add(ff_focus_btn, EVAS_CALLBACK_DEL, _mp_minicontroller_ff_rew_btn_del_cb, NULL);
 
-#ifdef MINICONTROLLER_ENABLE_SHUFFLLE_REPEAT
-       /*-------> repeat button ------->*/
-       Evas_Object *repeat_focus_btn = elm_button_add(ad->minicontroller_layout);
-       elm_object_style_set(repeat_focus_btn, "focus");
-       elm_object_part_content_set(ad->minicontroller_layout, "repeat_focus", repeat_focus_btn);
-       elm_object_focus_custom_chain_append(ad->minicontroller_layout, repeat_focus_btn, NULL);
-       evas_object_smart_callback_add(repeat_focus_btn, "clicked", _mp_minicontroller_repeat_btn_clicked_cb, NULL);
-#endif
-
        /*-------> close button ------->*/
        edje_object_signal_callback_add(_EDJ(ad->minicontroller_layout), "*", "*", _minicontroller_action_cb, ad);
        _mp_minicontroller_update_btn(ad);
@@ -947,11 +637,6 @@ mp_minicontroller_update(struct appdata *ad, bool with_title)
        MP_CHECK(!ad->is_lcd_off);
 
        _mp_minicontroller_update_playpause_btn(ad);
-       if (ad->player_state == PLAY_STATE_PLAYING) {
-#ifdef MINICONTROLLER_ENABLE_PROGRESS
-               _minicontroller_progress_timer_add(ad);
-#endif
-       }
 
        mp_track_info_t *current_item = ad->current_track_info;
        if (current_item) {
@@ -966,10 +651,6 @@ mp_minicontroller_update(struct appdata *ad, bool with_title)
                        free(shared_path);
                        elm_image_file_set(ad->minicon_icon, default_thumbnail, NULL);
                }
-#ifdef MINICONTROLLER_ENABLE_PROGRESS
-               _mp_minicontroller_update_elapsed_time(ad, true);
-#endif
-               mp_minicontroller_update_shuffle_and_repeat_btn(ad);
 
                if (with_title) {
                        _mp_minicontroller_title_set(ad);
@@ -1058,24 +739,18 @@ mp_minicontroller_visible_set(struct appdata *ad, bool visible)
        _mp_minicontroller_title_set(ad);
        mp_minicontroller_update_control(ad);
 
-       if (visible) {
-#ifdef MINICONTROLLER_ENABLE_PROGRESS
-               _minicontroller_progress_timer_add(ad);
-#endif
+       display_state_e lock_state;
+       int ret = device_display_get_state(&lock_state);
+       if (ret == DEVICE_ERROR_NONE) {
+               ERROR_TRACE("[SUCCESSFULL] return value %d", ret);
        } else {
-               display_state_e lock_state;
-               int ret = device_display_get_state(&lock_state);
-               if (ret == DEVICE_ERROR_NONE) {
-                       ERROR_TRACE("[SUCCESSFULL] return value %d", ret);
-               } else {
-                       ERROR_TRACE("[ERROR] Return value is %d", ret);
-               }
+               ERROR_TRACE("[ERROR] Return value is %d", ret);
+       }
 
-               DEBUG_TRACE("lock_state: %d", lock_state);
-               if (lock_state == DISPLAY_STATE_SCREEN_OFF || lock_state == DISPLAY_STATE_SCREEN_DIM) {
-                       ERROR_TRACE("Timer deleted");
-                       mp_ecore_timer_del(ad->minicon_progress_timer);
-               }
+       DEBUG_TRACE("lock_state: %d", lock_state);
+       if (lock_state == DISPLAY_STATE_SCREEN_OFF || lock_state == DISPLAY_STATE_SCREEN_DIM) {
+               ERROR_TRACE("Timer deleted");
+               mp_ecore_timer_del(ad->minicon_progress_timer);
        }
 }
 
@@ -1100,10 +775,3 @@ void mp_minicontroller_on_lcd_event(struct appdata *ad, bool lcd_on)
 
        mp_minicontroller_visible_set(ad, lcd_on);
 }
-
-void mp_minicontroller_update_progressbar(struct appdata *ad)
-{
-#ifdef MINICONTROLLER_ENABLE_PROGRESS
-       _mp_minicontroller_update_elapsed_time(ad, false);
-#endif
-}