summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinkyu Kang <mk7.kang@samsung.com>2015-09-14 21:15:24 +0900
committerMinkyu Kang <mk7.kang@samsung.com>2015-09-14 21:15:24 +0900
commitb26cf1eb1033cd6282f453d468223eace7ed4db6 (patch)
treeb9adbc2a9ebf3369e76dcf5ac5c7fd3afbc76092
parent9b250fabf4960e8cc9e12259f206f5d8cf4c3828 (diff)
downloadair_mediahub-b26cf1eb1033cd6282f453d468223eace7ed4db6.tar.gz
air_mediahub-b26cf1eb1033cd6282f453d468223eace7ed4db6.tar.bz2
air_mediahub-b26cf1eb1033cd6282f453d468223eace7ed4db6.zip
util: move _check_movie_type function to util.c
Change-Id: Idbfa28da016c2d5fd58fe02d88bdf7a9e070dedd Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
-rw-r--r--include/util/util.h1
-rw-r--r--src/util/util.c11
-rw-r--r--src/view/action_menu.c9
-rw-r--r--src/view/base.c11
-rw-r--r--src/view/viewer.c12
5 files changed, 16 insertions, 28 deletions
diff --git a/include/util/util.h b/include/util/util.h
index a9ece63..0c88343 100644
--- a/include/util/util.h
+++ b/include/util/util.h
@@ -20,6 +20,7 @@
#include <media_content.h>
#include <app_media.h>
+bool util_check_movie_type(const char *str);
void util_set_alpha_color(Evas_Object *obj, int alpha);
Evas_Object *util_add_button(Evas_Object *base, const char *style,
const char *text);
diff --git a/src/util/util.c b/src/util/util.c
index adac378..ce91360 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -22,6 +22,17 @@
#include "define.h"
#include "util/util.h"
+#define VIDEO_COPYRIGHT "Unknown"
+
+/*
+ * NOTE: Workaround
+ * we assumed that if video content have the copyright then it's a movie.
+ */
+bool util_check_movie_type(const char *str)
+{
+ return strcmp(str, VIDEO_COPYRIGHT);
+}
+
void util_set_alpha_color(Evas_Object *obj, int alpha)
{
int r, g, b, a;
diff --git a/src/view/action_menu.c b/src/view/action_menu.c
index 6925459..5453001 100644
--- a/src/view/action_menu.c
+++ b/src/view/action_menu.c
@@ -29,8 +29,6 @@
#define TEXT_LIVETV "Live TV"
#define TEXT_FAVORITE "Favorite"
-#define VIDEO_COPYRIGHT "Unknown"
-
#define NUM_MENU_BTN 4
#define MAX_BTN_COL 4
@@ -498,11 +496,6 @@ Elm_Gengrid_Item_Class *_get_grid_item_class(int type)
return ic;
}
-static bool _check_movie_type(app_media_info *info)
-{
- return strcmp(info->video->copyright, VIDEO_COPYRIGHT);
-}
-
static int _get_content_type(app_media_info *info)
{
int type;
@@ -513,7 +506,7 @@ static int _get_content_type(app_media_info *info)
type = E_CONTENT_GALLERY;
break;
case MEDIA_CONTENT_TYPE_VIDEO:
- if (_check_movie_type(info))
+ if (util_check_movie_type(info->video->copyright))
type = E_CONTENT_MOVIE;
else
type = E_CONTENT_GALLERY;
diff --git a/src/view/base.c b/src/view/base.c
index 0a0ecf7..9456277 100644
--- a/src/view/base.c
+++ b/src/view/base.c
@@ -36,8 +36,6 @@
#define TEXT_FAVORITE_ADDED "Added to your favorite."
#define TEXT_FAVORITE_REMOVED "Removed from your favorite."
-#define VIDEO_COPYRIGHT "Unknown"
-
#define BOX_PADDING_SIZE 80
#define TIME_TOAST_FAVORITE 5.0
@@ -300,11 +298,6 @@ static input_handler handler = {
.focused = _focused_cb
};
-static bool _check_movie_type(app_media_info *info)
-{
- return strcmp(info->video->copyright, VIDEO_COPYRIGHT);
-}
-
static app_media *_get_app_media(const char *id)
{
media_info_h media;
@@ -336,7 +329,7 @@ static int _get_content_type(app_media_info *info)
type = CONTENTS_GALLERY;
break;
case MEDIA_CONTENT_TYPE_VIDEO:
- if (_check_movie_type(info))
+ if (util_check_movie_type(info->video->copyright))
type = CONTENTS_MOVIE;
else
type = CONTENTS_GALLERY;
@@ -490,7 +483,7 @@ static int _get_layout_type(app_media_info *info)
type = E_LAYOUT_GALLERY;
break;
case MEDIA_CONTENT_TYPE_VIDEO:
- if (_check_movie_type(info))
+ if (util_check_movie_type(info->video->copyright))
type = E_LAYOUT_MOVIE;
else
type = E_LAYOUT_GALLERY;
diff --git a/src/view/viewer.c b/src/view/viewer.c
index 3c460bd..6719ace 100644
--- a/src/view/viewer.c
+++ b/src/view/viewer.c
@@ -41,7 +41,6 @@
#define VIEWER_TIMEOUT 3.0
#define VIEWER_SEPARATOR "/ "
#define SLIDE_SHOW_INTERVAL 3.0
-#define VIDEO_COPYRIGHT "Unknown"
#define BTN_LOC_NONE -1
#define BTN_LOC_PREV 0
@@ -191,15 +190,6 @@ static struct _viewer_info viewer_info[] = {
},
};
-/*
- * NOTE: Workaround
- * we assumed that if video content have the copyright then it's a movie.
- */
-static inline bool _check_movie_type(app_media_info *mi)
-{
- return strcmp(mi->video->copyright, VIDEO_COPYRIGHT);
-}
-
static void _set_bg_color(struct _priv *priv, int r, int g, int b, int a)
{
Evas_Object *bg;
@@ -548,7 +538,7 @@ static bool _viewer_show(struct _priv *priv)
id = VIEWER_PHOTO;
break;
case MEDIA_CONTENT_TYPE_VIDEO:
- if (_check_movie_type(mi))
+ if (util_check_movie_type(mi->video->copyright))
id = VIEWER_MOVIE;
else
id = VIEWER_VIDEO;