mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
d5c85f5ff8
- Added some missing braces in remux.c (thanks to Wayne Keer for reporting this one). - Removed unused MAINMENUENTRY from svdrpdemo.c (thanks to Udo Richter for reporting this one). - Fixed appending sequence end code in cDvbPlayer::Goto() (thanks to Reinhard Nissl). - Fixed syncing in cRepacker (thanks to Reinhard Nissl). - Now always using stream id 0xE0 for the video stream, to avoid problems with post processing tools that choke on different ids (suggested by Reinhard Nissl). - Updated the Estonian OSD texts (thanks to Arthur Konovalov). - Fixed cDvbPlayer::SkipFrames() to properly handle radio recordings (thanks to Reinhard Nissl). - Updated the Swedish OSD texts (thanks to Tomas Prybil). - Updated the Slovenian OSD texts (thanks to Matjaz Thaler). - Updated the Danish OSD texts (thanks to Mogens Elneff). - Made LIRC command parsing more robust (thanks to Ville Skyttä). - Introduced a separate 'plugins-install' target in the Makefile (thanks to Daniel Thompson). - Re-introduced the code that waits for a tuner lock in VDR/device.c, since apparently some users actually need it. It's not active by default, you'll have to define the WAIT_FOR_TUNER_LOCK macro in that file if you need it (suggested by Malcolm Caldwell). - Adjusted the Makefile to the dvb-kernel driver on kernel 2.6 and up (thanks to Lauri Tischler). - Repeat keys are now ignored when waiting for a keypress to cancel an operation (thanks to Marko Mäkelä). - The main menu function of a plugin can now be activated through a key macro of the form "@plugin" even if that plugin doesn't have a main menu entry (using part of a patch by Hardy Flor, which originally implemented calling plugins from SVDRP). - The menu timeout handling is now done centrally in the main program loop. - Added missing help for the 'help' keyword in the SVDRP command PLUG. - The main menu function of a plugin can now be called programmatically through the static function cRemote::CallPlugin(). - The SVDRP command PLUG now has a new option 'main' which can be used to initiate a call to the main menu function of a plugin (using part of a patch by Hardy Flor). - The new command line option '--vfat' can be used to make VDR encode special characters in recording file names, even if it wasn't compiled with VFAT=1 (suggested by Peter Bieringer). The compile time option VFAT still exists and creates a VDR that always behaves as if it were called with '--vfat'. - Replaced the ':' delimiter between hour and minute in recording file names with a '.' under Linux, too. Existing recordings with ':' as delimiter will still work. - Implemented the SVDRP command MOVC (thanks to Andreas Brachold). - Added support for multiple audio language codes in ISO639LanguageDescriptors to 'libsi' (thanks to Marcel Wiesweg). - Changed the audio PID language codes to hold up to two 3 letter codes, separated by '+', to store separate languages broadcast in two channel audio mode. - If the preferred audio language is broadcast on a PID that has two different languages in the two stereo channels, the audio channel is now properly set when switching to such a channel (thanks to Mogens Elneff for his help in testing this). - Fixed some typos in MANUAL (thanks to Ville Skyttä). - Fixed the default value for "Setup/EPG bugfix level" (thanks to Ville Skyttä for reporting this one). - Fixed defining timers that only differ in the day of week (thanks to Patrick Rother for reporting this one). - Fixed converting summary.vdr files that would result in a very long 'short text' (thanks to Carsten Koch). - Implemented a hash for the channels to reduce the system load in the EIT scanning thread (based on a patch by Georg Acher).
112 lines
2.8 KiB
C
112 lines
2.8 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.13 2005/09/02 12:51:35 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(const char *DeviceName)
|
|
:cRemote("LIRC")
|
|
,cThread("LIRC remote control")
|
|
{
|
|
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()
|
|
{
|
|
int fh = f;
|
|
f = -1;
|
|
Cancel();
|
|
if (fh >= 0)
|
|
close(fh);
|
|
}
|
|
|
|
bool cLircRemote::Ready(void)
|
|
{
|
|
return f >= 0;
|
|
}
|
|
|
|
void cLircRemote::Action(void)
|
|
{
|
|
cTimeMs FirstTime;
|
|
cTimeMs LastTime;
|
|
char buf[LIRC_BUFFER_SIZE];
|
|
char LastKeyName[LIRC_KEY_BUF] = "";
|
|
bool repeat = false;
|
|
int timeout = -1;
|
|
|
|
while (Running() && f >= 0) {
|
|
|
|
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];
|
|
if (sscanf(buf, "%*x %x %29s", &count, KeyName) != 2) { // '29' in '%29s' is LIRC_KEY_BUF-1!
|
|
esyslog("ERROR: unparseable lirc command: %s", buf);
|
|
continue;
|
|
}
|
|
if (count == 0) {
|
|
if (strcmp(KeyName, LastKeyName) == 0 && FirstTime.Elapsed() < KEYPRESSDELAY)
|
|
continue; // skip keys coming in too fast
|
|
if (repeat)
|
|
Put(LastKeyName, false, true);
|
|
strcpy(LastKeyName, KeyName);
|
|
repeat = false;
|
|
FirstTime.Set();
|
|
timeout = -1;
|
|
}
|
|
else {
|
|
if (FirstTime.Elapsed() < REPEATDELAY)
|
|
continue; // repeat function kicks in after a short delay
|
|
repeat = true;
|
|
timeout = REPEATDELAY;
|
|
}
|
|
LastTime.Set();
|
|
Put(KeyName, repeat);
|
|
}
|
|
else if (repeat) { // the last one was a repeat, so let's generate a release
|
|
if (LastTime.Elapsed() >= REPEATDELAY) {
|
|
Put(LastKeyName, false, true);
|
|
repeat = false;
|
|
*LastKeyName = 0;
|
|
timeout = -1;
|
|
}
|
|
}
|
|
}
|
|
}
|