From b9f31f086607b0732cdcace6319c6787b0932d75 Mon Sep 17 00:00:00 2001
From: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
Date: Wed, 19 Dec 2007 22:53:58 +0000
Subject: - Added option to select streamdev stream type in live setings.

---
 pages/setup.ecpp | 15 ++++++++++++++-
 pages/vlc.ecpp   |  6 +++---
 2 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'pages')

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>
-- 
cgit v1.2.3