r3076 - in vdr/vdr-plugin-serial/trunk: . debian
Tobias Grimm
tiber-guest at costa.debian.org
Sat Jun 24 19:46:43 UTC 2006
Author: tiber-guest
Date: 2006-06-24 19:46:36 +0000 (Sat, 24 Jun 2006)
New Revision: 3076
Removed:
vdr/vdr-plugin-serial/trunk/COPYING
vdr/vdr-plugin-serial/trunk/HISTORY
vdr/vdr-plugin-serial/trunk/Makefile
vdr/vdr-plugin-serial/trunk/README
vdr/vdr-plugin-serial/trunk/circuit.jpg
vdr/vdr-plugin-serial/trunk/i18n.c
vdr/vdr-plugin-serial/trunk/i18n.h
vdr/vdr-plugin-serial/trunk/serial.c
vdr/vdr-plugin-serial/trunk/tools/
Modified:
vdr/vdr-plugin-serial/trunk/debian/
Log:
mergeWithUpstream
Deleted: vdr/vdr-plugin-serial/trunk/COPYING
===================================================================
--- vdr/vdr-plugin-serial/trunk/COPYING 2006-06-24 19:42:35 UTC (rev 3075)
+++ vdr/vdr-plugin-serial/trunk/COPYING 2006-06-24 19:46:36 UTC (rev 3076)
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
Deleted: vdr/vdr-plugin-serial/trunk/HISTORY
===================================================================
--- vdr/vdr-plugin-serial/trunk/HISTORY 2006-06-24 19:42:35 UTC (rev 3075)
+++ vdr/vdr-plugin-serial/trunk/HISTORY 2006-06-24 19:46:36 UTC (rev 3076)
@@ -1,20 +0,0 @@
-VDR Plugin 'serial' Revision History
---------------------------------------
-
-2004-02-23: Version 0.0.6
-
-- added OSD Setup support to choose com port (TNX to cooper)
-- added plugin parameter support to choose com port (TNX to cooper)
-
-2003-06-11: Version 0.0.5
-
-- PrimaryDevice is now correctly identified
-
-2003-05-01: Version 0.0.4
-
-- Flashrate for Recording on primary Card is introduced
- (1 from short flashing to 10 from lighting with no flashing)
-
-2003-04-01: Version 0.0.3
-
-- Initial revision.
Deleted: vdr/vdr-plugin-serial/trunk/Makefile
===================================================================
--- vdr/vdr-plugin-serial/trunk/Makefile 2006-06-24 19:42:35 UTC (rev 3075)
+++ vdr/vdr-plugin-serial/trunk/Makefile 2006-06-24 19:46:36 UTC (rev 3076)
@@ -1,82 +0,0 @@
-#
-# Makefile for a Video Disk Recorder plugin
-#
-# $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.
-#
-PLUGIN = serial
-
-### 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 C++ compiler and options:
-
-CXX ?= g++
-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
-
-### The directory environment:
-
-DVBDIR = ../../../../DVB
-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
-
-### Allow user defined options to overwrite defaults:
-
--include $(VDRDIR)/Make.config
-
-### The version number of VDR (taken from VDR's "config.h"):
-
-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
-
-### The name of the distribution archive:
-
-ARCHIVE = $(PLUGIN)-$(VERSION)
-PACKAGE = vdr-$(ARCHIVE)
-
-### Includes and Defines (add further entries here):
-
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
-
-DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
-
-### The object files (add further files here):
-
-OBJS = $(PLUGIN).o i18n.o
-
-### Implicit rules:
-
-%.o: %.c
- $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
-
-# Dependencies:
-
-MAKEDEP = g++ -MM -MG
-DEPFILE = .dependencies
-$(DEPFILE): Makefile
- @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
-
--include $(DEPFILE)
-
-### Targets:
-
-all: libvdr-$(PLUGIN).so
-
-libvdr-$(PLUGIN).so: $(OBJS)
- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
- @cp $@ $(LIBDIR)/$@.$(VDRVERSION)
-
-dist: clean
- @-rm -rf $(TMPDIR)/$(ARCHIVE)
- @mkdir $(TMPDIR)/$(ARCHIVE)
- @cp -a * $(TMPDIR)/$(ARCHIVE)
- @tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
- @-rm -rf $(TMPDIR)/$(ARCHIVE)
- @echo Distribution package created as $(PACKAGE).tgz
-
-clean:
- @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
Deleted: vdr/vdr-plugin-serial/trunk/README
===================================================================
--- vdr/vdr-plugin-serial/trunk/README 2006-06-24 19:42:35 UTC (rev 3075)
+++ vdr/vdr-plugin-serial/trunk/README 2006-06-24 19:46:36 UTC (rev 3076)
@@ -1,17 +0,0 @@
-This is a "plugin" for the Video Disk Recorder (VDR).
-
-Written by: Ralf Klueber <r at lf-klueber.de>
-
-Project's homepage: http:/www.lf-klueber.de/vdr.htm
-
-See the file COPYING for license information.
-
-Description:
-This plugin allows using a homebrew frontpanel as a remote control for
-VDR. For details see circuit.jpg.
-To use the plugin your homebrew frontpanel has to be connected to your
-serial Port.
-
-When the plugin is loaded for the first time, vdr will prompt you to
-learn the keys of the hombrew frontpanel.
-
Deleted: vdr/vdr-plugin-serial/trunk/circuit.jpg
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-plugin-serial/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Deleted: vdr/vdr-plugin-serial/trunk/i18n.c
===================================================================
--- vdr/vdr-plugin-serial/trunk/i18n.c 2006-06-24 19:42:35 UTC (rev 3075)
+++ vdr/vdr-plugin-serial/trunk/i18n.c 2006-06-24 19:46:36 UTC (rev 3076)
@@ -1,45 +0,0 @@
-/*
- * i18n.c: Internationalization
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: i18n.c 1.3 2002/06/23 13:05:59 kls Exp $
- */
-
-#include "i18n.h"
-
-const tI18nPhrase Phrases[] = {
- { "Flashrate",
- "Abfrageintervall",
- "",// TODO
- "",// TODO
- "",// TODO
- "",// TODO
- "",// TODO
- "",// TODO
- "",// TODO
- "",// TODO
- "",// TODO
- "",// TODO
- "",// TODO
- "",// TODO
- "",// TODO
- },
- { "Serial Port (COM)",
- "Serieller Anschluss (COM)",
- "",// TODO
- "",// TODO
- "",// TODO
- "",// TODO
- "",// TODO
- "",// TODO
- "",// TODO
- "",// TODO
- "",// TODO
- "",// TODO
- "",// TODO
- "",// TODO
- "",// TODO
- },
- { NULL }
- };
Deleted: vdr/vdr-plugin-serial/trunk/i18n.h
===================================================================
--- vdr/vdr-plugin-serial/trunk/i18n.h 2006-06-24 19:42:35 UTC (rev 3075)
+++ vdr/vdr-plugin-serial/trunk/i18n.h 2006-06-24 19:46:36 UTC (rev 3076)
@@ -1,16 +0,0 @@
-/*
- * i18n.h: Internationalization
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id$
- */
-
-#ifndef _I18N__H
-#define _I18N__H
-
-#include <vdr/i18n.h>
-
-extern const tI18nPhrase Phrases[];
-
-#endif //_I18N__H
Deleted: vdr/vdr-plugin-serial/trunk/serial.c
===================================================================
--- vdr/vdr-plugin-serial/trunk/serial.c 2006-06-24 19:42:35 UTC (rev 3075)
+++ vdr/vdr-plugin-serial/trunk/serial.c 2006-06-24 19:46:36 UTC (rev 3076)
@@ -1,319 +0,0 @@
-/*
- * serial plugin for VDR
- *
- * Copyright (C) 2003 Andreas Regel <andreas.regel at gmx.de>
- *
- * This code is distributed under the terms and conditions of the
- * GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
- *
- */
-
-#include <vdr/plugin.h>
-#include <vdr/remote.h>
-#include <vdr/thread.h>
-#include <vdr/status.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <signal.h>
-#include <getopt.h>
-#include "i18n.h"
-
-#define LEDREC TIOCM_RTS
-#define LED2 TIOCM_SR
-#define MAXCYCLE 10
-
-static const char *VERSION = "0.0.6a";
-static const char *DESCRIPTION = "Frontpanel plugin for the serial line";
-//static const char *MAINMENUENTRY = NULL;
-
-static const char *SerPort[] = { "", "/dev/ttyS0", "/dev/ttyS1", "/dev/ttyS2", "/dev/ttyS3" };
-
-// Setup Menu
-struct sSerialSetup {
- int iFlash;
- int Port;
-};
-
-sSerialSetup SerialSetup;
-
-class cMenuSetupSerial : public cMenuSetupPage {
-private:
- sSerialSetup newSerialSetup;
-protected:
- virtual void Store(void);
-public:
- cMenuSetupSerial(void);
-};
-
-cMenuSetupSerial::cMenuSetupSerial(void)
-{
- newSerialSetup.iFlash = SerialSetup.iFlash;
- newSerialSetup.Port = SerialSetup.Port;
- Add(new cMenuEditIntItem( tr("Flashrate"), &newSerialSetup.iFlash, 1, 10));
- Add(new cMenuEditIntItem( tr("Serial Port (COM)"), &newSerialSetup.Port, 1, 4));
-}
-
-void cMenuSetupSerial::Store(void)
-{
- SetupStore("Flashrate", SerialSetup.iFlash = newSerialSetup.iFlash);
- SetupStore("Port", SerialSetup.Port = newSerialSetup.Port);
-}
-
-class cSerialStatus : public cStatus
-{
-private:
- int iLedStatus[MAXCYCLE];
- int iNumDevices;
-
-protected:
- virtual void Recording(const cDevice *Device, const char *Name);
-
-public:
- int GetLedStatus(int i);
- cSerialStatus(void);
- int iCardIsRecording[MAXDEVICES];
-};
-
-cSerialStatus::cSerialStatus(void)
-{
- for(int i=0; i<MAXCYCLE; i++)
- iLedStatus[i] = 0;
- for(int i=0; i<MAXDEVICES; i++)
- iCardIsRecording[i] = 0;
- iNumDevices = 0;
-}
-
-int cSerialStatus::GetLedStatus(int j)
-{
- int iOccupiedDevices = 0;
- int i;
-
- for(i=0; i<iNumDevices; i++)
- if(iCardIsRecording[i])
- iOccupiedDevices++;
-
- if((iNumDevices == iOccupiedDevices) && (iOccupiedDevices >0)) // Blinken
- {
- for(i=0; i<SerialSetup.iFlash; i++)
- iLedStatus[i] |= LEDREC; // Bit setzen
- for(i=SerialSetup.iFlash; i<MAXCYCLE; i++)
- iLedStatus[i] &= ~LEDREC; // Bit loeschen
- }
- else if(iOccupiedDevices > 0) // Dauerleuchten
- {
- for(int i=0;i<MAXCYCLE;i++)
- iLedStatus[i] |= LEDREC; // Bit setzen
- }
- else // LED aus
- {
- for(int i=0;i<MAXCYCLE;i++)
- iLedStatus[i] &= ~LEDREC; // Bit loeschen
- }
- return iLedStatus[i % MAXCYCLE];
-}
-
-void cSerialStatus::Recording(const cDevice *Device, const char *Name)
-{
- int iCardIndex = Device->CardIndex();
- iNumDevices = Device->NumDevices();
-
- if(iCardIndex < MAXDEVICES)
- {
- if(Name && Name[0])
- iCardIsRecording[iCardIndex]++;
- else
- iCardIsRecording[iCardIndex]--;
- }
-}
-
-class cSerialRemote : public cRemote, private cThread
-{
-private:
- int fd;
- int iCycle;
- virtual void Action(void);
- virtual void SetState(void);
- cSerialStatus *cSSstat;
-
-public:
- cSerialRemote(cSerialStatus *stat);
- virtual ~cSerialRemote(void);
- int Open(const char *device, cSerialStatus *stat);
- void Close(int fd);
-};
-
-
-cSerialRemote::cSerialRemote(cSerialStatus *stat)
- :cRemote("Serial")
-{
- fd = Open(SerPort[SerialSetup.Port], stat);
-}
-
-cSerialRemote::~cSerialRemote()
-{
- int state = 0;
- ioctl(fd, TIOCMSET, &state);
- Cancel();
-}
-
-void cSerialRemote::SetState(void)
-{
- int iStateWithDTR = 0;
-
- iCycle = (iCycle + 1) % MAXCYCLE;
- iStateWithDTR = cSSstat->GetLedStatus(iCycle);
- iStateWithDTR |= TIOCM_DTR;
- ioctl(fd, TIOCMSET, &iStateWithDTR);
-}
-
-void cSerialRemote::Action(void)
-{
- dsyslog("Serial remote control thread started (pid=%d)", getpid());
-
- int state = 0;
- int button = 0;
- char str[32];
-
- while(fd >= 0)
- {
- ioctl(fd, TIOCMGET, &state);
- button = 0;
- if(state & TIOCM_CTS)
- button += 1;
- if(state & TIOCM_DSR)
- button += 2;
- if(state & TIOCM_RNG)
- button += 4;
- if(state & TIOCM_CAR)
- button += 8;
- if(button > 0)
- {
- sprintf(str, "Button%d", button);
- Put(str);
- }
- SetState();
- usleep(100000);
- }
- dsyslog("Serial remote control thread ended (pid=%d)", getpid());
-}
-
-int cSerialRemote::Open(const char *device, cSerialStatus *stat)
-{
- int fd = 0;
- int state = 0;
- cSSstat = stat;
- iCycle = 0;
-
- fd = open(device , O_RDONLY | O_NDELAY);
- if(fd >= 0)
- {
- /* Set DTR to high */
- state |= TIOCM_DTR;
- ioctl(fd, TIOCMSET, &state);
- Start();
- return fd;
- }
- return -1;
-}
-
-void cSerialRemote::Close(int fd)
-{
- if(fd >= 0)
- close(fd);
-}
-
-class cPluginSerial : public cPlugin
-{
-private:
- // Add any member variables or functions you may need here.
- cSerialRemote *ser;
- cSerialStatus *stat;
-public:
- cPluginSerial(void);
- virtual ~cPluginSerial();
- virtual const char *Version(void) { return VERSION; }
- virtual const char *Description(void) { return DESCRIPTION; }
- virtual const char *CommandLineHelp(void);
- virtual bool ProcessArgs(int argc, char *argv[]);
- virtual bool Start(void);
- virtual void Housekeeping(void);
- virtual const char *MainMenuEntry(void) { return NULL; }
- virtual cOsdObject *MainMenuAction(void);
- virtual cMenuSetupPage *SetupMenu(void);
- virtual bool SetupParse(const char *Name, const char *Value);
-};
-
-cPluginSerial::cPluginSerial(void)
-{
- // Initialize any member variables here.
- // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
- // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
-}
-
-cPluginSerial::~cPluginSerial()
-{
- // Clean up after yourself!
-}
-
-const char *cPluginSerial::CommandLineHelp(void)
-{
- // Return a string that describes all known command line options.
- return NULL;
-}
-
-bool cPluginSerial::ProcessArgs(int argc, char *argv[])
-{
- // Implement command line argument processing here if applicable.
- return true;
-}
-
-bool cPluginSerial::Start(void)
-{
- // Start any background activities the plugin shall perform.
- stat = new cSerialStatus();
- ser = new cSerialRemote(stat);
- RegisterI18n(Phrases);
- return true;
-}
-
-void cPluginSerial::Housekeeping(void)
-{
- // Perform any cleanup or other regular tasks.
-}
-
-cOsdObject *cPluginSerial::MainMenuAction(void)
-{
- // Perform the action when selected from the main VDR menu.
- return NULL;
-}
-
-cMenuSetupPage *cPluginSerial::SetupMenu(void)
-{
- // Return a setup menu in case the plugin supports one.
- return new cMenuSetupSerial;
-}
-
-bool cPluginSerial::SetupParse(const char *Name, const char *Value)
-{
- // Parse your own setup parameters and store their values.
- if (!strcasecmp(Name,"Flashrate"))
- SerialSetup.iFlash = atoi(Value);
- else if (!strcasecmp(Name,"Port"))
- SerialSetup.Port = atoi(Value);
- else
- return false;
-
- return true;
-}
-
-
-
-
-
-VDRPLUGINCREATOR(cPluginSerial); // Don't touch this!
More information about the pkg-vdr-dvb-changes
mailing list