Merge pull request MarkusEh#8 from tmn505/pls

Various improvements
a-mair · May 22, 2021 · 8db400b · 8db400b
2 parents 375d8f3 + 665f6fa
commit 8db400b
Show file tree

Hide file tree

Showing 20 changed files with 73 additions and 40 deletions.
diff --git a/live/img/playlist.png b/live/img/playlist.png
diff --git a/pages/multischedule.ecpp b/pages/multischedule.ecpp
@@ -416,6 +416,7 @@ std::vector<time_t>			times_start;
 </%cpp>
 	       <td> <div class="boxheader"> <div> <div><$ channel_names[channel] $> <# reply.sout() automatically escapes special characters to html entities #>
             <& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(channel_IDs[channel]) image="zap.png" alt="" &>
+            <& pageelems.hls_channel channelId=(channel_IDs[channel]) &>
             <& pageelems.m3u_playlist_channel channelId=(channel_IDs[channel]) &>
             </div></div> </div></td>
 	       <td class="time spacer"> &nbsp; </td>

diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
@@ -36,7 +36,7 @@ int update_status(1);
 
 <%def logo>
 <!-- start of fixed page header -->
-<div id="header" style="width: 100%; z-index: 1; background-color: white">
+<div id="header" style="width: 100%; z-index: 1; background-color: inherit">
 <div id="padding" style="display: none"></div>
 <div id="content">
 <!-- header content follows -->
@@ -111,7 +111,7 @@ int update_status(1);
 
 <# ---------------------------------------------------------------------- #>
 
-<%def m3u_playlist_channel>
+<%def hls_channel>
 <%args>
 	string channelId;
 </%args>
