Skip to content

Commit

Permalink
[htsp v26] Hack can be removed now
Browse files Browse the repository at this point in the history
  • Loading branch information
Glenn-1990 committed Jan 29, 2017
1 parent 8e32bd4 commit 0f51070
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions src/Tvheadend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1826,20 +1826,12 @@ void CTvheadend::ParseChannelAddOrUpdate ( htsmsg_t *msg, bool bAdd )
continue;

/* Channel type */
bool bGotContent = false;
if (m_conn.GetProtocol() >= 25)
if (m_conn.GetProtocol() >= 26)
{
if (!htsmsg_get_u32(&f->hmf_msg, "content", &u32))
{
channel.SetType(u32);
bGotContent = true;
}
}

// The 'content' htsp method field was added to tvheadend htsp api without htsp version bump.
// Unfortunately, there are many semi-official tvheadend builds with htsp version 25 in the wild which
// do not support the 'content' htsp attribute. Just checking htsp api version is not sufficient. :-/
if (!bGotContent)
else
{
if ((str = htsmsg_get_str(&f->hmf_msg, "type")) != NULL)
{
Expand Down

0 comments on commit 0f51070

Please sign in to comment.