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 ecd0738..2bc1455 100644 (file)
--- a/include/base-view.h
+++ b/include/base-view.h
@@ -18,16 +18,18 @@
 #define __MUSIC_BASE_VIEW_H__
 
 
-struct _arg_list {
+struct SArgList {
        char *album_id;
        char *uri;
        char *source;
 };
 
 
-class CMusicBaseView : public CBaseView, public CListenerMgr, public IKeyDownListener, public IKeyUpListener,
-       IMusicControllerListener
-{
+class CMusicBaseView :
+       public CBaseView,
+       public IMouseMoveListener,
+       public IMouseClickedListener,
+       public IMusicControllerListener {
 private:
        struct SMusicBaseView* m;
 
@@ -35,22 +37,25 @@ private:
        static void sm_CbHandleEmptyStatus(void *cookie, bool emptyStatus);
        void m_OnHandleEmptyStatus(bool emptyStatus);
 
+       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);
        void m_UpdateEmptyFocusSequence(void);
 
-       static void sm_CbClickedGroupBtn(void *cookie, Evas_Object *obj);
-       void m_OnClickedGroupBtn(Evas_Object *obj);
-
-       static void sm_CbClickedCtxBtn(void *cookie, Evas_Object *obj);
-       void m_OnClickedCtxBtn(Evas_Object *obj);
-
        void m_ShowCurrentLayout(void);
+       void m_GotoPlayback(void);
 
-
-       void m_DestroyPopup(void);
+       void m_CreateCtxPopup(int btnType);
        void m_DestroyCtxPopup(void);
+
        Evas_Object *m_CreateLoadingPopup(void);
+       void m_DestroyPopup(void);
+
        void m_UpdatePlaysongLabel(void);
        void m_AddPlaysongLabel(void);
        void m_CreateTopSection(void);
@@ -60,31 +65,34 @@ 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);
        virtual void t_OnUpdate(void* data);
 
 public:
-       CMusicBaseView(const char *pViewId) : CBaseView(pViewId), IKeyDownListener(this), IKeyUpListener(this), m(0) {}
+       CMusicBaseView(const char *pViewId) :
+               CBaseView(pViewId),
+               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);
-
-protected:
-
-       virtual void t_OnComplete(void);
-       virtual void t_OnError(void);
-       virtual void t_OnUsbConnected(void);
-       virtual void t_OnUpdateContent(void);
+       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);
+
+       virtual void OnComplete(void);
+       virtual void OnError(void);
+       virtual void OnUsbStatusChanged(SUsbStorageStatus status);
+       virtual void OnUpdateContent(void);
 };