frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Version 1.5.8

Browse Source 
- Added missing install-i18n to the install target in the Makefile (reported
  by Joachim Wilke).
- Fixed a faulty comment in Make.config.template (reported by Marco Schlüßler).
- Improved i18n-to-gettext.pl (thanks to Matthias Schwarzott).
- Moved the "all" target in plugin Makefiles before the "Implicit rules",
  so that a plain "make" will compile everything (suggested by Matthias
  Schwarzott). The "newplugin" script has been changed accordingly.
  Plugin authors may want to change their Makefiles, too.
- Added DESTDIR and PREFIX handling to the Makefile (thanks to Matthias
  Schwarzott).
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Added internationalization to the "skincurses" plugin (thanks to Rolf
  Ahrenberg).
- Checking the string for NULL in I18nTranslate().
- Updated the French OSD texts (thanks to Bruno Roussel).
- Some optimizations in cDvbDevice::SetChannelDevice() (thanks to Tobias Bratfisch).
- Optimized cMenuEditChrItem::Set() (thanks to Tobias Bratfisch).
- Optimized cNitFilter::Process() (thanks to Tobias Bratfisch).
- Reduced the number of time(NULL) calls in vdr.c's main loop to a single call
  (thanks to Tobias Bratfisch).
- Changed cBitmap::DrawText() to always draw the background unless ColorBg
  is clrTransparent (thanks to Christoph Haubrich).
- The "Setup/OSD/Language" menu now only shows those languages that actually
  have a locale (suggested by Anssi Hannula).
- Now using setenv() instead of setlocale() to set the language for gettext()
  (suggested by Anssi Hannula; thanks also to Ludwig Nussel for a hint on using
  _nl_msg_cat_cntr).
- When scanning the locale directory, VDR now explicitly looks for a file named
  vdr.mo. Text files for plugins are now named "vdr-name.mo", when "name" is the
  name of the plugin. The "newplugin" script has been changed accordingly, and
  plugin authors should change their Makefiles, too.
This commit is contained in:
Klaus Schmidinger
2007-08-19 18:00:00 +02:00
parent 4c65b525dc
commit e5a2aa41c9
60 changed files with 931 additions and 677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
PLUGINS/src/hello/HISTORY
View File

@@ -53,3 +53,8 @@ VDR Plugin 'hello' Revision History
2007-08-11: Version 0.2.0
- Switched to 'gettext' internationalization.
2007-08-15: Version 0.2.1
- Moved the "all" target in the Makefile before the "Implicit rules",
so that a plain "make" will compile everything.

10
PLUGINS/src/hello/Makefile
View File

@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
# $Id: Makefile 1.16 2007/08/11 10:18:16 kls Exp $
# $Id: Makefile 1.18 2007/08/19 14:18:59 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -49,6 +49,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
OBJS = $(PLUGIN).o
### The main target:
all: libvdr-$(PLUGIN).so i18n
### Implicit rules:
%.o: %.c
@@ -85,13 +89,11 @@ i18n: $(I18Nmo)
@mkdir -p $(LOCALEDIR)
for i in $(I18Ndirs); do\
mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/$(PLUGIN).mo;\
cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/vdr-$(PLUGIN).mo;\
done
### Targets:
all: libvdr-$(PLUGIN).so i18n
libvdr-$(PLUGIN).so: $(OBJS)
$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)

4
PLUGINS/src/hello/hello.c
View File

@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: hello.c 1.13 2007/08/11 09:31:17 kls Exp $
* $Id: hello.c 1.14 2007/08/15 13:17:16 kls Exp $
*/
#include <getopt.h>
@@ -12,7 +12,7 @@
#include <vdr/interface.h>
#include <vdr/plugin.h>
static const char *VERSION = "0.2.0";
static const char *VERSION = "0.2.1";
static const char *DESCRIPTION = trNOOP("A friendly greeting");
static const char *MAINMENUENTRY = trNOOP("Hello");

5
PLUGINS/src/osddemo/HISTORY
View File

@@ -12,3 +12,8 @@ VDR Plugin 'osddemo' Revision History
2004-04-30: Version 0.1.1
- New OSD handling.
2007-08-15: Version 0.1.2
- Moved the "all" target in the Makefile before the "Implicit rules",
so that a plain "make" will compile everything.

