Commit graph

3165 commits

Author SHA1 Message Date
Bernhard Froehlich
b5b97be842 Merge WIP implementation for poll wrapper API
Obtained from:	533a6cc918
2013-05-31 11:46:21 +02: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
Dave Chapman
8c5f9af36b Do not export the episode URI if it starts with tvh:// - these are just for internal use within tvh. 2013-05-23 10:10:34 +01:00
Dave Chapman
833355d101 Add episodeUri and serieslinkUri to the HTSP eventAdd and eventUpdate messages. 2013-05-23 09:21:29 +01:00
Adam Sutton
15fa7adc22 htsp: update the EPG/HTSP hookup to send channelUpdate on next event change.
Previously this was only being output if the current event was updated.
2013-05-22 12:55:00 +01:00
Andreas Öman
a5a08aa1e5 Remove accidental code 2013-05-22 09:53:27 +02:00
Andreas Öman
535fc25fcc HTSP: Add subscriptionFilterStream command 2013-05-22 09:47:25 +02:00
Dave Chapman
29f715f685 Bump HTSP protocol version to 11 for the recent transcoding changes and the addition of the audio_type field 2013-05-13 11:23:26 +01:00
Dave Chapman
477fa0a846 Add saving/loading of audio_type, and also display it in the webui 2013-05-13 10:39:35 +01:00
Dave Chapman
4b86d2fd20 Parse the audio_type field of the iso639_language_descriptor - this indicates if the audio stream contains audio description for the hard of hearing. Use this value when regenerating the PMT for the passthrough muxer, and also include it in the HTSP stream description messages. 2013-05-13 09:27:01 +01:00
John Törblom
60bdb16c9d Added initial support for transcoding. 2013-05-12 14:47:05 +02:00
Adam Sutton
84c1c05d73 dvb: fix mistake in NIT processing.
This was stopping some DVB-C networks from being properly scanned.
2013-05-10 15:10:54 +01:00
User Decke
f385e5f2a9 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-08 15:19:45 +02:00
User Decke
7af59c9fee Fix sendfile() call on FreeBSD/i386
src/webui/webui.c:885: warning: passing argument 6 of 'sendfile' from incompatible pointer type
2013-05-08 15:19:45 +02:00
Bernhard Froehlich
c1193e81f0 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-08 15:19:45 +02:00
Bernhard Froehlich
303f92a61b Add kqueue support and make epoll optional. 2013-05-08 15:19:39 +02:00
Bernhard Froehlich
356917f9e2 Add kqueue support and make epoll optional. 2013-05-08 15:18:32 +02:00
Bernhard Froehlich
27e52c5c6f Fix IPv4 multicasting on FreeBSD and make IPv6 multicasting optional
because it's not yet supported on FreeBSD.
2013-05-04 16:34:03 +02:00
Bernhard Froehlich
006a1793b2 __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-04 15:30:48 +02:00
Bernhard Froehlich
3de6b0cbe1 Use internal tvh_strdupa() because strdupa() is GNU only. 2013-05-04 15:10:04 +02:00
Bernhard Froehlich
f0ec040cf2 Add sendfile(2) support for FreeBSD. 2013-05-04 15:08:14 +02:00
Bernhard Froehlich
b94257e50b stime(2) is only available on Linux so make it optional. 2013-05-04 14:59:52 +02:00
Bernhard Froehlich
0efd76a2a6 Dumping NGREG in traphandler only if it is supported by the platform. 2013-05-04 14:57:29 +02:00
Bernhard Froehlich
7e92397f2c 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-04 14:32:57 +02:00
Bernhard Froehlich
f42c7d4639 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-04 14:30:19 +02:00
Bernhard Froehlich
f1c7c87c93 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-04 14:25:59 +02:00
Bernhard Froehlich
72210b2cdb Read timezone from gettimeofday() to not have to rely on an globally set timezone variable. 2013-05-04 14:24:04 +02:00
Bernhard Froehlich
e5f9d020ea Add missing include for FreeBSD which has AF_INET6 defined in sys/socket.h 2013-05-04 14:22:18 +02:00
Bernhard Froehlich
0783ecee9e 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-04 14:20:29 +02:00
Bernhard Froehlich
23ec229b7f Remove unused sys/epoll.h includes 2013-05-04 14:16:33 +02:00
Bernhard Froehlich
0d38f0c860 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-04 14:10:42 +02:00
Bernhard Froehlich
c127710cd5 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-04 14:04:08 +02:00
Bernhard Froehlich
51ca7c6c55 Avoid "install -D" because the flag is not available on FreeBSD. 2013-05-04 13:59:54 +02:00
Bernhard Froehlich
8d814e9b51 Enable SSL per default on FreeBSD because libssl is in base so it's always available. 2013-05-04 13:57:34 +02:00
Bernhard Froehlich
7fe66a47ef Add kqueue option and allow to disable epoll. 2013-05-04 13:56:24 +02:00
Bernhard Froehlich
06824215e4 Add PLATFORM_* define to config.h to allow supporting non Linux platforms. 2013-05-04 13:54:12 +02:00
Adam Sutton
a2ccbb2de6 support: remove natty and add raring to the build list 2013-04-22 10:06:58 +01:00
Adam Sutton
143128c708 Fix #1703 - tvhlog: took too many liberties with previous va_list fix 2013-04-19 12:46:17 +01:00
Adam Sutton
341618477e Fix #1682 - support: version script outputs something even if .git is missing 2013-04-18 15:29:58 +01:00
Adam Sutton
c83b0cba2f dvb: remove the create only tv/radio services, this was a bad idea! 2013-04-18 15:21:59 +01:00
Adam Sutton
d4883d9d6b docs: some minor documentation updates 2013-04-18 13:25:14 +01:00
Adam Sutton
89b18c05ca docs: update documentation with new domain name and paypal link 2013-04-18 13:02:22 +01:00
Adam Sutton
1a95003b24 tvhlog: correct stupid error in va_list processing 2013-04-18 12:03:24 +01:00
Adam Sutton
1ed10b2cf2 dvb: add some additional tracing into NIT/SDT parsing 2013-04-18 11:54:39 +01:00
Adam Sutton
99fe1c73a7 tvhlog: fix some problems with hexdump code 2013-04-18 11:54:39 +01:00
Adam Sutton
f442a28b77 tvhlog: some efficiency improvements 2013-04-18 11:54:39 +01:00
Adam Sutton
ed27c4b3dd dvb: attempt to stop bad updates to network info. 2013-04-18 11:54:39 +01:00
Adam Sutton
34e7acc087 services: include info from SDT (for Other services) if they already exist.
Services can be added from a variety of other tables which probably indicates
that they are in fact valid TV/Radio services, but we just don't know the
type.

This might help people to map these services manually within TVH.
2013-04-18 11:54:39 +01:00