diff options
| author | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2007-01-17 01:15:59 +0000 |
|---|---|---|
| committer | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2007-01-17 01:15:59 +0000 |
| commit | b6ebbd4df6a6a588692bd0e5e1bbd1d920aad3e1 (patch) | |
| tree | 2c29c286acbd2fab9d520b9858c1da012b191e82 /pages | |
| parent | 14601674821ef51d93bff42759ac44d334946045 (diff) | |
| download | vdr-plugin-live-b6ebbd4df6a6a588692bd0e5e1bbd1d920aad3e1.tar.gz vdr-plugin-live-b6ebbd4df6a6a588692bd0e5e1bbd1d920aad3e1.tar.bz2 | |
- Moved cRecordings locking infrastructure to RecordingsManager.
- Take care to have at any time maximum one instance of RecordingsManager
alive. This is done with a combination of boost::shared_ptr and
boost::weak_ptr. See LiveRecordingsManager() function.
- RecordingsTree now uses RecordingsManager to calculate a MD5 Hash for
each 'real' cRecording item.
- The MD5 Hash is used in the Ajax-Request to start play back of a
recording. (Server side needs implementation of this.)
- Id's are also used in the DOM for the identification of the tooltips.
- New code dependency on openssl libraries (for md5 function).
- Changed style (not yet complete) to have 'action' items also in the
recording description popup.
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/pageelems.ecpp | 4 | ||||
| -rw-r--r-- | pages/recordings.ecpp | 29 |
2 files changed, 18 insertions, 15 deletions
diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp index 326a8b8..79d5d51 100644 --- a/pages/pageelems.ecpp +++ b/pages/pageelems.ecpp @@ -44,7 +44,7 @@ component; tChannelID channelid; tEventID eventid; </%args> - <a href="edit_timer.html?channelid=<$ *channelid.ToString() $>&eventid=<$ eventid $>"><img src="record.png" alt="" <& tooltip.hint text=(tr("Record this")) &> border="0"/></a> + <a href="edit_timer.html?channelid=<$ *channelid.ToString() $>&eventid=<$ eventid $>"><img src="record.png" alt="" <& tooltip.hint text=(tr("Record this")) &> /></a> </%def> <%def ajax_js> @@ -57,5 +57,5 @@ component; string image; string alt = ""; </%args> - <a href="javascript:LiveSimpleAjaxRequest('play_recording.xml', 'recording', '<$ recordingid $>');"><img src="<$ image $>" alt="<$ alt $>" border="0"/></a> + <a href="javascript:LiveSimpleAjaxRequest('play_recording.xml', 'recording', '<$ recordingid $>');"><img src="<$ image $>" alt="<$ alt $>" /></a> </%def> diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp index 2defee4..6139d1f 100644 --- a/pages/recordings.ecpp +++ b/pages/recordings.ecpp @@ -11,9 +11,7 @@ using namespace vdrlive; <%args> </%args> <%request scope="page"> -RecordingsTree recordingsTree; -const std::string lPref("long_"); -const std::string sPref("short_"); +RecordingsTree recordingsTree(LiveRecordingsManager()); </%request> <%include>page_init.eh</%include> <%cpp> @@ -115,9 +113,9 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) { <div class="recording_day" style="width: <$ dayLen $>"><$ day $></div> <div class="recording_date"><$ FormatDateTime(tr("%b %d %y"), recItem->StartTime()) $></div> <div class="recording_time"><$ FormatDateTime(tr("%I:%M %p"), recItem->StartTime()) $></div> - <div class="recording_name" <& tooltip.hint text=(shortDescr) &><& tooltip.display domId=(lPref + recItem->Id()) &>><$ recItem->Name() $></div> + <div class="recording_name" <& tooltip.hint text=(shortDescr) &><& tooltip.display domId=(recItem->Id()) &>><$ recItem->Name() $></div> <div class="recording_actions"> - <& pageelems.play_recording recordingid=(recItem->Recording()->FileName()) image="play.png" alt="" &> + <& pageelems.play_recording recordingid=(recItem->Id()) image="play.png" alt="" &> <img src="edit.png" alt="" /> <img src="del.png" alt="" /> </div> @@ -160,16 +158,21 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) { std::string shortDescr; if (info->ShortText()) shortDescr = info->ShortText(); std::string longDescr; if (info->Description()) longDescr = info->Description(); }> - <div class="re_longdescr" id="<$ (lPref + recItem->Id()) $>"> - <div class="re_station"> - <div class="boxheader"><div><div><$ recItem->Name() $><& tooltip.close domId=(lPref + recItem->Id()) &></div></div></div> + <div class="re_description" id="<$ (recItem->Id()) $>"> + <div class="station"> + <div class="boxheader"><div><div><$ recItem->Name() $><& tooltip.close domId=(recItem->Id()) &></div></div></div> </div> <div class="re_content"> - <div class="info"><$ (start) $></div> - <div class="title"><$ (title) $></div> - <div class="short"><$ (shortDescr) $></div> - <div class="description"> - <$ (longDescr) $> + <div class="re_tools"> + <& pageelems.play_recording recordingid=(recItem->Id()) image="play.png" alt="" &> + </div> + <div> + <div class="info"><$ (start) $></div> + <div class="title"><$ (title) $></div> + <div class="short"><$ (shortDescr) $></div> + <div class="description"> + <$ (longDescr) $> + </div> </div> </div> </div> |