Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
libhdhomerun integration
  • Loading branch information
pakar authored and perexg committed Oct 14, 2014
1 parent d6f66e7 commit 6718019
Show file tree
Hide file tree
Showing 9 changed files with 1,262 additions and 2 deletions.
5 changes: 5 additions & 0 deletions Makefile
Expand Up @@ -258,6 +258,11 @@ SRCS-${CONFIG_SATIP_CLIENT} += \
src/input/mpegts/satip/satip_satconf.c \
src/input/mpegts/satip/satip_rtsp.c

# HDHOMERUN
SRCS-${CONFIG_HDHOMERUN_CLIENT} += \
src/input/mpegts/tvhdhomerun/tvhdhomerun.c \
src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c

# IPTV
SRCS-${CONFIG_IPTV} += \
src/input/mpegts/iptv/iptv.c \
Expand Down
15 changes: 13 additions & 2 deletions configure
Expand Up @@ -22,6 +22,7 @@ OPTIONS=(
"v4l:no"
"linuxdvb:yes"
"satip_client:yes"
"hdhomerun_client:auto"
"iptv:yes"
"tsfile:yes"
"dvbscan:yes"
Expand Down Expand Up @@ -225,6 +226,16 @@ if enabled_or_auto linuxdvb; then
fi
fi

#
# HDHomeRun - libhdhomerun
#
if enabled_or_auto hdhomerun_client; then
if check_cc_lib hdhomerun; then
enable hdhomerun_client
LDFLAGS="$LDFLAGS -lhdhomerun"
fi
fi

#
# Gzip
#
Expand Down Expand Up @@ -380,11 +391,11 @@ fi
disable mpegts
disable mpegps
disable mpegts_dvb
if enabled linuxdvb || enabled iptv || enabled tsfile || enabled satip_client;
if enabled linuxdvb || enabled iptv || enabled tsfile || enabled satip_client || enabled hdhomerun_client;
then
enable mpegts
fi
if enabled linuxdvb || enabled satip_client; then
if enabled linuxdvb || enabled satip_client || enabled hdhomerun_client; then
enable mpegts_dvb
fi

Expand Down
3 changes: 3 additions & 0 deletions src/input.h
Expand Up @@ -147,6 +147,9 @@ void tvh_input_stream_destroy ( tvh_input_stream_t *st );
#if ENABLE_SATIP_CLIENT
#include "input/mpegts/satip/satip.h"
#endif
#if ENABLE_HDHOMERUN_CLIENT
#include "input/mpegts/tvhdhomerun/tvhdhomerun.h"
#endif
#endif

#endif /* __TVH_INPUT_H__ */
8 changes: 8 additions & 0 deletions src/input/mpegts.c
Expand Up @@ -62,6 +62,11 @@ mpegts_init ( int linuxdvb_mask, str_list_t *satip_client,
satip_init(satip_client);
#endif

/* HDHomerun client */
#if ENABLE_HDHOMERUN_CLIENT
tvhdhomerun_init();
#endif

/* Mux schedulers */
#if ENABLE_MPEGTS
mpegts_mux_sched_init();
Expand All @@ -86,6 +91,9 @@ mpegts_done ( void )
#if ENABLE_SATIP_CLIENT
tvhftrace("main", satip_done);
#endif
#if ENABLE_HDHOMERUN
tvhftrace("main", tvhdhomerun_done);
#endif
#if ENABLE_TSFILE
tvhftrace("main", tsfile_done);
#endif
Expand Down

2 comments on commit 6718019

@nmaclean
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this an issue or something I am doing.
In file included from src/input/mpegts/tvhdhomerun/tvhdhomerun.c:25:0:
src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h:27:36: fatal error: libhdhomerun/hdhomerun.h: No such file or directory
#include <libhdhomerun/hdhomerun.h>

@dmarion
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here, looks like recent hdhomerun commit breaks thing if you dont have hdhomerun libs installed.
Workaround: install libhdhomerun-dev ...

Please sign in to comment.