[MusicPlayer] Additional modify thumbnail provider and fixed jira issues and fixed...
authorMyunkyu <mk70.kang@partner.samsung.com>
Thu, 4 Apr 2013 08:33:46 +0000 (17:33 +0900)
committerMyunkyu <mk70.kang@partner.samsung.com>
Thu, 4 Apr 2013 09:45:08 +0000 (18:45 +0900)
Change-Id: I007ab8def021cf62209da74f8738588b3639ddec

41 files changed:
inc/MpContentEditPanel.h
inc/MpIThumbnailProviderHandler.h [changed mode: 0755->0644]
inc/MpThumbnailBase.h [changed mode: 0755->0644]
inc/MpThumbnailInfo.h [changed mode: 0755->0644]
inc/MpThumbnailJob.h [changed mode: 0755->0644]
inc/MpThumbnailProvider.h
res/screen-size-normal/IDL_CONTENTS_LIBARY_EDITOR_PANEL.xml
res/screen-size-normal/IDL_SHARE_VIA_POPUP.xml
src/MpAlbumContentListForm.cpp
src/MpAlbumListEditorPanel.cpp
src/MpAlbumListPanel.cpp
src/MpAllListEditorPanel.cpp
src/MpAllListPanel.cpp
src/MpArtistAlbumListEditorForm.cpp
src/MpArtistAlbumListForm.cpp
src/MpArtistAllSongListForm.cpp
src/MpArtistContentListForm.cpp
src/MpArtistListEditorPanel.cpp
src/MpArtistListPanel.cpp
src/MpComposerListEditorPanel.cpp
src/MpComposerListPanel.cpp
src/MpContentEditPanel.cpp
src/MpFolderContentListForm.cpp
src/MpFolderListPresentationModel.cpp
src/MpGenreListEditorPanel.cpp
src/MpGenreListPanel.cpp
src/MpMusicPlayerApp.cpp
src/MpMusicPlayerForm.cpp
src/MpMusicPlayerPresentationModel.cpp
src/MpPlaylistContentListForm.cpp
src/MpPlaylistListEditorPanel.cpp
src/MpPlaylistListPanel.cpp
src/MpPlaylistPickerPopup.cpp
src/MpThumbnailBase.cpp
src/MpThumbnailEventArg.cpp
src/MpThumbnailInfo.cpp
src/MpThumbnailJob.cpp
src/MpThumbnailProvider.cpp
src/MpUserPlaylistContentListForm.cpp
src/MpYearListEditorPanel.cpp
src/MpYearListPanel.cpp

index aefd96a..cd1ef3b 100644 (file)
@@ -46,6 +46,7 @@ protected:
        void SetContentEditHeader(void);\r
 \r
        virtual int GetCheckedItemCount(void) = 0;\r
+       virtual void OnOrientationPanelChanged(Tizen::Ui::OrientationStatus orientationStatus);\r
 \r
 private:\r
        result Construct(void);\r
old mode 100755 (executable)
new mode 100644 (file)
index f9ba6ea..bc22e58
@@ -32,7 +32,7 @@ class IThumbnailProviderHandler
 public:\r
        virtual ~IThumbnailProviderHandler(void){}\r
 \r
-       virtual void RequestThumbnail(const Tizen::Content::ContentId& contentId, const ThumbnailEvent* event, void* pParam = null) = 0;\r
+       virtual void RequestThumbnail(const Tizen::Content::ContentId& contentId, const ThumbnailEvent* event,  Tizen::Base::Object* pParam = null) = 0;\r
        virtual void CancelAllThumbnailRequest(const ThumbnailEvent* event) = 0;\r
        virtual const Tizen::Graphics::Bitmap* GetDefaultThumbnail(void) const = 0;\r
 };\r
old mode 100755 (executable)
new mode 100644 (file)
index 508eacb..5bc88f0
@@ -39,7 +39,8 @@ public:
        virtual ~ThumbnailBase(void);\r
 \r
        result Construct(void);\r
-       void RequestThumbnail(const Tizen::Content::ContentId& contentId, void* pParam) const;\r
+       void Stop(void);\r
+       void RequestThumbnail(const Tizen::Content::ContentId& contentId, Tizen::Base::Object* pParam = null) const;\r
        void CancelAllThumbnailRequest(void);\r
        const Tizen::Graphics::Bitmap* GetDefaultThumbnail(void) const;\r
 \r
@@ -55,6 +56,7 @@ private:
 private:\r
        IThumbnailProviderHandler* __pIThumbnailProviderHandler;\r
        ThumbnailEvent* __pThumbnailEvent;\r
+       bool __isForceStop;\r
 };\r
 \r
 #endif // _MP_THUMBNAIL_BASE_H_\r
old mode 100755 (executable)
new mode 100644 (file)
index 3539d7b..237c197
@@ -33,11 +33,11 @@ public:
        virtual ~ThumbnailInfo(void);
 
        void Construct(const Tizen::Content::ContentId& contentId,
-                                       const Tizen::Graphics::Bitmap& bitmap, void* pParam);
+                                       const Tizen::Graphics::Bitmap& bitmap, Tizen::Base::Object* pParam = null);
 
        Tizen::Content::ContentId GetContentId(void) const;
        Tizen::Graphics::Bitmap* GetBitmapN(void) const;
-       void* GetUserParamN(void);
+       Tizen::Base::Object* GetUserParamN(void) const;
 
 private:
        Tizen::Graphics::Bitmap* CloneBitmapN(const Tizen::Graphics::Bitmap& bitmap) const;
@@ -45,7 +45,7 @@ private:
 private :
        Tizen::Content::ContentId __contentId;
        const Tizen::Graphics::Bitmap* __pBitmap;
-       void* __pParam;
+       mutable Tizen::Base::Object* __pParam;
 };
 
 #endif // _MP_THUMBNAIL_INFO_H_
old mode 100755 (executable)
new mode 100644 (file)
index c0a1fb4..c780497
@@ -34,12 +34,12 @@ public:
        virtual ~ThumbnailJob(void);
 
        void Construct(const Tizen::Content::ContentId& contentId, const unsigned long requestId,
-                       const ThumbnailEvent* pRequestEvent, void* pParam);
+                       const ThumbnailEvent* pRequestEvent, Tizen::Base::Object* pParam);
 
        Tizen::Content::ContentId GetContentId(void) const;
        unsigned long GetRequestId(void) const;
        const ThumbnailEvent* GetEvent(void) const;
-       void* GetUserParam(void) const;
+       Tizen::Base::Object* GetUserParamN(void) const;
 
 private:
        ThumbnailJob(const ThumbnailJob&);
@@ -49,7 +49,7 @@ private:
        Tizen::Content::ContentId __contentId;
        unsigned long __requestId;
        const ThumbnailEvent* __pRequestEvent;
-       void* __pParam;
+       mutable Tizen::Base::Object* __pParam;
 };
 
 #endif // _MP_THUMBNAIL_JOB_H_
index 896d6ca..35a3bec 100644 (file)
 class ThumbnailEvent;
 
 class ThumbnailProvider