@@ -126,6 +126,27 @@ if (LiveSetup().GetUseStreamdev() && LiveFeatures<features::streamdev_server>().
 
 <# ---------------------------------------------------------------------- #>
 
+<%def m3u_playlist_channel>
+<%args>
+	string channelId;
+</%args>
+<%cpp>
+if (LiveSetup().GetUseStreamdev() && LiveFeatures<features::streamdev_server>().Loaded()) {
+#if TNTVERSION >= 30000
+</%cpp>
+<a href="playlist.m3u?channel_str=<$ channelId $>"><img src="<$ LiveSetup().GetThemedLink("img", "playlist.png") $>" alt="" <& tooltip.hint text=(tr("Stream this channel into media player.")) &>></img></a>
+<%cpp>
+#else
+</%cpp>
+<a href="playlist.m3u?channel=<$ channelId $>"><img src="<$ LiveSetup().GetThemedLink("img", "playlist.png") $>" alt="" <& tooltip.hint text=(tr("Stream this channel into media player.")) &>></img></a>
+<%cpp>
+#endif
+}
+</%cpp>
+</%def>
+
+<# ---------------------------------------------------------------------- #>
+
 <%def m3u_playlist_recording>
 <%args>
 	string recid;
@@ -134,7 +155,7 @@ if (LiveSetup().GetUseStreamdev() && LiveFeatures<features::streamdev_server>().
 <%cpp>
 #if TNT_WATCHDOG_SILENCE
 {
-</%cpp><a href="playlist.m3u?recid=<$ recid $>"><img src="<$ LiveSetup().GetThemedLink("img", "stream_button.png") $>" alt="" <& tooltip.hint text=(tr("Stream this recording into media player.")) &>></img> <$ linkText $></a>
+</%cpp><a href="playlist.m3u?recid=<$ recid $>"><img src="<$ LiveSetup().GetThemedLink("img", "playlist.png") $>" alt="" <& tooltip.hint text=(tr("Stream this recording into media player.")) &>></img> <$ linkText $></a>
 <%cpp>
 }
 #endif
@@ -294,6 +315,7 @@ if (LiveSetup().GetUseStreamdev() && LiveFeatures<features::streamdev_server>().
 		}
 		if ((duration == 0) || (elapsed >= 0)) {
 </%cpp>
+	<& pageelems.hls_channel channelId=(channelId) &>
 	<& pageelems.m3u_playlist_channel channelId=(channelId) &>
 <%cpp>
 		}
@@ -308,7 +330,8 @@ if (LiveSetup().GetUseStreamdev() && LiveFeatures<features::streamdev_server>().
 		<td class="action leftcol <? lastCurrentChanel ? "bottomrow"?>"><& pageelems.event_timer epgid=(epgid) &></td>
 		<td class="action <? lastCurrentChanel ? "bottomrow"?>"><& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(channelId) image="zap.png" alt="" &></td>
 		<td class="action <? lastCurrentChanel ? "bottomrow"?>"><%cpp>if (LiveFeatures<features::epgsearch>().Recent() && eventId != 0) { </%cpp><a href="searchresults.html?searchplain=<$ StringUrlEncode(title) $>"><img src="<$ LiveSetup().GetThemedLink("img", "search.png") $>" alt="" <& tooltip.hint text=(tr("Search for repeats.")) &>></img></a><%cpp> } else { </%cpp><img src="img/transparent.png" width="16" height="16"><%cpp> } </%cpp></td>
-        <td class="action <? lastCurrentChanel ? "bottomrow"?>"><%cpp>if ((duration == 0)  || (elapsed > 0)) { </%cpp><& pageelems.m3u_playlist_channel channelId=(channelId) &><%cpp> } else { </%cpp><img src="img/transparent.png" width="16" height="16"><%cpp> } </%cpp></td>
+		<td class="action <? lastCurrentChanel ? "bottomrow"?>"><%cpp>if ((duration == 0) || (elapsed > 0)) { </%cpp><& pageelems.hls_channel channelId=(channelId) &><%cpp> } </%cpp></td>
+		<td class="action <? lastCurrentChanel ? "bottomrow"?>"><%cpp>if ((duration == 0) || (elapsed > 0)) { </%cpp><& pageelems.m3u_playlist_channel channelId=(channelId) &><%cpp> } </%cpp></td>
 		<td class="action <? lastCurrentChanel ? "bottomrow"?>">
 <%cpp>
 			if (eventId != 0) {

diff --git a/pages/playlist.ecpp b/pages/playlist.ecpp
@@ -10,6 +10,7 @@ using namespace vdrlive;
 </%pre>
 <%args>
 	tChannelID channel;
+	string channel_str;
 	string recid;
 </%args>
 <%session scope="global">
@@ -20,6 +21,10 @@ using namespace vdrlive;
 </%request>
 <%include>page_init.eh</%include>
 <%cpp>
+#if TNTVERSION >= 30000
+	channel = channel.FromString(channel_str.c_str());  // Tntnet30: get struct channel from parameter string
+#endif
+
 	if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 	if (!cUser::CurrentUserHasRightTo(UR_STARTREPLAY))
 		throw HtmlError( tr("Sorry, no permission. Please contact your administrator!") );
@@ -45,7 +50,7 @@ using namespace vdrlive;
 	string server = request.getHost();
 	server = server.substr(0, server.rfind(':'));
 	string videourl;
-	reply.setContentType("application/vnd.apple.mpegurl");
+	reply.setContentType("audio/x-mpegurl");
 	if (Channel != 0) {
 		string channelname = Channel->Name();
 		int streamdevPort = LiveSetup().GetStreamdevPort();

diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp
@@ -275,6 +275,7 @@ if(recItemFound) {
      <label for="channel"><$ tr("Channel") $>:&nbsp;<span class="bold"><$ std::to_string(Channel->Number()) $></span></label>
      <& channels_widget name=("channel") selected=(Channel ? *Channel->GetChannelID().ToString() : "") onchange=("document.forms.channels.submit()") &>
      <& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(Channel->GetChannelID()) image="zap.png" alt="" &>
+     <& pageelems.hls_channel channelId=(Channel->GetChannelID()) &>
      <& pageelems.m3u_playlist_channel channelId=(Channel->GetChannelID()) &>
    </span>
 </form>

diff --git a/pages/setup.ecpp b/pages/setup.ecpp
@@ -252,7 +252,7 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP))
 						</td>
 					</tr>
                                         <tr>
-                                                <td class="label leftcol"><div class="withmargin"><$ tr("mark new recordings") $>:</div></td>
+                                                <td class="label leftcol"><div class="withmargin"><$ tr("Mark new recordings") $>:</div></td>
                                                 <td class="rightcol">
                                                         <input type="checkbox" name="markNewRec" id="markNewRec" value="1" <%cpp> CHECKIF(!markNewRec.empty()); </%cpp>/>
                                                 </td>

diff --git a/pages/stream.ecpp b/pages/stream.ecpp
@@ -120,7 +120,6 @@ using namespace vdrlive;
 				});
 				</script>
 			</div>
-            </center>			
 <%cpp>
 dsyslog("vdrlive::stream: generating EPG info");
 const cSchedule *Schedule = NULL;
@@ -190,6 +189,7 @@ string longDescription = StringEscapeAndBreak(StringWordTruncate(epgEvent->LongD
 					</td>
 				</tr>
 			</table>
+			</center>
 %} // if (Event)
 		</div>
 	</body>

diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp
@@ -111,7 +111,7 @@ if (type == "now") {
 %			if (mode == "list") {
 			<table class="listing" cellspacing="0" cellpadding="0">
 				<tr class="head">
-					<td colspan="8"><div class="boxheader"><div><div><$ head $></div></div></div></td>
+					<td colspan="9"><div class="boxheader"><div><div><$ head $></div></div></div></td>
 				</tr>
 %	    }
 <%cpp>

diff --git a/po/cs_CZ.po b/po/cs_CZ.po
@@ -854,7 +854,7 @@ msgstr ""
 msgid "Streamdev stream type"
 msgstr "Streamdev typ streamu"
 
-msgid "mark new recordings"
+msgid "Mark new recordings"
 msgstr ""
 
 msgid "Add links to IMDb"

diff --git a/po/de_DE.po b/po/de_DE.po
@@ -851,8 +851,8 @@ msgstr "Streamdev Server Port"
 msgid "Streamdev stream type"
 msgstr "Streamdev Stream Typ"
 
-msgid "mark new recordings"
-msgstr "markiere neue Aufnahmen"
+msgid "Mark new recordings"
+msgstr "Markiere neue Aufnahmen"
 
 msgid "Add links to IMDb"
 msgstr "Füge Links zur IMDb hinzu"

diff --git a/po/es_ES.po b/po/es_ES.po
@@ -846,7 +846,7 @@ msgstr "Puerto del servidor streamdev"
 msgid "Streamdev stream type"
 msgstr "Tipo de stream de streamdev"
 
-msgid "mark new recordings"
+msgid "Mark new recordings"
 msgstr ""
 
 msgid "Add links to IMDb"

diff --git a/po/fi_FI.po b/po/fi_FI.po
@@ -846,7 +846,7 @@ msgstr "Streamdev-palvelimen portti"
 msgid "Streamdev stream type"
 msgstr "Streamdev-lähetteen tyyppi"
 
-msgid "mark new recordings"
+msgid "Mark new recordings"
 msgstr ""
 
 msgid "Add links to IMDb"

diff --git a/po/fr_FR.po b/po/fr_FR.po
@@ -869,7 +869,7 @@ msgstr "Port du serveur streamdev"
 msgid "Streamdev stream type"
 msgstr "Type du serveur streamdev"
 
-msgid "mark new recordings"
+msgid "Mark new recordings"
 msgstr ""
 
 msgid "Add links to IMDb"

diff --git a/po/it_IT.po b/po/it_IT.po
@@ -852,7 +852,7 @@ msgstr "Porta server Streamdev"
 msgid "Streamdev stream type"
 msgstr "Tipo trasmissione Streamdev"
 
-msgid "mark new recordings"
+msgid "Mark new recordings"
 msgstr ""
 
 msgid "Add links to IMDb"

diff --git a/po/lt_LT.po b/po/lt_LT.po
@@ -847,7 +847,7 @@ msgstr "Streamdev serverio prievadas"
 msgid "Streamdev stream type"
 msgstr "Streamdev serverio tipas"
 
-msgid "mark new recordings"
+msgid "Mark new recordings"
 msgstr ""
 
 msgid "Add links to IMDb"

diff --git a/po/nl_NL.po b/po/nl_NL.po
@@ -866,7 +866,7 @@ msgstr ""
 msgid "Streamdev stream type"
 msgstr ""
 
-msgid "mark new recordings"
+msgid "Mark new recordings"
 msgstr ""
 
 msgid "Add links to IMDb"

diff --git a/po/pl_PL.po b/po/pl_PL.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2007 LIVE Development team. See http://live.vdr-developer.org
 # This file is distributed under the same license as the VDR-LIVE package.
 # Robert Polak <[email protected]>, 2011
-# Tomasz Maciej Nowak <[email protected]>, 2019
+# Tomasz Maciej Nowak <[email protected]>, 2019 2021
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <[email protected]>\n"
-"PO-Revision-Date: 2019-03-25 16:12+0100\n"
+"PO-Revision-Date: 2021-05-12 19:42+0200\n"
 "Last-Translator: Tomasz Maciej Nowak <[email protected]>\n"
 "Language-Team: see developers in README\n"
 "Language: pl_PL\n"
@@ -180,7 +180,7 @@ msgid "Wrong username or password"
 msgstr "Błędna nazwa lub hasło użytkownika"
 
 msgid "Login"
-msgstr "Nazwa"
+msgstr "Logowanie"
 
 msgid "VDR Live Login"
 msgstr "Login VDR Live"
@@ -247,7 +247,7 @@ msgid "What's on"
 msgstr "Audycje"
 
 msgid "Details view"
-msgstr "Widek szczegółowy"
+msgstr "Widok szczegółowy"
 
 msgid "List view"
 msgstr "Widok listy"
@@ -256,7 +256,7 @@ msgid "Find more at the Internet Movie Database."
 msgstr "Szukaj w IMDb.com"
 
 msgid "Stream this channel into browser."
-msgstr ""
+msgstr "Oglądaj kanał w przeglądarce"
 
 msgid "Stream this recording into media player."
 msgstr "Oglądaj nagranie w odtwarzaczu multimediów"
@@ -386,16 +386,19 @@ msgid "Project Idea"
 msgstr "Pomysł projektu"
 
 msgid "Webserver"
-msgstr ""
+msgstr "Serwer HTTP"
 
 msgid "Current Maintainer"
 msgstr "Obecny opiekun"
 
+msgid "Previous Maintainer"
+msgstr "Poprzedni opiekun"
+
 msgid "Project leader"
 msgstr "Lider projektu"
 
 msgid "Content"
-msgstr "Zawrtość"
+msgstr "Zawartość"
 
 msgid "Graphics"
 msgstr "Grafika"
@@ -440,7 +443,7 @@ msgid "Recordings"
 msgstr "Nagrania"
 
 msgid "Web-Streaming"
-msgstr ""
+msgstr "Oglądanie"
 
 msgid "Logout"
 msgstr "Wyloguj"
@@ -530,7 +533,7 @@ msgid "Title"
 msgstr "Tytuł"
 
 msgid "Server"
-msgstr ""
+msgstr "Serwer"
 
 msgid "Directory"
 msgstr "Katalog"
@@ -794,7 +797,7 @@ msgid "Timer is active."
 msgstr "Timer jest aktywny."
 
 msgid "Toggle timer active/inactive"
-msgstr "Aktywuj/deaktywuj timer."
+msgstr "Aktywuj/deaktywuj timer"
 
 msgid "Delete timer"
 msgstr "Usuń timer"
@@ -830,25 +833,25 @@ msgid "Allow video streaming"
 msgstr "Zezwól na streamowanie strumienia video"
 
 msgid "Web-Streaming h264"
-msgstr ""
+msgstr "Parametry HLS dla AVC (H.264)"
 
 msgid "Web-Streaming HEVC"
-msgstr ""
+msgstr "Parametry HLS dla HEVC (H.265)"
 
 msgid "Web-Streaming MPEG2"
-msgstr ""
+msgstr "Parametry HLS dla MPEG2 (H.262)"
 
 msgid "Web-Streaming others"
-msgstr ""
+msgstr "Parametry HLS dla innych"
 
 msgid "Streamdev server port"
 msgstr "Port serwera Streamdev"
 
 msgid "Streamdev stream type"
 msgstr "Typ strumienia Streamdev"
 
-msgid "mark new recordings"
-msgstr ""
+msgid "Mark new recordings"
+msgstr "Oznacz nowe nagrania"
 
 msgid "Add links to IMDb"
 msgstr "Pokazuj odnośniki do IMDb"
@@ -890,7 +893,7 @@ msgid "no current channel!"
 msgstr "brak informacji o kanale!"
 
 msgid "error retrieving status info!"
-msgstr "błąd podczas odczytu stanu"
+msgstr "błąd podczas odczytu stanu!"
 
 msgid "%I:%M:%S %p"
 msgstr "%H:%M:%S"
@@ -944,7 +947,7 @@ msgid "No timer conflicts"
 msgstr "Brak kolizji timerów"
 
 msgid "local"
-msgstr ""
+msgstr "lokalny"
 
 msgid "Timer has a conflict."
 msgstr "Timer jest w kolizji."
@@ -955,5 +958,5 @@ msgstr ""
 msgid "No EPG information available"
 msgstr "Brak informacji EPG"
 
-#~ msgid "Stream this channel into media player."
-#~ msgstr "Oglądaj kanał w odtwarzaczu multimediów"
+msgid "Stream this channel into media player."
+msgstr "Oglądaj kanał w odtwarzaczu multimediów"
diff --git a/po/ru_RU.po b/po/ru_RU.po
@@ -846,7 +846,7 @@ msgstr "Streamdev порт"
 msgid "Streamdev stream type"
 msgstr "Streamdev тип стриминга"
 
-msgid "mark new recordings"
+msgid "Mark new recordings"
 msgstr ""
 
 msgid "Add links to IMDb"

diff --git a/po/sk_SK.po b/po/sk_SK.po
@@ -847,7 +847,7 @@ msgstr "Streamdev port servera"
 msgid "Streamdev stream type"
 msgstr "Typ prúdového videa"
 
-msgid "mark new recordings"
+msgid "Mark new recordings"
 msgstr ""
 
 msgid "Add links to IMDb"