From: Minkyu Kang <mk7.kang@samsung.com>
Date: Wed, 4 Mar 2015 06:34:38 +0000 (+0900)
Subject: remove unnecessary codes and functions
X-Git-Tag: accepted/tizen/tv/20150304.123056~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F43%2F36243%2F1;p=profile%2Ftv%2Fapps%2Fnative%2Fvideoplayer.git

remove unnecessary codes and functions

Change-Id: I11422400e8ddc66edfc450e0e1688facd77a0040
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---

diff --git a/include/control.h b/include/control.h
index 506294a..9fd30f5 100644
--- a/include/control.h
+++ b/include/control.h
@@ -30,7 +30,6 @@ private:
 	int m_AddControls(const char **btns, int count);
 	Evas_Object *m_AddButton(const char *style);
 	void m_SetFocusDirection(Evas_Object **btn, int count);
-	int m_GetEventTypes(void);
 
 private:
 	static void sm_CbEvent(void *dt, Evas_Object *obj,
diff --git a/include/slider.h b/include/slider.h
index 181c977..e5cbc93 100644
--- a/include/slider.h
+++ b/include/slider.h
@@ -32,7 +32,6 @@ private:
 
 private:
 	void m_SetTimer(void);
-	int m_GetEventTypes(void);
 
 private:
 	static Eina_Bool sm_CbTimer(void *dt);
diff --git a/src/control.cpp b/src/control.cpp
index c0fbc82..010fac2 100644
--- a/src/control.cpp
+++ b/src/control.cpp
@@ -119,7 +119,7 @@ int CVideoController::m_AddControls(const char **btns, int count)
 			break;
 		}
 
-		Connect(m->btn[i], -1, m_GetEventTypes());
+		Connect(m->btn[i], -1, TYPE_MOUSE_MOVE | TYPE_CLICKED);
 
 		elm_object_signal_callback_add(m->btn[i],
 				SIG_BTN_ANI_FIN, btns[i],
@@ -233,8 +233,3 @@ void CVideoController::OnMouseClicked(int id, Evas_Object *obj)
 {
 	elm_object_signal_emit(obj, SIG_BTN_ANI_START, "");
 }
-
-int CVideoController::m_GetEventTypes(void)
-{
-	return TYPE_MOUSE_MOVE | TYPE_CLICKED;
-}
diff --git a/src/mediadata.cpp b/src/mediadata.cpp
index d91a082..94dcbfa 100644
--- a/src/mediadata.cpp
+++ b/src/mediadata.cpp
@@ -89,13 +89,7 @@ bool CMediaData::Create(const char *path)
 
 	r = media_info_foreach_media_from_db(filter, sm_GetMediaInfo, m);
 	if (r != MEDIA_CONTENT_ERROR_NONE) {
-		if (r == MEDIA_CONTENT_ERROR_DB_FAILED)
-			_ERR("MEDIA CONTENT ERROR DB FAILED");
-		else if (r == MEDIA_CONTENT_ERROR_DB_BUSY)
-			_ERR("MEDIA CONTENT ERROR DB BUSY");
-		else
-			_ERR("MEDIA CONTENT ERROR");
-
+		_ERR("MEDIA CONTENT ERROR: %d", r);
 		media_filter_destroy(filter);
 
 		delete m;
diff --git a/src/playermgr.cpp b/src/playermgr.cpp
index c4f307a..141c561 100644
--- a/src/playermgr.cpp
+++ b/src/playermgr.cpp
@@ -165,19 +165,13 @@ static int _play_video(struct playermgr *mgr, const char *path)
 
 	r = player_prepare(mgr->player);
 	if (r != PLAYER_ERROR_NONE) {
-		if (r == PLAYER_ERROR_NOT_SUPPORTED_FILE)
-			_ERR("PLAYER PREPARE ERROR NOT SUPPORTED FILE %d", r);
-		else if (r == PLAYER_ERROR_INVALID_URI)
-			_ERR("PLAYER PREPARE ERROR INVALID URI %d", r);
-		else
-			_ERR("PLAYER PREPARE ERROR");
-
+		_ERR("PLAYER PREPARE ERROR: %d", r);
 		return -1;
 	}
 
 	r = player_start(mgr->player);
 	if (r != PLAYER_ERROR_NONE) {
-		_ERR("PLAYER START ERROR");
+		_ERR("PLAYER START ERROR: %d", r);
 		return -1;
 	}
 
diff --git a/src/slider.cpp b/src/slider.cpp
index 20d498c..9355c14 100644
--- a/src/slider.cpp
+++ b/src/slider.cpp
@@ -175,7 +175,8 @@ bool CVideoSlider::Create(Evas_Object *base, playermgr *player)
 	elm_slider_horizontal_set(slider, EINA_TRUE);
 	elm_slider_step_set(slider, SLIDER_STEP);
 
-	Connect(slider, -1, m_GetEventTypes());
+	Connect(slider, -1, TYPE_MOUSE_MOVE | TYPE_MOUSE_DOWN | TYPE_MOUSE_UP |
+			TYPE_FOCUSED | TYPE_UNFOCUSED | TYPE_CHANGED);
 
 	elm_object_part_content_set(base, PART_SLIDER, slider);
 
@@ -240,9 +241,3 @@ void CVideoSlider::OnUnfocused(int id, Evas_Object *obj, Elm_Object_Item *item)
 void CVideoSlider::OnChanged(int id, Evas_Object *obj)
 {
 }
-
-int CVideoSlider::m_GetEventTypes(void)
-{
-	return TYPE_MOUSE_MOVE | TYPE_MOUSE_DOWN | TYPE_MOUSE_UP |
-		TYPE_FOCUSED | TYPE_UNFOCUSED | TYPE_CHANGED;
-}