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

@@ -142,9 +142,9 @@ static void addEPGFilter(t_original_network_id onid, t_transport_stream_id tsid,
static void addBlacklist(t_original_network_id onid, t_transport_stream_id tsid, t_service_id sid)
{
t_channel_id channel_id =
CREATE_CHANNEL_ID_FROM_SERVICE_ORIGINALNETWORK_TRANSPORTSTREAM_ID(sid, onid, tsid);
CREATE_CHANNEL_ID(sid, onid, tsid);
t_channel_id mask =
CREATE_CHANNEL_ID_FROM_SERVICE_ORIGINALNETWORK_TRANSPORTSTREAM_ID(
CREATE_CHANNEL_ID(
(sid ? 0xFFFF : 0), (onid ? 0xFFFF : 0), (tsid ? 0xFFFF : 0)
);
if (!checkBlacklist(channel_id))
@@ -161,9 +161,9 @@ static void addBlacklist(t_original_network_id onid, t_transport_stream_id tsid,
static void addNoDVBTimelist(t_original_network_id onid, t_transport_stream_id tsid, t_service_id sid)
{
t_channel_id channel_id =
CREATE_CHANNEL_ID_FROM_SERVICE_ORIGINALNETWORK_TRANSPORTSTREAM_ID(sid, onid, tsid);
CREATE_CHANNEL_ID(sid, onid, tsid);
t_channel_id mask =
CREATE_CHANNEL_ID_FROM_SERVICE_ORIGINALNETWORK_TRANSPORTSTREAM_ID(
CREATE_CHANNEL_ID(
(sid ? 0xFFFF : 0), (onid ? 0xFFFF : 0), (tsid ? 0xFFFF : 0)
);
if (!checkNoDVBTimelist(channel_id))