Some clean up in the timer editing call.

Prepeared timer edititing to be a popup like the epg-data. This is not
finished yet and seems to have some problems with the form and the
popup. So the overall functionality is disabled. Never the less some of
the changes for this are of general interrest, so current work was
commited.
Changes in the styles for this.

1 files changed, 6 insertions, 4 deletions

diff --git a/epg_events.cpp b/epg_events.cpp
index 7d22cdf..962fcfc 100644
--- a/epg_events.cpp
+++ b/epg_events.cpp
@@ -214,8 +214,9 @@ namespace vdrlive
 		string channelId(chanId.ToString());
 		string eventId("event_");
 
-		replace(channelId.begin(), channelId.end(), '.', 'p');
-		replace(channelId.begin(), channelId.end(), '-', 'm');
+		channelId = vdrlive::EncodeDomId(channelId, ".-", "pm");
+		// replace(channelId.begin(), channelId.end(), '.', 'p');
+		// replace(channelId.begin(), channelId.end(), '-', 'm');
 
 		eventId += channelId;
 		eventId += '_';
@@ -230,8 +231,9 @@ namespace vdrlive
 		size_t delimPos = epgid.find_last_of('_');
 		string cIdStr = epgid.substr(eventStr.length(), delimPos - eventStr.length());
 
-		replace(cIdStr.begin(), cIdStr.end(), 'm', '-');
-		replace(cIdStr.begin(), cIdStr.end(), 'p', '.');
+		cIdStr = vdrlive::DecodeDomId(cIdStr, "mp", "-.");
+		// replace(cIdStr.begin(), cIdStr.end(), 'm', '-');
+		// replace(cIdStr.begin(), cIdStr.end(), 'p', '.');
 
 		string const eIdStr = epgid.substr(delimPos+1);