Commit Graph

9698 Commits

Author SHA1 Message Date
vanhofen
b0f13d51ce Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/sectionsdclient/Makefile.am
	lib/timerdclient/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 93fdd4aa79
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)



------------------
This commit was generated by Migit
2016-11-17 09:52:47 +01:00
vanhofen
f4c831795c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b2b789452a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 01:48:51 +01:00
vanhofen
04d25db043 moviebrowser: more clarity in bookmark menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 365f36df92
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- moviebrowser: more clarity in bookmark menu

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 01:48:32 +01:00
vanhofen
ac2c9e2822 moviebrowser: use red key to remove all user bookmarks
Origin commit data
------------------
Branch: ni/coolstream
Commit: d171038a6e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- moviebrowser: use red key to remove all user bookmarks

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 01:48:32 +01:00
vanhofen
9d65df3050 locale: small changes in moviebrowser's bookmark locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3839c7f5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- locale: small changes in moviebrowser's bookmark locales

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 01:48:32 +01:00
vanhofen
48ead0f169 moviebrowser: fix input for end mark and lastplay mark
Origin commit data
------------------
Branch: ni/coolstream
Commit: 86c3655e96
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- moviebrowser: fix input for end mark and lastplay mark

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 01:48:32 +01:00
vanhofen
08cf7677c4 timerlist: reduce flicker-effects while timerlist construction
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0ce3513d78
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- timerlist: reduce flicker-effects while timerlist construction

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 00:18:09 +01:00
vanhofen
70d2c535ae Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/nhttpd/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2eafc848f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)



------------------
This commit was generated by Migit
2016-11-16 23:43:57 +01:00
TangoCash
e8f4b736cc Merge pull request #3 from neutrino-mp/master
move linux-dvb-headers out of the way for non-coolstream hardware

Origin commit data
------------------
Branch: ni/coolstream
Commit: 6128741ac2
Author: TangoCash <eric@loxat.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)



------------------
This commit was generated by Migit
2016-11-16 21:43:53 +01:00
vanhofen
38520024ef lcd4l: reduce console spam in module detection
Origin commit data
------------------
Branch: ni/coolstream
Commit: 90215fc6ee
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)

Origin message was:
------------------
- lcd4l: reduce console spam in module detection

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-16 20:43:28 +01:00
Stefan Seyfried
0f5446036c make sure the private dvb headers are used on coolstream
Origin commit data
------------------
Branch: ni/coolstream
Commit: 045587f6ec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-16 20:30:14 +01:00
vanhofen
7ecbfdf325 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/timerd/timermanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 506f7acbdd
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)



------------------
This commit was generated by Migit
2016-11-16 20:17:27 +01:00
TangoCash
b74a76d7a5 timermanager: try fix autoAdjustToEPG for (repeating) timers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8cb0bef8e1
Author: TangoCash <eric@loxat.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-16 20:09:17 +01:00
Stefan Seyfried
f1343bb815 disable private copy of the linux dvb headers
Move them into subdir private so that they are no longer used by
default. They still can be used by extending the include path.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e1efd222f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-16 (Sun, 16 Feb 2014)



------------------
This commit was generated by Migit
2016-11-16 20:09:10 +01:00
Jacek Jendrzej
70a6056d49 src/gui/channellist.cpp cancel paint_events thread on hide
Origin commit data
------------------
Branch: ni/coolstream
Commit: f957bbaa37
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-16 (Wed, 16 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-16 19:29:19 +01:00
vanhofen
3e693c9047 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a34b22e10
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-16 01:25:09 +01:00
vanhofen
e413239187 lcd4l: fix nevis build
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b50438766
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)

Origin message was:
------------------
- lcd4l: fix nevis build

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-16 01:24:31 +01:00
vanhofen
179db9f1b4 lcd4l: try to fix ModeCam detection; add some new features:
* Resolution detection
* AspectRatio detection
* Videotext detection
* DolbyDigital detection


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f10060211
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)

