Skip to content
This repository has been archived by the owner on Apr 15, 2023. It is now read-only.

Commit

Permalink
added: configure option for specifying default LIRC device
Browse files Browse the repository at this point in the history
The default LIRC device location was changed in LIRC 0.8.6 from
/dev/lircd to /var/run/lirc/lircd. Add --with-lirc-device=file
configure option to select the default device location at build time.
This can still be overridden at run time.

/dev/lircd is kept as the XBMC default for now.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@30976 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
  • Loading branch information
anssih committed Jun 8, 2010
1 parent 107055d commit ecd39b2
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
7 changes: 7 additions & 0 deletions configure.in
Expand Up @@ -235,6 +235,13 @@ AC_ARG_ENABLE([liba52],
[use_liba52=$enableval],
[use_liba52=no])

AC_ARG_WITH([lirc-device],
[AS_HELP_STRING([--with-lirc-device=file],
[specify the default LIRC device (default is /dev/lircd)])],
[lirc_device=$withval],
[lirc_device=/dev/lircd])
AC_DEFINE_UNQUOTED([LIRC_DEVICE], ["$lirc_device"], [Default LIRC device])

### External libraries options
AC_ARG_ENABLE([external-libraries],
[AS_HELP_STRING([--enable-external-libraries],
Expand Down
2 changes: 1 addition & 1 deletion docs/manpages/xbmc.bin.1
Expand Up @@ -24,7 +24,7 @@ XBMC will look for configurations in install folder instead of ~/.xbmc
Enables screen resolutions such as PAL, NTSC, etc.
.TP
\fB\-l\fR or \fB\-\-lircdev\fR
LircDevice to use default is /dev/lircd .
LircDevice to use. See \-\-help output for the default.
.TP
\fB\-n\fR or \fB\-\-nolirc\fR
do not use Lirc, aka no remote input.
Expand Down
2 changes: 0 additions & 2 deletions guilib/common/LIRC.cpp
Expand Up @@ -33,8 +33,6 @@
#include "FileSystem/File.h"
#include "utils/TimeUtils.h"

#define LIRC_DEVICE "/dev/lircd"

CRemoteControl g_RemoteControl;

CRemoteControl::CRemoteControl()
Expand Down
2 changes: 1 addition & 1 deletion xbmc/xbmc.cpp
Expand Up @@ -96,7 +96,7 @@ int main(int argc, char* argv[])
printf(" -p or --portable\tXBMC will look for configurations in install folder instead of ~/.xbmc\n");
printf(" --legacy-res\t\tEnables screen resolutions such as PAL, NTSC, etc.\n");
#ifdef HAS_LIRC
printf(" -l or --lircdev\tLircDevice to use default is /dev/lircd .\n");
printf(" -l or --lircdev\tLircDevice to use default is "LIRC_DEVICE" .\n");
printf(" -n or --nolirc\tdo not use Lirc, aka no remote input.\n");
#endif
printf(" --debug\t\tEnable debug logging\n");
Expand Down

0 comments on commit ecd39b2

Please sign in to comment.