stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix possible problem with the wrong EPG object types being returned. This fixes #25.

Browse source
This commit is contained in:
Adam Sutton 2012-07-02 11:27:58 +01:00
parent 7e97b3795a
commit a0eee8a38e
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/epg.c
View file

@ -191,11 +191,11 @@ static epg_object_t *_epg_object_find_by_uri
return eo;
}
static epg_object_t *_epg_object_find_by_id ( uint64_t id )
static epg_object_t *_epg_object_find_by_id ( uint64_t id, epg_object_type_t type )
{
epg_object_t *eo;
LIST_FOREACH(eo, &epg_objects[id & EPG_HASH_MASK], id_link) {
if (eo->id == id) return eo;
if (eo->id == id) return eo->type == type ? eo : NULL;
}
return NULL;
}
@ -309,7 +309,7 @@ epg_brand_t* epg_brand_find_by_uri
epg_brand_t *epg_brand_find_by_id ( uint64_t id )
{
return (epg_brand_t*)_epg_object_find_by_id(id);
return (epg_brand_t*)_epg_object_find_by_id(id, EPG_BRAND);
}
int epg_brand_set_title ( epg_brand_t *brand, const char *title )
@ -467,7 +467,7 @@ epg_season_t* epg_season_find_by_uri
epg_season_t *epg_season_find_by_id ( uint64_t id )
{
return (epg_season_t*)_epg_object_find_by_id(id);
return (epg_season_t*)_epg_object_find_by_id(id, EPG_SEASON);
}
int epg_season_set_summary ( epg_season_t *season, const char *summary )
@ -682,7 +682,7 @@ epg_episode_t* epg_episode_find_by_uri
epg_episode_t *epg_episode_find_by_id ( uint64_t id )
{
return (epg_episode_t*)_epg_object_find_by_id(id);
return (epg_episode_t*)_epg_object_find_by_id(id, EPG_EPISODE);
}
int epg_episode_set_title ( epg_episode_t *episode, const char *title )
@ -1187,7 +1187,7 @@ epg_broadcast_t *epg_broadcast_find_by_id ( uint64_t id, channel_t *ch )
{
// Note: I have left channel_t param, just in case I decide to change
// to use it for shorter search
return (epg_broadcast_t*)_epg_object_find_by_id(id);
return (epg_broadcast_t*)_epg_object_find_by_id(id, EPG_BROADCAST);
}
epg_broadcast_t *epg_broadcast_find_by_eid ( channel_t *ch, int eid )