Origin message was:
------------------
- lcd4l: try to fix ModeCam detection; add some new features:

* Resolution detection
* AspectRatio detection
* Videotext detection
* DolbyDigital detection


------------------
This commit was generated by Migit
2016-11-16 00:55:52 +01:00
vanhofen
c72aac7588 record.cpp: avoid segfault in CRecordManager::getUseCI()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 79c12ed7ad
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)

Origin message was:
------------------
- record.cpp: avoid segfault in CRecordManager::getUseCI()

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-16 00:49:45 +01:00
TangoCash
874a27d7b2 timermanager: disable autoAdjustToEPG for repeating timers
Origin commit data
------------------
Branch: ni/coolstream
Commit: b657ef8b3c
Author: TangoCash <eric@loxat.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)

Origin message was:
------------------
- timermanager: disable autoAdjustToEPG for repeating timers

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-15 21:30:12 +01:00
vanhofen
aaf3946608 followscreenings: re-add possibility to show followscreenings in every case
This commit replaces formerly commit 5b4e8952fa


Origin commit data
------------------
Branch: ni/coolstream
Commit: b7838210a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)

Origin message was:
------------------
- followscreenings: re-add possibility to show followscreenings in every case

This commit replaces formerly commit 5b4e8952fa


------------------
This commit was generated by Migit
2016-11-15 00:05:02 +01:00
vanhofen
ff9095e66b Revert "Recording Menu: Add option "Always show timer pick list""
This reverts commit 5b4e8952fa.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 226ec2c57d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)



------------------
This commit was generated by Migit
2016-11-14 23:05:36 +01:00
vanhofen
9cab869e17 Revert "- deutsch.locale: minor changes in menu.hint_record_tevents"
This reverts commit fa63ad16f7.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 23cbcbcdb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)



------------------
This commit was generated by Migit
2016-11-14 23:05:20 +01:00
vanhofen
06ab0e9f73 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca86828ff1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-14 23:02:33 +01:00
vanhofen
715af20490 followscreenings: allow to turn off followscreenings list
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6cb1d206f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)

Origin message was:
------------------
- followscreenings: allow to turn off followscreenings list

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-14 22:58:43 +01:00
Jacek Jendrzej
5e16302783 src/gui/widget/menue.cpp try fix hide info_box (in channellist)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 99c57d3075
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-14 (Mon, 14 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-14 19:27:09 +01:00
vanhofen
83a0611b63 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 028049500d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-14 10:43:44 +01:00
vanhofen
a6a70301f0 moviebrowser: add PREVPLAYDATE/RECORDDATE sort buttons to footer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2f23aaedea
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)

Origin message was:
------------------
- moviebrowser: add PREVPLAYDATE/RECORDDATE sort buttons to footer

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-14 10:09:34 +01:00
vanhofen
23fedcd08a Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 66a3a40db2
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-14 08:23:53 +01:00
vanhofen
69e17e4b10 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 73d3abcdef
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-13 20:25:22 +01:00
Thilo Graf
fd5bab0236 CMovieBrowser: unfify and reduce flicker effects of connect line
Connectline object can handle hide behavior itself.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5dc6255b43
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)



------------------
This commit was generated by Migit
2016-11-13 16:44:08 +01:00
vanhofen
531b7b2cc0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3e818b1e3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-13 01:48:39 +01:00
Stefan Seyfried
da356003f8 zapit: fix "comparison is always false" warnings
demux Start() Stop() and pesFilter() are bool, so comparing < 0 really
does not make sense.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5948f045aa
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)



------------------
This commit was generated by Migit
2016-11-13 01:44:59 +01:00
Stefan Seyfried
9da0bb35b9 driver: use newer ffmpeg API
Reduce the "deprecated function" warnings a bit when compiling against
recent ffmpeg releases. Just the drop-in-replacement "av_packet_unref"
which works with both old and new ffmpeg versions.
The other stuff needs rewrites which are not compatible with all ffmpeg
releases :-(


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7154f36258
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)



