rename CREATE_CHANNEL_ID_FROM_SERVICE_ORIGINALNETWORK_TRANSPORTSTREAM_ID to CREATE_CHANNEL_ID

Origin commit data
------------------
Branch: ni/coolstream
Commit: b072232956
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-10 (Tue, 10 Apr 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-04-10 14:35:09 +04:00
parent 2ae311b612
commit 6b14e079e0
9 changed files with 17 additions and 18 deletions

View File

@@ -313,11 +313,11 @@ class SIevent
void setExtendedText(const std::string &lang, const std::string &text);
t_channel_id get_channel_id(void) const {
return CREATE_CHANNEL_ID;
return CREATE_CHANNEL_ID(service_id, original_network_id, transport_stream_id);
}
event_id_t uniqueKey(void) const {
return CREATE_EVENT_ID(CREATE_CHANNEL_ID, eventID);
return CREATE_EVENT_ID(get_channel_id(), eventID);
}
int runningStatus(void) const {
return running;