summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjinwoo.shin <jw0227.shin@samsung.com>2015-07-21 15:16:30 +0900
committerjinwoo.shin <jw0227.shin@samsung.com>2015-07-21 15:20:44 +0900
commit0398000574135780958f3253e093ca0fca15bf77 (patch)
tree4bb8d37ae574f4d0f0012ca52e5889523727b40a
parenta1547986f5ff3a92fe4323f0e818f66abefc1907 (diff)
downloadair_livetv-0398000574135780958f3253e093ca0fca15bf77.tar.gz
air_livetv-0398000574135780958f3253e093ca0fca15bf77.tar.bz2
air_livetv-0398000574135780958f3253e093ca0fca15bf77.zip
Add tv service integration
Change-Id: I2f70eb50a47195ad4bd1ef8c98130757634e9b9e Signed-off-by: jinwoo.shin <jw0227.shin@samsung.com>
-rw-r--r--CMakeLists.txt7
-rw-r--r--packaging/org.tizen.live-tv.spec2
-rw-r--r--src/main.c40
3 files changed, 6 insertions, 43 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34340b1..de9e819 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,8 +45,7 @@ SET(SRCS src/main.c
src/layout_channelinfo_search.c
src/view_channelnumber.c
src/view_error.c
- src/util.c
- src/tv_service.c)
+ src/util.c)
SET(TARGET_EDJ "${PROJECT_NAME}.edj")
SET(THEME_EDJ "${PROJECT_NAME}-theme.edj")
@@ -67,7 +66,9 @@ pkg_check_modules(PKGS REQUIRED
capi-appfw-application
app-utils
vconf
- gobject-2.0)
+ glib-2.0
+ gobject-2.0
+ tv-service)
FOREACH(flag ${PKGS_CFLAGS})
SET(EXTRA_CFLGAS "${EXTRA_CFLGAS} ${flag}")
diff --git a/packaging/org.tizen.live-tv.spec b/packaging/org.tizen.live-tv.spec
index 4b27b9c..3d06fc2 100644
--- a/packaging/org.tizen.live-tv.spec
+++ b/packaging/org.tizen.live-tv.spec
@@ -13,7 +13,9 @@ BuildRequires: pkgconfig(ecore)
BuildRequires: pkgconfig(edje)
BuildRequires: pkgconfig(app-utils)
BuildRequires: pkgconfig(vconf)
+BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-2.0)
+BuildRequires: pkgconfig(tv-service)
BuildRequires: gettext-devel
BuildRequires: edje-bin
diff --git a/src/main.c b/src/main.c
index 6a846b1..8d82c86 100644
--- a/src/main.c
+++ b/src/main.c
@@ -129,36 +129,9 @@ static Evas_Object *_add_win(const char *name)
evas_object_show(win);
- trans = evas_object_rectangle_add(evas_object_evas_get(win));
- if (!trans) {
- _ERR("Create transparent layer failed");
- evas_object_del(win);
- return NULL;
- }
-
- /* for transparent layer */
- evas_object_color_set(trans, 0, 0, 0, 0);
- evas_object_render_op_set(trans, EVAS_RENDER_COPY);
- elm_win_resize_object_add(win, trans);
- evas_object_size_hint_weight_set(trans,
- EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(trans);
-
return win;
}
-int _set_tv_overlay(Evas_Object *win)
-{
- int r;
- Ecore_Wl_Window *wl_win;
-
- wl_win = elm_win_wl_window_get(win);
-
- r = tv_overlay_set(wl_win);
-
- return r;
-}
-
static void _tv_signal_cb(void *data, int is_signal)
{
struct _appdata *ad;
@@ -203,12 +176,6 @@ static void _resume(void *data)
return;
}
}
-
- r = _set_tv_overlay(ad->win);
- if (r < 0) {
- _ERR("Set overlay failed");
- return;
- }
}
static bool _create(void *data)
@@ -249,13 +216,6 @@ static bool _create(void *data)
return false;
}
- r = _set_tv_overlay(ad->win);
- if (r < 0) {
- _ERR("Set overlay failed");
- evas_object_del(win);
- return false;
- }
-
ad->win = win;
tv_signal_cb_set(_tv_signal_cb, ad);