Add Mute icon.

Change-Id: I7f86593d55dcea86885757264704b79cd75b44f6

diff --git a/include/mp-util.h b/include/mp-util.h
index 81f0cd6..1f6ccdb 100755 (executable)
--- a/include/mp-util.h
+++ b/include/mp-util.h
@@ -53,6 +53,11 @@ void MpUtilSetRotationState(int nCurRotation);
 bool MpUtilGetTitleFromFilepath(char* szFilepath, char* szTitle, int nLengthTitle);\r
 void MpUtilInitSession(void);\r
 void MpUtilFinishSession(void);\r
+void MpUtilVolumeTypeSet(void);\r
+void MpUtilVolumeTypeUnset(void);\r
+bool MpUtilCheckMuteStatus();\r
+bool MpUtilSetVolumeChangeCbSet(void *pUserData);\r
+void MpUtilSetVolumeChangeCbUnset();\r
 void MpUtilDeletePopupHandle(void);\r
 bool MpUtilNotifyPopUp(VideoAppData* pAppData, char* szContents, void* PopupButtonCallbackFunc);\r
 bool MpUtilWarinigPopUp(VideoAppData *pAppData, char *szContents,void *PopupButtonCallbackFunc);\r

diff --git a/include/mp-video-display-view.h b/include/mp-video-display-view.h
old mode 100644 (file)
new mode 100755 (executable)
index 52f075e..dca4ade
--- a/include/mp-video-display-view.h
+++ b/include/mp-video-display-view.h
@@ -50,5 +50,6 @@ void  MpVideoDisplayViewResetProgressBar(void *pUserData);
 bool   MpVideoDisplayViewIsPauseByUser(void);
 void   MpVideoDisplayViewSetPauseByUser(bool bPauseByUser);
 void   MpVideoDisplayViewUpdateProgressBar(void *pUserData);
+void   MpVideoDisplayViewSetMuteStatus(bool bMute);
 
 #endif

diff --git a/include/mp-video-streaming-view.h b/include/mp-video-streaming-view.h
old mode 100644 (file)
new mode 100755 (executable)
index 3f93ece..74cacfb
--- a/include/mp-video-streaming-view.h
+++ b/include/mp-video-streaming-view.h
@@ -45,8 +45,9 @@ bool MpVideoStreamingViewGetBufferingState(void);
 bool MpVideoStreamingViewIsTopView(void);\r
 void MpVideoStreamingViewShowNocontentImage(void *pUserData);\r
 void MpVideoStreamingViewHideNocontentImage(void);\r
-void   MpVideoStreamingViewPortrate(void);\r
-void   MpVideoStreamingViewLandscape(void);\r
+void MpVideoStreamingViewPortrate(void);\r
+void MpVideoStreamingViewLandscape(void);\r
 void MpVideoStreamingViewUpdateProgressBar(void *pUserData);\r
+void MpVideoStreamingViewSetMuteStatus(bool bMute);\r
 \r
 #endif\r

diff --git a/include/mp-video-view-mgr.h b/include/mp-video-view-mgr.h
old mode 100644 (file)
new mode 100755 (executable)
index dd2918a..fe9afa9
--- a/include/mp-video-view-mgr.h
+++ b/include/mp-video-view-mgr.h
@@ -41,6 +41,7 @@ void MpVideoViewCtrlResetProgressBar(void *pUserData);
 void MpVideoViewCtrlPopTopView(int nPlayerType, void *pUserData);
 void MpVideoViewCtrlUpdateProgressbar(void *pUserData);
 bool MpVideoViewCtrlIsPauseByUser(void *pUserData);
+void MpVideoViewCtrlSetMuteValue(bool bMute);
 void MpVideoViewCtrlShowVolume();
 void MpVideoViewCtrlHideVolume();
 

