Dave Chapman [Mon, 17 Jun 2013 21:06:05 +0000 (22:06 +0100)]
Only compare the serieslink field when comparing an event with a serieslink auto recording. Previously tvh was also comparing other fields, including title, which broke some serieslink recordings (e.g. if the episodes had unique titles). Fix by adamsutton.
src/tvhpoll.c:127: warning: assignment makes pointer from integer without a cast
src/tvhpoll.c:179: warning: assignment makes integer from pointer without a cast
src/tcp.c:38: error: 'AF_INET' undeclared here (not in a function)
src/tcp.c:99: error: 'SOCK_STREAM' undeclared (first use in this function)
src/tcp.c:121: error: 'AF_INET6' undeclared (first use in this function)
src/tcp.c:159: error: 'SOL_SOCKET' undeclared (first use in this function)
src/tcp.c:159: error: 'SO_ERROR' undeclared (first use in this function)
Adam Sutton [Wed, 29 May 2013 22:39:42 +0000 (23:39 +0100)]
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).
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'
User Decke [Mon, 6 May 2013 13:57:14 +0000 (15:57 +0200)]
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
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
__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'
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)
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)
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'
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'
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
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)
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'
Wojciech Myrda [Wed, 22 May 2013 07:37:20 +0000 (09:37 +0200)]
The lists out there set ISO8859-5 encoding for all the channels
in the "Sattelite BG" digital platform from 23.5E however hence
several of those transponders share their channels with other
platforms this commit sets in only where it is safe meaning where
channels are used by this platform only. To set them for others
would require more testing
Wojciech Myrda [Wed, 22 May 2013 07:33:29 +0000 (09:33 +0200)]
I have found several ovverrides http://www.ab-forum.info/viewtopic.php?f=147&t=41393
that help with encoding on the platforms of Easteuropean origin for enigma2 boxes.
This commit sets encoding for Romanian channels from RCS DigiTV
Wojciech Myrda [Wed, 22 May 2013 07:28:34 +0000 (09:28 +0200)]
Moving skyde overrides to the beggining of the file to sort the list in the
alphabetical order just like sattelites names go and skyde is located on Astra
hence is deserves the place in the start
Dave Chapman [Mon, 13 May 2013 08:27:01 +0000 (09:27 +0100)]
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.
User Decke [Mon, 6 May 2013 13:57:14 +0000 (15:57 +0200)]
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
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
__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'
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)
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)
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'
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'
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
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)