delete create and destroy method of media data

Change-Id: Iffefccfb0b9ba23317234b09178199b4e3e720d9
Signed-off-by: Jehun Lim <jehun.lim@samsung.com>

diff --git a/include/data/eventinfo.h b/include/data/eventinfo.h
index d27d4aa..07b4bb4 100644 (file)
--- a/include/data/eventinfo.h
+++ b/include/data/eventinfo.h
@@ -25,11 +25,8 @@ private:
        void m_DeleteMediaList(void);
 
 public:
-       CEventInfo() : m(0) {};
-       virtual ~CEventInfo() {};
-
-       bool Create(void);
-       virtual void Destroy(void);
+       CEventInfo();
+       virtual ~CEventInfo();
 
        CMediaInfo *MediaInfo(void);
        Eina_List *MediaList(void);

diff --git a/include/data/folderinfo.h b/include/data/folderinfo.h
index a7d5b86..5af39ec 100644 (file)
--- a/include/data/folderinfo.h
+++ b/include/data/folderinfo.h
@@ -25,11 +25,8 @@ private:
        void m_DeleteMediaList(void);
 
 public:
-       CFolderInfo() : m(0) {};
-       virtual ~CFolderInfo() {};
-
-       bool Create(void);
-       virtual void Destroy(void);
+       CFolderInfo();
+       virtual ~CFolderInfo();
 
        Eina_List *MediaList(void);
 

diff --git a/include/data/imageinfo.h b/include/data/imageinfo.h
index 3a72cf1..e6409cb 100644 (file)
--- a/include/data/imageinfo.h
+++ b/include/data/imageinfo.h
@@ -34,11 +34,8 @@ private:
        bool m_SetOrientation(int orientation);
 
 public:
-       CImageInfo() : m(0) {};
-       virtual ~CImageInfo() {};
-
-       bool Create(void);
-       void Destroy(void);
+       CImageInfo();
+       virtual ~CImageInfo();
 
        bool Update(void);
 

diff --git a/include/data/mediainfo.h b/include/data/mediainfo.h
index b5fd31e..3fade24 100644 (file)
--- a/include/data/mediainfo.h
+++ b/include/data/mediainfo.h
@@ -27,11 +27,8 @@ private:
        bool m_SetSource(int source);
 
 public:
-       CMediaInfo() : m(0) {};
-       virtual ~CMediaInfo() {};
-
-       virtual bool Create(void);
-       virtual void Destroy(void);
+       CMediaInfo();
+       virtual ~CMediaInfo();
 
        virtual bool Update(void);
 

diff --git a/include/data/videoinfo.h b/include/data/videoinfo.h
index 6e6a035..4652c62 100644 (file)
--- a/include/data/videoinfo.h
+++ b/include/data/videoinfo.h
@@ -32,11 +32,8 @@ private:
        bool m_SetPlayedPosition(int played_position);
 
 public:
-       CVideoInfo() : m(0) {};
-       virtual ~CVideoInfo() {};
-
-       bool Create(void);
-       virtual void Destroy(void);
+       CVideoInfo();
+       virtual ~CVideoInfo();
 
        bool Update(void);
 

diff --git a/src/data/eventinfo.cpp b/src/data/eventinfo.cpp
index b3ab0fe..15824ef 100644 (file)
--- a/src/data/eventinfo.cpp
+++ b/src/data/eventinfo.cpp
@@ -26,32 +26,18 @@ struct SEventInfo {
        Eina_List *medialist;
 };
 
-bool CEventInfo::Create(void)
+CEventInfo::CEventInfo(void)
 {
-       if (m)
-               return false;
-
        m = new SEventInfo();
        if (!m)
-               return false;
-
-       if (!CExtNameInfo::Create()) {
-               delete m;
-               m = NULL;
-               return false;
-       }
+               return;
 
-       return true;
+       memset(m, 0, sizeof(*m));
 }
 
 
