mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
0686038af3
- Fixed detecting broken connection to the LIRC daemon (thanks to Ludwig Nussel). - Now sending CA descriptors to the CAM in the same sequence as they were originally received (thanks to Stefan Huelswitt). - The PCR PID can now be set separately from the video PID. The syntax in the 'channels.conf' file is, for example, ...:164+17:..., where 164 is the video PID and 17 is the PCR PID. The separator is a '+' sign, not a comma or semicolon as with the audio PIDs, because this is not an alternate PID, but rather an additional, necessary PID. In order to use this feature you need a driver version dated 2003-04-27 or higher (setting the PCR PID didn't work in earlier versions). - Fixed deleting the last recording in the "Recordings" menu, which started pausing live video (thanks to Christoph Friederich for reporting this one). - Now setting the "broken link" flag for GOPs at the beginning of a new video sequence, which avoids artefacts when cutting (thanks to Stefan Huelswitt). - Removed the Mute() call from cDvbDevice::StillPicture() (suggested by Andreas Schultz). - Updated 'channels.conf.terr' for Berlin (thanks to Andreas Brachold). - Extended logging info when starting/stopping timers to show the channel number, start/stop time and the file name (suggested by Manuel Hartl). - Added a note regarding non-VDR files in the /videoX directories to INSTALL (suggested by Benjamin Harling). - Skipping keys that come in too fast from LIRC (thanks to Christian Jacobsen). - Avoiding short display of the main menu if a plugin displays its own OSD and is started through a user defined key macro (thanks to Andreas Mair for reporting this one). - Reduced the time to wait for EPG data when starting a recording to 3 seconds. - The new SVDRP command STAT can be used to request information about the disk usage (thanks to Thomas Koch). - Fixed faulty calculation of section length in eit.c (thanks to Teemu Rantanen).
109 lines
2.6 KiB
C
109 lines
2.6 KiB
C
/*
|
|
* 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: lirc.c 1.6 2003/04/27 11:39:47 kls Exp $
|
|
*/
|
|
|
|
#include "lirc.h"
|
|
#include <netinet/in.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/un.h>
|
|
|
|
#define REPEATLIMIT 20 // ms
|
|
#define REPEATDELAY 350 // ms
|
|
#define KEYPRESSDELAY 150 // ms
|
|
|
|
cLircRemote::cLircRemote(char *DeviceName)
|
|
:cRemote("LIRC")
|
|
{
|
|
struct sockaddr_un addr;
|
|
addr.sun_family = AF_UNIX;
|
|
strcpy(addr.sun_path, DeviceName);
|
|
if ((f = socket(AF_UNIX, SOCK_STREAM, 0)) >= 0) {
|
|
if (connect(f, (struct sockaddr *)&addr, sizeof(addr)) >= 0) {
|
|
Start();
|
|
return;
|
|
}
|
|
LOG_ERROR_STR(DeviceName);
|
|
close(f);
|
|
}
|
|
else
|
|
LOG_ERROR_STR(DeviceName);
|
|
f = -1;
|
|
}
|
|
|
|
cLircRemote::~cLircRemote()
|
|
{
|
|
Cancel();
|
|
}
|
|
|
|
bool cLircRemote::Ready(void)
|
|
{
|
|
return f >= 0;
|
|
}
|
|
|
|
void cLircRemote::Action(void)
|
|
{
|
|
dsyslog("LIRC remote control thread started (pid=%d)", getpid());
|
|
|
|
int FirstTime = 0;
|
|
int LastTime = 0;
|
|
char buf[LIRC_BUFFER_SIZE];
|
|
char LastKeyName[LIRC_KEY_BUF] = "";
|
|
bool repeat = false;
|
|
int timeout = -1;
|
|
|
|
for (; f >= 0;) {
|
|
|
|
LOCK_THREAD;
|
|
|
|
bool ready = cFile::FileReady(f, timeout);
|
|
int ret = ready ? safe_read(f, buf, sizeof(buf)) : -1;
|
|
|
|
if (ready && ret <= 0 ) {
|
|
esyslog("ERROR: lircd connection lost");
|
|
close(f);
|
|
f = -1;
|
|
break;
|
|
}
|
|
|
|
if (ready && ret > 21) {
|
|
int count;
|
|
char KeyName[LIRC_KEY_BUF];
|
|
sscanf(buf, "%*x %x %29s", &count, KeyName); // '29' in '%29s' is LIRC_KEY_BUF-1!
|
|
int Now = time_ms();
|
|
if (count == 0) {
|
|
if (strcmp(KeyName, LastKeyName) == 0 && Now - FirstTime < KEYPRESSDELAY)
|
|
continue; // skip keys coming in too fast
|
|
if (repeat)
|
|
Put(LastKeyName, false, true);
|
|
strcpy(LastKeyName, KeyName);
|
|
repeat = false;
|
|
FirstTime = Now;
|
|
timeout = -1;
|
|
}
|
|
else {
|
|
if (Now - FirstTime < REPEATDELAY)
|
|
continue; // repeat function kicks in after a short delay
|
|
repeat = true;
|
|
timeout = REPEATDELAY;
|
|
}
|
|
LastTime = Now;
|
|
Put(KeyName, repeat);
|
|
}
|
|
else if (repeat) { // the last one was a repeat, so let's generate a release
|
|
if (time_ms() - LastTime >= REPEATDELAY) {
|
|
Put(LastKeyName, false, true);
|
|
repeat = false;
|
|
*LastKeyName = 0;
|
|
timeout = -1;
|
|
}
|
|
}
|
|
}
|
|
}
|