8
PLUGINS/src/osddemo/Makefile
View File

@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
# $Id: Makefile 1.9 2006/09/09 12:38:35 kls Exp $
# $Id: Makefile 1.10 2007/08/15 13:05:24 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -47,6 +47,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
OBJS = $(PLUGIN).o
### The main target:
all: libvdr-$(PLUGIN).so
### Implicit rules:
%.o: %.c
@@ -63,8 +67,6 @@ $(DEPFILE): Makefile
### Targets:
all: libvdr-$(PLUGIN).so
libvdr-$(PLUGIN).so: $(OBJS)
$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)

4
PLUGINS/src/osddemo/osddemo.c
View File

@@ -3,12 +3,12 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: osddemo.c 1.3 2004/05/16 09:28:51 kls Exp $
* $Id: osddemo.c 1.4 2007/08/15 13:17:55 kls Exp $
*/
#include <vdr/plugin.h>
static const char *VERSION = "0.1.1";
static const char *VERSION = "0.1.2";
static const char *DESCRIPTION = "Demo of arbitrary OSD setup";
static const char *MAINMENUENTRY = "Osd Demo";

5
PLUGINS/src/servicedemo/HISTORY
View File

@@ -4,3 +4,8 @@ VDR Plugin 'servicedemo' Revision History
2005-08-21: Version 0.1.1
- Initial revision.
2007-08-15: Version 0.1.2
- Moved the "all" target in the Makefile before the "Implicit rules",
so that a plain "make" will compile everything.

8
PLUGINS/src/servicedemo/Makefile
View File

@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
# $Id: Makefile 1.8 2006/09/09 12:38:35 kls Exp $
# $Id: Makefile 1.9 2007/08/15 13:05:42 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -49,6 +49,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
OBJS = $(PLUGIN1).o $(PLUGIN2).o
### The main target:
all: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so
### Implicit rules:
%.o: %.c
@@ -65,8 +69,6 @@ $(DEPFILE): Makefile
### Targets:
all: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so
libvdr-$(PLUGIN1).so: $(PLUGIN1).o
$(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@
@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)

4
PLUGINS/src/servicedemo/svccli.c
View File

@@ -3,14 +3,14 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: svccli.c 1.1 2005/08/21 10:44:29 kls Exp $
* $Id: svccli.c 1.2 2007/08/15 13:18:08 kls Exp $
*/
#include <stdlib.h>
#include <vdr/interface.h>
#include <vdr/plugin.h>
static const char *VERSION = "0.1.1";
static const char *VERSION = "0.1.2";
static const char *DESCRIPTION = "Service demo client";
static const char *MAINMENUENTRY = "Service demo";

4
PLUGINS/src/servicedemo/svcsvr.c
View File

