diff options
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | xine_frontend_lirc.c | 7 | ||||
| -rw-r--r-- | xine_frontend_main.c | 5 |
3 files changed, 17 insertions, 9 deletions
@@ -4,7 +4,7 @@ # See the main source file 'xineliboutput.c' for copyright information and # how to reach the author. # -# $Id: Makefile,v 1.53 2008-11-04 14:05:46 phintuka Exp $ +# $Id: Makefile,v 1.54 2008-11-11 00:02:33 phintuka Exp $ # # The official name of this plugin. @@ -241,7 +241,8 @@ endif ifeq ($(XINELIBOUTPUT_X11), yes) OBJS_SXFE_SO = xine_sxfe_frontend.o xine/post.o - OBJS_SXFE = xine_sxfe_frontend_standalone.o xine/post.o tools/vdrdiscovery.o logdefs.o + OBJS_SXFE = xine_sxfe_frontend_standalone.o xine/post.o tools/vdrdiscovery.o logdefs.o \ + xine_frontend_lirc.o else OBJS_SXFE_SO = OBJS_SXFE = @@ -249,7 +250,8 @@ endif ifeq ($(XINELIBOUTPUT_FB), yes) OBJS_FBFE_SO = xine_fbfe_frontend.o xine/post.o - OBJS_FBFE = xine_fbfe_frontend_standalone.o xine/post.o tools/vdrdiscovery.o logdefs.o + OBJS_FBFE = xine_fbfe_frontend_standalone.o xine/post.o tools/vdrdiscovery.o logdefs.o \ + xine_frontend_lirc.o else OBJS_FBFE_SO = OBJS_FBFE = @@ -305,6 +307,8 @@ xine_post_audiochannel.o: xine_post_audiochannel.c logdefs.o: logdefs.c logdefs.h $(CC) $(CFLAGS) -c $(DEFINES) $(INCLUDES) $(OPTFLAGS) -o $@ $< +xine_frontend_lirc.o: xine_frontend_lirc.c xine_frontend_lirc.h + $(CC) $(CFLAGS) -c $(DEFINES) $(INCLUDES) $(OPTFLAGS) -o $@ $< xine/post.o: xine/post.c xine/post.h $(CC) $(CFLAGS) -c $(DEFINES) $(INCLUDES) $(OPTFLAGS) -o $@ $< tools/vdrdiscovery.o: tools/vdrdiscovery.c tools/vdrdiscovery.h @@ -317,12 +321,12 @@ xine_fbfe_frontend.o: xine_fbfe_frontend.c xine_sxfe_frontend_standalone.o: xine_sxfe_frontend.c xine_frontend.c \ xine_frontend.h xine_input_vdr.h xine_osd_command.h \ - xine/post.h logdefs.h xine_frontend_main.c xine_frontend_lirc.c \ + xine/post.h logdefs.h xine_frontend_main.c xine_frontend_lirc.h \ xineliboutput.c tools/vdrdiscovery.h $(CC) $(CFLAGS) -c $(DEFINES) -DFE_STANDALONE $(INCLUDES) $(OPTFLAGS) xine_sxfe_frontend.c -o $@ xine_fbfe_frontend_standalone.o: xine_fbfe_frontend.c xine_frontend.c \ xine_frontend.h xine_input_vdr.h xine_osd_command.h \ - xine/post.h logdefs.h xine_frontend_main.c xine_frontend_lirc.c \ + xine/post.h logdefs.h xine_frontend_main.c xine_frontend_lirc.h \ xineliboutput.c tools/vdrdiscovery.h $(CC) $(CFLAGS) -c $(DEFINES) -DFE_STANDALONE $(INCLUDES) $(OPTFLAGS) xine_fbfe_frontend.c -o $@ diff --git a/xine_frontend_lirc.c b/xine_frontend_lirc.c index aec56894..21e7b090 100644 --- a/xine_frontend_lirc.c +++ b/xine_frontend_lirc.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_frontend_lirc.c,v 1.14 2008-11-10 23:50:10 phintuka Exp $ + * $Id: xine_frontend_lirc.c,v 1.15 2008-11-11 00:02:33 phintuka Exp $ * */ /* @@ -32,6 +32,11 @@ #include <sys/socket.h> #include <sys/un.h> +#define LOG_MODULENAME "[lirc] " +#include "logdefs.h" + +#include "xine_frontend_internal.h" + #define REPEATDELAY 350 /* ms */ #define REPEATFREQ 100 /* ms */ #define REPEATTIMEOUT 500 /* ms */ diff --git a/xine_frontend_main.c b/xine_frontend_main.c index b9b1b44b..8560991c 100644 --- a/xine_frontend_main.c +++ b/xine_frontend_main.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_frontend_main.c,v 1.53 2008-11-10 21:33:42 phintuka Exp $ + * $Id: xine_frontend_main.c,v 1.54 2008-11-11 00:02:33 phintuka Exp $ * */ @@ -22,6 +22,7 @@ #include <signal.h> #include "tools/vdrdiscovery.h" +#include "xine_frontend_lirc.h" /* next symbol is dynamically linked from input plugin */ int SysLogLevel __attribute__((visibility("default"))) = 2; /* errors and info, no debug */ @@ -62,8 +63,6 @@ pthread_t kbd_thread; struct termios tm, saved_tm; volatile int terminate_key_pressed = 0; -/* include LIRC forwarding code */ -#include "xine_frontend_lirc.c" static int read_key(void) { |