Commit graph

2854 commits

Author SHA1 Message Date
Adam Sutton
fbd34be472 mpegts: fix scanning issue and lfe display name
Still have a problem with dup services being created when scanning
with multiple adapters.
2013-06-01 14:32:40 +01:00
Adam Sutton
ff3bc4c35a mpegts: fix display name bug and looks like mux arbitration is currently still broken 2013-06-01 14:07:01 +01:00
Adam Sutton
37f64806d7 mpegts: correct some types now I have added PT_U16 2013-06-01 13:46:01 +01:00
Adam Sutton
400e8c61ea mpegts linuxdvb: loads of tidying up of network/mux code 2013-06-01 13:40:29 +01:00
Adam Sutton
896345228c dvbpsi: tidied up some of the debug 2013-06-01 12:33:58 +01:00
Adam Sutton
1da619851b tvhlog: allow independent trace/debug subsystems to be enabled 2013-06-01 12:32:51 +01:00
Adam Sutton
3c00057b42 linuxdvb: new service file 2013-06-01 11:58:18 +01:00
Adam Sutton
2489e44492 mpegts: fixed some problems with service discovery 2013-05-31 23:55:43 +01:00
Adam Sutton
afd6d085d9 service: fix some mistakes in service saving 2013-05-31 21:48:59 +01:00
Adam Sutton
c412f6e28c service: trying to sort the service saving 2013-05-31 21:45:29 +01:00
Adam Sutton
dc773b0380 prop: added some extra sized types for clarity
In particular I wanted to be able to use u16, as this is commonly
used within the mpegts code for various fields.
2013-05-31 20:43:17 +01:00
Adam Sutton
cfbba3891d linuxdvb: stop the correct mux! 2013-05-31 20:18:49 +01:00
Bernhard Froehlich
17b16d7a76 tvhpoll: update all code to use new tvhpoll wrapper rather than epoll 2013-05-31 14:22:29 +01:00
Adam Sutton
7d122d8dea tvhpoll: corrected some mistakes and expanded usage for user data. 2013-05-31 14:22:29 +01:00
Bernhard Froehlich
a2ef8e9c94 tvhpoll: Fix kqueue parts of the poll wrapper API 2013-05-31 14:22:29 +01:00
Adam Sutton
ee5d2171d5 tvhpoll: new epoll/kqueue wrapper API
This is to ease some of the BSD porting work that has been done and
keep the core code cleaner.

Credit to Bernhard Froehlich <decke@bluelife.at>, for the original
kqueue code that was #if'd inline with epoll code (now hidden as a
result of tidying up commits).
2013-05-31 14:21:25 +01:00
Bernhard Froehlich
9a0d477acd Fix warning because of wrong time_t format specifier on FreeBSD i386
and fix places where format specifier is hardcoded for time_t and
correctly use PRItime_t instead.