------------------
This commit was generated by Migit
2016-11-13 01:44:45 +01:00
Stefan Seyfried
579d81b2f2 timermanager: fix -Waddress warning with newer gcc
The address of Events (wich is checked against NULL) can never be NULL,
because Events is passed by reference.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0531618643
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)



------------------
This commit was generated by Migit
2016-11-13 01:43:55 +01:00
Stefan Seyfried
b61bc1aa90 neutrinoyparser: fix string literal warning with newer gcc
Origin commit data
------------------
Branch: ni/coolstream
Commit: ee5f73c64d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-13 01:43:37 +01:00
vanhofen
dfbcb302b9 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2a7ec1a59f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-13 01:35:07 +01:00
vanhofen
30bd7aa4cc Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: cb9b4b1d7e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)



------------------
This commit was generated by Migit
2016-11-13 01:34:20 +01:00
Stefan Seyfried
8f423715c2 zapit: fix "comparison is always false" warnings
demux Start() Stop() and pesFilter() are bool, so comparing < 0 really
does not make sense.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 71457a0b17
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)



------------------
This commit was generated by Migit
2016-11-12 22:19:33 +01:00
Stefan Seyfried
8a0cebc9fc driver: use newer ffmpeg API
Reduce the "deprecated function" warnings a bit when compiling against
recent ffmpeg releases. Just the drop-in-replacement "av_packet_unref"
which works with both old and new ffmpeg versions.
The other stuff needs rewrites which are not compatible with all ffmpeg
releases :-(


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a400c909a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)



------------------
This commit was generated by Migit
2016-11-12 22:16:42 +01:00
vanhofen
6281d1f066 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e40d4c44b5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-12 22:05:01 +01:00
vanhofen
9bd690019e moviebrowser: limit cover to one third of m_cBoxFrameInfo1 width
Origin commit data
------------------
Branch: ni/coolstream
Commit: a47a5cd422
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)

Origin message was:
------------------
- moviebrowser: limit cover to one third of m_cBoxFrameInfo1 width

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-12 22:03:05 +01:00
vanhofen
0b245e051c cc_item_picture: reset keep_aspect variables after use
Origin commit data
------------------
Branch: ni/coolstream
Commit: 73b97ecd4d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)

Origin message was:
------------------
- cc_item_picture: reset keep_aspect variables after use

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-12 22:00:12 +01:00
vanhofen
569ce7dbbc moviebrowser: fix MB_INFO_SPACER's empty content
Origin commit data
------------------
Branch: ni/coolstream
Commit: da604fb9a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)

Origin message was:
------------------
- moviebrowser: fix MB_INFO_SPACER's empty content

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-12 20:40:28 +01:00
Stefan Seyfried
ce4c21fab3 timermanager: fix -Waddress warning with newer gcc
The address of Events (wich is checked against NULL) can never be NULL,
because Events is passed by reference.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bd8696a84
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)



------------------
This commit was generated by Migit
2016-11-12 18:25:06 +01:00
Stefan Seyfried
512e039fb6 neutrinoyparser: fix string literal warning with newer gcc
Origin commit data
------------------
Branch: ni/coolstream
Commit: bc06052985
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-12 18:24:14 +01:00
Stefan Seyfried
d8d4d753a5 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c92d112d0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-12 18:06:26 +01:00
vanhofen
caff50b53e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 184e6325c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-11 16:39:18 +01:00
vanhofen
ebec9b29c6 moviebrowser: use own defaults for moviebrowser's view
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98ba673e19
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- moviebrowser: use own defaults for moviebrowser's view

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-11 16:38:24 +01:00
vanhofen
790508f5e0 moviebrowser: reset m_pcInfo1 box to default height, ...
when turning m_settings.browserAdditional off


Origin commit data
------------------
Branch: ni/coolstream
Commit: ad7947d11a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- moviebrowser: reset m_pcInfo1 box to default height, ...

when turning m_settings.browserAdditional off


------------------
This commit was generated by Migit
2016-11-11 16:35:50 +01:00