- Added option to select streamdev stream type in live setings.

26 files changed, 285 insertions, 74 deletions

diff --git a/i18n-generated.h b/i18n-generated.h
index 384353d..612203e 100644
--- a/i18n-generated.h
+++ b/i18n-generated.h
@@ -6416,6 +6416,41 @@ const tI18nPhrase Phrases[] = {
     "",
 #endif
   },
+  { "RecDate",
+    "Aufnahmedatum",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "Tallenteen päiväys",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+#if VDRVERSNUM >= 10302
+    "",
+#endif
+#if VDRVERSNUM >= 10307
+    "",
+#endif
+#if VDRVERSNUM >= 10313
+    "",
+#endif
+#if VDRVERSNUM >= 10316
+    "",
+#endif
+#if VDRVERSNUM >= 10342
+    "",
+#endif
+#if VDRVERSNUM >= 10502
+    "",
+#endif
+  },
   { "List of recordings",
     "Liste der Aufnahmen",
     "",
@@ -7466,7 +7501,7 @@ const tI18nPhrase Phrases[] = {
     "",
 #endif
   },
-  { "streamdev server port",
+  { "Streamdev server port",
     "Streamdev Server Port",
     "",
     "",
@@ -7501,6 +7536,41 @@ const tI18nPhrase Phrases[] = {
     "",
 #endif
   },
+  { "Streamdev stream type",
+    "Streamdev Stream Typ",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "Streamdev-palvelimen portti",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+#if VDRVERSNUM >= 10302
+    "",
+#endif
+#if VDRVERSNUM >= 10307
+    "",
+#endif
+#if VDRVERSNUM >= 10313
+    "",
+#endif
+#if VDRVERSNUM >= 10316
+    "",
+#endif
+#if VDRVERSNUM >= 10342
+    "",
+#endif
+#if VDRVERSNUM >= 10502
+    "",
+#endif
+  },
   { "additional fixed times in 'What's on?'",
     "zusätzliche Zeitpunkte in 'Was läuft?'",
     "",
diff --git a/pages/setup.ecpp b/pages/setup.ecpp
index debd97c..548846f 100644
--- a/pages/setup.ecpp
+++ b/pages/setup.ecpp
@@ -23,6 +23,7 @@ using namespace std;
 	string showInfoBox;
 	string useStreamdev;
 	string streamdevport;
+	string streamdevtype;
 	int authchanged = 0;
 </%args>
 <%session scope="global">
@@ -61,6 +62,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 			}
 			LiveSetup().SetUseStreamdev(!useStreamdev.empty());
 			LiveSetup().SetStreamdevPort(streamdevport.empty() ? 3000 : lexical_cast<int>(streamdevport));
+			LiveSetup().SetStreamdevType(streamdevtype.empty() ? "PES" : streamdevtype);
 			LiveSetup().SaveSetup();
 			message = tr("Setup saved.");
 		}
@@ -83,6 +85,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 	showInfoBox = LiveSetup().GetShowInfoBox() ? "1" : "";
 	useStreamdev = LiveSetup().GetUseStreamdev() ? "1" : "";
 	streamdevport = lexical_cast<std::string, int>(LiveSetup().GetStreamdevPort());
+	streamdevtype = LiveSetup().GetStreamdevType();
 
 </%cpp>
 <& pageelems.doc_type &>
@@ -182,9 +185,19 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 							<div id="streamdevsection" style="display: none">
 							<table border="0" cellpadding="0" cellspacing="0" class="dependent">
 							<tr>
-								<td class="label"><div class="withmargin"><$ tr("streamdev server port") $>:</div></td>
+								<td class="label"><div class="withmargin"><$ tr("Streamdev server port") $>:</div></td>
 								<td><input type="text" name="streamdevport" id="streamdevport" value="<$ streamdevport $>" /></td>
 							</tr>
+							<tr>
+								<td class="label"><div class="withmargin"><$ tr("Streamdev stream type") $>:</div></td>
+								<td class="rightcol"><select name="streamdevtype" size="1" id="streamdevtype">
+									<option value="TS" <%cpp> SELECTIF(streamdevtype == "TS") </%cpp>>TS</option>
+									<option value="PES" <%cpp> SELECTIF(streamdevtype == "PES") </%cpp>>PES</option>
+									<option value="PS" <%cpp> SELECTIF(streamdevtype == "PS") </%cpp>>PS</option>
+									<option value="ES" <%cpp> SELECTIF(streamdevtype == "ES") </%cpp>>ES</option>
+									<option value="Extern" <%cpp> SELECTIF(streamdevtype == "Extern") </%cpp>>Extern</option>
+								</select></td>
+							</tr>
 							</table>
 							</div>
 						</td>
diff --git a/pages/vlc.ecpp b/pages/vlc.ecpp
index b8cea6f..d150347 100644
--- a/pages/vlc.ecpp
+++ b/pages/vlc.ecpp
@@ -63,12 +63,12 @@ using namespace vdrlive;
 <%cpp>
 		if ( Channel != 0 ) {
 			int streamdevPort = LiveSetup().GetStreamdevPort();
-			// string videourl = string("http://") + "192.168.96.30" + ":" + lexical_cast<string,int>(streamdevPort) + "/TS/" + *Channel->GetChannelID().ToString();
-			string videourl = string("http://") + request.getServerIp() + ":" + lexical_cast<string,int>(streamdevPort) + "/TS/" + *Channel->GetChannelID().ToString();
+			// string videourl = string("http://") + "192.168.96.30" + ":" + lexical_cast<string,int>(streamdevPort) + + "/" + LiveSetup().GetStreamdevType() + "/" + *Channel->GetChannelID().ToString();
+			string videourl = string("http://") + request.getServerIp() + ":" + lexical_cast<string,int>(streamdevPort) + "/" + LiveSetup().GetStreamdevType() + "/" + *Channel->GetChannelID().ToString();
 </%cpp>
 			<embed type="application/x-vlc-plugin" name="video1" autoplay="yes" loop="yes" width="720" height="576" target="<$ videourl $>" />
 	   		<& vlc.channel_selection &>
-			<!-- <p><$ videourl $></p> -->
+			<!-- --> <p><$ videourl $></p><!-- -->
 <%cpp>
 		}
 </%cpp>
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 58ea59d..3993918 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-12-19 22:05+0100\n"
+"POT-Creation-Date: 2007-12-19 23:35+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Jordi Vilà <jvila@tinet.org>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -567,6 +567,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -657,7 +660,10 @@ msgstr ""
 msgid "Allow video streaming"
 msgstr ""
 
-msgid "streamdev server port"
+msgid "Streamdev server port"
+msgstr ""
+
+msgid "Streamdev stream type"
 msgstr ""
 
 msgid "additional fixed times in 'What's on?'"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 339b4b7..015620c 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-12-19 22:05+0100\n"
+"POT-Creation-Date: 2007-12-19 23:35+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Vladimír Bárta <vladimir.barta@k2atmitec.cz>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -565,6 +565,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -655,7 +658,10 @@ msgstr ""
 msgid "Allow video streaming"
 msgstr ""
 
-msgid "streamdev server port"
+msgid "Streamdev server port"
+msgstr ""
+
+msgid "Streamdev stream type"
 msgstr ""
 
 msgid "additional fixed times in 'What's on?'"
diff --git a/po/da_DK.po b/po/da_DK.po
index 15ba2b5..eeb06e9 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-12-19 22:05+0100\n"
+"POT-Creation-Date: 2007-12-19 23:35+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -565,6 +565,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -655,7 +658,10 @@ msgstr ""
 msgid "Allow video streaming"
 msgstr ""
 
-msgid "streamdev server port"
+msgid "Streamdev server port"
+msgstr ""
+
+msgid "Streamdev stream type"
 msgstr ""
 
 msgid "additional fixed times in 'What's on?'"
diff --git a/po/de_DE.po b/po/de_DE.po
index 065008b..6bbcd09 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-12-19 22:05+0100\n"
+"POT-Creation-Date: 2007-12-19 23:35+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -565,6 +565,9 @@ msgstr "Fehlerberichte und Vorschläge"
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr "Für Fehler oder Verbesserungsvorschläge steht unser Bugtracker bereit"
 
+msgid "RecDate"
+msgstr "Aufnahmedatum"
+
 msgid "List of recordings"
 msgstr "Liste der Aufnahmen"
 
@@ -655,9 +658,12 @@ msgstr "Zeige dynamische VDR Status Box"
 msgid "Allow video streaming"
 msgstr "Erlaube Videoanzeige im Browser"
 
-msgid "streamdev server port"
+msgid "Streamdev server port"
 msgstr "Streamdev Server Port"
 
+msgid "Streamdev stream type"
+msgstr "Streamdev Stream Typ"
+
 msgid "additional fixed times in 'What's on?'"
 msgstr "zusätzliche Zeitpunkte in 'Was läuft?'"
 
@@ -721,9 +727,6 @@ msgstr "Ausführliche Ansicht"
 msgid "List view"
 msgstr "Listenansicht"
 
-#~ msgid "RecDate"
-#~ msgstr "Aufnahmedatum"
-
 #, fuzzy
 #~ msgid "Watch channel"
 #~ msgstr "bis Kanal"
diff --git a/po/el_GR.po b/po/el_GR.po
index 06a23b8..7e52694 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-12-19 22:05+0100\n"
+"POT-Creation-Date: 2007-12-19 23:35+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -565,6 +565,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -655,7 +658,10 @@ msgstr ""
 msgid "Allow video streaming"
 msgstr ""
 
-msgid "streamdev server port"
+msgid "Streamdev server port"
+msgstr ""
+
+msgid "Streamdev stream type"
 msgstr ""
 
 msgid "additional fixed times in 'What's on?'"
diff --git a/po/es_ES.po b/po/es_ES.po
index cafac4e..649d63e 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-12-19 22:05+0100\n"
+"POT-Creation-Date: 2007-12-19 23:35+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -565,6 +565,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -655,7 +658,10 @@ msgstr ""
 msgid "Allow video streaming"
 msgstr ""
 
-msgid "streamdev server port"
+msgid "Streamdev server port"
+msgstr ""
+
+msgid "Streamdev stream type"
 msgstr ""
 
 msgid "additional fixed times in 'What's on?'"
diff --git a/po/et_EE.po b/po/et_EE.po
index f6cdf78..c896cf7 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-12-19 22:05+0100\n"
+"POT-Creation-Date: 2007-12-19 23:35+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -565,6 +565,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -655,7 +658,10 @@ msgstr ""
 msgid "Allow video streaming"
 msgstr ""
 
-msgid "streamdev server port"
+msgid "Streamdev server port"
+msgstr ""
+
+msgid "Streamdev stream type"
 msgstr ""
 
 msgid "additional fixed times in 'What's on?'"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 2611e16..1892908 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-12-19 22:05+0100\n"
+"POT-Creation-Date: 2007-12-19 23:35+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -565,6 +565,9 @@ msgstr "Virheraportoinnit ja parannusehdotukset"
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr "Voit raportoida sekä virheet että parannusehdotukset suoraan havaintotietokantaan"
 
+msgid "RecDate"
+msgstr "Tallenteen päiväys"
+
 msgid "List of recordings"
 msgstr "Tallennelistaus"
 
@@ -655,7 +658,12 @@ msgstr "Näytä dynaaminen VDR:n infolaatikko"
 msgid "Allow video streaming"
 msgstr "Salli lähetyksen suoratoisto"
 
-msgid "streamdev server port"
+#, fuzzy
+msgid "Streamdev server port"
+msgstr "Streamdev-palvelimen portti"
+
+#, fuzzy
+msgid "Streamdev stream type"
 msgstr "Streamdev-palvelimen portti"
 
 msgid "additional fixed times in 'What's on?'"
@@ -721,9 +729,6 @@ msgstr "Ruudukkonäkymä"
 msgid "List view"
 msgstr "Listanäkymä"
 
-#~ msgid "RecDate"
-#~ msgstr "Tallenteen päiväys"
-
 #, fuzzy
 #~ msgid "Watch channel"
 #~ msgstr "Kanavaan"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 47feef8..8d2bd9d 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-12-19 22:05+0100\n"
+"POT-Creation-Date: 2007-12-19 23:35+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -569,6 +569,9 @@ msgstr "Bogues et suggestions"
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr "Si vous rencontrez n'importe quels bogue ou voudriez suggérer de nouveaux dispositifs, employer notre bugtracker svp"
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr "Liste des enregistrements"
 
@@ -659,7 +662,10 @@ msgstr ""
 msgid "Allow video streaming"
 msgstr ""
 
-msgid "streamdev server port"
+msgid "Streamdev server port"
+msgstr ""
+
+msgid "Streamdev stream type"
 msgstr ""
 
 msgid "additional fixed times in 'What's on?'"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 9886f32..3c639c2 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-12-19 22:05+0100\n"
+"POT-Creation-Date: 2007-12-19 23:35+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -566,6 +566,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -656,7 +659,10 @@ msgstr ""
 msgid "Allow video streaming"
 msgstr ""
 
-msgid "streamdev server port"
+msgid "Streamdev server port"
+msgstr ""
+
+msgid "Streamdev stream type"
 msgstr ""
 
 msgid "additional fixed times in 'What's on?'"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index eb33806..085715f 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-12-19 22:05+0100\n"
+"POT-Creation-Date: 2007-12-19 23:35+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -566,6 +566,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -656,7 +659,10 @@ msgstr ""
 msgid "Allow video streaming"
 msgstr ""
 
-msgid "streamdev server port"
+msgid "Streamdev server port"
+msgstr ""
+
+msgid "Streamdev stream type"
 msgstr ""
 
 msgid "additional fixed times in 'What's on?'"
diff --git a/po/it_IT.po b/po/it_IT.po
index 03d4f87..3785b4c 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-12-19 22:05+0100\n"
+"POT-Creation-Date: 2007-12-19 23:35+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Sean Carlos <seanc@libero.it>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -568,6 +568,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -658,7 +661,10 @@ msgstr ""
 msgid "Allow video streaming"
 msgstr ""
 
-msgid "streamdev server port"
+msgid "Streamdev server port"
+msgstr ""
+
+msgid "Streamdev stream type"
 msgstr ""
 
 msgid "additional fixed times in 'What's on?'"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 4b52709..b587b8b 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-12-19 22:05+0100\n"
+"POT-Creation-Date: 2007-12-19 23:35+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -568,6 +568,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -658,7 +661,10 @@ msgstr ""
 msgid "Allow video streaming"
 msgstr ""
 
-msgid "streamdev server port"
+msgid "Streamdev server port"
+msgstr ""
+
+msgid "Streamdev stream type"
 msgstr ""
 
 msgid "additional fixed times in 'What's on?'"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index bf7918d..2d87d97 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-12-19 22:05+0100\n"
+"POT-Creation-Date: 2007-12-19 23:35+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -566,6 +566,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -656,7 +659,10 @@ msgstr ""
 msgid "Allow video streaming"
 msgstr ""
 
-msgid "streamdev server port"
+msgid "Streamdev server port"
+msgstr ""
+
+msgid "Streamdev stream type"
 msgstr ""
 
 msgid "additional fixed times in 'What's on?'"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index bca6dd3..fa1c6dd 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-12-19 22:05+0100\n"
+"POT-Creation-Date: 2007-12-19 23:35+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -565,6 +565,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -655,7 +658,10 @@ msgstr ""
 msgid "Allow video streaming"
 msgstr ""
 
-msgid "streamdev server port"
+msgid "Streamdev server port"
+msgstr ""
+
+msgid "Streamdev stream type"
 msgstr ""
 
 msgid "additional fixed times in 'What's on?'"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index cd5bee4..4415ebe 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-12-19 22:05+0100\n"
+"POT-Creation-Date: 2007-12-19 23:35+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -565,6 +565,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -655,7 +658,10 @@ msgstr ""
 msgid "Allow video streaming"
 msgstr ""
 
-msgid "streamdev server port"
+msgid "Streamdev server port"
+msgstr ""
+
+msgid "Streamdev stream type"
 msgstr ""
 
 msgid "additional fixed times in 'What's on?'"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 67e6946..096957a 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-12-19 22:05+0100\n"
+"POT-Creation-Date: 2007-12-19 23:35+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -566,6 +566,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -656,7 +659,10 @@ msgstr ""
 msgid "Allow video streaming"
 msgstr ""
 
-msgid "streamdev server port"
+msgid "Streamdev server port"
+msgstr ""
+
+msgid "Streamdev stream type"
 msgstr ""
 
 msgid "additional fixed times in 'What's on?'"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index e03fb35..8cf8b01 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-12-19 22:05+0100\n"
+"POT-Creation-Date: 2007-12-19 23:35+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -565,6 +565,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -655,7 +658,10 @@ msgstr ""
 msgid "Allow video streaming"
 msgstr ""
 
-msgid "streamdev server port"
+msgid "Streamdev server port"
+msgstr ""
+
+msgid "Streamdev stream type"
 msgstr ""
 
 msgid "additional fixed times in 'What's on?'"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 68d60e3..0af2639 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-12-19 22:05+0100\n"
+"POT-Creation-Date: 2007-12-19 23:35+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -566,6 +566,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -656,7 +659,10 @@ msgstr ""
 msgid "Allow video streaming"
 msgstr ""
 
-msgid "streamdev server port"
+msgid "Streamdev server port"
+msgstr ""
+
+msgid "Streamdev stream type"
 msgstr ""
 
 msgid "additional fixed times in 'What's on?'"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index a730ca2..2b58120 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-12-19 22:05+0100\n"
+"POT-Creation-Date: 2007-12-19 23:35+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -566,6 +566,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -656,7 +659,10 @@ msgstr ""
 msgid "Allow video streaming"
 msgstr ""
 
-msgid "streamdev server port"
+msgid "Streamdev server port"
+msgstr ""
+
+msgid "Streamdev stream type"
 msgstr ""
 
 msgid "additional fixed times in 'What's on?'"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index d82e21d..d56e9e2 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-12-19 22:05+0100\n"
+"POT-Creation-Date: 2007-12-19 23:35+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -565,6 +565,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -655,7 +658,10 @@ msgstr ""
 msgid "Allow video streaming"
 msgstr ""
 
-msgid "streamdev server port"
+msgid "Streamdev server port"
+msgstr ""
+
+msgid "Streamdev stream type"
 msgstr ""
 
 msgid "additional fixed times in 'What's on?'"
diff --git a/setup.cpp b/setup.cpp
index f160a72..bc024af 100644
--- a/setup.cpp
+++ b/setup.cpp
@@ -34,7 +34,8 @@ Setup::Setup():
 		m_useAjax(1),
 		m_showInfoBox(1),
 		m_useStreamdev(1),
-		m_streamdevPort(3000)
+		m_streamdevPort(3000),
+		m_streamdevType()
 {
 	m_adminPasswordMD5 = "4:" + MD5Hash("live");
 	liveplugin = cPluginManager::GetPlugin("live");
@@ -98,6 +99,7 @@ bool Setup::ParseSetupEntry( char const* name, char const* value )
 	else if ( strcmp( name, "ShowInfoBox" ) == 0 ) { m_showInfoBox = atoi(value); }
 	else if ( strcmp( name, "UseStreamdev" ) == 0 ) { m_useStreamdev = atoi(value); }
 	else if ( strcmp( name, "StreamdevPort" ) == 0 ) { m_streamdevPort = atoi(value); }
+	else if ( strcmp( name, "StreamdevType" ) == 0 ) { m_streamdevType = value; }
 	else if ( strcmp( name, "ScreenShotInterval" ) == 0 ) { m_screenshotInterval = atoi(value); }
 	else return false;
 	return true;
@@ -130,7 +132,7 @@ bool Setup::CheckServerIps()
 	return true;
 }
 
-std::string Setup::GetMD5HashAdminPassword() const
+std::string const Setup::GetMD5HashAdminPassword() const
 {
 	// format is <length>:<md5-hash of password>
 	vector< string > parts = StringSplit( m_adminPasswordMD5, ':' );
@@ -152,7 +154,7 @@ std::string Setup::SetAdminPassword(std::string password)
 	return m_adminPasswordMD5;
 }
 
-std::string Setup::GetStartScreenLink() const
+std::string const Setup::GetStartScreenLink() const
 {
 	if (m_startscreen == "whatsonnext")
 		return "whats_on.html?type=next";
@@ -227,6 +229,7 @@ bool Setup::SaveSetup()
 	liveplugin->SetupStore("ShowInfoBox", m_showInfoBox);
 	liveplugin->SetupStore("UseStreamdev", m_useStreamdev);
 	liveplugin->SetupStore("StreamdevPort", m_streamdevPort);
+	liveplugin->SetupStore("StreamdevType", m_streamdevType.c_str());
 	liveplugin->SetupStore("ScreenShotInterval", m_screenshotInterval);
 
 	return true;
diff --git a/setup.h b/setup.h
index 3b0767c..039df04 100644
--- a/setup.h
+++ b/setup.h
@@ -31,43 +31,45 @@ class Setup
 		// vdr-setup
 		int GetLastChannel() const { return m_lastChannel == 0 ? std::numeric_limits< int >::max() : m_lastChannel; }
 		int GetScreenshotInterval() const { return m_screenshotInterval; }
-		std::string GetAdminLogin() const { return m_adminLogin; }
-		std::string GetMD5HashAdminPassword() const;
+		std::string const GetAdminLogin() const { return m_adminLogin; }
+		std::string const GetMD5HashAdminPassword() const;
 		int GetAdminPasswordLength() const;
 		bool GetUseAuth() const { return m_useAuth; }
 		bool UseAuth() const;
-		std::string GetTimes() const { return m_times; }
-		std::string GetStartScreen() const { return m_startscreen; }
-		std::string GetStartScreenLink() const;
-		std::string GetTheme() const { return m_theme; }
-		std::string GetThemedLink(const std::string& type, const std::string& name) const { return "themes/" + GetTheme() + "/" + type + "/" + name; }
-		std::string GetLocalNetMask() const { return m_localnetmask; };
+		std::string const GetTimes() const { return m_times; }
+		std::string const GetStartScreen() const { return m_startscreen; }
+		std::string const GetStartScreenLink() const;
+		std::string const GetTheme() const { return m_theme; }
+		std::string const GetThemedLink(std::string const & type, const std::string& name) const { return "themes/" + GetTheme() + "/" + type + "/" + name; }
+		std::string const GetLocalNetMask() const { return m_localnetmask; };
 		bool GetIsLocalNet() const { return m_islocalnet; };
-		std::string GetLastWhatsOnListMode() const { return m_lastwhatsonlistmode; }
-		std::string GetTntnetLogLevel() const { return m_tntnetloglevel; }
+		std::string const GetLastWhatsOnListMode() const { return m_lastwhatsonlistmode; }
+		std::string const GetTntnetLogLevel() const { return m_tntnetloglevel; }
 		bool GetShowLogo() const { return m_showLogo != 0; }
 		bool GetUseAjax() const { return m_useAjax != 0; }
 		bool GetShowInfoBox() const { return m_showInfoBox != 0; }
 		bool GetUseStreamdev() const { return m_useStreamdev != 0; }
 		int GetStreamdevPort() const { return m_streamdevPort; }
-		std::string GetEpgImageDir() { return m_epgimagedir; }
+		std::string const GetStreamdevType() const { return m_streamdevType; }
+		std::string const GetEpgImageDir() { return m_epgimagedir; }
 
 		void SetLastChannel(int lastChannel) { m_lastChannel = lastChannel; }
-		void SetAdminLogin(std::string login) { m_adminLogin = login; }
+		void SetAdminLogin(std::string const & login) { m_adminLogin = login; }
 		std::string SetAdminPassword(std::string password);
 		void SetUseAuth(int auth) { m_useAuth = auth; }
 		void SetScreenshotInterval(int interval) { m_screenshotInterval = interval; }
-		void SetTimes(std::string times) { m_times = times; }
-		void SetStartScreen(std::string startscreen) { m_startscreen = startscreen; }
-		void SetTheme(std::string theme) { m_theme = theme; }
-		void SetLocalNetMask(std::string localnetmask) { m_localnetmask = localnetmask; }
+		void SetTimes(std::string const & times) { m_times = times; }
+		void SetStartScreen(std::string const & startscreen) { m_startscreen = startscreen; }
+		void SetTheme(std::string const & theme) { m_theme = theme; }
+		void SetLocalNetMask(std::string const & localnetmask) { m_localnetmask = localnetmask; }
 		void SetIsLocalNet(bool islocalnet) { m_islocalnet = islocalnet; }
-		void SetLastWhatsOnListMode(std::string mode) { m_lastwhatsonlistmode = mode; SaveSetup(); }
+		void SetLastWhatsOnListMode(std::string const & mode) { m_lastwhatsonlistmode = mode; SaveSetup(); }
 		void SetShowLogo(bool show) { m_showLogo = show ? 1 : 0; }
 		void SetUseAjax(bool use) { m_useAjax = use ? 1 : 0; }
 		void SetShowInfoBox(bool show) { m_showInfoBox = show ? 1 : 0; }
 		void SetUseStreamdev(bool use) { m_useStreamdev = use ? 1 : 0; }
 		void SetStreamdevPort(int port) { m_streamdevPort = port; }
+		void SetStreamdevType(std::string const & type) { m_streamdevType = type; }
 
 		bool SaveSetup();
 
@@ -76,7 +78,7 @@ class Setup
 
 		bool ParseSetupEntry( char const* name, char const* value );
 
-		bool CheckLocalNet(const std::string& ip);
+		bool CheckLocalNet(std::string const & ip);
 
 
 	private:
@@ -111,6 +113,7 @@ class Setup
 		int m_showInfoBox;
 		int m_useStreamdev;
 		int m_streamdevPort;
+		std::string m_streamdevType;
 
 		bool CheckServerPort();
 		bool CheckServerIps();