@@ -3,14 +3,14 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: svcsvr.c 1.1 2005/08/21 10:44:24 kls Exp $
* $Id: svcsvr.c 1.2 2007/08/15 13:18:59 kls Exp $
*/
#include <stdlib.h>
#include <vdr/interface.h>
#include <vdr/plugin.h>
static const char *VERSION = "0.1.1";
static const char *VERSION = "0.1.2";
static const char *DESCRIPTION = "Service demo server";
class cPluginSvcSvr : public cPlugin {

6
PLUGINS/src/skincurses/HISTORY
View File

@@ -51,3 +51,9 @@ VDR Plugin 'skincurses' Revision History
2007-07-20: Version 0.1.2
- Fixed clearing color buttons.
2007-08-15: Version 0.1.3
- Moved the "all" target in the Makefile before the "Implicit rules",
so that a plain "make" will compile everything.
- Added internationalization.

34
PLUGINS/src/skincurses/Makefile
View File

@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
# $Id: Makefile 1.8 2007/06/10 16:19:08 kls Exp $
# $Id: Makefile 1.11 2007/08/19 14:19:07 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -47,6 +47,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
OBJS = $(PLUGIN).o
### The main target:
all: libvdr-$(PLUGIN).so i18n
### Implicit rules:
%.o: %.c
@@ -61,9 +65,32 @@ $(DEPFILE): Makefile
-include $(DEPFILE)
### Targets:
### Internationalization (I18N):
all: libvdr-$(PLUGIN).so
PODIR = po
LOCALEDIR = $(VDRDIR)/locale
I18Npo = $(wildcard $(PODIR)/*.po)
I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
I18Ndirs = $(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='<vdr-bugs@cadsoft.de>' -o $@ $(wildcard *.c)
$(I18Npo): $(I18Npot)
msgmerge -U --no-wrap -F --backup=none -q $@ $<
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
### Targets:
libvdr-$(PLUGIN).so: $(OBJS)
$(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@
@@ -78,4 +105,5 @@ dist: clean
@echo Distribution package created as $(PACKAGE).tgz
clean:
@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~

32
PLUGINS/src/skincurses/po/de_DE.po Normal file
View File

@@ -0,0 +1,32 @@
# VDR plugin language source file.
# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
# This file is distributed under the same license as the VDR package.
# Klaus Schmidinger <kls@cadsoft.de>, 2007
#
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-15 16:04+0200\n"
"PO-Revision-Date: 2007-08-15 16:07+0200\n"
"Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
#: skincurses.c:15
msgid "A text only skin"
msgstr "Eine reine Text-Oberfl<66>che"
#: skincurses.c:566
msgid "Key$Mute"
msgstr "Stumm"
#: skincurses.c:569
msgid "Volume "
msgstr "Lautst<73>rke"
#: skincurses.c:699
msgid "Text mode"
msgstr "Text-Modus"

32
PLUGINS/src/skincurses/po/fi_FI.po Normal file
View File

@@ -0,0 +1,32 @@
# VDR plugin language source file.
# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
# This file is distributed under the same license as the VDR package.
# Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2007
#
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-14 20:54+0300\n"
"PO-Revision-Date: 2007-08-14 20:48+0300\n"
"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
#: skincurses.c:15
msgid "A text only skin"
msgstr "Tekstipohjainen ulkoasu"
#: skincurses.c:566
msgid "Key$Mute"
msgstr "Mykistys"
#: skincurses.c:569
msgid "Volume "
msgstr "<22><>nenvoimakkuus "
#: skincurses.c:699
msgid "Text mode"
msgstr "Teksti"

10
PLUGINS/src/skincurses/skincurses.c
View File

@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: skincurses.c 1.15 2007/07/20 14:45:07 kls Exp $
* $Id: skincurses.c 1.17 2007/08/15 14:01:54 kls Exp $
*/
#include <ncurses.h>
@@ -11,8 +11,8 @@
#include <vdr/plugin.h>
#include <vdr/skins.h>
static const char *VERSION = "0.1.2";
static const char *DESCRIPTION = "A text only skin";
static const char *VERSION = "0.1.3";
static const char *DESCRIPTION = trNOOP("A text only skin");
static const char *MAINMENUENTRY = NULL;
// --- cCursesFont -----------------------------------------------------------
@@ -738,13 +738,13 @@ public:
cPluginSkinCurses(void);
virtual ~cPluginSkinCurses();
virtual const char *Version(void) { return VERSION; }
virtual const char *Description(void) { return DESCRIPTION; }
virtual const char *Description(void) { return tr(DESCRIPTION); }
virtual const char *CommandLineHelp(void);
virtual bool ProcessArgs(int argc, char *argv[]);
virtual bool Initialize(void);
virtual bool Start(void);
virtual void Housekeeping(void);
virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; }
virtual const char *MainMenuEntry(void) { return tr(MAINMENUENTRY); }
virtual cOsdObject *MainMenuAction(void);
virtual cMenuSetupPage *SetupMenu(void);
virtual bool SetupParse(const char *Name, const char *Value);

5
PLUGINS/src/sky/HISTORY
View File

@@ -54,3 +54,8 @@ VDR Plugin 'sky' Revision History
use the new option -U of getskyepg.pl to have the information added to the URL
as a query string.
- The getskyepg.pl script now replaces "&amp;" with "&".
2007-08-15:Version 0.3.6
- Moved the "all" target in the Makefile before the "Implicit rules",
so that a plain "make" will compile everything.

8
PLUGINS/src/sky/Makefile
View File

@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
# $Id: Makefile 1.9 2006/09/09 12:38:35 kls Exp $
# $Id: Makefile 1.10 2007/08/15 13:06:08 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -47,6 +47,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
OBJS = $(PLUGIN).o
### The main target:
all: libvdr-$(PLUGIN).so
### Implicit rules:
%.o: %.c
@@ -63,8 +67,6 @@ $(DEPFILE): Makefile
### Targets:
all: libvdr-$(PLUGIN).so
libvdr-$(PLUGIN).so: $(OBJS)
$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)

