From ba7e9035540410767737e93a11f974065c89b3f2 Mon Sep 17 00:00:00 2001
From: Minkyu Kang <mk7.kang@samsung.com>
Date: Fri, 10 Apr 2015 21:12:31 +0900
Subject: [PATCH 01/16] mediadata: don't use mediadata when failed to create

Change-Id: Idc3f956c18cfe065096bb94e74eed01f6a9937ac
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---
 src/view_player.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/view_player.cpp b/src/view_player.cpp
index fe1034b..b371223 100644
--- a/src/view_player.cpp
+++ b/src/view_player.cpp
@@ -153,9 +153,11 @@ bool CPlayerView::m_PlayerInit(void)
 
 	path = m->player->GetPath();
 
-	m->mediadata->Create(path);
-	m_UpdateInfoBar();
-	m->mediadata->Destroy();
+	r = m->mediadata->Create(path);
+	if (r) {
+		m_UpdateInfoBar();
+		m->mediadata->Destroy();
+	}
 
 	m->slider->Reset(m->duration, m->position);
 	m->control->Signal(E_PLAYPAUSE_BTN, SIG_SET_PAUSE, "");
-- 
2.7.4


From ecb92cf4e78320c57e401bd67956cf3c598c83fc Mon Sep 17 00:00:00 2001
From: Minkyu Kang <mk7.kang@samsung.com>
Date: Mon, 13 Apr 2015 21:23:14 +0900
Subject: [PATCH 02/16] slider: add key up/down handlers for seek from slider
 bar using keys

Change-Id: Ic8840a595dd83738f467d3e0130660aeb44466f8
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---
 include/slider.h    | 13 ++++++++++++
 src/playermgr.cpp   | 12 +++++++++++
 src/slider.cpp      | 57 ++++++++++++++++++++++++++++++++++++++++++++---------
 src/view_player.cpp |  4 ++++
 4 files changed, 77 insertions(+), 9 deletions(-)

diff --git a/include/slider.h b/include/slider.h
index 7dc00fd..f338b0b 100644
--- a/include/slider.h
+++ b/include/slider.h
@@ -21,6 +21,8 @@ struct SSliderData;
 
 class CVideoSlider :
 	public CListenerMgr,
+	public IKeyDownListener,
+	public IKeyUpListener,
 	public IMouseMoveListener,
 	public IMouseDownListener,
 	public IMouseUpListener,
@@ -31,10 +33,17 @@ private:
 	SSliderData *m;
 
 private:
+	void m_SeekStart(Evas_Object *obj);
+	void m_SeekEnd(Evas_Object *obj);
+
+private:
 	static Eina_Bool sm_CbTimer(void *dt);
+	static void sm_SeekCb(void *dt);
 
 public:
 	CVideoSlider(void) :
+		IKeyDownListener(this),
+		IKeyUpListener(this),
 		IMouseMoveListener(this),
 		IMouseDownListener(this),
 		IMouseUpListener(this),
@@ -76,6 +85,10 @@ public:
 	void Pause(void);
 
 	/* Listeners */
