diff options
| author | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2008-02-26 01:16:19 +0100 |
|---|---|---|
| committer | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2008-02-26 01:16:19 +0100 |
| commit | 59ed31a30e621e5ce469e6d622a740cf1a98294f (patch) | |
| tree | 74b77ace44abd83a87ec88ab35658bedadf19efe /pages | |
| parent | a61f3ee4e41a1c8b575e657a99f8e7ac4276ed17 (diff) | |
| download | vdr-plugin-live-59ed31a30e621e5ce469e6d622a740cf1a98294f.tar.gz vdr-plugin-live-59ed31a30e621e5ce469e6d622a740cf1a98294f.tar.bz2 | |
Added streaming button in channnel selection page.
This allows to stream also channels that don't have EPG data and thus
are only selectable by hand.
Regenerated backwards compatible message file, because of string
changes.
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/pageelems.ecpp | 15 | ||||
| -rw-r--r-- | pages/schedule.ecpp | 2 |
2 files changed, 14 insertions, 3 deletions
diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp index 34cfbf8..ddae948 100644 --- a/pages/pageelems.ecpp +++ b/pages/pageelems.ecpp @@ -102,6 +102,17 @@ int update_status(1); <# ---------------------------------------------------------------------- #> +<%def vlc_stream_channel> +<%args> + tChannelID channelId; + string linkText; +</%args> +<%cpp> if (LiveSetup().GetUseStreamdev() && LiveFeatures<features::streamdev_server>().Loaded()) { </%cpp><a href="vlc.html?channel=<$ channelId $>"><img src="<$ LiveSetup().GetThemedLink("img", "play.png") $>" alt="" <& tooltip.hint text=(tr("Stream this channel into browser.")) &>></img> <$ linkText $></a><%cpp> } </%cpp> +</%def> + + +<# ---------------------------------------------------------------------- #> + <%def event_timer> <%args> string epgid; @@ -241,9 +252,9 @@ int update_status(1); <a href="searchresults.html?searchplain=<$ StringEscapeAndBreak(title) $>"><img src="<$ LiveSetup().GetThemedLink("img", "search.png") $>" alt="" <& tooltip.hint text=(tr("Search for repeats.")) &>></img></a> <%cpp> } - if (LiveSetup().GetUseStreamdev() && elapsed > 0 && LiveFeatures<features::streamdev_server>().Loaded()) { + if (elapsed > 0) { </%cpp> - <a href="vlc.html?channel=<$ channelId $>"><img src="<$ LiveSetup().GetThemedLink("img", "play.png") $>" alt="" <& tooltip.hint text=(tr("Stream this channel into browser.")) &>></img></a> + <& pageelems.vlc_stream_channel channelId=(channelId) &> <%cpp> } </%cpp> diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp index 3877d59..f2a0907 100644 --- a/pages/schedule.ecpp +++ b/pages/schedule.ecpp @@ -145,5 +145,5 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); <%include>page_exit.eh</%include> <%def channel_selection> -<form action="schedule.html" method="get" id="channels"><span><label for="channel"><$ tr("Show schedule of channel") $>: </label><& channels_widget name=("channel") selected=(Channel ? *Channel->GetChannelID().ToString() : "") onchange=("document.forms.channels.submit()") &></span></form> +<form action="schedule.html" method="get" id="channels"><span><label for="channel"><$ tr("Show schedule of channel") $>: </label><& channels_widget name=("channel") selected=(Channel ? *Channel->GetChannelID().ToString() : "") onchange=("document.forms.channels.submit()") &> <& pageelems.vlc_stream_channel channelId=(Channel->GetChannelID()) linkText=(tr("Stream into browser")) &></span></form> </%def> |