diff --git a/include/video-player.h b/include/video-player.h
old mode 100644 (file)
new mode 100755 (executable)
index daad009..a51e04f
--- a/include/video-player.h
+++ b/include/video-player.h
@@ -47,18 +47,18 @@ typedef struct _VideoAppData                VideoAppData;
 
 typedef struct
 {
-       void (*VideoAppCtrlStart)                               (VideoAppData* pAppData);
-       void (*VideoAppCtrlStop)                                (VideoAppData* pAppData);
-       void (*VideoAppCtrlPause)                               (VideoAppData* pAppData);
-       void (*VideoAppCtrlResume)                              (VideoAppData* pAppData);
+       void (*VideoAppCtrlStart)                       (VideoAppData* pAppData);
+       void (*VideoAppCtrlStop)                        (VideoAppData* pAppData);
+       void (*VideoAppCtrlPause)                       (VideoAppData* pAppData);
+       void (*VideoAppCtrlResume)                      (VideoAppData* pAppData);
        void (*VideoAppCtrlStopByAppPause)              (VideoAppData* pAppData);
-       void (*VideoAppCtrlStartByAppResume)    (VideoAppData* pAppData);
-       void (*VideoAppCtrlFFDown)                              (VideoAppData* pAppData);
-       void (*VideoAppCtrlRewDown)                             (VideoAppData* pAppData);
-       void (*VideoAppCtrlFFUp)                                (VideoAppData* pAppData);
-       void (*VideoAppCtrlRewUp)                               (VideoAppData* pAppData);
+       void (*VideoAppCtrlStartByAppResume)            (VideoAppData* pAppData);
+       void (*VideoAppCtrlFFDown)                      (VideoAppData* pAppData);
+       void (*VideoAppCtrlRewDown)                     (VideoAppData* pAppData);
+       void (*VideoAppCtrlFFUp)                        (VideoAppData* pAppData);
+       void (*VideoAppCtrlRewUp)                       (VideoAppData* pAppData);
        void (*VideoAppCtrlSpeedReset)                  (VideoAppData* pAppData);
-       void (*VideoAppCtrlSpeedFF)                             (VideoAppData* pAppData);
+       void (*VideoAppCtrlSpeedFF)                     (VideoAppData* pAppData);
        void (*VideoAppCtrlSpeedRew)                    (VideoAppData* pAppData);
        void (*VideoAppCtrlRotateScreen)                (VideoAppData *pAppData, int nRotateState);
        void (*VideoAppCtrlGetPosition)                 (VideoAppData* pAppData);
@@ -68,15 +68,16 @@ typedef struct
        void (*VideoAppCtrlShowLayout)                  (VideoAppData* pAppData);
        void (*VideoAppCtrlHideFinish)                  (VideoAppData* pAppData);
        void (*VideoAppCtrlShowFinish)                  (VideoAppData* pAppData);
-       void (*VideoAppCtrlGetVideoResolution)  (VideoAppData* pAppData);
+       void (*VideoAppCtrlGetVideoResolution)          (VideoAppData* pAppData);
        void (*VideoAppCtrlReqDurationTime)             (VideoAppData* pAppData);
-       void (*VideoAppCtrlChangeResolution)    (VideoAppData* pAppData);
+       void (*VideoAppCtrlChangeResolution)            (VideoAppData* pAppData);
        void (*VideoAppCtrlBeginOfStream)               (VideoAppData* pAppData);
        void (*VideoAppCtrlEndOfStream)                 (VideoAppData* pAppData);
-       void (*VideoAppCtrlExit)                                (VideoAppData* pAppData);
+       void (*VideoAppCtrlExit)                        (VideoAppData* pAppData);
        void (*VideoAppCtrlStartStreaming)              (VideoAppData* pAppData);
        void (*VideoAppCtrlReLaunching)                 (VideoAppData* pAppData);
-       void (*VideoAppCtrlGetBufferingPosition)(VideoAppData* pAppData);
+       void (*VideoAppCtrlGetBufferingPosition)        (VideoAppData* pAppData);
+       void (*VideoAppCtrlSetMute)                     (VideoAppData *pAppData, bool bMute);
 
 
        void (*VideoAppCtrlShowVolume)                  (VideoAppData *pAppData);

diff --git a/src/mp-util.c b/src/mp-util.c
index cc39ccf..8eb3638 100755 (executable)
--- a/src/mp-util.c
+++ b/src/mp-util.c
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 
 // CAPI
 #include <app.h>
@@ -123,6 +123,34 @@ static void MpUtilMMCStatusChangeCb(keynode_t * pKeyNode, void *pUserData)
        }
 }
 