-void CEventInfo::Destroy(void)
+CEventInfo::~CEventInfo(void)
 {
-       if (!m)
-               return;
-
-       CExtNameInfo::Destroy();
-
        m_DeleteMediaList();
 
        delete m;
@@ -68,7 +54,6 @@ void CEventInfo::m_DeleteMediaList(void)
        EINA_LIST_FREE(m->medialist, obj) {
                minfo = (CMediaInfo *)obj;
 
-               minfo->Destroy();
                delete minfo;
        }
 

diff --git a/src/data/folderinfo.cpp b/src/data/folderinfo.cpp
index d10e050..8076a90 100644 (file)
--- a/src/data/folderinfo.cpp
+++ b/src/data/folderinfo.cpp
@@ -26,33 +26,19 @@ struct SFolderInfo {
        Eina_List *medialist;
 };
 
-bool CFolderInfo::Create(void)
+CFolderInfo::CFolderInfo(void)
 {
-       if (m)
-               return false;
-
        m = new SFolderInfo();
        if (!m) {
                _ERR("FolderInfo Create Failed");
-               return false;
-       }
-
-       if (!CExtNameInfo::Create()) {
-               delete m;
-               m = NULL;
-               return false;
+               return;
        }
 
-       return true;
+       memset(m, 0, sizeof(*m));
 }
 
-void CFolderInfo::Destroy(void)
+CFolderInfo::~CFolderInfo(void)
 {
-       if (!m)
-               return;
-
-       CExtNameInfo::Destroy();
-
        m_DeleteMediaList();
 
        delete m;
@@ -69,7 +55,6 @@ void CFolderInfo::m_DeleteMediaList(void)
        EINA_LIST_FREE(m->medialist, obj) {
                minfo = (CMediaInfo *)obj;
 
-               minfo->Destroy();
                delete minfo;
        }
 

diff --git a/src/data/imageinfo.cpp b/src/data/imageinfo.cpp
index 9eef9cb..c8609e7 100644 (file)
--- a/src/data/imageinfo.cpp
+++ b/src/data/imageinfo.cpp
@@ -25,33 +25,19 @@ struct SImageInfo {
        int orientation;
 };
 
-bool CImageInfo::Create(void)
+CImageInfo::CImageInfo(void)
 {
-       if (m)
-               return false;
-
        m = new SImageInfo();
        if (!m) {
                _ERR("ImageInfo Create Failed");
-               return false;
-       }
-
-       if (!CMediaInfo::Create()) {
-               delete m;
-               m = NULL;
-               return false;
+               return;
        }
 
-       return true;
+       memset(m, 0, sizeof(*m));
 }
 
-void CImageInfo::Destroy(void)
+CImageInfo::~CImageInfo(void)
 {
-       if (!m)
-               return;
-
-       CMediaInfo::Destroy();
-
        delete m;
 
        m = NULL;

diff --git a/src/data/mediadata.cpp b/src/data/mediadata.cpp
index 9567a4b..debb9a7 100644 (file)
--- a/src/data/mediadata.cpp
+++ b/src/data/mediadata.cpp
@@ -64,7 +64,6 @@ void CMediadata::m_DeleteFolderList(void)
        finfo = NULL;
        EINA_LIST_FREE(m->folderlist, obj) {
                finfo = (CFolderInfo *)obj;
-               finfo->Destroy();
                delete finfo;
        }
 
@@ -79,7 +78,6 @@ void CMediadata::m_DeleteEventList(void)
        einfo = NULL;
        EINA_LIST_FREE(m->eventlist, obj) {
                einfo = (CEventInfo *)obj;
-               einfo->Destroy();
                delete einfo;
        }
 
@@ -105,7 +103,6 @@ void CMediadata::m_DeleteMediaList(int type)
        EINA_LIST_FREE(medialist, obj) {
                minfo = (CMediaInfo *)obj;
 
-               minfo->Destroy();
                delete minfo;
        }
 
@@ -217,7 +214,6 @@ void CMediadata::m_GetMediaList(void)
                else if (minfo->Type() == E_MEDIA_VIDEO)
                        nminfo = new CVideoInfo;
 
-               nminfo->Create();
                nminfo->Duplicate(minfo);
 
                m->medialist = eina_list_append(m->medialist, nminfo);
@@ -252,7 +248,6 @@ void CMediadata::m_GetEventList(void)
 
                if (!date_taken) {
                        einfo = new CEventInfo;
-                       einfo->Create();
                        if (!einfo)
                                goto error;
 
@@ -277,7 +272,6 @@ void CMediadata::m_GetEventList(void)
 
                        if (!bevent_found) {
                                einfo = new CEventInfo;
-                               einfo->Create();
                                if (!einfo)
                                        goto error;
 
@@ -377,14 +371,11 @@ bool CMediadata::m_HandleEachMediaInfo(media_info_h media_h)
                return false;
        }
 
-       minfo->Create();
-
        minfo->SetMediaInfo(media_h);
        minfo->SetType(type);
 
        if (!minfo->Update()) {
                _ERR("MediaInfo update failed");
-               minfo->Destroy();
                delete minfo;
 
                return false;
@@ -416,7 +407,6 @@ bool CMediadata::m_HandleEachFolderInfo(media_folder_h folder)
 
        finfo = new CFolderInfo;
 
-       finfo->Create();
        if (!finfo) {
                _ERR("FolderInfo Create Failed");
                return false;
@@ -473,7 +463,6 @@ bool CMediadata::m_HandleEachFolderInfo(media_folder_h folder)
 error:
        _ERR("Error in creating Media list");
        m_DestroyFilter(filter);
-       finfo->Destroy();
        delete finfo;
        free(uuid);
        DestroyMediaList();

diff --git a/src/data/mediainfo.cpp b/src/data/mediainfo.cpp
index b68f0e3..fac7d9d 100644 (file)
--- a/src/data/mediainfo.cpp
+++ b/src/data/mediainfo.cpp
@@ -28,33 +28,19 @@ struct SMediaInfo {
        int source;
 };
 
-bool CMediaInfo::Create(void)
+CMediaInfo::CMediaInfo(void)
 {
-       if (m)
-               return false;
-
        m = new SMediaInfo();
        if (!m) {
                _ERR("MediaInfo Create Failed");
-               return false;
-       }
-
-       if (!CExtNameInfo::Create()) {
-               delete m;
-               m = NULL;
-               return false;
+               return;
        }
 
-       return true;
+       memset(m, 0, sizeof(*m));
 }
 
-void CMediaInfo::Destroy(void)
+CMediaInfo::~CMediaInfo(void)
 {
-       if (!m)
-               return;
-
-       CExtNameInfo::Destroy();
-
        media_info_destroy(m->media_h);
 
        delete[] m->location_tag;

diff --git a/src/data/videoinfo.cpp b/src/data/videoinfo.cpp
index 2dfbe78..325852c 100644 (file)
--- a/src/data/videoinfo.cpp
+++ b/src/data/videoinfo.cpp
@@ -24,33 +24,19 @@ struct SVideoInfo {
        int played_position;
 };
 
-bool CVideoInfo::Create(void)
+CVideoInfo::CVideoInfo(void)
 {
-       if (m)
-               return false;
-
        m = new SVideoInfo();
        if (!m) {
                _ERR("VideoInfo Create Failed");
-               return false;
-       }
-
-       if (!CMediaInfo::Create()) {
-               delete m;
-               m = NULL;
-               return false;
+               return;
        }
 
-       return true;
+       memset(m, 0, sizeof(*m));
 }
 
-void CVideoInfo::Destroy(void)
+CVideoInfo::~CVideoInfo(void)
 {
-       if (!m)
-               return;
-
-       CMediaInfo::Destroy();
-
        delete m;
 
        m = NULL;