VDR Live - <$ searchtimer ? tr("Edit search timer") : tr("New search timer") $>

+ + <& pageelems.logo &> + <& menu active=("searchtimers") &> <%include>page_exit.eh diff --git a/pages/ibox.ecpp b/pages/ibox.ecpp new file mode 100644 index 0000000..badd690 --- /dev/null +++ b/pages/ibox.ecpp @@ -0,0 +1,177 @@ +<%pre> +#include +#include +#include +#include +#include +#include + +#include "exception.h" +#include "tools.h" +#include "epg_events.h" + +using namespace vdrlive; +using namespace std; + + +<%args> + int update; + +<%cpp> + EpgEvents epgEvents; + string EMPTY_STR; + tChannelID prev_chan; + tChannelID next_chan; + + reply.setContentType( "application/xml" ); + + if (cReplayControl::NowReplaying()) { + cThreadLock RecordingsLock(&Recordings); + cRecording *Recording = Recordings.GetByName(cReplayControl::NowReplaying()); + if (Recording) { + const cRecordingInfo* info = Recording->Info(); + if (info) { + EpgEventPtr epgEvent(new EpgEvent("recording", + Recording->Name(), + info->Title() ? info->Title() : Recording->Name(), + info->ShortText() ? info->ShortText() : "", + info->Description() ? info->Description() : "", + Recording->start, + Recording->start)); + epgEvents.push_back(epgEvent); + } + } + } + else { + string CHANNEL_STR("channel"); + ReadLock channelsLock( Channels ); + + if (cDevice::CurrentChannel()) { + cChannel* Channel = Channels.GetByNumber(cDevice::CurrentChannel()); + + cChannel* tmp = Channels.GetByNumber(Channels.GetPrevNormal(cDevice::CurrentChannel())); + if (tmp) + prev_chan = tmp->GetChannelID(); + tmp = Channels.GetByNumber(Channels.GetNextNormal(cDevice::CurrentChannel())); + if (tmp) + next_chan = tmp->GetChannelID(); + + string chanName(Channel->Name()); + cSchedulesLock schedulesLock; + const cSchedules* Schedules = cSchedules::Schedules(schedulesLock); + const cSchedule *Schedule = Schedules->GetSchedule(Channel); + + if (Schedule) { + const cEvent *Event = Schedule->GetPresentEvent(); + if (Event) { + EpgEventPtr epgEvent(new EpgEvent(CHANNEL_STR, + Event, + Channel->Name())); + epgEvents.push_back(epgEvent); + } + else { + string noInfo(tr("no epg info for current event!")); + EpgEventPtr epgEvent(new EpgEvent(CHANNEL_STR, + chanName, + noInfo, + EMPTY_STR, EMPTY_STR, + time(0), + time(0))); + epgEvents.push_back(epgEvent); + } + } + else { + string noInfo(tr("no epg info for current channel!")); + EpgEventPtr epgEvent(new EpgEvent(CHANNEL_STR, + Channel->Name(), + noInfo, + EMPTY_STR, EMPTY_STR, + time(0), + time(0))); + epgEvents.push_back(epgEvent); + } + } + else { + string chanName(tr("no current channel!")); + EpgEventPtr epgEvent(new EpgEvent(CHANNEL_STR, + chanName, + chanName, + EMPTY_STR, EMPTY_STR, + time(0), + time(0))); + epgEvents.push_back(epgEvent); + } + } + if (epgEvents.size() == 0) { + string ERROR_STR("error"); + string noInfo(tr("error retrieving status info!")); + string chanName(tr("no current channel!")); + EpgEventPtr epgEvent(new EpgEvent(ERROR_STR, + chanName, + noInfo, + EMPTY_STR, EMPTY_STR, + time(0), + time(0))); + epgEvents.push_back(epgEvent); + } + for (vector::iterator i = epgEvents.begin(); i != epgEvents.end(); ++i) { + EpgEventPtr epg = *i; + if (prev_chan.Valid() && next_chan.Valid()) + { + +<& xmlresponse update=(update) type=(epg->Id()) caption=(epg->Caption()) currentTime=(epg->CurrentTime(tr("%I:%M:%S %p"))) duration=(epg->StartTime(tr("%I:%M %p")) + string(" - ") + epg->EndTime(tr("%I:%M %p"))) title=(epg->Title()) elapsed=(epg->Elapsed()) prev_chan=(prev_chan) next_chan=(next_chan) &> +<%cpp> + } + else if (prev_chan.Valid()) { + +<& xmlresponse update=(update) type=(epg->Id()) caption=(epg->Caption()) currentTime=(epg->CurrentTime(tr("%I:%M:%S %p"))) duration=(epg->StartTime(tr("%I:%M %p")) + string(" - ") + epg->EndTime(tr("%I:%M %p"))) title=(epg->Title()) elapsed=(epg->Elapsed()) prev_chan=(prev_chan) &> +<%cpp> + } + else if (next_chan.Valid()) { + +<& xmlresponse update=(update) type=(epg->Id()) caption=(epg->Caption()) currentTime=(epg->CurrentTime(tr("%I:%M:%S %p"))) duration=(epg->StartTime(tr("%I:%M %p")) + string(" - ") + epg->EndTime(tr("%I:%M %p"))) title=(epg->Title()) elapsed=(epg->Elapsed()) next_chan=(next_chan) &> +<%cpp> + } + else { + +<& xmlresponse update=(update) type=(epg->Id()) caption=(epg->Caption()) currentTime=(epg->CurrentTime(tr("%I:%M:%S %p"))) duration=(epg->StartTime(tr("%I:%M %p")) + string(" - ") + epg->EndTime(tr("%I:%M %p"))) title=(epg->Title()) elapsed=(epg->Elapsed()) &> +<%cpp> + } + break; + } + + +<%def xmlresponse> +<%args> + int update; + string type; + string currentTime; + string caption; + string title; + string duration; + int elapsed; + string prev_chan; + string next_chan; + + + + + <$ update $> + + 1 + + + <$ update $> + + <$ type $> + <$ caption $> + <$ currentTime $> + <$ title $> + <$ duration $> + <$ elapsed $> + <$ next_chan $> + <$ prev_chan $> + + + + diff --git a/pages/infobox.ecpp b/pages/infobox.ecpp deleted file mode 100644 index afc44b4..0000000 --- a/pages/infobox.ecpp +++ /dev/null @@ -1,141 +0,0 @@ -<%pre> -#include -#include -#include -#include -#include -#include - -#include "exception.h" -#include "tools.h" -#include "epg_events.h" - -using namespace vdrlive; -using namespace std; - - -<%include>page_init.eh -<{ - EpgEvents epgEvents; - string EMPTY_STR; - tChannelID prev_chan; - tChannelID next_chan; - - if (cReplayControl::NowReplaying()) { - cThreadLock RecordingsLock(&Recordings); - cRecording *Recording = Recordings.GetByName(cReplayControl::NowReplaying()); - if (Recording) { - const cRecordingInfo* info = Recording->Info(); - if (info) { - EpgEventPtr epgEvent(new EpgEvent("recording", - Recording->Name(), - info->Title() ? info->Title() : Recording->Name(), - info->ShortText() ? info->ShortText() : "", - info->Description() ? info->Description() : "", - Recording->start, - Recording->start)); - epgEvents.push_back(epgEvent); - } - } - } - else { - string CHANNEL_STR("channel"); - ReadLock channelsLock( Channels ); - - if (cDevice::CurrentChannel()) { - cChannel* Channel = Channels.GetByNumber(cDevice::CurrentChannel()); - if (!Channel) - throw HtmlError("got invalid channel number!"); - - cChannel* tmp = Channels.GetByNumber(Channels.GetPrevNormal(cDevice::CurrentChannel())); - if (tmp) - prev_chan = tmp->GetChannelID(); - tmp = Channels.GetByNumber(Channels.GetNextNormal(cDevice::CurrentChannel())); - if (tmp) - next_chan = tmp->GetChannelID(); - - string chanName(Channel->Name()); - cSchedulesLock schedulesLock; - const cSchedules* Schedules = cSchedules::Schedules(schedulesLock); - const cSchedule *Schedule = Schedules->GetSchedule(Channel); - - if (Schedule) { - const cEvent *Event = Schedule->GetPresentEvent(); - if (Event) { - EpgEventPtr epgEvent(new EpgEvent(CHANNEL_STR, - Event, - Channel->Name())); - epgEvents.push_back(epgEvent); - } - else { - string noInfo(tr("no epg info for current event!")); - EpgEventPtr epgEvent(new EpgEvent(CHANNEL_STR, - chanName, - noInfo, - EMPTY_STR, EMPTY_STR, - time(0), - time(0))); - epgEvents.push_back(epgEvent); - } - } - else { - string noInfo(tr("no epg info for current channel!")); - EpgEventPtr epgEvent(new EpgEvent(CHANNEL_STR, - Channel->Name(), - noInfo, - EMPTY_STR, EMPTY_STR, - time(0), - time(0))); - epgEvents.push_back(epgEvent); - } - } - else { - string chanName(tr("no current channel!")); - EpgEventPtr epgEvent(new EpgEvent(CHANNEL_STR, - chanName, - chanName, - EMPTY_STR, EMPTY_STR, - time(0), - time(0))); - epgEvents.push_back(epgEvent); - } - } - if (epgEvents.size() == 0) { - string ERROR_STR("error"); - string noInfo(tr("error retrieving status info!")); - string chanName(tr("no current channel!")); - EpgEventPtr epgEvent(new EpgEvent(ERROR_STR, - chanName, - noInfo, - EMPTY_STR, EMPTY_STR, - time(0), - time(0))); - epgEvents.push_back(epgEvent); - } - for (vector::iterator i = epgEvents.begin(); i != epgEvents.end(); ++i) { - EpgEventPtr epg = *i; - if (prev_chan.Valid() && next_chan.Valid()) - { -}> - <& pageelems.status_box type=(epg->Id()) caption=(epg->Caption()) currentTime=(epg->CurrentTime(tr("%I:%M:%S %p"))) duration=(epg->StartTime(tr("%I:%M %p")) + string(" - ") + epg->EndTime(tr("%I:%M %p"))) title=(epg->Title()) elapsed=(epg->Elapsed()) prev_chan=(prev_chan) next_chan=(next_chan) &> -<{ - } - else if (prev_chan.Valid()) { -}> - <& pageelems.status_box type=(epg->Id()) caption=(epg->Caption()) currentTime=(epg->CurrentTime(tr("%I:%M:%S %p"))) duration=(epg->StartTime(tr("%I:%M %p")) + string(" - ") + epg->EndTime(tr("%I:%M %p"))) title=(epg->Title()) elapsed=(epg->Elapsed()) prev_chan=(prev_chan) &> -<{ - } - else if (next_chan.Valid()) { -}> - <& pageelems.status_box type=(epg->Id()) caption=(epg->Caption()) currentTime=(epg->CurrentTime(tr("%I:%M:%S %p"))) duration=(epg->StartTime(tr("%I:%M %p")) + string(" - ") + epg->EndTime(tr("%I:%M %p"))) title=(epg->Title()) elapsed=(epg->Elapsed()) next_chan=(next_chan) &> -<{ - } - else { -}> - <& pageelems.status_box type=(epg->Id()) caption=(epg->Caption()) currentTime=(epg->CurrentTime(tr("%I:%M:%S %p"))) duration=(epg->StartTime(tr("%I:%M %p")) + string(" - ") + epg->EndTime(tr("%I:%M %p"))) title=(epg->Title()) elapsed=(epg->Elapsed()) &> -<{ - } - break; - } -}> -<%include>page_exit.eh diff --git a/pages/menu.ecpp b/pages/menu.ecpp index cc81879..fb6b2f9 100644 --- a/pages/menu.ecpp +++ b/pages/menu.ecpp @@ -30,6 +30,9 @@ std::string set_component; % } ><$ tr("Recordings") $> | ><$ tr("Remote Control") $> + % if (LiveSetup().UseAuth()) { | % } diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp index 6ed608a..6f70d94 100644 --- a/pages/pageelems.ecpp +++ b/pages/pageelems.ecpp @@ -3,6 +3,7 @@ #include #include #include "tools.h" +#include "i18n.h" using namespace std; using namespace vdrlive; @@ -20,19 +21,64 @@ using namespace vdrlive; <%def logo>