+
+static void MpUtilSoundMgrVolumeChangeCb(sound_type_e nType, unsigned int nVolume, void *pUserData)
+{
+       VideoLogInfo("");
+
+       //char szFilename[9] = { 0 };
+
+       if (!pUserData ) {
+               VideoLogInfo("User data is NULL.");
+               return;
+       }
+
+       if(nType != (sound_type_e)VOLUME_KEY_TYPE_MEDIA)
+       {
+               return;
+       }
+
+       bool bMute = FALSE;
+
+       if(nVolume == 0)
+       {
+               bMute = TRUE;
+       }
+
+       VideoAppData *pAppData = (VideoAppData *)pUserData;
+       pAppData->VideoAppCtrlCallbackFunc.VideoAppCtrlSetMute(pAppData, bMute);
+
+}
 /*
  * External function
  */
@@ -479,7 +507,6 @@ void MpUtilFinishSession(void)
        //sound_manager_set_session_type(SOUND_SESSION_TYPE_SHARE);
 }
 
-/*
 void MpUtilVolumeTypeSet(void)
 {
        VideoLogInfo("");
@@ -494,13 +521,47 @@ void MpUtilVolumeTypeUnset(void)
         sound_manager_set_volume_key_type(VOLUME_KEY_TYPE_NONE);
 }
 
+bool MpUtilCheckMuteStatus()
+{
+       VideoLogInfo("");
+
+       int nVolume = 0;
+       int nRet = 0;
+       nRet = sound_manager_get_volume(VOLUME_KEY_TYPE_MEDIA, &nVolume);
+       if(nRet != SOUND_MANAGER_ERROR_NONE)
+       {
+               VideoLogError("sound_manager_get_volume fail : %d", nRet);
+               return FALSE;
+       }
+
+       if(nVolume == 0)
+       {
+               return TRUE;
+       }
+       return FALSE;
+}
+
+bool MpUtilSetVolumeChangeCbSet(void *pUserData)
+{
+       int ret = 0;
+       VideoLogInfo("");
+
+       ret = sound_manager_set_volume_changed_cb(MpUtilSoundMgrVolumeChangeCb, pUserData);
+       if(ret != SOUND_MANAGER_ERROR_NONE)
+       {
+               VideoLogError("sound_manager_set_volume_changed_cb fail : %d", ret);
+               return FALSE;
+       }
+
+       return TRUE;
+}
 void MpUtilSetVolumeChangeCbUnset()
 {
        VideoLogInfo("");
 
        sound_manager_unset_volume_changed_cb();
+
 }
-*/
 
 void MpUtilDeletePopupHandle(void)
 {
@@ -1585,4 +1646,4 @@ void MpUtilLayoutVisibleOff(void *pWindowHandle)
                VideoLogError("Skip for Desktop mode : %s", elm_win_profile_get (pWindowHandle));
        }
        return;
-}
\ No newline at end of file
+}

diff --git a/src/mp-video-app-ctrl.c b/src/mp-video-app-ctrl.c
index a837ebe..e3175a0 100755 (executable)
--- a/src/mp-video-app-ctrl.c
+++ b/src/mp-video-app-ctrl.c
@@ -79,6 +79,7 @@ static void MpVideoAppCtrlGetBufferingPosition(VideoAppData *pAppData);
 static void MpVideoAppCtrlPipeInit(VideoAppData *pAppData);
 static void MpVideoAppCtrlShowVolume(VideoAppData *pAppData);
 static void MpVideoAppCtrlHideVolume(VideoAppData *pAppData);
