[vdr-plugin-svdrpservice] 01/01: Imported Upstream version 1.0.0
Tobias Grimm
tiber-guest at alioth.debian.org
Sun Sep 15 08:40:58 UTC 2013
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to branch upstream
in repository vdr-plugin-svdrpservice.
commit 9d96fe868e6a791bb5a5c0e9ba2e9a478030d6af
Author: etobi <git at e-tobi.net>
Date: Sun Sep 15 10:31:56 2013 +0200
Imported Upstream version 1.0.0
---
HISTORY | 13 +++
Makefile | 89 +++++++++--------
README | 37 +++----
connection.c | 80 ---------------
connection.h | 4 -
i18n.c | 149 ----------------------------
i18n.h | 19 ----
patches/vdr-1.2.4-1.4.1-svdrp_eof.patch | 16 ---
patches/vdr-1.4.x-svdrp_charset.diff | 11 --
patches/vdr-1.5.3-1.6.0-svdrp_charset.diff | 11 --
po/de_DE.po | 3 +-
po/it_IT.po | 3 +-
po/sk_SK.po | 31 ++++++
setup.c | 6 +-
svdrpservice.c | 11 +-
15 files changed, 116 insertions(+), 367 deletions(-)
diff --git a/HISTORY b/HISTORY
index d390a6c..de738f9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,7 +1,17 @@
VDR Plugin 'svdrpservice' Revision History
-----------------------------------------
+2013-06-07: Version 1.0.0
+
+- Updated Makefile for VDR 1.7.36 and dropped compatibility with older VDR
+ versions
+- Added Slovak translation (thanks to Milan Hrala)
+- Updated README. With the new VDR 1.7.34 Makefiles I think it's better to
+ include a copy of svdrpservice.h in every plugin using svdrpservice.
+- Updated default SVDRP port to new VDR default 6419.
+
2008-09-25: Version 0.0.4
+
- Italian translation (thanks to Diego Pierotto)
- Commandline parameter for default server IP and port (suggested by
kris at vdrportal)
@@ -15,6 +25,7 @@ VDR Plugin 'svdrpservice' Revision History
- Configurable timeouts
2007-03-06: Version 0.0.3
+
- Dynamic buffer size
- New setup options: default server IP and port
- Silent change of service interface: serverIP and serverPort are now
@@ -24,6 +35,7 @@ VDR Plugin 'svdrpservice' Revision History
- Non-blocking connect
2006-07-24: Version 0.0.2
+
- Added locking. svdrpservice is now threadsafe
- Must use cFile::FileReady instead of cFile::Ready. Otherwise a
command may return without delivering the reply
@@ -36,4 +48,5 @@ VDR Plugin 'svdrpservice' Revision History
server ignoring client side close
2006-06-01: Version 0.0.1
+
- Initial revision.
diff --git a/Makefile b/Makefile
index ee4bf10..e4bb22f 100644
--- a/Makefile
+++ b/Makefile
@@ -6,52 +6,58 @@
# 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 = svdrpservice
### 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:
+
+export CFLAGS = $(call PKGCFG,cflags)
+export CXXFLAGS = $(call PKGCFG,cxxflags)
--include $(VDRDIR)/Make.config
+### The version number of VDR's plugin API:
-### The version number of VDR's plugin API (taken from VDR's "config.h"):
+APIVERSION = $(call PKGCFG,apiversion)
-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+### 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 connection.o setup.o i18n.o
+OBJS = $(PLUGIN).o connection.o setup.o
+
+### The main target:
-.PHONY: all i18n dist clean
-all: libvdr-$(PLUGIN).so i18n
+all: $(SOFILE) i18n
### Enable debugging?
ifdef SVDRPSERVICE_DEBUG
@@ -65,57 +71,54 @@ endif
### 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 $< $@
+$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+ install -D -m644 $< $@
-i18n: $(I18Nmsgs)
+.PHONY: i18n
+i18n: $(I18Nmo) $(I18Npot)
-else
-
-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 91b5b8e..9489aad 100644
--- a/README
+++ b/README
@@ -31,9 +31,15 @@ settings in every plugin.
There's also a commandline option for the default server IP and port. Use
something like that:
- vdr ... -P 'svdrpservice 192.168.0.1:2001' ...
-The port is optional and defaults to 2001. So this is equivalent:
- vdr ... -P 'svdrpservice 192.168.0.1' ...
+
+ vdr ... -P 'svdrpservice 192.0.2.1:6419' ...
+
+The port is optional and defaults to 6419. So this is equivalent:
+
+ vdr ... -P 'svdrpservice 192.0.2.1' ...
+
+Note that the default SVDRP port on VDR before 1.7.15 was 2001.
+
When using the commandline option, the options for default server IP and
port in the plugin setup will become read-only.
@@ -54,24 +60,9 @@ If the client VDR (the one running svdrpservice) and the server VDR (the
one svdrpservice connects to) use different charsets, svdrpservice will do
an on the fly conversion of everything it sends and receives.
-The feature relies on the server reporting its charset as part of the SVDRP
-greeting line. A VDR 1.6.1+ and 1.7.1+ will do this out of the box. In the
-patches subdirectory of the svdrpservice source distribution you will find
-patches for older VDR releases (vdr-1.5.3-1.6.0-svdrp_charset.diff and
-vdr-1.4.x-svdrp_charset.diff). Note that you only need to patch the server
-side. There's no need to patch the VDR instance running svdrpservice.
-
-Known issue:
-------------
-VDR 1.4.1-2 fixes a bug in the SVDRP server code which was introduced
-in VDR 1.2.2. The server ignored client side closes of the connection.
-The svdrpclient plugin is likely to trigger that bug as it will
-disconnect if the server doesn't reply in time. In the patches
-subdirectory you will find a patch for VDR 1.4.1-1 and older.
-
Usage:
------
-Include the header file "svdrpservice.h" if you want to use svdrpservice
+Add a copy of header file "svdrpservice.h" if you want to use svdrpservice
in your plugin. Call the "Service" method to interact with svdrpservice.
There are two services available:
1. SvdrpConnection gets or releases an SVDRP server connection
@@ -80,7 +71,7 @@ There are two services available:
Typically your plugin will require the following code snippets:
// include the svdrpservice header file
-#include "../svdrpservice/svdrpservice.h"
+#include "svdrpservice.h"
// get the svdrpservice plugin
cPlugin *svdrpservice = cPluginManager::GetPlugin("svdrpservice");
@@ -89,9 +80,11 @@ if (svdrpservice == NULL) // TODO: ERROR
// get a connection handle. This will open the connection to the server
// or for a shared connection simply add a referer to the existing one.
SvdrpConnection_v1_0 conn;
-conn.serverIp = "192.168.0.1"; // you must not use 127.0.0.1
+conn.serverIp = "192.0.2.1"; // you must not use 127.0.0.1
// use "0.0.0.0" or "" for setup default
-conn.serverPort = 2001; // 2001 for SVDRP, 2004 for VTP
+conn.serverPort = 6419; // 6419 for SVDRP since VDR 1.7.15,
+ // 2001 for SVDRP before VDR 1.7.15,
+ // 2004 for VTP
// 0 to use svdrpservice setup default
conn.shared = true; // share connection with others
conn.handle = -1; // Handle < 0: get me a handle
diff --git a/connection.c b/connection.c
index c64c328..e2897d3 100644
--- a/connection.c
+++ b/connection.c
@@ -37,86 +37,6 @@ int charsetcmp(const char* s, const char* t)
return ret;
}
-#if VDRVERSNUM < 10503
-// cCharSetConv -------------------------------------------------------
-#include <iconv.h>
-
-class cCharSetConv {
-private:
- iconv_t cd;
- char *result;
- size_t length;
-public:
- cCharSetConv(const char *FromCode, const char *ToCode);
- ~cCharSetConv();
- const char *Convert(const char *From, char *To = NULL, size_t ToLength = 0);
- static const char *SystemCharacterTable(void) { return I18nCharSets()[Setup.OSDLanguage]; }
-};
-
-cCharSetConv::cCharSetConv(const char *FromCode, const char *ToCode)
-{
- if (!FromCode)
- FromCode = "UTF-8";
- if (!ToCode)
- ToCode = "UTF-8";
- cd = (FromCode && ToCode) ? iconv_open(ToCode, FromCode) : (iconv_t)-1;
- result = NULL;
- length = 0;
-}
-
-cCharSetConv::~cCharSetConv()
-{
- free(result);
- iconv_close(cd);
-}
-
-const char *cCharSetConv::Convert(const char *From, char *To, size_t ToLength)
-{
- if (cd != (iconv_t)-1 && From && *From) {
- char *FromPtr = (char *)From;
- size_t FromLength = strlen(From);
- char *ToPtr = To;
- if (!ToPtr) {
- length = max(length, FromLength * 2); // some reserve to avoid later reallocations
- result = (char *)realloc(result, length);
- ToPtr = result;
- ToLength = length;
- }
- else if (!ToLength)
- return From; // can't convert into a zero sized buffer
- ToLength--; // save space for terminating 0
- char *Converted = ToPtr;
- while (FromLength > 0) {
- if (iconv(cd, &FromPtr, &FromLength, &ToPtr, &ToLength) == size_t(-1)) {
- if (errno == E2BIG || errno == EILSEQ && ToLength < 1) {
- if (To)
- break; // caller provided a fixed size buffer, but it was too small
- // The result buffer is too small, so increase it:
- size_t d = ToPtr - result;
- size_t r = length / 2;
- length += r;
- Converted = result = (char *)realloc(result, length);
- ToLength += r;
- ToPtr = result + d;
- }
- if (errno == EILSEQ) {
- // A character can't be converted, so mark it with '?' and proceed:
- FromPtr++;
- FromLength--;
- *ToPtr++ = '?';
- ToLength--;
- }
- else if (errno != E2BIG)
- return From; // unknown error, return original string
- }
- }
- *ToPtr = 0;
- return Converted;
- }
- return From;
-}
-#endif
-
// cSvdrpConnection -------------------------------------------------------
int cSvdrpConnection::Connect() {
diff --git a/connection.h b/connection.h
index 7ff6ed6..fdbf4a4 100644
--- a/connection.h
+++ b/connection.h
@@ -13,10 +13,6 @@
#define MAX_SVDRP_CONNECTIONS 8
-#if VDRVERSNUM < 10503
-class cCharSetConv;
-#endif
-
class cSvdrpConnection: public cMutex {
private:
char* serverIp;
diff --git a/i18n.c b/i18n.c
deleted file mode 100644
index 93985ca..0000000
--- a/i18n.c
+++ /dev/null
@@ -1,149 +0,0 @@
-#include "i18n.h"
-
-#if VDRVERSNUM < 10507
-const tI18nPhrase Phrases[] = {
-// START I18N - automatically generated by po2i18n.pl
- { "Command timeout (s)",
- "Timeout f�r Befehle (s)",
- "",
- "Scadenza comando (s)",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
- { "Connect timeout (s)",
- "Timeout Verbindungsaufbau (s)",
- "",
- "Scadenza connessione (s)",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
- { "Default server IP",
- "Standard Server IP",
- "",
- "IP server predefinito",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
- { "Default server port",
- "Standard Server Port",
- "",
- "Porta server predefinito",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#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 bcd9991..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 _SVDRPSERVICE_I18N__H
-#define _SVDRPSERVICE_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 //_SVDRPSERVICE_I18N__H
diff --git a/patches/vdr-1.2.4-1.4.1-svdrp_eof.patch b/patches/vdr-1.2.4-1.4.1-svdrp_eof.patch
deleted file mode 100644
index 5d6c882..0000000
--- a/patches/vdr-1.2.4-1.4.1-svdrp_eof.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- svdrp.c.orig 2006-07-16 11:39:16.000000000 +0200
-+++ svdrp.c 2006-07-23 12:47:30.078132728 +0200
-@@ -1575,8 +1575,11 @@
- isyslog("lost connection to SVDRP client");
- Close();
- }
-- else
-- break;
-+ else {
-+ isyslog("SVDRP client closed connection");
-+ file.Close();
-+ DELETENULL(PUTEhandler);
-+ }
- }
- if (Setup.SVDRPTimeout && time(NULL) - lastActivity > Setup.SVDRPTimeout) {
- isyslog("timeout on SVDRP connection");
diff --git a/patches/vdr-1.4.x-svdrp_charset.diff b/patches/vdr-1.4.x-svdrp_charset.diff
deleted file mode 100644
index 4801a8a..0000000
--- a/patches/vdr-1.4.x-svdrp_charset.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- svdrp.c.orig 2008-02-17 14:36:01.000000000 +0100
-+++ svdrp.c 2008-05-02 16:29:16.000000000 +0200
-@@ -1606,7 +1606,7 @@
- char buffer[BUFSIZ];
- gethostname(buffer, sizeof(buffer));
- time_t now = time(NULL);
-- Reply(220, "%s SVDRP VideoDiskRecorder %s; %s", buffer, VDRVERSION, *TimeToString(now));
-+ Reply(220, "%s SVDRP VideoDiskRecorder %s; %s; %s", buffer, VDRVERSION, *TimeToString(now), I18nCharSets()[Setup.OSDLanguage]);
- }
- if (NewConnection)
- lastActivity = time(NULL);
diff --git a/patches/vdr-1.5.3-1.6.0-svdrp_charset.diff b/patches/vdr-1.5.3-1.6.0-svdrp_charset.diff
deleted file mode 100644
index 2b7688a..0000000
--- a/patches/vdr-1.5.3-1.6.0-svdrp_charset.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- svdrp.c.orig 2008-02-17 14:36:01.000000000 +0100
-+++ svdrp.c 2008-05-02 16:29:16.000000000 +0200
-@@ -1606,7 +1606,7 @@
- char buffer[BUFSIZ];
- gethostname(buffer, sizeof(buffer));
- time_t now = time(NULL);
-- Reply(220, "%s SVDRP VideoDiskRecorder %s; %s", buffer, VDRVERSION, *TimeToString(now));
-+ Reply(220, "%s SVDRP VideoDiskRecorder %s; %s; %s", buffer, VDRVERSION, *TimeToString(now), cCharSetConv::SystemCharacterTable() ? cCharSetConv::SystemCharacterTable() : "UTF-8");
- }
- if (NewConnection)
- lastActivity = time(NULL);
diff --git a/po/de_DE.po b/po/de_DE.po
index 60b32f6..e60c333 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -8,10 +8,11 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdrdev at schmirler.de>\n"
-"POT-Creation-Date: 2008-09-21 09:44+0200\n"
+"POT-Creation-Date: 2013-04-30 22:54+0200\n"
"PO-Revision-Date: 2008-09-21 09:44+0200\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"
diff --git a/po/it_IT.po b/po/it_IT.po
index 2ff1301..167a862 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -8,10 +8,11 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdrdev at schmirler.de>\n"
-"POT-Creation-Date: 2008-09-21 09:44+0200\n"
+"POT-Creation-Date: 2013-04-30 22:54+0200\n"
"PO-Revision-Date: 2008-09-25 00:02+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"
diff --git a/po/sk_SK.po b/po/sk_SK.po
new file mode 100755
index 0000000..805abe7
--- /dev/null
+++ b/po/sk_SK.po
@@ -0,0 +1,31 @@
+# VDR svdrpservice plugin language source file.
+# Copyright (C) 2013 Frank Schmirler <vdrdev at schmirler.de>
+# This file is distributed under the same license as the svdrpservice package.
+# Milan Hrala <hrala.milan at gmail.com>, 2013
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr-svdrpservice 0.0.4\n"
+"Report-Msgid-Bugs-To: <vdrdev at schmirler.de>\n"
+"POT-Creation-Date: 2013-04-30 22:54+0200\n"
+"PO-Revision-Date: 2013-03-12 23:54+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"
+
+msgid "Default server IP"
+msgstr "Predvolen� IP servera"
+
+msgid "Default server port"
+msgstr "Predvolen� port servera"
+
+msgid "Connect timeout (s)"
+msgstr "�asov� limit pripojenia (s)"
+
+msgid "Command timeout (s)"
+msgstr "�asov� limit pr�kazu (s)"
diff --git a/setup.c b/setup.c
index 8f1ad90..29e86ba 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"
cSvdrpServiceSetup SvdrpServiceSetup;
@@ -17,7 +17,7 @@ const char* cSvdrpServiceSetup::opt_serverPort = NULL;
cSvdrpServiceSetup::cSvdrpServiceSetup() {
serverIp[0] = 0;
- serverPort = 2001;
+ serverPort = 6419;
connectTimeout = 2;
readTimeout = 5;
}
@@ -34,7 +34,7 @@ bool cSvdrpServiceSetup::Parse(const char *Name, const char *Value) {
if (!strcasecmp(Name, "ServerIp"))
strn0cpy(serverIp, opt_serverIp ? opt_serverIp : Value, sizeof(serverIp));
else if (!strcasecmp(Name, "ServerPort"))
- serverPort = opt_serverIp ? (opt_serverPort ? atoi(opt_serverPort) : 2001) : atoi(Value);
+ serverPort = opt_serverIp ? (opt_serverPort ? atoi(opt_serverPort) : 6419) : atoi(Value);
else if (!strcasecmp(Name, "ConnectTimeout"))
connectTimeout = atoi(Value);
else if (!strcasecmp(Name, "ReadTimeout"))
diff --git a/svdrpservice.c b/svdrpservice.c
index 64ed60c..6757c48 100644
--- a/svdrpservice.c
+++ b/svdrpservice.c
@@ -9,15 +9,15 @@
#include <vdr/plugin.h>
#include <vdr/thread.h>
#include <vdr/tools.h>
+#include <vdr/i18n.h>
#include "svdrpservice.h"
#include "connection.h"
#include "setup.h"
-#include "i18n.h"
#define MAX_SVDRP_CONNECTIONS 8
-static const char *VERSION = "0.0.4";
+static const char *VERSION = "1.0.0";
static const char *DESCRIPTION = "SVDRP client";
class cPluginSvdrpService : public cPlugin {
@@ -61,8 +61,8 @@ cPluginSvdrpService::~cPluginSvdrpService()
const char *cPluginSvdrpService::CommandLineHelp(void)
{
- return " IP[:PORT] Default server IP and optional port (e.g. 192.168.0.1:2001).\n"
- " If no port is given, the default SVDRP port 2001 is asumed.\n";
+ return " IP[:PORT] Default server IP and optional port (e.g. 192.0.2.1:6419).\n"
+ " If no port is given, the default SVDRP port 6419 is asumed.\n";
}
bool cPluginSvdrpService::ProcessArgs(int argc, char *argv[])
@@ -92,9 +92,6 @@ bool cPluginSvdrpService::Initialize(void)
bool cPluginSvdrpService::Start(void)
{
-#if VDRVERSNUM < 10507
- RegisterI18n(Phrases);
-#endif
return true;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-svdrpservice.git
More information about the pkg-vdr-dvb-changes
mailing list