Commit graph

3529 commits

Author SHA1 Message Date
Adam Sutton
d91c02d520 Merge branch 'feature/dvb-rewrite'
Conflicts:
	Makefile
	configure
	src/dvb/diseqc.h
	src/dvb/dvb.h
	src/dvb/dvb_adapter.c
	src/dvb/dvb_fe.c
	src/dvb/dvb_input_filtered.c
	src/dvb/dvb_tables.c
	src/input/mpegts/dvb_psi.c
	src/input/mpegts/iptv/iptv_mux.c
	src/iptv_input.c
	src/service_mapper.h
	src/webui/static/app/tvadapters.js
	src/webui/webui.c
2013-08-28 17:08:39 +01:00
Adam Sutton
b6a0658bad iptv: further fixes to input processing
I had forgotten to make the read() buffers mux specific. Without this they
effectively end up using the same buffer for all active sessions and will
trample all over each other!
2013-08-22 22:38:42 +01:00
Adam Sutton
88fddda7e1 mpegts: ensure that partial (TS packet) reads are properly handled 2013-08-22 22:04:23 +01:00
Adam Sutton
ea99e7b3c6 iptv: sort out service configuration 2013-08-22 22:01:38 +01:00
Adam Sutton
20f7e3c8e7 channel: provide a link in the channel grid to allow playback. 2013-08-22 16:51:53 +01:00
Adam Sutton
65c304fb9a channel: migrated channel_t to an idnode
Also since the channel name is no longer unique various other things have
had to be updated.
2013-08-22 15:15:08 +01:00
Adam Sutton
b9c1171a7d api: include access to the service mapper 2013-08-22 15:15:08 +01:00
Adam Sutton
d8973cba3e service_mapper: New service mapper code
This will now allow the mappings between services and channels to be created.
Some basic options have been created for the purpose of allowing certain
level of control of how the mapping is done.
2013-08-22 15:15:08 +01:00
Adam Sutton
ca35906be5 mpegts: debug statement fix 2013-08-22 15:15:08 +01:00
Adam Sutton
69aa247167 iptv: make it possibel for HTTP reception to be used in IPTV 2013-08-20 20:12:04 +01:00
Adam Sutton
1c2a0b05a1 iptv: updated to work with new API
This isn't fully tested and no doubt there are configuration issues to
be resolved. But I was able to receive an RTP stream using negge's server.
2013-08-17 19:50:52 +01:00
Adam Sutton
275845ca19 idnode: some additional debug 2013-08-17 19:50:18 +01:00
Adam Sutton
f73482605d linuxdvb: updated mux to use new idnode delete routine 2013-08-16 13:56:31 +01:00
Adam Sutton
ecfacc5aed api webui: simplified webui API by removing "args" field
The API code has also been updated to use the htsmsg auto conversion of
strings to map/list where required. Basic approach is check for list/map
first and if that fails fallback to string (if that's whats appropriate
for a mixed type field).
2013-08-16 13:49:25 +01:00
Adam Sutton
91cfb24bbb htsmsg: added automatic conversion from string to msg/list
This is done on request if the string can be JSON deserialized. This is
useful for the common API where the webui will be sending in serialized
strings and saves having the special case "args" field.

For things like HTSP, which deal directly in htsmsg, the fields should
already have been converted to the right formats etc...
2013-08-16 13:47:41 +01:00
Adam Sutton
f50bb028ab htsmsg: missed off the header updates for cleanup 2013-08-16 12:57:03 +01:00
Adam Sutton
a79782c9e7 htsmsg prop: some tidying up of type conversions
Really this lot could do with a proper tidy up, but probably for another day
and since this code is kinda shared with showtime I want to keep the changes
to a minimum until I've had a chance to discuss with Andreas.
2013-08-15 22:31:47 +01:00
Adam Sutton
8ae30388aa webui: some minor corrections to mpegts/idnode code 2013-08-15 12:30:19 +01:00
Adam Sutton
a63df85c64 webui: ensure there is output for successful ops 2013-08-15 12:29:53 +01:00
Adam Sutton
09abad751e idnode: fix bug in config saving, not calling callback properly 2013-08-15 12:29:33 +01:00
Adam Sutton
6924fbc032 Merge branch 'feature/dvb-rewrite' of github.com:adamsutton/tvheadend into feature/dvb-rewrite 2013-08-15 12:06:51 +01:00
Adam Sutton
43d50f2d9b webui: updated UI to new API calls. Still crap, but hey ho! 2013-08-15 12:06:00 +01:00
Adam Sutton
0218b3842a mpegts linuxdvb: some minor modifications to linuxdvb for better idnode API 2013-08-15 12:05:30 +01:00
Adam Sutton
dee72beaa5 api webui: migrated most of the new web API stuff to the new API subsystem 2013-08-15 12:05:04 +01:00
Adam Sutton
c368e32f0d idnode: add new deletion method to allow generic api method 2013-08-14 16:10:17 +01:00
Adam Sutton
f067952fd5 api: started to add idnode to the new API structure 2013-08-12 20:39:40 +01:00
John Törnblom
2b64995434 transcoding: fixed copy & paste error, making it impossible to disable transcoding from the webui once enabled. 2013-08-11 21:34:43 +02:00
John Törnblom
012ed060cb transcoding: added option to enable/disable transcoding from the webif 2013-08-11 21:20:32 +02:00
Adam Sutton
0efeda1727 api: started work on creating a common API framework
The idea is that this will become a common API framework for both HTTP
and HTSP. And anything else we might think off.

