From 48410c4bca01e97f62e4df279f43d1664b1d8944 Mon Sep 17 00:00:00 2001 From: JuWan Kim Date: Mon, 6 Apr 2015 14:40:16 +0900 Subject: [PATCH 1/1] Apply changed UsbConnection API Change-Id: Id0155ed09fbc9dc9fb77e34e890399d2eaeb9203 Signed-off-by: JuWan Kim --- include/FbBaseView.h | 2 +- src/views/BaseView/FbBaseView.cpp | 31 +++++++++++++++++-------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/include/FbBaseView.h b/include/FbBaseView.h index 77623fb..56b70eb 100644 --- a/include/FbBaseView.h +++ b/include/FbBaseView.h @@ -40,7 +40,7 @@ public: public: - virtual void OnConnect(void); + virtual void OnStatusChanged(SUsbHostDeviceStatus status); virtual void OnUpdated(const SEntity *entity); }; diff --git a/src/views/BaseView/FbBaseView.cpp b/src/views/BaseView/FbBaseView.cpp index bf87f87..3a98993 100644 --- a/src/views/BaseView/FbBaseView.cpp +++ b/src/views/BaseView/FbBaseView.cpp @@ -685,24 +685,27 @@ Evas_Object* CFbBaseView::Base(void) } -void CFbBaseView::OnConnect(void) +void CFbBaseView::OnStatusChanged(SUsbHostDeviceStatus status) { - m->pPopup = new CPopup; - if (!m->pPopup) - return; - if (!m->pPopup->Create(m->eoBase)) { - delete m->pPopup; - m->pPopup = NULL; - return; - } + if(status == USB_HOST_DEV_CONNECTED) { + m->pPopup = new CPopup; + if (!m->pPopup) + return; + if (!m->pPopup->Create(m->eoBase)) { + delete m->pPopup; + m->pPopup = NULL; + return; + } - if (CInfo::SourceType() == E_USB) { - if (!FlagConnected()) { - CInfo::SetSourceType(E_ALL); - elm_object_text_set(m->eoBtnSource, - _(CSourceCtxPopup::SourceText(CInfo::SourceType()))); + if (CInfo::SourceType() == E_USB) { + if (!FlagConnected()) { + CInfo::SetSourceType(E_ALL); + elm_object_text_set(m->eoBtnSource, + _(CSourceCtxPopup::SourceText(CInfo::SourceType()))); + } } } + /* FIXME: should add disconnected flow */ } -- 2.7.4