Modification due to the change of CBaseView

[profile/tv/apps/native/musicplayer.git] / include / base-view.h

diff --git a/include/base-view.h b/include/base-view.h
index 04873d8..2bc1455 100644 (file)
--- a/include/base-view.h
+++ b/include/base-view.h
@@ -18,9 +18,6 @@
 #define __MUSIC_BASE_VIEW_H__
 
 
-#include <CtxPopup.h>
-
-
 struct SArgList {
        char *album_id;
        char *uri;
@@ -28,11 +25,11 @@ struct SArgList {
 };
 
 
-class CMusicBaseView : public CBaseView, public CListenerMgr,
-       public IKeyDownListener, public IKeyUpListener,
-       public IMouseMoveListener, public IMouseClickedListener,
-       public IMusicControllerListener
-{
+class CMusicBaseView :
+       public CBaseView,
+       public IMouseMoveListener,
+       public IMouseClickedListener,
+       public IMusicControllerListener {
 private:
        struct SMusicBaseView* m;
 
@@ -40,8 +37,11 @@ private:
        static void sm_CbHandleEmptyStatus(void *cookie, bool emptyStatus);
        void m_OnHandleEmptyStatus(bool emptyStatus);
 
-       static void sm_CbCtxPopupBtnSelected(void* cookie, CCtxPopup* instance, const char* text);
-       void m_CbCtxPopupBtnSelected(CCtxPopup* instance, const char* text);
+       static void sm_CbCtxPopupBtnSelected(void* cookie, CContextPopup* instance, const char* text);
+       void m_CbCtxPopupBtnSelected(CContextPopup* instance, const char* text);
+
+       static Eina_Bool sm_CbShowLayoutIdler(void *cookie);
+       void m_OnShowLayoutIdler(void);
 
 private:
        void m_UpdateFocusSequence(void);
@@ -65,6 +65,8 @@ private:
        void m_SetSourceType(void);
        void m_UpdateCurrentLayout(bool focusFlag);
 
+       char *m_Argument(void *data);
+
 protected:
        virtual void t_OnShow(void);
        virtual void t_OnHide(void);
@@ -73,30 +75,24 @@ protected:
 public:
        CMusicBaseView(const char *pViewId) :
                CBaseView(pViewId),
-               IKeyDownListener(this),
-               IKeyUpListener(this),
                IMouseMoveListener(this),
                IMouseClickedListener(this),
                m(0) {}
        virtual ~CMusicBaseView() {}
 
-       virtual bool Create(void *data);
+       virtual bool Create(void *data, Evas_Object *eoBase);
        virtual void Destroy(void);
 
-       virtual Evas_Object* Base(void);
-
 public:
-       virtual void OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev);
-       virtual void OnKeyUp(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Up *ev);
+       virtual void OnSKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_SKey_Down *ev);
+       virtual void OnSKeyUp(int id, Evas *e, Evas_Object *obj, Evas_Event_SKey_Up *ev);
        virtual void OnMouseMove(int id, Evas *e, Evas_Object *obj, Evas_Event_Mouse_Move *ev);
        virtual void OnMouseClicked(int id, Evas_Object *obj);
 
-
-protected:
-       virtual void t_OnComplete(void);
-       virtual void t_OnError(void);
-       virtual void t_OnUsbConnected(void);
-       virtual void t_OnUpdateContent(void);
+       virtual void OnComplete(void);
+       virtual void OnError(void);
+       virtual void OnUsbStatusChanged(SUsbStorageStatus status);
+       virtual void OnUpdateContent(void);
 };