Hello community, here is the log from the commit of package vdr-plugin-remote for openSUSE:Factory checked in at 2014-04-22 11:55:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vdr-plugin-remote (Old) and /work/SRC/openSUSE:Factory/.vdr-plugin-remote.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vdr-plugin-remote" Changes: -------- --- /work/SRC/openSUSE:Factory/vdr-plugin-remote/vdr-plugin-remote.changes 2011-09-23 12:49:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vdr-plugin-remote.new/vdr-plugin-remote.changes 2014-04-22 11:55:52.000000000 +0200 @@ -1,0 +2,14 @@ +Sun Mar 30 15:43:36 UTC 2014 - seife+obs@b1-systems.com + +- update to version 0.5.0 + - easier to build with plain make + - obsolete remote-0.4.0-locale.diff +- other changes from HISTORY file: + - Updated Italian language texts. + - Fixed some compiler warnings. + - Telnet section added to FAQ. + - Fixed crash with TTY and/or Telnet remotes when VDR terminated + - Access /proc/av7110_ir in write-only mode (for newer kernels) +- run spec-cleaner + +------------------------------------------------------------------- Old: ---- remote-0.4.0-locale.diff vdr-remote-0.4.0.tgz New: ---- vdr-remote-0.5.0.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vdr-plugin-remote.spec ++++++ --- /var/tmp/diff_new_pack.ywuy2X/_old 2014-04-22 11:55:52.000000000 +0200 +++ /var/tmp/diff_new_pack.ywuy2X/_new 2014-04-22 11:55:52.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package vdr-plugin-remote (Version 0.4.0) +# spec file for package vdr-plugin-remote # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,55 +15,50 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%define pluginversion 0.4.0 +%define pluginversion 0.5.0 %define pluginname remote %define pluginurl http://www.escape-edv.de/endriss/vdr # -%define plugindir %pluginname-%pluginversion -%define plugintarball vdr-%pluginname-%pluginversion.tgz +%define plugindir %{pluginname}-%{pluginversion} +%define plugintarball vdr-%{pluginname}-%{pluginversion}.tgz # -%define pkgversion %pluginversion - Name: vdr-plugin-remote -Version: %pkgversion -Release: 1 -Source: %plugintarball -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: VDR %pluginname plugin +Version: %{pluginversion} +Release: 0 +Summary: VDR %{pluginname} plugin License: GPL-2.0+ Group: Hardware/TV -BuildRequires: gcc-c++ vdr-devel -PreReq: vdr(abi) = %{vdr_apiversion} -Url: %pluginurl -Patch0: remote-0.4.0-locale.diff +Url: %{pluginurl} +Source: %{plugintarball} +BuildRequires: gcc-c++ +BuildRequires: pkg-config +BuildRequires: vdr-devel +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: %vdr_prereq # only needed for packages that used the old naming scheme -Obsoletes: vdr-%pluginname < %pkgversion +Obsoletes: vdr-%{pluginname} < %{pluginversion} # used to be in vdr-plugins -Provides: vdr-plugins:/usr/share/doc/packages/vdr/plugins/%{pluginname} +Provides: vdr-plugins:%{_docdir}/vdr/plugins/%{pluginname} +BuildRoot: %{_tmppath}/%{name}-%{version}-build Conflicts: vdr-plugins <= 0.5 %description +%{vdrname} %{pluginname} plugin -%vdrname %pluginname plugin %prep -%setup -q -n %plugindir -%patch0 -p1 +%setup -q -n %{plugindir} %build -%vdr_make +# use msgmerge wrapper +export PATH=%{_datadir}/vdr:$PATH +make %{?_smp_mflags} %install -%vdr_install_plugin %pluginname -%vdr_install_plugin_locale -# -%find_lang vdr-%pluginname - -%clean -rm -rf "${RPM_BUILD_ROOT}" +make DESTDIR=%{buildroot} install +%find_lang vdr-%{pluginname} -%files -f vdr-%pluginname.lang +%files -f vdr-%{pluginname}.lang %defattr(-,root,root) %doc COPYING HISTORY README FAQ %{vdr_libdir}/* ++++++ vdr-remote-0.4.0.tgz -> vdr-remote-0.5.0.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/remote-0.4.0/CONTRIBUTORS new/remote-0.5.0/CONTRIBUTORS --- old/remote-0.4.0/CONTRIBUTORS 2007-10-06 14:47:46.000000000 +0200 +++ new/remote-0.5.0/CONTRIBUTORS 2012-12-26 02:36:47.000000000 +0100 @@ -28,3 +28,6 @@ Joachim Selinger <selinger at idefix dot s dot bawue dot de> for suggesting to implement selection of the input device by path. + +Tobias Grimm tobias dot grimm at e-tobi dot net + for providing a better gettext detection using i18n.h. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/remote-0.4.0/FAQ new/remote-0.5.0/FAQ --- old/remote-0.4.0/FAQ 2007-10-06 15:08:10.000000000 +0200 +++ new/remote-0.5.0/FAQ 2012-12-26 07:53:35.000000000 +0100 @@ -1,4 +1,4 @@ -Remote Control Mini-FAQ (Rev 0.4.0, 2007-10-06 En) +Remote Control Mini-FAQ (Rev 0.5.0, 2012-12-26 En) ================================================== 1. Which hardware is supported? @@ -7,6 +7,7 @@ card type driver connector IR protocol notes --------------------------------------------------------------------- +TT S2 6400 saa716x_ff ir connector RC5 Activy 300 RCMM DVB-S 1.x dvb-ttpci J2 RC5/RCMM 1 DVB-S 1.x dvb-ttpci CI module RC5/RCMM 1 @@ -180,9 +181,44 @@ Have a look at the script 'runvdr.remote' in sub-directory 'misc'. +------------------------------------------------------------------------------- + + +4. Telnet + ------ + +4.1 Terminating the telnet session + ------------------------------ +Any telnet session can be terminated by 'escape character' c (close). +The escape character will be displayed when telnet is started, +default is Ctrl-]. + + +4.2 Key mapping example + ------------------- +VDR is able to learn the telnet keys like any other keyboard. + +If you cannot see the OSD to perform key learning, add file +misc/remote.conf.tcp3333 to your remote.conf. +The keys are documented in misc/remote.conf.tcp3333.readme. + + +4.3 Customizing the key mapping + --------------------------- +It is recommended to use the key learning feature of vdr, but you +might also use your favorite editor to modify the key mapping. + +Key codes can be found by using the debug feature of telnet: +- enter command mode by pressing the 'escape character' +- enter 'set netdata on' +Note that the byte order must be reversed for remote.conf. + + +------------------------------------------------------------------------------- + -3.6 More information - ---------------- +5. More information + ---------------- WIKIs: - VDR and plugins http://www.vdr-wiki.de - DVB http://linuxtv.org/wiki diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/remote-0.4.0/HISTORY new/remote-0.5.0/HISTORY --- old/remote-0.4.0/HISTORY 2007-10-06 14:52:51.000000000 +0200 +++ new/remote-0.5.0/HISTORY 2012-12-26 02:54:17.000000000 +0100 @@ -94,6 +94,7 @@ - Added French language texts (thanks to Pierre Briec). + 2006-04-30: Version 0.3.7 - Updated Makefile (use APIVERSION for VDR >= 1.3.47, VDRVERSION otherwise) @@ -117,3 +118,15 @@ For example: vdr -P"remote -i /dev/input/by-path/pci-0000:02:06.0--event-ir" (Thanks to Joachim Selinger for suggesting to add this feature.) + + +2012-12-26: Version 0.5.0 +- gettext detection modified to use $(VDRDIR)/i18n.h (thanks to Tobias Grimm). +- Updated Italian language texts. +- Fixed some compiler warnings. +- Telnet section added to FAQ. +- GPL text added to all source files. +- Fixed crash with TTY and/or Telnet remotes when VDR terminated. +- Access /proc/av7110_ir in write-only mode (required by kernel 2.6.34+). +- Adopt Makefile for vdr 1.7.34+. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/remote-0.4.0/Makefile new/remote-0.5.0/Makefile --- old/remote-0.4.0/Makefile 2007-10-06 14:58:06.000000000 +0200 +++ new/remote-0.5.0/Makefile 2012-12-26 02:16:57.000000000 +0100 @@ -1,20 +1,54 @@ # -# Makefile for a Video Disk Recorder plugin +# Remote Control plugin for the Video Disk Recorder +# +# Copyright (C) 2002-2010 Oliver Endriss <o.endriss@gmx.de> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html # -# $Id$ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. # By default the main source file also carries this name. -# IMPORTANT: the presence of this macro is important for the Make.config -# file. So it must be defined, even if it is not used here! -# + PLUGIN = remote ### The version number of this plugin (taken from the main source file): VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g') +### The directory environment: +# Use package data if installed...otherwise assume we're under the VDR source directory: +PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) +LIBDIR = $(DESTDIR)$(call PKGCFG,libdir) +LOCDIR = $(DESTDIR)$(call PKGCFG,locdir) +# +TMPDIR ?= /tmp + +### The compiler options: + +export CFLAGS = $(call PKGCFG,cflags) +export CXXFLAGS = $(call PKGCFG,cxxflags) + +### The version number of VDR's plugin API: + +APIVERSION = $(call PKGCFG,apiversion) + + +### Backward compatibility stuff +ifeq ($(LOCDIR),) ### The C++ compiler and options: CXX ?= g++ @@ -24,7 +58,6 @@ VDRDIR = ../../.. LIBDIR = ../../lib -TMPDIR = /tmp ### Allow user defined options to overwrite defaults: @@ -39,16 +72,38 @@ APIVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h) endif +LOCDIR = $(VDRDIR)/locale + +### Includes and Defines (add further entries here): + +DEFINES += -D_GNU_SOURCE + +INCLUDES += -I$(VDRDIR)/include + +### Run 'install' for target 'all': + +all: install + +ifeq ($(shell grep 'I18N_DEFAULT_LOCALE' $(VDRDIR)/i18n.h),) +OLD_I18N = 1 + +i18n install-i18n: + +endif +endif # compatibility section + ### The name of the distribution archive: ARCHIVE = $(PLUGIN)-$(VERSION) PACKAGE = vdr-$(ARCHIVE) -### Includes and Defines (add further entries here): +### The name of the shared object file: -INCLUDES += -I$(VDRDIR)/include +SOFILE = libvdr-$(PLUGIN).so + +### Includes and Defines (add further entries here): -DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' +DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' ### optional components DEFINES += -DREMOTE_FEATURE_LIRC @@ -56,14 +111,18 @@ ### The object files (add further files here): -OBJS = $(PLUGIN).o ttystatus.o +OBJS = $(PLUGIN).o +OBJS += ttystatus.o ifneq (, $(findstring REMOTE_FEATURE_TCPIP, $(DEFINES))) OBJS += remotetcp.o endif +ifneq ($(OLD_I18N),) +OBJS += i18n.o +endif ### The main target: -all: libvdr-$(PLUGIN).so i18n +all: $(SOFILE) i18n ### Implicit rules: @@ -81,41 +140,43 @@ ### Internationalization (I18N): -ifneq ($(shell grep 'LOCALEDIR' $(VDRDIR)/Makefile),) +ifeq ($(OLD_I18N),) PODIR = po -LOCALEDIR = $(VDRDIR)/locale I18Npo = $(wildcard $(PODIR)/*.po) I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file)))) -I18Ndirs = $(notdir $(foreach file, $(I18Npo), $(basename $(file)))) +I18Nmsgs = $(addprefix $(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file)))))) I18Npot = $(PODIR)/$(PLUGIN).pot %.mo: %.po msgfmt -c -o $@ $< $(I18Npot): $(wildcard *.c) - xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --msgid-bugs-address='<o.endriss@gmx.de>' -o $@ $(wildcard *.c) + xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<o.endriss@gmx.de>' -o $@ `ls $^` -$(I18Npo): $(I18Npot) - msgmerge -U --no-wrap -F --backup=none -q $@ $< +%.po: $(I18Npot) + msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $< + @touch $@ -i18n: $(I18Nmo) - @mkdir -p $(LOCALEDIR) - for i in $(I18Ndirs); do\ - mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\ - cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/vdr-$(PLUGIN).mo;\ - done -else -OBJS += i18n.o -i18n: ; +$(I18Nmsgs): $(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo + install -D -m644 $< $@ + +.PHONY: i18n +i18n: $(I18Nmo) $(I18Npot) + +install-i18n: $(I18Nmsgs) endif ### Targets: -libvdr-$(PLUGIN).so: $(OBJS) - $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ - @cp $@ $(LIBDIR)/$@.$(APIVERSION) +$(SOFILE): $(OBJS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ -dist: clean +install-lib: $(SOFILE) + install -D $^ $(LIBDIR)/$^.$(APIVERSION) + +install: install-lib install-i18n + +dist: $(I18Npo) clean @-rm -rf $(TMPDIR)/$(ARCHIVE) @mkdir $(TMPDIR)/$(ARCHIVE) @cp -a * $(TMPDIR)/$(ARCHIVE) @@ -125,4 +186,11 @@ clean: @-rm -f $(PODIR)/*.mo $(PODIR)/*.pot - @-rm -f *.o $(DEPFILE) *.so *.tgz core* *~ + @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ + +env: + @echo "Configuration:" + @echo " APIVERSION $(APIVERSION)" + @echo " CXX $(CXX) CXXFLAGS $(CXXFLAGS)" + @echo " VDRDIR $(VDRDIR) LIBDIR $(LIBDIR) LOCDIR $(LOCDIR)" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/remote-0.4.0/README new/remote-0.5.0/README --- old/remote-0.4.0/README 2007-10-06 14:02:45.000000000 +0200 +++ new/remote-0.5.0/README 2012-12-26 03:53:56.000000000 +0100 @@ -1,7 +1,7 @@ remote - Remote Control plugin for the Video Disk Recorder (VDR) ================================================================ -Version: 0.4.0 +Version: 0.5.0 Written by: Oliver Endriss <o.endriss@gmx.de> @@ -19,10 +19,12 @@ The following remote control devices are supported: (a) linux input device driver ('/dev/input/eventX', X=0,1,2,...) - - built-in remote control port of the av711x-based DVB cards - (aka full-featured cards), e.g. DVB-S Nexus [1] - - remote control port of some budget cards, e.g. Nova-CI [2] - - other input devices (not tested, please report success!) + - Built-in remote control port of the TT DVB-S2 6400 + (HD full-featured card). + - Built-in remote control port of the av711x-based DVB cards + (SD full-featured cards), e.g. DVB-S Nexus. + - Remote control port of some budget cards, e.g. Nova-CI. + - Other input devices. See file FAQ for a list of cards which have been reported to work. (b) keyboard (tty driver): /dev/console, /dev/ttyX @@ -40,8 +42,8 @@ ------------- The Remote Control plugin is installed the same way as any other plugin: - cd VDR/PLUGINS/src -- tar xfz vdr-remote-0.4.0.tgz -- ln -s remote-0.4.0 remote +- tar xfz vdr-remote-0.5.0.tgz +- ln -s remote-0.5.0 remote - cd ../.. - make plugins diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/remote-0.4.0/i18n.c new/remote-0.5.0/i18n.c --- old/remote-0.4.0/i18n.c 2007-10-06 01:18:08.000000000 +0200 +++ new/remote-0.5.0/i18n.c 2012-12-26 02:47:05.000000000 +0100 @@ -3,14 +3,30 @@ * * i18n.c: Internationalization * - * See the README file for copyright information and how to reach the author. + * Copyright (C) 2002-2012 Oliver Endriss <o.endriss@gmx.de> * * Translations provided by: - * Finnish Ville Skytt� <ville dot skytta at iki dot fi> - * French Pierre Briec <eclipse dot vdr at gmail dot com> - * Italian Nicola Franchi <franchi at cefriel dot it> - * Polish Jakub Wolnicki - * Russian Waldemar Nikel + * Finnish Ville Skytt� <ville dot skytta at iki dot fi> + * French Pierre Briec <eclipse dot vdr at gmail dot com> + * Italian Nicola Franchi <franchi at cefriel dot it> + * Italian Gringo <vdr-italian@tiscali.it> + * Polish Jakub Wolnicki + * Russian Waldemar Nikel + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html */ #include "i18n.h" @@ -64,7 +80,7 @@ { "Press any key to use pre-loaded keymap", "Taste dr�cken, um zuvor geladene Keymap zu verwenden", "", - "Premi un tasto per usare una mappa dei tasti pre-caricata", + "Premi un tasto per usare una tabella dei tasti precaricata", "", "", "Appuyez sur une touche pour utiliser un Keymap pr�charg�", @@ -107,7 +123,7 @@ { "Remote control test - press and hold down any key", "Test der Fernbedienung - beliebige Taste gedr�ckt halten", "", - "Test del telecomando - premi e tieni premuto un tasto", + "Prova telecomando - premi e tieni premuto un tasto", "", "", "Test t�l�commande - Appuyer et maintenir une touche enfonc�e", @@ -128,7 +144,7 @@ { "RC5 protocol detected", "RC5-Protokoll erkannt", "", - "Rilevato il protocollo RC5", + "Rilevato protocollo RC5", "", "", "Protocole RC5 d�tect�", @@ -149,7 +165,7 @@ { "RC5 protocol detected (inverted signal)", "RC5-Protokoll erkannt (invertiertes Signal)", "", - "Rilevato il protocollo RC5 (segnale invertito)", + "Rilevato protocollo RC5 (segnale invertito)", "", "", "Protocole RC5 d�tect� (signal invers�)", @@ -170,7 +186,7 @@ { "RCMM protocol detected", "RCMM-Protokoll erkannt", "", - "Rilevato il protocollo RCMM", + "Rilevato protocollo RCMM", "", "", "Protocole RCMM d�tect�", @@ -191,7 +207,7 @@ { "RCMM protocol detected (inverted signal)", "RCMM-Protokoll erkannt (invertiertes Signal)", "", - "Rilevato il protocollo RCMM (segnale invertito)", + "Rilevato protocollo RCMM (segnale invertito)", "", "", "Protocole RCMM d�tect� (signal invers�)", @@ -233,7 +249,7 @@ { "Error uploading keymap", "Fehler beim Laden der Tastenbelegung", "", - "Errore nel caricamento della mappa dei tasti", + "Errore caricamento tabella dei tasti", "", "", "Erreur chargement tables de touches", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/remote-0.4.0/i18n.h new/remote-0.5.0/i18n.h --- old/remote-0.4.0/i18n.h 2007-10-06 01:23:42.000000000 +0200 +++ new/remote-0.5.0/i18n.h 2012-12-26 02:49:36.000000000 +0100 @@ -3,7 +3,22 @@ * * i18n.h: Internationalization * - * See the README file for copyright information and how to reach the author. + * Copyright (C) 2002-2012 Oliver Endriss <o.endriss@gmx.de> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/remote-0.4.0/misc/remote.conf.tcp3333.readme new/remote-0.5.0/misc/remote.conf.tcp3333.readme --- old/remote-0.4.0/misc/remote.conf.tcp3333.readme 1970-01-01 01:00:00.000000000 +0100 +++ new/remote-0.5.0/misc/remote.conf.tcp3333.readme 2008-05-17 04:27:12.000000000 +0200 @@ -0,0 +1,41 @@ +Key mapping for telnet over TCP port 3333 +========================================= + +Note: This works for telnet started from a linux _console_. + +vdr key code keyboard +--------------------------------------------------------- +remote-tcp:3333.Up 0000000000415B1B up +remote-tcp:3333.Down 0000000000425B1B down +remote-tcp:3333.Menu 000000007E315B1B home +remote-tcp:3333.Ok 000000000000000D return +remote-tcp:3333.Back 000000007E345B1B end +remote-tcp:3333.Left 0000000000445B1B left +remote-tcp:3333.Right 0000000000435B1B right +remote-tcp:3333.Red 00000000415B5B1B F1 +remote-tcp:3333.Green 00000000425B5B1B F2 +remote-tcp:3333.Yellow 00000000435B5B1B F3 +remote-tcp:3333.Blue 00000000445B5B1B F4 +remote-tcp:3333.0 0000000000000030 0 +remote-tcp:3333.1 0000000000000031 1 +remote-tcp:3333.2 0000000000000032 2 +remote-tcp:3333.3 0000000000000033 3 +remote-tcp:3333.4 0000000000000034 4 +remote-tcp:3333.5 0000000000000035 5 +remote-tcp:3333.6 0000000000000036 6 +remote-tcp:3333.7 0000000000000037 7 +remote-tcp:3333.8 0000000000000038 8 +remote-tcp:3333.9 0000000000000039 9 +remote-tcp:3333.Channel+ 000000007E355B1B page up +remote-tcp:3333.Channel- 000000007E365B1B page down +remote-tcp:3333.Volume+ 000000007E325B1B ins +remote-tcp:3333.Volume- 000000007E335B1B del +remote-tcp:3333.User1 00000000455B5B1B F5 +remote-tcp:3333.User2 0000007E37315B1B F6 +remote-tcp:3333.User3 0000007E38315B1B F7 +remote-tcp:3333.User4 0000007E39315B1B F8 +remote-tcp:3333.User5 0000007E30325B1B F9 +remote-tcp:3333.User6 0000007E31325B1B F10 +remote-tcp:3333.User7 0000007E33325B1B F11 +remote-tcp:3333.User8 0000007E34325B1B F12 +remote-tcp:3333.User9 0000000000505B1B pause diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/remote-0.4.0/po/de_DE.po new/remote-0.5.0/po/de_DE.po --- old/remote-0.4.0/po/de_DE.po 2007-10-06 01:02:09.000000000 +0200 +++ new/remote-0.5.0/po/de_DE.po 2012-12-26 04:12:47.000000000 +0100 @@ -7,55 +7,56 @@ msgstr "" "Project-Id-Version: Remote Control plugin 0.4.0\n" "Report-Msgid-Bugs-To: <o.endriss@gmx.de>\n" -"POT-Creation-Date: 2007-10-06 01:02+0200\n" +"POT-Creation-Date: 2012-05-27 17:56+0200\n" "PO-Revision-Date: 2007-10-05 06:58+0200\n" "Last-Translator: Oliver Endriss <o.endriss@gmx.de>, 2002-2007\n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -#: remote.c:38 +#: remote.c:52 msgid "Remote control" msgstr "Fernbedienung" -#: remote.c:217 remote.c:761 +#: remote.c:233 remote.c:777 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: remote.c:239 +#: remote.c:255 msgid "Error uploading keymap" msgstr "Fehler beim Laden der Tastenbelegung" -#: remote.c:320 +#: remote.c:336 msgid "Press any key to use pre-loaded keymap" msgstr "Taste dr�cken, um zuvor geladene Keymap zu verwenden" -#: remote.c:325 +#: remote.c:341 msgid "User-supplied keymap will be used" msgstr "Benutzerdefinierte Keymap wird verwendet" -#: remote.c:331 +#: remote.c:347 msgid "Remote control test - press and hold down any key" msgstr "Test der Fernbedienung - beliebige Taste gedr�ckt halten" -#: remote.c:350 +#: remote.c:366 msgid "RC5 protocol detected" msgstr "RC5-Protokoll erkannt" -#: remote.c:374 +#: remote.c:390 msgid "RC5 protocol detected (inverted signal)" msgstr "RC5-Protokoll erkannt (invertiertes Signal)" -#: remote.c:385 +#: remote.c:401 msgid "RCMM protocol detected" msgstr "RCMM-Protokoll erkannt" -#: remote.c:396 +#: remote.c:412 msgid "RCMM protocol detected (inverted signal)" msgstr "RCMM-Protokoll erkannt (invertiertes Signal)" -#: remote.c:404 +#: remote.c:420 msgid "No remote control detected" msgstr "Keine Fernbedienung erkannt" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/remote-0.4.0/po/fi_FI.po new/remote-0.5.0/po/fi_FI.po --- old/remote-0.4.0/po/fi_FI.po 2007-10-06 01:02:09.000000000 +0200 +++ new/remote-0.5.0/po/fi_FI.po 2012-12-26 04:12:47.000000000 +0100 @@ -7,55 +7,56 @@ msgstr "" "Project-Id-Version: Remote Control plugin 0.4.0\n" "Report-Msgid-Bugs-To: <o.endriss@gmx.de>\n" -"POT-Creation-Date: 2007-10-06 01:02+0200\n" +"POT-Creation-Date: 2012-05-27 17:56+0200\n" "PO-Revision-Date: 2007-10-05 06:58+0200\n" "Last-Translator: Ville Skytt� <ville dot skytta at iki dot fi>, 2004\n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -#: remote.c:38 +#: remote.c:52 msgid "Remote control" msgstr "Kaukos��din" -#: remote.c:217 remote.c:761 +#: remote.c:233 remote.c:777 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: remote.c:239 +#: remote.c:255 msgid "Error uploading keymap" msgstr "N�pp�inkartan lataaminen ep�onnistui" -#: remote.c:320 +#: remote.c:336 msgid "Press any key to use pre-loaded keymap" msgstr "Paina mit� tahansa n�pp�int� k�ytt��ksesi oletusn�pp�inkarttaa" -#: remote.c:325 +#: remote.c:341 msgid "User-supplied keymap will be used" msgstr "K�ytet��n k�ytt�j�n m��rittelem�� n�pp�inkarttaa" -#: remote.c:331 +#: remote.c:347 msgid "Remote control test - press and hold down any key" msgstr "Kaukos��dintesti - paina ja pid� alhaalla jotain kaukos��timen n�pp�int�" -#: remote.c:350 +#: remote.c:366 msgid "RC5 protocol detected" msgstr "RC5-yhteysk�yt�nt� tunnistettu" -#: remote.c:374 +#: remote.c:390 msgid "RC5 protocol detected (inverted signal)" msgstr "RC5-yhteysk�yt�nt� tunnistettu (k��nteinen signaali)" -#: remote.c:385 +#: remote.c:401 msgid "RCMM protocol detected" msgstr "RCMM-yhteysk�yt�nt� tunnistettu" -#: remote.c:396 +#: remote.c:412 msgid "RCMM protocol detected (inverted signal)" msgstr "RCMM-yhteysk�yt�nt� tunnistettu (k��nteinen signaali)" -#: remote.c:404 +#: remote.c:420 msgid "No remote control detected" msgstr "Kaukos��dint� ei tunnistettu" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/remote-0.4.0/po/fr_FR.po new/remote-0.5.0/po/fr_FR.po --- old/remote-0.4.0/po/fr_FR.po 2007-10-06 01:02:09.000000000 +0200 +++ new/remote-0.5.0/po/fr_FR.po 2012-12-26 04:12:47.000000000 +0100 @@ -7,55 +7,56 @@ msgstr "" "Project-Id-Version: Remote Control plugin 0.4.0\n" "Report-Msgid-Bugs-To: <o.endriss@gmx.de>\n" -"POT-Creation-Date: 2007-10-06 01:02+0200\n" +"POT-Creation-Date: 2012-05-27 17:56+0200\n" "PO-Revision-Date: 2007-10-05 06:58+0200\n" "Last-Translator: Pierre Briec <eclipse dot vdr at gmail dot com>, 2006\n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: remote.c:38 +#: remote.c:52 msgid "Remote control" msgstr "T�l�commande" -#: remote.c:217 remote.c:761 +#: remote.c:233 remote.c:777 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: remote.c:239 +#: remote.c:255 msgid "Error uploading keymap" msgstr "Erreur chargement tables de touches" -#: remote.c:320 +#: remote.c:336 msgid "Press any key to use pre-loaded keymap" msgstr "Appuyez sur une touche pour utiliser un Keymap pr�charg�" -#: remote.c:325 +#: remote.c:341 msgid "User-supplied keymap will be used" msgstr "Keymap personnalis� va �tre utilis�" -#: remote.c:331 +#: remote.c:347 msgid "Remote control test - press and hold down any key" msgstr "Test t�l�commande - Appuyer et maintenir une touche enfonc�e" -#: remote.c:350 +#: remote.c:366 msgid "RC5 protocol detected" msgstr "Protocole RC5 d�tect�" -#: remote.c:374 +#: remote.c:390 msgid "RC5 protocol detected (inverted signal)" msgstr "Protocole RC5 d�tect� (signal invers�)" -#: remote.c:385 +#: remote.c:401 msgid "RCMM protocol detected" msgstr "Protocole RCMM d�tect�" -#: remote.c:396 +#: remote.c:412 msgid "RCMM protocol detected (inverted signal)" msgstr "Protocole RCMM d�tect� (signal invers�)" -#: remote.c:404 +#: remote.c:420 msgid "No remote control detected" msgstr "Aucune t�l�commande d�tect�e" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/remote-0.4.0/po/it_IT.po new/remote-0.5.0/po/it_IT.po --- old/remote-0.4.0/po/it_IT.po 2007-10-06 01:02:09.000000000 +0200 +++ new/remote-0.5.0/po/it_IT.po 2012-12-26 04:12:47.000000000 +0100 @@ -7,55 +7,45 @@ msgstr "" "Project-Id-Version: Remote Control plugin 0.4.0\n" "Report-Msgid-Bugs-To: <o.endriss@gmx.de>\n" -"POT-Creation-Date: 2007-10-06 01:02+0200\n" -"PO-Revision-Date: 2007-10-05 06:58+0200\n" -"Last-Translator: Nicola Franchi <franchi at cefriel dot it>, 2006\n" -"Language-Team: <vdr@linuxtv.org>\n" +"POT-Creation-Date: 2012-12-26 02:52+0100\n" +"PO-Revision-Date: 2007-12-29 02:22+0100\n" +"Last-Translator: Gringo <vdr-italian@tiscali.it>\n" +"Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -#: remote.c:38 msgid "Remote control" msgstr "Telecomando" -#: remote.c:217 remote.c:761 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: remote.c:239 msgid "Error uploading keymap" -msgstr "Errore nel caricamento della mappa dei tasti" +msgstr "Errore caricamento tabella dei tasti" -#: remote.c:320 msgid "Press any key to use pre-loaded keymap" -msgstr "Premi un tasto per usare una mappa dei tasti pre-caricata" +msgstr "Premi un tasto per usare una tabella dei tasti precaricata" -#: remote.c:325 msgid "User-supplied keymap will be used" msgstr "Verr� usata una mappa dei tasti fornita dall'utente" -#: remote.c:331 msgid "Remote control test - press and hold down any key" -msgstr "Test del telecomando - premi e tieni premuto un tasto" +msgstr "Prova telecomando - premi e tieni premuto un tasto" -#: remote.c:350 msgid "RC5 protocol detected" -msgstr "Rilevato il protocollo RC5" +msgstr "Rilevato protocollo RC5" -#: remote.c:374 msgid "RC5 protocol detected (inverted signal)" -msgstr "Rilevato il protocollo RC5 (segnale invertito)" +msgstr "Rilevato protocollo RC5 (segnale invertito)" -#: remote.c:385 msgid "RCMM protocol detected" -msgstr "Rilevato il protocollo RCMM" +msgstr "Rilevato protocollo RCMM" -#: remote.c:396 msgid "RCMM protocol detected (inverted signal)" -msgstr "Rilevato il protocollo RCMM (segnale invertito)" +msgstr "Rilevato protocollo RCMM (segnale invertito)" -#: remote.c:404 msgid "No remote control detected" msgstr "Nessun telecomando rilevato" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/remote-0.4.0/po/pl_PL.po new/remote-0.5.0/po/pl_PL.po --- old/remote-0.4.0/po/pl_PL.po 2007-10-06 01:02:09.000000000 +0200 +++ new/remote-0.5.0/po/pl_PL.po 2012-12-26 04:12:47.000000000 +0100 @@ -7,55 +7,56 @@ msgstr "" "Project-Id-Version: Remote Control plugin 0.4.0\n" "Report-Msgid-Bugs-To: <o.endriss@gmx.de>\n" -"POT-Creation-Date: 2007-10-06 01:02+0200\n" +"POT-Creation-Date: 2012-05-27 17:56+0200\n" "PO-Revision-Date: 2007-10-05 06:58+0200\n" "Last-Translator: Jakub Wolnicki, 2006\n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -#: remote.c:38 +#: remote.c:52 msgid "Remote control" msgstr "Zdalne sterowanie" -#: remote.c:217 remote.c:761 +#: remote.c:233 remote.c:777 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: remote.c:239 +#: remote.c:255 msgid "Error uploading keymap" msgstr "Blad przy przesylaniu mapy klawiszy" -#: remote.c:320 +#: remote.c:336 msgid "Press any key to use pre-loaded keymap" msgstr "Nacisnij dowolny klawisz, aby uzyc zaladowanej mapy klawiszy" -#: remote.c:325 +#: remote.c:341 msgid "User-supplied keymap will be used" msgstr "Uzyta zostanie mapa klawiszy, zdefinowana przez uzytkownika" -#: remote.c:331 +#: remote.c:347 msgid "Remote control test - press and hold down any key" msgstr "Test zdalnego sterowania - nacisnij i przytrzymaj dowolny klawisz" -#: remote.c:350 +#: remote.c:366 msgid "RC5 protocol detected" msgstr "Wykryto protokol RC5" -#: remote.c:374 +#: remote.c:390 msgid "RC5 protocol detected (inverted signal)" msgstr "Wykryto protokol RC5 (sygnal odwrocony)" -#: remote.c:385 +#: remote.c:401 msgid "RCMM protocol detected" msgstr "Wykryto protokol RCMM" -#: remote.c:396 +#: remote.c:412 msgid "RCMM protocol detected (inverted signal)" msgstr "Wykryto protokol RCMM (sygnal odwrocony)" -#: remote.c:404 +#: remote.c:420 msgid "No remote control detected" msgstr "Nie znaleziono zdalnego sterowania" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/remote-0.4.0/po/ru_RU.po new/remote-0.5.0/po/ru_RU.po --- old/remote-0.4.0/po/ru_RU.po 2007-10-06 01:02:09.000000000 +0200 +++ new/remote-0.5.0/po/ru_RU.po 2012-12-26 04:12:47.000000000 +0100 @@ -7,55 +7,56 @@ msgstr "" "Project-Id-Version: Remote Control plugin 0.4.0\n" "Report-Msgid-Bugs-To: <o.endriss@gmx.de>\n" -"POT-Creation-Date: 2007-10-06 01:02+0200\n" +"POT-Creation-Date: 2012-05-27 17:56+0200\n" "PO-Revision-Date: 2007-10-05 06:58+0200\n" "Last-Translator: Waldemar Nikel, 2006\n" "Language-Team: <vdr@linuxtv.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-5\n" "Content-Transfer-Encoding: 8bit\n" -#: remote.c:38 +#: remote.c:52 msgid "Remote control" msgstr "����� ����������" -#: remote.c:217 remote.c:761 +#: remote.c:233 remote.c:777 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: remote.c:239 +#: remote.c:255 msgid "Error uploading keymap" msgstr "������ ��� �������� ���������" -#: remote.c:320 +#: remote.c:336 msgid "Press any key to use pre-loaded keymap" msgstr "������� ����� ������ ��� ������������� ����� ���������� ���������" -#: remote.c:325 +#: remote.c:341 msgid "User-supplied keymap will be used" msgstr "����� �������������� ��������� ������������" -#: remote.c:331 +#: remote.c:347 msgid "Remote control test - press and hold down any key" msgstr "�������� ������ - ������� � �������� ����� ������" -#: remote.c:350 +#: remote.c:366 msgid "RC5 protocol detected" msgstr "������� �������� RC5" -#: remote.c:374 +#: remote.c:390 msgid "RC5 protocol detected (inverted signal)" msgstr "������� �������� RC5 (� ��������������� �������)" -#: remote.c:385 +#: remote.c:401 msgid "RCMM protocol detected" msgstr "������� �������� RCMM" -#: remote.c:396 +#: remote.c:412 msgid "RCMM protocol detected (inverted signal)" msgstr "������� �������� RCMM (� ��������������� �������)" -#: remote.c:404 +#: remote.c:420 msgid "No remote control detected" msgstr "����� ���������� �� �������" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/remote-0.4.0/remote.c new/remote-0.5.0/remote.c --- old/remote-0.4.0/remote.c 2007-10-06 01:23:21.000000000 +0200 +++ new/remote-0.5.0/remote.c 2012-12-26 02:50:33.000000000 +0100 @@ -3,7 +3,22 @@ * * remote.c: main source file * - * See the README file for copyright information and how to reach the author. + * Copyright (C) 2002-2012 Oliver Endriss <o.endriss@gmx.de> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html */ @@ -21,7 +36,6 @@ #ifdef REMOTE_FEATURE_TCPIP #include "remotetcp.h" #endif -#include "ttystatus.h" #define NUMREMOTES 10 // maximum number of remote control devices @@ -34,7 +48,7 @@ #define AV7110_PARM_INVERSION "/sys/module/dvb_ttpci/parameters/ir_inversion" #endif -static const char *VERSION = "0.4.0"; +static const char *VERSION = "0.5.0"; static const char *DESCRIPTION = trNOOP("Remote control"); @@ -65,6 +79,8 @@ bool cRemoteGeneric::Put(uint64_t Code, bool Repeat, bool Release) // --------------------------------------------------------------------------- { + //printf("%s: code %llx repeat %u release %u\n", + // __func__, Code, Repeat, Release); return cRemote::Put(Code, Repeat, Release); } @@ -209,7 +225,7 @@ uint16_t keymap[2+256]; int n; - fh = open(devname, O_RDWR); + fh = open(devname, O_WRONLY); if (fh < 0) { int err = errno; @@ -308,7 +324,7 @@ // load keymap for full-featured cards if (identifyInputDevice(fh, device) == 1) { - char *kDevname = AV7110_KEYMAP_DEVICE; + const char *kDevname = AV7110_KEYMAP_DEVICE; uint32_t kOptions; int kAddr = -1; int i, n; @@ -675,7 +691,7 @@ if (devcnt == 0) { devtyp[0] = 'i'; - devnam[0] = "autodetect"; + devnam[0] = (char *) "autodetect"; devcnt = 1; } @@ -717,7 +733,7 @@ // use default device if nothing could be identified if (devtyp[i] == 'i' && strcmp(devnam[i], "autodetect") == 0) - devnam[i] = "/dev/input/ir"; + devnam[i] = (char *) "/dev/input/ir"; } // for i for (int i = 0; i < devcnt; i++) @@ -790,8 +806,9 @@ break; #endif case 'T': - new cTtyStatus(fh[i]); - // fall thru + new cRemoteDevTtyWithOsd(nam,fh[i],devnam[i]); + break; + case 't': new cRemoteDevTty(nam,fh[i],devnam[i]); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/remote-0.4.0/remote.h new/remote-0.5.0/remote.h --- old/remote-0.4.0/remote.h 2006-12-03 16:10:16.000000000 +0100 +++ new/remote-0.5.0/remote.h 2012-12-26 02:49:44.000000000 +0100 @@ -3,16 +3,31 @@ * * remote.h: input/lirc/tty remote control * - * See the README file for copyright information and how to reach the author. + * Copyright (C) 2002-2012 Oliver Endriss <o.endriss@gmx.de> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html */ #ifndef __PLUGIN_REMOTE_H #define __PLUGIN_REMOTE_H - #include <vdr/remote.h> #include <vdr/thread.h> +#include "ttystatus.h" //#define DEBUG @@ -113,5 +128,13 @@ virtual ~cRemoteDevTty(); }; +/*****************************************************************************/ +class cRemoteDevTtyWithOsd : protected cRemoteDevTty, protected cTtyStatus +/*****************************************************************************/ +{ +public: + cRemoteDevTtyWithOsd(const char *name, int f, char *d) + :cRemoteDevTty(name, f, d), cTtyStatus(f) {} +}; #endif // __PLUGIN_REMOTE_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/remote-0.4.0/remotetcp.c new/remote-0.5.0/remotetcp.c --- old/remote-0.4.0/remotetcp.c 2006-12-03 15:41:50.000000000 +0100 +++ new/remote-0.5.0/remotetcp.c 2012-12-26 02:50:40.000000000 +0100 @@ -1,15 +1,29 @@ /* - * Remote Plugin for the Video Disk Recorder + * Remote Control plugin for the Video Disk Recorder * * remotetcp.c: tcp/telnet remote control * - * See the README file for copyright information and how to reach the author. + * Copyright (C) 2002-2012 Oliver Endriss <o.endriss@gmx.de> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html */ #include "remote.h" #include "remotetcp.h" -#include "ttystatus.h" cTcpRemote::cTcpRemote(const char *name, int f, char *d) @@ -26,7 +40,10 @@ Cancel(); if (cstatus) + { delete cstatus; + cstatus = NULL; + } if (fh != -1) close(fh); @@ -84,8 +101,11 @@ if (key == INVALID_KEY) { - delete cstatus; - cstatus = NULL; + if (cstatus) + { + delete cstatus; + cstatus = NULL; + } close(fh); fh = -1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/remote-0.4.0/remotetcp.h new/remote-0.5.0/remotetcp.h --- old/remote-0.4.0/remotetcp.h 2006-12-03 15:43:23.000000000 +0100 +++ new/remote-0.5.0/remotetcp.h 2012-12-26 02:49:51.000000000 +0100 @@ -1,9 +1,24 @@ /* - * Remote plugin for the Video Disk Recorder + * Remote Control plugin for the Video Disk Recorder * * remotetcp.h: tcp/telnet remote control * - * See the README file for copyright information and how to reach the author. + * Copyright (C) 2002-2012 Oliver Endriss <o.endriss@gmx.de> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html */ @@ -13,7 +28,6 @@ #include <vdr/svdrp.h> #include "remote.h" -#include "ttystatus.h" /****************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/remote-0.4.0/ttystatus.c new/remote-0.5.0/ttystatus.c --- old/remote-0.4.0/ttystatus.c 2006-09-02 19:06:23.000000000 +0200 +++ new/remote-0.5.0/ttystatus.c 2012-12-26 02:50:48.000000000 +0100 @@ -1,9 +1,24 @@ /* - * Remote Plugin for the Video Disk Recorder + * Remote Control plugin for the Video Disk Recorder * * ttystatus.c: tty osd emulation * - * See the README file for copyright information and how to reach the author. + * Copyright (C) 2002-2012 Oliver Endriss <o.endriss@gmx.de> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/remote-0.4.0/ttystatus.h new/remote-0.5.0/ttystatus.h --- old/remote-0.4.0/ttystatus.h 2006-01-09 17:35:01.000000000 +0100 +++ new/remote-0.5.0/ttystatus.h 2012-12-26 02:49:59.000000000 +0100 @@ -1,9 +1,24 @@ /* - * Remote plugin for the Video Disk Recorder + * Remote Control plugin for the Video Disk Recorder * * ttystatus.h: tty osd emulation * - * See the README file for copyright information and how to reach the author. + * Copyright (C) 2002-2012 Oliver Endriss <o.endriss@gmx.de> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html */ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org