+ <& infobox &>

<# ---------------------------------------------------------------------- #> +<%def infobox> +

<$ tr("retrieving status ...") $>

--:--

+ >

+ + + <& ajax_action_href action=("switch_channel") id=("infobox_prevchan") image=("one_downarrow.png") tip=(tr("previous channel")) &> + <& ajax_action_href action=("switch_channel") id=("infobox_nextchan") image=("one_uparrow.png") tip=(tr("next channel")) &> + +

+ <& progressbar id=("infobox_elapsed") &> +

+ + +<# ---------------------------------------------------------------------- #> + +<%def infobox_start_update> +<%cpp> { LiveStatusRequest('ibox.xml', 'infobox')<%cpp> } + + +<# ---------------------------------------------------------------------- #> + +<%def hide_element> +<%args> + bool hide = true; + +<%cpp> if (hide) { style="visibility: hidden"<%cpp> } + + +<# ---------------------------------------------------------------------- #> + <%def progressbar> <%args> - string progress; + string progress = "0"; + string id; -

px">

<# ---------------------------------------------------------------------- #> @@ -61,8 +107,9 @@ using namespace vdrlive; string param; string image; string alt; + string id; - if (!tip.empty()) { <& tooltip.hint text=(tip) &> <%cpp> } > <$ alt $>

+<%cpp> { .xml', 'param', '<$ param $>');" <%cpp>if (!tip.empty()) { <& tooltip.hint text=(tip) &> <%cpp> } > <$ alt $>

<%cpp> } <# ---------------------------------------------------------------------- #> diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp index d9c620d..87c534e 100644 --- a/pages/recordings.ecpp +++ b/pages/recordings.ecpp @@ -38,7 +38,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); <& pageelems.ajax_js &> - + <& pageelems.logo &> <& menu active=("recordings") &>