From fe9499ba901f5c32dd0b3841a2b6e599fefc144f Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 24 Nov 2002 18:00:00 +0100 Subject: =?UTF-8?q?Version=201.1.17=20-=20Added=20new=20entries=20to=20'ca?= =?UTF-8?q?.conf'.=20-=20Fixed=20closing=20unused=20PID=20handles=20(thank?= =?UTF-8?q?s=20to=20Stefan=20Schluenss=20for=20reporting=20this=20=20=20on?= =?UTF-8?q?e).=20-=20Added=20more=20examples=20to=20'diseqc.conf'=20(thank?= =?UTF-8?q?s=20to=20Oliver=20Endriss).=20-=20Fixed=20disabling=20multiple?= =?UTF-8?q?=20recordings=20on=20a=20single=20DVB=20card=20(comment=20out?= =?UTF-8?q?=20the=20definition=20=20=20of=20the=20macros=20DO=5FREC=5FAND?= =?UTF-8?q?=5FPLAY=5FON=5FPRIMARY=5FDEVICE=20and=20DO=5FMULTIPLE=5FRECORDI?= =?UTF-8?q?NGS=20in=20=20=20dvbdevice.c).=20-=20Plugins=20can=20now=20have?= =?UTF-8?q?=20their=20very=20own=20OSD=20setup=20in=20the=20object=20they?= =?UTF-8?q?=20return=20from=20=20=20a=20call=20to=20cPlugin::MainMenuActio?= =?UTF-8?q?n().=20In=20order=20to=20implement=20this,=20the=20return=20typ?= =?UTF-8?q?e=20=20=20of=20cPlugin::MainMenuAction()=20had=20to=20be=20chan?= =?UTF-8?q?ged=20from=20(cOsdMenu=20*)=20to=20(cOsdObject=20*).=20=20=20So?= =?UTF-8?q?=20in=20case=20you=20are=20compiling=20an=20existing=20plugin?= =?UTF-8?q?=20with=20this=20version=20of=20VDR=20and=20you=20=20=20get=20a?= =?UTF-8?q?n=20error=20message,=20simply=20change=20cOsdMenu=20to=20cOsdOb?= =?UTF-8?q?ject=20in=20the=20plugin's=20source=20=20=20for=20the=20MainMen?= =?UTF-8?q?uAction()=20function.=20=20=20Plugin=20authors=20who=20have=20s?= =?UTF-8?q?o=20far=20(ab)used=20the=20cControl=20mechanism=20to=20implemen?= =?UTF-8?q?t=20their=20=20=20own=20raw=20OSD=20should=20take=20a=20look=20?= =?UTF-8?q?at=20the=20new=20demo=20plugin=20'osddemo'.=20It=20implements?= =?UTF-8?q?=20=20=20a=20very=20primitive=20game=20that=20shows=20how=20a?= =?UTF-8?q?=20plugin=20can=20have=20its=20own=20raw=20OSD.=20Especially=20?= =?UTF-8?q?=20=20look=20into=20cLineGame=20and=20see=20how=20it=20implemen?= =?UTF-8?q?ts=20the=20Show()=20function.=20See=20also=20=20=20the=20chapte?= =?UTF-8?q?r=20on=20"User=20interaction"=20in=20PLUGINS.html.=20-=20Added?= =?UTF-8?q?=20three=20new=20fields=20to=20the=20lines=20in=20'channels.con?= =?UTF-8?q?f':=20NID,=20TID=20and=20RID.=20NID=20and=20=20=20TID=20are=20t?= =?UTF-8?q?he=20Network=20and=20Transport=20Stream=20IDs,=20respectively.?= =?UTF-8?q?=20RID=20is=20an=20additional=20ID=20=20=20that=20can=20be=20us?= =?UTF-8?q?ed=20to=20tell=20apart=20channels=20that=20would=20otherwise=20?= =?UTF-8?q?be=20indistinguishable.=20=20=20This=20is=20typically=20the=20c?= =?UTF-8?q?ase=20with=20radio=20channels,=20which=20may=20have=20the=20sam?= =?UTF-8?q?e=20NID,=20TID=20=20=20and=20SID,=20but=20different=20"radio=20?= =?UTF-8?q?IDs".=20This=20new=20field=20is=20therefore=20called=20RID=20("?= =?UTF-8?q?radio=20=20=20ID").=20Currently=20NID=20and=20TID=20are=20not?= =?UTF-8?q?=20yet=20used=20by=20VDR=20and=20should=20always=20be=200.=20Th?= =?UTF-8?q?e=20=20=20RID=20is=20actually=20used=20when=20building=20the=20?= =?UTF-8?q?"unique=20channel=20ID",=20so=20if=20you=20have=20channels=20?= =?UTF-8?q?=20=20in=20your=20'channels.conf'=20file=20that=20cause=20error?= =?UTF-8?q?=20messages=20when=20loading,=20you=20can=20set=20=20=20the=20R?= =?UTF-8?q?IDs=20of=20these=20channels=20to=20different=20values.=20=20=20?= =?UTF-8?q?When=20reading=20an=20old=20'channels.conf'=20these=20new=20fie?= =?UTF-8?q?lds=20will=20be=20automatically=20=20=20initialized=20to=200=20?= =?UTF-8?q?and=20once=20the=20file=20is=20written=20back=20to=20disk=20the?= =?UTF-8?q?y=20will=20be=20appended=20=20=20to=20the=20channel=20definitio?= =?UTF-8?q?ns.=20=20=20Thanks=20to=20R=C3=A9gis=20Bossut=20for=20pointing?= =?UTF-8?q?=20out=20that=20with=20some=20providers=20the=20channels=20can?= =?UTF-8?q?=20=20=20only=20be=20distinguished=20through=20the=20RID.=20-?= =?UTF-8?q?=20The=20"unique=20channel=20ID"=20now=20contains=20an=20option?= =?UTF-8?q?al=205th=20part=20(the=20RID).=20See=20man=20vdr(5).=20-=20Upda?= =?UTF-8?q?ted=20'channels.conf.cable'=20and=20made=20some=20channels=20un?= =?UTF-8?q?ique=20using=20the=20new=20RID=20=20=20(thanks=20to=20Andreas?= =?UTF-8?q?=20Kool=20for=20pointing=20out=20the=20problems).=20-=20Made=20?= =?UTF-8?q?some=20channels=20unique=20in=20'channels.conf.terr'=20using=20?= =?UTF-8?q?the=20new=20RID.=20-=20Extended=20the=20'-l'=20option=20to=20al?= =?UTF-8?q?low=20logging=20to=20LOG=5FLOCALn=20(n=3D0..7)=20by=20writing,?= =?UTF-8?q?=20for=20=20=20instance,=20'-l=203.7'=20(suggested=20by=20J?= =?UTF-8?q?=C3=BCrgen=20Schmidt).=20-=20Now=20deleting=20stale=20lock=20fi?= =?UTF-8?q?les=20if=20they=20have=20a=20time=20stamp=20that=20is=20outside?= =?UTF-8?q?=20the=20window=20=20=20'now=20+/-=20LOCKFILESTALETIME'.=20This?= =?UTF-8?q?=20improves=20things=20in=20cases=20where=20the=20system=20time?= =?UTF-8?q?=20=20=20makes=20far=20jumps,=20so=20that=20a=20lock=20file=20m?= =?UTF-8?q?ight=20end=20up=20with=20a=20time=20stamp=20that=20lies=20=20?= =?UTF-8?q?=20in=20the=20distant=20future=20(thanks=20to=20Oliver=20Endris?= =?UTF-8?q?s).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PLUGINS/SRC/hello/HISTORY | 4 + PLUGINS/SRC/hello/hello.c | 8 +- PLUGINS/SRC/osddemo/COPYING | 340 ++++++++++++++++++++++++++++++++++++++++++ PLUGINS/SRC/osddemo/HISTORY | 6 + PLUGINS/SRC/osddemo/Makefile | 82 ++++++++++ PLUGINS/SRC/osddemo/README | 18 +++ PLUGINS/SRC/osddemo/osddemo.c | 153 +++++++++++++++++++ PLUGINS/SRC/status/HISTORY | 4 + PLUGINS/SRC/status/status.c | 8 +- 9 files changed, 615 insertions(+), 8 deletions(-) create mode 100644 PLUGINS/SRC/osddemo/COPYING create mode 100644 PLUGINS/SRC/osddemo/HISTORY create mode 100644 PLUGINS/SRC/osddemo/Makefile create mode 100644 PLUGINS/SRC/osddemo/README create mode 100644 PLUGINS/SRC/osddemo/osddemo.c (limited to 'PLUGINS') diff --git a/PLUGINS/SRC/hello/HISTORY b/PLUGINS/SRC/hello/HISTORY index 8639e05..53b620e 100644 --- a/PLUGINS/SRC/hello/HISTORY +++ b/PLUGINS/SRC/hello/HISTORY @@ -37,3 +37,7 @@ VDR Plugin 'hello' Revision History The NEWSTRUCT compile time switch is now obsolete. The required driver is now the CVS HEAD version dated 2002-11-01 or later. - Introduced Make.config. + +2002-11-23: Version 0.0.9 + +- Changed return type of MainMenuAction(). diff --git a/PLUGINS/SRC/hello/hello.c b/PLUGINS/SRC/hello/hello.c index 6583285..b726578 100644 --- a/PLUGINS/SRC/hello/hello.c +++ b/PLUGINS/SRC/hello/hello.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: hello.c 1.9 2002/11/01 10:16:53 kls Exp $ + * $Id: hello.c 1.10 2002/11/23 15:07:28 kls Exp $ */ #include @@ -12,7 +12,7 @@ #include #include "i18n.h" -static const char *VERSION = "0.0.8"; +static const char *VERSION = "0.0.9"; static const char *DESCRIPTION = "A friendly greeting"; static const char *MAINMENUENTRY = "Hello"; @@ -31,7 +31,7 @@ public: virtual bool Start(void); virtual void Housekeeping(void); virtual const char *MainMenuEntry(void) { return tr(MAINMENUENTRY); } - virtual cOsdMenu *MainMenuAction(void); + virtual cOsdObject *MainMenuAction(void); virtual cMenuSetupPage *SetupMenu(void); virtual bool SetupParse(const char *Name, const char *Value); }; @@ -124,7 +124,7 @@ void cPluginHello::Housekeeping(void) // Perform any cleanup or other regular tasks. } -cOsdMenu *cPluginHello::MainMenuAction(void) +cOsdObject *cPluginHello::MainMenuAction(void) { // Perform the action when selected from the main VDR menu. Interface->Confirm(UseAlternateGreeting ? tr("Howdy folks!") : tr("Hello world!"), GreetingTime); diff --git a/PLUGINS/SRC/osddemo/COPYING b/PLUGINS/SRC/osddemo/COPYING new file mode 100644 index 0000000..5b6e7c6 --- /dev/null +++ b/PLUGINS/SRC/osddemo/COPYING @@ -0,0 +1,340 @@ + 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. + + + Copyright (C) + + 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. + + , 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. diff --git a/PLUGINS/SRC/osddemo/HISTORY b/PLUGINS/SRC/osddemo/HISTORY new file mode 100644 index 0000000..8c9d3e1 --- /dev/null +++ b/PLUGINS/SRC/osddemo/HISTORY @@ -0,0 +1,6 @@ +VDR Plugin 'osddemo' Revision History +------------------------------------- + +2002-11-23: Version 0.0.1 + +- Initial revision. diff --git a/PLUGINS/SRC/osddemo/Makefile b/PLUGINS/SRC/osddemo/Makefile new file mode 100644 index 0000000..ac56d1f --- /dev/null +++ b/PLUGINS/SRC/osddemo/Makefile @@ -0,0 +1,82 @@ +# +# Makefile for a Video Disk Recorder plugin +# +# $Id: Makefile 1.1 2002/11/23 14:56:44 kls Exp $ + +# 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 = osddemo + +### 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 + +### 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* *~ diff --git a/PLUGINS/SRC/osddemo/README b/PLUGINS/SRC/osddemo/README new file mode 100644 index 0000000..cc150ab --- /dev/null +++ b/PLUGINS/SRC/osddemo/README @@ -0,0 +1,18 @@ +This is a "plugin" for the Video Disk Recorder (VDR). + +Written by: Klaus Schmidinger + +Project's homepage: http://www.cadsoft.de/vdr + +Latest version available at: http://www.cadsoft.de/vdr + +See the file COPYING for license information. + +Description: + +Demonstration of how a plugin can have its very own OSD setup. + +It's a very primitive game that opens a small window in which the +user can draw lines with the Up, Down, Left and Right buttons. +The color buttons are used to switch color. +Press Ok to close the window. diff --git a/PLUGINS/SRC/osddemo/osddemo.c b/PLUGINS/SRC/osddemo/osddemo.c new file mode 100644 index 0000000..f806178 --- /dev/null +++ b/PLUGINS/SRC/osddemo/osddemo.c @@ -0,0 +1,153 @@ +/* + * osddemo.c: A plugin for the Video Disk Recorder + * + * See the README file for copyright information and how to reach the author. + * + * $Id: osddemo.c 1.1 2002/11/24 10:32:59 kls Exp $ + */ + +#include + +static const char *VERSION = "0.0.1"; +static const char *DESCRIPTION = "Demo of arbitrary OSD setup"; +static const char *MAINMENUENTRY = "Osd Demo"; + +// --- cLineGame ------------------------------------------------------------- + +class cLineGame : public cOsdObject { +private: + cOsdBase *osd; + int x; + int y; + eDvbColor color; +public: + cLineGame(void); + ~cLineGame(); + virtual void Show(void); + virtual eOSState ProcessKey(eKeys Key); + }; + +cLineGame::cLineGame(void) +{ + osd = NULL; + x = y = 50; + color = clrRed; +} + +cLineGame::~cLineGame() +{ + delete osd; +} + +void cLineGame::Show(void) +{ + osd = cOsd::OpenRaw(100, 50); + if (osd) { + osd->Create(0, 0, 100, 200, 4); + osd->AddColor(clrBackground); + osd->AddColor(clrRed); + osd->AddColor(clrGreen); + osd->AddColor(clrYellow); + osd->AddColor(clrBlue); + osd->Clear(); + osd->Flush(); + } +} + +eOSState cLineGame::ProcessKey(eKeys Key) +{ + eOSState state = cOsdObject::ProcessKey(Key); + if (state == osUnknown) { + switch (Key & ~k_Repeat) { + case kUp: if (y > 0) y--; break; + case kDown: if (y < 196) y++; break; + case kLeft: if (x > 0) x--; break; + case kRight: if (x < 96) x++; break; + case kRed: color = clrRed; break; + case kGreen: color = clrGreen; break; + case kYellow: color = clrYellow; break; + case kBlue: color = clrBlue; break; + case kOk: return osEnd; + default: return state; + } + osd->Fill(x, y, x + 3, y + 3, color); + osd->Flush(); + state = osContinue; + } + return state; +} + +// --- cPluginOsddemo -------------------------------------------------------- + +class cPluginOsddemo : public cPlugin { +private: + // Add any member variables or functions you may need here. +public: + cPluginOsddemo(void); + virtual ~cPluginOsddemo(); + 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 MAINMENUENTRY; } + virtual cOsdObject *MainMenuAction(void); + virtual cMenuSetupPage *SetupMenu(void); + virtual bool SetupParse(const char *Name, const char *Value); + }; + +cPluginOsddemo::cPluginOsddemo(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! +} + +cPluginOsddemo::~cPluginOsddemo() +{ + // Clean up after yourself! +} + +const char *cPluginOsddemo::CommandLineHelp(void) +{ + // Return a string that describes all known command line options. + return NULL; +} + +bool cPluginOsddemo::ProcessArgs(int argc, char *argv[]) +{ + // Implement command line argument processing here if applicable. + return true; +} + +bool cPluginOsddemo::Start(void) +{ + // Start any background activities the plugin shall perform. + return true; +} + +void cPluginOsddemo::Housekeeping(void) +{ + // Perform any cleanup or other regular tasks. +} + +cOsdObject *cPluginOsddemo::MainMenuAction(void) +{ + // Perform the action when selected from the main VDR menu. + return new cLineGame; +} + +cMenuSetupPage *cPluginOsddemo::SetupMenu(void) +{ + // Return a setup menu in case the plugin supports one. + return NULL; +} + +bool cPluginOsddemo::SetupParse(const char *Name, const char *Value) +{ + // Parse your own setup parameters and store their values. + return false; +} + +VDRPLUGINCREATOR(cPluginOsddemo); // Don't touch this! diff --git a/PLUGINS/SRC/status/HISTORY b/PLUGINS/SRC/status/HISTORY index 45d42fb..7d28291 100644 --- a/PLUGINS/SRC/status/HISTORY +++ b/PLUGINS/SRC/status/HISTORY @@ -23,3 +23,7 @@ VDR Plugin 'status' Revision History The NEWSTRUCT compile time switch is now obsolete. The required driver is now the CVS HEAD version dated 2002-11-01 or later. - Introduced Make.config. + +2002-11-23: Version 0.0.6 + +- Changed return type of MainMenuAction(). diff --git a/PLUGINS/SRC/status/status.c b/PLUGINS/SRC/status/status.c index 12e64b7..f5ab5b9 100644 --- a/PLUGINS/SRC/status/status.c +++ b/PLUGINS/SRC/status/status.c @@ -3,13 +3,13 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: status.c 1.5 2002/11/01 10:16:59 kls Exp $ + * $Id: status.c 1.6 2002/11/23 15:07:40 kls Exp $ */ #include #include -static const char *VERSION = "0.0.5"; +static const char *VERSION = "0.0.6"; static const char *DESCRIPTION = "Status monitor test"; static const char *MAINMENUENTRY = NULL; @@ -115,7 +115,7 @@ public: virtual bool Start(void); virtual void Housekeeping(void); virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; } - virtual cOsdMenu *MainMenuAction(void); + virtual cOsdObject *MainMenuAction(void); virtual cMenuSetupPage *SetupMenu(void); virtual bool SetupParse(const char *Name, const char *Value); }; @@ -158,7 +158,7 @@ void cPluginStatus::Housekeeping(void) // Perform any cleanup or other regular tasks. } -cOsdMenu *cPluginStatus::MainMenuAction(void) +cOsdObject *cPluginStatus::MainMenuAction(void) { // Perform the action when selected from the main VDR menu. return NULL; -- cgit v1.2.3