Commit graph

3178 commits

Author SHA1 Message Date
James Hannah
aab90516eb Bring the TVH_ARGS variable into the Debian init script
This is defined in the Defaults file but then not included in the init
script.
2013-06-02 11:30:57 +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
04199db013 Add kqueue option and allow to disable epoll. 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
946130a832 Avoid "install -D" because the flag is not available on FreeBSD. 2013-05-31 14:19:24 +01:00
Bernhard Froehlich
8ee3e09529 Enable SSL per default on FreeBSD because libssl is in base so it's always available. 2013-05-31 14:19:24 +01:00
Bernhard Froehlich
cae63f8a94 Add PLATFORM_* define to config.h to allow supporting non Linux platforms. 2013-05-31 14:19:24 +01:00
Adam Sutton
767f824f3e Merge remote-tracking branch 'origin/pr/276' 2013-05-29 23:44:43 +01:00
Adam Sutton
0aca536db1 Merge remote-tracking branch 'origin/pr/275' 2013-05-29 23:44:39 +01:00
Adam Sutton
310cf97b86 Merge remote-tracking branch 'origin/pr/273' 2013-05-29 23:44:24 +01: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
CSchlipp
dcbfd1425a Change status.xml to default xml-style with only one element/tag per line
Change status.xml to default xml-style with only one element/tag per line.
Makes it a lot more easier to parse the file.
2013-05-22 09:49:33 +02:00
Andreas Öman
535fc25fcc HTSP: Add subscriptionFilterStream command 2013-05-22 09:47:25 +02:00
Wojciech Myrda
ac53915b97 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
2013-05-22 09:37:20 +02:00
Wojciech Myrda
5c8ade8536 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
2013-05-22 09:33:29 +02:00
Wojciech Myrda
db947242a6 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
2013-05-22 09:28:34 +02:00
Wojciech Myrda
5a163d7638 Turkish character encoding override addition based on encoding.conf from
http://git.opendreambox.org/?p=enigma2.git;a=summary
2013-05-22 09:26:06 +02:00
Wojciech Myrda
a636cf6994 Greek character encoding override addition based on nonstandard_encoding from IPBox HD 2013-05-22 09:20:37 +02:00
Wojciech Myrda
f6547d5ad9 upstream uptodate file 2013-05-22 09:17:16 +02:00
Wojciech Myrda
21e8e272fb Merge remote-tracking branch 'dev/master'
Conflicts:
	data/conf/charset
2013-05-22 09:10:08 +02:00
Vuolter
6df3e69335 README updated 2013-05-17 23:00:44 +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