-       : IThumbnailProviderHandler
+       : public IThumbnailProviderHandler
        , public Tizen::Base::Runtime::EventDrivenThread
 {
 public:
        static IThumbnailProviderHandler* GetInstance(void);
 
 public:
-       void RequestThumbnail(const Tizen::Content::ContentId& contentId, const ThumbnailEvent* event, void* pParam = null);
+       void RequestThumbnail(const Tizen::Content::ContentId& contentId, const ThumbnailEvent* event, Tizen::Base::Object* pParam = null);
        void CancelThumbnailRequest(const Tizen::Content::ContentId& contentId, const ThumbnailEvent* event);
        void CancelAllThumbnailRequest(const ThumbnailEvent* event);
        void ClearThumbnailRequests(void);
@@ -56,7 +56,7 @@ private:
        void CreateDefaultThumbnailBitmap(void);
        void DestroyDefaultThumbnailBitmap(void);
 
-       ThumbnailInfo* GetThumbnailInfoN(const Tizen::Content::ContentId& contentId, void* pParam) const;
+       ThumbnailInfo* GetThumbnailInfoN(const Tizen::Content::ContentId& contentId, Tizen::Base::Object* pParam) const;
        Tizen::Graphics::Bitmap* GetThumbnailByDecodeN(const Tizen::Base::String& filePath, const Tizen::Content::ContentType contentType) const;
        Tizen::Base::String GetFileNameFromFullPath(const Tizen::Base::String& fullPath, bool withExt) const;
 
index e7f4008..503d3e0 100644 (file)
@@ -3,25 +3,25 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.\r
 -->\r
 <!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
-<ScenePanel Bversion="2.0.0.201303041025" Dversion="20120315">\r
+<ScenePanel Bversion="2.0.0.201304011927" Dversion="20120315">\r
     <Panel id="IDL_CONTENTS_LIBARY_EDITOR_PANEL">\r
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
-        <layout height="888" mode="Portrait" type="LAYOUT_RELATIVE" width="600" x="0" y="0"/>\r
-        <layout height="600" mode="Landscape" type="LAYOUT_RELATIVE" width="800" x="0" y="0"/>\r
+        <layout height="456.0" mode="Portrait" type="LAYOUT_RELATIVE" width="720.0" x="0.0" y="0.0"/>\r
+        <layout height="600.0" mode="Landscape" type="LAYOUT_RELATIVE" width="800.0" x="0.0" y="0.0"/>\r
     </Panel>\r
     <Label id="IDC_ITEM_SELECTED_COUNT_LABEL" parent="IDL_CONTENTS_LIBARY_EDITOR_PANEL">\r
-        <property backgroundBitmapPath="" backgroundColor="#444444" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" text="%d items are selected." textColor="#FFFFFF" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="600" x="0" y="840"/>\r
-        <layout bottomRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="800" x="0" y="552"/>\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#444444" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="%d items are selected." textColor="#FFFFFF" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="48.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="408.0"/>\r
+        <layout bottomRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="48.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="800.0" x="0.0" y="552.0"/>\r
     </Label>\r
     <TableView id="IDC_CONTENTS_EDIT_TABLEVIEW" parent="IDL_CONTENTS_LIBARY_EDITOR_PANEL">\r
         <property backgroundColor="" backgroundColorOpacity="0" fastScrollIndex="" itemDivider="true" itemDividerColor="" scrollBarStyle="TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" useSearchIcon="false"/>\r
-        <layout bottomRelation="IDC_ITEM_SELECTED_COUNT_LABEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="840" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="600" x="0" y="0"/>\r
-        <layout bottomRelation="IDC_ITEM_SELECTED_COUNT_LABEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="552" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="800" x="0" y="0"/>\r
+        <layout bottomRelation="IDC_ITEM_SELECTED_COUNT_LABEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="408.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="0.0"/>\r
+        <layout bottomRelation="IDC_ITEM_SELECTED_COUNT_LABEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="600.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONTENTS_LIBARY_EDITOR_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_PARENT" width="800.0" x="0" y="0"/>\r
     </TableView>\r
     <Label id="IDC_NO_CONTENTS_LABEL" parent="IDL_CONTENTS_LIBARY_EDITOR_PANEL">\r
-        <property backgroundBitmapPath="T02_nocomposers.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" text="No Songs" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_BOTTOM"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="280" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="280" x="160" y="304"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="280" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="280" x="260" y="160"/>\r
+        <property accessibilityHint="" backgroundBitmapPath="T02_nocomposers.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" leftMargin="16" text="No Songs" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_BOTTOM"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="220.0" y="88.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="280.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="280.0" x="260.0" y="160.0"/>\r
     </Label>\r
 </ScenePanel>\r
index 9fd7252..56299af 100644 (file)
@@ -5,18 +5,18 @@
 <!DOCTYPE ScenePopup SYSTEM "UIForm.dtd">\r
 <ScenePopup Bversion="2.0.0.201303041025" Dversion="20120315">\r
     <Popup id="IDL_SHARE_VIA_POPUP">\r
-        <property color="" titleText="Share via" titleTextColor=""/>\r
-        <layout height="532" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="688"/>\r
-        <layout height="532" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="688"/>\r
+        <property accessibilityHint="" color="" titleText="Share via" titleTextColor=""/>\r
+        <layout height="532.0" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="688.0"/>\r
+        <layout height="532.0" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="688.0"/>\r
     </Popup>\r
     <Button id="IDC_CANCEL_BUTTON" parent="IDL_SHARE_VIA_POPUP">\r
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Cancel" textSize="36" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="true" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="20" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="394" x="127" y="358"/>\r
-        <layout bottomRelation="IDL_SHARE_VIA_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="20" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="394" x="127" y="358"/>\r
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Cancel" textSize="36.0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDL_SHARE_VIA_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="true" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="394.0" x="127.0" y="358.0"/>\r
+        <layout bottomRelation="IDL_SHARE_VIA_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="true" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="394.0" x="127.0" y="358.0"/>\r
     </Button>\r
     <TableView id="IDC_TABLEVIEW" parent="IDL_SHARE_VIA_POPUP">\r
         <property backgroundColor="" backgroundColorOpacity="0" fastScrollIndex="" itemDivider="true" itemDividerColor="" scrollBarStyle="TABLE_VIEW_SCROLL_BAR_STYLE_NONE" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" useSearchIcon="false"/>\r
-        <layout bottomRelation="IDC_CANCEL_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="338" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SHARE_VIA_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_SHARE_VIA_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="648" x="0" y="0"/>\r
-        <layout bottomRelation="IDC_CANCEL_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="338" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SHARE_VIA_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_SHARE_VIA_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="648" x="0" y="0"/>\r
+        <layout bottomRelation="IDC_CANCEL_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="true" centerVertical="false" height="338.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SHARE_VIA_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_SHARE_VIA_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="648.0" x="0.0" y="0.0"/>\r
+        <layout bottomRelation="IDC_CANCEL_BUTTON" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="338.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SHARE_VIA_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_SHARE_VIA_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="648.0" x="0.0" y="0.0"/>\r
     </TableView>\r
 </ScenePopup>\r
index e143ca8..3ed13ca 100644 (file)
@@ -100,7 +100,7 @@ result
 AlbumContentListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       CancelAllThumbnailRequest();
+       ThumbnailBase::Stop();
        AppLogDebug("EXIT");
        return ContentListForm::OnTerminating();
 }
@@ -231,7 +231,7 @@ AlbumContentListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previo
                        delete pBgBitmap;
 
                        SetExtraInformaionArea(*pContentInfoPanel);
-                       RequestThumbnail(pContentInfo->contentId, (new (std::nothrow) String(IDC_CONTENTS_THUMBNAIL)));
+                       RequestThumbnail(pContentInfo->contentId);
                        delete pContentInfo;
                }
 
@@ -534,6 +534,7 @@ AlbumContentListForm::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
 
        Label* pThumbnailLabel = static_cast<Label*>(pItemPanel->GetControl(IDC_CONTENTS_THUMBNAIL));
        __pThumbnail = pThumbnailInfo->GetBitmapN();
+       delete pThumbnailInfo;
 
        if (__pThumbnail == null || pThumbnailLabel == null)
        {
index ae17352..e1f612f 100644 (file)
@@ -33,7 +33,8 @@ using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
 AlbumListEditorPanel::AlbumListEditorPanel(void)
-       : ThumbnailBase::ThumbnailBase()
+       : ContentEditPanel::ContentEditPanel()
+       , ThumbnailBase::ThumbnailBase()
        , __checkedItemCount(0)
        , __pPlayListPickerPopup(null)
        , __pThumbnail(null)
@@ -52,8 +53,8 @@ result
 AlbumListEditorPanel::OnInitializing(void)
 {
        AppLogDebug("ENTER");
-       __pPresentationModel = AlbumListPresentationModel::GetInstance();
        SetLayoutFitToForm();
+       __pPresentationModel = AlbumListPresentationModel::GetInstance();
        AppLogDebug("EXIT");
        return ThumbnailBase::Construct();
 }
@@ -62,7 +63,7 @@ result
 AlbumListEditorPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       CancelAllThumbnailRequest();
+       ThumbnailBase::Stop();
        if (__pPlayListPickerPopup != null)
        {
                delete __pPlayListPickerPopup;
@@ -262,7 +263,7 @@ AlbumListEditorPanel::CreateItem(const int itemIndex, int itemWidth)
        pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
 
        CreateTableViewItem(*pItem, *pContentInfoStruct);
-       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
+       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) Integer(itemIndex)));
        delete pContentInfoStruct;
 
        AppLogDebug("EXIT");
@@ -340,6 +341,7 @@ AlbumListEditorPanel::CreateTableViewItem(Tizen::Ui::Container& parent,
        static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENTS_THUMBNAIL))->SetBackgroundBitmap(*GetDefaultThumbnail());
 
        parent.AddControl(*pTableViewItem);
+       CommonUtil::SetLayoutFitToContainer(parent, *pTableViewItem);
 
        AppLogDebug("EXIT");
        return E_SUCCESS;
@@ -396,17 +398,15 @@ void
 AlbumListEditorPanel::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
 {
        AppLogDebug("ENTER");
-       int itemIndex = 0;
-       void* pParam = null;
        __pThumbnail = pThumbnailInfo->GetBitmapN();
-       pParam = pThumbnailInfo->GetUserParamN();
-       if (pParam)
+       Object* pParam = pThumbnailInfo->GetUserParamN();
+       if (pParam != null)
        {
-               itemIndex = *(static_cast<int*>(pParam));
+               __pContentTableView->RefreshItem((static_cast<Integer*>(pParam))->ToInt(), TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+               delete pParam;
        }
-       __pContentTableView->RefreshItem(itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+
        delete pThumbnailInfo;
-       delete static_cast<int*>(pParam);
        AppLogDebug("EXIT");
 }
 
index 8050e7c..3e7f874 100644 (file)
@@ -55,10 +55,10 @@ AlbumListPanel::OnInitializing(void)
 {
        AppLogDebug("ENTER");
        __pPresentationModel = AlbumListPresentationModel::GetInstance();
-       __pContextItem = CommonUtil::CreateTableViewContextItemN(*this, GetWidth(), FLICK_MENU_STYLE_TYPE_02);
 
        SetFooterStyle(STYLE_MORE_ADD);
        SetLayoutFitToForm();
+       __pContextItem = CommonUtil::CreateTableViewContextItemN(*this, GetWidth(), FLICK_MENU_STYLE_TYPE_02);
        AppLogDebug("EXIT");
        return ThumbnailBase::Construct();
 }
@@ -67,7 +67,7 @@ result
 AlbumListPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       CancelAllThumbnailRequest();
+       ThumbnailBase::Stop();
        RemoveContextMenu();
 
        if (__pPlayListPickerPopup != null)
@@ -249,7 +249,7 @@ AlbumListPanel::CreateItem(const int itemIndex, int itemWidth)
        pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
 
        CreateTableViewItem(*pItem, *pContentInfoStruct, __pPresentationModel->GetContentCount(itemIndex));
-       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
+       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) Integer(itemIndex)));
        pItem->SetContextItem(__pContextItem);
 
        delete pContentInfoStruct;
