diff options
author | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2013-01-11 03:07:58 +0000 |
---|---|---|
committer | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2013-01-11 03:07:58 +0000 |
commit | fc82f2f978ee765dcd67d77ff55a9077b9211286 (patch) | |
tree | 8468550382229032ef5eb04f8851e6c26133561f /src | |
parent | 5c3d1f1f6be28079a7c693f6feb52881b2597501 (diff) | |
download | emotion_generic_players-fc82f2f978ee765dcd67d77ff55a9077b9211286.tar.gz |
add emotion_generic_players project.
This is similar to evas_generic_loaders. It contains VLC player
engine.
SVN revision: 82603
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 8 | ||||
-rw-r--r-- | src/vlc/Makefile.am | 18 | ||||
-rw-r--r-- | src/vlc/emotion_generic_vlc.c | 14 |
3 files changed, 7 insertions, 33 deletions
diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index bbdd8c3..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ - -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = - -if EMOTION_BUILD_GENERIC_VLC -SUBDIRS += vlc -endif diff --git a/src/vlc/Makefile.am b/src/vlc/Makefile.am deleted file mode 100644 index 5cda1b9..0000000 --- a/src/vlc/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -AM_CPPFLAGS = \ --I$(top_srcdir) \ --I$(top_srcdir)/src/lib \ --I$(top_srcdir)/src/modules \ --I$(top_srcdir)/src/modules/generic \ --DPACKAGE_BIN_DIR=\"$(bindir)\" \ --DPACKAGE_LIB_DIR=\"$(libdir)\" \ --DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -@GENERIC_VLC_CFLAGS@ - -internal_bindir = $(libdir)/emotion/utils -internal_bin_PROGRAMS = em_generic_vlc - -em_generic_vlc_SOURCES = emotion_generic_vlc.c -em_generic_vlc_DEPENDENCIES = $(top_srcdir)/src/modules/generic/Emotion_Generic_Plugin.h -em_generic_vlc_LDADD = @GENERIC_VLC_LIBS@ @EFL_SHM_OPEN_LIBS@ -lpthread diff --git a/src/vlc/emotion_generic_vlc.c b/src/vlc/emotion_generic_vlc.c index a207173..2bf441e 100644 --- a/src/vlc/emotion_generic_vlc.c +++ b/src/vlc/emotion_generic_vlc.c @@ -181,7 +181,7 @@ _send_cmd_start(struct _App *app, int cmd) } static void -_send_cmd_finish(struct _App *app __UNUSED__) +_send_cmd_finish(struct _App *app EINA_UNUSED) { pthread_mutex_unlock(&_mutex_fd); } @@ -263,12 +263,12 @@ _lock(void *data, void **pixels) } static void -_unlock(void *data __UNUSED__, void *id __UNUSED__, void *const *pixels __UNUSED__) +_unlock(void *data EINA_UNUSED, void *id EINA_UNUSED, void *const *pixels EINA_UNUSED) { } static void -_display(void *data, void *id __UNUSED__) +_display(void *data, void *id EINA_UNUSED) { struct _App *app = data; if (!app->playing) @@ -292,12 +292,12 @@ _tmp_lock(void *data, void **pixels) } static void -_tmp_unlock(void *data __UNUSED__, void *id __UNUSED__, void *const *pixels __UNUSED__) +_tmp_unlock(void *data EINA_UNUSED, void *id EINA_UNUSED, void *const *pixels EINA_UNUSED) { } static void -_tmp_display(void *data __UNUSED__, void *id __UNUSED__) +_tmp_display(void *data EINA_UNUSED, void *id EINA_UNUSED) { } @@ -889,12 +889,12 @@ main(int argc, const char *argv[]) if (fds[0].revents & (POLLERR | POLLHUP | POLLNVAL)) { - ERR("error communicating with stdin", stderr); + ERR("error communicating with stdin"); break; } if (fds[1].revents & (POLLERR | POLLHUP | POLLNVAL)) { - ERR("error communicating with thread", stderr); + ERR("error communicating with thread"); break; } |