Fixed TSAM-8777 Music Minicontroller display abnormal

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

diff --git a/src/common/mp-app.c b/src/common/mp-app.c
index 2e3b2e71943fde1b1c840cbbe6745e76d6a9c4e2..7ff64d92efb8ca4b152b716650f8dfc2f2188a32 100755 (executable)
--- a/src/common/mp-app.c
+++ b/src/common/mp-app.c
@@ -176,8 +176,6 @@ _mp_app_noti_key_changed_cb(const char *key, void *data)
 
 }
 
-static bool __mp_get_supported_storage_cb();
-
 void
 _mp_app_storage_state_changed_cb(int storage_id, storage_state_e state, void *user_data)
 {
@@ -387,54 +385,6 @@ void _mp_app_db_update_cb(void *data)
 
 }
 
-static void mp_app_now_playing_id_changed_cb(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, const char *path)
-{
-       startfunc;
-
-       struct appdata *ad = data;
-       MP_CHECK(ad);
-
-       int playing_pid = mp_setting_get_nowplaying_id();
-       ERROR_TRACE("wishjox playing_pid:%d", playing_pid);
-#ifndef MP_SOUND_PLAYER
-       if (!playing_pid) {
-               if (ad->player_state == PLAY_STATE_PAUSED) {
-                       DEBUG_TRACE("sound-player terminated.. show minicontroller");
-
-                       if (!ad->win_minicon) {
-                               mp_minicontroller_create(ad);
-                       }
-                       if (ad->win_minicon) {
-                               mp_minicontroller_show(ad);
-                       }
-#ifdef MP_FEATURE_LOCKSCREEN
-                       if (!ad->win_lockmini) {
-                               mp_lockscreenmini_create(ad);
-                       }
-                       if (ad->win_lockmini) {
-                               mp_lockscreenmini_show(ad);
-                       }
-#endif
-                       mp_setting_save_playing_info(ad);
-               }
-       } else
-#endif
-               if (playing_pid != getpid()) {
-                       DEBUG_TRACE("other player activated : [pid:%d]", playing_pid);
-                       if (ad->player_state == PLAY_STATE_PLAYING) {
-                               ad->paused_by_other_player = TRUE;
-                               mp_play_control_play_pause(ad, false);
-                       }
-/*
-                       mp_minicontroller_destroy(ad);
-#ifdef MP_FEATURE_LOCKSCREEN
-                       mp_lockscreenmini_destroy(ad);
-#endif
-*/
-               }
-
-}
-
 bool mp_app_get_supported_storages_callback(int storageId, storage_type_e type, storage_state_e state, const char *path, void *userData)
 {
        if (type == STORAGE_TYPE_EXTERNAL) {
@@ -469,13 +419,6 @@ mp_app_noti_init(void *data)
                res = FALSE;
        }
 
-       char *path = app_get_data_path();
-       char now_playing_id[1024] = {0};
-
-       snprintf(now_playing_id, 1024, "%s%s", path, MP_NOW_PLAYING_ID_INI);
-       free(path);
-       ecore_file_monitor_add(now_playing_id, mp_app_now_playing_id_changed_cb, ad);
-
        if (storage_set_state_changed_cb(ad->mmc_id, _mp_app_storage_state_changed_cb, ad) < 0) {
                ERROR_TRACE("Fail to register storage state changed callback");
                res = FALSE;
@@ -518,11 +461,6 @@ mp_app_noti_ignore(void *data)
 {
        struct appdata *ad = (struct appdata *)data;
        int retcode = -1;
-       // TEMP_BLOCK
-       //sound_manager_unset_available_route_changed_cb();
-       //sound_manager_unset_active_device_changed_cb();
-
-       //mp_media_info_unset_db_update_cb();
        retcode = system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_SOUND_SILENT_MODE);
        if (retcode != SYSTEM_SETTINGS_ERROR_NONE) {
                ERROR_TRACE("Error when ignore callback [%d]", retcode);
@@ -533,7 +471,6 @@ mp_app_noti_ignore(void *data)
                ERROR_TRACE("Error when ignore callback");
                return FALSE;
        }
-       //mp_file_monitor_del(ECORE_FILE_MONITOR_TYPE_INOTIFY);
 
        if (gNotiPipe) {
                ecore_pipe_del(gNotiPipe);

diff --git a/src/common/mp-common.c b/src/common/mp-common.c
index 3e439e51300ec0814e7f5b3d34cabbd815afd441..fa0758f9593cff879e2eb8e8aa4ae16ba8a04e8a 100755 (executable)
--- a/src/common/mp-common.c
+++ b/src/common/mp-common.c
@@ -1077,6 +1077,9 @@ void mp_common_play_track_list_with_playlist_id(mp_list_item_data_t *item, Evas_
        MP_CHECK(genlist);
        struct appdata *ad = mp_util_get_appdata();
        MP_CHECK(ad);
+
+       mp_setting_set_nowplaying_id(getpid());
+
        Elm_Object_Item *gli2 = NULL;
 
        mp_plst_item *plst_item = NULL;

diff --git a/src/core/mp-player-mgr.c b/src/core/mp-player-mgr.c
index 706524d4d2c9a3a4e6f3079f751aa2206002bf3b..bbf6d241418d8fe4b914350c9ff68723944a9a02 100755 (executable)
--- a/src/core/mp-player-mgr.c
+++ b/src/core/mp-player-mgr.c
@@ -1166,6 +1166,17 @@ void mp_player_focus_callback(sound_stream_info_h stream_info, sound_stream_focu
        if (state_for_playback == SOUND_STREAM_FOCUS_STATE_RELEASED) {
                mp_player_mgr_pause(ad);
 
+               int current_pid = mp_setting_get_nowplaying_id();
+               if (current_pid && current_pid != getpid()) {
+                       DEBUG_TRACE("Some other player playing currently");
+                       if (ad->win_minicon) {
+                               mp_minicontroller_destroy(ad);
+                       }
+                       if (ad->win_lockmini) {
+                               mp_lockscreenmini_destroy(ad);
+                       }
+               }
+
                sound_manager_get_focus_reacquisition(ad->stream_info, &reacquire_state);
                DEBUG_TRACE("reason for change is %d", reason_for_change);
                if (reason_for_change != SOUND_STREAM_FOCUS_CHANGED_BY_ALARM &&

diff --git a/src/mp-main.c b/src/mp-main.c
index 7365cb101dc512fb6a5b2492a22be040e90217a4..9d55818cca20fd2a7c1597a08d4e3dcd34427012 100755 (executable)
--- a/src/mp-main.c
+++ b/src/mp-main.c
@@ -971,6 +971,8 @@ _mp_main_parse_service(struct appdata *ad, app_control_h app_control, bool *acti
 
        char *value = NULL;
 #ifdef MP_SOUND_PLAYER
+       mp_setting_set_nowplaying_id(getpid());
+
        /* create playlist mgr before parse service */
        mp_common_create_playlist_mgr();
 

diff --git a/src/view/mp-player-view.c b/src/view/mp-player-view.c
index 23bd95fc6653b4200c784d3186bd559fada618fb..4b59438ded0ce4a291f705d64c88e946bbc66f10 100755 (executable)
--- a/src/view/mp-player-view.c
+++ b/src/view/mp-player-view.c
@@ -1985,6 +1985,7 @@ static void
 _mp_player_view_option_btn_click_cb(void *data, Evas_Object * obj, const char *emission, const char *source)
 {
        startfunc;
+       mp_setting_set_nowplaying_id(getpid());
        return;
 }
 

diff --git a/src/widget/mp-now-playing.c b/src/widget/mp-now-playing.c
index 99c51930bf5d1950b935c4a792acb37badd96e1a..7c058abaf2c601610a529c18a8cc47472cb1c00b 100755 (executable)
--- a/src/widget/mp-now-playing.c
+++ b/src/widget/mp-now-playing.c
@@ -559,6 +559,8 @@ static void _mp_now_playing_btn_clicked_cb(void *data, Evas_Object *obj, void *e
 {
        DEBUG_TRACE("button clicked");
 
+       mp_setting_set_nowplaying_id(getpid());
+
        MpNpData_t *wd = data;
        MP_CHECK(wd);
        wd->play_bt_clicked(wd->userdata);

diff --git a/src/widget/mp-search.c b/src/widget/mp-search.c
index cdf898805ec3f3e645d5fe15198d431930e0bad5..64b9ce3effd8a4447b9d6484927fc97f3b1d365a 100644 (file)
--- a/src/widget/mp-search.c
+++ b/src/widget/mp-search.c
@@ -114,7 +114,6 @@ mp_search_create_new(Evas_Object * parent, Evas_Smart_Cb change_cb, void *change
        elm_theme_extension_add(th, edje_path);
        free(path);
        elm_layout_theme_set(searchfield, "layout", "searchbar", "cancel_button_case");
-       const char *style = "DEFAULT='font=tizen; font_size=45'";
 
        en = elm_entry_add(searchfield);
        elm_entry_scrollable_set(en, EINA_TRUE);