@@ -385,17 +385,15 @@ void
 AlbumListPanel::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
 {
        AppLogDebug("ENTER");
-       int itemIndex = 0;
-       void* pParam = null;
        __pThumbnail = pThumbnailInfo->GetBitmapN();
-       pParam = pThumbnailInfo->GetUserParamN();
-       if (pParam)
+       Object* pParam = pThumbnailInfo->GetUserParamN();
+       if (pParam != null)
        {
-               itemIndex = *(static_cast<int*>(pParam));
+               __pContentTableView->RefreshItem((static_cast<Integer*>(pParam))->ToInt(), TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+               delete pParam;
        }
-       __pContentTableView->RefreshItem(itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+
        delete pThumbnailInfo;
-       delete static_cast<int*>(pParam);
        AppLogDebug("EXIT");
 }
 
index 367b615..c33816b 100644 (file)
@@ -68,7 +68,7 @@ result
 AllListEditorPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       CancelAllThumbnailRequest();
+       ThumbnailBase::Stop();
        if (__pPlayListPickerPopup != null)
        {
                delete __pPlayListPickerPopup;
@@ -338,7 +338,7 @@ AllListEditorPanel::CreateItem(const int itemIndex, int itemWidth)
        pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
 
        CreateTableViewItem(*pItem, *pContentInfoStruct);
-       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
+       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) Integer(itemIndex)));
 
        delete pContentInfoStruct;
 
@@ -483,17 +483,15 @@ void
 AllListEditorPanel::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
 {
        AppLogDebug("ENTER");
-       int itemIndex = 0;
-       void* pParam = null;
        __pThumbnail = pThumbnailInfo->GetBitmapN();
-       pParam = pThumbnailInfo->GetUserParamN();
-       if (pParam)
+       Object* pParam = pThumbnailInfo->GetUserParamN();
+       if (pParam != null)
        {
-               itemIndex = *(static_cast<int*>(pParam));
+               __pContentTableView->RefreshItem((static_cast<Integer*>(pParam))->ToInt(), TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+               delete pParam;
        }
-       __pContentTableView->RefreshItem(itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+
        delete pThumbnailInfo;
-       delete static_cast<int*>(pParam);
        AppLogDebug("EXIT");
 }
 
index 538c565..b0fe0ae 100644 (file)
@@ -104,7 +104,7 @@ result
 AllListPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       CancelAllThumbnailRequest();
+       ThumbnailBase::Stop();
        RemoveContextMenu();
        if (__pPlayListPickerPopup != null)
        {
@@ -434,8 +434,8 @@ TableViewItem*
 AllListPanel::CreateItem(const int itemIndex, int itemWidth)
 {
        AppLogDebug("ENTER");
-       ContentInformation* pContentInfoStruct = __pPresentationModel->GetContentInfoN(itemIndex);
-       if (pContentInfoStruct == null)
+       ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(itemIndex);
+       if (pContentInfo == null)
        {
                return null;
        }
@@ -446,12 +446,11 @@ AllListPanel::CreateItem(const int itemIndex, int itemWidth)
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
 
-       CreateTableViewItem(*pItem, *pContentInfoStruct);
+       CreateTableViewItem(*pItem, *pContentInfo);
        pItem->SetContextItem(__pContextItem);
-       CommonUtil::SetLayoutFitToContainer(*pItem, *__pContextItem);
-       delete pContentInfoStruct;
 
-       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
+       RequestThumbnail(pContentInfo->contentId, (new (std::nothrow) Integer(itemIndex)));
+       delete pContentInfo;
 
        AppLogDebug("EXIT");
        return pItem;
@@ -602,17 +601,15 @@ void
 AllListPanel::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
 {
        AppLogDebug("ENTER");
-       int itemIndex = 0;
-       void* pParam = null;
        __pThumbnail = pThumbnailInfo->GetBitmapN();
-       pParam = pThumbnailInfo->GetUserParamN();
-       if (pParam)
+       Object* pParam = pThumbnailInfo->GetUserParamN();
+       if (pParam != null)
        {
-               itemIndex = *(static_cast<int*>(pParam));
+               __pContentTableView->RefreshItem((static_cast<Integer*>(pParam))->ToInt(), TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+               delete pParam;
        }
-       __pContentTableView->RefreshItem(itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+
        delete pThumbnailInfo;
-       delete static_cast<int*>(pParam);
        AppLogDebug("EXIT");
 }
 
index 0d2f342..573d78b 100644 (file)
@@ -100,7 +100,7 @@ result
 ArtistAlbumListEditorForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       CancelAllThumbnailRequest();
+       ThumbnailBase::Stop();
        AppLogDebug("EXIT");
        return E_SUCCESS;
 }
@@ -261,7 +261,7 @@ ArtistAlbumListEditorForm::CreateItem(const int itemIndex, int itemWidth)
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
 //     pItem->SetBackgroundColor(COLOR_ITEM);
 
-       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
+       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) Integer(itemIndex)));
        CommonUtil::CreateEditListTableViewItem(*pItem, *(GetDefaultThumbnail()), pContentInfoStruct->AlbumName, __pPresentationModel->GetArtistAlbumContentCount(itemIndex));
 
        delete pContentInfoStruct;
@@ -347,17 +347,15 @@ void
 ArtistAlbumListEditorForm::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
 {
        AppLogDebug("ENTER");
-       int itemIndex = 0;
-       void* pParam = null;
        __pThumbnail = pThumbnailInfo->GetBitmapN();
-       pParam = pThumbnailInfo->GetUserParamN();
-       if (pParam)
+       Object* pParam = pThumbnailInfo->GetUserParamN();
+       if (pParam != null)
        {
-               itemIndex = *(static_cast<int*>(pParam));
+               __pContentTableView->RefreshItem((static_cast<Integer*>(pParam))->ToInt(), TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+               delete pParam;
        }
-       __pContentTableView->RefreshItem(itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+
        delete pThumbnailInfo;
-       delete static_cast<int*>(pParam);
        AppLogDebug("EXIT");
 }
 
index 4d8d08b..3950fda 100644 (file)
@@ -116,7 +116,7 @@ result
 ArtistAlbumListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       CancelAllThumbnailRequest();
+       ThumbnailBase::Stop();
        delete __pContextItem;
        __pContextItem = null;
 
@@ -302,7 +302,7 @@ ArtistAlbumListForm::CreateItem(const int itemIndex, int itemWidth)
                }
 
                int itemTotalCount = __pPresentationModel->GetArtistAlbumContentCount(ALL_SONG_INDEX_COUNT_MINUS(itemIndex));
-               RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
+               RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) Integer(itemIndex)));
 
                CommonUtil::CreateTableViewItem(*pItem, *GetDefaultThumbnail(), pContentInfoStruct->ArtistName, itemTotalCount);
                pItem->SetContextItem(__pContextItem);