The only real constraint at the moment is both assume a JSON like input
format (for simplicity) since they currently have that in common.
2013-08-10 14:08:36 +01:00
Adam Sutton
0253651246 idnode: ensure nodes are properly saved on update 2013-08-09 23:13:34 +01:00
Adam Sutton
b96c432f69 mpegts linuxdvb: use new class lookup for satconf network lookup 2013-08-09 22:07:46 +01:00
Adam Sutton
2e13f5db01 idnode: added concept of class registration
this allows a class instance to be looked up by name, and in turn all
instances of that class can be found.
2013-08-09 22:07:45 +01:00
Adam Sutton
5cb2ea0768 idnode prop: tweak to get config to load in the right order. 2013-08-09 22:07:45 +01:00
Adam Sutton
6fc769e4ee linuxdvb: fix LNB frequency processing 2013-08-09 22:06:02 +01:00
Adam Sutton
22138a808d linuxdvb: some additional trace debug for S2 commands 2013-08-09 22:05:29 +01:00
Adam Sutton
28b204a905 mpegts idnode: updates to idnode for more resopsive list types
input network select is now dynamic and will update when network names are
changed
2013-08-07 15:27:53 +01:00
Adam Sutton
29f6d712e8 mpegts: added deleting of entire network 2013-08-06 23:11:03 +01:00
Adam Sutton
c2723dd7cf mpegts: added the ability to delete muxes 2013-08-06 22:23:24 +01:00
Adam Sutton
0d74894f33 debug: added a proper pthread_mutex ownership check in lock_assert()
this is conditional based on a test run from the configure script, as this
type of test is certainly not 100% cross platform compatible.

However its very useful to have a true check of lock ownership rather than
the rather arbitary check that "someone" holds the lock.
2013-08-06 19:57:07 +01:00
Adam Sutton
7a97b53665 channels: started work on a significant update to the way channels are managed
Channels to services will be N-N, to allow for some future options.

Also reworking the service mapper to get it working with the new code.
2013-08-06 19:56:54 +01:00
Dave Chapman
e84aceace2 Fix typo in epggrab online help - thanks to jasa for spotting. 2013-07-29 18:53:05 +01:00
John Törblom
7dd6a7beb8 transcoding: resync pts when audio frames are dropped. 2013-07-28 12:09:42 +02:00
Adam Sutton
5f8510d7a3 cwc: fix stupid mistake in key updating (only setting using one set) 2013-07-23 22:12:25 +01:00
John Törblom
12e542b7f4 html5video: detect errors on the source element (tested in ff & opera) 2013-07-21 22:02:23 +02:00
John Törblom
2d2f2dcff6 html5video: display messages describing the state of the video element. 2013-07-21 21:33:14 +02:00
John Törblom
74d424da00 html5video: moved index file into tvheadend 2013-07-21 21:31:04 +02:00
John Törblom
14708b4ef8 html5video: fixed root keyboard handler for devices with VK_ENTER other than the usual one. 2013-07-21 21:05:08 +02:00
John Törblom
7da6c46da9 transcoding: added missing eye candy for js client 2013-07-21 19:44:19 +02:00
John Törblom
824b0c0ca6 transcoding: redesigned the 10-foot javascript client.
navigation is done using a keyboard (no mouse scrolling or touch events
are supported). double clicking a channel (or pressing the enter key
while being selected) will tune to a channel. the channel list can be
hidden by pressing esc or backspace, and brought back by pressing enter.
page-up and page-down are also supported.
2013-07-21 14:58:32 +02:00
John Törblom
9259102090 transcoding: minor improvements to the javascript client 2013-07-19 16:31:53 +02:00