+	virtual void OnKeyDown(int id, Evas *e, Evas_Object *obj,
+			Evas_Event_Key_Down *ev);
+	virtual void OnKeyUp(int id, Evas *e, Evas_Object *obj,
+			Evas_Event_Key_Up *ev);
 	virtual void OnMouseMove(int id, Evas *e, Evas_Object *obj,
 			Evas_Event_Mouse_Move *ev);
 	virtual void OnMouseDown(int id, Evas *e, Evas_Object *obj,
diff --git a/src/playermgr.cpp b/src/playermgr.cpp
index 3609aad..b18aab2 100644
--- a/src/playermgr.cpp
+++ b/src/playermgr.cpp
@@ -278,9 +278,15 @@ const char *CPlayer::GetPath(void)
 
 bool CPlayer::Pause(void)
 {
+	player_state_e state;
+
 	ASSERT(m);
 	ASSERT(m->player);
 
+	GetState(&state);
+	if (state == PLAYER_STATE_PAUSED)
+		return true;
+
 	if (player_pause(m->player) != PLAYER_ERROR_NONE) {
 		_ERR("Player pause error");
 		return false;
@@ -291,9 +297,15 @@ bool CPlayer::Pause(void)
 
 bool CPlayer::Resume(void)
 {
+	player_state_e state;
+
 	ASSERT(m);
 	ASSERT(m->player);
 
+	GetState(&state);
+	if (state == PLAYER_STATE_PLAYING)
+		return true;
+
 	if (player_start(m->player) != PLAYER_ERROR_NONE) {
 		_ERR("Player resume error");
 		return false;
diff --git a/src/slider.cpp b/src/slider.cpp
index f74e554..c4f44d0 100644
--- a/src/slider.cpp
+++ b/src/slider.cpp
@@ -28,7 +28,8 @@
 
 #define TIME_STR_START "00:00:00"
 #define TIME_INTERVAL 0.1
-#define SLIDER_STEP 0.05
+#define SLIDER_DEFAULT 0.05
+#define SLIDER_STEP 0.03
 
 struct SSliderData {
 	Evas_Object *base;
@@ -47,7 +48,7 @@ static void _get_timestr(char *str, int size, unsigned int ms)
 			sec / 3600, (sec % 3600) / 60, sec % 60);
 }
 
-static void _slider_seek_completed(void *dt)
+void CVideoSlider::sm_SeekCb(void *dt)
 {
 	SSliderData *data;
 	char str[32];
@@ -132,6 +133,7 @@ void CVideoSlider::Reset(int duration, int position)
 
 	elm_slider_value_set(m->slider, position);
 	elm_slider_min_max_set(m->slider, 0, duration);
+	elm_slider_step_set(m->slider, SLIDER_STEP);
 
 	_get_timestr(str, sizeof(str), duration);
 	elm_object_part_text_set(m->base, PART_CURTIME_TEXT, TIME_STR_START);
@@ -162,9 +164,10 @@ bool CVideoSlider::Create(Evas_Object *base, CPlayer *player)
 	elm_slider_indicator_show_on_focus_set(slider, EINA_FALSE);
 	elm_object_style_set(slider, STYLE_SLIDER);
 	elm_slider_horizontal_set(slider, EINA_TRUE);
-	elm_slider_step_set(slider, SLIDER_STEP);
+	elm_slider_step_set(slider, SLIDER_DEFAULT);
 
-	Connect(slider, -1, TYPE_MOUSE_MOVE | TYPE_MOUSE_DOWN | TYPE_MOUSE_UP |
+	Connect(slider, -1, TYPE_KEY_DOWN | TYPE_KEY_UP |
+			TYPE_MOUSE_MOVE | TYPE_MOUSE_DOWN | TYPE_MOUSE_UP |
 			TYPE_FOCUSED | TYPE_UNFOCUSED | TYPE_CHANGED);
 
 	elm_object_part_content_set(base, PART_SLIDER, slider);
@@ -186,8 +189,7 @@ void CVideoSlider::Destroy(void)
 	m = NULL;
 }
 
-void CVideoSlider::OnMouseDown(int id, Evas *e, Evas_Object *obj,
-			Evas_Event_Mouse_Down *ev)
+void CVideoSlider::m_SeekStart(Evas_Object *obj)
 {
 	update_action action;
 
@@ -195,13 +197,44 @@ void CVideoSlider::OnMouseDown(int id, Evas *e, Evas_Object *obj,
 	CViewMgr::GetInstance()->UpdateView(VIEW_ID_PLAYER, (void *)&action);
 }
 
-void CVideoSlider::OnMouseUp(int id, Evas *e, Evas_Object *obj,
-			Evas_Event_Mouse_Up *ev)
+void CVideoSlider::m_SeekEnd(Evas_Object *obj)
 {
 	int v;
 
 	v = elm_slider_value_get(obj);
-	m->player->SetPosition(v, _slider_seek_completed, m);
+	m->player->SetPosition(v, sm_SeekCb, m);
+}
+
+void CVideoSlider::OnKeyDown(int id, Evas *e, Evas_Object *obj,
+			Evas_Event_Key_Down *ev)
+{
+	if (strcmp(ev->keyname, KEY_RIGHT) &&
+			strcmp(ev->keyname, KEY_LEFT))
+		return;
+
+	m_SeekStart(obj);
+}
+
+void CVideoSlider::OnKeyUp(int id, Evas *e, Evas_Object *obj,
+			Evas_Event_Key_Up *ev)
+{
+	if (strcmp(ev->keyname, KEY_RIGHT) &&
+			strcmp(ev->keyname, KEY_LEFT))
+		return;
+
+	m_SeekEnd(obj);
+}
+
+void CVideoSlider::OnMouseDown(int id, Evas *e, Evas_Object *obj,
+			Evas_Event_Mouse_Down *ev)
+{
+	m_SeekStart(obj);
+}
+
+void CVideoSlider::OnMouseUp(int id, Evas *e, Evas_Object *obj,
+			Evas_Event_Mouse_Up *ev)
+{
+	m_SeekEnd(obj);
 }
 
 void CVideoSlider::OnMouseMove(int id, Evas *e, Evas_Object *obj,
@@ -226,4 +259,10 @@ void CVideoSlider::OnUnfocused(int id, Evas_Object *obj, Elm_Object_Item *item)
 
 void CVideoSlider::OnChanged(int id, Evas_Object *obj)
 {
+	char str[32];
+	int v;
+
+	v = elm_slider_value_get(obj);
+	_get_timestr(str, sizeof(str), v);
+	elm_object_part_text_set(m->base, PART_CURTIME_TEXT, str);
 }
diff --git a/src/view_player.cpp b/src/view_player.cpp
index b371223..1537620 100644
--- a/src/view_player.cpp
+++ b/src/view_player.cpp
@@ -711,10 +711,14 @@ void CPlayerView::t_OnUpdate(void *dt)
 	case ACTION_RESUME:
 		m->player->Resume();
 		m->slider->Resume();
+		m->control->Signal(E_PLAYPAUSE_BTN, SIG_SET_PAUSE, "");
+		timeout_handler_reset(m->timeout_handle);
 		break;
 	case ACTION_PAUSE:
 		m->player->Pause();
 		m->slider->Pause();
+		m->control->Signal(E_PLAYPAUSE_BTN, SIG_SET_PLAY, "");
+		timeout_handler_reset(m->timeout_handle);
 		break;
 	case ACTION_INIT:
 		m_PlayerInit();
-- 
2.7.4


From 7f4176e321f65a8fcb57937a63f41fcf273d0cd0 Mon Sep 17 00:00:00 2001
From: Minkyu Kang <mk7.kang@samsung.com>
Date: Tue, 14 Apr 2015 15:58:16 +0900
Subject: [PATCH 03/16] volume: fix the return value

Change-Id: If918f7b7d430362b9db486500e7f3668de4d5392
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---
 src/volume.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/volume.cpp b/src/volume.cpp
index 6064006..0ced574 100644
--- a/src/volume.cpp
+++ b/src/volume.cpp
@@ -196,7 +196,7 @@ bool CVolume::Create(Evas_Object *base)
 
 	sound_manager_set_session_type(SOUND_SESSION_TYPE_EXCLUSIVE);
 
-	return EINA_TRUE;
+	return true;
 }
 
 void CVolume::Destroy(void)
-- 
2.7.4


From 3dfd02fb41f09570d8a03e8985f82102ff7b7a73 Mon Sep 17 00:00:00 2001
From: Minkyu Kang <mk7.kang@samsung.com>
Date: Tue, 14 Apr 2015 16:01:35 +0900
Subject: [PATCH 04/16] initialize the member pointer in constructor

Change-Id: Idd462f6e93f328484d18caa1829bd321bd44f219
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---
 src/main.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index 2fe1715..b57a239 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -59,6 +59,8 @@ public:
 CVideoPlayerApp::CVideoPlayerApp(void)
 {
 	m_pApp = new SAppData;
+	m_pVmgr = NULL;
+	m_pPlayerView = NULL;
 }
 
 CVideoPlayerApp::~CVideoPlayerApp(void)
-- 
2.7.4


From 4d03575d54d5ae12d007b08e41954088881b3007 Mon Sep 17 00:00:00 2001
From: Minkyu Kang <mk7.kang@samsung.com>
Date: Tue, 14 Apr 2015 20:05:16 +0900
Subject: [PATCH 05/16] slider: set last position when request the position
 continuously

Change-Id: I75189eecea3f05b561b9c9a9e7a2a842503c7bbe
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---
 include/slider.h |  3 ++-
 src/slider.cpp   | 46 ++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/include/slider.h b/include/slider.h
index f338b0b..d0b5e43 100644
--- a/include/slider.h
+++ b/include/slider.h
@@ -38,7 +38,8 @@ private:
 
 private:
 	static Eina_Bool sm_CbTimer(void *dt);
-	static void sm_SeekCb(void *dt);
+	static Eina_Bool sm_CbSeekSet(void *dt);
+	static void sm_CbSeekComplete(void *dt);
 
 public:
 	CVideoSlider(void) :
diff --git a/src/slider.cpp b/src/slider.cpp
index c4f44d0..8a873b1 100644
--- a/src/slider.cpp
+++ b/src/slider.cpp
@@ -35,7 +35,10 @@ struct SSliderData {
 	Evas_Object *base;
 	Evas_Object *slider;
 	Ecore_Timer *timer;
+	Ecore_Timer *seek;
 	CPlayer *player;
+	int pos;
+	bool seeking;
 };
 
 static void _get_timestr(char *str, int size, unsigned int ms)
@@ -48,7 +51,23 @@ static void _get_timestr(char *str, int size, unsigned int ms)
 			sec / 3600, (sec % 3600) / 60, sec % 60);
 }
 
-void CVideoSlider::sm_SeekCb(void *dt)
+Eina_Bool CVideoSlider::sm_CbSeekSet(void *dt)
+{
+	SSliderData *data;
+
+	if (!dt)
+		return ECORE_CALLBACK_CANCEL;
+
+	data = (SSliderData *)dt;
+
+	data->player->SetPosition(data->pos, sm_CbSeekComplete, data);
+	data->pos = -1;
+	data->seek = NULL;
+
+	return ECORE_CALLBACK_CANCEL;
+}
+
+void CVideoSlider::sm_CbSeekComplete(void *dt)
 {
 	SSliderData *data;
 	char str[32];
@@ -61,6 +80,14 @@ void CVideoSlider::sm_SeekCb(void *dt)
 
 	data = (SSliderData *)dt;
 
+	if (data->pos != -1) {
+		if (!data->seek) {
+			data->seek = ecore_timer_add(TIME_INTERVAL,
+					sm_CbSeekSet, data);
+		}
+		return;
+	}
+
 	r = data->player->GetPosition(&pos);
 	if (!r) {
 		_ERR("Get Position Failed");
@@ -72,6 +99,9 @@ void CVideoSlider::sm_SeekCb(void *dt)
 
 	action = ACTION_RESUME;
 	CViewMgr::GetInstance()->UpdateView(VIEW_ID_PLAYER, (void *)&action);
+
+	data->pos = -1;
+	data->seeking = false;
 }
 
 Eina_Bool CVideoSlider::sm_CbTimer(void *dt)
@@ -128,6 +158,7 @@ void CVideoSlider::Reset(int duration, int position)
 
 	char str[32];
 
+	ecore_timer_del(m->seek);
 	ecore_timer_del(m->timer);
 	m->timer = ecore_timer_add(TIME_INTERVAL, sm_CbTimer, m);
 
@@ -175,6 +206,10 @@ bool CVideoSlider::Create(Evas_Object *base, CPlayer *player)
 	m->base = base;
 	m->slider = slider;
 	m->player = player;
+	m->timer = NULL;
+	m->pos = -1;
+	m->seeking = false;
+	m->seek = NULL;
 
 	return true;
 }
@@ -184,6 +219,7 @@ void CVideoSlider::Destroy(void)
 	ASSERT(m);
 
 	ecore_timer_del(m->timer);
+	ecore_timer_del(m->seek);
 
 	delete m;
 	m = NULL;
@@ -202,7 +238,13 @@ void CVideoSlider::m_SeekEnd(Evas_Object *obj)
 	int v;
 
 	v = elm_slider_value_get(obj);
-	m->player->SetPosition(v, sm_SeekCb, m);
+
+	if (m->seeking) {
+		m->pos = v;
+	} else {
+		m->player->SetPosition(v, sm_CbSeekComplete, m);
+		m->seeking = true;
+	}
 }
 
 void CVideoSlider::OnKeyDown(int id, Evas *e, Evas_Object *obj,
-- 
2.7.4


From bb33972acd129533a578ac2265e10ca6d8f9f5d8 Mon Sep 17 00:00:00 2001
From: Minkyu Kang <mk7.kang@samsung.com>
Date: Thu, 16 Apr 2015 17:01:37 +0900
Subject: [PATCH 06/16] fix exception handling

this patch contain following changes.

set pointers to NULL before use
return false when failed initializing controls
add more ASSERT macros

Change-Id: Id110981687047056085adc75ddbe48e90fa4cfbc
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---
 include/mediadata.h   |   4 +-
 include/view_player.h |   2 +-
 src/control.cpp       |  19 +++-----
 src/mediadata.cpp     |  27 +++++------
 src/playermgr.cpp     |  36 +++++++--------
 src/slider.cpp        |  38 ++++++++++------
 src/view_player.cpp   | 121 ++++++++++++++++++++++++++++++--------------------
 src/volume.cpp        |  29 ++++++------
 8 files changed, 152 insertions(+), 124 deletions(-)

diff --git a/include/mediadata.h b/include/mediadata.h
index ddfdbd3..493adcd 100644
--- a/include/mediadata.h
+++ b/include/mediadata.h
@@ -27,8 +27,8 @@ private:
 	static bool sm_GetMediaInfo(media_info_h media_h, void *dt);
 
 public:
-	CMediaData(void);
-	virtual ~CMediaData(void);
+	CMediaData(void) : m(0) {}
+	virtual ~CMediaData(void) {}
 
 	bool Create(const char *path);
 	void Destroy(void);
diff --git a/include/view_player.h b/include/view_player.h
index 1a3b2f3..7e790f5 100644
--- a/include/view_player.h
+++ b/include/view_player.h
@@ -38,7 +38,7 @@ private:
 	SPlayerView *m;
 
 private:
-	void m_ControlInit(SPlayerParam *param);
+	bool m_ControlInit(SPlayerParam *param);
 	bool m_UiInit(void);
 	bool m_AddControls(void);
 	void m_UpdateInfoBar(void);
diff --git a/src/control.cpp b/src/control.cpp
index 583ca56..649c547 100644
--- a/src/control.cpp
+++ b/src/control.cpp
@@ -27,8 +27,6 @@
 
 #define MAX_CONTROL_BTNS 6
 
-struct SControlData;
-
 struct _event_cb {
 	void (*func)(void *data, const char *ev);
 	void *data;
@@ -45,13 +43,11 @@ struct SControlData {
 void CVideoController::sm_CbEvent(void *dt, Evas_Object *obj,
 		const char *emission, const char *source)
 {
-	struct SControlData *data;
+	ASSERT(dt);
 
-	if (!dt)
-		return;
+	struct SControlData *data;
 
 	data = (SControlData *)dt;
-
 	data->cb.func(data->cb.data, source);
 }
 
@@ -79,8 +75,6 @@ void CVideoController::m_SetFocusDirection(Evas_Object **btn, int count)
 
 Evas_Object *CVideoController::m_AddButton(const char *style)
 {
-	ASSERT(m);
-
 	Evas_Object *btn;
 
 	btn = elm_button_add(m->base);
@@ -95,8 +89,6 @@ Evas_Object *CVideoController::m_AddButton(const char *style)
 
 int CVideoController::m_AddControls(const char **btns, int count)
 {
-	ASSERT(m);
-
 	int i;
 	char buf[32];
 
@@ -136,7 +128,7 @@ bool CVideoController::Create(Evas_Object *base, const char **btns, int count)
 
 	m = new SControlData;
 	if (!m) {
-		_ERR("failed to add slider");
+		_ERR("allocation failed");
 		return false;
 	}
 
@@ -213,8 +205,7 @@ void CVideoController::Show(void)
 void CVideoController::OnMouseMove(int id, Evas *e, Evas_Object *obj,
 			Evas_Event_Mouse_Move *ev)
 {
-	if (!obj)
-		return;
+	ASSERT(obj);
 
 	if (!elm_object_focus_get(obj))
 		elm_object_focus_set(obj, EINA_TRUE);
@@ -222,5 +213,7 @@ void CVideoController::OnMouseMove(int id, Evas *e, Evas_Object *obj,
 
 void CVideoController::OnMouseClicked(int id, Evas_Object *obj)
 {
+	ASSERT(obj);
+
 	elm_object_signal_emit(obj, SIG_BTN_ANI_START, "");
 }
diff --git a/src/mediadata.cpp b/src/mediadata.cpp
index 94dcbfa..89e2294 100644
--- a/src/mediadata.cpp
+++ b/src/mediadata.cpp
@@ -30,19 +30,10 @@ struct SMediaData {
 	CVideoData *video;
 };
 
-CMediaData::CMediaData(void)
-{
-	m = NULL;
-	media_content_connect();
-}
-
-CMediaData::~CMediaData(void)
-{
-	media_content_disconnect();
-}
-
 bool CMediaData::sm_GetMediaInfo(media_info_h media_h, void *dt)
 {
+	ASSERT(dt);
+
 	SMediaData *md;
 
 	md = (SMediaData *)dt;
@@ -52,7 +43,8 @@ bool CMediaData::sm_GetMediaInfo(media_info_h media_h, void *dt)
 	media_info_get_modified_time(media_h, &md->time);
 
 	md->video = new CVideoData;
-	md->video->Update(media_h);
+	if (md->video)
+		md->video->Update(media_h);
 
 	return true;
 }
@@ -84,13 +76,21 @@ bool CMediaData::Create(const char *path)
 	m = new SMediaData;
 	if (!m) {
 		_ERR("allocation failed");
+		media_filter_destroy(filter);
 		return false;
 	}
 
+	m->name = NULL;
+	m->path = NULL;
+	m->video = NULL;
+
+	media_content_connect();
+
 	r = media_info_foreach_media_from_db(filter, sm_GetMediaInfo, m);
 	if (r != MEDIA_CONTENT_ERROR_NONE) {
 		_ERR("MEDIA CONTENT ERROR: %d", r);
 		media_filter_destroy(filter);
+		media_content_disconnect();
 
 		delete m;
 		m = NULL;
@@ -107,11 +107,12 @@ void CMediaData::Destroy(void)
 {
 	ASSERT(m);
 
+	media_content_disconnect();
+
 	free(m->name);
 	free(m->path);
 
 	delete m->video;
-	m->video = NULL;
 
 	delete m;
 	m = NULL;
diff --git a/src/playermgr.cpp b/src/playermgr.cpp
index b18aab2..b2d4ecf 100644
--- a/src/playermgr.cpp
+++ b/src/playermgr.cpp
@@ -117,6 +117,8 @@ bool CPlayer::Create(Evas_Object *win, const char *path, const char *playlist)
 	}
 
 	m->win = win;
+	m->player = NULL;
+	m->ffrew_timer = NULL;
 	m->display_mode = E_FULL_SCREEN;
 	m->audio_effect = 0;
 	m->rew_speed = 0;
@@ -126,6 +128,8 @@ bool CPlayer::Create(Evas_Object *win, const char *path, const char *playlist)
 	if (!m->media_list) {
 		_ERR("play list is null");
 		delete m;
+		m = NULL;
+
 		return false;
 	}
 
@@ -135,6 +139,8 @@ bool CPlayer::Create(Evas_Object *win, const char *path, const char *playlist)
 	if (player_create(&m->player) != PLAYER_ERROR_NONE) {
 		_ERR("PLAYER CREATION ERROR");
 		delete m;
+		m = NULL;
+
 		return false;
 	}
 
@@ -163,13 +169,13 @@ void CPlayer::Destroy(void)
 
 bool CPlayer::m_Play(const char *path)
 {
-	ASSERT(m);
 	ASSERT(m->player);
 
 	int r;
 
-	if (player_set_uri(m->player, path) != PLAYER_ERROR_NONE) {
-		_ERR("PLAYER SET URI ERROR");
+	r = player_set_uri(m->player, path);
+	if (r != PLAYER_ERROR_NONE) {
+		_ERR("PLAYER SET URI ERROR: %d", r);
 		return false;
 	}
 
@@ -222,10 +228,6 @@ bool CPlayer::Play(void)
 		return r;
 
 	path = GetPath();
-	if (!path) {
-		_ERR("video path is NULL");
-		return false;
-	}
 
 	r = m_Play(path);
 
@@ -263,26 +265,23 @@ bool CPlayer::Next(bool repeat)
 const char *CPlayer::GetPath(void)
 {
 	ASSERT(m);
+	ASSERT(m->media_list);
 
 	const char *path;
 
-	if (!m->media_list) {
-		_ERR("invalid parameter");
-		return NULL;
-	}
-
 	path = (const char *)eina_list_nth(m->media_list, m->current);
+	ASSERT(path);
 
 	return path;
 }
 
 bool CPlayer::Pause(void)
 {
-	player_state_e state;
-
 	ASSERT(m);
 	ASSERT(m->player);
 
+	player_state_e state;
+
 	GetState(&state);
 	if (state == PLAYER_STATE_PAUSED)
 		return true;
@@ -297,11 +296,11 @@ bool CPlayer::Pause(void)
 
 bool CPlayer::Resume(void)
 {
-	player_state_e state;
-
 	ASSERT(m);
 	ASSERT(m->player);
 
+	player_state_e state;
+
 	GetState(&state);
 	if (state == PLAYER_STATE_PLAYING)
 		return true;
@@ -426,13 +425,12 @@ int CPlayer::GetCurrent(void)
 
 Eina_Bool CPlayer::sm_CbFFRew(void *dt)
 {
+	ASSERT(dt);
+
 	CPlayer *p;
 	SPlayerData *m;
 	int pos;
 
-	if (!dt)
-		return ECORE_CALLBACK_CANCEL;
-
 	p = (CPlayer *)dt;
 	m = p->m;
 
diff --git a/src/slider.cpp b/src/slider.cpp
index 8a873b1..dc9eefc 100644
--- a/src/slider.cpp
+++ b/src/slider.cpp
@@ -53,10 +53,9 @@ static void _get_timestr(char *str, int size, unsigned int ms)
 
 Eina_Bool CVideoSlider::sm_CbSeekSet(void *dt)
 {
-	SSliderData *data;
+	ASSERT(dt);
 
-	if (!dt)
-		return ECORE_CALLBACK_CANCEL;
+	SSliderData *data;
 
 	data = (SSliderData *)dt;
 
@@ -69,15 +68,14 @@ Eina_Bool CVideoSlider::sm_CbSeekSet(void *dt)
 
 void CVideoSlider::sm_CbSeekComplete(void *dt)
 {
+	ASSERT(dt);
+
 	SSliderData *data;
 	char str[32];
 	int pos;
 	bool r;
 	update_action action;
 
-	if (!dt)
-		return;
-
 	data = (SSliderData *)dt;
 
 	if (data->pos != -1) {
@@ -106,14 +104,13 @@ void CVideoSlider::sm_CbSeekComplete(void *dt)
 
 Eina_Bool CVideoSlider::sm_CbTimer(void *dt)
 {
+	ASSERT(dt);
+
 	SSliderData *data;
 	int pos;
 	bool r;
 	char str[32];
 
-	if (!dt)
-		return ECORE_CALLBACK_CANCEL;
-
 	data = (SSliderData *)dt;
 
 	if (!data->player)
@@ -181,14 +178,16 @@ bool CVideoSlider::Create(Evas_Object *base, CPlayer *player)
 
 	m = new SSliderData;
 	if (!m) {
-		_ERR("failed to add slider");
+		_ERR("allocation fail");
 		return false;
 	}
 
 	slider = elm_slider_add(base);
 	if (!slider) {
 		_ERR("failed to add slider");
-		return true;
+		delete m;
+		m = NULL;
+		return false;
 	}
 
 	elm_slider_indicator_show_set(slider, EINA_FALSE);
@@ -235,6 +234,8 @@ void CVideoSlider::m_SeekStart(Evas_Object *obj)
 
 void CVideoSlider::m_SeekEnd(Evas_Object *obj)
 {
+	ASSERT(m);
+
 	int v;
 
 	v = elm_slider_value_get(obj);
@@ -250,6 +251,8 @@ void CVideoSlider::m_SeekEnd(Evas_Object *obj)
 void CVideoSlider::OnKeyDown(int id, Evas *e, Evas_Object *obj,
 			Evas_Event_Key_Down *ev)
 {
+	ASSERT(obj);
+
 	if (strcmp(ev->keyname, KEY_RIGHT) &&
 			strcmp(ev->keyname, KEY_LEFT))
 		return;
@@ -260,6 +263,8 @@ void CVideoSlider::OnKeyDown(int id, Evas *e, Evas_Object *obj,
 void CVideoSlider::OnKeyUp(int id, Evas *e, Evas_Object *obj,
 			Evas_Event_Key_Up *ev)
 {
+	ASSERT(obj);
+
 	if (strcmp(ev->keyname, KEY_RIGHT) &&
 			strcmp(ev->keyname, KEY_LEFT))
 		return;
@@ -270,20 +275,23 @@ void CVideoSlider::OnKeyUp(int id, Evas *e, Evas_Object *obj,
 void CVideoSlider::OnMouseDown(int id, Evas *e, Evas_Object *obj,
 			Evas_Event_Mouse_Down *ev)
 {
+	ASSERT(obj);
+
 	m_SeekStart(obj);
 }
 
 void CVideoSlider::OnMouseUp(int id, Evas *e, Evas_Object *obj,
 			Evas_Event_Mouse_Up *ev)
 {
+	ASSERT(obj);
+
 	m_SeekEnd(obj);
 }
 
 void CVideoSlider::OnMouseMove(int id, Evas *e, Evas_Object *obj,
 			Evas_Event_Mouse_Move *ev)
 {
-	if (!obj)
-		return;
+	ASSERT(obj);
 
 	if (!elm_object_focus_get(obj))
 		elm_object_focus_set(obj, EINA_TRUE);
@@ -291,11 +299,15 @@ void CVideoSlider::OnMouseMove(int id, Evas *e, Evas_Object *obj,
 
 void CVideoSlider::OnFocused(int id, Evas_Object *obj, Elm_Object_Item *item)
 {
+	ASSERT(m);
+
 	elm_object_signal_emit(m->base, SIG_SLIDER_FOCUS, "");
 }
 
 void CVideoSlider::OnUnfocused(int id, Evas_Object *obj, Elm_Object_Item *item)
 {
+	ASSERT(m);
+
 	elm_object_signal_emit(m->base, SIG_SLIDER_UNFOCUS, "");
 }
 
diff --git a/src/view_player.cpp b/src/view_player.cpp
index 1537620..4bb5317 100644
--- a/src/view_player.cpp
+++ b/src/view_player.cpp
@@ -119,13 +119,11 @@ void CPlayerView::m_UpdateInfoBar(void)
 	/* Source */
 	/* FIXME: when usb path is decided, this logic should be changed */
 	path = m->mediadata->GetPath();
-	if (path) {
-		if (!strncmp(path, SOURCE_TV_PATH, SOURCE_PATH_LEN))
-			source = SOURCE_TV;
-		else
-			source = SOURCE_USB;
-		elm_object_part_text_set(m->base, PART_SOURCETEXT, _(source));
-	}
+	if (!strncmp(path, SOURCE_TV_PATH, SOURCE_PATH_LEN))
+		source = SOURCE_TV;
+	else
+		source = SOURCE_USB;
+	elm_object_part_text_set(m->base, PART_SOURCETEXT, _(source));
 
 	/* Playlist Count */
 	snprintf(buf, sizeof(buf), "%d/%d",
@@ -148,8 +146,6 @@ bool CPlayerView::m_PlayerInit(void)
 	bool r;
 
 	r = m->player->Play();
-	if (r < 0)
-		return false;
 
 	path = m->player->GetPath();
 
@@ -167,7 +163,7 @@ bool CPlayerView::m_PlayerInit(void)
 		timeout_handler_reset(m->timeout_handle);
 	}
 
-	return true;
+	return r;
 }
 
 void CPlayerView::sm_EvtRewindBtn(void *dt)
@@ -477,21 +473,29 @@ bool CPlayerView::m_AddControls(void)
 
 	m->control->AddHandler(sm_EvtControlBtn, m);
 
-	if (!m->slider->Create(m->base, m->player))
+	if (!m->slider->Create(m->base, m->player)) {
+		m->control->Destroy();
 		return false;
+	}
 
-	if (!m->volume->Create(m->win))
+	if (!m->volume->Create(m->win)) {
+		m->control->Destroy();
+		m->slider->Destroy();
 		return false;
+	}
 
 	m->timeout_handle = timeout_handler_init(TIMEOUT_VIDEOPLAYER,
 		sm_CbTimeoutEvent, m, sm_CbEcoreEvent, m);
+	if (!m->timeout_handle) {
+		m->control->Destroy();
+		m->slider->Destroy();
+		m->volume->Destroy();
+		return false;
+	}
 
 	eext_object_event_callback_add(m->base,
 			EEXT_CALLBACK_BACK, sm_EvtBack, m);
 
-	if (!m->timeout_handle)
-		return false;
-
 	return true;
 }
 
@@ -512,36 +516,42 @@ Eina_Bool CPlayerView::sm_CbDrawAnimation(void *dt)
 	return ECORE_CALLBACK_CANCEL;
 }
 
-void CPlayerView::m_ControlInit(SPlayerParam *param)
+bool CPlayerView::m_ControlInit(SPlayerParam *param)
 {
-	bool r;
-
 	m->mediadata = new CMediaData;
-	if (!m->mediadata)
+	if (!m->mediadata) {
 		_ERR("mediadata init failed");
+		return false;
+	}
 
 	if (param->id)
 		m->id = strdup(param->id);
 
 	m->player = new CPlayer;
-	if (!m->player)
+	if (!m->player) {
 		_ERR("player init failed");
-
-	r = m->player->Create(m->win, param->filepath, param->playlist);
-	if (!r)
-		_ERR("player creation failed");
+		return false;
+	}
 
 	m->control = new CVideoController;
-	if (!m->control)
+	if (!m->control) {
 		_ERR("control init failed");
+		return false;
+	}
 
 	m->volume = new CVolume;
-	if (!m->volume)
+	if (!m->volume) {
 		_ERR("volume init failed");
+		return false;
+	}
 
 	m->slider = new CVideoSlider;
-	if (!m->slider)
+	if (!m->slider) {
 		_ERR("slider init failed");
+		return false;
+	}
+
+	return true;
 }
 
 bool CPlayerView::m_UiInit(void)
@@ -584,6 +594,7 @@ bool CPlayerView::Create(void *data)
 	ASSERT(data);
 
 	Evas_Object *win;
+	SPlayerParam *param;
 	bool r;
 
 	win = CViewMgr::GetInstance()->Window();
@@ -596,18 +607,38 @@ bool CPlayerView::Create(void *data)
 	}
 
 	m->win = win;
+	m->player = NULL;
+	m->volume = NULL;
+	m->control = NULL;
+	m->slider = NULL;
+	m->mediadata = NULL;
+	m->timeout_handle = NULL;
+	m->drawanim_timer = NULL;
+
+	param = (SPlayerParam *)data;
 
-	m_ControlInit((SPlayerParam *)data);
+	r = m_ControlInit(param);
+	if (!r) {
+		_ERR("failed to init Controls");
+		goto err;
+	}
 
 	r = m_UiInit();
 	if (!r) {
 		_ERR("failed to init UI");
-		goto err;
+		goto err_control;
+	}
+
+	r = m->player->Create(m->win, param->filepath, param->playlist);
+	if (!r) {
+		_ERR("player creation failed");
+		goto err_control;
 	}
 
-	if (!m_PlayerInit()) {
+	r = m_PlayerInit();
+	if (!r) {
 		_ERR("failed to play video");
-		goto err;
+		goto err_player;
 	}
 
 	m->player->SetCompletedCb(sm_CbPlayComplete, m);
@@ -625,6 +656,12 @@ bool CPlayerView::Create(void *data)
 
 	return true;
 
+err_player:
+	m->player->Destroy();
+err_control:
+	m->control->Destroy();
+	m->slider->Destroy();
+	m->volume->Destroy();
 err:
 	m_Fini();
 	return false;
@@ -633,32 +670,17 @@ err:
 void CPlayerView::m_Fini(void)
 {
 	ecore_timer_del(m->drawanim_timer);
-	m->drawanim_timer = NULL;
 
 	delete m->mediadata;
-	m->mediadata = NULL;
-
-	m->player->Destroy();
-	delete m->player;
-	m->player = NULL;
 
 	timeout_handler_fini(m->timeout_handle);
-	m->timeout_handle = NULL;
 
 	free(m->id);
-	m->id = NULL;
 
-	m->volume->Destroy();
+	delete m->player;
 	delete m->volume;
-	m->volume = NULL;
-
-	m->control->Destroy();
 	delete m->control;
-	m->control = NULL;
-
-	m->slider->Destroy();
 	delete m->slider;
-	m->slider = NULL;
 
 	delete m;
 	m = NULL;
@@ -670,6 +692,11 @@ void CPlayerView::Destroy(void)
 
 	CBaseView::Destroy();
 
+	m->player->Destroy();
+	m->volume->Destroy();
+	m->control->Destroy();
+	m->slider->Destroy();
+
 	m_Fini();
 }
 
diff --git a/src/volume.cpp b/src/volume.cpp
index 0ced574..6bb62e4 100644
--- a/src/volume.cpp
+++ b/src/volume.cpp
@@ -46,6 +46,7 @@ void CVolume::m_SetMute(bool mute)
 			return;
 
 		m->volume = vol;
+		sound_manager_set_volume(SOUND_TYPE_MEDIA, 0);
 	} else {
 		sound_manager_set_volume(SOUND_TYPE_MEDIA, m->volume);
 	}
@@ -90,9 +91,6 @@ void CVolume::m_UpdateVolume(void)
 	char buf[8];
 	int r;
 
-	if (!m->bar)
-		return;
-
 	r = sound_manager_get_volume(SOUND_TYPE_MEDIA, &vol);
 	if (r != SOUND_MANAGER_ERROR_NONE) {
 		_ERR("get volume error");
@@ -115,10 +113,9 @@ void CVolume::m_UpdateVolume(void)
 
 Eina_Bool CVolume::sm_CbTimer(void *dt)
 {
-	SVolumeData *data;
+	ASSERT(dt);
 
-	if (!dt)
-		return ECORE_CALLBACK_CANCEL;
+	SVolumeData *data;
 
 	data = (SVolumeData *)dt;
 
@@ -160,17 +157,9 @@ bool CVolume::Create(Evas_Object *base)
 	Evas_Object *ly;
 	Evas_Object *bar;
 
-	m = new SVolumeData;
-	if (!m) {
-		_ERR("allocation fail");
-		return false;
-	}
-
 	ly = elm_layout_add(base);
-	if (!ly) {
-		delete m;
+	if (!ly)
 		return false;
-	}
 
 	elm_layout_file_set(ly, EDJEFILE, GRP_VOLUME);
 	elm_win_resize_object_add(base, ly);
@@ -179,7 +168,6 @@ bool CVolume::Create(Evas_Object *base)
 	bar = elm_progressbar_add(ly);
 	if (!bar) {
 		_ERR("failed to create progressbar");
-		delete m;
 		evas_object_del(ly);
 		return false;
 	}
@@ -191,8 +179,16 @@ bool CVolume::Create(Evas_Object *base)
 	elm_object_part_content_set(ly, PART_VOLUME_BAR, bar);
 	evas_object_show(bar);
 
+	m = new SVolumeData;
+	if (!m) {
+		_ERR("allocation fail");
+		evas_object_del(ly);
+		return false;
+	}
+
 	m->ly = ly;
 	m->bar = bar;
+	m->timer = NULL;
 
 	sound_manager_set_session_type(SOUND_SESSION_TYPE_EXCLUSIVE);
 
@@ -204,6 +200,7 @@ void CVolume::Destroy(void)
 	ASSERT(m);
 
 	ecore_timer_del(m->timer);
+
 	delete m;
 	m = NULL;
 }
-- 
2.7.4


From 34f0bb4db0882c8c0602eb777bbc1a1a9d1041e4 Mon Sep 17 00:00:00 2001
From: Minkyu Kang <mk7.kang@samsung.com>
Date: Mon, 20 Apr 2015 11:57:21 +0900
Subject: [PATCH 07/16] fix location of  header files

Change-Id: If427f10a5799fbe05f04c05b5d04922cc0e86dc7
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---
 src/control.cpp     | 3 ---
 src/main.cpp        | 3 ---
 src/mediadata.cpp   | 2 +-
 src/playermgr.cpp   | 2 +-
 src/slider.cpp      | 3 ---
 src/view_player.cpp | 5 +----
 src/volume.cpp      | 2 +-
 7 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/control.cpp b/src/control.cpp
index 649c547..0083b2b 100644
--- a/src/control.cpp
+++ b/src/control.cpp
@@ -18,9 +18,6 @@
 #include <Eina.h>
 #include <dbg.h>
 #include <AppCommon.h>
-#include <ViewMgr.h>
-#include <BaseView.h>
-#include <InputHandler.h>
 #include "define.h"
 #include "i18n.h"
 #include "control.h"
diff --git a/src/main.cpp b/src/main.cpp
index b57a239..530b4dd 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,9 +18,6 @@
 #include <Elementary.h>
 #include <dbg.h>
 #include <AppCommon.h>
-#include <BaseApp.h>
-#include <BaseView.h>
-#include <ViewMgr.h>
 #include "define.h"
 #include "view_player.h"
 #include "i18n.h"
diff --git a/src/mediadata.cpp b/src/mediadata.cpp
index 89e2294..0acfbde 100644
--- a/src/mediadata.cpp
+++ b/src/mediadata.cpp
@@ -17,8 +17,8 @@
 #include <Elementary.h>
 #include <Eina.h>
 #include <media_content.h>
-#include <AppCommon.h>
 #include <dbg.h>
+#include <AppCommon.h>
 #include "define.h"
 #include "mediadata.h"
 #include "videodata.h"
diff --git a/src/playermgr.cpp b/src/playermgr.cpp
index b2d4ecf..a545c62 100644
--- a/src/playermgr.cpp
+++ b/src/playermgr.cpp
@@ -16,8 +16,8 @@
 
 #include <Elementary.h>
 #include <Eina.h>
-#include <AppCommon.h>
 #include <dbg.h>
+#include <AppCommon.h>
 #include "define.h"
 #include "playermgr.h"
 
diff --git a/src/slider.cpp b/src/slider.cpp
index dc9eefc..2a99ef2 100644
--- a/src/slider.cpp
+++ b/src/slider.cpp
@@ -18,9 +18,6 @@
 #include <Eina.h>
 #include <dbg.h>
 #include <AppCommon.h>
-#include <ViewMgr.h>
-#include <BaseView.h>
-#include <InputHandler.h>
 #include "define.h"
 #include "playermgr.h"
 #include "slider.h"
diff --git a/src/view_player.cpp b/src/view_player.cpp
index 4bb5317..c0c5f2c 100644
--- a/src/view_player.cpp
+++ b/src/view_player.cpp
@@ -17,12 +17,9 @@
 #include <Elementary.h>
 #include <Eina.h>
 #include <efl_extension.h>
+#include <dbg.h>
 #include <AppCommon.h>
-#include <ViewMgr.h>
-#include <BaseView.h>
-#include <InputHandler.h>
 #include <media_content.h>
-#include <dbg.h>
 #include "define.h"
 #include "i18n.h"
 #include "playermgr.h"
diff --git a/src/volume.cpp b/src/volume.cpp
index 6bb62e4..6976eb1 100644
--- a/src/volume.cpp
+++ b/src/volume.cpp
@@ -17,8 +17,8 @@
 #include <Elementary.h>
 #include <Eina.h>
 #include <media/sound_manager.h>
-#include <AppCommon.h>
 #include <dbg.h>
+#include <AppCommon.h>
 #include "define.h"
 #include "volume.h"
 
-- 
2.7.4


From d3358ca66e87807449afee6fc3614537bb476b40 Mon Sep 17 00:00:00 2001
From: Minkyu Kang <mk7.kang@samsung.com>
Date: Mon, 20 Apr 2015 12:12:58 +0900
Subject: [PATCH 08/16] remove unnecessary header files

Change-Id: I5c2900917b5f647e88bb56bef4ad620306e40658
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---
 src/control.cpp     | 2 --
 src/main.cpp        | 2 --
 src/mediadata.cpp   | 3 ---
 src/playermgr.cpp   | 2 --
 src/slider.cpp      | 2 --
 src/videodata.cpp   | 4 +---
 src/view_player.cpp | 3 ---
 src/volume.cpp      | 2 --
 8 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/control.cpp b/src/control.cpp
index 0083b2b..59e4a74 100644
--- a/src/control.cpp
+++ b/src/control.cpp
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
-#include <Eina.h>
 #include <dbg.h>
 #include <AppCommon.h>
 #include "define.h"
diff --git a/src/main.cpp b/src/main.cpp
index 530b4dd..771206f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#include <app.h>
-#include <Elementary.h>
 #include <dbg.h>
 #include <AppCommon.h>
 #include "define.h"
diff --git a/src/mediadata.cpp b/src/mediadata.cpp
index 0acfbde..5d3a5a0 100644
--- a/src/mediadata.cpp
+++ b/src/mediadata.cpp
@@ -14,9 +14,6 @@
  * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <media_content.h>
 #include <dbg.h>
 #include <AppCommon.h>
 #include "define.h"
diff --git a/src/playermgr.cpp b/src/playermgr.cpp
index a545c62..523e654 100644
--- a/src/playermgr.cpp
+++ b/src/playermgr.cpp
@@ -14,8 +14,6 @@
  * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
 #include <dbg.h>
 #include <AppCommon.h>
 #include "define.h"
diff --git a/src/slider.cpp b/src/slider.cpp
index 2a99ef2..26316b6 100644
--- a/src/slider.cpp
+++ b/src/slider.cpp
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#include <Elementary.h>
-#include <Eina.h>
 #include <dbg.h>
 #include <AppCommon.h>
 #include "define.h"
diff --git a/src/videodata.cpp b/src/videodata.cpp
index 74661e6..a4ce494 100644
--- a/src/videodata.cpp
+++ b/src/videodata.cpp
@@ -14,10 +14,8 @@
  * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <media_content.h>
 #include <dbg.h>
+#include <AppCommon.h>
 #include "define.h"
 #include "videodata.h"
 
diff --git a/src/view_player.cpp b/src/view_player.cpp
index c0c5f2c..5682e3a 100644
--- a/src/view_player.cpp
+++ b/src/view_player.cpp
@@ -14,12 +14,9 @@
  * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
 #include <efl_extension.h>
 #include <dbg.h>
 #include <AppCommon.h>
-#include <media_content.h>
 #include "define.h"
 #include "i18n.h"
 #include "playermgr.h"
diff --git a/src/volume.cpp b/src/volume.cpp
index 6976eb1..c880203 100644
--- a/src/volume.cpp
+++ b/src/volume.cpp
@@ -14,8 +14,6 @@
  * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
 #include <media/sound_manager.h>
 #include <dbg.h>
 #include <AppCommon.h>
-- 
2.7.4


From 06db98f04e2127a79b92fb07ecc95034cd00ee25 Mon Sep 17 00:00:00 2001
From: Kim Youngjin <yj21c.kim@samsung.com>
Date: Tue, 21 Apr 2015 08:40:37 +0900
Subject: [PATCH 09/16] dbg.h file is removed.

Change-Id: If3920536c78590ba19c7440fdb3070d5b1053020
Signed-off-by: Kim Youngjin <yj21c.kim@samsung.com>
---
 include/dbg.h           | 39 ---------------------------------------
 src/control.cpp         |  1 -
 src/main.cpp            |  3 ++-
 src/mediadata.cpp       |  1 -
 src/playermgr.cpp       |  1 -
 src/slider.cpp          |  1 -
 src/timeout_handler.cpp |  2 +-
 src/videodata.cpp       |  1 -
 src/view_player.cpp     |  1 -
 src/volume.cpp          |  1 -
 10 files changed, 3 insertions(+), 48 deletions(-)
 delete mode 100644 include/dbg.h

diff --git a/include/dbg.h b/include/dbg.h
deleted file mode 100644
index 6cbeffa..0000000
--- a/include/dbg.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __DBG_H__
-#define __DBG_H__
-
-#include <dlog.h>
-
-#ifdef LOG_TAG
-#undef LOG_TAG
-#endif
-#define LOG_TAG "org.tizen.video-player"
-
-#ifndef _ERR
-#define _ERR(fmt, args...) LOGE(fmt"\n", ##args)
-#endif
-
-#ifndef _DBG
-#define _DBG(fmt, args...) LOGD(fmt"\n", ##args)
-#endif
-
-#ifndef _INFO
-#define _INFO(fmt, args...) LOGI(fmt"\n", ##args)
-#endif
-
-#endif /* __DBG_H__ */
diff --git a/src/control.cpp b/src/control.cpp
index 59e4a74..3d95c98 100644
--- a/src/control.cpp
+++ b/src/control.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <dbg.h>
 #include <AppCommon.h>
 #include "define.h"
 #include "i18n.h"
diff --git a/src/main.cpp b/src/main.cpp
index 771206f..214129e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <dbg.h>
 #include <AppCommon.h>
 #include "define.h"
 #include "view_player.h"
@@ -24,6 +23,8 @@
 #define PARAM_URI "uri"
 #define PARAM_PLAYLIST_ID "playlist_id"
 
+SET_TAG("org.tizen.video-playher");
+
 struct SAppData {
 	const char *name;
 	Evas_Object *win;
diff --git a/src/mediadata.cpp b/src/mediadata.cpp
index 5d3a5a0..c7ae1bf 100644
--- a/src/mediadata.cpp
+++ b/src/mediadata.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
 */
 
-#include <dbg.h>
 #include <AppCommon.h>
 #include "define.h"
 #include "mediadata.h"
diff --git a/src/playermgr.cpp b/src/playermgr.cpp
index 523e654..a5db947 100644
--- a/src/playermgr.cpp
+++ b/src/playermgr.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
 */
 
-#include <dbg.h>
 #include <AppCommon.h>
 #include "define.h"
 #include "playermgr.h"
diff --git a/src/slider.cpp b/src/slider.cpp
index 26316b6..bb609fa 100644
--- a/src/slider.cpp
+++ b/src/slider.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <dbg.h>
 #include <AppCommon.h>
 #include "define.h"
 #include "playermgr.h"
diff --git a/src/timeout_handler.cpp b/src/timeout_handler.cpp
index bdac234..f63cb9d 100644
--- a/src/timeout_handler.cpp
+++ b/src/timeout_handler.cpp
@@ -18,7 +18,7 @@
 #include <Eina.h>
 #include <Ecore.h>
 #include "timeout_handler.h"
-#include "dbg.h"
+#include <MacroDefine.h>
 
 #define NUM_EVENT_HANDLERS 7
 
diff --git a/src/videodata.cpp b/src/videodata.cpp
index a4ce494..a6e9eaf 100644
--- a/src/videodata.cpp
+++ b/src/videodata.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
 */
 
-#include <dbg.h>
 #include <AppCommon.h>
 #include "define.h"
 #include "videodata.h"
diff --git a/src/view_player.cpp b/src/view_player.cpp
index 5682e3a..6013ea7 100644
--- a/src/view_player.cpp
+++ b/src/view_player.cpp
@@ -15,7 +15,6 @@
 */
 
 #include <efl_extension.h>
-#include <dbg.h>
 #include <AppCommon.h>
 #include "define.h"
 #include "i18n.h"
diff --git a/src/volume.cpp b/src/volume.cpp
index c880203..cad9b2f 100644
--- a/src/volume.cpp
+++ b/src/volume.cpp
@@ -15,7 +15,6 @@
 */
 
 #include <media/sound_manager.h>
-#include <dbg.h>
 #include <AppCommon.h>
 #include "define.h"
 #include "volume.h"
-- 
2.7.4


From 6645bc0ad022c6a80323be34ab51554e7bffefa9 Mon Sep 17 00:00:00 2001
From: Minkyu Kang <mk7.kang@samsung.com>
Date: Tue, 21 Apr 2015 09:43:59 +0900
Subject: [PATCH 10/16] use AppCommon header file

Change-Id: I45a161939079662f11ba9f1c4d3d3be856eca934
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---
 src/timeout_handler.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/timeout_handler.cpp b/src/timeout_handler.cpp
index f63cb9d..3e9f969 100644
--- a/src/timeout_handler.cpp
+++ b/src/timeout_handler.cpp
@@ -14,11 +14,8 @@
  * limitations under the License.
 */
 
-#include <Elementary.h>
-#include <Eina.h>
-#include <Ecore.h>
+#include <AppCommon.h>
 #include "timeout_handler.h"
-#include <MacroDefine.h>
 
 #define NUM_EVENT_HANDLERS 7
 
-- 
2.7.4


From 90cd3b8512f07522802777a6295e9115f8576062 Mon Sep 17 00:00:00 2001
From: Minkyu Kang <mk7.kang@samsung.com>
Date: Tue, 21 Apr 2015 15:04:59 +0900
Subject: [PATCH 11/16] fix typo: playher->player

Change-Id: I8587f5ebb67e39045f8af483febaf23d520cf762
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 214129e..3406ee6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -23,7 +23,7 @@
 #define PARAM_URI "uri"
 #define PARAM_PLAYLIST_ID "playlist_id"
 
-SET_TAG("org.tizen.video-playher");
+SET_TAG("org.tizen.video-player");
 
 struct SAppData {
 	const char *name;
-- 
2.7.4


From e3f26b04797f03cc48953b85bdfcc605682b317d Mon Sep 17 00:00:00 2001
From: Minkyu Kang <mk7.kang@samsung.com>
Date: Tue, 21 Apr 2015 15:09:42 +0900
Subject: [PATCH 12/16] use defined value instead of string

Change-Id: I3452f64074ef16a326c2662e9837b7cbc1c516d4
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 3406ee6..b745ade 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -23,7 +23,7 @@
 #define PARAM_URI "uri"
 #define PARAM_PLAYLIST_ID "playlist_id"
 
-SET_TAG("org.tizen.video-player");
+SET_TAG(PACKAGE);
 
 struct SAppData {
 	const char *name;
-- 
2.7.4


From 938c8e51c8c39a52128b83aba95ac60aa1afffbf Mon Sep 17 00:00:00 2001
From: Minkyu Kang <mk7.kang@samsung.com>
Date: Wed, 22 Apr 2015 14:44:24 +0900
Subject: [PATCH 13/16] add test case files

Change-Id: If30a5aa69d0c6f0e83b1b3b2532b7ded8950f5c8
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---
 testcase/videoplayer.txt     |    2 +
 testcase/videoplayer_all.txt | 2646 ++++++++++++++++++++++++++++++++++++++++++
 testcase/videoplayer_err.txt |    2 +
 3 files changed, 2650 insertions(+)
 create mode 100644 testcase/videoplayer.txt
 create mode 100644 testcase/videoplayer_all.txt
 create mode 100644 testcase/videoplayer_err.txt

diff --git a/testcase/videoplayer.txt b/testcase/videoplayer.txt
new file mode 100644
index 0000000..fb0a797
--- /dev/null
+++ b/testcase/videoplayer.txt
@@ -0,0 +1,2 @@
+videoplayer_all.txt
+videoplayer_err.txt
diff --git a/testcase/videoplayer_all.txt b/testcase/videoplayer_all.txt
new file mode 100644
index 0000000..aca5154
--- /dev/null
+++ b/testcase/videoplayer_all.txt
@@ -0,0 +1,2646 @@
+Mouse Move
+1374 671 1000
+Mouse Move
+1368 669 16
+Mouse Move
+1358 669 544
+Mouse Move
+1329 666 16
+Mouse Move
+1301 662 16
+Mouse Move
+1273 662 16
+Mouse Move
+1239 658 16
+Mouse Move
+1204 652 16
+Mouse Move
+1165 641 16
+Mouse Move
+1135 628 16
+Mouse Move
+1108 619 16
+Mouse Move
+1090 613 16
+Mouse Move
+1079 608 16
+Mouse Move
+1065 596 16
+Mouse Move
+1053 582 16
+Mouse Move
+1040 566 16
+Mouse Move
+1027 553 16
+Mouse Move
+1015 542 16
+Mouse Move
+998 532 16
+Mouse Move
+979 524 16
+Mouse Move
+962 521 16
+Mouse Move
+948 519 16
+Mouse Move
+939 519 16
+Mouse Move
+930 517 16
+Mouse Move
+922 512 16
+Mouse Move
+913 508 16
+Mouse Move
+901 503 16
+Mouse Move
+891 502 16
+Mouse Move
+879 502 16
+Mouse Move
+867 502 16
+Mouse Move
+859 505 16
+Mouse Move
+856 502 72
+Mouse Move
+849 497 16
+Mouse Move
+839 492 16
+Mouse Move
+829 489 16
+Mouse Move
+824 487 80
+Mouse Move
+816 486 16
+Mouse Move
+805 486 16
+Mouse Move
+793 486 18
+Mouse Move
+780 486 14
+Mouse Move
+776 486 16
+Mouse Move
+771 486 96
+Mouse Move
+769 488 56
+Mouse Move
+772 493 16
+Mouse Move
+774 497 16
+Mouse Move
+776 504 16
+Mouse Move
+770 507 16
+Mouse Move
+763 510 16
+Mouse Move
+759 512 16
+Mouse Move
+755 514 16
+Mouse Move
+753 515 32
+Mouse Move
+747 521 16
+Mouse Move
+737 529 17
+Mouse Move
+729 533 15
+Mouse Move
+727 534 64
+Mouse Move
+723 534 16
+Mouse Move
+720 533 64
+Mouse Move
+714 536 16
+Mouse Move
+707 544 16
+Mouse Move
+702 554 16
+Mouse Move
+695 569 16
+Mouse Move
+688 586 16
+Mouse Move
+684 601 16
+Mouse Move
+680 616 16
+Mouse Move
+677 626 16
+Mouse Move
+675 632 16
+Mouse Move
+675 638 16
+Mouse Move
+674 644 16
+Mouse Move
+674 650 16
+Mouse Move
+674 655 16
+Mouse Move
+674 661 16
+Mouse Move
+670 671 16
+Mouse Move
+672 673 176
+Mouse Move
+673 675 17
+Mouse Move
+674 677 24
+Mouse Move
+675 679 15
+Mouse Move
+677 684 16
+Mouse Move
+679 687 24
+Mouse Move
+680 690 25
+Mouse Move
+680 696 15
+Mouse Move
+673 705 16
+Mouse Move
+662 720 16
+Mouse Move
+649 738 21
+Mouse Move
+638 758 11
+Mouse Move
+625 779 16
+Mouse Move
+614 802 16
+Mouse Move
+602 824 19
+Mouse Move
+590 841 13
+Mouse Move
+581 855 16
+Mouse Move
+573 864 16
+Mouse Move
+567 870 16
+Mouse Move
+561 877 16
+Mouse Move
+556 882 16
+Mouse Move
+553 885 16
+Mouse Move
+550 888 32
+Mouse Move
+549 891 26
+Mouse Move
+549 894 14
+Mouse Move
+547 899 16
+Mouse Move
+544 903 24
+Mouse Move
+542 908 16
+Mouse Move
+537 914 16
+Mouse Move
+531 922 16
+Mouse Move
+525 930 16
+Mouse Move
+518 934 16
+Mouse Move
+513 939 16
+Mouse Move
+509 942 16
+Mouse Move
+505 946 16
+Mouse Move
+502 948 16
+Mouse Move
+499 951 16
+Mouse Move
+494 952 16
+Mouse Move
+490 953 17
+Mouse Move
+486 954 15
+Mouse Move
+483 955 16
+Mouse Move
+480 956 16
+Mouse Move
+476 957 16
+Mouse Pressed
+474 959 0 1 552
+Mouse Move
+475 960 48
+Mouse Released
+476 959 256 1 144
+Mouse Move
+477 960 264
+Mouse Move
+479 961 424
+Mouse Move
+483 960 24
+Mouse Move
+488 956 16
+Mouse Move
+493 951 16
+Mouse Move
+500 946 16
+Mouse Move
+503 941 16
+Mouse Move
+508 934 16
+Mouse Move
+514 923 16
+Mouse Move
+522 909 16
+Mouse Move
+532 887 16
+Mouse Move
+543 860 16
+Mouse Move
+556 833 23
+Mouse Move
+568 810 9
+Mouse Move
+579 792 28
+Mouse Move
+590 777 13
+Mouse Move
+597 765 12
+Mouse Move
+602 757 12
+Mouse Move
+606 750 27
+Mouse Move
+608 745 8
+Mouse Move
+611 738 18
+Mouse Move
+613 733 12
+Mouse Move
+616 727 14
+Mouse Move
+617 723 16
+Mouse Move
+620 720 16
+Mouse Move
+622 718 64
+Mouse Move
+625 716 24
+Mouse Move
+629 713 16
+Mouse Move
+632 711 21
+Mouse Move
+636 708 14
+Mouse Move
+639 704 13
+Mouse Move
+641 703 32
+Mouse Move
+643 705 232
+Mouse Move
+645 707 16
+Mouse Move
+649 709 16
+Mouse Move
+652 711 16
+Mouse Move
+655 713 16
+Mouse Move
+657 715 16
+Mouse Move
+659 717 16
+Mouse Move
+662 719 24
+Mouse Move
+666 720 72
+Mouse Move
+669 721 20
+Mouse Move
+672 723 20
+Mouse Move
+674 725 24
+Mouse Move
+677 726 16
+Mouse Move
+682 726 16
+Mouse Move
+688 727 16
+Mouse Move
+695 729 17
+Mouse Move
+701 729 15
+Mouse Move
+707 729 16
+Mouse Move
+712 729 16
+Mouse Move
+717 729 16
+Mouse Move
+721 729 16
+Mouse Move
+724 729 16
+Mouse Move
+727 729 16
+Mouse Move
+730 729 24
+Mouse Move
+732 729 16
+Mouse Move
+735 729 16
+Mouse Move
+737 729 16
+Mouse Move
+741 729 16
+Mouse Move
+744 729 16
+Mouse Move
+746 729 24
+Mouse Move
+750 731 16
+Mouse Move
+755 734 16
+Mouse Move
+758 736 16
+Mouse Move
+760 736 24
+Mouse Move
+762 736 32
+Mouse Move
+766 737 24
+Mouse Move
+767 740 160
+Mouse Move
+767 745 16
+Mouse Move
+771 751 16
+Mouse Move
+776 761 16
+Mouse Move
+782 770 16
+Mouse Move
+792 780 16
+Mouse Move
+800 786 16
+Mouse Move
+806 791 16
+Mouse Move
+810 798 16
+Mouse Move
+812 808 16
+Mouse Move
+815 821 16
+Mouse Move
+816 836 16
+Mouse Move
+816 850 16
+Mouse Move
+816 861 16
+Mouse Move
+816 869 16
+Mouse Move
+816 875 16
+Mouse Move
+817 880 16
+Mouse Move
+817 885 18
+Mouse Move
+817 894 14
+Mouse Move
+817 900 16
+Mouse Move
+817 906 16
+Mouse Move
+815 913 16
+Mouse Move
+813 916 16
+Mouse Move
+813 923 16
+Mouse Move
+810 930 16
+Mouse Move
+809 935 16
+Mouse Move
+807 940 16
+Mouse Move
+807 944 16
+Mouse Move
+807 946 56
+Mouse Move
+807 949 32
+Mouse Move
+806 951 16
+Mouse Pressed
+805 952 0 1 184
+Mouse Released
+805 952 256 1 144
+Mouse Pressed
+805 952 0 1 1272
+Mouse Released
+805 952 256 1 176
+Mouse Move
+806 952 1288
+Mouse Move
+809 952 80
+Mouse Move
+811 952 168
+Mouse Move
+814 952 16
+Mouse Move
+815 950 720
+Mouse Move
+807 949 24
+Mouse Move
+795 949 16
+Mouse Move
+788 949 16
+Mouse Move
+782 950 17
+Mouse Move
+778 951 15
+Mouse Move
+773 951 16
+Mouse Move
+766 951 16
+Mouse Move
+760 951 16
+Mouse Move
+751 951 16
+Mouse Move
+741 951 16
+Mouse Move
+729 951 16
+Mouse Move
+718 951 16
+Mouse Move
+708 951 16
+Mouse Move
+700 951 16
+Mouse Move
+696 951 16
+Mouse Move
+691 951 16
+Mouse Move
+688 951 16
+Mouse Move
+684 951 16
+Mouse Move
+679 952 16
+Mouse Move
+674 953 16
+Mouse Move
+671 955 24
+Mouse Move
+669 956 17
+Mouse Move
+666 957 15
+Mouse Move
+663 959 40
+Mouse Move
+661 960 64
+Mouse Pressed
+661 960 0 1 976
+Mouse Released
+661 960 256 1 144
+Mouse Move
+664 960 760
+Mouse Move
+666 959 16
+Mouse Move
+669 957 16
+Mouse Move
+670 949 6112
+Mouse Move
+670 940 16
+Mouse Move
+670 928 16
+Mouse Move
+670 914 16
+Mouse Move
+672 897 16
+Mouse Move
+679 883 16
+Mouse Move
+689 872 16
+Mouse Move
+701 862 16
+Mouse Move
+719 856 16
+Mouse Move
+741 849 16
+Mouse Move
+760 844 16
+Mouse Move
+772 842 16
+Mouse Move
+780 842 16
+Mouse Move
+784 841 16
+Mouse Move
+786 841 24
+Mouse Move
+789 844 40
+Mouse Move
+791 846 24
+Mouse Move
+793 848 32
+Mouse Move
+796 851 640
+Mouse Move
+798 855 32
+Mouse Move
+801 858 24
+Mouse Move
+804 862 16
+Mouse Move
+808 866 16
+Mouse Move
+810 871 16
+Mouse Move
+813 876 16
+Mouse Move
+816 883 16
+Mouse Move
+818 889 16
+Mouse Move
+820 895 16
+Mouse Move
+821 903 16
+Mouse Move
+822 910 16
+Mouse Move
+822 918 16
+Mouse Move
+822 923 16
+Mouse Move
+822 926 16
+Mouse Move
+822 930 16
+Mouse Move
+821 934 16
+Mouse Move
+820 937 16
+Mouse Move
+818 941 16
+Mouse Move
+817 945 24
+Mouse Move
+815 947 16
+Mouse Move
+815 949 16
+Mouse Move
+814 951 24
+Mouse Move
+814 954 16
+Mouse Move
+813 956 16
+Mouse Move
+812 959 16
+Mouse Move
+812 963 528
+Mouse Move
+812 966 16
+Mouse Move
+813 970 24
+Mouse Move
+816 974 16
+Mouse Move
+818 977 16
+Mouse Pressed
+818 978 0 1 432
+Mouse Released
+818 978 256 1 88
+Mouse Move
+817 979 16
+Mouse Move
+821 979 208
+Mouse Move
+826 979 24
+Mouse Move
+829 979 24
+Mouse Move
+831 979 1032
+Mouse Move
+836 979 16
+Mouse Move
+841 979 16
+Mouse Move
+850 980 16
+Mouse Move
+862 980 16
+Mouse Move
+875 980 16
+Mouse Move
+885 980 16
+Mouse Move
+892 980 16
+Mouse Move
+897 980 16
+Mouse Move
+902 980 16
+Mouse Move
+906 980 16
+Mouse Move
+912 980 16
+Mouse Move
+917 980 16
+Mouse Move
+922 980 17
+Mouse Move
+925 980 15
+Mouse Move
+927 980 16
+Mouse Move
+930 980 16
+Mouse Move
+935 980 16
+Mouse Move
+940 980 16
+Mouse Move
+942 980 16
+Mouse Move
+945 980 16
+Mouse Move
+947 980 48
+Mouse Move
+950 980 16
+Mouse Move
+952 980 16
+Mouse Pressed
+954 980 0 1 208
+Mouse Released
+954 980 256 1 184
+Mouse Move
+953 981 200
+Mouse Move
+950 982 16
+Mouse Move
+947 984 24
+Mouse Move
+943 986 240
+Mouse Move
+941 987 32
+Mouse Move
+938 990 32
+Mouse Move
+934 994 24
+Mouse Move
+932 996 16
+Mouse Move
+928 1001 16
+Mouse Move
+925 1006 24
+Mouse Move
+924 1008 120
+Mouse Move
+924 1010 752
+Mouse Move
+924 1013 48
+Mouse Move
+926 1015 232
+Mouse Move
+926 1018 264
+Mouse Move
+927 1021 264
+Mouse Move
+927 1024 32
+Mouse Move
+927 1026 24
+Mouse Move
+928 1030 32
+Mouse Move
+930 1033 16
+Mouse Move
+931 1038 24
+Mouse Move
+932 1041 16
+Mouse Move
+935 1046 32
+Mouse Move
+936 1050 32
+Mouse Move
+936 1047 7232
+Mouse Move
+936 1044 16
+Mouse Move
+936 1040 24
+Mouse Move
+942 1038 1984
+Mouse Move
+976 1038 16
+Mouse Move
+1017 1040 16
+Mouse Move
+1032 1042 16
+Mouse Move
+1035 1041 24
+Mouse Move
+1034 1029 16
+Mouse Move
+1032 1019 16
+Mouse Move
+1030 1008 16
+Mouse Move
+1030 999 16
+Mouse Move
+1030 992 16
+Mouse Move
+1031 983 16
+Mouse Move
+1032 975 16
+Mouse Move
+1032 969 16
+Mouse Move
+1029 962 16
+Mouse Move
+1027 959 16
+Mouse Move
+1024 956 16
+Mouse Move
+1024 953 40
+Mouse Move
+1024 950 16
+Mouse Move
+1026 948 16
+Mouse Move
+1030 945 112
+Mouse Move
+1029 943 48
+Mouse Move
+1027 941 16
+Mouse Move
+1025 941 16
+Mouse Move
+1023 941 16
+Mouse Move
+1020 941 32
+Mouse Move
+1030 942 104
+Mouse Move
+1045 942 16
+Mouse Move
+1062 944 16
+Mouse Move
+1077 946 16
+Mouse Move
+1090 947 16
+Mouse Move
+1100 949 16
+Mouse Move
+1106 950 16
+Mouse Move
+1111 950 16
+Mouse Move
+1115 950 16
+Mouse Move
+1120 950 16
+Mouse Move
+1124 951 16
+Mouse Move
+1129 952 16
+Mouse Move
+1132 954 24
+Mouse Pressed
+1132 954 0 1 448
+Mouse Released
+1132 954 256 1 168
+Mouse Move
+1136 955 3144
+Mouse Move
+1139 957 273
+Mouse Move
+1141 957 15
+Mouse Move
+1144 957 16
+Mouse Move
+1146 957 32
+Mouse Move
+1150 958 16
+Mouse Move
+1152 959 24
+Mouse Move
+1155 959 16
+Mouse Move
+1157 959 16
+Mouse Move
+1160 959 16
+Mouse Move
+1162 959 16
+Mouse Move
+1165 959 18
+Mouse Move
+1167 959 14
+Mouse Move
+1170 959 24
+Mouse Move
+1174 959 24
+Mouse Move
+1180 959 24
+Mouse Move
+1187 958 16
+Mouse Move
+1195 957 16
+Mouse Move
+1202 956 16
+Mouse Move
+1206 956 16
+Mouse Move
+1211 954 16
+Mouse Move
+1214 954 16
+Mouse Move
+1216 954 25
+Mouse Move
+1219 954 15
+Mouse Move
+1224 954 16
+Mouse Move
+1229 954 16
+Mouse Move
+1232 954 16
+Mouse Move
+1236 954 16
+Mouse Move
+1239 954 16
+Mouse Move
+1241 954 17
+Mouse Move
+1244 954 15
+Mouse Move
+1247 954 32
+Mouse Move
+1250 954 24
+Mouse Move
+1252 954 16
+Mouse Move
+1255 954 40
+Mouse Move
+1257 954 544
+Mouse Move
+1261 955 96
+Mouse Move
+1263 956 210
+Mouse Pressed
+1263 956 0 1 119
+Mouse Released
+1263 956 256 1 183
+Mouse Move
+1262 954 4984
+Mouse Move
+1264 951 24
+Mouse Move
+1272 947 16
+Mouse Move
+1285 943 16
+Mouse Move
+1300 939 16
+Mouse Move
+1314 937 16
+Mouse Move
+1327 934 16
+Mouse Move
+1342 929 16
+Mouse Move
+1358 925 16
+Mouse Move
+1377 919 16
+Mouse Move
+1399 912 16
+Mouse Move
+1423 906 16
+Mouse Move
+1451 899 16
+Mouse Move
+1476 896 16
+Mouse Move
+1500 892 16
+Mouse Move
+1520 888 16
+Mouse Move
+1539 886 16
+Mouse Move
+1556 883 16
+Mouse Move
+1571 881 16
+Mouse Move
+1581 878 16
+Mouse Move
+1590 876 16
+Mouse Move
+1597 873 16
+Mouse Move
+1602 873 16
+Mouse Move
+1609 873 17
+Mouse Move
+1617 873 15
+Mouse Move
+1629 873 16
+Mouse Move
+1640 871 17
+Mouse Move
+1650 869 16
+Mouse Move
+1660 868 16
+Mouse Move
+1670 866 15
+Mouse Move
+1682 863 16
+Mouse Move
+1698 863 16
+Mouse Move
+1716 862 16
+Mouse Move
+1736 859 16
+Mouse Move
+1755 857 16
+Mouse Move
+1767 857 16
+Mouse Move
+1777 857 16
+Mouse Move
+1786 857 16
+Mouse Move
+1796 857 16
+Mouse Move
+1805 859 17
+Mouse Move
+1812 859 15
+Mouse Move
+1817 859 16
+Mouse Move
+1821 859 16
+Mouse Move
+1825 859 16
+Mouse Move
+1832 857 16
+Mouse Move
+1842 856 17
+Mouse Move
+1855 853 15
+Mouse Move
+1867 853 16
+Mouse Move
+1880 853 16
+Mouse Move
+1890 853 16
+Mouse Move
+1894 853 24
+Mouse Move
+1896 853 56
+Mouse Move
+1899 855 24
+Mouse Move
+1900 858 26
+Mouse Move
+1899 860 62
+Mouse Move
+1897 862 32
+Mouse Move
+1895 862 16
+Mouse Move
+1893 863 17
+Mouse Move
+1890 865 15
+Mouse Move
+1888 866 40
+Mouse Move
+1885 868 96
+Mouse Pressed
+1885 868 0 1 448
+Mouse Released
+1885 868 256 1 208
+Mouse Move
+1883 869 368
+Mouse Move
+1881 870 16
+Mouse Move
+1879 871 16
+Mouse Move
+1877 872 24
+Mouse Move
+1875 873 16
+Mouse Move
+1872 876 24
+Mouse Move
+1868 880 16
+Mouse Move
+1864 887 16
+Mouse Move
+1860 892 16
+Mouse Move
+1859 895 24
+Mouse Move
+1858 898 16
+Mouse Move
+1855 901 48
+Mouse Move
+1853 904 96
+Mouse Move
+1851 905 24
+Mouse Move
+1849 907 16
+Mouse Move
+1845 910 16
+Mouse Move
+1840 915 24
+Mouse Move
+1837 920 16
+Mouse Move
+1833 924 16
+Mouse Move
+1830 927 16
+Mouse Move
+1826 929 1041
+Mouse Move
+1824 927 5151
+Mouse Move
+1822 925 40
+Mouse Move
+1820 923 32
+Mouse Move
+1818 922 40
+Mouse Move
+1813 919 16
+Mouse Move
+1810 917 17
+Mouse Move
+1805 913 15
+Mouse Move
+1801 911 16
+Mouse Move
+1796 908 16
+Mouse Move
+1791 906 16
+Mouse Move
+1780 902 19
+Mouse Move
+1773 902 13
+Mouse Move
+1769 901 16
+Mouse Move
+1766 901 32
+Mouse Move
+1764 901 16
+Mouse Move
+1758 901 16
+Mouse Move
+1748 901 16
+Mouse Move
+1734 901 16
+Mouse Move
+1718 901 16
+Mouse Move
+1697 901 16
+Mouse Move
+1674 901 16
+Mouse Move
+1650 901 16
+Mouse Move
+1628 902 16
+Mouse Move
+1598 906 16
+Mouse Move
+1568 911 16
+Mouse Move
+1538 919 16
+Mouse Move
+1507 924 16
+Mouse Move
+1481 927 16
+Mouse Move
+1460 930 16
+Mouse Move
+1445 932 16
+Mouse Move
+1431 934 17
+Mouse Move
+1418 936 15
+Mouse Move
+1403 939 17
+Mouse Move
+1391 942 15
+Mouse Move
+1378 946 16
+Mouse Move
+1365 950 16
+Mouse Move
+1351 954 16
+Mouse Move
+1338 956 16
+Mouse Move
+1325 960 16
+Mouse Move
+1313 964 16
+Mouse Move
+1304 966 16
+Mouse Move
+1294 970 16
+Mouse Move
+1283 974 16
+Mouse Move
+1275 977 17
+Mouse Move
+1268 979 15
+Mouse Move
+1264 981 32
+Mouse Pressed
+1264 981 0 1 128
+Mouse Released
+1264 981 256 1 144
+Mouse Move
+1266 981 416
+Mouse Move
+1269 981 24
+Mouse Move
+1272 978 16
+Mouse Move
+1275 978 16
+Mouse Move
+1280 977 16
+Mouse Move
+1285 976 16
+Mouse Move
+1294 973 16
+Mouse Move
+1308 971 16
+Mouse Move
+1324 967 17
+Mouse Move
+1341 963 15
+Mouse Move
+1362 958 16
+Mouse Move
+1389 954 16
+Mouse Move
+1415 951 16
+Mouse Move
+1442 947 16
+Mouse Move
+1465 944 16
+Mouse Move
+1479 942 16
+Mouse Move
+1490 941 16
+Mouse Move
+1497 938 16
+Mouse Move
+1504 937 16
+Mouse Move
+1514 936 16
+Mouse Move
+1530 933 21
+Mouse Move
+1550 931 11
+Mouse Move
+1568 928 16
+Mouse Move
+1581 926 16
+Mouse Move
+1588 923 16
+Mouse Move
+1591 923 16
+Mouse Move
+1594 922 32
+Mouse Move
+1596 921 24
+Mouse Move
+1599 921 24
+Mouse Move
+1602 921 24
+Mouse Move
+1607 919 16
+Mouse Move
+1616 919 16
+Mouse Move
+1626 918 16
+Mouse Move
+1635 917 16
+Mouse Move
+1642 916 16
+Mouse Move
+1651 914 16
+Mouse Move
+1657 913 17
+Mouse Move
+1666 913 15
+Mouse Move
+1672 912 16
+Mouse Move
+1678 911 16
+Mouse Move
+1685 909 16
+Mouse Move
+1692 908 16
+Mouse Move
+1697 908 16
+Mouse Move
+1700 908 56
+Mouse Move
+1702 907 56
+Mouse Move
+1694 909 112
+Mouse Move
+1678 913 16
+Mouse Move
+1665 917 17
+Mouse Move
+1654 920 15
+Mouse Move
+1644 921 16
+Mouse Move
+1633 922 16
+Mouse Move
+1620 924 16
+Mouse Move
+1610 924 16
+Mouse Move
+1605 925 16
+Mouse Move
+1611 925 112
+Mouse Move
+1622 923 16
+Mouse Move
+1634 922 16
+Mouse Move
+1648 921 16
+Mouse Move
+1664 918 16
+Mouse Move
+1674 917 16
+Mouse Move
+1680 916 16
+Mouse Move
+1682 916 16
+Mouse Move
+1686 916 24
+Mouse Move
+1689 914 16
+Mouse Move
+1691 914 16
+Mouse Move
+1694 913 56
+Mouse Move
+1696 913 40
+Mouse Move
+1699 913 72
+Mouse Move
+1701 912 27
+Mouse Move
+1704 912 13
+Mouse Move
+1710 909 24
+Mouse Move
+1716 908 16
+Mouse Move
+1722 907 16
+Mouse Move
+1727 906 16
+Mouse Move
+1732 906 16
+Mouse Move
+1737 904 16
+Mouse Move
+1744 903 16
+Mouse Move
+1748 902 16
+Mouse Move
+1752 901 16
+Mouse Move
+1755 901 24
+Mouse Move
+1759 899 32
+Mouse Move
+1762 897 24
+Mouse Move
+1766 896 16
+Mouse Move
+1769 894 32
+Mouse Move
+1771 893 32
+Mouse Move
+1754 897 128
+Mouse Move
+1725 906 16
+Mouse Move
+1690 912 16
+Mouse Move
+1658 917 16
+Mouse Move
+1630 921 16
+Mouse Move
+1611 925 16
+Mouse Move
+1595 926 16
+Mouse Move
+1578 930 16
+Mouse Move
+1560 932 16
+Mouse Move
+1544 934 16
+Mouse Move
+1534 935 16
+Mouse Move
+1525 936 16
+Mouse Move
+1514 939 16
+Mouse Move
+1502 940 16
+Mouse Move
+1486 942 16
+Mouse Move
+1469 945 16
+Mouse Move
+1459 946 16
+Mouse Move
+1447 947 16
+Mouse Move
+1434 947 16
+Mouse Move
+1422 949 16
+Mouse Move
+1409 950 16
+Mouse Move
+1395 951 16
+Mouse Move
+1379 954 16
+Mouse Move
+1364 956 16
+Mouse Move
+1353 957 16
+Mouse Move
+1341 957 16
+Mouse Move
+1333 957 16
+Mouse Move
+1328 957 16
+Mouse Move
+1325 957 16
+Mouse Move
+1323 957 56
+Mouse Move
+1319 957 16
+Mouse Move
+1313 957 16
+Mouse Move
+1306 957 16
+Mouse Move
+1301 959 16
+Mouse Move
+1298 959 16
+Mouse Move
+1293 959 16
+Mouse Move
+1286 959 16
+Mouse Move
+1281 959 16
+Mouse Pressed
+1281 959 0 1 120
+Mouse Released
+1281 959 256 1 128
+Mouse Move
+1291 959 760
+Mouse Move
+1313 959 16
+Mouse Move
+1356 953 16
+Mouse Move
+1406 947 16
+Mouse Move
+1455 939 16
+Mouse Move
+1497 932 18
+Mouse Move
+1527 927 14
+Mouse Move
+1547 924 16
+Mouse Move
+1557 922 17
+Mouse Move
+1566 919 15
+Mouse Move
+1574 917 17
+Mouse Move
+1581 913 15
+Mouse Move
+1590 911 16
+Mouse Move
+1597 909 16
+Mouse Move
+1604 907 16
+Mouse Move
+1611 907 16
+Mouse Move
+1622 904 16
+Mouse Move
+1633 904 16
+Mouse Move
+1644 902 16
+Mouse Move
+1652 901 16
+Mouse Move
+1661 899 16
+Mouse Move
+1670 898 16
+Mouse Move
+1685 897 16
+Mouse Move
+1702 893 16
+Mouse Move
+1721 891 16
+Mouse Move
+1737 886 16
+Mouse Move
+1747 882 16
+Mouse Move
+1757 882 16
+Mouse Move
+1765 881 16
+Mouse Move
+1776 881 16
+Mouse Move
+1791 878 16
+Mouse Move
+1805 876 16
+Mouse Move
+1817 874 16
+Mouse Move
+1825 872 17
+Mouse Move
+1831 869 15
+Mouse Move
+1837 866 16
+Mouse Move
+1846 863 17
+Mouse Move
+1856 858 15
+Mouse Move
+1864 856 16
+Mouse Move
+1871 853 16
+Mouse Move
+1875 853 16
+Mouse Move
+1880 853 16
+Mouse Move
+1884 853 16
+Mouse Move
+1890 853 16
+Mouse Move
+1895 853 16
+Mouse Move
+1899 853 16
+Mouse Move
+1901 855 64
+Mouse Move
+1901 859 24
+Mouse Move
+1901 863 16
+Mouse Move
+1900 866 16
+Mouse Move
+1899 869 48
+Mouse Pressed
+1898 870 0 1 409
+Mouse Released
+1898 870 256 1 175
+Mouse Move
+1895 870 368
+Mouse Move
+1891 870 16
+Mouse Move
+1887 873 16
+Mouse Move
+1883 877 16
+Mouse Move
+1878 888 16
+Mouse Move
+1873 899 16
+Mouse Move
+1867 909 16
+Mouse Move
+1862 916 16
+Mouse Move
+1859 921 16
+Mouse Move
+1858 923 24
+Mouse Move
+1856 926 48
+Mouse Move
+1854 927 192
+Mouse Move
+1852 926 448
+Mouse Move
+1850 926 3680
+Mouse Move
+1848 926 160
+Mouse Move
+1845 926 48
+Mouse Move
+1843 926 16
+Mouse Move
+1839 926 16
+Mouse Move
+1832 926 16
+Mouse Move
+1824 926 16
+Mouse Move
+1814 926 16
+Mouse Move
+1803 926 16
+Mouse Move
+1791 926 19
+Mouse Move
+1777 923 13
+Mouse Move
+1762 922 16
+Mouse Move
+1744 919 16
+Mouse Move
+1724 916 17
+Mouse Move
+1703 913 15
+Mouse Move
+1682 909 16
+Mouse Move
+1661 907 16
+Mouse Move
+1643 906 16
+Mouse Move
+1625 903 16
+Mouse Move
+1609 902 16
+Mouse Move
+1592 898 16
+Mouse Move
+1576 897 16
+Mouse Move
+1558 894 16
+Mouse Move
+1542 892 16
+Mouse Move
+1526 891 16
+Mouse Move
+1510 889 16
+Mouse Move
+1494 888 16
+Mouse Move
+1478 888 16
+Mouse Move
+1465 888 16
+Mouse Move
+1454 888 16
+Mouse Move
+1446 888 16
+Mouse Move
+1440 889 16
+Mouse Move
+1435 890 16
+Mouse Move
+1430 890 16
+Mouse Move
+1426 891 18
+Mouse Move
+1423 892 14
+Mouse Move
+1420 892 16
+Mouse Move
+1417 894 16
+Mouse Move
+1415 895 16
+Mouse Move
+1411 896 16
+Mouse Move
+1407 899 16
+Mouse Move
+1401 900 16
+Mouse Move
+1396 901 16
+Mouse Move
+1390 901 16
+Mouse Move
+1388 901 16
+Mouse Move
+1384 901 16
+Mouse Move
+1380 901 17
+Mouse Move
+1376 901 15
+Mouse Move
+1373 902 16
+Mouse Move
+1368 902 16
+Mouse Move
+1361 904 16
+Mouse Move
+1355 906 17
+Mouse Move
+1349 910 15
+Mouse Move
+1341 914 16
+Mouse Move
+1334 917 16
+Mouse Move
+1325 921 16
+Mouse Move
+1319 924 16
+Mouse Move
+1314 926 16
+Mouse Move
+1310 928 16
+Mouse Move
+1309 930 24
+Mouse Move
+1308 934 16
+Mouse Move
+1307 936 16
+Mouse Move
+1304 940 16
+Mouse Move
+1303 945 16
+Mouse Move
+1302 948 16
+Mouse Move
+1300 951 16
+Mouse Move
+1299 953 24
+Mouse Move
+1298 956 24
+Mouse Move
+1297 958 16
+Mouse Move
+1295 962 25
+Mouse Pressed
+1295 962 0 1 159
+Mouse Released
+1295 962 256 1 144
+Mouse Pressed
+1295 962 0 1 1344
+Mouse Released
+1295 962 256 1 184
+Mouse Move
+1299 962 632
+Mouse Move
+1305 962 16
+Mouse Move
+1315 962 16
+Mouse Move
+1328 962 16
+Mouse Move
+1347 962 19
+Mouse Move
+1369 962 13
+Mouse Move
+1391 962 16
+Mouse Move
+1416 962 16
+Mouse Move
+1438 962 16
+Mouse Move
+1451 962 16
+Mouse Move
+1460 962 16
+Mouse Move
+1466 962 16
+Mouse Move
+1472 962 16
+Mouse Move
+1479 962 16
+Mouse Move
+1485 962 16
+Mouse Move
+1485 962 176
+Key Pressed
+Right 557
+Key Released
+Right 120
+Key Pressed
+Right 0
+Key Released
+Right 120
+Key Pressed
+Right 160
+Key Released
+Right 120
+Key Pressed
+Return 1408
+Key Released
+Return 120
+Key Pressed
+Return 0
+Key Released
+Return 120
+Key Pressed
+Return 97
+Key Released
+Return 120
+Key Pressed
+Right 1735
+Key Released
+Right 120
+Key Pressed
+Right 0
+Key Released
+Right 120
+Key Pressed
+Right 136
+Key Released
+Right 120
+Key Pressed
+Right 2272
+Key Released
+Right 120
+Key Pressed
+Right 0
+Key Released
+Right 120
+Key Pressed
+Right 160
+Key Released
+Right 120
+Key Pressed
+Return 232
+Key Released
+Return 120
+Key Pressed
+Return 0
+Key Released
+Return 120
+Key Pressed
+Return 120
+Key Released
+Return 120
+Key Pressed
+Return 1336
+Key Released
+Return 120
+Key Pressed
+Return 0
+Key Released
+Return 120
+Key Pressed
+Return 160
+Key Released
+Return 120
+Key Pressed
+Right 512
+Key Released
+Right 120
+Key Pressed
+Right 0
+Key Released
+Right 120
+Key Pressed
+Right 136
+Key Released
+Right 120
+Key Pressed
+Return 480
+Key Released
+Return 120
+Key Pressed
+Return 0
+Key Released
+Return 120
+Key Pressed
+Return 152
+Key Released
+Return 120
+Key Pressed
+Return 5984
+Key Released
+Return 120
+Key Pressed
+Return 0
+Key Released
+Return 120
+Key Pressed
+Return 144
+Key Released
+Return 120
+Key Pressed
+Return 624
+Key Released
+Return 120
+Key Pressed
+Return 0
+Key Released
+Return 120
+Key Pressed
+Return 145
+Key Released
+Return 120
+Key Pressed
+Return 2328
+Key Released
+Return 120
+Key Pressed
+Return 0
+Key Released
+Return 120
+Key Pressed
+Return 175
+Key Released
+Return 120
+Key Pressed
+Left 4081
+Key Released
+Left 120
+Key Pressed
+Left 0
+Key Released
+Left 120
+Key Pressed
+Left 119
+Key Released
+Left 120
+Key Pressed
+Left 433
+Key Released
+Left 120
+Key Pressed
+Left 0
+Key Released
+Left 120
+Key Pressed
+Left 103
+Key Released
+Left 120
+Key Pressed
+Return 400
+Key Released
+Return 120
+Key Pressed
+Return 0
+Key Released
+Return 120
+Key Pressed
+Return 153
+Key Released
+Return 120
+Key Pressed
+Return 3215
+Key Released
+Return 120
+Key Pressed
+Return 0
+Key Released
+Return 120
+Key Pressed
+Return 120
+Key Released
+Return 120
+Key Pressed
+Return 1865
+Key Released
+Return 120
+Key Pressed
+Return 0
+Key Released
+Return 120
+Key Pressed
+Return 159
+Key Released
+Return 120
+Key Pressed
+Right 1576
+Key Released
+Right 120
+Key Pressed
+Right 0
+Key Released
+Right 120
+Key Pressed
+Right 208
+Key Released
+Right 120
+Key Pressed
+Right 368
+Key Released
+Right 120
+Key Pressed
+Right 0
+Key Released
+Right 120
+Key Pressed
+Right 129
+Key Released
+Right 120
+Key Pressed
+Right 808
+Key Released
+Right 120
+Key Pressed
+Right 0
+Key Released
+Right 120
+Key Pressed
+Right 167
+Key Released
+Right 120
+Key Pressed
+Return 752
+Key Released
+Return 120
+Key Pressed
+Return 0
+Key Released
+Return 120
+Key Pressed
+Return 178
+Key Released
+Return 120
+Mouse Move
+1483 962 3666
+Mouse Move
+1479 960 215
+Mouse Move
+1479 957 129
+Mouse Move
+1482 954 15
+Mouse Move
+1488 951 16
+Mouse Move
+1491 949 16
+Mouse Move
+1493 946 16
+Mouse Move
+1495 943 16
+Mouse Move
+1498 939 16
+Mouse Move
+1500 937 17
+Mouse Move
+1503 934 15
+Mouse Move
+1505 931 16
+Mouse Move
+1508 929 48
+Mouse Move
+1511 926 24
+Mouse Move
+1513 923 16
+Mouse Move
+1514 919 16
+Mouse Move
+1516 916 272
+Mouse Move
+1518 913 25
+Mouse Move
+1521 912 71
+Mouse Move
+1522 909 272
+Mouse Move
+1526 904 17
+Mouse Move
+1531 892 15
+Mouse Move
+1533 883 16
+Mouse Move
+1535 872 16
+Mouse Move
+1535 860 16
+Mouse Move
+1535 847 16
+Mouse Move
+1535 832 16
+Mouse Move
+1532 819 16
+Mouse Move
+1532 812 16
+Mouse Move
+1530 807 16
+Mouse Move
+1526 804 112
+Mouse Move
+1520 802 16
+Mouse Move
+1515 798 20
+Mouse Move
+1508 794 12
+Mouse Move
+1502 788 17
+Mouse Move
+1494 783 15
+Mouse Move
+1485 778 16
+Mouse Move
+1476 773 16
+Mouse Move
+1468 768 16
+Mouse Move
+1459 763 16
+Mouse Move
+1456 762 24
+Mouse Move
+1450 760 28
+Mouse Move
+1445 757 12
+Mouse Move
+1438 754 17
+Mouse Move
+1435 753 15
+Mouse Move
+1430 751 32
+Mouse Move
+1428 750 49
+Mouse Move
+1426 749 31
+Mouse Move
+1423 747 16
+Mouse Move
+1420 743 24
+Mouse Move
+1415 738 16
+Mouse Move
+1411 734 16
+Mouse Move
+1409 732 16
+Mouse Move
+1408 729 16
+Mouse Move
+1403 723 16
+Mouse Move
+1397 715 16
+Mouse Move
+1390 707 16
+Mouse Move
+1382 699 16
+Mouse Move
+1372 692 17
+Mouse Move
+1364 687 15
+Mouse Move
+1357 683 16
+Key Pressed
+XF86AudioRaiseVolume 250
+Key Released
+XF86AudioRaiseVolume 120
+Key Pressed
+XF86AudioMute 3696
+Key Released
+XF86AudioMute 120
+Key Pressed
+XF86AudioMute 249
+Key Released
+XF86AudioMute 120
+Key Pressed
+XF86AudioMute 1911
+Key Released
+XF86AudioMute 120
+Key Pressed
+XF86AudioMute 474
+Key Released
+XF86AudioMute 120
+Key Pressed
+XF86AudioLowerVolume 2170
+Key Released
+XF86AudioLowerVolume 120
+Key Pressed
+XF86AudioLowerVolume 475
+Key Released
+XF86AudioLowerVolume 120
+Key Pressed
+XF86AudioRaiseVolume 575
+Key Released
+XF86AudioRaiseVolume 120
+Key Pressed
+XF86AudioRaiseVolume 375
+Key Released
+XF86AudioRaiseVolume 120
+Key Pressed
+XF86AudioRaiseVolume 215
+Key Released
+XF86AudioRaiseVolume 120
+Key Pressed
+XF86AudioRaiseVolume 375
+Key Released
+XF86AudioRaiseVolume 120
+Key Pressed
+Return 6000
+Key Released
+Return 120
+Key Pressed
+Return 112
+Key Released
+Return 120
+Mouse Move
+1217 732 1000
+Mouse Move
+1214 731 32
+Mouse Move
+1207 728 16
+Mouse Move
+1198 726 16
+Mouse Move
+1186 723 16
+Mouse Move
+1173 720 16
+Mouse Move
+1160 714 16
+Mouse Move
+1143 707 17
+Mouse Move
+1120 700 15
+Mouse Move
+1095 694 16
+Mouse Move
+1065 688 16
+Mouse Move
+1031 684 16
+Mouse Move
+997 681 16
+Mouse Move
+966 681 16
+Mouse Move
+935 681 16
+Mouse Move
+900 681 16
+Mouse Move
+862 681 16
+Mouse Move
+832 685 16
+Mouse Move
+802 690 16
+Mouse Move
+776 692 16
+Mouse Move
+749 697 16
+Mouse Move
+719 706 16
+Mouse Move
+684 719 16
+Mouse Move
+654 731 16
+Mouse Move
+645 736 16
+Mouse Move
+645 738 344
+Mouse Move
+639 741 40
+Mouse Move
+632 749 16
+Mouse Move
+618 765 16
+Mouse Move
+600 777 16
+Mouse Move
+588 792 16
+Mouse Move
+579 805 16
+Mouse Move
+572 820 16
+Mouse Move
+564 834 17
+Mouse Move
+557 845 15
+Mouse Move
+553 855 16
+Mouse Move
+550 861 16
+Mouse Move
+547 868 16
+Mouse Move
+542 874 16
+Mouse Move
+537 879 16
+Mouse Move
+531 882 16
+Mouse Move
+524 888 16
+Mouse Move
+517 895 16
+Mouse Move
+510 902 16
+Mouse Move
+504 908 16
+Mouse Move
+499 915 16
+Mouse Move
+495 920 16
+Mouse Move
+493 924 17
+Mouse Move
+488 932 15
+Mouse Move
+485 937 16
+Mouse Move
+483 941 16
+Mouse Move
+483 944 16
+Mouse Move
+482 948 16
+Mouse Move
+482 951 16
+Mouse Move
+480 955 16
+Mouse Move
+480 958 32
+Mouse Move
+480 960 16
+Mouse Move
+480 963 24
+Mouse Pressed
+481 964 0 1 376
+Mouse Released
+481 964 256 1 120
+Mouse Pressed
+481 964 0 1 600
+Mouse Move
+482 965 64
+Mouse Released
+482 965 256 1 96
+Mouse Pressed
+482 965 0 1 1192
+Mouse Released
+482 965 256 1 120
+Mouse Pressed
+483 966 0 1 904
+Mouse Move
+484 966 24
+Mouse Released
+484 966 256 1 104
+Mouse Pressed
+484 966 0 1 1120
+Mouse Released
+484 966 256 1 112
+Mouse Move
+487 966 1896
+Mouse Move
+491 967 16
+Mouse Move
+494 967 656
+Mouse Move
+497 969 32
+Mouse Move
+498 971 40
+Mouse Move
+501 972 24
+Mouse Move
+505 974 16
+Mouse Move
+509 975 16
+Mouse Move
+516 976 16
+Mouse Move
+524 977 16
+Mouse Move
+532 977 16
+Mouse Move
+541 977 16
+Mouse Move
+550 977 16
+Mouse Move
+559 977 16
+Mouse Move
+566 977 16
+Mouse Move
+571 977 16
+Mouse Move
+576 977 16
+Mouse Move
+580 977 16
+Mouse Move
+586 977 16
+Mouse Move
+595 977 16
+Mouse Move
+604 977 16
+Mouse Move
+614 977 18
+Mouse Move
+621 974 14
+Mouse Move
+629 974 16
+Mouse Move
+636 972 16
+Mouse Move
+644 972 16
+Mouse Move
+652 971 16
+Mouse Move
+661 969 16
+Mouse Move
+674 968 16
+Mouse Move
+686 966 16
+Mouse Move
+697 964 16
+Mouse Move
+707 963 16
+Mouse Move
+715 962 16
+Mouse Move
+724 961 16
+Mouse Move
+732 959 16
+Mouse Move
+741 959 16
+Mouse Move
+749 959 16
+Mouse Move
+756 959 16
+Mouse Move
+764 958 16
+Mouse Move
+772 957 16
+Mouse Move
+781 956 16
+Mouse Move
+794 954 16
+Mouse Move
+810 954 16
+Mouse Move
+827 954 16
+Mouse Move
+839 954 16
+Mouse Move
+849 954 16
+Mouse Move
+857 954 16
+Mouse Move
+866 954 16
+Mouse Move
+876 954 16
+Mouse Move
+884 954 16
+Mouse Move
+890 954 16
+Mouse Move
+894 954 16
+Mouse Move
+896 953 16
+Mouse Move
+899 953 16
+Mouse Move
+901 953 24
+Mouse Move
+904 953 16
+Mouse Move
+906 953 24
+Mouse Move
+909 953 16
+Mouse Move
+912 953 24
+Mouse Move
+917 955 16
+Mouse Move
+920 957 16
+Mouse Move
+924 960 16
+Mouse Move
+926 961 40
+Mouse Move
+930 963 32
+Mouse Move
+933 965 16
+Mouse Move
+935 965 24
+Mouse Move
+937 965 24
+Mouse Move
+939 966 16
+Mouse Move
+942 967 16
+Mouse Move
+945 968 56
+Mouse Pressed
+945 968 0 1 88
+Mouse Released
+945 968 256 1 96
+Mouse Pressed
+945 968 0 1 208
+Mouse Released
+945 968 256 1 112
+Mouse Pressed
+945 968 0 1 416
+Mouse Released
+945 968 256 1 112
+Mouse Move
+943 969 568
+Mouse Move
+938 970 16
+Mouse Move
+931 971 16
+Mouse Move
+925 972 16
+Mouse Move
+921 975 16
+Mouse Move
+919 976 16
+Mouse Move
+917 978 32
+Mouse Move
+915 979 40
+Mouse Move
+913 979 24
+Key Pressed
+Escape 100000
+Key Released
+Escape 168
+Mouse Move
+1423 813 1000
+Mouse Move
+1420 813 16
+Mouse Move
+1418 813 24
+Mouse Move
+1413 813 16
+Mouse Move
+1406 813 16
+Mouse Move
+1399 810 16
+Mouse Move
+1392 806 16
+Mouse Move
+1381 803 16
+Mouse Move
+1368 796 16
+Mouse Move
+1354 793 16
+Mouse Move
+1337 790 16
+Mouse Move
+1319 788 16
+Mouse Move
+1303 788 16
+Mouse Move
+1285 788 16
+Mouse Move
+1265 788 16
+Mouse Move
+1245 788 16
+Mouse Move
+1224 788 16
+Mouse Move
+1205 788 16
+Mouse Move
+1188 793 16
+Mouse Move
+1170 798 16
+Mouse Move
+1154 803 16
+Mouse Move
+1139 807 16
+Mouse Move
+1124 812 16
+Mouse Move
+1112 818 16
+Mouse Move
+1100 823 16
+Mouse Move
+1087 831 16
+Mouse Move
+1073 839 16
+Mouse Move
+1059 851 16
+Mouse Move
+1048 860 16
+Mouse Move
+1042 868 16
+Mouse Move
+1037 878 16
+Mouse Move
+1032 887 16
+Mouse Move
+1028 897 16
+Mouse Move
+1021 908 16
+Mouse Move
+1013 919 16
+Mouse Move
+1009 927 16
+Mouse Move
+1005 934 16
+Mouse Move
+1001 942 16
+Mouse Move
+997 947 16
+Mouse Move
+994 952 16
+Mouse Move
+992 956 16
+Mouse Move
+990 959 16
+Mouse Move
+988 961 16
+Mouse Move
+987 963 32
+Mouse Move
+984 964 32
+Mouse Move
+980 966 16
+Mouse Move
+975 968 16
+Mouse Move
+973 969 16
+Mouse Move
+971 971 120
+Mouse Pressed
+971 971 0 1 56
+Mouse Released
+971 971 256 1 176
+Mouse Move
+968 970 3864
+Mouse Move
+960 969 16
+Mouse Move
+949 966 16
+Mouse Move
+941 966 16
+Mouse Move
+938 966 16
+Mouse Move
+935 966 112
+Mouse Move
+931 966 16
+Mouse Move
+926 966 16
+Mouse Move
+923 966 16
+Mouse Move
+918 966 16
+Mouse Move
+911 966 16
+Mouse Move
+905 966 16
+Mouse Move
+896 966 16
+Mouse Move
+889 966 16
+Mouse Move
+880 966 15
+Mouse Move
+870 966 17
+Mouse Move
+861 966 16
+Mouse Move
+851 966 16
+Mouse Move
+843 966 16
+Mouse Move
+835 966 16
+Mouse Move
+828 966 16
+Mouse Move
+823 966 16
+Mouse Move
+818 966 16
+Mouse Move
+813 966 16
+Mouse Move
+808 966 16
+Mouse Move
+801 966 16
+Mouse Move
+795 966 16
+Mouse Move
+789 966 16
+Mouse Move
+785 966 16
+Mouse Move
+781 966 16
+Mouse Move
+778 966 16
+Mouse Move
+774 966 16
+Mouse Move
+770 966 16
+Mouse Move
+768 966 16
+Mouse Move
+765 967 88
+Mouse Move
+767 969 176
+Mouse Move
+771 971 16
+Mouse Move
+775 972 24
+Mouse Move
+777 973 72
+Mouse Pressed
+777 973 0 1 1088
+Mouse Released
+777 973 256 1 184
+Key Pressed
+Up 4500
+Key Released
+Up 120
+Key Pressed
+Right 1000
+Key Released
+Right 150
+Key Pressed
+Right 170
+Key Released
+Right 150
+Key Pressed
+Right 170
+Key Released
+Right 150
+Key Pressed
+Escape 3000
+Key Released
+Escape 176
diff --git a/testcase/videoplayer_err.txt b/testcase/videoplayer_err.txt
new file mode 100644
index 0000000..ff096a6
--- /dev/null
+++ b/testcase/videoplayer_err.txt
@@ -0,0 +1,2 @@
+Command
+/usr/apps/org.tizen.video-player-tv-ref/bin/video-player-tv-ref
-- 
2.7.4


From fd51c9d36c134b2bc7769dcd7e667ef9b6521111 Mon Sep 17 00:00:00 2001
From: Minkyu Kang <mk7.kang@samsung.com>
Date: Fri, 24 Apr 2015 21:39:13 +0900
Subject: [PATCH 14/16] modify CBaseView related codes

Change-Id: I8a2d27b65245367d709b80cbf6a9e07422399fd1
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---
 include/view_player.h |  5 +----
 src/view_player.cpp   | 41 +++++++++++++++++------------------------
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/include/view_player.h b/include/view_player.h
index 7e790f5..faf70a3 100644
--- a/include/view_player.h
+++ b/include/view_player.h
@@ -39,7 +39,7 @@ private:
 
 private:
 	bool m_ControlInit(SPlayerParam *param);
-	bool m_UiInit(void);
+	bool m_UiInit(Evas_Object *base);
 	bool m_AddControls(void);
 	void m_UpdateInfoBar(void);
 	bool m_PlayerInit(void);
@@ -77,9 +77,6 @@ public:
 
 	virtual bool Create(void *data);
 	virtual void Destroy(void);
-
-	virtual Evas_Object *Base(void);
-
 };
 
 #endif
diff --git a/src/view_player.cpp b/src/view_player.cpp
index 6013ea7..2cd98b0 100644
--- a/src/view_player.cpp
+++ b/src/view_player.cpp
@@ -95,7 +95,7 @@ void CPlayerView::m_UpdateInfoBar(void)
 	/* Title */
 	name = m->mediadata->GetName();
 	if (name)
-		elm_object_part_text_set(m->base, PART_TITLETEXT, name);
+		elm_object_part_text_set(Base(), PART_TITLETEXT, name);
 
 	/* Created Time */
 	video_time = m->mediadata->GetTime();
@@ -107,7 +107,7 @@ void CPlayerView::m_UpdateInfoBar(void)
 		snprintf(buf, sizeof(buf), "%s", _(TEXT_NODATE));
 	}
 
-	elm_object_part_text_set(m->base, PART_DATETEXT, buf);
+	elm_object_part_text_set(Base(), PART_DATETEXT, buf);
 
 	/* Source */
 	/* FIXME: when usb path is decided, this logic should be changed */
@@ -116,12 +116,12 @@ void CPlayerView::m_UpdateInfoBar(void)
 		source = SOURCE_TV;
 	else
 		source = SOURCE_USB;
-	elm_object_part_text_set(m->base, PART_SOURCETEXT, _(source));
+	elm_object_part_text_set(Base(), PART_SOURCETEXT, _(source));
 
 	/* Playlist Count */
 	snprintf(buf, sizeof(buf), "%d/%d",
 			m->player->GetCurrent() + 1, m->player->GetTotal());
-	elm_object_part_text_set(m->base, PART_CURRENTTEXT, buf);
+	elm_object_part_text_set(Base(), PART_CURRENTTEXT, buf);
 
 	/* Resolution */
 	snprintf(buf, sizeof(buf), "%dx%d", m->mediadata->GetWidth(),
@@ -130,7 +130,7 @@ void CPlayerView::m_UpdateInfoBar(void)
 	m->duration = m->mediadata->GetDuration();
 	m->position = m->mediadata->GetPosition();
 
-	elm_object_part_text_set(m->base, PART_RESOLUTIONTEXT, buf);
+	elm_object_part_text_set(Base(), PART_RESOLUTIONTEXT, buf);
 }
 
 bool CPlayerView::m_PlayerInit(void)
@@ -356,7 +356,7 @@ void CPlayerView::m_ShowBar(void)
 	m->volume->Hide();
 
 	if (m->bar_hidden) {
-		elm_object_signal_emit(m->base, SIG_SHOW_VIEW, "");
+		elm_object_signal_emit(Base(), SIG_SHOW_VIEW, "");
 		m->bar_hidden = false;
 		m->slider->Resume();
 	}
@@ -364,7 +364,7 @@ void CPlayerView::m_ShowBar(void)
 
 void CPlayerView::m_HideBar(void)
 {
-	elm_object_signal_emit(m->base, SIG_HIDE_VIEW, "");
+	elm_object_signal_emit(Base(), SIG_HIDE_VIEW, "");
 	m->bar_hidden = true;
 
 	m->slider->Pause();
@@ -459,14 +459,14 @@ void CPlayerView::sm_CbEcoreEvent(void *dt, int type, void *ei)
 
 bool CPlayerView::m_AddControls(void)
 {
-	if (!m->control->Create(m->base, _control_name, CONTROL_BTNS))
+	if (!m->control->Create(Base(), _control_name, CONTROL_BTNS))
 		return false;
 
 	m->repeat = E_REPEAT_ALL;
 
 	m->control->AddHandler(sm_EvtControlBtn, m);
 
-	if (!m->slider->Create(m->base, m->player)) {
+	if (!m->slider->Create(Base(), m->player)) {
 		m->control->Destroy();
 		return false;
 	}
@@ -486,7 +486,7 @@ bool CPlayerView::m_AddControls(void)
 		return false;
 	}
 
-	eext_object_event_callback_add(m->base,
+	eext_object_event_callback_add(Base(),
 			EEXT_CALLBACK_BACK, sm_EvtBack, m);
 
 	return true;
@@ -547,10 +547,8 @@ bool CPlayerView::m_ControlInit(SPlayerParam *param)
 	return true;
 }
 
-bool CPlayerView::m_UiInit(void)
+bool CPlayerView::m_UiInit(Evas_Object *base)
 {
-	Evas_Object *base;
-
 	base = elm_layout_add(m->win);
 	if (!base) {
 		_ERR("failed to add layout");
@@ -587,6 +585,7 @@ bool CPlayerView::Create(void *data)
 	ASSERT(data);
 
 	Evas_Object *win;
+	Evas_Object *base;
 	SPlayerParam *param;
 	bool r;
 
@@ -616,7 +615,7 @@ bool CPlayerView::Create(void *data)
 		goto err;
 	}
 
-	r = m_UiInit();
+	r = m_UiInit(base);
 	if (!r) {
 		_ERR("failed to init UI");
 		goto err_control;
@@ -636,7 +635,7 @@ bool CPlayerView::Create(void *data)
 
 	m->player->SetCompletedCb(sm_CbPlayComplete, m);
 
-	elm_object_signal_callback_add(m->base, "show,view,finish", "",
+	elm_object_signal_callback_add(Base(), "show,view,finish", "",
 			sm_CbShowViewFinish, m);
 
 	m->drawanim_timer = ecore_timer_add(0.8, sm_CbDrawAnimation, m);
@@ -645,7 +644,7 @@ bool CPlayerView::Create(void *data)
 		goto err;
 	}
 
-	CBaseView::Create(NULL);
+	CBaseView::Create(NULL, base);
 
 	return true;
 
@@ -683,6 +682,7 @@ void CPlayerView::Destroy(void)
 {
 	ASSERT(m);
 
+	Disconnect(Base());
 	CBaseView::Destroy();
 
 	m->player->Destroy();
@@ -693,18 +693,11 @@ void CPlayerView::Destroy(void)
 	m_Fini();
 }
 
-Evas_Object *CPlayerView::Base(void)
-{
-	ASSERT(m);
-
-	return m->base;
-}
-
 void CPlayerView::t_OnShow(void)
 {
 	ASSERT(m);
 
-	evas_object_show(m->base);
+	evas_object_show(Base());
 }
 
 void CPlayerView::t_OnPause(void)
-- 
2.7.4


From aa3fa91382e557f427ce8afcf0517c3f96a4226d Mon Sep 17 00:00:00 2001
From: Minkyu Kang <mk7.kang@samsung.com>
Date: Mon, 27 Apr 2015 20:50:19 +0900
Subject: [PATCH 15/16] remove i18n header file

Change-Id: I153f1b0276a30de15e18de7ea76812aa9eac045a
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---
 include/i18n.h                               | 37 ----------------------------
 packaging/org.tizen.video-player-tv-ref.spec |  1 -
 src/control.cpp                              |  1 -
 src/main.cpp                                 |  1 -
 src/view_player.cpp                          |  7 +++---
 5 files changed, 3 insertions(+), 44 deletions(-)
 delete mode 100644 include/i18n.h

diff --git a/include/i18n.h b/include/i18n.h
deleted file mode 100644
index 86e15ae..0000000
--- a/include/i18n.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2013 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __I18N_H__
-#define __I18N_H__
-
-#include <libintl.h>
-
-#define i18n_init() bindtextdomain(DOMAIN_NAME, LOCALEDIR)
-
-#ifdef _
-#undef _
-#endif
-
-#define _(s) dgettext(DOMAIN_NAME, s)
-#define dgettext_noop(s) (s)
-
-#ifdef N_
-#undef N_
-#endif
-
-#define N_(s) dgettext_noop(s)
-
-#endif /* __I18N_H__ */
diff --git a/packaging/org.tizen.video-player-tv-ref.spec b/packaging/org.tizen.video-player-tv-ref.spec
index 9a85847..d3406b0 100644
--- a/packaging/org.tizen.video-player-tv-ref.spec
+++ b/packaging/org.tizen.video-player-tv-ref.spec
@@ -18,7 +18,6 @@ BuildRequires: pkgconfig(capi-media-sound-manager)
 BuildRequires: pkgconfig(capi-content-media-content)
 BuildRequires: pkgconfig(mm-player)
 BuildRequires: pkgconfig(application-common)
-BuildRequires: gettext-devel
 BuildRequires: edje-bin
 
 %define _appdir /usr/apps/%{name}
diff --git a/src/control.cpp b/src/control.cpp
index 3d95c98..f528335 100644
--- a/src/control.cpp
+++ b/src/control.cpp
@@ -16,7 +16,6 @@
 
 #include <AppCommon.h>
 #include "define.h"
-#include "i18n.h"
 #include "control.h"
 
 #define MAX_CONTROL_BTNS 6
diff --git a/src/main.cpp b/src/main.cpp
index b745ade..f205069 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,7 +17,6 @@
 #include <AppCommon.h>
 #include "define.h"
 #include "view_player.h"
-#include "i18n.h"
 
 #define WIN_TITLE "Video Player"
 #define PARAM_URI "uri"
diff --git a/src/view_player.cpp b/src/view_player.cpp
index 2cd98b0..e059956 100644
--- a/src/view_player.cpp
+++ b/src/view_player.cpp
@@ -17,7 +17,6 @@
 #include <efl_extension.h>
 #include <AppCommon.h>
 #include "define.h"
-#include "i18n.h"
 #include "playermgr.h"
 #include "timeout_handler.h"
 #include "mediadata.h"
@@ -28,12 +27,12 @@
 
 #define BTN_ID "BTN_ID"
 
-#define TEXT_NODATE N_("----.--.--")
+#define TEXT_NODATE "----.--.--"
 
 #define SOURCE_PATH_LEN 6
 #define SOURCE_TV_PATH "/home/"
-#define SOURCE_TV N_("TV")
-#define SOURCE_USB N_("USB")
+#define SOURCE_TV "TV"
+#define SOURCE_USB "USB"
 
 #define CONTROL_BTNS 6
 
-- 
2.7.4


From 76736b8ec1b29d344cfe5402d0f6b3b005db5083 Mon Sep 17 00:00:00 2001
From: Minkyu Kang <mk7.kang@samsung.com>
Date: Mon, 27 Apr 2015 20:54:02 +0900
Subject: [PATCH 16/16] remove compiler warning

warning: 'base' may be used uninitialized in this function [-Wmaybe-uninitialized]

Change-Id: I8b4fa93b93130f7cce015ab34ff2ffdfe8c7f418
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---
 src/view_player.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/view_player.cpp b/src/view_player.cpp
index e059956..25e48ff 100644
--- a/src/view_player.cpp
+++ b/src/view_player.cpp
@@ -614,6 +614,7 @@ bool CPlayerView::Create(void *data)
 		goto err;
 	}
 
+	base = NULL;
 	r = m_UiInit(base);
 	if (!r) {
 		_ERR("failed to init UI");
-- 
2.7.4