This commit was manufactured by cvs2svn to create branch 'unlabeled-1.4.2'.

1 files changed, 0 insertions, 265 deletions

diff --git a/xine_frontend_lirc.c b/xine_frontend_lirc.c
deleted file mode 100644
index a9c4e251..00000000
--- a/xine_frontend_lirc.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * xine_frontend_lirc.c: Forward (local) lirc keys to VDR (server)
- *
- * See the main source file 'xineliboutput.c' for copyright information and
- * how to reach the author.
- *
- * $Id: xine_frontend_lirc.c,v 1.10 2008-02-05 00:56:43 phintuka Exp $
- *
- */
-/*
- *
- * Almost directly copied from vdr-1.4.3-2 (lirc.c : cLircRemote) 
- *
- */
-/*
- * lirc.c: LIRC remote control
- *
- * See the main source file 'vdr.c' for copyright information and
- * how to reach the author.
- *
- * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
- *
- * $Id: xine_frontend_lirc.c,v 1.10 2008-02-05 00:56:43 phintuka Exp $
- */
-
-
-#include <stdint.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-
-#define REPEATDELAY     350 /* ms */
-#define REPEATFREQ      100 /* ms */
-#define REPEATTIMEOUT   500 /* ms */
-#define RECONNECTDELAY 3000 /* ms */
-
-#define LIRC_KEY_BUF      30
-#define LIRC_BUFFER_SIZE 128 
-#define MIN_LIRCD_CMD_LEN  5
-
-/* static data */
-static pthread_t lirc_thread;
-static volatile char *lirc_device_name = NULL;
-static volatile int fd_lirc = -1;
-static int lirc_repeat_emu = 0;
-
-#ifndef IS_FBFE
-static void sxfe_toggle_fullscreen(sxfe_t *this);
-#endif
-
-static uint64_t time_ms()
-{
-  struct timeval t;
-  if (gettimeofday(&t, NULL) == 0)
-     return ((uint64_t)t.tv_sec) * 1000ULL + t.tv_usec / 1000ULL;
-  return 0;
-}
-
-static uint64_t elapsed(uint64_t t)
-{
-  return time_ms() - t;
-}
-
-static void lircd_connect(void)
-{
-  struct sockaddr_un addr;
-
-  if(fd_lirc >= 0) {
-    close(fd_lirc);
-    fd_lirc = -1;
-  }
-
-  if(!lirc_device_name) {
-    LOGDBG("no lirc device given");
-    return;
-  }
-
-  addr.sun_family = AF_UNIX;
-  strn0cpy(addr.sun_path, (char*)lirc_device_name, sizeof(addr.sun_path));
-
-  if ((fd_lirc = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
-    LOGERR("lirc error: socket() < 0");
-    return;
-  }
-
-  if (connect(fd_lirc, (struct sockaddr *)&addr, sizeof(addr))) {
-    LOGERR("lirc error: connect(%s) < 0", lirc_device_name);
-    close(fd_lirc);
-    fd_lirc = -1;
-    return;
-  }
-}
-
-static void *lirc_receiver_thread(void *fe)
-{
-  int timeout = -1;
-  uint64_t FirstTime = time_ms();
-  uint64_t LastTime = time_ms();
-  char buf[LIRC_BUFFER_SIZE];
-  char LastKeyName[LIRC_KEY_BUF] = "";
-  int repeat = 0;
-
-  LOGMSG("lirc forwarding started");
-
-  nice(-1);
-  lircd_connect();
-
-  while(lirc_device_name && fd_lirc >= 0) {
-    fd_set set;
-    int ready, ret = -1;
-    FD_ZERO(&set);
-    FD_SET(fd_lirc, &set);
-
-    if (timeout >= 0) {
-      struct timeval tv;
-      tv.tv_sec  = timeout / 1000;
-      tv.tv_usec = (timeout % 1000) * 1000;
-      ready = select(FD_SETSIZE, &set, NULL, NULL, &tv) > 0 && FD_ISSET(fd_lirc, &set);
-    } else {
-      ready = select(FD_SETSIZE, &set, NULL, NULL, NULL) > 0 && FD_ISSET(fd_lirc, &set);
-    }
-
-    if(ready < 0) {
-      LOGMSG("LIRC connection lost ?");
-      break;
-    }
-    
-    if(ready) {
-
-      do { 
-	errno = 0;
-	ret = read(fd_lirc, buf, sizeof(buf));
-      } while(ret < 0 && errno == EINTR);
-
-      if (ret <= 0 ) {
-	/* try reconnecting */
-	LOGERR("LIRC connection lost");
-	lircd_connect();
-	while(lirc_device_name && fd_lirc < 0) {
-	  sleep(RECONNECTDELAY/1000);
-	  lircd_connect();
-	}
-	if(fd_lirc >= 0)
-	  LOGMSG("LIRC reconnected");
-	continue;
-      }
-
-      if (ret >= MIN_LIRCD_CMD_LEN) {
-        unsigned int count;
-	char KeyName[LIRC_KEY_BUF];
-	LOGDBG("LIRC: %s", buf);
-
-	if (sscanf(buf, "%*x %x %29s", &count, KeyName) != 2) { 
-	  /* '29' in '%29s' is LIRC_KEY_BUF-1! */
-	  LOGMSG("unparseable lirc command: %s", buf);
-	  continue;
-	}
-
-	if(lirc_repeat_emu)
-          if (strcmp(KeyName, LastKeyName) == 0 && elapsed(LastTime) < REPEATDELAY)
-	    count = repeat + 1;
-
-        if (count == 0) {
-          if (strcmp(KeyName, LastKeyName) == 0 && elapsed(FirstTime) < REPEATDELAY) 
-	    continue; /* skip keys coming in too fast */
-	  if (repeat) {
-	    alarm(3);
-	    if(find_input((fe_t*)fe))
-	      process_xine_keypress(((fe_t*)fe)->input, "LIRC", LastKeyName, 0, 1);
-	    alarm(0);
-	  }
-
-	  strcpy(LastKeyName, KeyName);
-	  repeat = 0;
-	  FirstTime = time_ms();
-	  timeout = -1;
-	}
-	else {
-	  if (elapsed(LastTime) < REPEATFREQ)
-	    continue; /* repeat function kicks in after a short delay */
-
-	  if (elapsed(FirstTime) < REPEATDELAY) {
-	    if(lirc_repeat_emu)
-	      LastTime = time_ms();
-	    continue; /* skip keys coming in too fast */
-	  }
-	  repeat = 1;
-	  timeout = REPEATDELAY;
-	}
-	LastTime = time_ms();
-
-#if defined(XINELIBOUTPUT_FE_TOGGLE_FULLSCREEN) || defined(INTERPRET_LIRC_KEYS)
-        if(!strcmp(KeyName, "Quit")) {
-          terminate_key_pressed = 1;
-          break;
-# ifndef IS_FBFE
-        } else if(!strcmp(KeyName, "Fullscreen")) {
-          if(!repeat)
-            sxfe_toggle_fullscreen((sxfe_t*)fe);
-# endif
-        } else if(!strcmp(KeyName, "Deinterlace")) {
-          fe_t *this = (fe_t*)fe;
-          xine_set_param(this->stream, XINE_PARAM_VO_DEINTERLACE, 
-                         xine_get_param(this->stream, XINE_PARAM_VO_DEINTERLACE) ? 0 : 1);
-        } else 
-#endif
-	  {
-	    alarm(3);
-	    if(find_input((fe_t*)fe))
-	      process_xine_keypress(((fe_t*)fe)->input, "LIRC", KeyName, repeat, 0);
-	    alarm(0);
-	  }
-
-      }
-      else if (repeat) { /* the last one was a repeat, so let's generate a release */
-	if (elapsed(LastTime) >= REPEATTIMEOUT) {
-	  alarm(3);
-	  if(find_input((fe_t*)fe))
-	    process_xine_keypress(((fe_t*)fe)->input, "LIRC", LastKeyName, 0, 1);
-	  alarm(0);
-	  repeat = 0;
-	  *LastKeyName = 0;
-	  timeout = -1;
-	}
-      }
-
-    }
-  }
-
-
-  if(fd_lirc >= 0)
-    close(fd_lirc);
-  fd_lirc = -1;
-  pthread_exit(NULL);
-  return NULL; /* never reached */
-}
-
-void lirc_start(fe_t *fe, char *lirc_dev, int repeat_emu)
-{
-  if(lirc_dev) {
-    int err;
-    lirc_device_name = lirc_dev;
-    lirc_repeat_emu = repeat_emu;
-    if ((err = pthread_create (&lirc_thread,
-			       NULL, lirc_receiver_thread, 
-			       (void*)fe)) != 0) {
-      fprintf(stderr, "can't create new thread for lirc (%s)\n", 
-	      strerror(err));
-    }
-  }
-}
-
-void lirc_stop(void)
-{
-  if(lirc_device_name) {
-    void *p;
-    /*free(lirc_device_name);*/    
-    lirc_device_name = NULL;
-    if(fd_lirc >= 0)
-      close(fd_lirc);
-    fd_lirc = -1;
-    pthread_cancel (lirc_thread);
-    pthread_join (lirc_thread, &p);
-  }
-}