[vdr-plugin-remoteosd] 01/03: Imported Upstream version 1.0.0
Tobias Grimm
tiber-guest at alioth.debian.org
Sun Sep 15 08:28:11 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-remoteosd.
commit eef7195e2def1e7e15e0a74ab5ec946d27bc96ff
Author: etobi <git at e-tobi.net>
Date: Sun Sep 15 10:14:23 2013 +0200
Imported Upstream version 1.0.0
---
HISTORY | 16 +
Makefile | 89 ++--
README | 21 +-
i18n.c | 429 --------------------
i18n.h | 19 -
menu.c | 3 +-
menu.h | 2 +-
...ooks-v1_0_1.patch => MainMenuHooks-v1_0_2.diff} | 10 +-
po/de_DE.po | 6 +-
po/it_IT.po | 6 +-
po/sk_SK.po | 58 +++
remoteosd.c | 25 +-
remoteosd.h | 43 ++
setup.c | 6 +-
svdrpservice.h | 40 ++
15 files changed, 258 insertions(+), 515 deletions(-)
diff --git a/HISTORY b/HISTORY
index ad66110..3198d14 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,11 +1,26 @@
VDR Plugin 'remoteosd' Revision History
---------------------------------------
+2013-06-07: Version 1.0.0
+
+- Added service call to open remote menu
+- Updated Makefile for VDR 1.7.36 and dropped compatibility with older VDR
+ versions
+- Added SetMenuCategory for VDR 1.7.28+
+- Added Slovak translation (thanks to Milan Hrala)
+- Included a copy of svdrpservice.h
+- Updated MainMenuHooks patch (thanks to Manuel Reimer)
+- README now mentions the new VDR default port and the possibility to pass
+ server IP and port as parameter to svdrpservice.
+- Updated SVDRP port. Default is now 0 (i.e. use svdrpservice).
+
2011-09-20: Version 0.1.1
+
- Updated MainMenuHooks patch to v1.0.1
- SetTitle must not be called with NULL argument (thanks to Manfred Heindl)
2009-10-07: Version 0.1.0
+
- if available, use svdrposd-plugin instead of svdrpext-plugin
- added gettext support (thanks to Diego Pierotto)
Credits to Udo Richter for his po218n.pl backward compatibility script
@@ -15,6 +30,7 @@ VDR Plugin 'remoteosd' Revision History
- fixed not parsing replace mainmenu settings
2007-03-07: Version 0.0.2
+
- New option: tune channel on server
- Support for MainMenuHooks patch. Plugin may replace the VDR mainmenus
Schedule and Timers
diff --git a/Makefile b/Makefile
index fc96f76..e8fba91 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 = remoteosd
### 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 menu.o setup.o i18n.o
+OBJS = $(PLUGIN).o menu.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 bea58a9..4ce9983 100644
--- a/README
+++ b/README
@@ -29,10 +29,6 @@ Straightforward:
- tar xzf vdr-remoteosd-<VERSION>.tgz
- ln -sf remoteosd-<VERSION> remoteosd
-If you didn't do that already (otherwise svdrpservice.h is missing):
-- tar xzf vdr-svdrpservice-<VERSION>.tgz
-- ln -sf svdrpservice-<VERSION> svdrpservice
-
If you want to replace the VDR mainmenus "Schedule" or "Timers" by
the respective remote menus, you must apply the MainMenuHooks patch
to VDR before compiling remoteosd. The MainMenuHooks patch is included
@@ -43,7 +39,17 @@ Now compile and install remoteosd (and svdrpservice) as usual and add
both plugins to the script starting your VDR (e.g. runvdr). No options
required, so simply append:
- -Premoteosd -Psvdrpservice
+ -P remoteosd -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'
+
+Finally check the file svdrphosts.conf on the remote VDR: The IP of the VDR
+running remoteosd must be listed or otherwise the connection will be
+refused.
Installation on server VDR:
---------------------------
@@ -83,8 +89,9 @@ IP address of SVDRP server. Leave empty or enter 0.0.0.0 if you want to
use the default IP configured in the svdrpservice plugin.
- Server port
-SVDRP port on server (usually 2001). Enter 0 if you want to use the
-default port from svdrpservice.
+SVDRP port on server. Since VDR 1.7.15 the default port is 6419, before
+it was 2001. The special value 0 uses the default port configured in
+svdrpservice.
- Tune server channel
Tries to tune the server to the same channel the client is currently
diff --git a/i18n.c b/i18n.c
deleted file mode 100644
index 8141860..0000000
--- a/i18n.c
+++ /dev/null
@@ -1,429 +0,0 @@
-#include "i18n.h"
-
-#if VDRVERSNUM < 10507
-const tI18nPhrase Phrases[] = {
-// START I18N - automatically generated by po2i18n.pl
- { "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
- },
- { "Number of lines per page",
- "Zeilen pro Bildschirmseite",
- "",
- "Numero di righe per pagina",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
- { "Remote OSD already in use. Proceed anyway?",
- "Men� bereits in Benutzung. Dennoch fortfahren?",
- "",
- "OSD remoto gi� in esecuzione. Continuare?",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
- { "Remote menu",
- "Server Men�",
- "",
- "Menu remoto",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
- { "Remote menu not available. Connection failed.",
- "Server Men� nicht verf�gbar. Verbindung fehlgeschlagen.",
- "",
- "Menu remoto non disponibile. Connessione fallita.",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
- { "Remote menu theme",
- "Thema f�r entferntes Men�",
- "",
- "Tema menu remoto",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
- { "Replace mainmenu \"Schedule\"",
- "Hauptmen� \"Programm\" ersetzen",
- "",
- "Sostituisci \"Programmi\" nel 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
- },
- { "Replace mainmenu \"Timers\"",
- "Hauptmen� \"Timer\" ersetzen",
- "",
- "Sostituisci \"Timer\" nel 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
- },
- { "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
- },
- { "Show menu of a remote VDR",
- "Zugriff auf Men� eines anderen VDR",
- "",
- "Mostra menu VDR remoto",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
-#if VDRVERSNUM >= 10302
- "",
-#endif
-#if VDRVERSNUM >= 10307
- "",
-#endif
-#if VDRVERSNUM >= 10313
- "",
-#endif
-#if VDRVERSNUM >= 10316
- "",
-#endif
-#if VDRVERSNUM >= 10342
- "",
-#endif
-#if VDRVERSNUM >= 10502
- "",
-#endif
- },
- { "Tune server channel",
- "Kanal auf Server umstellen",
- "",
- "Sintonizza canale 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
- },
-// END I18N - automatically generated by po2i18n.pl
-{ NULL }
-};
-#endif
diff --git a/i18n.h b/i18n.h
deleted file mode 100644
index b2ece00..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 _REMOTEOSD_I18N__H
-#define _REMOTEOSD_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 //_REMOTEOSD_I18N__H
diff --git a/menu.c b/menu.c
index 4999a19..480d13a 100644
--- a/menu.c
+++ b/menu.c
@@ -6,7 +6,7 @@
#include <vdr/themes.h>
#include <vdr/interface.h>
#include <vdr/status.h>
-#include "i18n.h"
+#include <vdr/i18n.h>
#include "menu.h"
#include "setup.h"
@@ -18,6 +18,7 @@
#define RC_NA 930
cRemoteOsdMenu::cRemoteOsdMenu(const char *Title): cOsdMenu(Title) {
+ SetMenuCategory(mcPlugin);
plugin = cPluginManager::GetPlugin("svdrpservice");
isEmpty = true;
plugOsd = true;
diff --git a/menu.h b/menu.h
index 63decf6..9ba9316 100644
--- a/menu.h
+++ b/menu.h
@@ -11,7 +11,7 @@
#include <vdr/osdbase.h>
#include <vdr/plugin.h>
#include <vdr/channels.h>
-#include "../svdrpservice/svdrpservice.h"
+#include "svdrpservice.h"
class cRemoteOsdMenu: public cOsdMenu {
private:
diff --git a/patches/MainMenuHooks-v1_0_1.patch b/patches/MainMenuHooks-v1_0_2.diff
similarity index 98%
rename from patches/MainMenuHooks-v1_0_1.patch
rename to patches/MainMenuHooks-v1_0_2.diff
index 4df6b7a..21a7cb8 100644
--- a/patches/MainMenuHooks-v1_0_1.patch
+++ b/patches/MainMenuHooks-v1_0_2.diff
@@ -1,6 +1,9 @@
This is a "patch" for the Video Disk Recorder (VDR).
* History
+2012-04-06: Version 1.0.2
+- Update f�r aktuelle VDR-Entwickler-Versionen (Manuel Reimer)
+
2010-10-15: Version 1.0.1
- return a cOsdObject instead of its subclass cOsdMenu (thanks to
Joe_D at vdrportal)
@@ -168,14 +171,11 @@ diff -ru vdr-1.6.0.orig/menu.c vdr-1.6.0/menu.c
diff -ru vdr-1.6.0.orig/config.h vdr-1.6.0/config.h
--- vdr-1.6.0.orig/config.h 2008-03-23 11:26:10.000000000 +0100
+++ vdr-1.6.0/config.h 2010-10-11 20:32:25.000000000 +0200
-@@ -36,6 +36,10 @@
+@@ -36,3 +36,7 @@
// plugins to work with newer versions of the core VDR as long as no
// VDR header files have changed.
-
++
+// The MainMenuHook Patch's version number:
+#define MAINMENUHOOKSVERSION "1.0.1"
+#define MAINMENUHOOKSVERSNUM 10001 // Version * 10000 + Major * 100 + Minor
-+
- #define MAXPRIORITY 99
- #define MAXLIFETIME 99
diff --git a/po/de_DE.po b/po/de_DE.po
index 4abf28b..27c8b0d 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -6,10 +6,11 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdrdev at schmirler.de>\n"
-"POT-Creation-Date: 2009-10-02 23:48+0200\n"
+"POT-Creation-Date: 2013-05-01 00:08+0200\n"
"PO-Revision-Date: 2009-08-25 00:55+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"
@@ -41,6 +42,9 @@ msgstr "Server IP"
msgid "Server port"
msgstr "Server Port"
+msgid "from svdrpservice"
+msgstr "aus svdrpservice"
+
msgid "Tune server channel"
msgstr "Kanal auf Server umstellen"
diff --git a/po/it_IT.po b/po/it_IT.po
index 64953de..c05953b 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -6,10 +6,11 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdrdev at schmirler.de>\n"
-"POT-Creation-Date: 2009-10-02 23:48+0200\n"
+"POT-Creation-Date: 2013-05-01 00:08+0200\n"
"PO-Revision-Date: 2009-08-25 01:00+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"
@@ -41,6 +42,9 @@ msgstr "IP server"
msgid "Server port"
msgstr "Porta server"
+msgid "from svdrpservice"
+msgstr "da svdrpservice"
+
msgid "Tune server channel"
msgstr "Sintonizza canale server"
diff --git a/po/sk_SK.po b/po/sk_SK.po
new file mode 100755
index 0000000..4731256
--- /dev/null
+++ b/po/sk_SK.po
@@ -0,0 +1,58 @@
+# VDR remoteosd plugin language source file.
+# Copyright (C) 2013 Frank Schmirler <vdrdev at schmirler.de>
+# This file is distributed under the same license as the VDR remoteosd package.
+# Milan Hrala <hrala.milan at gmail.com>, 2013
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr-remoteosd 0.1.1\n"
+"Report-Msgid-Bugs-To: <vdrdev at schmirler.de>\n"
+"POT-Creation-Date: 2013-05-01 00:08+0200\n"
+"PO-Revision-Date: 2013-03-13 00:33+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 "Remote OSD already in use. Proceed anyway?"
+msgstr "Vzdialen� OSD sa u� pou��va. Napriek tomu pokra�ova�?"
+
+msgid "Show menu of a remote VDR"
+msgstr "Zobrazi� menu na vzdialenom VDR"
+
+msgid "Remote menu"
+msgstr "Vzdialen� menu"
+
+msgid "Remote menu not available. Connection failed."
+msgstr "Vzdialen� menu nie je dostupn�. Pripojenie zlyhalo."
+
+msgid "Hide mainmenu entry"
+msgstr "Schova� v hlavnom menu"
+
+msgid "Replace mainmenu \"Schedule\""
+msgstr "Zameni� v hlavnom menu \"TV program\""
+
+msgid "Replace mainmenu \"Timers\""
+msgstr "Zameni� v hlavnom menu \"Pl�ny nahr�vania\""
+
+msgid "Server IP"
+msgstr "IP servera"
+
+msgid "Server port"
+msgstr "Port servera"
+
+msgid "from svdrpservice"
+msgstr "zo svdrpservice"
+
+msgid "Tune server channel"
+msgstr ""
+
+msgid "Number of lines per page"
+msgstr "Po�et riadkov na stranu"
+
+msgid "Remote menu theme"
+msgstr "T�ma vzdialen�ho menu"
diff --git a/remoteosd.c b/remoteosd.c
index 67a1255..53b372f 100644
--- a/remoteosd.c
+++ b/remoteosd.c
@@ -9,13 +9,14 @@
#include <vdr/plugin.h>
#include <vdr/skins.h>
#include <vdr/themes.h>
+#include <vdr/i18n.h>
#include <strings.h>
#include <stdlib.h>
-#include "i18n.h"
+#include "remoteosd.h"
#include "menu.h"
#include "setup.h"
-static const char *VERSION = "0.1.1";
+static const char *VERSION = "1.0.0";
static const char *DESCRIPTION = trNOOP("Show menu of a remote VDR");
static const char *MAINMENUENTRY = trNOOP("Remote menu");
@@ -75,9 +76,6 @@ bool cPluginRemoteOsd::Initialize(void)
bool cPluginRemoteOsd::Start(void)
{
// Start any background activities the plugin shall perform.
-#if VDRVERSNUM < 10507
- RegisterI18n(Phrases);
-#endif
return true;
}
@@ -132,6 +130,23 @@ bool cPluginRemoteOsd::SetupParse(const char *Name, const char *Value)
bool cPluginRemoteOsd::Service(const char *Id, void *Data)
{
// Handle custom service requests from other plugins
+
+ if (strcmp(Id, "RemoteOsd::Menu-v1.0") == 0) {
+ if (Data) {
+ RemoteOsd_Menu_v1_0 *data = (RemoteOsd_Menu_v1_0 *) Data;
+ cRemoteOsdMenu *remoteMenu = new cRemoteOsdMenu(data->serverIp);
+ if (!remoteMenu->Open(data->serverIp, data->serverPort, data->key ? data->key : "MENU")) {
+ DELETENULL(remoteMenu);
+ Skins.Message(mtError, tr("Remote menu not available. Connection failed."));
+ }
+ data->menu = remoteMenu;
+ }
+ return true;
+ }
+
+ /*
+ * MainMenuHooks
+ */
cRemoteOsdMenu **menu = (cRemoteOsdMenu**) Data;
if (RemoteOsdSetup.replaceSchedule && strcmp(Id, "MainMenuHooksPatch-v1.0::osSchedule") == 0) {
if (menu) {
diff --git a/remoteosd.h b/remoteosd.h
new file mode 100644
index 0000000..ff901ee
--- /dev/null
+++ b/remoteosd.h
@@ -0,0 +1,43 @@
+/*
+ * remotetimers.h: Public interface of the plugin's services
+ *
+ * Copyright (C) 2013 Frank Schmirler <vdr at schmirler.de>
+ *
+ * This file is part of VDR Plugin remoteosd.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ */
+
+#ifndef _REMOTEOSD_SERVICE__H
+#define _REMOTEOSD_SERVICE__H
+
+#include <vdr/osdbase.h>
+
+/*
+ * RemoteOsd::Menu-v1.0
+ * Open the menu of VDR at serverIp and serverPort, sending the specified key.
+ * If key is NULL, key "MENU" is used.
+ */
+struct RemoteOsd_Menu_v1_0 {
+//in
+ const char *serverIp;
+ unsigned short serverPort;
+ const char *key;
+//out
+ cOsdMenu *menu;
+};
+
+#endif //_REMOTEOSD_SERVICE__H
diff --git a/setup.c b/setup.c
index a9c7c0c..016e2a5 100644
--- a/setup.c
+++ b/setup.c
@@ -8,7 +8,7 @@
#include <vdr/menuitems.h>
#include <vdr/skins.h>
-#include "i18n.h"
+#include <vdr/i18n.h>
#include "setup.h"
cRemoteOsdSetup RemoteOsdSetup;
@@ -18,7 +18,7 @@ cRemoteOsdSetup::cRemoteOsdSetup() {
replaceSchedule = 0;
replaceTimers = 0;
serverIp[0] = 0;
- serverPort = 2001;
+ serverPort = 0;
tuneServer = 0;
maxItems = 0;
remoteTheme[0] = 0;
@@ -73,7 +73,7 @@ cRemoteOsdMenuSetup::cRemoteOsdMenuSetup() {
Add(new cMenuEditBoolItem(tr("Replace mainmenu \"Timers\""), &setupTmp.replaceTimers));
#endif
Add(new cMenuEditStrItem(tr("Server IP"), setupTmp.serverIp, 15, ".1234567890"));
- Add(new cMenuEditIntItem(tr("Server port"), &setupTmp.serverPort, 0, 65535));
+ Add(new cMenuEditIntItem(tr("Server port"), &setupTmp.serverPort, 0, 65535, tr("from svdrpservice")));
Add(new cMenuEditBoolItem(tr("Tune server channel"), &setupTmp.tuneServer));
Add(new cMenuEditIntItem(tr("Number of lines per page"), &setupTmp.maxItems, 0));
Add(new cMenuEditStraItem(tr("Remote menu theme"), &themeIndex, numThemes + 1, themeList));
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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-remoteosd.git
More information about the pkg-vdr-dvb-changes
mailing list