@@ -434,17 +434,15 @@ void
 ArtistAlbumListForm::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
 {
        AppLogDebug("ENTER");
-       int itemIndex = 0;
-       void* pParam = null;
        __pThumbnail = pThumbnailInfo->GetBitmapN();
-       pParam = pThumbnailInfo->GetUserParamN();
-       if (pParam)
+       Object* pParam = pThumbnailInfo->GetUserParamN();
+       if (pParam != null)
        {
-               itemIndex = *(static_cast<int*>(pParam));
+               __pContentTableView->RefreshItem((static_cast<Integer*>(pParam))->ToInt(), TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+               delete pParam;
        }
-       __pContentTableView->RefreshItem(itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+
        delete pThumbnailInfo;
-       delete static_cast<int*>(pParam);
        AppLogDebug("EXIT");
 }
 
index c4bc922..d9109e3 100644 (file)
@@ -94,7 +94,7 @@ result
 ArtistAllSongListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       CancelAllThumbnailRequest();
+       ThumbnailBase::Stop();
        delete __pPlayListPickerPopup;
        __pPlayListPickerPopup = null;
        AppLogDebug("EXIT");
@@ -205,21 +205,19 @@ Tizen::Ui::Controls::TableViewItem*
 ArtistAllSongListForm::CreateItem(const int itemIndex, int itemWidth)
 {
        AppLogDebug("ENTER");
-       ContentInformation* pContentInfoStruct = __pPresentationModel->GetArtistContentInfoN(itemIndex);
-       if (pContentInfoStruct == null)
+       ContentInformation* pContentInfo = __pPresentationModel->GetArtistContentInfoN(itemIndex);
+       if (pContentInfo == null)
        {
+               AppLogDebug("EXIT");
                return null;
        }
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
-//     pItem->SetBackgroundColor(COLOR_ITEM);
-
-       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
-       CreateTableViewItem(*pItem, *pContentInfoStruct);
+       CreateTableViewItem(*pItem, *pContentInfo);
 
-       delete pContentInfoStruct;
-       pContentInfoStruct = null;
+       RequestThumbnail(pContentInfo->contentId, (new (std::nothrow) Integer(itemIndex)));
+       delete pContentInfo;
 
        AppLogDebug("EXIT");
        return pItem;
@@ -334,17 +332,15 @@ void
 ArtistAllSongListForm::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
 {
        AppLogDebug("ENTER");
-       int itemIndex = 0;
-       void* pParam = null;
        __pThumbnail = pThumbnailInfo->GetBitmapN();
-       pParam = pThumbnailInfo->GetUserParamN();
-       if (pParam)
+       Object* pParam = pThumbnailInfo->GetUserParamN();
+       if (pParam != null)
        {
-               itemIndex = *(static_cast<int*>(pParam));
+               __pContentTableView->RefreshItem((static_cast<Integer*>(pParam))->ToInt(), TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+               delete pParam;
        }
-       __pContentTableView->RefreshItem(itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+
        delete pThumbnailInfo;
-       delete static_cast<int*>(pParam);
        AppLogDebug("EXIT");
 }
 
index 2ffeff5..19bed45 100644 (file)
@@ -114,7 +114,7 @@ result
 ArtistContentListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       CancelAllThumbnailRequest();
+       ThumbnailBase::Stop();
        RemoveCheckedItemMultiHashMap();
 
        delete __pTableViewContextItem;
@@ -544,19 +544,13 @@ void
 ArtistContentListForm::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
 {
        AppLogDebug("ENTER");
-       TableviewItemTag* pTableviewItemTag;
-       void* pParam = null;
        __pThumbnail = pThumbnailInfo->GetBitmapN();
-       pParam = pThumbnailInfo->GetUserParamN();
-       if (pParam)
-       {
-               pTableviewItemTag = static_cast<TableviewItemTag*>(pParam);
-       }
-
-       if (pTableviewItemTag != null)
+       Object* pParam = pThumbnailInfo->GetUserParamN();
+       if (pParam != null)
        {
+               TableviewItemTag* pTableviewItemTag = static_cast<TableviewItemTag*>(pParam);
                __pContentGroupedTableView->RefreshItem(pTableviewItemTag->__groupIndex, pTableviewItemTag->__itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
-               delete static_cast<TableviewItemTag*>(pParam);
+               delete pParam;
        }
 
        delete pThumbnailInfo;
index 2f2156d..a4a4744 100644 (file)
@@ -63,7 +63,7 @@ result
 ArtistListEditorPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       CancelAllThumbnailRequest();
+       ThumbnailBase::Stop();
        AppLogDebug("EXIT");
        return E_SUCCESS;
 }
@@ -246,8 +246,8 @@ Tizen::Ui::Controls::TableViewItem*
 ArtistListEditorPanel::CreateItem(const int itemIndex, int itemWidth)
 {
        AppLogDebug("ENTER");
-       ContentInformation* pContentInfoStruct = __pPresentationModel->GetArtistnIfoN(itemIndex);
-       if (pContentInfoStruct == null)
+       ContentInformation* pContentInfo = __pPresentationModel->GetArtistnIfoN(itemIndex);
+       if (pContentInfo == null)
        {
                return null;
        }
@@ -258,9 +258,9 @@ ArtistListEditorPanel::CreateItem(const int itemIndex, int itemWidth)
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
 
-       CreateTableViewItem(*pItem, *pContentInfoStruct);
-       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
-       delete pContentInfoStruct;
+       CreateTableViewItem(*pItem, *pContentInfo);
+       RequestThumbnail(pContentInfo->contentId, (new (std::nothrow) Integer(itemIndex)));
+       delete pContentInfo;
 
        AppLogDebug("EXIT");
        return pItem;
@@ -315,7 +315,7 @@ ArtistListEditorPanel::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableVie
        {
                SetUnCheckedIconAllCheckButton();
        }
-
+       SetCheckedCountBallonTooltip(__checkedItemCount);
        Invalidate(true);
        AppLogDebug("EXIT");
 }
@@ -404,7 +404,7 @@ ArtistListEditorPanel::SetCheckedIconAllCheckButton(void)
 {
        AppLogDebug("ENTER");
        Header* pHeader = GetParentHeader();
-       String titleText(L"EDIT");
+       String titleText(L"Edit");
        CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
        pHeader->Invalidate(true);
        AppLogDebug("EXIT");
@@ -415,7 +415,7 @@ ArtistListEditorPanel::SetUnCheckedIconAllCheckButton(void)
 {
        AppLogDebug("ENTER");
        Header* pHeader = GetParentHeader();
-       String titleText(L"EDIT");
+       String titleText(L"Edit");
        CommonUtil::SetEditHeaderStyle(*pHeader, titleText);
        pHeader->Invalidate(true);
        AppLogDebug("EXIT");
@@ -425,17 +425,15 @@ void
 ArtistListEditorPanel::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
 {
        AppLogDebug("ENTER");
-       int itemIndex = 0;
-       void* pParam = null;
        __pThumbnail = pThumbnailInfo->GetBitmapN();
-       pParam = pThumbnailInfo->GetUserParamN();
-       if (pParam)
+       Object* pParam = pThumbnailInfo->GetUserParamN();
+       if (pParam != null)
        {
-               itemIndex = *(static_cast<int*>(pParam));
+               __pContentTableView->RefreshItem((static_cast<Integer*>(pParam))->ToInt(), TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+               delete pParam;
        }
-       __pContentTableView->RefreshItem(itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+
        delete pThumbnailInfo;
-       delete static_cast<int*>(pParam);
        AppLogDebug("EXIT");
 }
 
index 0209f8b..358aaf2 100644 (file)
@@ -67,7 +67,7 @@ result
 ArtistListPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       CancelAllThumbnailRequest();
+       ThumbnailBase::Stop();
        RemoveContextMenu();
        AppLogDebug("EXIT");
        return E_SUCCESS;
@@ -234,9 +234,10 @@ Tizen::Ui::Controls::TableViewItem*
 ArtistListPanel::CreateItem(const int itemIndex, int itemWidth)
 {
        AppLogDebug("ENTER");
-       ContentInformation* pContentInfoStruct = __pPresentationModel->GetArtistnIfoN(itemIndex);
-       if (pContentInfoStruct == null)
+       ContentInformation* pContentInfo = __pPresentationModel->GetArtistnIfoN(itemIndex);
+       if (pContentInfo == null)
        {
+               AppLogDebug("EXIT");
                return null;
        }
 
@@ -246,11 +247,12 @@ ArtistListPanel::CreateItem(const int itemIndex, int itemWidth)
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
 
-       CreateTableViewItem(*pItem, *pContentInfoStruct, __pPresentationModel->GetArtistContentCount(itemIndex));
+       CreateTableViewItem(*pItem, *pContentInfo, __pPresentationModel->GetArtistContentCount(itemIndex));
        pItem->SetContextItem(__pContextItem);
-       delete pContentInfoStruct;
 
-       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
+       RequestThumbnail(pContentInfo->contentId, (new (std::nothrow) Integer(itemIndex)));
+       delete pContentInfo;
+
        AppLogDebug("EXIT");
        return pItem;
 }
@@ -411,17 +413,15 @@ void
 ArtistListPanel::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
 {
        AppLogDebug("ENTER");
-       int itemIndex = 0;
-       void* pParam = null;
        __pThumbnail = pThumbnailInfo->GetBitmapN();
-       pParam = pThumbnailInfo->GetUserParamN();
-       if (pParam)
+       Object* pParam = pThumbnailInfo->GetUserParamN();
+       if (pParam != null)
        {
-               itemIndex = *(static_cast<int*>(pParam));
+               __pContentTableView->RefreshItem((static_cast<Integer*>(pParam))->ToInt(), TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+               delete pParam;
        }
-       __pContentTableView->RefreshItem(itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+
        delete pThumbnailInfo;
-       delete static_cast<int*>(pParam);
        AppLogDebug("EXIT");
 }
 
index 22bd345..fd910b7 100644 (file)
@@ -257,7 +257,7 @@ ComposerListEditorPanel::CreateItem(const int itemIndex, int itemWidth)
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
 //     pItem->SetBackgroundColor(COLOR_ITEM);
 
-       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
+//     RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
        CommonUtil::CreateEditListTableViewItem(*pItem, *GetDefaultThumbnail(), pContentInfoStruct->ComposerName, __pPresentationModel->GetContentCount(itemIndex));
 
        delete pContentInfoStruct;
index 2141601..08e46b6 100644 (file)
@@ -268,7 +268,7 @@ ComposerListPanel::CreateItem(const int itemIndex, int itemWidth)
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
 //     pItem->SetBackgroundColor(COLOR_ITEM);
 
-       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
+//     RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
        CommonUtil::CreateTableViewItem(*pItem, *GetDefaultThumbnail(), pContentInfoStruct->ComposerName, __pPresentationModel->GetContentCount(itemIndex));
        pItem->SetContextItem(__pContextItem);
 
index 7795b77..5cef2fe 100644 (file)
@@ -190,7 +190,15 @@ void
 ContentEditPanel::SetContentEditHeader(void)\r
 {\r
        AppLogDebug("ENTER");\r
-       CommonUtil::SetSimpleTitleStyle(*GetHeader(), L"EDIT");  //NEED String\r
+       CommonUtil::SetSimpleTitleStyle(*GetHeader(), L"Edit");  //NEED String\r
        CommonUtil::SetButtonItemUnCheckedIcon(*GetParentHeader());\r
        AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
+ContentEditPanel::OnOrientationPanelChanged(Tizen::Ui::OrientationStatus orientationStatus)\r
+{\r
+       AppLogDebug("ENTER");\r
+       __pContentTableView->Invalidate(true);\r
+       AppLogDebug("EXIT");\r
 }
\ No newline at end of file
index ffc0719..0eb426f 100644 (file)
@@ -102,7 +102,7 @@ result
 FolderContentListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       CancelAllThumbnailRequest();
+       ThumbnailBase::Stop();
        __pPresentationModel = null;
        delete __pTableViewContextItem;
        __pTableViewContextItem = null;
@@ -388,16 +388,14 @@ FolderContentListForm::CreateItem(const int itemIndex, int itemWidth)
                return null;
        }
 
-       ContentInformation* pContentInfoStruct = __pPresentationModel->GetContentInfoN(itemIndex);
-       if (pContentInfoStruct != null)
+       ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(itemIndex);
+       if (pContentInfo != null)
        {
-               CreateTableViewItem(*pItem, *pContentInfoStruct);
-               RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
+               CreateTableViewItem(*pItem, *pContentInfo);
+               RequestThumbnail(pContentInfo->contentId, (new (std::nothrow) Integer(itemIndex)));
+               delete pContentInfo;
        }
 
-       delete pContentInfoStruct;
-       pContentInfoStruct = null;
-
        AppLogDebug("EXIT");
        return pItem;
 }
@@ -649,17 +647,15 @@ void
 FolderContentListForm::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
 {
        AppLogDebug("ENTER");
-       int itemIndex = 0;
-       void* pParam = null;
        __pThumbnail = pThumbnailInfo->GetBitmapN();
-       pParam = pThumbnailInfo->GetUserParamN();
-       if (pParam)
+       Object* pParam = pThumbnailInfo->GetUserParamN();
+       if (pParam != null)
        {
-               itemIndex = *(static_cast<int*>(pParam));
+               __pContentListTableView->RefreshItem((static_cast<Integer*>(pParam))->ToInt(), TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+               delete pParam;
        }
-       __pContentListTableView->RefreshItem(itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+
        delete pThumbnailInfo;
-       delete static_cast<int*>(pParam);
        AppLogDebug("EXIT");
 }
 
index a81294d..08d7fad 100644 (file)
@@ -74,6 +74,7 @@ FolderListPresentationModel::ContentDirectoryPathList(void)
        result r = directory.Construct(CONTENT_TYPE_AUDIO);
        if (IsFailed(r))
        {
+               AppLogDebug("EXIT");
                return null;
        }
        AppLogDebug("EXIT");
@@ -141,15 +142,21 @@ FolderListPresentationModel::GetFolderInfoN(int folderIndex)
        }
        ContentDirectory contentDirectory;
        result r = contentDirectory.Construct(CONTENT_TYPE_AUDIO);
-
        if (IsFailed(r))
        {
+               AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
                return null;
        }
 
        IList* pSearchList = contentDirectory.GetContentDirectoryItemListN(*(static_cast<String*>(__pFolderPathList->GetAt(folderIndex))), SEARCH_PAGE_NO, SEARCH_COUNT_PER_PAGE, STRING_SORT_TITLE, SORT_ORDER_ASCENDING);
-       if (pSearchList == null)
+       if (pSearchList == null || IsFailed(GetLastResult()))
        {
+               AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+               if (pSearchList != null)
+               {
+                       pSearchList->RemoveAll();
+                       delete pSearchList;
+               }
                return null;
        }
 
@@ -176,6 +183,7 @@ FolderListPresentationModel::GetContentPathListN(int folderIndex)
        AppLogDebug("ENTER");
        if (__pFolderPathList == null)
        {
+               AppLogDebug("EXIT");
                return null;
        }
 
@@ -183,12 +191,19 @@ FolderListPresentationModel::GetContentPathListN(int folderIndex)
        result r = contentDirectory.Construct(CONTENT_TYPE_AUDIO);
        if (IsFailed(r))
        {
+               AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
                return null;
        }
 
        IList* pSearchList = contentDirectory.GetContentDirectoryItemListN(*(static_cast<String*>(__pFolderPathList->GetAt(folderIndex))), SEARCH_PAGE_NO, SEARCH_COUNT_PER_PAGE, STRING_SORT_TITLE, SORT_ORDER_ASCENDING);
-       if (pSearchList == null)
+       if (pSearchList == null || IsFailed(GetLastResult()))
        {
+               AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+               if (pSearchList != null)
+               {
+                       pSearchList->RemoveAll();
+               }
+               delete pSearchList;
                return null;
        }
 
@@ -198,12 +213,14 @@ FolderListPresentationModel::GetContentPathListN(int folderIndex)
        for (int iCount = 0; iCount < pSearchList->GetCount(); iCount++)
        {
                ContentInfo* pContentInfo = static_cast<ContentInfo*>(pSearchList->GetAt(iCount));
-               pContentPathList->Add(*(new (std::nothrow) String(pContentInfo->GetContentPath())));
+               if (pContentInfo != null)
+               {
+                       pContentPathList->Add(*(new (std::nothrow) String(pContentInfo->GetContentPath())));
+               }
        }
 
        pSearchList->RemoveAll(true);
        delete pSearchList;
-       pSearchList = null;
 
        AppLogDebug("EXIT");
        return pContentPathList;
@@ -215,6 +232,7 @@ FolderListPresentationModel::GetFolderPath(int folderIndex)
        AppLogDebug("ENTER");
        if (__pFolderPathList == null)
        {
+               AppLogDebug("EXIT");
                return null;
        }
        AppLogDebug("EXIT");
@@ -225,24 +243,22 @@ void
 FolderListPresentationModel::InitializeContentList(int folderIndex)
 {
        AppLogDebug("ENTER");
-       if (__pContentList != null)
-       {
-               __pContentList->RemoveAll(true);
-       }
-
-       String* pFolderPath = static_cast<String*>(__pFolderPathList->GetAt(folderIndex));
-
        ContentDirectory contentDirectory;
        result r = contentDirectory.Construct(CONTENT_TYPE_AUDIO);
        if (IsFailed(r))
        {
+               AppLogDebug("EXIT(%s)", GetErrorMessage(r));
                return;
        }
-       __pContentList = contentDirectory.GetContentDirectoryItemListN(*pFolderPath,
-                                                                                                                               SEARCH_PAGE_NO,
-                                                                                                                               SEARCH_COUNT_PER_PAGE,
-                                                                                                                               STRING_SORT_TITLE,
-                                                                                                                               SORT_ORDER_ASCENDING);
+
+       String* pFolderPath = static_cast<String*>(__pFolderPathList->GetAt(folderIndex));
+       if (__pContentList != null)
+       {
+               __pContentList->RemoveAll(true);
+               delete __pContentList;
+       }
+
+       __pContentList = contentDirectory.GetContentDirectoryItemListN(*pFolderPath, SEARCH_PAGE_NO, SEARCH_COUNT_PER_PAGE, STRING_SORT_TITLE, SORT_ORDER_ASCENDING);
        __currentFolderIndex = folderIndex;
        AppLogDebug("EXIT");
 }
@@ -257,7 +273,10 @@ FolderListPresentationModel::GetContentInfoN(int contentIndex)
        if (pContentInfo != null && pContentInfo->GetContentType() == CONTENT_TYPE_AUDIO)
        {
                AudioContentInfo* pAudioContentInfo = static_cast<AudioContentInfo*>(pContentInfo);
-               pContentInfoStruct = CommonUtil::GetContentInformationN(*pAudioContentInfo);
+               if (pAudioContentInfo != null)
+               {
+                       pContentInfoStruct = CommonUtil::GetContentInformationN(*pAudioContentInfo);
+               }
        }
 
        AppLogDebug("EXIT");
@@ -285,44 +304,45 @@ FolderListPresentationModel::RemoveFolderList(int folderIndex)
        int totalCount = 0;
 
        ContentManager contentManager;
-       contentManager.Construct();
-
-       if (__pFolderPathList == null)
+       result r = contentManager.Construct();
+       if (IsFailed(r))
        {
+               AppLogDebug("EXIT(%s)", GetErrorMessage(r));
                return ;
        }
 
-       String* pFolderPath = static_cast<String*>(__pFolderPathList->GetAt(folderIndex));
-
        ContentDirectory contentDirectory;
-       result r = contentDirectory.Construct(CONTENT_TYPE_AUDIO);
-
+       r = contentDirectory.Construct(CONTENT_TYPE_AUDIO);
        if (IsFailed(r))
        {
+               AppLogDebug("EXIT(%s)", GetErrorMessage(r));
                return;
        }
-       pRemoveFolderList = contentDirectory.GetContentDirectoryItemListN(*pFolderPath,
-                                                                                                                               SEARCH_PAGE_NO,
-                                                                                                                               SEARCH_COUNT_PER_PAGE,
-                                                                                                                               STRING_SORT_TITLE,
-                                                                                                                               SORT_ORDER_ASCENDING);
-
-       totalCount = pRemoveFolderList->GetCount();
 
-       ContentInfo* pContentInfo = null;
-       ContentInformation* pContentInfoStruct = null;
+       if (__pFolderPathList != null)
+       {
+               String* pFolderPath = static_cast<String*>(__pFolderPathList->GetAt(folderIndex));
+               pRemoveFolderList = contentDirectory.GetContentDirectoryItemListN(*pFolderPath, SEARCH_PAGE_NO, SEARCH_COUNT_PER_PAGE, STRING_SORT_TITLE, SORT_ORDER_ASCENDING);
+       }
+       else
+       {
+               AppLogDebug("EXIT(__pFolderPathList is null)");
+               return;
+       }
 
+       totalCount = pRemoveFolderList->GetCount();
        for (int iCount = 0; iCount < totalCount; iCount++)
        {
-               pContentInfo = static_cast<ContentInfo*>(pRemoveFolderList->GetAt(iCount));
+               ContentInfo* pContentInfo = static_cast<ContentInfo*>(pRemoveFolderList->GetAt(iCount));
                if (pContentInfo != null && pContentInfo->GetContentType() == CONTENT_TYPE_AUDIO)
                {
                        AudioContentInfo* pAudioContentInfo = static_cast<AudioContentInfo*>(pContentInfo);
-                       pContentInfoStruct = CommonUtil::GetContentInformationN(*pAudioContentInfo);
-                       contentManager.DeleteContent(pContentInfoStruct->contentId);
-
-                       delete pContentInfoStruct;
-                       pContentInfoStruct = null;
+                       ContentInformation* pContentInfoStruct = CommonUtil::GetContentInformationN(*pAudioContentInfo);
+                       if (pContentInfoStruct != null)
+                       {
+                               contentManager.DeleteContent(pContentInfoStruct->contentId);
+                               delete pContentInfoStruct;
+                       }
                }
        }
 
@@ -335,25 +355,21 @@ void
 FolderListPresentationModel::RefreshContentList(int folderIndex)
 {
        AppLogDebug("ENTER");
-       if (__pContentList != null)
-       {
-               __pContentList->RemoveAll(true);
-       }
-
-       String* pFolderPath = static_cast<String*>(__pFolderPathList->GetAt(folderIndex));
-
        ContentDirectory contentDirectory;
        result r = contentDirectory.Construct(CONTENT_TYPE_AUDIO);
        if (IsFailed(r))
        {
+               AppLogDebug("EXIT(%s)", GetErrorMessage(r));
                return;
        }
-       __pContentList = contentDirectory.GetContentDirectoryItemListN(*pFolderPath,
-                                                                                                                               SEARCH_PAGE_NO,
-                                                                                                                               SEARCH_COUNT_PER_PAGE,
-                                                                                                                               STRING_SORT_TITLE,
-                                                                                                                               SORT_ORDER_ASCENDING);
+       if (__pContentList != null)
+       {
+               __pContentList->RemoveAll(true);
+               delete __pContentList;
+       }
 
+       String* pFolderPath = static_cast<String*>(__pFolderPathList->GetAt(folderIndex));
+       __pContentList = contentDirectory.GetContentDirectoryItemListN(*pFolderPath, SEARCH_PAGE_NO, SEARCH_COUNT_PER_PAGE, STRING_SORT_TITLE, SORT_ORDER_ASCENDING);
        if (__pContentList->GetCount() == INIT_VALUE)
        {
                __pContentList->RemoveAll(true);
@@ -379,13 +395,13 @@ FolderListPresentationModel::AddContent(String path, int playlistIndex)
        AppLogDebug("ENTER");
        ContentInformation* pContentInfoStruct = GetContentInfoN(playlistIndex);
        PlayList* pPlayList = PlayListManager::GetInstance()->GetPlayListN(path);
-       pPlayList->AddItem(pContentInfoStruct->contentId);
-
-       delete pContentInfoStruct;
-       pContentInfoStruct = null;
+       if (pContentInfoStruct != null)
+       {
+               pPlayList->AddItem(pContentInfoStruct->contentId);
+               delete pContentInfoStruct;
+       }
 
        delete pPlayList;
-       pPlayList = null;
        AppLogDebug("EXIT");
 }
 
index e1e5761..ac343ca 100644 (file)
@@ -254,7 +254,7 @@ GenresListEditorPanel::CreateItem(const int itemIndex, int itemWidth)
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_MARK);
 //     pItem->SetBackgroundColor(COLOR_ITEM);
 
-       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
+//     RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
        CommonUtil::CreateEditListTableViewItem(*pItem, *GetDefaultThumbnail(), pContentInfoStruct->GenreName, __pPresentationModel->GetContentCount(itemIndex));
 
        delete pContentInfoStruct;
index e631a73..223cddd 100644 (file)
@@ -274,7 +274,7 @@ GenreListPanel::CreateItem(const int itemIndex, int itemWidth)
        pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
 //     pItem->SetBackgroundColor(COLOR_ITEM);
 
-       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
+//     RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
        CommonUtil::CreateTableViewItem(*pItem, *GetDefaultThumbnail(), pContentInfoStruct->GenreName, __pPresentationModel->GetContentCount(itemIndex));
        pItem->SetContextItem(__pContextItem);
 
index 982e5b7..8f5d4fe 100644 (file)
@@ -175,12 +175,12 @@ MusicPlayerApp::OnForeground(void)
        Scene* pScene = pSceneManager->GetCurrentScene();
        AppAssert(pScene);
 
-       BasePanel* pBasePanel = dynamic_cast<BasePanel*>(pScene->GetPanel());
-       PlayerForm* pBaseForm = dynamic_cast<PlayerForm*>(pScene->GetForm());
-       if (pBasePanel)
-       {
-               pBasePanel->OnUpdateContentList();
-       }
+//     BasePanel* pBasePanel = dynamic_cast<BasePanel*>(pScene->GetPanel());
+//     PlayerForm* pBaseForm = dynamic_cast<PlayerForm*>(pScene->GetForm());
+//     if (pBasePanel)
+//     {
+//             pBasePanel->OnUpdateContentList();
+//     }
 //     else
 //     {
 //             if (pBaseForm)
@@ -189,6 +189,7 @@ MusicPlayerApp::OnForeground(void)
 //             }
 //     }
 
+       PlayerForm* pBaseForm = dynamic_cast<PlayerForm*>(pScene->GetForm());
        if (pScene->GetSceneId() == IDSCN_PLAYER)
        {
                if (pBaseForm)
index b9fee20..29b699a 100644 (file)
@@ -364,6 +364,8 @@ PlayerForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::Or
                        __pVolumePanel->Invalidate(true);
                }
        }
+
+       __pContentsListViewPanel->Invalidate(true);
        AppLogDebug("EXIT");
 }
 
@@ -371,7 +373,7 @@ result
 PlayerForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       CancelAllThumbnailRequest();
+       ThumbnailBase::Stop();
        if (__pAlbumArtElements)
        {
                __pAlbumArtElements->Destroy();
@@ -1033,8 +1035,8 @@ Tizen::Ui::Controls::TableViewItem*
 PlayerForm::CreateItem(int index, int itemWidth)
 {
        AppLogDebug("ENTER");
-       ContentInformation* pContentInfoStruct = __pPlayerPresentationModel->GetContentInfoN(index);
-       if (pContentInfoStruct == null)
+       ContentInformation* pContentInfo = __pPlayerPresentationModel->GetContentInfoN(index);
+       if (pContentInfo == null)
        {
                return null;
        }
@@ -1043,11 +1045,18 @@ PlayerForm::CreateItem(int index, int itemWidth)
        layout.Construct();
 
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
-       pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
+       result r = pItem->Construct(layout, Dimension(itemWidth, ITEM_HEIGHT), TABLE_VIEW_ANNEX_STYLE_NORMAL);
+       if (IsFailed(r))
+       {
+               AppLogDebug("EXIT(%s)", GetErrorMessage(r));
+               delete pContentInfo;
+               delete pItem;
+               return null;
+       }
 
-       CreateTableViewItem(*pItem, *pContentInfoStruct);
-       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(index)));
-       delete pContentInfoStruct;
+       CreateTableViewItem(*pItem, *pContentInfo);
+       RequestThumbnail(pContentInfo->contentId, (new (std::nothrow) Integer(index)));
+       delete pContentInfo;
 
        AppLogDebug("EXIT");
        return pItem;
@@ -1117,8 +1126,6 @@ PlayerForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                        Tizen::Base::Collection::IList* pArgs)
 {
        AppLogDebug("ENTER");
-       CancelAllThumbnailRequest();
-
        MusicPlayerApp* pMusicPlayerApp = static_cast<MusicPlayerApp*>(MusicPlayerApp::GetInstance());
        TryReturnVoid(pMusicPlayerApp != null, "Unable to cast UiApp to MusicPlayerApp");
        /* Comment out this code temporarily in 2.0. This will be supported in 2.1.
@@ -1752,18 +1759,15 @@ void
 PlayerForm::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
 {
        AppLogDebug("ENTER");
-       int itemIndex = 0;
-       void* pParam = null;
        __pThumbnail = pThumbnailInfo->GetBitmapN();
-       pParam = pThumbnailInfo->GetUserParamN();
-       if (pParam)
+       Object* pParam = pThumbnailInfo->GetUserParamN();
+       if (pParam != null)
        {
-               itemIndex = *(static_cast<int*>(pParam));
+               static_cast<TableView*>(__pContentsListViewPanel->GetControl(IDC_CONTENTS_TABLEVIEW))->RefreshItem((static_cast<Integer*>(pParam))->ToInt(), TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+               delete pParam;
        }
-       TableView* pContentsTableView = static_cast<TableView*>(__pContentsListViewPanel->GetControl(IDC_CONTENTS_TABLEVIEW));
-       pContentsTableView->RefreshItem(itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+
        delete pThumbnailInfo;
-       delete static_cast<int*>(pParam);
        AppLogDebug("EXIT");
 }
 
index c0df9ee..974f47b 100644 (file)
@@ -1251,6 +1251,8 @@ PlayerPresentationModel::SetPlayPosition(int playPosition)
                        __seekCompleted = true;
                }
        }
+
+       AppLogDebug("EXIT");
        return r;
 
 CATCH:
index 21f1bb2..b0a66ab 100644 (file)
@@ -101,7 +101,7 @@ result
 PlaylistContentListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       CancelAllThumbnailRequest();
+       ThumbnailBase::Stop();
        AppLogDebug("EXIT");
        return ContentListForm::OnTerminating();
 }
@@ -283,7 +283,7 @@ PlaylistContentListForm::CreateItem(const int itemIndex, int itemWidth)
        }
 
        CreateTableViewItem(*pItem, *pContentInfo);
-       RequestThumbnail(pContentInfo->contentId, (new (std::nothrow) int(itemIndex)));
+       RequestThumbnail(pContentInfo->contentId, (new (std::nothrow) Integer(itemIndex)));
        delete pContentInfo;
 
        AppLogDebug("EXIT");
@@ -547,17 +547,16 @@ void
 PlaylistContentListForm::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
 {
        AppLogDebug("ENTER");
-       int itemIndex = 0;
-       void* pParam = null;
+       Object* pParam = null;
        __pThumbnail = pThumbnailInfo->GetBitmapN();
        pParam = pThumbnailInfo->GetUserParamN();
-       if (pParam)
+       if (pParam != null)
        {
-               itemIndex = *(static_cast<int*>(pParam));
+               __pContentListTableView->RefreshItem((static_cast<Integer*>(pParam))->ToInt(), TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+               delete pParam;
        }
-       __pContentListTableView->RefreshItem(itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+
        delete pThumbnailInfo;
-       delete static_cast<int*>(pParam);
        AppLogDebug("EXIT");
 }
 
index ae9cf49..3e846e6 100644 (file)
@@ -69,7 +69,7 @@ result
 PlaylistListEditorPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       CancelAllThumbnailRequest();
+       ThumbnailBase::Stop();
        AppLogDebug("EXIT");
        return E_SUCCESS;
 }
@@ -298,7 +298,7 @@ PlaylistListEditorPanel::CreateItem(const int itemIndex, int itemWidth)
        if (playlistItemCount > 0 && !IsFailed(GetLastResult()))
        {
                static_cast<Label*>(pTableViewItem->GetControl(IDC_CONTENTS_THUMBNAIL))->SetBackgroundBitmap(*GetDefaultThumbnail());
-               RequestThumbnail(contentId, (new (std::nothrow) int(itemIndex)));
+               RequestThumbnail(contentId, (new (std::nothrow) Integer(itemIndex)));
        }
        else
        {
@@ -449,17 +449,15 @@ void
 PlaylistListEditorPanel::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
 {
        AppLogDebug("ENTER");
-       int itemIndex = 0;
-       void* pParam = null;
        __pThumbnail = pThumbnailInfo->GetBitmapN();
-       pParam = pThumbnailInfo->GetUserParamN();
-       if (pParam)
+       Object* pParam = pThumbnailInfo->GetUserParamN();
+       if (pParam != null)
        {
-               itemIndex = *(static_cast<int*>(pParam));
+               __pContentTableView->RefreshItem((static_cast<Integer*>(pParam))->ToInt(), TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+               delete pParam;
        }
-       __pContentTableView->RefreshItem(itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+
        delete pThumbnailInfo;
-       delete static_cast<int*>(pParam);
        AppLogDebug("EXIT");
 }
 
index c252b77..7d88e57 100644 (file)
@@ -97,7 +97,7 @@ result
 PlaylistListPanel::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       CancelAllThumbnailRequest();
+       ThumbnailBase::Stop();
        RemoveContextMenu();
        if (__pDeletePopup != null)
        {
@@ -348,7 +348,7 @@ PlaylistListPanel::CreateItem(const int itemIndex, int itemWidth)
                if (playlistItemCount > 0 && !IsFailed(GetLastResult()))
                {
                        CreateTableViewItem(*pTableItem, *playlistName, *GetDefaultThumbnail(), playlistItemCount);
-                       RequestThumbnail(contentId, (new (std::nothrow) int(itemIndex)));
+                       RequestThumbnail(contentId, (new (std::nothrow) Integer(itemIndex)));
                }
                else
                {
@@ -546,17 +546,15 @@ void
 PlaylistListPanel::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
 {
        AppLogDebug("ENTER");
-       int itemIndex = 0;
-       void* pParam = null;
        __pThumbnail = pThumbnailInfo->GetBitmapN();
-       pParam = pThumbnailInfo->GetUserParamN();
-       if (pParam)
+       Object* pParam = pThumbnailInfo->GetUserParamN();
+       if (pParam != null)
        {
-               itemIndex = *(static_cast<int*>(pParam));
+               __pContentTableView->RefreshItem((static_cast<Integer*>(pParam))->ToInt(), TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+               delete pParam;
        }
-       __pContentTableView->RefreshItem(itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+
        delete pThumbnailInfo;
-       delete static_cast<int*>(pParam);
        AppLogDebug("EXIT");
 }
 
index 2779de3..e8232b6 100644 (file)
@@ -40,7 +40,7 @@ using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
-static const Tizen::Graphics::Rectangle RECT_LABEL (0, 0, 560, 128);
+static const Tizen::Graphics::Rectangle RECT_LABEL (0, 25, 560, 60);
 static const int HEIGHT_POPUP_ITEM = 110;
 
 PlayListPickerPopup::PlayListPickerPopup(void)
index 7f84fe8..30044cb 100644 (file)
@@ -34,6 +34,7 @@ using namespace Tizen::Graphics;
 ThumbnailBase::ThumbnailBase(void)\r
        : __pIThumbnailProviderHandler(null)\r
        , __pThumbnailEvent(null)\r
+       , __isForceStop(false)\r
 {\r
        AppLogDebug("ENTER");\r
        AppLogDebug("EXIT");\r
@@ -42,7 +43,8 @@ ThumbnailBase::ThumbnailBase(void)
 ThumbnailBase::~ThumbnailBase(void)\r
 {\r
        AppLogDebug("ENTER");\r
-       RemoveThumbnailEventListner();\r
+       delete __pThumbnailEvent;\r
+       __pThumbnailEvent = null;\r
        __pIThumbnailProviderHandler = null;\r
        AppLogDebug("EXIT");\r
 }\r
@@ -64,6 +66,16 @@ ThumbnailBase::Construct(void)
 }\r
 \r
 void\r
+ThumbnailBase::Stop(void)\r
+{\r
+       AppLogDebug("ENTER");\r
+       __isForceStop = true;\r
+       CancelAllThumbnailRequest();\r
+       RemoveThumbnailEventListner();\r
+       AppLogDebug("EXIT");\r
+}\r
+\r
+void\r
 ThumbnailBase::SetThumbnailEventListner(void)\r
 {\r
        AppLogDebug("ENTER");\r
@@ -84,11 +96,7 @@ void
 ThumbnailBase::RemoveThumbnailEventListner(void)\r
 {\r
        AppLogDebug("ENTER");\r
-       CancelAllThumbnailRequest();\r
-\r
        __pThumbnailEvent->RemoveListener(*(static_cast<IThumbnailEventListener*>(this)));\r
-       delete __pThumbnailEvent;\r
-       __pThumbnailEvent = null;\r
        AppLogDebug("EXIT");\r
 }\r
 \r
@@ -101,9 +109,15 @@ ThumbnailBase::CancelAllThumbnailRequest(void)
 }\r
 \r
 void\r
-ThumbnailBase::RequestThumbnail(const Tizen::Content::ContentId& contentId, void* pParam) const\r
+ThumbnailBase::RequestThumbnail(const Tizen::Content::ContentId& contentId, Tizen::Base::Object* pParam) const\r
 {\r
        AppLogDebug("ENTER");\r
+       if (__isForceStop == true)\r
+       {\r
+               AppLogDebug("EXIT");\r
+               delete pParam;\r
+               return;\r
+       }\r
        __pIThumbnailProviderHandler->RequestThumbnail(contentId, __pThumbnailEvent, pParam);\r
        AppLogDebug("EXIT");\r
 }\r
@@ -121,7 +135,14 @@ ThumbnailBase::OnThumbnailReceivedN(Tizen::Base::Runtime::IEventArg& eventArg)
 {\r
        AppLogDebug("ENTER");\r
        ThumbnailInfo* pThumbnailInfo = GetThumbnailInfo(eventArg);\r
-       OnThumbnailInfoReveivedN(pThumbnailInfo);\r
+       if (pThumbnailInfo != null && __isForceStop == false)\r
+       {\r
+               OnThumbnailInfoReveivedN(pThumbnailInfo);\r
+       }\r
+       else\r
+       {\r
+               delete pThumbnailInfo;\r
+       }\r
        AppLogDebug("EXIT");\r
 }\r
 \r
@@ -129,14 +150,8 @@ ThumbnailInfo*
 ThumbnailBase::GetThumbnailInfo(Tizen::Base::Runtime::IEventArg& eventArg)\r
 {\r
        AppLogDebug("ENTER");\r
-       ThumbnailEventArg* pThumbnailEventArg = static_cast<ThumbnailEventArg*>(&eventArg);\r
-       if (pThumbnailEventArg == null)\r
-       {\r
-               AppLogDebug("pThumbnailEventArg is null(%s)", GetErrorMessage(GetLastResult()));\r
-               return null;\r
-       }\r
-\r
-       ThumbnailInfo* pThumbnailInfo = pThumbnailEventArg->GetThumbnailInfoN();\r
+       ThumbnailEventArg& pThumbnailEventArg = static_cast<ThumbnailEventArg&>(eventArg);\r
+       ThumbnailInfo* pThumbnailInfo = pThumbnailEventArg.GetThumbnailInfoN();\r
        AppLogDebug("EXIT");\r
        return pThumbnailInfo;\r
 }
\ No newline at end of file
index 8b8b4b4..9030680 100644 (file)
@@ -35,10 +35,8 @@ ThumbnailEventArg::ThumbnailEventArg(ThumbnailInfo* pThumbnailInfo)
 ThumbnailEventArg::~ThumbnailEventArg(void)
 {
        AppLogDebug("ENTER");
-       if (_pThumbnailInfo != null)
-       {
-               delete _pThumbnailInfo;
-       }
+       delete _pThumbnailInfo;
+       _pThumbnailInfo = null;
        AppLogDebug("EXIT");
 }
 
index 4943a87..346e14d 100644 (file)
@@ -39,12 +39,14 @@ ThumbnailInfo::~ThumbnailInfo(void)
        AppLogDebug("ENTER");
        delete __pBitmap;
        __pBitmap = null;
+       delete __pParam;
+       __pParam = null;
        AppLogDebug("EXIT");
 }
 
 void
 ThumbnailInfo::Construct(const Tizen::Content::ContentId& contentId,
-                                               const Tizen::Graphics::Bitmap& bitmap, void* pParam)
+                                               const Tizen::Graphics::Bitmap& bitmap, Tizen::Base::Object* pParam)
 {
        AppLogDebug("ENTER");
        __contentId = contentId;
@@ -69,12 +71,14 @@ ThumbnailInfo::GetBitmapN(void) const
        return CloneBitmapN(*__pBitmap);
 }
 
-void*
-ThumbnailInfo::GetUserParamN(void)
+Tizen::Base::Object*
+ThumbnailInfo::GetUserParamN(void) const
 {
        AppLogDebug("ENTER");
+       Object* pUserParam = __pParam;
+       __pParam = null;
        AppLogDebug("EXIT");
-       return __pParam;
+       return pUserParam;
 }
 
 Bitmap*
index 8a58010..480a413 100644 (file)
@@ -37,12 +37,14 @@ ThumbnailJob::ThumbnailJob(void)
 ThumbnailJob::~ThumbnailJob(void)
 {
        AppLogDebug("ENTER");
+       delete __pParam;
+       __pParam = null;
        AppLogDebug("EXIT");
 }
 
 void
 ThumbnailJob::Construct(const ContentId& contentId, const unsigned long requestId,
-               const ThumbnailEvent* pRequestEvent, void* pParam)
+               const ThumbnailEvent* pRequestEvent, Tizen::Base::Object* pParam)
 {
        AppLogDebug("ENTER");
        __contentId = contentId;
@@ -76,10 +78,12 @@ ThumbnailJob::GetEvent(void) const
        return __pRequestEvent;
 }
 
-void*
-ThumbnailJob::GetUserParam(void) const
+Tizen::Base::Object*
+ThumbnailJob::GetUserParamN(void) const
 {
        AppLogDebug("ENTER");
+       Object* pUserParam = __pParam;
+       __pParam = null;
        AppLogDebug("EXIT");
-       return __pParam;
+       return pUserParam;
 }
\ No newline at end of file
index 239962f..ccabdab 100644 (file)
@@ -137,7 +137,6 @@ ThumbnailProvider::CreateInstance(void)
        AppLogDebug("ENTER");
        __pThumbnailProviderInstance = new (std::nothrow) ThumbnailProvider();
        result r = __pThumbnailProviderInstance->Construct();
-
        if (IsFailed(r))
        {
                delete __pThumbnailProviderInstance;
@@ -174,7 +173,7 @@ ThumbnailProvider::Release(void)
 }
 
 void
-ThumbnailProvider::RequestThumbnail(const ContentId& contentId, const ThumbnailEvent* event, void* pParam)
+ThumbnailProvider::RequestThumbnail(const ContentId& contentId, const ThumbnailEvent* event, Tizen::Base::Object* pParam)
 {
        AppLogDebug("ENTER");
        AppLogDebug("[THREAD] Request Job - (MainThread)");
@@ -183,6 +182,7 @@ ThumbnailProvider::RequestThumbnail(const ContentId& contentId, const ThumbnailE
                || __pMutexCmd == null || __pCmdQueue == null || __isForceClose == true)
        {
                AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult()));
+               delete pParam;
                return;
        }
 
@@ -295,10 +295,6 @@ ThumbnailProvider::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
 {
        AppLogDebug("ENTER");
        AppLogDebug("[THREAD] Receive Job Message - (SubThread)");
-       ThumbnailJob* pThumbnailJob = null;
-       ThumbnailInfo* pThumbnailInfo = null;
-       ContentId contentId;
-
        if (__pMutexCmd == null || __pCmdQueue == null)
        {
                delete pArgs;
@@ -309,7 +305,7 @@ ThumbnailProvider::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
        __pMutexCmd->Acquire();
        if (__pCmdQueue->GetCount() > 0)
        {
-               pThumbnailJob = static_cast<ThumbnailJob*>(__pCmdQueue->GetAt(0));
+               ThumbnailJob* pThumbnailJob = static_cast<ThumbnailJob*>(__pCmdQueue->GetAt(0));
                if (pThumbnailJob == null)
                {
                        __pCmdQueue->RemoveAt(0);
@@ -321,7 +317,7 @@ ThumbnailProvider::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
                ContentId contentId = pThumbnailJob->GetContentId();
                __pMutexCmd->Release();
 
-               pThumbnailInfo = GetThumbnailInfoN(contentId, pThumbnailJob->GetUserParam());
+               ThumbnailInfo* pThumbnailInfo = GetThumbnailInfoN(contentId, pThumbnailJob->GetUserParamN());
                if (pThumbnailInfo == null)
                {
                        __pMutexCmd->Acquire();
@@ -340,8 +336,11 @@ ThumbnailProvider::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
                        {
                                ThumbnailEventArg* pSendingArg = new (std::nothrow) ThumbnailEventArg(pThumbnailInfo);
                                pThumbnailEvent->Fire(*pSendingArg);
+                               pThumbnailInfo = null;
                        }
+
                        __pCmdQueue->RemoveAt(0, true);
+                       delete pThumbnailInfo;
                }
                else
                {
@@ -356,55 +355,38 @@ ThumbnailProvider::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
 }
 
 ThumbnailInfo*
-ThumbnailProvider::GetThumbnailInfoN(const ContentId& contentId, void* pParam) const
+ThumbnailProvider::GetThumbnailInfoN(const ContentId& contentId, Tizen::Base::Object* pParam) const
 {
        AppLogDebug("ENTER");
        ThumbnailInfo* pNewThumbnailInfo = null;
+       Bitmap* pBitmap = null;
+       ContentInfo* pContentInfo = null;
 
        ContentManager contentManager;
        result r = contentManager.Construct();
-       if (r == E_SUCCESS)
-       {
-               Bitmap* pBitmap = null;
-               long duration = 0;
-
-               ContentInfo* pContentInfo = contentManager.GetContentInfoN(contentId);
+       TryCatch(r == E_SUCCESS, , "ContentManager.Construct() failed(%s)", GetErrorMessage(r));
 
-               if (pContentInfo != null && GetLastResult() == E_SUCCESS)
-               {
-                       pBitmap = pContentInfo->GetThumbnailN();
+       pContentInfo = contentManager.GetContentInfoN(contentId);
+       TryCatch(GetLastResult() == E_SUCCESS, , "ContentManager.GetContentInfoN() failed(%s)", GetErrorMessage(r));
+       TryCatch(pContentInfo != null, delete pContentInfo, "pContentInfo is null(%s)", GetErrorMessage(GetLastResult()));
 
-                       if (pBitmap == null)
-                       {
-                               pBitmap = GetThumbnailByDecodeN(pContentInfo->GetContentPath(), pContentInfo->GetContentType());
-                               if (pBitmap == null)
-                               {
-                                       delete pContentInfo;
-                                       return null;
-                               }
-                       }
+       pBitmap = pContentInfo->GetThumbnailN();
+       if (pBitmap == null)
+       {
+               pBitmap = GetThumbnailByDecodeN(pContentInfo->GetContentPath(), pContentInfo->GetContentType());
+               TryCatch(pBitmap != null, delete pContentInfo , "GetThumbnailByDecodeN failed(%s)", GetErrorMessage(GetLastResult()));
+       }
+       pBitmap->Scale(Dimension(W_THUMBNAIL, H_THUMBNAIL));
 
-                       pBitmap->Scale(Dimension(W_THUMBNAIL, H_THUMBNAIL));
-               }
-               else
-               {
-                       delete pContentInfo;
-                       AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult()));
-                       return null;
-               }
+       pNewThumbnailInfo = new (std::nothrow) ThumbnailInfo();
+       pNewThumbnailInfo->Construct(contentId, *pBitmap, pParam);
 
-               ContentType contentType = pContentInfo->GetContentType();
-               if (contentType == CONTENT_TYPE_VIDEO)
-               {
-                       VideoContentInfo* pVideoContentInfo = static_cast<VideoContentInfo*>(pContentInfo);
-                       duration = pVideoContentInfo->GetDuration();
-               }
-               pNewThumbnailInfo = new (std::nothrow) ThumbnailInfo();
-               pNewThumbnailInfo->Construct(contentId, *pBitmap, pParam);
-       }
+       AppLogDebug("EXIT");
+       return pNewThumbnailInfo;
 
+CATCH:
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
-       return pNewThumbnailInfo;
+       return null;
 }
 
 Bitmap*
@@ -420,7 +402,6 @@ ThumbnailProvider::GetThumbnailByDecodeN(const String& filePath, const ContentTy
        else
        {
                AudioMetadata* pAudioMeta = ContentManagerUtil::GetAudioMetaN(filePath);
-
                TryReturn(pAudioMeta != null, null, "filepath is [%ls]", filePath.GetPointer());
 
                pBitmap = pAudioMeta->GetAlbumArtN();
index 7d80924..22802c8 100644 (file)
@@ -96,7 +96,7 @@ result
 UserPlaylistContentListForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
-       CancelAllThumbnailRequest();
+       ThumbnailBase::Stop();
        __pPresentationModel = null;
        AppLogDebug("EXIT");
        return ContentListForm::OnTerminating();
@@ -297,7 +297,7 @@ UserPlaylistContentListForm::CreateItem(const int itemIndex, int itemWidth)
        }
 
        CreateTableViewItem(*pItem, *pContentInfo);
-       RequestThumbnail(pContentInfo->contentId, (new (std::nothrow) int(itemIndex)));
+       RequestThumbnail(pContentInfo->contentId, (new (std::nothrow) Integer(itemIndex)));
        delete pContentInfo;
 
        AppLogDebug("EXIT");
@@ -457,17 +457,15 @@ void
 UserPlaylistContentListForm::OnThumbnailInfoReveivedN(ThumbnailInfo* pThumbnailInfo)
 {
        AppLogDebug("ENTER");
-       int itemIndex = 0;
-       void* pParam = null;
        __pThumbnail = pThumbnailInfo->GetBitmapN();
-       pParam = pThumbnailInfo->GetUserParamN();
-       if (pParam)
+       Object* pParam = pThumbnailInfo->GetUserParamN();
+       if (pParam != null)
        {
-               itemIndex = *(static_cast<int*>(pParam));
+               __pContentListTableView->RefreshItem((static_cast<Integer*>(pParam))->ToInt(), TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+               delete pParam;
        }
-       __pContentListTableView->RefreshItem(itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+
        delete pThumbnailInfo;
-       delete static_cast<int*>(pParam);
        AppLogDebug("EXIT");
 }
 
index 505e0ca..09a99d1 100644 (file)
@@ -261,7 +261,7 @@ YearsListEditorPanel::CreateItem(const int itemIndex, int itemWidth)
        {
                strYear = STRING_UNKNOWN;
        }
-       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
+//     RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
        CommonUtil::CreateEditListTableViewItem(*pItem, *GetDefaultThumbnail(), strYear, __pPresentationModel->GetContentCount(itemIndex));
 
        delete pContentInfoStruct;
index f96704e..fa97ffc 100644 (file)
@@ -278,7 +278,7 @@ YearsListPanel::CreateItem(const int itemIndex, int itemWidth)
                strYear = STRING_UNKNOWN;
        }
 
-       RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
+//     RequestThumbnail(pContentInfoStruct->contentId, (new (std::nothrow) int(itemIndex)));
        CommonUtil::CreateTableViewItem(*pItem, *GetDefaultThumbnail(), strYear, __pPresentationModel->GetContentCount(itemIndex));
        pItem->SetContextItem(__pContextItem);