- made pageelems.play_recording a generic ajax call widget

- renamed service parameters to "param" to ease calling with ajax widget

4 files changed, 12 insertions, 11 deletions

diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
index a341c3a..9adb045 100644
--- a/pages/pageelems.ecpp
+++ b/pages/pageelems.ecpp
@@ -52,13 +52,14 @@ component;
 	<script type="text/javascript" language="javascript" src="ajax.js"></script>
 </%def>
 
-<%def play_recording>
+<%def ajax_action_href>
 <%args>
-	string recordingid;
+	string action;
+	string param;
 	string image;
 	string alt = "";
 </%args>
-	<a href="javascript:LiveSimpleAjaxRequest('play_recording.xml', 'recordingid', '<$ recordingid $>');"><img src="<$ image $>" alt="<$ alt $>" /></a>
+	<a href="javascript:LiveSimpleAjaxRequest('<$ action $>.xml', 'param', '<$ param $>');"><img src="<$ image $>" border="0" alt="<$ alt $>" /></a>
 </%def>
 
 <%def epg_tt_box>
diff --git a/pages/play_recording.ecpp b/pages/play_recording.ecpp
index a8ab47a..d314ace 100644
--- a/pages/play_recording.ecpp
+++ b/pages/play_recording.ecpp
@@ -10,18 +10,18 @@ using namespace vdrlive;
 
 </%pre>
 <%args>
-	string recordingid;
+	string param;
 </%args>
 <%cpp>
 	reply.setContentType( "application/xml" );
 
-	ReplayRecordingTask task( recordingid );
+	ReplayRecordingTask task( param );
 	LiveTaskManager().Execute( task );
 </%cpp>
 <?xml version="1.0"?>
 <service>
 <request name="play_recording">
-<param name="recording"><$ recordingid $></param>
+<param name="recording"><$ param $></param>
 </request>
 <response><$ task.Result() $></response>
 <error><$ task.Error() $></error>
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index c9427c8..59d255c 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -117,7 +117,7 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) {
 			<div class="recording_time"><$ FormatDateTime(tr("%I:%M %p"), recItem->StartTime()) $></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->Id()) image="play.png" alt="" &>
+				 <& pageelems.ajax_action_href action="play_recording" param=(recItem->Id()) image="play.png" alt="" &>
 				 <img src="edit.png" alt="" />
 				 <img src="del.png" alt="" />
 			</div>
@@ -170,5 +170,5 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) {
 </%def>
 
 <%def rec_tools>
-<& pageelems.play_recording recordingid=(currRecItem->Id()) image="play.png" alt="" &>
+<& pageelems.ajax_action_href action="play_recording" param=(currRecItem->Id()) image="play.png" alt="" &>
 </%def>
diff --git a/pages/switch_channel.ecpp b/pages/switch_channel.ecpp
index d31bcfc..3297793 100644
--- a/pages/switch_channel.ecpp
+++ b/pages/switch_channel.ecpp
@@ -8,18 +8,18 @@ using namespace vdrlive;
 
 </%pre>
 <%args>
-	tChannelID channelid;
+	tChannelID param;
 </%args>
 <%cpp>
 	reply.setContentType( "application/xml" );
 
-	SwitchChannelTask task( channelid );
+	SwitchChannelTask task( param );
 	LiveTaskManager().Execute( task );
 </%cpp>
 <?xml version="1.0"?>
 <service>
 <request name="switch_channel">
-<param name="channel"><$ *channelid.ToString() $></param>
+<param name="channel"><$ *param.ToString() $></param>
 </request>
 <response><$ task.Result() $></response>
 <error><$ task.Error() $></error>