src/epg.c:1412: warning: format '%ld' expects type 'long int', but argument 7 has type 'time_t'
src/dvr/dvr_rec.c:596: warning: format '%ld' expects type 'long int', but argument 4 has type 'time_t'
src/epggrab/module/eit.c:536: warning: format '%lu' expects type 'long unsigned int', but argument 8 has type 'time_t'
2013-05-31 14:19:26 +01:00
User Decke
138e73eb26 Fix printf format modifier to build properly with CLANG.
src/htsp_server.c:485:55: error: format specifies type 'short' but the argument has type 'int' [-Werror,-Wformat]
        p += snprintf(url+p, sizeof(url)-p, "%s%s%s:%hd%s",
                                                    ~~^
                                                    %d
2013-05-31 14:19:26 +01:00
User Decke
d137cc0073 Fix sendfile() call on FreeBSD/i386
src/webui/webui.c:885: warning: passing argument 6 of 'sendfile' from incompatible pointer type
2013-05-31 14:19:26 +01:00
Bernhard Froehlich
f22d3e0fb2 Add missing include for ssize_t on FreeBSD.
src/tvhlog.h:48: error: expected declaration specifiers or '...' before 'ssize_t'
src/tvhlog.c:244: error: conflicting types for '_tvhlog_hexdump'
src/tvhlog.h:48: error: previous declaration of '_tvhlog_hexdump' was here
2013-05-31 14:19:26 +01:00
Bernhard Froehlich
cf74b5f1c9 Fix IPv4 multicasting on FreeBSD and make IPv6 multicasting optional
because it's not yet supported on FreeBSD.
2013-05-31 14:19:26 +01:00
Bernhard Froehlich
2d6c12222c __u8 is not available on FreeBSD so use u_int8_t instead
tvheadend-3.4/src/dvb/diseqc.h:10: error: expected declaration specifiers or '...' before '__u8'
tvheadend-3.4/src/dvb/diseqc.h:11: error: expected declaration specifiers or '...' before '__u8'
2013-05-31 14:19:26 +01:00
Bernhard Froehlich
0ac56f0be8 Use internal tvh_strdupa() because strdupa() is GNU only. 2013-05-31 14:19:25 +01:00
Bernhard Froehlich
f24ea24b26 Add sendfile(2) support for FreeBSD. 2013-05-31 14:19:25 +01:00
Bernhard Froehlich
0fdc4fc193 stime(2) is only available on Linux so make it optional. 2013-05-31 14:19:25 +01:00
Bernhard Froehlich
252a15f728 Dumping NGREG in traphandler only if it is supported by the platform. 2013-05-31 14:19:25 +01:00
Bernhard Froehlich
3158494a5e Add missing include for FreeBSD which has AF_INET and AF_INET6 defined in sys/socket.h
tvheadend-3.4/src/webui/extjs.c: In function 'service_update_iptv':
tvheadend-3.4/src/webui/extjs.c:1748: error: 'AF_INET' undeclared (first use in this function)
tvheadend-3.4/src/webui/extjs.c:1748: error: (Each undeclared identifier is reported only once
tvheadend-3.4/src/webui/extjs.c:1748: error: for each function it appears in.)
tvheadend-3.4/src/webui/extjs.c:1749: error: 'AF_INET6' undeclared (first use in this function)
tvheadend-3.4/src/webui/extjs.c: In function 'build_record_iptv':
tvheadend-3.4/src/webui/extjs.c:1776: error: 'AF_INET' undeclared (first use in this function)
tvheadend-3.4/src/webui/extjs.c:1780: error: 'AF_INET6' undeclared (first use in this function)
2013-05-31 14:19:25 +01:00
Bernhard Froehlich
38d9f2ec39 Add missing include for FreeBSD which has AF_INET defined in sys/socket.h
tvheadend-3.4/src/webui/comet.c: In function 'comet_serverIpPort':
tvheadend-3.4/src/webui/comet.c:162: error: 'AF_INET' undeclared (first use in this function)
tvheadend-3.4/src/webui/comet.c:162: error: (Each undeclared identifier is reported only once
tvheadend-3.4/src/webui/comet.c:162: error: for each function it appears in.)
tvheadend-3.4/src/webui/comet.c:164: error: 'AF_INET6' undeclared (first use in this function)
2013-05-31 14:19:25 +01:00
Bernhard Froehlich
45e1ca3b7e Add missing include for "struct iovec" which is defined in sys/uio.h
on FreeBSD and also on Linux.

tvheadend-3.4/src/muxer/tvh/mkmux.c: In function 'mk_write_to_fd':
tvheadend-3.4/src/muxer/tvh/mkmux.c:347: error: invalid application of 'sizeof' to incomplete type 'struct iovec'
tvheadend-3.4/src/muxer/tvh/mkmux.c:351: error: invalid use of undefined type 'struct iovec'
tvheadend-3.4/src/muxer/tvh/mkmux.c:351: error: dereferencing pointer to incomplete type
tvheadend-3.4/src/muxer/tvh/mkmux.c:352: error: invalid use of undefined type 'struct iovec'
tvheadend-3.4/src/muxer/tvh/mkmux.c:352: error: dereferencing pointer to incomplete type
cc1: warnings being treated as errors
tvheadend-3.4/src/muxer/tvh/mkmux.c:358: warning: implicit declaration of function 'writev'
tvheadend-3.4/src/muxer/tvh/mkmux.c:364: error: invalid use of undefined type 'struct iovec'
2013-05-31 14:19:25 +01:00
Bernhard Froehlich
bf1c6ac55a Read timezone from gettimeofday() to not have to rely on an globally set timezone variable. 2013-05-31 14:19:25 +01:00
Bernhard Froehlich
112c264336 Add missing include for FreeBSD which has AF_INET6 defined in sys/socket.h 2013-05-31 14:19:25 +01:00
Bernhard Froehlich
10abaf8853 Add missing include for accept(2) on FreeBSD.
tvheadend-3.4/src/epggrab/module.c: In function '_epggrab_socket_thread':
tvheadend-3.4/src/epggrab/module.c:357: warning: implicit declaration of function 'accept'
tvheadend-3.4/src/epggrab/module.c: In function 'epggrab_module_enable_socket':
tvheadend-3.4/src/epggrab/module.c:382: warning: implicit declaration of function 'shutdown'
tvheadend-3.4/src/epggrab/module.c:382: error: 'SHUT_RDWR' undeclared (first use in this function)
tvheadend-3.4/src/epggrab/module.c:382: error: (Each undeclared identifier is reported only once
tvheadend-3.4/src/epggrab/module.c:382: error: for each function it appears in.)
tvheadend-3.4/src/epggrab/module.c:392: warning: implicit declaration of function 'socket'
tvheadend-3.4/src/epggrab/module.c:392: error: 'AF_UNIX' undeclared (first use in this function)
tvheadend-3.4/src/epggrab/module.c:392: error: 'SOCK_STREAM' undeclared (first use in this function)
tvheadend-3.4/src/epggrab/module.c:398: warning: implicit declaration of function 'bind'
tvheadend-3.4/src/epggrab/module.c:406: warning: implicit declaration of function 'listen'
2013-05-31 14:19:25 +01:00
Bernhard Froehlich
70d79169ea Remove unused sys/epoll.h includes 2013-05-31 14:19:25 +01:00
Bernhard Froehlich
99e5d63e81 Add missing includes for shutdown(2) and SHUT_RDWR on FreeBSD.
tvheadend-3.4/src/cwc.c: In function 'cwc_session':
tvheadend-3.4/src/cwc.c:1139: warning: implicit declaration of function 'shutdown'
tvheadend-3.4/src/cwc.c:1139: error: 'SHUT_RDWR' undeclared (first use in this function)
tvheadend-3.4/src/cwc.c:1139: error: (Each undeclared identifier is reported only once
tvheadend-3.4/src/cwc.c:1139: error: for each function it appears in.)
tvheadend-3.4/src/cwc.c: In function 'cwc_entry_update':
tvheadend-3.4/src/cwc.c:2369: error: 'SHUT_RDWR' undeclared
2013-05-31 14:19:25 +01:00
Bernhard Froehlich
3103e1814a Add missing include for FreeBSD which has AF_INET6 defined
in sys/socket.h

tvheadend-3.4/src/access.c: In function 'netmask_verify':
tvheadend-3.4/src/access.c:164: error: dereferencing pointer to incomplete type
tvheadend-3.4/src/access.c:164: error: 'AF_INET6' undeclared (first use in this function)
tvheadend-3.4/src/access.c:164: error: (Each undeclared identifier is reported only once
tvheadend-3.4/src/access.c:164: error: for each function it appears in.)
tvheadend-3.4/src/access.c:177: error: dereferencing pointer to incomplete type
tvheadend-3.4/src/access.c:177: error: 'AF_INET' undeclared (first use in this function)
tvheadend-3.4/src/access.c:193: error: dereferencing pointer to incomplete type
tvheadend-3.4/src/access.c: In function 'access_set_prefix':
tvheadend-3.4/src/access.c:422: error: 'AF_INET6' undeclared (first use in this function)
tvheadend-3.4/src/access.c: In function 'access_record_build':
tvheadend-3.4/src/access.c:554: error: 'AF_INET6' undeclared (first use in this function)
2013-05-31 14:19:24 +01:00
Bernhard Froehlich
cf2963e566 Fix kqueue parts of the poll wrapper API 2013-05-31 11:48:40 +02:00
Bernhard Froehlich
b5b97be842 Merge WIP implementation for poll wrapper API
Obtained from:	533a6cc918
2013-05-31 11:46:21 +02:00
Adam Sutton
d5a86bf8e9 linuxdvb: started to add service saving (very rough) 2013-05-30 22:30:16 +01:00
Adam Sutton
0d82be3664 linuxdvb: mux scanning is now working and I will not re-run unless reqd 2013-05-30 21:47:42 +01:00
Adam Sutton
7465423cb6 mpegts linuxdvb: starting to get more complete config load/save 2013-05-30 20:55:11 +01:00
Adam Sutton
578c3fc545 mpegts linuxdvb: starting to get working scanning on DVB-T
Moved DVB mux config into dvb_support
Updated table processing to include proper section tracking
Fixed some problem in the MPEG-TS core
Updates to get scanning working in LinuxDVB
2013-05-30 16:09:47 +01:00
Adam Sutton
0aca536db1 Merge remote-tracking branch 'origin/pr/275' 2013-05-29 23:44:39 +01:00
Adam Sutton
51eeb9af0d linuxdvb: starting to see data input working
there are a lot of hacks in at the moment, need to go through and tidy
everything up.
2013-05-29 14:22:22 +01:00
Adam Sutton
3cb6be346f mpegts linuxdvb: add routine to create mmi's on the fly 2013-05-28 16:27:09 +01:00
Adam Sutton
e0c4695239 linuxdvb: starting to add network/input connection
Still just early stages, but should be able to start thinking about
getting something tuning soon.
2013-05-26 21:02:17 +01:00
Adam Sutton
0fbdb43ac2 linuxdvb: starting to get config load/save for device tree
I think eventually I will re-work this to one file per entry similar
to the other trees (like network). But this will do for now.
2013-05-25 21:46:37 +01:00
Adam Sutton
5c420b613a linuxdvb: starting to add network/mux information 2013-05-24 21:20:56 +01:00
Bernhard Froehlich
1a458ae763 Fix warning because of wrong time_t format specifier on FreeBSD i386
and fix places where format specifier is hardcoded for time_t and
correctly use PRItime_t instead.

src/epg.c:1412: warning: format '%ld' expects type 'long int', but argument 7 has type 'time_t'
src/dvr/dvr_rec.c:596: warning: format '%ld' expects type 'long int', but argument 4 has type 'time_t'
src/epggrab/module/eit.c:536: warning: format '%lu' expects type 'long unsigned int', but argument 8 has type 'time_t'
2013-05-24 21:34:53 +02:00
Bernhard Froehlich
ae7d281898 Convert all #ifdef ENABLE_EPOLL to #if ENABLE_EPOLL 2013-05-24 19:31:10 +02:00
Bernhard Froehlich
5691e131a9 Sync with tvheadend/master and merge in changes. 2013-05-24 19:03:40 +02:00