4
PLUGINS/src/sky/sky.c
View File

@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: sky.c 1.13 2006/03/26 09:21:10 kls Exp $
* $Id: sky.c 1.14 2007/08/15 13:19:24 kls Exp $
*/
#include <sys/socket.h>
@@ -15,7 +15,7 @@
#include <vdr/plugin.h>
#include <vdr/sources.h>
static const char *VERSION = "0.3.5";
static const char *VERSION = "0.3.6";
static const char *DESCRIPTION = "Sky Digibox interface";
// --- cDigiboxDevice --------------------------------------------------------

5
PLUGINS/src/status/HISTORY
View File

@@ -35,3 +35,8 @@ VDR Plugin 'status' Revision History
2005-12-31: Version 0.2.0
- API change in cStatus.
2007-08-15: Version 0.2.1
- Moved the "all" target in the Makefile before the "Implicit rules",
so that a plain "make" will compile everything.

8
PLUGINS/src/status/Makefile
View File

@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
# $Id: Makefile 1.13 2006/09/09 12:38:35 kls Exp $
# $Id: Makefile 1.14 2007/08/15 13:06:17 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -47,6 +47,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
OBJS = $(PLUGIN).o
### The main target:
all: libvdr-$(PLUGIN).so
### Implicit rules:
%.o: %.c
@@ -63,8 +67,6 @@ $(DEPFILE): Makefile
### Targets:
all: libvdr-$(PLUGIN).so
libvdr-$(PLUGIN).so: $(OBJS)
$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)

4
PLUGINS/src/status/status.c
View File

@@ -3,13 +3,13 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: status.c 1.8 2005/12/31 15:19:45 kls Exp $
* $Id: status.c 1.9 2007/08/15 13:19:44 kls Exp $
*/
#include <vdr/plugin.h>
#include <vdr/status.h>
static const char *VERSION = "0.2.0";
static const char *VERSION = "0.2.1";
static const char *DESCRIPTION = "Status monitor test";
static const char *MAINMENUENTRY = NULL;

5
PLUGINS/src/svdrpdemo/HISTORY
View File

@@ -8,3 +8,8 @@ VDR Plugin 'svdrpdemo' Revision History
2005-08-28: Version 0.0.2
- Removed unused MAINMENUENTRY.
2007-08-15: Version 0.0.3
- Moved the "all" target in the Makefile before the "Implicit rules",
so that a plain "make" will compile everything.

8
PLUGINS/src/svdrpdemo/Makefile
View File

@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
# $Id: Makefile 1.7 2006/09/09 12:38:35 kls Exp $
# $Id: Makefile 1.8 2007/08/15 13:06:28 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -47,6 +47,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
OBJS = $(PLUGIN).o
### The main target:
all: libvdr-$(PLUGIN).so
### Implicit rules:
%.o: %.c
@@ -63,8 +67,6 @@ $(DEPFILE): Makefile
### Targets:
all: libvdr-$(PLUGIN).so
libvdr-$(PLUGIN).so: $(OBJS)
$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)

4
PLUGINS/src/svdrpdemo/svdrpdemo.c
View File

@@ -3,12 +3,12 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: svdrpdemo.c 1.2 2005/08/28 21:11:14 kls Exp $
* $Id: svdrpdemo.c 1.3 2007/08/15 13:19:57 kls Exp $
*/
#include <vdr/plugin.h>
static const char *VERSION = "0.0.2";
static const char *VERSION = "0.0.3";
static const char *DESCRIPTION = "How to add SVDRP support to a plugin";
class cPluginSvdrpdemo : public cPlugin {