diff options
| author | Sascha Volkenandt <sascha (at) akv-soft (dot) de> | 2007-01-19 21:33:23 +0000 |
|---|---|---|
| committer | Sascha Volkenandt <sascha (at) akv-soft (dot) de> | 2007-01-19 21:33:23 +0000 |
| commit | 359faf6c427f3ced6ec938e8b029b5f614eed4eb (patch) | |
| tree | 878cedb4aeea61856500bac67c183b2aebcf12ca | |
| parent | a0f950a57be97a09ff1ea8a1339232379d37574c (diff) | |
| download | vdr-plugin-live-359faf6c427f3ced6ec938e8b029b5f614eed4eb.tar.gz vdr-plugin-live-359faf6c427f3ced6ec938e8b029b5f614eed4eb.tar.bz2 | |
- converted all tChannelID::ToString and *::FromString calls to the stream operators when streams are involved
| -rw-r--r-- | pages/edit_timer.ecpp | 2 | ||||
| -rw-r--r-- | pages/pageelems.ecpp | 2 | ||||
| -rw-r--r-- | pages/switch_channel.ecpp | 2 | ||||
| -rw-r--r-- | pages/whats_on.ecpp | 2 | ||||
| -rw-r--r-- | timers.cpp | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp index cee1ddd..90e19e1 100644 --- a/pages/edit_timer.ecpp +++ b/pages/edit_timer.ecpp @@ -132,7 +132,7 @@ cTimer* timer; <tr> <td class="label"><$ tr("Channel") $>:</td> <td> -<& channels_widget name=("channel") channelid=(true) selected=(*channel.ToString()) &> +<& channels_widget name=("channel") channelid=(true) selected=(channel) &> </td> </tr> diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp index 9adb045..932184b 100644 --- a/pages/pageelems.ecpp +++ b/pages/pageelems.ecpp @@ -45,7 +45,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")) &> /></a> + <a href="edit_timer.html?channelid=<$ channelid $>&eventid=<$ eventid $>"><img src="record.png" alt="" <& tooltip.hint text=(tr("Record this")) &> /></a> </%def> <%def ajax_js> diff --git a/pages/switch_channel.ecpp b/pages/switch_channel.ecpp index 3297793..91f4f30 100644 --- a/pages/switch_channel.ecpp +++ b/pages/switch_channel.ecpp @@ -19,7 +19,7 @@ using namespace vdrlive; <?xml version="1.0"?> <service> <request name="switch_channel"> -<param name="channel"><$ *param.ToString() $></param> +<param name="channel"><$ param $></param> </request> <response><$ task.Result() $></response> <error><$ task.Error() $></error> diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp index be36f96..b9062e0 100644 --- a/pages/whats_on.ecpp +++ b/pages/whats_on.ecpp @@ -72,7 +72,7 @@ if (type == "now") { <div class="content"> <div class="tools"> <& pageelems.event_timer channelid=(channel_id) eventid=(event) &> - <& pageelems.ajax_action_href action="switch_channel" param=(*channel_id.ToString()) image="zap.png" alt="" &> + <& pageelems.ajax_action_href action="switch_channel" param=(channel_id) image="zap.png" alt="" &> </div> <div> <div class="info"><$ start $> - <$ end $></div> @@ -24,7 +24,7 @@ SortedTimers::SortedTimers(): string SortedTimers::GetTimerId( cTimer const& timer ) { ostringstream builder; - builder << *timer.Channel()->GetChannelID().ToString() << ":" << timer.WeekDays() << ":" + builder << timer.Channel()->GetChannelID() << ":" << timer.WeekDays() << ":" << timer.Day() << ":" << timer.Start() << ":" << timer.Stop(); return builder.str(); } @@ -80,7 +80,7 @@ void TimerManager::UpdateTimer( cTimer* timer, int flags, tChannelID& channel, s int start, int stop, int priority, int lifetime, string const& title, string const& aux ) { ostringstream builder; - builder << flags << ":" << *channel.ToString() << ":" << ( weekdays != "-------" ? weekdays : "" ) + builder << flags << ":" << channel << ":" << ( weekdays != "-------" ? weekdays : "" ) << ( weekdays == "-------" || day.empty() ? "" : "@" ) << day << ":" << start << ":" << stop << ":" << priority << ":" << lifetime << ":" << title << ":" << aux; dsyslog("%s", builder.str().c_str()); |