[vdr-plugin-live] 02/08: Imported Upstream version 0.3.0
Tobias Grimm
tiber-guest at moszumanska.debian.org
Wed Oct 29 22:33:35 UTC 2014
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to branch master
in repository vdr-plugin-live.
commit 07f8e8b10b93961bf6a19358b4feee3a71a63422
Author: etobi <git at e-tobi.net>
Date: Wed Oct 29 21:44:27 2014 +0100
Imported Upstream version 0.3.0
---
.cvsignore | 7 -
.gitignore | 14 --
HISTORY | 9 ++
Makefile | 9 +-
README | 8 +-
css/Makefile | 3 +
doc/ChangeLog | 5 +
doc/TODO.txt | 3 -
doc/web/homepage/de/download.php | 79 -----------
doc/web/homepage/de/features_0-1-0.inc | 3 -
doc/web/homepage/de/features_0-2-0.inc | 111 ---------------
doc/web/homepage/de/img/editsearchtimer.jpg | Bin 93409 -> 0 bytes
doc/web/homepage/de/img/editsearchtimer_thumb.jpg | Bin 12985 -> 0 bytes
doc/web/homepage/de/img/edittimer.jpg | Bin 74716 -> 0 bytes
doc/web/homepage/de/img/edittimer_thumb.jpg | Bin 10683 -> 0 bytes
doc/web/homepage/de/img/favourites.jpg | Bin 127139 -> 0 bytes
doc/web/homepage/de/img/favourites_thumb.jpg | Bin 17801 -> 0 bytes
doc/web/homepage/de/img/recordings.jpg | Bin 144417 -> 0 bytes
doc/web/homepage/de/img/recordings_thumb.jpg | Bin 17490 -> 0 bytes
doc/web/homepage/de/img/remote.jpg | Bin 77753 -> 0 bytes
doc/web/homepage/de/img/remote_thumb.jpg | Bin 10877 -> 0 bytes
doc/web/homepage/de/img/schedule.jpg | Bin 107086 -> 0 bytes
doc/web/homepage/de/img/schedule_thumb.jpg | Bin 14350 -> 0 bytes
doc/web/homepage/de/img/search.jpg | Bin 69939 -> 0 bytes
doc/web/homepage/de/img/search_thumb.jpg | Bin 10599 -> 0 bytes
doc/web/homepage/de/img/searchtimer.jpg | Bin 101537 -> 0 bytes
doc/web/homepage/de/img/searchtimer_thumb.jpg | Bin 13954 -> 0 bytes
doc/web/homepage/de/img/setup.jpg | Bin 86243 -> 0 bytes
doc/web/homepage/de/img/setup_thumb.jpg | Bin 13079 -> 0 bytes
doc/web/homepage/de/img/timerconflict.jpg | Bin 61515 -> 0 bytes
doc/web/homepage/de/img/timerconflict_thumb.jpg | Bin 8480 -> 0 bytes
doc/web/homepage/de/img/whatson.jpg | Bin 178868 -> 0 bytes
doc/web/homepage/de/img/whatson_thumb.jpg | Bin 19780 -> 0 bytes
doc/web/homepage/de/img/whatsonlist.jpg | Bin 152162 -> 0 bytes
doc/web/homepage/de/img/whatsonlist_thumb.jpg | Bin 19561 -> 0 bytes
doc/web/homepage/de/index.php | 146 --------------------
doc/web/homepage/de/install_0-1-0.inc | 40 ------
doc/web/homepage/de/install_0-2-0.inc | 49 -------
doc/web/homepage/de/install_devel.inc | 49 -------
doc/web/homepage/de/news.php | 37 -----
doc/web/homepage/de/screenshots.php | 46 -------
doc/web/homepage/de/settings-de.inc | 28 ----
doc/web/homepage/en/download.php | 81 -----------
doc/web/homepage/en/features_0-1-0.inc | 3 -
doc/web/homepage/en/features_0-2-0.inc | 98 --------------
doc/web/homepage/en/img | 1 -
doc/web/homepage/en/index.php | 144 --------------------
doc/web/homepage/en/install_0-1-0.inc | 38 ------
doc/web/homepage/en/install_0-2-0.inc | 49 -------
doc/web/homepage/en/install_devel.inc | 49 -------
doc/web/homepage/en/news.php | 37 -----
doc/web/homepage/en/screenshots.php | 46 -------
doc/web/homepage/en/settings-en.inc | 28 ----
doc/web/homepage/html-header.inc | 31 -----
doc/web/homepage/img | 1 -
doc/web/homepage/index.php | 7 -
doc/web/homepage/live-sw-configs.php | 50 -------
doc/web/homepage/page-header.inc | 20 ---
doc/web/homepage/page-menu.inc | 13 --
doc/web/homepage/page-php-classes.inc | 158 ----------------------
doc/web/homepage/styles.css | 1 -
epgsearch.cpp | 58 ++++----
epgsearch.h | 14 +-
httpd/.cvsignore | 1 -
httpd/Makefile | 5 +-
javascript/Makefile | 3 +
livefeatures.h | 2 +-
pages/.cvsignore | 2 -
pages/Makefile | 6 +-
pages/pageelems.ecpp | 2 +-
pages/recordings.ecpp | 17 ++-
pages/setup.ecpp | 4 +
po/.cvsignore | 3 -
po/de_DE.po | 1 -
setup.cpp | 13 +-
setup.h | 4 +-
tntfeatures.h | 2 +
77 files changed, 103 insertions(+), 1535 deletions(-)
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 9e2d478..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.git
-.gitignore
-.libs
-.dependencies
-gen_version_suffix.h
-debian
-locale
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 020d64b..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-CVS
-.#*
-*~
-*.o
-*.a
-*.so
-gen_version_suffix.h
-pages/*.cpp
-po/*.mo
-po/live.pot
-.dependencies
-.cvsignore
-.libs
-locale
diff --git a/HISTORY b/HISTORY
index 6dc2223..5506190 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9,3 +9,12 @@ VDR Plugin 'live' Revision History
- First release.
+2008-04-30: Version 0.2.0
+
+- Version 0.2.0
+
+2013-03-24: Version 0.3.0
+
+- Declares GIT-Tree as new stable version. See
+ http://live.vdr-developer.org about details.
+
diff --git a/Makefile b/Makefile
index e8bf910..ab2f2b5 100644
--- a/Makefile
+++ b/Makefile
@@ -47,6 +47,7 @@ TMPDIR ?= /tmp
APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
I18NTARG = $(shell if [ `echo $(APIVERSION) | tr [.] [0]` -ge "10507" ]; then echo "i18n"; fi)
TNTVERSION = $(shell tntnet-config --version | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
+CXXTOOLVER = $(shell cxxtools-config --version | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
TNTVERS7 = $(shell ver=$(TNTVERSION); if [ $$ver -ge "1606" ]; then echo "yes"; fi)
CXXFLAGS += $(shell tntnet-config --cxxflags)
@@ -73,7 +74,7 @@ ifneq ($(TNTVERS7),yes)
LIBS += httpd/libhttpd.a
endif
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DTNTVERSION=$(TNTVERSION)
+DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DTNTVERSION=$(TNTVERSION) -DCXXTOOLVER=$(CXXTOOLVER)
SUBDIRS = pages css javascript
ifneq ($(TNTVERS7),yes)
@@ -164,7 +165,7 @@ libvdr-$(PLUGIN).so: $(VERSIONSUFFIX) $(SUBDIRS) $(PLUGINOBJS)
ifneq ($(TNTVERS7),yes)
@echo ""
- @echo "If LIVE was built successfully and you can try to use it!"
+ @echo "LIVE was built successfully and you can try to use it!"
@echo ""
@echo ""
@echo ""
@@ -189,9 +190,9 @@ dist: clean
@-rm -rf $(TMPDIR)/$(ARCHIVE)
@mkdir $(TMPDIR)/$(ARCHIVE)
@cp -a * $(TMPDIR)/$(ARCHIVE)
- @tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
+ @tar czf $(TMPDIR)/$(PACKAGE).tar.gz -C $(TMPDIR) $(ARCHIVE)
@-rm -rf $(TMPDIR)/$(ARCHIVE)
- @echo Distribution package created as $(PACKAGE).tgz
+ @echo Distribution package created as $(TMPDIR)/$(PACKAGE).tar.gz
clean: $(SUBDIRS)
@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
diff --git a/README b/README
index 6b22ee6..a4c9c9e 100644
--- a/README
+++ b/README
@@ -8,9 +8,7 @@ Currently maintained by:
Project's homepage: http://live.vdr-developer.org
-Latest version available at: either http://live.vdr-developer.org
- or the current cvs version at
- http://www.vdr-developer.org/cgi-bin/cvsweb.cgi/live/live.tar.gz?tarball=1
+Latest version available at: http://live.vdr-developer.org
See the file COPYING for license information.
@@ -76,8 +74,8 @@ need: (See also the Internationalization section below)
Locale::PO - perl module from CPAN www.cpan.org
-The default i18n-generated.h header (provided via CVS) contains all
-translations from CVS. Users that just want to stay on bleeding development
+The default i18n-generated.h header contains all
+translations from GIT. Users that just want to stay on bleeding development
edge of live do not need Locale::PO installed.
How to get Locale::PO
diff --git a/css/Makefile b/css/Makefile
index be9341a..0ce391c 100644
--- a/css/Makefile
+++ b/css/Makefile
@@ -56,3 +56,6 @@ libcss.a: $(OBJS)
clean:
@rm -f *~ *.o core* libcss.a $(OBJS:%.o=%.cpp)
+
+dist: clean
+ @echo "Nothing to do for distribution here ..."
diff --git a/doc/ChangeLog b/doc/ChangeLog
index d2ac030..3e07771 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-04 Dieter Hametner <dh+vdr at gekrumbel dot de>
+ * This file is discontinued. To get an overview of the
+ changes please consult the git history found on
+ http://projects.vdr-developer.org/git/vdr-plugin-live.git/
+
2009-09-07 Christian Wieninger <cwieninger at gmx dot de>
* new user management within setup that also handles different
user rights
diff --git a/doc/TODO.txt b/doc/TODO.txt
index 074c52b..363e887 100644
--- a/doc/TODO.txt
+++ b/doc/TODO.txt
@@ -18,6 +18,3 @@ This is a list of ideas and TODO-Items for live plugin.
- Provide a way to get the infos on extra 'static' pages.
-For Features regarding functionality and user suggestions please take
-a look to the bugtracker: http://www.vdr-developer.org/mantisbt/
-
diff --git a/doc/web/homepage/de/download.php b/doc/web/homepage/de/download.php
deleted file mode 100644
index 56c258c..0000000
--- a/doc/web/homepage/de/download.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
- <head>
- <title>VDR LIVE - Downloads</title>
- <?php include ("../html-header.inc") ?>
- </head>
- <body>
- <?php
- include ("../page-php-classes.inc");
- include ("settings-de.inc");
- ?>
- <div class="page_header">
- <?php include ("../page-header.inc"); ?>
- </div>
- <div style="clear:both"></div>
-
- <?php include ("../page-menu.inc"); ?>
-
- <div class="inhalt">
-
- <div style="width: 800px; margin-top: 15px">
- <div class="boxheader"><div><div>Stabile Version:</div></div></div>
- <div style="border: 1px solid black; padding: 0px 10px">
- <p>
- <b>Version 0.2.0</b>
- <ul>
- <li>Download: <a href="http://live.vdr-developer.org/downloads/vdr-live-0.2.0.tar.gz">http://live.vdr-developer.org/downloads/vdr-live-0.2.0.tar.gz</a></li>
- </ul>
- </p>
- <p>
- <b>Vorausetzungen für die Installation:</b>
- <?php include ("install_0-2-0.inc"); ?>
- </p>
- <p></p>
- </div>
- </div>
-
- <div style="width: 800px; margin-top: 15px">
- <div class="boxheader"><div><div>Entwickler Version:</div></div></div>
- <div style="border: 1px solid black; padding: 0px 10px">
- <p>
- <b>Akuteller CVS-Snapshot</b>
- <ul>
- <li>
- Download: <a href="http://www.vdr-developer.org/cgi-bin/cvsweb.cgi/live/live.tar.gz?tarball=1">http://www.vdr-developer.org/cgi-bin/cvsweb.cgi/live/</a>
- <p>
- <strong>WICHTIG:</strong> unbedingt auch immer die Datei README in LIVE Quellen-Verzeichnis beachten!
- </p>
- </li>
- </ul>
- </p>
- <p>
- <b>Vorausetzungen für die Installation:</b>
- <?php include ("install_devel.inc"); ?>
- </p>
- <p></p>
- </div>
- </div>
-
- <div style="width: 800px; margin-top: 15px">
- <div class="boxheader"><div><div>Ältere Version:</div></div></div>
- <div style="border: 1px solid black; padding: 0px 10px">
- <p>
- <b>Version 0.1.0</b>
- <ul>
- <li>Download: <a href="http://live.vdr-developer.org/downloads/vdr-live-0.1.0.tar.gz">http://live.vdr-developer.org/downloads/vdr-live-0.1.0.tar.gz</a></li>
- </ul>
- </p>
- <p>
- <b>Vorausetzungen für die Installation:</b>
- <?php include ("install_0-1-0.inc"); ?>
- </p>
- <p></p>
- </div>
- </div>
-
- </div>
- </body>
-</html>
diff --git a/doc/web/homepage/de/features_0-1-0.inc b/doc/web/homepage/de/features_0-1-0.inc
deleted file mode 100644
index 85cefa7..0000000
--- a/doc/web/homepage/de/features_0-1-0.inc
+++ /dev/null
@@ -1,3 +0,0 @@
- <ul>
- <li>Initiale Version :)</li>
- </ul>
diff --git a/doc/web/homepage/de/features_0-2-0.inc b/doc/web/homepage/de/features_0-2-0.inc
deleted file mode 100644
index dcbd96b..0000000
--- a/doc/web/homepage/de/features_0-2-0.inc
+++ /dev/null
@@ -1,111 +0,0 @@
- <p>
- Die folgende Liste enthält die wichtigsten für
- den Benutzer sichtbaren Änderungen an LIVE seit der
- letzten stabilen Version. Daneben wurde auch unter der
- Haube einiges verändert. Z.B. wurde auf das
- Javascript
- Framework <a href="http://www.mootools.net/">Mootools</a>
- umgestellt.
- </p>
- <ul>
- <li>
- Die <strong>Infobox ist noch
- „intelligenter”</strong>
- geworden. Hierüber kann z.B. eine Aufnahme
- vorgespult werden, welche über die VDR TV Ausgabe
- abgespielt werden. Auch kann man hierüber die
- Programme direkt am TV umschalten.
- </li>
- <li>
- Unter „Was läuft?” gibt es nun eine
- <strong>Favoritenliste</strong>. Hier werden die
- Sendungen dargestellt, die man via
- „Suchtimer” suchen lässt und hier
- dargestellt haben will. Ein Beispiel: Beim
- „Suchtimer-Anlegen” gebe ich den Suchbegriff
- „Volksmusik” ein und setze den Haken bei
- „Im Favoritenmenü verwenden”. Bei
- „Was läuft?” →
- „Favoriten” werden dann alle Sendungen mit
- Volksmusik in der Beschreibung angezeigt. Auch neu unter
- „Was läuft?” ist
- die <strong>Listenansicht</strong>.
- </li>
- <li>
- Bei den einzelnen Sendungen (also nur bei Sendungen
- für die EPG-Daten vorliegen) gibt es jetzt einen
- Knopf <strong>„Sendung im Browser
- anzeigen”</strong>: Dieser Knopf ruft das
- VLC-Plugin auf und erlaubt das Streamen von LiveTV.
- </li>
- <li>
- Bei dem Menü „Programm” gibt es bei der
- Programmauswahl den Knopf <strong>”Im Browser
- anzeigen”</strong>. Hier können auch Sender
- ausgewählt werden, die keine EPG-Daten liefern,
- aber in der channels.conf vorhanden sind. Zum Beispiel
- kleinere TV-Sender oder Radio Stationen.
- </li>
- <li>
- Mit der entsprechenden Version vom Epgsearch-Plugin (ab
- epgsearch-0.9.24) gibt es bei Timer nun auch einen
- Menüpunkt: <strong>„Timerkonflikte”</strong>.
- Dieser Menüpunkt wertet aus, welche programmierte
- Timer nicht funktionieren können, weil z.B. keine
- Karte mehr frei ist. Wenn die Infobox aktiv ist, wird
- eine entsprechende Einblendung angezeigt, wenn Epgsearch
- eine Änderung an den Timerkonflikten festgestellt
- hat.
- </li>
- <li>
- Im Menüpunkt „Suchtimer” gibt es jetzt
- die Möglichkeit direkt ein <strong>manuelles
- Suchtimer-Update</strong> anzustoßen. So kann man
- direkt das Epgsearch-Plugin dazu zwingen,
- unverzüglich ein Update durchzuführen.
- </li>
- <li>
- Bei „Neuen Suchtimer anlegen” gibt es nun
- unter „Als Suchtimer verwenden:” die
- Möglichkeit eine <strong>Benutzer-definierte
- Suche</strong> durchzuführen. Hier bestimmt der
- Benutzer, ab welchem Datum und bis zu welchem Datum
- Epgsearch im Hintergrund seiner Tätigkeit nachgehen
- soll. Somit kann man z.B. Suchtimer bauen, die z.B. nur
- einen Zeitraum der Herbstfolgen einer Serie durchsuchen.
- </li>
- <li>
- Beim
- Menüpunkt <strong>„Aufnahmen”</strong>
- gibt es jetzt
- den <strong>„Löschen”–Knopf</strong>
- neben dem Namen einer Aufnahme. Die Aufnahme wird via
- VDR als gelöscht markiert. D.h. die Aufnahme wird
- in „.del” umbenannt und beim nächsten
- Aufräumen des VDR entsorgt.
- </li>
- <li>
- Die „Einstellungen” sollte man nach einem
- Update von live 0.1.0 auf 0.2.0 direkt aufsuchen. Dort
- gibt es <strong>Einstellungen für die neuen
- Funktionen</strong>, die man überprüfen
- sollte.
- </li>
- <li>
- Überarbeitet ist auch die Möglichkeit sich ein
- passendes <strong>„Thema”</strong>
- auszusuchen, sprich farblich unterschiedliche Designs
- auszuwählen.
- </li>
- <li>
- Unterstützung für https Datentransfer zwischen
- LIVE und dem Browser
- via <strong>SSL-Unterstützung</strong> in tntnet.
- </li>
- <li>
- Weiterhin gibt es viele <strong>kleine
- Neuerungen</strong> wie z.B. die Anzeige der
- Aufnahmenlänge in Minuten, die zu entdecken sich
- lohnt :).
- </li>
- </ul>
diff --git a/doc/web/homepage/de/img/editsearchtimer.jpg b/doc/web/homepage/de/img/editsearchtimer.jpg
deleted file mode 100644
index 385043e..0000000
Binary files a/doc/web/homepage/de/img/editsearchtimer.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/editsearchtimer_thumb.jpg b/doc/web/homepage/de/img/editsearchtimer_thumb.jpg
deleted file mode 100644
index 6bf65a8..0000000
Binary files a/doc/web/homepage/de/img/editsearchtimer_thumb.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/edittimer.jpg b/doc/web/homepage/de/img/edittimer.jpg
deleted file mode 100644
index b461653..0000000
Binary files a/doc/web/homepage/de/img/edittimer.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/edittimer_thumb.jpg b/doc/web/homepage/de/img/edittimer_thumb.jpg
deleted file mode 100644
index b1347ff..0000000
Binary files a/doc/web/homepage/de/img/edittimer_thumb.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/favourites.jpg b/doc/web/homepage/de/img/favourites.jpg
deleted file mode 100644
index 9e40a48..0000000
Binary files a/doc/web/homepage/de/img/favourites.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/favourites_thumb.jpg b/doc/web/homepage/de/img/favourites_thumb.jpg
deleted file mode 100644
index 4a8a406..0000000
Binary files a/doc/web/homepage/de/img/favourites_thumb.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/recordings.jpg b/doc/web/homepage/de/img/recordings.jpg
deleted file mode 100644
index 8049cba..0000000
Binary files a/doc/web/homepage/de/img/recordings.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/recordings_thumb.jpg b/doc/web/homepage/de/img/recordings_thumb.jpg
deleted file mode 100644
index 6d4eeee..0000000
Binary files a/doc/web/homepage/de/img/recordings_thumb.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/remote.jpg b/doc/web/homepage/de/img/remote.jpg
deleted file mode 100644
index 5177a3a..0000000
Binary files a/doc/web/homepage/de/img/remote.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/remote_thumb.jpg b/doc/web/homepage/de/img/remote_thumb.jpg
deleted file mode 100644
index 03719f5..0000000
Binary files a/doc/web/homepage/de/img/remote_thumb.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/schedule.jpg b/doc/web/homepage/de/img/schedule.jpg
deleted file mode 100644
index 93fd164..0000000
Binary files a/doc/web/homepage/de/img/schedule.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/schedule_thumb.jpg b/doc/web/homepage/de/img/schedule_thumb.jpg
deleted file mode 100644
index 33cc499..0000000
Binary files a/doc/web/homepage/de/img/schedule_thumb.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/search.jpg b/doc/web/homepage/de/img/search.jpg
deleted file mode 100644
index 8e2f034..0000000
Binary files a/doc/web/homepage/de/img/search.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/search_thumb.jpg b/doc/web/homepage/de/img/search_thumb.jpg
deleted file mode 100644
index c4c38b3..0000000
Binary files a/doc/web/homepage/de/img/search_thumb.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/searchtimer.jpg b/doc/web/homepage/de/img/searchtimer.jpg
deleted file mode 100644
index 68a878d..0000000
Binary files a/doc/web/homepage/de/img/searchtimer.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/searchtimer_thumb.jpg b/doc/web/homepage/de/img/searchtimer_thumb.jpg
deleted file mode 100644
index 7be9633..0000000
Binary files a/doc/web/homepage/de/img/searchtimer_thumb.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/setup.jpg b/doc/web/homepage/de/img/setup.jpg
deleted file mode 100644
index 8f4c570..0000000
Binary files a/doc/web/homepage/de/img/setup.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/setup_thumb.jpg b/doc/web/homepage/de/img/setup_thumb.jpg
deleted file mode 100644
index 1947dbb..0000000
Binary files a/doc/web/homepage/de/img/setup_thumb.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/timerconflict.jpg b/doc/web/homepage/de/img/timerconflict.jpg
deleted file mode 100644
index 184c9dd..0000000
Binary files a/doc/web/homepage/de/img/timerconflict.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/timerconflict_thumb.jpg b/doc/web/homepage/de/img/timerconflict_thumb.jpg
deleted file mode 100644
index a434ad4..0000000
Binary files a/doc/web/homepage/de/img/timerconflict_thumb.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/whatson.jpg b/doc/web/homepage/de/img/whatson.jpg
deleted file mode 100644
index 7e373ed..0000000
Binary files a/doc/web/homepage/de/img/whatson.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/whatson_thumb.jpg b/doc/web/homepage/de/img/whatson_thumb.jpg
deleted file mode 100644
index 7393c79..0000000
Binary files a/doc/web/homepage/de/img/whatson_thumb.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/whatsonlist.jpg b/doc/web/homepage/de/img/whatsonlist.jpg
deleted file mode 100644
index 16bd48b..0000000
Binary files a/doc/web/homepage/de/img/whatsonlist.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/img/whatsonlist_thumb.jpg b/doc/web/homepage/de/img/whatsonlist_thumb.jpg
deleted file mode 100644
index b93d2be..0000000
Binary files a/doc/web/homepage/de/img/whatsonlist_thumb.jpg and /dev/null differ
diff --git a/doc/web/homepage/de/index.php b/doc/web/homepage/de/index.php
deleted file mode 100644
index 857f90a..0000000
--- a/doc/web/homepage/de/index.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
- <head>
- <title>VDR LIVE - Home</title>
- <?php include ("../html-header.inc") ?>
- </head>
- <body>
- <?php
- include ("../page-php-classes.inc");
- include ("settings-de.inc");
- ?>
- <div class="page_header">
- <?php include ("../page-header.inc"); ?>
- </div>
- <div style="clear:both"></div>
-
- <?php include ("../page-menu.inc"); ?>
-
- <div class="inhalt">
-
- <div style="width: 800px; margin-top: 15px">
- <a name="about"></a>
- <div class="boxheader"><div><div>Über LIVE</div></div></div>
- <div style="border: 1px solid black; padding: 0px 10px">
- <div class="screenshots" style="float: right; border: 0; padding-top: 15px"><?php $screenshots->RandomImg(); ?></div>
- <p>
- <b>LIVE</b>
- </p>
- <p>
- LIVE, das <strong><em>LIVE Interactive VDR
- Environment</em></strong>, ermöglicht die komfortable
- Bedienung des VDR und mancher seiner Plugins über ein
- Webinterface.</p>
-
- <p>Anders als externe Programme, die mit VDR und seinen
- Plugins über die SVDRP-Schnittstelle kommunizieren,
- hat LIVE einen direkten Zugriff auf die internen
- Datenstrukturen und ist dadurch sehr schnell.</p>
-
- <p>Zudem wurde eine Schnittstelle eingeführt, die eine
- direkte Integration einer Bedienoberfläche für
- VDR Plugins in LIVE ermöglicht.<br/>
- Gegenwärtig wurde dies
- für <a href="http://winni.vdr-developer.org/epgsearch/index.html">EPGSearch</a>
- realisiert, welches einen erheblichen Teil des
- Funktionsumfangs der Weboberfläche zur Verfügung
- stellt. Langfristig ist das für andere Plugins, wie
- zum Beispiel taste, burn, femon und viele andere
- geplant.<br/> LIVE funktioniert aber auch ohne diese(s)
- Plugin(s). LIVE erkennt das Fehlen eines Plugins und passt
- seine Oberfläche entsprechend an. Daher kann es sein,
- dass bestimmte Funktionen erst bei Aktivierung der Plugins
- sicht- und verwendbar werden.
- </p>
- <p>
- Einen ersten optischen Eindruck von LIVE kann man sich auf
- der <a href="screenshots.php"><?php echo
- $menu->urls["screenshots.php"]; ?>-Seite</a> verschaffen.
- </p>
- <p>
- <b>Lizenz</b>
- </p>
- <p>
- LIVE wird unter
- der <a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU
- General Public License, Version 2</a> (GPLv2)
- veröffentlicht. Nähere Informationen erhalten
- Sie durch verfolgen des Links und/oder in der
- Datei <tt>COPYING</tt> im Quellcode Verzeichnis von LIVE.
- </p>
- </div>
- </div>
-
- <div style="width: 800px; margin-top: 15px">
- <div class="boxheader"><div><div>Neue Features von LIVE <?php echo $status->vers_number; ?></div></div></div>
- <div style="border: 1px solid black; padding: 0px 10px">
- <?php include ("features_0-2-0.inc"); ?>
- <p>
- Alle bisherigen Änderungen an LIVE sind auf der Seite
- mit den <a href="news.php">archivierten <?php echo
- $menu->urls["news.php"];?></a> aufgelistet.
- </p>
- </div>
- </div>
-
- <div style="width: 800px; margin-top: 15px">
- <div class="boxheader"><div><div>Direkter Download von LIVE <?php echo $status->vers_number; ?></div></div></div>
- <div style="border: 1px solid black; padding: 0px 10px">
- <p>
- <b>Version <?php echo $status->vers_number; ?></b>
- <ul>
- <li>
- Download: <?php echo "<a href=\"http://live.vdr-developer.org/downloads/vdr-live-" . $status->vers_number . ".tar.gz\">" . "http://live.vdr-developer.org/downloads/vdr-live-" . $status->vers_number . ".tar.gz</a>"; ?>
- <p>
- <strong>WICHTIG:</strong> unbedingt auch immer die Datei README in LIVE Quellen-Verzeichnis beachten!
- </p>
- </li>
- </ul>
- </p>
- <p>
- <b>Vorausetzungen für die Installation:</b>
- <?php include ("install_0-2-0.inc"); ?>
- </p>
- <p>
- Andere Versionen von LIVE können von
- der <a href="download.php"><?php echo
- $menu->urls["download.php"]; ?>-Seite</a> herunter geladen
- werden.
- </p>
- </div>
- </div>
-
- <div style="width: 800px; margin-top: 15px">
- <a name="links"></a>
- <div class="boxheader"><div><div>Links</div></div></div>
- <div style="border: 1px solid black; padding: 0px 10px">
- <p>
- <b>Web:</b>
- <ul>
- <li><a href="http://www.vdr-developer.org/mantisbt/main_page.php">Bugtracker</a> - Bugs und Featurewünsche</li>
- <li><a href="http://www.cadsoft.de/vdr/">Video Disk Recorder - VDR</a></li>
- <li><a href="http://winni.vdr-developer.org/epgsearch/index.html">EPGSearch Plugin</a></li>
- <br />
- <li><a href="http://www.vdr-portal.de">VDR-Portal</a></li>
- <li><a href="http://www.vdr-wiki.de">VDR-Wiki</a></li>
- </ul>
- </p>
- <p>
- <b>IRC:</b>
- <ul>
- <li>Server: irc://www.vdr-portal.de</li>
- <li>Channel: #live</li>
- </ul>
- </p>
- <p>
- <b>Sonstiges</b>
- <ul>
- <li>Zusätzliche Kontaktinfos finden Sie am Anfang der README Datei im LIVE Quellcode.</li>
- </ul>
- </p>
- </div>
- </div>
-
- </div>
- </body>
-</html>
diff --git a/doc/web/homepage/de/install_0-1-0.inc b/doc/web/homepage/de/install_0-1-0.inc
deleted file mode 100644
index dc7cf36..0000000
--- a/doc/web/homepage/de/install_0-1-0.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
- require_once ("../live-sw-configs.php");
-
- $selectedConfig = '0.1.0';
-?>
- <div class="tab">
- <table class="listing" style="margin-bottom: 15px; width: 100%" cellspacing="0" cellpadding="0">
- <tr class="description">
- <td><div class="withmargin">Software</div></td>
- <td><div class="withmargin">Mindestversion</div></td>
- <td><div class="withmargin">Empfohlen</div></td>
- <td><div class="withmargin">URL</div></td>
- </tr>
- <?php
- foreach ($LiveSWConfigs[$selectedConfig]->Required() as $sc) {
- SWConfTableRow($sc);
- }
- ?>
- <tr class="spacer">
- <td colspan="4"></td>
- </tr>
- <tr class="description">
- <td colspan="4"><div class="withmargin">Verwendete VDR Plugins:</div></td>
- </tr>
- <?php
- foreach ($LiveSWConfigs[$selectedConfig]->Plugins() as $sc) {
- SWConfTableRow($sc);
- }
- ?>
- </table>
- </div>
-
- <p>
- Tntnet stellt grundlegende Webserver-Funktionen f�r LIVE zur
- Verf�gung. Cxxtools wird von Tntnet ben�tigt.<br />
- Boost stellt wichtige Datenstrukturen. Gegenw�rtig ben�tigen
- wir das Gesamtpaket, demn�chst k�nnte es aber eine
- abgespeckte Version, die nur das ben�tigte bereitstellt, von
- uns geben.
- </p>
diff --git a/doc/web/homepage/de/install_0-2-0.inc b/doc/web/homepage/de/install_0-2-0.inc
deleted file mode 100644
index 71f2a89..0000000
--- a/doc/web/homepage/de/install_0-2-0.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
- require_once ("../live-sw-configs.php");
-
- $selectedConfig = '0.2.0';
-?>
- <div class="tab">
- <table class="listing" style="margin-bottom: 15px; width: 100%" cellspacing="0" cellpadding="0">
- <tr class="description">
- <td><div class="withmargin">Software</div></td>
- <td><div class="withmargin">Mindestversion</div></td>
- <td><div class="withmargin">Empfohlen</div></td>
- <td><div class="withmargin">URL</div></td>
- </tr>
- <?php
- foreach ($LiveSWConfigs[$selectedConfig]->Required() as $sc) {
- SWConfTableRow($sc);
- }
- ?>
- <tr class="spacer">
- <td colspan="4"></td>
- </tr>
- <tr class="description">
- <td colspan="4"><div class="withmargin">Optional:</div></td>
- </tr>
- <?php
- foreach ($LiveSWConfigs[$selectedConfig]->Optional() as $sc) {
- SWConfTableRow($sc);
- }
- ?>
- <tr class="spacer">
- <td colspan="4"></td>
- </tr>
- <tr class="description">
- <td colspan="4"><div class="withmargin">Verwendete VDR Plugins:</div></td>
- </tr>
- <?php
- foreach ($LiveSWConfigs[$selectedConfig]->Plugins() as $sc) {
- SWConfTableRow($sc);
- }
- ?>
- </table>
- </div>
-
- <p>
- Tntnet stellt grundlegende Webserver-Funktionen f�r LIVE zur
- Verf�gung. Cxxtools wird von Tntnet ben�tigt.<br />*) Boost
- stellt TR1 C++-Erweiterungen bereit und wird nur von GCC
- < 4.1 ben�tigt.
- </p>
diff --git a/doc/web/homepage/de/install_devel.inc b/doc/web/homepage/de/install_devel.inc
deleted file mode 100644
index c57889e..0000000
--- a/doc/web/homepage/de/install_devel.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
- require_once ("../live-sw-configs.php");
-
- $selectedConfig = 'devel';
-?>
- <div class="tab">
- <table class="listing" style="margin-bottom: 15px; width: 100%" cellspacing="0" cellpadding="0">
- <tr class="description">
- <td><div class="withmargin">Software</div></td>
- <td><div class="withmargin">Mindestversion</div></td>
- <td><div class="withmargin">Empfohlen</div></td>
- <td><div class="withmargin">URL</div></td>
- </tr>
- <?php
- foreach ($LiveSWConfigs[$selectedConfig]->Required() as $sc) {
- SWConfTableRow($sc);
- }
- ?>
- <tr class="spacer">
- <td colspan="4"></td>
- </tr>
- <tr class="description">
- <td colspan="4"><div class="withmargin">Optional:</div></td>
- </tr>
- <?php
- foreach ($LiveSWConfigs[$selectedConfig]->Optional() as $sc) {
- SWConfTableRow($sc);
- }
- ?>
- <tr class="spacer">
- <td colspan="4"></td>
- </tr>
- <tr class="description">
- <td colspan="4"><div class="withmargin">Verwendete VDR Plugins:</div></td>
- </tr>
- <?php
- foreach ($LiveSWConfigs[$selectedConfig]->Plugins() as $sc) {
- SWConfTableRow($sc);
- }
- ?>
- </table>
- </div>
-
- <p>
- Tntnet stellt grundlegende Webserver-Funktionen f�r LIVE zur
- Verf�gung. Cxxtools wird von Tntnet ben�tigt.<br />*) Boost
- stellt TR1 C++-Erweiterungen bereit und wird nur von GCC
- < 4.1 ben�tigt.
- </p>
diff --git a/doc/web/homepage/de/news.php b/doc/web/homepage/de/news.php
deleted file mode 100644
index 3c96aef..0000000
--- a/doc/web/homepage/de/news.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
- <head>
- <title>VDR Live - Neuerungen</title>
- <?php include ("../html-header.inc") ?>
- </head>
- <body>
- <?php
- include ("../page-php-classes.inc");
- include ("settings-de.inc");
- ?>
- <div class="page_header">
- <?php include ("../page-header.inc"); ?>
- </div>
- <div style="clear:both"></div>
-
- <?php include ("../page-menu.inc"); ?>
-
- <div class="inhalt">
-
- <div style="width: 800px; margin-top: 15px">
- <div class="boxheader"><div><div>Features von LIVE 0.2.0</div></div></div>
- <div style="border: 1px solid black; padding: 0px 10px">
- <?php include ("features_0-2-0.inc"); ?>
- </div>
- </div>
-
- <div style="width: 800px; margin-top: 15px">
- <div class="boxheader"><div><div>Features von LIVE 0.1.0</div></div></div>
- <div style="border: 1px solid black; padding: 0px 10px">
- <?php include ("features_0-1-0.inc"); ?>
- </div>
- </div>
-
- </div>
- </body>
-</html>
diff --git a/doc/web/homepage/de/screenshots.php b/doc/web/homepage/de/screenshots.php
deleted file mode 100644
index df1c755..0000000
--- a/doc/web/homepage/de/screenshots.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
- <head>
- <title>VDR Live - Screenshots</title>
- <?php include ("../html-header.inc") ?>
- </head>
- <body>
- <?php
- include ("../page-php-classes.inc");
- include ("settings-de.inc");
- ?>
- <div class="page_header">
- <?php include ("../page-header.inc"); ?>
- </div>
- <div style="clear:both"></div>
-
- <?php include ("../page-menu.inc"); ?>
-
- <div class="inhalt">
-
- <div style="width: 840px; margin-top: 15px">
- <div class="boxheader"><div><div>
- <?php
- if (isset($_GET["img"])) {
- echo "Screenshot: " . $screenshots->ImageDescr($_GET["img"], "Unbekanntes Bild");
- }
- else {
- echo "Screenshots: Übersicht";
- }
- ?>
- </div></div></div>
- <div class="screenshots">
- <?php
- if (isset($_GET["img"])) {
- $screenshots->FullImage($_GET["img"]);
- }
- else {
- $screenshots->AllImg();
- }
- ?>
- </div>
- </div>
-
- </div>
- </body>
-</html>
diff --git a/doc/web/homepage/de/settings-de.inc b/doc/web/homepage/de/settings-de.inc
deleted file mode 100644
index e49ca83..0000000
--- a/doc/web/homepage/de/settings-de.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
- // Settings for german version:
-$status = new Status("LIVE Plugin Status",
- "Aktuelle stabile Version",
- "0.2.0",
- "d.m.Y",
- "Sprache: ");
-
-$menu = new Menu(array("index.php" => "Über LIVE",
- "news.php" => "Neuerungen",
- "download.php" => "Download",
- "screenshots.php" => "Screenshots",
- "index.php#links" => "Links und Kontakt"
- ));
-
-$screenshots = new Screenshots(array("whatson" => "Was läuft (Ausführliche Ansicht)",
- "whatsonlist" => "Was läuft (Listenansicht)",
- "schedule" => "Programm eines Kanals für die nächsten Tage",
- "edittimer" => "Timer editieren",
- "search" => "Suche in den EPG Daten",
- "searchtimer" => "Suchtimer",
- "editsearchtimer" => "Suchtimer editieren",
- "timerconflict" => "Timer Konflikt Anzeige",
- "recordings" => "Aufnahmen",
- "remote" => "Fernbedienung",
- "setup" => "LIVE Einstellungen",
- "favourites" => "Was läuft (Favoritenansicht)"));
-?>
diff --git a/doc/web/homepage/en/download.php b/doc/web/homepage/en/download.php
deleted file mode 100644
index 2cedca3..0000000
--- a/doc/web/homepage/en/download.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
- <head>
- <title>VDR LIVE - Downloads</title>
- <?php include ("../html-header.inc") ?>
- </head>
- <body>
- <?php
- include ("../page-php-classes.inc");
- include ("settings-en.inc");
- ?>
- <div class="page_header">
- <?php include ("../page-header.inc"); ?>
- </div>
- <div style="clear:both"></div>
-
- <?php include ("../page-menu.inc"); ?>
-
- <div class="inhalt">
-
- <div style="width: 800px; margin-top: 15px">
- <div class="boxheader"><div><div>Stable version:</div></div></div>
- <div style="border: 1px solid black; padding: 0px 10px">
- <p>
- <b>Version 0.2.0</b>
- <ul>
- <li>Download: <a href="http://live.vdr-developer.org/downloads/vdr-live-0.2.0.tar.gz">http://live.vdr-developer.org/downloads/vdr-live-0.2.0.tar.gz</a></li>
- </ul>
- </p>
- <p>
- <b>Installation prerequisites:</b>
- <?php include ("install_0-2-0.inc"); ?>
- </p>
- <p></p>
- </div>
- </div>
-
- <div style="width: 800px; margin-top: 15px">
- <div class="boxheader"><div><div>Development version:</div></div></div>
- <div style="border: 1px solid black; padding: 0px 10px">
- <p>
- <b>Current CVS snapshot</b>
- <ul>
- <li>
- Download: <a href="http://www.vdr-developer.org/cgi-bin/cvsweb.cgi/live/live.tar.gz?tarball=1">http://www.vdr-developer.org/cgi-bin/cvsweb.cgi/live/</a>
- <p>
- <strong>IMPORTANT:</strong> when using this version
- please always check the README file in the LIVE
- source directory.
- </p>
- </li>
- </ul>
- </p>
- <p>
- <b>Installation prerequisites:</b>
- <?php include ("install_devel.inc"); ?>
- </p>
- <p></p>
- </div>
- </div>
-
- <div style="width: 800px; margin-top: 15px">
- <div class="boxheader"><div><div>Old version:</div></div></div>
- <div style="border: 1px solid black; padding: 0px 10px">
- <p>
- <b>Version 0.1.0</b>
- <ul>
- <li>Download: <a href="http://live.vdr-developer.org/downloads/vdr-live-0.1.0.tar.gz">http://live.vdr-developer.org/downloads/vdr-live-0.1.0.tar.gz</a></li>
- </ul>
- </p>
- <p>
- <b>Installation prerequisites:</b>
- <?php include ("install_0-1-0.inc"); ?>
- </p>
- <p></p>
- </div>
- </div>
-
- </div>
- </body>
-</html>
diff --git a/doc/web/homepage/en/features_0-1-0.inc b/doc/web/homepage/en/features_0-1-0.inc
deleted file mode 100644
index a6954c5..0000000
--- a/doc/web/homepage/en/features_0-1-0.inc
+++ /dev/null
@@ -1,3 +0,0 @@
- <ul>
- <li>Initial version :)</li>
- </ul>
diff --git a/doc/web/homepage/en/features_0-2-0.inc b/doc/web/homepage/en/features_0-2-0.inc
deleted file mode 100644
index 4d231ce..0000000
--- a/doc/web/homepage/en/features_0-2-0.inc
+++ /dev/null
@@ -1,98 +0,0 @@
- <p>
- The following list contains the most important user
- visible changes in LIVE since the release of the last
- stable version. Underneath the visible parts changes took
- place too: e.g. the used Javascript is now based in large
- parts on
- the <a href="http://www.mootools.net/">Mootools</a>
- framework.
- </p>
- <ul>
- <li>
-
- The <strong>InfoBox</strong> has
- become <strong>“more intelligent”</strong>,
- e.g. a recording can be fast-forwarded, while playing it
- over VDR TV out. And channels of the primary output
- device can be switched with the controls in the InfoBox.
- </li>
- <li>
- A <strong>favorite list</strong> found place under
- “whats on?”. It is populated by
- “search timers” with set option “use
- in favorite menu” while creating the timer. Also
- new is an option to display the “whats on?”
- entries in a list.
- </li>
- <li>
- Each schedules entry (only those with EPG data) owns a
- button
- <strong>“show in browser”</strong>: This
- button calls the VLC plugin and shows a liveTV
- stream. This does not work for recordings.
- </li>
- <li>
- On “schedule” page, there is a
- button <strong>“show in browser”</strong>.
- All channels can be selected here, also those without
- EPG data but which are present in the
- channels.conf. Smaller TV providers or radio stations
- are affected by this from time to time.
- </li>
- <li>
- With newer versions of the Epgsearch plugin (starting from
- epgsearch-0.9.24) there is a menu option for timers:
- <strong>“timer conflicts”</strong>. This
- option evaluates, which programmed timers could not be
- recorded, because there are no more free DVB devices
- available, or similar reasons. When the InfoBox is
- switched active, a message is displayed on the current
- page if Epgsearch detected a change of the timer
- conflicts.
- </li>
- <li>
- On the “search timers” page it is now
- possible to start direct <strong>manual search timer
- updates</strong>. Use it and Epgsearch plugin will
- immediately update all search timers.
- </li>
- <li>
- Within the “edit search timers” page the new
- option “use as search timer” provides a
- <strong>user-defined search</strong>. Here the user
- determines start and stop date for Epgsearch in the
- background. So you are able to build search timers,
- which scan for example only during the period of the
- autumn all transmissions of a series.
- </li>
- <li>
- In <strong>“recordings”</strong> now you
- will find a
- button <strong>“delete”</strong>. The
- recording will be marked with VDRs methods as
- deleted. That means the recording will be renamed with
- the suffix “.del” and removed at the next
- time when VDR cleans up deleted recordings.
- </li>
- <li>
- You should visit “setup” directly after
- updating live 0.1.0 to 0.2.0. There might
- be <strong>settings</strong> for the new functions,
- which you would like to <strong>examine</strong>.
- </li>
- <li>
- Revised is the possibility to selected a suitable
- <strong>“theme”</strong>, a small set of
- different colored designs to select.
- </li>
- <li>
- Support for https data transfer between LIVE and the
- browser due to <strong>SSL support</strong> in Tntnet.
- </li>
- <li>
- Further there are many <strong>small
- innovations</strong> like the length of recordings in
- minutes ', but we are sure you will discover them by
- yourself.
- </li>
- </ul>
diff --git a/doc/web/homepage/en/img b/doc/web/homepage/en/img
deleted file mode 120000
index 2f29e60..0000000
--- a/doc/web/homepage/en/img
+++ /dev/null
@@ -1 +0,0 @@
-../de/img
\ No newline at end of file
diff --git a/doc/web/homepage/en/index.php b/doc/web/homepage/en/index.php
deleted file mode 100644
index 92d0799..0000000
--- a/doc/web/homepage/en/index.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
- <head>
- <title>VDR LIVE - Home</title>
- <?php include ("../html-header.inc") ?>
- </head>
- <body>
- <?php
- include ("../page-php-classes.inc");
- include ("settings-en.inc");
- ?>
- <div class="page_header">
- <?php include ("../page-header.inc"); ?>
- </div>
- <div style="clear:both"></div>
-
- <?php include ("../page-menu.inc"); ?>
-
- <div class="inhalt">
-
- <div style="width: 800px; margin-top: 15px">
- <a name="about"></a>
- <div class="boxheader"><div><div>About LIVE</div></div></div>
- <div style="border: 1px solid black; padding: 0px 10px">
- <div class="screenshots" style="float: right; border: 0; padding-top: 15px"><?php $screenshots->RandomImg(); ?></div>
- <p>
- <b>LIVE</b>
- </p>
- <p>
- LIVE, the <strong><em>LIVE Interactive VDR
- Environment</em></strong>, allows a comfortable operation
- of VDR and some of its plugins trough a web interface.
- </p>
- <p>
- Unlike external programs, which communicate with VDR and
- its plugins through the SVDRP interface, LIVE has direct
- access to the internal data structures of VDR. This makes
- LIVE very fast.
- </p>
- <p>
- Additionally LIVE introduces an interface which allows the
- direct integration of user interfaces for VDR
- plugins.<br/> Currently this interface was implemented
- for
- the <a href="http://winni.vdr-developer.org/epgsearch/index.html">EPGSearch</a>
- plugin. A substantial part of the LIVE web interface is
- based on this implementation. There exist plans to extend
- other plugins (like taste, burn, femon and others) with
- this interface too.<br/> LIVE works even when these
- plugins are missing. LIVE detects the available plugins
- and adapts its user interface accordingly. Therefor it can
- happen, that certain functions appear and can be used only
- when the appropriate plugin is activated in VDR.
- </p>
- <p>
- You can get a first optical impression of LIVE on the <a href="screenshots.php"><?php echo
- $menu->urls["screenshots.php"]; ?> page</a>
- </p>
- <p>
- <b>License</b>
- </p>
- <p>
- LIVE is distributed under
- the <a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU
- General Public License, version 2</a>(GPLv2). For more
- information follow the Link and/or see the file <tt>COPYING</tt> in
- the LIVE source code directory.
- </p>
- </div>
- </div>
-
- <div style="width: 800px; margin-top: 15px">
- <div class="boxheader"><div><div>New features in LIVE <?php echo $status->vers_number; ?></div></div></div>
- <div style="border: 1px solid black; padding: 0px 10px">
- <?php include ("features_0-2-0.inc"); ?>
- <p>
- All past feature additions or changes of LIVE can be found on
- the
- <a href="news.php"><?php echo
- $menu->urls["news.php"];?> archive page</a>.
- </p>
- </div>
- </div>
-
- <div style="width: 800px; margin-top: 15px">
- <div class="boxheader"><div><div>Direct download of LIVE <?php echo $status->vers_number; ?></div></div></div>
- <div style="border: 1px solid black; padding: 0px 10px">
- <p>
- <b>Version <?php echo $status->vers_number; ?></b>
- <ul>
- <li>
- Download: <?php echo "<a href=\"http://live.vdr-developer.org/downloads/vdr-live-" . $status->vers_number . ".tar.gz\">" . "http://live.vdr-developer.org/downloads/vdr-live-" . $status->vers_number . ".tar.gz</a>"; ?>
- <p>
- <strong>IMPORTANT:</strong> please allways have a look at the <tt>README</tt> file in the LIVE source code directory!
- </p>
- </li>
- </ul>
- </p>
- <p>
- <b>Installation prerequisites:</b>
- <?php include ("install_0-2-0.inc"); ?>
- </p>
- <p>
- Different versions of LIVE can be downloaded from the
- <a href="download.php"><?php echo
- $menu->urls["download.php"]; ?> page</a>.
- </p>
- </div>
- </div>
-
- <div style="width: 800px; margin-top: 15px">
- <a name="links"></a>
- <div class="boxheader"><div><div>Links</div></div></div>
- <div style="border: 1px solid black; padding: 0px 10px">
- <p>
- <b>Web:</b>
- <ul>
- <li><a href="http://www.vdr-developer.org/mantisbt/main_page.php">Bugtracker</a> - for bugs and feature requests</li>
- <li><a href="http://www.cadsoft.de/vdr/">Video Disk Recorder - VDR</a></li>
- <li><a href="http://winni.vdr-developer.org/epgsearch/index.html">EPGSearch Plugin</a></li>
- <br />
- <li><a href="http://www.vdr-portal.de">VDR-Portal</a></li>
- <li><a href="http://www.vdr-wiki.de">VDR-Wiki</a></li>
- </ul>
- </p>
- <p>
- <b>IRC:</b>
- <ul>
- <li>Server: irc://www.vdr-portal.de</li>
- <li>Channel: #live</li>
- </ul>
- </p>
- <p>
- <b>Other:</b>
- <ul>
- <li>Traditional contact information can be found at the top of the README file in the LIVE source distribution.</li>
- </ul>
- </p>
- </div>
- </div>
-
- </div>
- </body>
-</html>
diff --git a/doc/web/homepage/en/install_0-1-0.inc b/doc/web/homepage/en/install_0-1-0.inc
deleted file mode 100644
index 6db40f6..0000000
--- a/doc/web/homepage/en/install_0-1-0.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
- require_once ("../live-sw-configs.php");
-
- $selectedConfig = '0.1.0';
-?>
- <div class="tab">
- <table class="listing" style="margin-bottom: 15px; width: 100%" cellspacing="0" cellpadding="0">
- <tr class="description">
- <td><div class="withmargin">Software</div></td>
- <td><div class="withmargin">minimal version</div></td>
- <td><div class="withmargin">recommended</div></td>
- <td><div class="withmargin">URL</div></td>
- </tr>
- <?php
- foreach ($LiveSWConfigs[$selectedConfig]->Required() as $sc) {
- SWConfTableRow($sc);
- }
- ?>
- <tr class="spacer">
- <td colspan="4"></td>
- </tr>
- <tr class="description">
- <td colspan="4"><div class="withmargin">Used VDR Plugins:</div></td>
- </tr>
- <?php
- foreach ($LiveSWConfigs[$selectedConfig]->Plugins() as $sc) {
- SWConfTableRow($sc);
- }
- ?>
- </table>
- </div>
- <p>
- Tntnet provides the basic web server function for LIVE.
- Cxxtools is needed for Tntnet.<br /> *) Boost provides
- important data structures. Currently the complete package is
- needed. In the future a stripped down version might be part
- of the LIVE distribution.
- </p>
diff --git a/doc/web/homepage/en/install_0-2-0.inc b/doc/web/homepage/en/install_0-2-0.inc
deleted file mode 100644
index c3c1b53..0000000
--- a/doc/web/homepage/en/install_0-2-0.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
- require_once ("../live-sw-configs.php");
-
- $selectedConfig = '0.2.0';
-?>
- <div class="tab">
- <table class="listing" style="margin-bottom: 15px; width: 100%" cellspacing="0" cellpadding="0">
- <tr class="description">
- <td><div class="withmargin">Software</div></td>
- <td><div class="withmargin">minimal version</div></td>
- <td><div class="withmargin">recommended</div></td>
- <td><div class="withmargin">URL</div></td>
- </tr>
- <?php
- foreach ($LiveSWConfigs[$selectedConfig]->Required() as $sc) {
- SWConfTableRow($sc);
- }
- ?>
- <tr class="spacer">
- <td colspan="4"></td>
- </tr>
- <tr class="description">
- <td colspan="4"><div class="withmargin">Optional:</div></td>
- </tr>
- <?php
- foreach ($LiveSWConfigs[$selectedConfig]->Optional() as $sc) {
- SWConfTableRow($sc);
- }
- ?>
- <tr class="spacer">
- <td colspan="4"></td>
- </tr>
- <tr class="description">
- <td colspan="4"><div class="withmargin">Used VDR Plugins:</div></td>
- </tr>
- <?php
- foreach ($LiveSWConfigs[$selectedConfig]->Plugins() as $sc) {
- SWConfTableRow($sc);
- }
- ?>
- </table>
- </div>
- <p>
- Tntnet provides the basic web server function for LIVE.
- Cxxtools is needed for Tntnet.<br />*) Boost provides the
- TR1 C++ extensions. These are only needed when compiled with
- GCC < 4.1. Later GCC versions provide the TR1 extensions
- natively.
- </p>
diff --git a/doc/web/homepage/en/install_devel.inc b/doc/web/homepage/en/install_devel.inc
deleted file mode 100644
index 0c059b7..0000000
--- a/doc/web/homepage/en/install_devel.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
- require_once ("../live-sw-configs.php");
-
- $selectedConfig = 'devel';
-?>
- <div class="tab">
- <table class="listing" style="margin-bottom: 15px; width: 100%" cellspacing="0" cellpadding="0">
- <tr class="description">
- <td><div class="withmargin">Software</div></td>
- <td><div class="withmargin">minimal version</div></td>
- <td><div class="withmargin">recommended</div></td>
- <td><div class="withmargin">URL</div></td>
- </tr>
- <?php
- foreach ($LiveSWConfigs[$selectedConfig]->Required() as $sc) {
- SWConfTableRow($sc);
- }
- ?>
- <tr class="spacer">
- <td colspan="4"></td>
- </tr>
- <tr class="description">
- <td colspan="4"><div class="withmargin">Optional:</div></td>
- </tr>
- <?php
- foreach ($LiveSWConfigs[$selectedConfig]->Optional() as $sc) {
- SWConfTableRow($sc);
- }
- ?>
- <tr class="spacer">
- <td colspan="4"></td>
- </tr>
- <tr class="description">
- <td colspan="4"><div class="withmargin">Used VDR Plugins:</div></td>
- </tr>
- <?php
- foreach ($LiveSWConfigs[$selectedConfig]->Plugins() as $sc) {
- SWConfTableRow($sc);
- }
- ?>
- </table>
- </div>
- <p>
- Tntnet provides the basic web server function for LIVE.
- Cxxtools is needed for Tntnet.<br />*) Boost provides the
- TR1 C++ extensions. These are only needed when compiled with
- GCC < 4.1. Later GCC versions provide the TR1 extensions
- natively.
- </p>
diff --git a/doc/web/homepage/en/news.php b/doc/web/homepage/en/news.php
deleted file mode 100644
index 879c549..0000000
--- a/doc/web/homepage/en/news.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
- <head>
- <title>VDR Live - News</title>
- <?php include ("../html-header.inc") ?>
- </head>
- <body>
- <?php
- include ("../page-php-classes.inc");
- include ("settings-en.inc");
- ?>
- <div class="page_header">
- <?php include ("../page-header.inc"); ?>
- </div>
- <div style="clear:both"></div>
-
- <?php include ("../page-menu.inc"); ?>
-
- <div class="inhalt">
-
- <div style="width: 800px; margin-top: 15px">
- <div class="boxheader"><div><div>Features of LIVE 0.2.0</div></div></div>
- <div style="border: 1px solid black; padding: 0px 10px">
- <?php include ("features_0-2-0.inc"); ?>
- </div>
- </div>
-
- <div style="width: 800px; margin-top: 15px">
- <div class="boxheader"><div><div>Features of LIVE 0.1.0</div></div></div>
- <div style="border: 1px solid black; padding: 0px 10px">
- <?php include ("features_0-1-0.inc"); ?>
- </div>
- </div>
-
- </div>
- </body>
-</html>
diff --git a/doc/web/homepage/en/screenshots.php b/doc/web/homepage/en/screenshots.php
deleted file mode 100644
index 4eb8693..0000000
--- a/doc/web/homepage/en/screenshots.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
- <head>
- <title>VDR Live - Screenshots</title>
- <?php include ("../html-header.inc") ?>
- </head>
- <body>
- <?php
- include ("../page-php-classes.inc");
- include ("settings-en.inc");
- ?>
- <div class="page_header">
- <?php include ("../page-header.inc"); ?>
- </div>
- <div style="clear:both"></div>
-
- <?php include ("../page-menu.inc"); ?>
-
- <div class="inhalt">
-
- <div style="width: 840px; margin-top: 15px">
- <div class="boxheader"><div><div>
- <?php
- if (isset($_GET["img"])) {
- echo "Screenshot: " . $screenshots->ImageDescr($_GET["img"], "Unbekanntes Bild");
- }
- else {
- echo "Screenshots: Overview";
- }
- ?>
- </div></div></div>
- <div class="screenshots">
- <?php
- if (isset($_GET["img"])) {
- $screenshots->FullImage($_GET["img"]);
- }
- else {
- $screenshots->AllImg();
- }
- ?>
- </div>
- </div>
-
- </div>
- </body>
-</html>
diff --git a/doc/web/homepage/en/settings-en.inc b/doc/web/homepage/en/settings-en.inc
deleted file mode 100644
index de0f9b3..0000000
--- a/doc/web/homepage/en/settings-en.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
- // Settings for german version:
-$status = new Status("LIVE Plugin State",
- "Current stable version",
- "0.2.0",
- "m/d/Y",
- "Language: ");
-
-$menu = new Menu(array("index.php" => "About LIVE",
- "news.php" => "News",
- "download.php" => "Download",
- "screenshots.php" => "Screenshots",
- "index.php#links" => "Links and contact"
- ));
-
-$screenshots = new Screenshots(array("whatson" => "What's on (Extended view)",
- "whatsonlist" => "What's on (List view)",
- "schedule" => "Schedule of one channel for the next days",
- "edittimer" => "Edit timer",
- "search" => "Search through EPG data",
- "searchtimer" => "Search timer",
- "editsearchtimer" => "Edit search timer",
- "timerconflict" => "Timer conflict display",
- "recordings" => "Recordings",
- "remote" => "Remote",
- "setup" => "LIVE Settings",
- "favourites" => "What's on (Favorites)"));
-?>
diff --git a/doc/web/homepage/html-header.inc b/doc/web/homepage/html-header.inc
deleted file mode 100644
index 583a7b2..0000000
--- a/doc/web/homepage/html-header.inc
+++ /dev/null
@@ -1,31 +0,0 @@
- <link rel="stylesheet" type="text/css" href="../styles.css" />
- <style type="text/css">
- <!--
- /* ... Hier werden die Formate definiert ... */
-div.screenshots {
- border: 1px solid black;
- padding: 5px;
-}
-
-div.screenshots img {
- padding: 7px;
- border: 1px solid #444444;
-}
-
-a {
- font-weight: bold;
-}
-
-div.tab {
- padding-left: 2.5em;
-}
-
-table.listing a {
- color: blue;
-}
-
-div.inhalt p {
- padding-left: 1em;
-}
- -->
- </style>
diff --git a/doc/web/homepage/img b/doc/web/homepage/img
deleted file mode 120000
index f508b22..0000000
--- a/doc/web/homepage/img
+++ /dev/null
@@ -1 +0,0 @@
-../../../live/img
\ No newline at end of file
diff --git a/doc/web/homepage/index.php b/doc/web/homepage/index.php
deleted file mode 100644
index af9d3c4..0000000
--- a/doc/web/homepage/index.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-require_once 'HTTP.php';
-$langs = array("de" => true, "en" => true);
-$selected = HTTP::negotiateLanguage($langs, "en");
-header("Location: $selected/index.php");
-exit;
-?>
diff --git a/doc/web/homepage/live-sw-configs.php b/doc/web/homepage/live-sw-configs.php
deleted file mode 100644
index 786a469..0000000
--- a/doc/web/homepage/live-sw-configs.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$LiveSWConfigs = array(
-/*
- * devel currently same as '0.2.0'. See below!
- 'devel' => new LiveSWConfig(
- array(),
- array(),
- array()
- ),
-*/
- '0.2.0' => new LiveSWConfig(
- array(
- new SoftwareComponent('VDR', '1.4.0', '>= 1.4.7', 'http://www.cadsoft.de/vdr/download.htm'),
- new SoftwareComponent('Tntnet', '1.5.3', '>= 1.6.1', 'http://www.tntnet.org/download.html'),
- new SoftwareComponent('Cxxtools', '1.4.3', '>= 1.4.7', 'http://www.tntnet.org/download.html')
- ),
- array(
- new SoftwareComponent('boost', '1.32.0', 'GCC < 4.1<sup><small>*</small></sup>', 'http://www.boost.org')
- ),
- array(
- new SoftwareComponent('epgsearch', '0.9.22', '>= 0.9.24', 'http://winni.vdr-developer.org/epgsearch/index.html#download'),
- new SoftwareComponent('streamdev', '0.3.3', '>= 0.3.4', 'http://streamdev.vdr-developer.org/')
- )
- ),
- '0.1.0' => new LiveSWConfig(
- array(
- new SoftwareComponent('VDR', '1.4.0', '<= 1.5.7', 'http://www.cadsoft.de/vdr/download.htm'),
- new SoftwareComponent('Tntnet', '1.5.3', '>= 1.5.3', 'http://www.tntnet.org/download.html'),
- new SoftwareComponent('Cxxtools', '1.4.3', '>= 1.4.3', 'http://www.tntnet.org/download.html'),
- new SoftwareComponent('boost<sup><small>*</small></sup>', '1.32.0', '', 'http://www.boost.org')
- ),
- array(),
- array(
- new SoftwareComponent('epgsearch', '0.9.22', '>= 0.9.22', 'http://winni.vdr-developer.org/epgsearch/index.html#download')
- )
- )
- );
-
-$LiveSWConfigs['devel'] = $LiveSWConfigs['0.2.0'];
-
-function SWConfTableRow($sc)
-{
- echo "<tr>\n";
- echo " <td><div class=\"withmargin\">" . $sc->Name() . "</div></td>\n";
- echo " <td><div class=\"withmargin\">" . $sc->MinVersion() . "</div></td>\n";
- echo " <td><div class=\"withmargin\">" . $sc->RecommendedVersion() . "</div></td>\n";
- echo " <td><div class=\"withmargin\"><a href=\"" . $sc->Homepage() . "\">" . $sc->Homepage() . "</a></div></td>\n";
- echo "</tr>\n";
-}
-?>
diff --git a/doc/web/homepage/page-header.inc b/doc/web/homepage/page-header.inc
deleted file mode 100644
index 5224d9e..0000000
--- a/doc/web/homepage/page-header.inc
+++ /dev/null
@@ -1,20 +0,0 @@
- <a href="index.php"><img src="../img/logo.png" alt="VDR Live!" class="logo" /></a>
- <div id="infobox">
- <div class="statuscontent">
- <div class="st_header">
- <div id="infobox_caption" class="caption"><?php echo $status->title; ?></div>
- <div id="infobox_timenow" class="now"><?php echo date($status->datefmt); ?></div>
- </div>
- <div class="st_content">
- <div id="infobox_name" class="name"><?php echo $status->vers_string; ?>:</div>
- <div id="infobox_duration" class="duration"><?php echo $status->vers_number; ?></div>
- </div>
- <div class="st_controls">
- <div>
- <div style="padding-right: 5px"><?php echo $status->language; ?></div>
- <a href="../en/index.php" ><img src="../img/english.png" alt=""></img></a>
- <a href="../de/index.php" ><img src="../img/german.png" alt=""></img></a>
- </div>
- </div>
- </div>
- </div>
diff --git a/doc/web/homepage/page-menu.inc b/doc/web/homepage/page-menu.inc
deleted file mode 100644
index 3394865..0000000
--- a/doc/web/homepage/page-menu.inc
+++ /dev/null
@@ -1,13 +0,0 @@
- <div class="menu">
- <?php
- $delim = false;
- foreach ($menu->urls as $url => $name) {
- if ($delim) {
- echo " |\n";
- }
- echo "<a href=\"$url\">$name</a>";
- $delim = true;
- }
- echo "\n";
- ?>
- </div>
diff --git a/doc/web/homepage/page-php-classes.inc b/doc/web/homepage/page-php-classes.inc
deleted file mode 100644
index fc6b2f7..0000000
--- a/doc/web/homepage/page-php-classes.inc
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/**
- * class Status:
- * Contains the localized current status of the LIVE plugin.
- */
-class Status
-{
- public $title;
- public $vers_string;
- public $vers_number;
- public $datefmt;
- public $language;
-
- public function __construct($title, $vname, $vnum, $datefmt, $lang)
- {
- $this->title = $title;
- $this->vers_string = $vname;
- $this->vers_number = $vnum;
- $this->datefmt = $datefmt;
- $this->language = $lang;
- }
-}
-
-/**
- * class Menu:
- * holds the localized names and the urls to the pages of the main
- * menu.
- */
-class Menu
-{
- public $urls;
-
- public function __construct($entries)
- {
- $this->urls = $entries;
- }
-}
-
-/**
- * class Screenshots:
- * Contains the localized 'basic' names of the screenshot images and a
- * description of the single images.
- */
-class Screenshots
-{
- private $images;
-
- public function __construct($imgNames)
- {
- $this->images = $imgNames;
- }
-
- public function RandomImg()
- {
- $idx = array_rand($this->images);
- $this->MakeAnchor($idx);
- }
-
-
- public function AllImg()
- {
- foreach($this->images as $idx => $descr) {
- $this->MakeAnchor($idx);
- }
- }
-
- private function MakeAnchor($img)
- {
- echo "<a href=\"screenshots.php?img=$img\"><img src=\"img/${img}_thumb.jpg\" alt=\"$img\"/></a>\n";
- }
-
- public function FullImage($img)
- {
- $img = basename($img);
- echo "<a href=\"screenshots.php\"><img src=\"img/${img}.jpg\" alt=\"img/${img}.jpg\"/ style=\"width: 810px\"></a>\n";
- }
-
- public function ImageDescr($img, $error)
- {
- $img = basename($img);
- if (isset($this->images[$img]))
- return $this->images[$img];
- else
- return $error;
- }
-}
-
-/**
- * class SoftwareComponnent:
- * Describes one software component which has some kind of relation
- * with the LIVE plugin.
- */
-class SoftwareComponent
-{
- private $name;
- private $minVers;
- private $recVers;
- private $homepage;
-
- public function __construct($n, $m, $r, $h)
- {
- $this->name = $n;
- $this->minVers = $m;
- $this->recVers = $r;
- $this->homepage = $h;
- }
-
- public function Name()
- {
- return $this->name;
- }
-
- public function MinVersion()
- {
- return $this->minVers;
- }
-
- public function RecommendedVersion()
- {
- return $this->recVers;
- }
-
- public function Homepage()
- {
- return $this->homepage;
- }
-}
-
-class LiveSWConfig
-{
- private $required;
- private $optional;
- private $plugins;
-
- public function __construct(array $r, array $o, array $p)
- {
- $this->required = $r;
- $this->optional = $o;
- $this->plugins = $p;
- }
-
- public function Required()
- {
- return $this->required;
- }
-
- public function Optional()
- {
- return $this->optional;
- }
-
- public function Plugins()
- {
- return $this->plugins;
- }
-}
-
-?>
diff --git a/doc/web/homepage/styles.css b/doc/web/homepage/styles.css
deleted file mode 120000
index 2c8e136..0000000
--- a/doc/web/homepage/styles.css
+++ /dev/null
@@ -1 +0,0 @@
-../../../css/styles.css
\ No newline at end of file
diff --git a/epgsearch.cpp b/epgsearch.cpp
index 11892de..cd29a0b 100644
--- a/epgsearch.cpp
+++ b/epgsearch.cpp
@@ -85,7 +85,7 @@ void SearchTimer::Init()
m_delAfterCountRecs = 0;
m_delAfterDaysOfFirstRec = 0;
m_useAsSearchTimerFrom = 0;
- m_useAsSearchTimerTil = 0;
+ m_useAsSearchTimerTil = 0;
m_catvaluesAvoidRepeat = 0;
m_ignoreMissingEPGCats = false;
}
@@ -204,7 +204,7 @@ std::string SearchTimer::ToText()
if (m_useExtEPGInfo)
{
for(unsigned int i=0; i<m_ExtEPGInfo.size(); i++)
- tmp_catvalues += (tmp_catvalues != ""?"|":"") +
+ tmp_catvalues += (tmp_catvalues != ""?"|":"") +
StringReplace(StringReplace(m_ExtEPGInfo[i], ":", "!^colon^!"), "|", "!^pipe^!");
}
@@ -381,11 +381,11 @@ bool SearchTimers::Save(SearchTimer* searchtimer)
SearchTimer* SearchTimers::GetByTimerId( std::string const& id )
{
- for (SearchTimers::iterator timer = m_timers.begin(); timer != m_timers.end(); ++timer)
- if (timer->Id() == lexical_cast< int >(id))
+ for (SearchTimers::iterator timer = m_timers.begin(); timer != m_timers.end(); ++timer)
+ if (timer->Id() == lexical_cast< int >(id))
return &*timer;
return NULL;
-
+
}
bool SearchTimers::ToggleActive(std::string const& id)
@@ -419,10 +419,10 @@ void SearchTimers::TriggerUpdate()
}
bool SearchTimer::BlacklistSelected(int id) const
-{
- for(unsigned int i=0; i<m_blacklistIDs.size(); i++)
- if (StringToInt(m_blacklistIDs[i]) == id) return true;
- return false;
+{
+ for(unsigned int i=0; i<m_blacklistIDs.size(); i++)
+ if (StringToInt(m_blacklistIDs[i]) == id) return true;
+ return false;
}
ExtEPGInfo::ExtEPGInfo( string const& data )
@@ -458,13 +458,13 @@ bool ExtEPGInfo::Selected(unsigned int index, std::string const& values)
vector< string > parts;
parts = StringSplit( values, ',' );
- for(unsigned int i=0; i<parts.size(); i++) if (StringTrim(parts[i]) == extepgvalue) return true;
+ for(unsigned int i=0; i<parts.size(); i++) if (StringTrim(parts[i]) == extepgvalue) return true;
parts = StringSplit( values, ';' );
- for(unsigned int i=0; i<parts.size(); i++) if (StringTrim(parts[i]) == extepgvalue) return true;
+ for(unsigned int i=0; i<parts.size(); i++) if (StringTrim(parts[i]) == extepgvalue) return true;
parts = StringSplit( values, '|' );
- for(unsigned int i=0; i<parts.size(); i++) if (StringTrim(parts[i]) == extepgvalue) return true;
+ for(unsigned int i=0; i<parts.size(); i++) if (StringTrim(parts[i]) == extepgvalue) return true;
parts = StringSplit( values, '~' );
- for(unsigned int i=0; i<parts.size(); i++) if (StringTrim(parts[i]) == extepgvalue) return true;
+ for(unsigned int i=0; i<parts.size(); i++) if (StringTrim(parts[i]) == extepgvalue) return true;
return false;
}
@@ -562,7 +562,7 @@ const cEvent* SearchResult::GetEvent()
if (!Channel) return NULL;
const cSchedule *Schedule = Schedules->GetSchedule(Channel);
if (!Schedule) return NULL;
- return Schedule->GetEvent(m_eventId);
+ return Schedule->GetEvent(m_eventId);
}
std::set<std::string> SearchResults::querySet;
@@ -598,10 +598,10 @@ std::string SearchResults::AddQuery(std::string const& query)
std::string SearchResults::PopQuery(std::string const& md5)
{
std::string query;
- if (!md5.empty())
+ if (!md5.empty())
{
std::set<std::string>::iterator it;
- for (it = querySet.begin(); it != querySet.end(); it++)
+ for (it = querySet.begin(); it != querySet.end(); it++)
{
if (md5 == MD5Hash(*it))
{
@@ -616,21 +616,21 @@ std::string SearchResults::PopQuery(std::string const& md5)
RecordingDirs::RecordingDirs(bool shortList)
{
- if (shortList)
+ if (shortList)
{
- Epgsearch_services_v1_2 service;
- if ( !CheckEpgsearchVersion() || cPluginManager::CallFirstService(ServiceInterface, &service) == 0 )
- throw HtmlError( tr("EPGSearch version outdated! Please update.") );
-
- m_set = service.handler->ShortDirectoryList();
+ Epgsearch_services_v1_2 service;
+ if ( !CheckEpgsearchVersion() || cPluginManager::CallFirstService(ServiceInterface, &service) == 0 )
+ throw HtmlError( tr("EPGSearch version outdated! Please update.") );
+
+ m_set = service.handler->ShortDirectoryList();
}
- else
- {
- Epgsearch_services_v1_0 service;
- if ( !CheckEpgsearchVersion() || cPluginManager::CallFirstService(ServiceInterface, &service) == 0 )
- throw HtmlError( tr("EPGSearch version outdated! Please update.") );
-
- m_set = service.handler->DirectoryList();
+ else
+ {
+ Epgsearch_services_v1_0 service;
+ if ( !CheckEpgsearchVersion() || cPluginManager::CallFirstService(ServiceInterface, &service) == 0 )
+ throw HtmlError( tr("EPGSearch version outdated! Please update.") );
+
+ m_set = service.handler->DirectoryList();
}
}
diff --git a/epgsearch.h b/epgsearch.h
index 2f1f6a7..67a9b99 100644
--- a/epgsearch.h
+++ b/epgsearch.h
@@ -25,7 +25,7 @@ public:
Group = 2,
FTAOnly = 3
};
-
+
SearchTimer();
SearchTimer( std::string const& data );
void Init();
@@ -98,8 +98,8 @@ public:
void SetSwitchMinBefore(int switchMinBefore) { m_switchMinBefore = switchMinBefore; }
bool UseExtEPGInfo() const { return m_useExtEPGInfo; }
void SetUseExtEPGInfo(bool useExtEPGInfo) { m_useExtEPGInfo = useExtEPGInfo; }
- std::vector< std::string > ExtEPGInfo() const { return m_ExtEPGInfo; }
- void SetExtEPGInfo(std::vector< std::string > ExtEPGInfo) { m_ExtEPGInfo = ExtEPGInfo; }
+ std::vector< std::string > ExtEPGInfo() const { return m_ExtEPGInfo; }
+ void SetExtEPGInfo(std::vector< std::string > ExtEPGInfo) { m_ExtEPGInfo = ExtEPGInfo; }
bool AvoidRepeats() const { return m_avoidrepeats; }
void SetAvoidRepeats(bool avoidrepeats) { m_avoidrepeats = avoidrepeats; }
int AllowedRepeats() const { return m_allowedrepeats; }
@@ -136,7 +136,7 @@ public:
void SetUseAsSearchTimerTil(std::string const& datestring, std::string const& format);
bool IgnoreMissingEPGCats() const { return m_ignoreMissingEPGCats; }
void SetIgnoreMissingEPGCats(bool ignoreMissingEPGCats) { m_ignoreMissingEPGCats = ignoreMissingEPGCats; }
-
+
private:
int m_id;
std::string m_search;
@@ -392,7 +392,7 @@ public:
typedef recordingdirs::size_type size_type;
typedef recordingdirs::iterator iterator;
typedef recordingdirs::const_iterator const_iterator;
-
+
RecordingDirs(bool shortList=false);
iterator begin() { return m_set.begin(); }
@@ -407,8 +407,8 @@ private:
class EPGSearchSetupValues
{
public:
- static std::string ReadValue(const std::string& entry);
- static bool WriteValue(const std::string& entry, const std::string& value);
+ static std::string ReadValue(const std::string& entry);
+ static bool WriteValue(const std::string& entry, const std::string& value);
};
class EPGSearchExpr
diff --git a/httpd/.cvsignore b/httpd/.cvsignore
deleted file mode 100644
index 42864ae..0000000
--- a/httpd/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-.dependencies
diff --git a/httpd/Makefile b/httpd/Makefile
index 6aa448c..a11d57c 100644
--- a/httpd/Makefile
+++ b/httpd/Makefile
@@ -40,4 +40,7 @@ libhttpd.a: $(OBJS)
$(AR) r $@ $^
clean:
- @rm -f *.o core* libhttpd.a proctest $(DEPFILE)
+ @rm -f *~ *.o core* libhttpd.a proctest $(DEPFILE)
+
+dist: clean
+ @echo "Nothing to do for distribution here ..."
diff --git a/javascript/Makefile b/javascript/Makefile
index d6b72b2..50f3b52 100644
--- a/javascript/Makefile
+++ b/javascript/Makefile
@@ -56,3 +56,6 @@ libjavascript.a: $(OBJS)
clean:
@rm -f *~ *.o core* libjavascript.a $(OBJS:%.o=%.cpp)
+
+dist: clean
+ @echo "Nothing to do for distribution here ..."
diff --git a/livefeatures.h b/livefeatures.h
index 2f246cc..8c6f361 100644
--- a/livefeatures.h
+++ b/livefeatures.h
@@ -42,7 +42,7 @@ private:
SplitVersion m_version;
SplitVersion m_minVersion;
- Features()
+ Features()
: m_plugin( cPluginManager::GetPlugin( Feat::Plugin() ) )
, m_version( Version() )
, m_minVersion( Feat::MinVersion() ) {}
diff --git a/pages/.cvsignore b/pages/.cvsignore
deleted file mode 100644
index 1ae0abb..0000000
--- a/pages/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.cpp
-.dependencies
diff --git a/pages/Makefile b/pages/Makefile
index 6a123d6..78a4a9c 100644
--- a/pages/Makefile
+++ b/pages/Makefile
@@ -5,6 +5,7 @@ PLUGIN = live
### Additional options to silence TNTNET warnings
TNTFLAGS ?= -Wno-overloaded-virtual -Wno-unused-variable
TNTVERSION ?= $(shell tntnet-config --version | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
+CXXTOOLVER ?= $(shell cxxtools-config --version | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
### The C++ compiler and options:
@@ -13,7 +14,7 @@ AR ?= ar
ECPPC ?= ecppc
CXXFLAGS ?= -O2 -Woverloaded-virtual -Wall -fPIC
-DEFINES ?= -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DTNTVERSION=$(TNTVERSION)
+DEFINES ?= -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DTNTVERSION=$(TNTVERSION) -DCXXTOOLVER=$(CXXTOOLVER)
### The directory environment:
@@ -74,3 +75,6 @@ libpages.a: $(OBJS)
clean:
@rm -f *~ *.o core* libpages.a $(OBJS:%.o=%.cpp) $(DEPFILE)
+
+dist: clean
+ @echo "Nothing to do for distribution here ..."
diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
index ad8a494..2be03a0 100644
--- a/pages/pageelems.ecpp
+++ b/pages/pageelems.ecpp
@@ -104,7 +104,7 @@ int update_status(1);
<%args>
string title;
</%args>
-<%cpp> if (LiveSetup().GetShowIMDb()) { </%cpp> <a href="http://akas.imdb.com/Tsearch?title=<$ StringUrlEncode(title) $>" target="_blank"><img src="<$ LiveSetup().GetThemedLink("img", "imdb.png") $>" alt="" <& tooltip.hint text=(tr("Find more at the Internet Movie Database.")) &>></img></a> <%cpp> } </%cpp>
+<%cpp> if (LiveSetup().GetShowIMDb()) { </%cpp> <a href="http://www.imdb.com/find?s=all&q=<$ StringUrlEncode(title) $>" target="_blank"><img src="<$ LiveSetup().GetThemedLink("img", "imdb.png") $>" alt="" <& tooltip.hint text=(tr("Find more at the Internet Movie Database.")) &>></img></a> <%cpp> } </%cpp>
</%def>
<# ---------------------------------------------------------------------- #>
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index 8bdad66..51018bb 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -64,12 +64,17 @@ if (!todel.empty()) {
deletions.push_back(todel);
}
for (deletions_type::const_iterator it = deletions.begin(); it != deletions.end(); ++it) {
- RemoveRecordingTask task(*it);
- LiveTaskManager().Execute(task);
- if (!task.Result())
- deleteResult += string() + tr("ERROR:") + " " + task.Error() + "<br/>";
- else
- deleteResult += string() + tr("Deleted recording:") + " " + StringReplace(task.RecName(), "~", "/") + "<br/>";
+ if (cUser::CurrentUserHasRightTo(UR_DELRECS)) {
+ RemoveRecordingTask task(*it);
+ LiveTaskManager().Execute(task);
+ if (!task.Result())
+ deleteResult += string() + tr("ERROR:") + " " + task.Error() + "<br/>";
+ else
+ deleteResult += string() + tr("Deleted recording:") + " " + StringReplace(task.RecName(), "~", "/") + "<br/>";
+ }
+ else {
+ throw HtmlError( tr("Sorry, no permission. Please contact your administrator!") );
+ }
}
deletions.clear();
diff --git a/pages/setup.ecpp b/pages/setup.ecpp
index edb88a7..9bb2261 100644
--- a/pages/setup.ecpp
+++ b/pages/setup.ecpp
@@ -265,7 +265,11 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP))
<td class="rightcol"><select name="theme" size="1" id="theme">
<%cpp>
{
+#if APIVERSNUM > 10729
+ const string dirPath(Plugin::GetResourceDirectory() + "/themes");
+#else
const string dirPath(Plugin::GetConfigDirectory() + "/themes");
+#endif
cReadDir d(dirPath.c_str());
struct dirent* e;
string parent("..");
diff --git a/po/.cvsignore b/po/.cvsignore
deleted file mode 100644
index be410a4..0000000
--- a/po/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.mo
-live.pot
-
diff --git a/po/de_DE.po b/po/de_DE.po
index a7cf149..3dd9cfb 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -159,7 +159,6 @@ msgstr "Schnittmarken löschen"
msgid "Copy only"
msgstr "Nur kopieren"
-#, fuzzy
msgid "Short description"
msgstr "Kurzbeschreibung"
diff --git a/setup.cpp b/setup.cpp
index bd72e92..f6bf168 100644
--- a/setup.cpp
+++ b/setup.cpp
@@ -189,26 +189,31 @@ namespace {
bool Setup::CheckServerIps()
{
if ( m_serverIps.empty() ) {
+#if TNT_IPV6_V6ONLY
+ m_serverIps.push_back("");
+ return true;
+#else
FILE* f = fopen("/proc/sys/net/ipv6/bindv6only", "r");
if (f) {
bool bindv6only = false;
int c = fgetc(f);
if (c != EOF) {
- bindv6only = c - '0';
+ bindv6only = ((c - '0') != 0);
}
fclose(f);
f = NULL;
esyslog( "[live] INFO: bindv6only=%d", bindv6only);
// add a default IPv6 listener address
- m_serverIps.push_back( "::" );
- // skip the default IPv4 listener address if IPv6 one will be binded also to v4
+ m_serverIps.push_back("::");
+ // skip the default IPv4 listener address if the IPv6 one will be bound also to v4
if (!bindv6only)
return true;
}
// add a default IPv4 listener address
- m_serverIps.push_back( "0.0.0.0" );
+ m_serverIps.push_back("0.0.0.0");
// we assume these are ok :)
return true;
+#endif // TNT_IPV6_V6ONLY
}
IpList::iterator i = partition(m_serverIps.begin(), m_serverIps.end(), IpValidator());
diff --git a/setup.h b/setup.h
index 4d83762..58b4a11 100644
--- a/setup.h
+++ b/setup.h
@@ -9,8 +9,8 @@
#include "tntfeatures.h"
#include <vdr/menuitems.h>
-#define LIVEVERSION "0.2.0"
-#define LIVEVERSNUM 200
+#define LIVEVERSION "0.3.0"
+#define LIVEVERSNUM 300
#define LIVESUMMARY trNOOP("Live Interactive VDR Environment")
namespace vdrlive {
diff --git a/tntfeatures.h b/tntfeatures.h
index fb5d9c5..6de1f88 100644
--- a/tntfeatures.h
+++ b/tntfeatures.h
@@ -23,5 +23,7 @@
// new version of TNTNET allow the request watchdog to be silenced.
#define TNT_WATCHDOG_SILENCE (TNTVERSION >= 16900)
+// version of TNTNET that binds ipv6 addresses with IPV6_V6ONLY flag set to true
+#define TNT_IPV6_V6ONLY (CXXTOOLVER >= 21000)
#endif // VDR_LIVE_TNTFEATURES_H
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-live.git
More information about the pkg-vdr-dvb-changes
mailing list