[vdr-plugin-epgsync] 01/03: Imported Upstream version 1.0.0
Tobias Grimm
tiber-guest at alioth.debian.org
Sun Sep 22 20:52:37 UTC 2013
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to branch master
in repository vdr-plugin-epgsync.
commit 0e2bdde9217c08d7d552b6b09898f717cfd70752
Author: etobi <git at e-tobi.net>
Date: Sun Sep 22 22:47:19 2013 +0200
Imported Upstream version 1.0.0
---
HISTORY | 8 +
Makefile | 89 ++---
README | 31 +-
epgsync.c | 7 +-
i18n.c | 499 ---------------------------
i18n.h | 19 -
patches/vdr-1.3.39-1.4.1-add_schedule.patch | 12 -
po/de_DE.po | 6 +-
po/it_IT.po | 7 +-
po/sk_SK.po | 65 ++++
setup.c | 8 +-
setup.h | 2 -
svdrpservice.h | 40 +++
thread.c | 17 +-
thread.h | 2 +-
15 files changed, 186 insertions(+), 626 deletions(-)
diff --git a/HISTORY b/HISTORY
index a0a3c53..1473ada 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,14 @@
VDR Plugin 'epgsync' Revision History
-----------------------------------------
+2013-06-07: Version 1.0.0
+
+- Updated Makefile for VDR 1.7.36 and dropped compatibility with older VDR
+ versions
+- Updated SVDRP port. Default is now 0 (i.e. use svdrpservice).
+- Added Slovak translation (thanks to Milan Hrala)
+- Included a copy of svdrpservice.h
+
2010-04-19: Version 0.0.4
- VDR 1.7.13 obsoletes pluginparam-patch. Analog and IPTV now have dedicated
diff --git a/Makefile b/Makefile
index 099cc4b..51de146 100644
--- a/Makefile
+++ b/Makefile
@@ -6,107 +6,110 @@
# 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 = epgsync
### 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 ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
-
### The directory environment:
-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
+# 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 = $(call PKGCFG,libdir)
+LOCDIR = $(call PKGCFG,locdir)
+PLGCFG = $(call PKGCFG,plgcfg)
+#
+TMPDIR ?= /tmp
-### Allow user defined options to overwrite defaults:
+### The compiler options:
--include $(VDRDIR)/Make.config
+export CFLAGS = $(call PKGCFG,cflags)
+export CXXFLAGS = $(call PKGCFG,cxxflags)
-### The version number of VDR's plugin API (taken from VDR's "config.h"):
+### The version number of VDR's plugin API:
-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+APIVERSION = $(call PKGCFG,apiversion)
+
+### Allow user defined options to overwrite defaults:
-### Test whether VDR has locale support
-VDRLOCALE = $(shell grep '^LOCALEDIR' $(VDRDIR)/Makefile)
+-include $(PLGCFG)
### The name of the distribution archive:
ARCHIVE = $(PLUGIN)-$(VERSION)
PACKAGE = vdr-$(ARCHIVE)
+### The name of the shared object file:
+
+SOFILE = libvdr-$(PLUGIN).so
+
### Includes and Defines (add further entries here):
-INCLUDES += -I$(VDRDIR)/include
+INCLUDES +=
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
### The object files (add further files here):
-OBJS = $(PLUGIN).o thread.o setup.o i18n.o
+OBJS = $(PLUGIN).o thread.o setup.o
-.PHONY: all i18n dist clean
-all: libvdr-$(PLUGIN).so i18n
+### The main target:
+
+all: $(SOFILE) i18n
### Implicit rules:
%.o: %.c
- $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+ $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
-# Dependencies:
+### Dependencies:
MAKEDEP = $(CXX) -MM -MG
DEPFILE = .dependencies
$(DEPFILE): Makefile
- @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+ @$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
-include $(DEPFILE)
### Internationalization (I18N):
PODIR = po
-
-ifneq ($(strip $(VDRLOCALE)),)
-
-LOCALEDIR = $(VDRDIR)/locale
I18Npo = $(wildcard $(PODIR)/*.po)
-I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+I18Nmsgs = $(addprefix $(DESTDIR)$(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 --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdrdev at schmirler.de>' -o $@ $^
+ xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<vdrdev at schmirler.de>' -o $@ `ls $^`
%.po: $(I18Npot)
- msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+ msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
@touch $@
-$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
- @mkdir -p $(dir $@)
- cp $< $@
-
-i18n: $(I18Nmsgs)
+$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+ install -D -m644 $< $@
-else
+.PHONY: i18n
+i18n: $(I18Nmo) $(I18Npot)
-i18n:
- @### nothing to do
-endif
+install-i18n: $(I18Nmsgs)
### Targets:
-libvdr-$(PLUGIN).so: $(OBJS)
- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
- @cp $@ $(LIBDIR)/$@.$(APIVERSION)
+$(SOFILE): $(OBJS)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+
+install-lib: $(SOFILE)
+ install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
+
+install: install-lib install-i18n
-dist: clean
+dist: $(I18Npo) clean
@-rm -rf $(TMPDIR)/$(ARCHIVE)
@mkdir $(TMPDIR)/$(ARCHIVE)
@cp -a * $(TMPDIR)/$(ARCHIVE)
diff --git a/README b/README
index 6922050..084cc02 100644
--- a/README
+++ b/README
@@ -16,35 +16,23 @@ Requirements:
-------------
- plugin svdrpservice >= 0.0.2 (available via http://vdr.schmirler.de)
-Known issues:
-------------
-1) VTP does not always deliver the expected events for "LSTE now" and
-"LSTE next".
-
-2) In VDR 1.3.39 up to 1.4.1-2 there's an issue when adding EPG to a
-channel which had no EPG previously. The new EPG entries won't show
-up whenever they are internally addressed "by channel". The complete
-EPG dump contains all entries, so they will become available after
-the next VDR restart. Usually this problem will affect only those of
-you who start with an empty epg.data and whenever you have added a
-new channel. In the patches subdirectory you will find a fix for this
-problem.
-
Installation:
-------------
- cd VDR/PLUGINS/src
- tar xzf vdr-epgsync-<VERSION>.tgz
- ln -sf epgsync-<VERSION> epgsync
-If you didn't do that already (otherwise svdrpservice.h is missing):
-- tar xzf vdr-svdrpservice-<VERSION>.tgz
-- ln -sf svdrpservice-<VERSION> svdrpservice
-
Now compile and install epgsync (and svdrpservice) as usual and add
both plugins to the script starting your VDR (e.g. runvdr). No options
required, so simply append:
- -Pepgsync -Psvdrpservice
+ -P epgsync -P svdrpservice
+
+Since svdrpservice-0.0.4 you can already specify the server IP and port
+on the commandline. It will then serve as the default for all plugins
+using svdrpservice:
+
+ -P remoteosd -P 'svdrpservice 192.0.2.1:6419'
Check the svdrphosts.conf (or streamdevhosts.conf) file on the remote
VDR: The IP of the VDR running epgsync must be listed or otherwise the
@@ -61,8 +49,9 @@ trigger an epgsync at any time. If you don't need this or if you are
using a keymakro to call the mainmenu entry you can hide it with this
option.
- Server IP: Enter the IP of the remote VDR
-- Server port: Defaults to 2001 (SVDRP). If you prefer VTP, its default
-port is 2004
+- Server port: Since VDR 1.7.15 the default port is 6419, before it
+was 2001. If you prefer VTP, its default port is 2004. The default
+value 0 uses the port configured in svdrpservice.
- Connection attempts: Defines how often epgsync will try to establish
the connection to the server. For most users the default 1 should be
sufficient. However if e.g. the client uses WOL to wake the server it
diff --git a/epgsync.c b/epgsync.c
index 5cf8fcd..ae68ead 100644
--- a/epgsync.c
+++ b/epgsync.c
@@ -7,11 +7,11 @@
*/
#include <vdr/plugin.h>
-#include "i18n.h"
+#include <vdr/i18n.h>
#include "setup.h"
#include "thread.h"
-static const char *VERSION = "0.0.4";
+static const char *VERSION = "1.0.0";
static const char *DESCRIPTION = trNOOP("Import EPG of an other VDR");
static const char *MAINMENUENTRY = trNOOP("Synchronize EPG");
@@ -76,9 +76,6 @@ bool cPluginEpgsync::Initialize(void)
bool cPluginEpgsync::Start(void)
{
// Start any background activities the plugin shall perform.
-#if VDRVERSNUM < 10507
- RegisterI18n(Phrases);
-#endif
if (EpgSyncSetup.syncOnStart) {
EpgSyncThread->Start();
}
diff --git a/i18n.c b/i18n.c
deleted file mode 100644
index 066ace0..0000000
--- a/i18n.c
+++ /dev/null
@@ -1,499 +0,0 @@
-#include "i18n.h"
-
-#if VDRVERSNUM < 10507
-const tI18nPhrase Phrases[] = {
-// START I18N - automatically generated by po2i18n.pl
- { "Connection attempts",
- "Verbindungsversuche",
- "",
- "Tentativo connessione",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
- { "EPG sync on startup",
- "EPG sync beim Starten",
- "",
- "Sincronizza EPG all'avvio",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
- { "EpgSync: Unable to connect to Server",
- "EpgSync: Verbindung zum Server fehlgeschlagen",
- "",
- "EpgSync: Impossibile connettersi al server",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
- { "Hide mainmenu entry",
- "Hauptmen�eintrag verstecken",
- "",
- "Nascondi voce menu principale",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
- { "Import EPG of an other VDR",
- "EPG eines anderen VDR importieren",
- "",
- "Importa EPG da un'altra VDR",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
- { "Map channels by",
- "Kan�le zuordnen nach",
- "",
- "Mappa canali per",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
- { "Server IP",
- "Server IP",
- "",
- "IP server",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
- { "Server port",
- "Server Port",
- "",
- "Porta server",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
- { "Sync channel by channel",
- "Kanalweise synchronisieren",
- "",
- "Sincronizza canale per canale",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
- { "Synchronize EPG",
- "EPG synchronisieren",
- "",
- "Sincronizza EPG",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
- { "Target channels",
- "Ziel-Kan�le",
- "",
- "Canali di destinazione",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
- { "Update \"now\" and \"next\" first",
- "\"Jetzt\" und \"N�chste\" zuerst",
- "",
- "Agg. prima Adesso/Prossimi",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
- { "all",
- "alle",
- "",
- "tutti",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
- { "analog",
- "analog",
- "",
- "analogici",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
-// END I18N - automatically generated by po2i18n.pl
-{ NULL }
-};
-#endif
diff --git a/i18n.h b/i18n.h
deleted file mode 100644
index 75462ba..0000000
--- a/i18n.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * i18n.h: translations
- *
- * See the README file for copyright information and how to reach the author.
- */
-
-#ifndef _EPGSYNC_I18N__H
-#define _EPGSYNC_I18N__H
-
-#include <vdr/config.h>
-#include <vdr/i18n.h>
-
-#if VDRVERSNUM < 10507
-#define trNOOP(s) (s)
-#define trVDR(s) tr(s)
-extern const tI18nPhrase Phrases[];
-#endif
-
-#endif //_EPGSYNC_I18N__H
diff --git a/patches/vdr-1.3.39-1.4.1-add_schedule.patch b/patches/vdr-1.3.39-1.4.1-add_schedule.patch
deleted file mode 100644
index c849858..0000000
--- a/patches/vdr-1.3.39-1.4.1-add_schedule.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- epg.c.orig 2006-07-09 00:05:37.118736336 +0200
-+++ epg.c 2006-07-09 00:10:05.370955800 +0200
-@@ -1023,6 +1023,9 @@
- if (!p) {
- p = new cSchedule(ChannelID);
- Add(p);
-+ cChannel *channel = Channels.GetByChannelID(ChannelID);
-+ if (channel)
-+ channel->schedule = p;
- }
- return p;
- }
diff --git a/po/de_DE.po b/po/de_DE.po
index 0d22681..5b54063 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,10 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdrdev at schmirler.de>\n"
-"POT-Creation-Date: 2009-02-03 11:21+0100\n"
+"POT-Creation-Date: 2013-05-01 00:01+0200\n"
"PO-Revision-Date: 2009-02-03 11:23+0100\n"
"Last-Translator: Frank Schmirler <vdrdev at schmirler.de>\n"
"Language-Team: <vdr at linuxtv.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -36,6 +37,9 @@ msgstr "Server IP"
msgid "Server port"
msgstr "Server Port"
+msgid "from svdrpservice"
+msgstr "aus svdrpservice"
+
msgid "Connection attempts"
msgstr "Verbindungsversuche"
diff --git a/po/it_IT.po b/po/it_IT.po
index 083deef..6855e48 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -7,10 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdrdev at schmirler.de>\n"
-"POT-Creation-Date: 2009-02-03 11:21+0100\n"
+"POT-Creation-Date: 2013-05-01 00:01+0200\n"
"PO-Revision-Date: 2009-02-09 19:54+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian at tiscali.it>\n"
"Language-Team: <vdr at linuxtv.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -36,6 +37,9 @@ msgstr "IP server"
msgid "Server port"
msgstr "Porta server"
+msgid "from svdrpservice"
+msgstr "da svdrpservice"
+
msgid "Connection attempts"
msgstr "Tentativo connessione"
@@ -56,4 +60,3 @@ msgstr "Canali di destinazione"
msgid "EpgSync: Unable to connect to Server"
msgstr "EpgSync: Impossibile connettersi al server"
-
diff --git a/po/sk_SK.po b/po/sk_SK.po
new file mode 100755
index 0000000..82d0e79
--- /dev/null
+++ b/po/sk_SK.po
@@ -0,0 +1,65 @@
+# VDR epgsync plugin language source file.
+# Copyright (C) 2013 Frank Schmirler <vdrdev at schmirler.de>
+# This file is distributed under the same license as the epgsync package.
+# Milan Hrala <hrala.milan at gmail.com>, 2013
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr-epgsync 0.0.4\n"
+"Report-Msgid-Bugs-To: <vdrdev at schmirler.de>\n"
+"POT-Creation-Date: 2013-05-01 00:01+0200\n"
+"PO-Revision-Date: 2013-03-12 23:39+0100\n"
+"Last-Translator: Milan Hrala <hrala.milan at gmail.com>\n"
+"Language-Team: Slovak\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Slovak\n"
+"X-Poedit-Country: SLOVAKIA\n"
+"X-Poedit-SourceCharset: iso-8859-2\n"
+
+msgid "Import EPG of an other VDR"
+msgstr "Imprtovanie EPG z in�ho VDR"
+
+msgid "Synchronize EPG"
+msgstr "Synchronizova� EPG"
+
+msgid "all"
+msgstr "v�etko"
+
+msgid "analog"
+msgstr "anal�g"
+
+msgid "Hide mainmenu entry"
+msgstr "Schova� polo�ku v hlavnom menu"
+
+msgid "Server IP"
+msgstr "IP servera"
+
+msgid "Server port"
+msgstr "Port servera"
+
+msgid "from svdrpservice"
+msgstr "zo svdrpservice"
+
+msgid "Connection attempts"
+msgstr "Pokusy o pripojenie"
+
+msgid "Update \"now\" and \"next\" first"
+msgstr "Aktualizova� \"teraz\" a \"potom\" najprv"
+
+msgid "Sync channel by channel"
+msgstr "Synchronyzova� kan�l pod�a kan�la"
+
+msgid "EPG sync on startup"
+msgstr "Synchronizova� EPG pri �tarte"
+
+msgid "Map channels by"
+msgstr "Mapova� kan�ly pod�a"
+
+msgid "Target channels"
+msgstr "Zamera� kan�ly"
+
+msgid "EpgSync: Unable to connect to Server"
+msgstr "EpgSync: Nemo�e sa pripoji� na server"
diff --git a/setup.c b/setup.c
index 9056d0c..a7a5126 100644
--- a/setup.c
+++ b/setup.c
@@ -7,7 +7,7 @@
*/
#include <vdr/menuitems.h>
-#include "i18n.h"
+#include <vdr/i18n.h>
#include "setup.h"
cEpgSyncSetup EpgSyncSetup;
@@ -15,7 +15,7 @@ cEpgSyncSetup EpgSyncSetup;
cEpgSyncSetup::cEpgSyncSetup() {
hideMainMenuEntry = 0;
serverIp[0] = 0;
- serverPort = 2001;
+ serverPort = 0;
connectAttempts = 1;
nowNext = 0;
channelByChannel = 0;
@@ -85,13 +85,11 @@ cEpgSyncMenuSetup::cEpgSyncMenuSetup() {
channelTypeTexts[ctDVB_S] = "DVB-S";
channelTypeTexts[ctDVB_T] = "DVB-T";
channelTypeTexts[ctAnalog] = tr("analog");
-#if defined(PLUGINPARAMPATCHVERSNUM) || APIVERSNUM >= 10713
channelTypeTexts[ctIptv] = "IP";
-#endif
Add(new cMenuEditBoolItem(tr("Hide mainmenu entry"), &setupTmp.hideMainMenuEntry));
Add(new cMenuEditStrItem(tr("Server IP"), setupTmp.serverIp, 15, ".1234567890"));
- Add(new cMenuEditIntItem(tr("Server port"), &setupTmp.serverPort, 1, 65535));
+ Add(new cMenuEditIntItem(tr("Server port"), &setupTmp.serverPort, 0, 65535, tr("from svdrpservice")));
Add(new cMenuEditIntItem(tr("Connection attempts"), &setupTmp.connectAttempts, 0, 10));
Add(new cMenuEditBoolItem(tr("Update \"now\" and \"next\" first"), &setupTmp.nowNext));
Add(new cMenuEditBoolItem(tr("Sync channel by channel"), &setupTmp.channelByChannel));
diff --git a/setup.h b/setup.h
index 8f8fc11..8dd6638 100644
--- a/setup.h
+++ b/setup.h
@@ -14,9 +14,7 @@
enum eRedirectChannelModes { rcmId, rcmIdName, rcmNameId, rcm_Count };
enum eChannelTypes {
ctAll, ctDVB_C, ctDVB_S, ctDVB_T, ctAnalog,
-#if defined(PLUGINPARAMPATCHVERSNUM) || APIVERSNUM >= 10713
ctIptv,
-#endif
ct_Count
};
diff --git a/svdrpservice.h b/svdrpservice.h
new file mode 100644
index 0000000..239128c
--- /dev/null
+++ b/svdrpservice.h
@@ -0,0 +1,40 @@
+/*
+ * svdrpservice.h: Public interface of the plugin's services
+ *
+ * See the README file for copyright information and how to reach the author.
+ */
+
+#ifndef _SVDRPSERVICE__H
+#define _SVDRPSERVICE__H
+
+#include <vdr/tools.h>
+
+class cLine: public cListObject {
+ private:
+ char *Line;
+ public:
+ const char *Text() { return Line; }
+ cLine(const char *s) { Line = s ? strdup(s) : NULL; };
+ virtual ~cLine() { if (Line) free(Line); };
+};
+
+struct SvdrpConnection_v1_0 {
+//in+out
+ cString serverIp;
+ unsigned short serverPort;
+//in
+ bool shared;
+//in+out
+ int handle;
+};
+
+struct SvdrpCommand_v1_0 {
+//in
+ cString command;
+ int handle;
+//out
+ cList<cLine> reply;
+ unsigned short responseCode;
+};
+
+#endif //_SVDRPSERVICE__H
diff --git a/thread.c b/thread.c
index 7bf6f8d..08d2683 100644
--- a/thread.c
+++ b/thread.c
@@ -2,11 +2,11 @@
#include <vdr/epg.h>
#include <vdr/channels.h>
#include <vdr/skins.h>
+#include <vdr/i18n.h>
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
#include <string.h>
-#include "i18n.h"
#include "setup.h"
#include "thread.h"
@@ -29,29 +29,14 @@ bool IsType(const cChannel* Channel, eChannelTypes Type)
return Type == ctAnalog;
else
return Type == ctDVB_C;
-#if APIVERSNUM >= 10713
case 'I':
return Type == ctIptv;
-#endif
-#if defined(PLUGINPARAMPATCHVERSNUM)
- case 'P':
- // Patched VDR - PluginParam() contains ID of the
- // plugin which provides the channel
- if (strncasecmp(Channel->PluginParam(), "PVRINPUT|", 9) == 0)
- return Type == ctAnalog;
- else if (strncasecmp(Channel->PluginParam(), "IPTV|", 5) == 0)
- return Type == ctIptv;
- else
- return false;
-#endif
case 'S':
return Type == ctDVB_S;
case 'T':
return Type == ctDVB_T;
-#if APIVERSNUM >= 10713
case 'V':
return Type == ctAnalog;
-#endif
default:
return false;
}
diff --git a/thread.h b/thread.h
index af896bc..3e31040 100644
--- a/thread.h
+++ b/thread.h
@@ -10,7 +10,7 @@
#include <vdr/thread.h>
#include <vdr/tools.h>
#include <vdr/plugin.h>
-#include "../svdrpservice/svdrpservice.h"
+#include "svdrpservice.h"
class cEpgSyncThread: public cThread {
private:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-epgsync.git
More information about the pkg-vdr-dvb-changes
mailing list