aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/modules/emotion/xine/emotion_xine.c16
-rw-r--r--src/modules/emotion/xine/emotion_xine.h22
2 files changed, 37 insertions, 1 deletions
diff --git a/src/modules/emotion/xine/emotion_xine.c b/src/modules/emotion/xine/emotion_xine.c
index 2cc2eac5c..1ea745dc9 100644
--- a/src/modules/emotion/xine/emotion_xine.c
+++ b/src/modules/emotion/xine/emotion_xine.c
@@ -908,6 +908,20 @@ em_video_channel_get(void *ef)
return xine_get_param(ev->stream, XINE_PARAM_VIDEO_CHANNEL);
}
+static void
+em_video_subtitle_file_set(void *video EINA_UNUSED,
+ const char *filepath EINA_UNUSED)
+{
+ DBG("video_subtitle_file_set not implemented for xine yet.");
+}
+
+static const char *
+em_video_subtitle_file_get(void *video EINA_UNUSED)
+{
+ DBG("video_subtitle_file_get not implemented for xine yet.");
+ return NULL;
+}
+
static const char *
em_video_channel_name_get(void *ef EINA_UNUSED, int channel EINA_UNUSED)
{
@@ -1554,6 +1568,8 @@ static Emotion_Video_Module em_module =
em_video_channel_count, /* video_channel_count */
em_video_channel_set, /* video_channel_set */
em_video_channel_get, /* video_channel_get */
+ em_video_subtitle_file_set, /* video_subtitle_file_set */
+ em_video_subtitle_file_get, /* video_subtitle_file_get */
em_video_channel_name_get, /* video_channel_name_get */
em_video_channel_mute_set, /* video_channel_mute_set */
em_video_channel_mute_get, /* video_channel_mute_get */
diff --git a/src/modules/emotion/xine/emotion_xine.h b/src/modules/emotion/xine/emotion_xine.h
index c1cae2e5a..129256e30 100644
--- a/src/modules/emotion/xine/emotion_xine.h
+++ b/src/modules/emotion/xine/emotion_xine.h
@@ -88,11 +88,31 @@ struct _Emotion_Xine_Event
int mtype;
};
-extern int _emotion_xine_log_domain;
+#ifdef DBG
+#undef DBG
+#endif
#define DBG(...) EINA_LOG_DOM_DBG(_emotion_xine_log_domain, __VA_ARGS__)
+
+#ifdef INF
+#undef INF
+#endif
#define INF(...) EINA_LOG_DOM_INFO(_emotion_xine_log_domain, __VA_ARGS__)
+
+#ifdef WRN
+#undef WRN
+#endif
#define WRN(...) EINA_LOG_DOM_WARN(_emotion_xine_log_domain, __VA_ARGS__)
+
+#ifdef ERR
+#undef ERR
+#endif
#define ERR(...) EINA_LOG_DOM_ERR(_emotion_xine_log_domain, __VA_ARGS__)
+
+#ifdef CRITICAL
+#undef CRITICAL
+#endif
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_emotion_xine_log_domain, __VA_ARGS__)
+extern int _emotion_xine_log_domain;
+
#endif