Modification due to the change of CUsbConnectionListener

Change-Id: Iac99edd077278357b75c3129fb56039ce1c6a19c
Signed-off-by: Kim Tae Soo <taesoo46.kim@samsung.com>

diff --git a/include/base-view.h b/include/base-view.h
index 3b1482b..0680e98 100644 (file)
--- a/include/base-view.h
+++ b/include/base-view.h
@@ -96,7 +96,7 @@ public:
 
        virtual void OnComplete(void);
        virtual void OnError(void);
-       virtual void OnUsbConnected(void);
+       virtual void OnUsbStatusChanged(SUsbStorageStatus status);
        virtual void OnUpdateContent(void);
 };
 

diff --git a/include/music-controller.h b/include/music-controller.h
index 153d51e..1024ef2 100644 (file)
--- a/include/music-controller.h
+++ b/include/music-controller.h
@@ -24,14 +24,20 @@
 
 class IMusicControllerListener {
 public:
+       enum SUsbStorageStatus {
+               USB_STORAGE_CONNECTED,
+               USB_STORAGE_DISCONNECTED
+       };
+
+public:
        static void s_CbComplete(void *cookie);
        static void s_CbError(void *cookie);
-       static void s_CbUsbConnected(void *cookie);
+       static void s_CbUsbStatusChagned(void *cookie, SUsbStorageStatus status);
        static void s_CbUpdateContent(void *cookie);
 
        virtual void OnComplete(void) = 0;
        virtual void OnError(void) = 0;
-       virtual void OnUsbConnected(void) = 0;
+       virtual void OnUsbStatusChanged(SUsbStorageStatus status) = 0;
        virtual void OnUpdateContent(void) = 0;
 };
 
@@ -123,7 +129,7 @@ public:
        ERepeatStatus RepeatState(void);
 
 public:
-       virtual void OnConnect(void);
+       virtual void OnStatusChanged(SUsbHostDeviceStatus status);
 };
 
 

diff --git a/include/playback-view.h b/include/playback-view.h
index 0ddfc9a..08ffd3e 100644 (file)
--- a/include/playback-view.h
+++ b/include/playback-view.h
@@ -152,7 +152,7 @@ public:
 
        virtual void OnComplete(void);
        virtual void OnError(void);
-       virtual void OnUsbConnected(void);
+       virtual void OnUsbStatusChanged(SUsbStorageStatus status);
        virtual void OnUpdateContent(void);
 };
 

diff --git a/src/playback/music-controller.cpp b/src/playback/music-controller.cpp
index aff012e..b8e14c1 100644 (file)
--- a/src/playback/music-controller.cpp
+++ b/src/playback/music-controller.cpp
@@ -71,11 +71,11 @@ void IMusicControllerListener::s_CbError(void *cookie)
 }
 
 
-void IMusicControllerListener::s_CbUsbConnected(void *cookie)
+void IMusicControllerListener::s_CbUsbStatusChagned(void *cookie, SUsbStorageStatus status)
 {
        IMusicControllerListener *root = (IMusicControllerListener *)cookie;
        if (root)
-               root->OnUsbConnected();
+               root->OnUsbStatusChanged(status);
 }
 
 
@@ -821,7 +821,7 @@ ERepeatStatus CMusicController::RepeatState(void)
 }
 
 
-void CMusicController::OnConnect(void)
+void CMusicController::OnStatusChanged(SUsbHostDeviceStatus status)
 {
        if (!m)
                return;
@@ -830,14 +830,29 @@ void CMusicController::OnConnect(void)
        IMusicControllerListener *mcListener = NULL;;
        void *obj;
 
-       if (CInfo::SourceType() == SOURCE_TYPE_USB) {
-               if (!FlagConnected())
-                       CInfo::SetSourceType(SOURCE_TYPE_ALL);
+       if (status == USB_HOST_DEV_CONNECTED) {
+               if (CInfo::SourceType() == SOURCE_TYPE_USB) {
+                       if (!FlagConnected())
+                               CInfo::SetSourceType(SOURCE_TYPE_ALL);
+               }
+
+               EINA_LIST_FOREACH(m->elListener, l, obj) {
+                       mcListener = (IMusicControllerListener *)obj;
+                       if (mcListener)
+                               mcListener->s_CbUsbStatusChagned(mcListener,
+                                       IMusicControllerListener::USB_STORAGE_CONNECTED);
+               }
        }
+       else {
+               if (CInfo::SourceType() == SOURCE_TYPE_USB) {
+                       CInfo::SetSourceType(SOURCE_TYPE_ALL);
+               }
 
-       EINA_LIST_FOREACH(m->elListener, l, obj) {
-               mcListener = (IMusicControllerListener *)obj;
-               if (mcListener)
-                       mcListener->s_CbUsbConnected(mcListener);
+               EINA_LIST_FOREACH(m->elListener, l, obj) {
+                       mcListener = (IMusicControllerListener *)obj;
+                       if (mcListener)
+                               mcListener->s_CbUsbStatusChagned(mcListener,
+                                       IMusicControllerListener::USB_STORAGE_DISCONNECTED);
+               }
        }
 }
\ No newline at end of file

diff --git a/src/views/base-view.cpp b/src/views/base-view.cpp
index c099aa6..c3fc929 100644 (file)
--- a/src/views/base-view.cpp
+++ b/src/views/base-view.cpp
@@ -495,7 +495,7 @@ Evas_Object *CMusicBaseView::m_CreateLoadingPopup(void)
        elm_transit_object_add(m->transit, icon);
        elm_transit_effect_rotation_add(m->transit, 0, 360);
        elm_transit_duration_set(m->transit, 1);
-       elm_transit_repeat_times_set(m->transit, 5);
+       elm_transit_repeat_times_set(m->transit, MAX_SHOW_TIME);
        elm_transit_objects_final_state_keep_set(m->transit, EINA_TRUE);
        elm_transit_go(m->transit);
 
@@ -1211,9 +1211,22 @@ void CMusicBaseView::OnError(void)
 }
 
 
-void CMusicBaseView::OnUsbConnected(void)
+void CMusicBaseView::OnUsbStatusChanged(SUsbStorageStatus status)
 {
-       m->popup = m_CreateLoadingPopup();
+       switch (status) {
+               case USB_STORAGE_CONNECTED:
+                       m_DestroyPopup();
+                       m->popup = m_CreateLoadingPopup();
+                       break;
+
+               case USB_STORAGE_DISCONNECTED:
+                       m_DestroyPopup();
+                       break;
+
+               default:
+                       ASSERT(!"Invalid Status");
+                       break;
+       }
 }
 
 

diff --git a/src/views/playback-view.cpp b/src/views/playback-view.cpp
index 3cf03b2..f1028f3 100644 (file)
--- a/src/views/playback-view.cpp
+++ b/src/views/playback-view.cpp
@@ -2128,7 +2128,7 @@ void CPlaybackView::OnError(void)
 }
 
 
-void CPlaybackView::OnUsbConnected(void)
+void CPlaybackView::OnUsbStatusChanged(SUsbStorageStatus status)
 {
 }