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

mpegts: fix some compilation issues with various configure options

Browse source
This commit is contained in:
Adam Sutton 2014-05-16 21:20:58 +01:00
parent f317576527
commit 3d5666787c
7 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
configure vendored
View file

@ -36,7 +36,6 @@ OPTIONS=(
"bundle:no"
"dvbcsa:no"
"kqueue:no"
"mpegts_dvb:auto"
)
#
@ -155,7 +154,6 @@ check_cc_header 'linux/dvb/version' linuxdvbapi
if enabled_or_auto linuxdvb; then
if enabled linuxdvbapi; then
enable linuxdvb
enable mpegts_dvb
elif enabled linuxdvb; then
die "Linux DVB API not found (use --disable-linuxdvb)"
fi
@ -307,9 +305,14 @@ fi
#
disable mpegts
disable mpegps
if enabled linuxdvb || enabled iptv || enabled tsfile; then
disable mpegts_dvb
if enabled linuxdvb || enabled iptv || enabled tsfile || enabled satip_client;
then
enable mpegts
fi
if enabled linuxdvb || enabled satip_client; then
enable mpegts_dvb
fi
if enabled v4l; then
enable mpegps

12
src/descrambler/capmt.c
View file

@ -16,6 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <pthread.h>
#include <assert.h>
#include <string.h>
@ -40,6 +41,9 @@
#include "input.h"
#include "tcp.h"
#include "capmt.h"
#if ENABLE_LINUXDVB
#include "notify.h"
#include "subscriptions.h"
#include "dtable.h"
@ -1299,3 +1303,11 @@ capmt_done(void)
}
dtable_delete("capmt");
}
#else /* ENABLE_LINUXDVB */
void capmt_init ( void ) {}
void capmt_done ( void ) {}
void capmt_service_start(service_t *s) {}
#endif

2
src/input/mpegts.h
View file

@ -265,7 +265,7 @@ struct mpegts_network
void (*mn_display_name) (mpegts_network_t*, char *buf, size_t len);
void (*mn_config_save) (mpegts_network_t*);
mpegts_mux_t* (*mn_create_mux)
(mpegts_mux_t*, uint16_t onid, uint16_t tsid, dvb_mux_conf_t *conf);
(mpegts_mux_t*, uint16_t onid, uint16_t tsid, void *conf);
mpegts_service_t* (*mn_create_service)
(mpegts_mux_t*, uint16_t sid, uint16_t pmt_pid);
const idclass_t* (*mn_mux_class) (mpegts_network_t*);

2
src/input/mpegts/dvb_psi.c
View file

@ -824,6 +824,7 @@ dvb_nit_callback
break;
/* nit only */
#if ENABLE_MPEGTS_DVB
case DVB_DESC_SAT_DEL:
case DVB_DESC_CABLE_DEL:
case DVB_DESC_TERR_DEL:
@ -838,6 +839,7 @@ dvb_nit_callback
mpegts_mux_set_tsid(mux, tsid, 0);
}
break;
#endif
/* Both */
case DVB_DESC_DEF_AUTHORITY:

2
src/input/mpegts/mpegts_network.c
View file

@ -181,7 +181,7 @@ mpegts_network_config_save
static mpegts_mux_t *
mpegts_network_create_mux
( mpegts_mux_t *mm, uint16_t sid, uint16_t tsid, dvb_mux_conf_t *aux )
( mpegts_mux_t *mm, uint16_t sid, uint16_t tsid, void *aux )
{
return NULL;
}

3
src/input/mpegts/mpegts_network_dvb.c
View file

@ -275,11 +275,12 @@ dvb_network_mux_class
static mpegts_mux_t *
dvb_network_create_mux
( mpegts_mux_t *mm, uint16_t onid, uint16_t tsid, dvb_mux_conf_t *dmc )
( mpegts_mux_t *mm, uint16_t onid, uint16_t tsid, void *p )
{
int save = 0;
mpegts_mux_t *mmo = mm;
dvb_network_t *ln = (dvb_network_t*)mm->mm_network;
dvb_mux_conf_t *dmc = p;
mm = dvb_network_find_mux(ln, dmc);
if (!mm && ln->mn_autodiscovery) {

4
src/main.c
View file

@ -427,8 +427,8 @@ main(int argc, char **argv)
{
int i;
sigset_t set;
#if ENABLE_LINUXDVB
uint32_t adapter_mask;
#if ENABLE_MPEGTS
uint32_t adapter_mask = 0;
#endif
int log_level = LOG_INFO;
int log_options = TVHLOG_OPT_MILLIS | TVHLOG_OPT_STDERR | TVHLOG_OPT_SYSLOG;