+static void MpVideoAppCtrlSetMute(VideoAppData *pAppData, bool bMute);
 
 
 /*
@@ -573,6 +574,7 @@ void MpVideoAppCtrlFuncInit(VideoAppData *pAppData)
        pAppData->VideoAppCtrlCallbackFunc.VideoAppCtrlGetBufferingPosition = (void *)MpVideoAppCtrlGetBufferingPosition;
        pAppData->VideoAppCtrlCallbackFunc.VideoAppCtrlShowVolume = (void *)MpVideoAppCtrlShowVolume;
        pAppData->VideoAppCtrlCallbackFunc.VideoAppCtrlHideVolume = (void *)MpVideoAppCtrlHideVolume;
+       pAppData->VideoAppCtrlCallbackFunc.VideoAppCtrlSetMute = (void *)MpVideoAppCtrlSetMute;
 }
 
 static void MpVideoAppCtrlGetBufferingPosition(VideoAppData *pAppData)
@@ -1064,6 +1066,7 @@ static void MpVideoAppCtrlExit(VideoAppData *pAppData)
        MpVideoCtrlMgrMediaDestroy(pAppData);
        MpUtilDeletePopupHandle();
        MpVideoViewCtrlDestroy((void *)pAppData);
+       MpUtilSetVolumeChangeCbUnset();
 
        if(MpVideoServiceCtrlGetPlayerType() == MP_STREAMING_PLAYER)
        {
@@ -1206,6 +1209,13 @@ static void MpVideoAppCtrlPipeInit(VideoAppData *pAppData)
        pEcorePipeHandleForInterruped = ecore_pipe_add((Ecore_Pipe_Cb)MpVideoAppCtrlPauseByInterrupteCb, (void *)pAppData);
 }
 
+static void MpVideoAppCtrlSetMute(VideoAppData *pAppData, bool bMute)
+{
+       VideoLogInfo("");
+
+       MpVideoViewCtrlSetMuteValue(bMute);
+}
+
 static void MpVideoAppCtrlShowVolume(VideoAppData *pAppData)
 {
        VideoLogInfo("");
@@ -1236,6 +1246,8 @@ bool MpVideoAppCtrlInit(VideoAppData *pAppData)
 
        VideoLogInfo("Get rotation state from appcore. - %d", MpUtilGetRotationStateFromAppcore());
 
+       MpUtilSetVolumeChangeCbSet((void *)pAppData);
+
        MpVideoAppCtrlFuncInit(pAppData);
        MpVideoAppCtrlPipeInit(pAppData);
        MpVideoViewCtrlInit(pAppData);

diff --git a/src/mp-video-display-view.c b/src/mp-video-display-view.c
index 1607e4c..213b2be 100755 (executable)
--- a/src/mp-video-display-view.c
+++ b/src/mp-video-display-view.c
@@ -121,6 +121,8 @@ static void MpVideoDisplayViewPressOptionShareCb(void *pUserData, Evas_Object *p
                pCtrlPanelHideTimer = NULL;
        }
 
+       pAppData->VideoAppCtrlCallbackFunc.VideoAppCtrlPause(pAppData);
+
        MpExternalUgShow((void *)pAppData, pNaviFrameHandle);
 }
 
@@ -875,6 +877,10 @@ void MpVideoDisplayViewPush(void *pNaviFrame, int nPlayerType, void *pUserData,
                elm_object_item_part_content_set(pNaviFrameItemForDisplayerView, "title_right_btn", pDisplaySoundpathButton);
        }
 
+       if(MpUtilCheckMuteStatus())
+       {
+               MpVideoDisplayViewSetMuteStatus(TRUE);
+       }
 
        pAppData->VideoAppCtrlCallbackFunc.VideoAppCtrlShowLayout(pAppData);
 }
@@ -1310,5 +1316,26 @@ void MpVideoDisplayViewUpdateProgressBar(void *pUserData)
        {
                MpVideoProgressbarCreateTimer(pUserData);
        }
+}
+
+void MpVideoDisplayViewSetMuteStatus(bool bMute)
+{
+       VideoLogInfo("");
+
+       if(pDisplayViewCtrlEdj == NULL)
+       {
+               VideoLogError("Display control edj is NULL");
+               return;
+       }
+
+       if(bMute)
+       {
+               edje_object_signal_emit(pDisplayViewCtrlEdj, SIGNAL_CONTROL_SET_MUTE, "*");
+       }
+       else
+       {
+               edje_object_signal_emit(pDisplayViewCtrlEdj, SIGNAL_CONTROL_UNSET_MUTE, "*");
+       }
 
 }
+

diff --git a/src/mp-video-streaming-view.c b/src/mp-video-streaming-view.c
old mode 100644 (file)
new mode 100755 (executable)
index b084677..fa8506e
--- a/src/mp-video-streaming-view.c
+++ b/src/mp-video-streaming-view.c
@@ -340,6 +340,11 @@ void MpVideoStreamingViewPush(void *pNaviFrame, int nPlayerType, void *pUserData
        elm_object_signal_callback_add(pStreamingViewLayout, SIGNAL_CONTORL_SHOW_FINISH, "*", MpVideoStreamingViewShowLayoutFinish, pUserData);
        elm_object_signal_callback_add(pStreamingViewLayout, SIGNAL_CONTORL_HIDE_FINISH, "*", MpVideoStreamingViewHideLayoutFinish, pUserData);
 
+       if(MpUtilCheckMuteStatus())
+       {
+               MpVideoStreamingViewSetMuteStatus(TRUE);
+       }
+
        int nRotate = MpUtilGetRotationState();
        if( nRotate == VIDEO_ROTATE_PORTRAIT_REVERSE || nRotate == VIDEO_ROTATE_PORTRAIT_NORMAL)
        {
@@ -714,5 +719,25 @@ void MpVideoStreamingViewUpdateProgressBar(void *pUserData)
        }
 
        MpVideoProgressbarCreateTimer(pUserData);
+}
+
+void MpVideoStreamingViewSetMuteStatus(bool bMute)
+{
+       VideoLogInfo("");
+       if(pStreamingViewCtrlEdj == NULL)
+       {
+               VideoLogError("streaming control edj is NULL");
+               return;
+       }
+
+       if(bMute)
+       {
+               edje_object_signal_emit(pStreamingViewCtrlEdj, SIGNAL_CONTROL_SET_MUTE, "*");
+       }
+       else
+       {
+               edje_object_signal_emit(pStreamingViewCtrlEdj, SIGNAL_CONTROL_UNSET_MUTE, "*");
+       }
 
 }
+

diff --git a/src/mp-video-view-mgr.c b/src/mp-video-view-mgr.c
old mode 100644 (file)
new mode 100755 (executable)
index f06ce87..23293fc
--- a/src/mp-video-view-mgr.c
+++ b/src/mp-video-view-mgr.c
@@ -58,7 +58,7 @@ static bool bIsKeyCancle = FALSE;
 static bool bShowLayout = FALSE;
 
 static Ecore_Timer *pLongPressSpeedPlayingTimer = NULL;
-static Ecore_Timer *pLongPressVolumeKeyTimer = NULL; 
+static Ecore_Timer *pLongPressVolumeKeyTimer = NULL;
 static Ecore_Timer *pLayoutVisibleOffTimer = NULL;
 
 static void MpVideoVideoViewCtrlLongpressSpeedKeyUp(void *pUserData);
@@ -85,7 +85,7 @@ static Eina_Bool MpVideoViewCtrlLayoutVisibleOffTimerCb(void *pUserData)
        }
 
        VideoAppData *pAppData = (VideoAppData *)pUserData;
- 
+
        MpUtilLayoutVisibleOff(pAppData->pMainWindow);
 
        return EINA_FALSE;
@@ -163,7 +163,7 @@ static Eina_Bool MpVideoViewCtrlHardkeyDownCb(void *pUserData, int nType, void *
                        ecore_timer_del(pLongPressVolumeKeyTimer);
                        pLongPressVolumeKeyTimer = NULL;
                                }
-               pLongPressVolumeKeyTimer = ecore_timer_add(0.3, MpVideoViewCtrlVolumeKeyDownTimerCb, (void *)pAppData); 
+               pLongPressVolumeKeyTimer = ecore_timer_add(0.3, MpVideoViewCtrlVolumeKeyDownTimerCb, (void *)pAppData);
                                        }
        else if(!strcmp(pKeyEvent->keyname, VOLUME_UP_KEY))
                                        {
@@ -1046,7 +1046,7 @@ void MpVideoViewShowLayout(void *pUserData)
                nTmpPlayerType == MP_VIDEO_PLAYER_EMAIL ||
                nTmpPlayerType == MP_VIDEO_PLAYER_MMS)
        {
-               edje_object_signal_emit(_EDJ(pMainLayout), SIGNAL_LAYOUT_INDICATOR_SHOW, "*"); 
+               edje_object_signal_emit(_EDJ(pMainLayout), SIGNAL_LAYOUT_INDICATOR_SHOW, "*");
                        elm_win_indicator_mode_set(pAppData->pMainWindow, ELM_WIN_INDICATOR_SHOW);
                        MpVideoViewCtrlShowNaviFrame();
                        bShowLayout = TRUE;
@@ -1325,7 +1325,6 @@ void MpVideoViewCtrlUpdateProgressbar(void *pUserData)
        }
 }
 
-
 bool MpVideoViewCtrlIsPauseByUser(void *pUserData)
 {
        if(!pUserData)
@@ -1339,6 +1338,27 @@ bool MpVideoViewCtrlIsPauseByUser(void *pUserData)
        return MpVideoDisplayViewIsPauseByUser();
 }
 
+void MpVideoViewCtrlSetMuteValue(bool bMute)
+{
+
+       VideoLogInfo("");
+       int nTmpPlayerType = MpVideoServiceCtrlGetPlayerType();
+
+       if(nTmpPlayerType == MP_VIDEO_PLAYER ||
+               nTmpPlayerType == MP_VIDEO_PLAYER_SIMPLE ||
+               nTmpPlayerType == MP_VIDEO_PLAYER_GALLERY ||
+               nTmpPlayerType == MP_VIDEO_PLAYER_EMAIL ||
+               nTmpPlayerType == MP_VIDEO_PLAYER_MMS)
+       {
+               MpVideoDisplayViewSetMuteStatus(bMute);
+       }
+       else if(nTmpPlayerType == MP_STREAMING_PLAYER)
+       {
+               MpVideoStreamingViewSetMuteStatus(bMute);
+       }
+}
+
+
 void MpVideoViewCtrlShowVolume()
 {
        VideoLogInfo("");

diff --git a/src/video-player.c b/src/video-player.c
index e1e0941..43f366b 100755 (executable)
--- a/src/video-player.c
+++ b/src/video-player.c
@@ -260,6 +260,7 @@ static bool appCreate(void *pUserData)
 
 
        MpUtilInitSession();
+       MpUtilVolumeTypeSet();
 
        if(!MpUtilMMCstatusNoti(pAppData))
        {
@@ -288,6 +289,7 @@ static void appService(service_h pAppSvcHandle, void *pUserData)
        VideoAppData *pAppData = (VideoAppData *)pUserData;
 
        char* szGetMediaUri = NULL;
+       MpUtilVolumeTypeSet();
 
        if(!pAppSvcHandle)
        {
@@ -361,6 +363,7 @@ static void appExit(void *pUserData)
        MpUtilMultimediaKeyUngrab();
        MpUtilMMCstatusNotiIgnore();
        MpUtilBatteryStatusNotiIgnore();
+       MpUtilVolumeTypeUnset();
        MpUtilFinishSession();
        MpUtilDeletePopupHandle();
        MpUtilMediaSvcDestoryVideoList();
@@ -386,6 +389,7 @@ static void appPause(void *pUserData)
 
        VideoLogInfo("");
 
+       MpUtilVolumeTypeUnset();
        MpUtilMultimediaVolumeKeyUngrab();
 
        VideoAppData *pAppData = (VideoAppData *)pUserData;
@@ -442,6 +446,7 @@ static void appResume(void *pUserData)
                VideoLogInfo("Defence overlap launching.");
                return;
        }
+       MpUtilVolumeTypeSet();
 
        MpUtilMultimediaVolumeKeyGrab();