Commit Graph

8978 Commits

Author SHA1 Message Date
Thilo Graf
7bb3ecdc45 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Commit: 59ae2b52e9
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)
2016-11-17 21:53:06 +01:00
vanhofen
092b774d90 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: addd53b04e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)
2016-11-17 21:33:46 +01:00
TangoCash
63ec0ce1c3 fix moviebrowser detailsline
Origin commit data
------------------
Commit: d3fe4f5e0a
Author: TangoCash <eric@loxat.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)
2016-11-17 21:02:28 +01:00
Jacek Jendrzej
ae79dffff4 src/gui/moviebrowser/mb.cpp fix bookmark Menu
Origin commit data
------------------
Commit: 531ab8f818
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-17 (Thu, 17 Nov 2016)
2016-11-17 18:45:59 +01:00
vanhofen
8f7331b3b9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: 15f3b45175
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)
2016-11-17 10:22:05 +01:00
vanhofen
8d52f31f5e moviebrowser: resort movie info update menu
Origin commit data
------------------
Commit: de27a8a36c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- moviebrowser: resort movie info update menu
2016-11-17 10:19:53 +01:00
vanhofen
680ef07635 moviebrowser: resort movie info menu
Origin commit data
------------------
Commit: b43145af7c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- moviebrowser: resort movie info menu
2016-11-17 10:19:53 +01:00
vanhofen
ff4fb2d640 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: b2b789452a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)
2016-11-17 01:48:51 +01:00
vanhofen
44c7c41e61 moviebrowser: more clarity in bookmark menu
Origin commit data
------------------
Commit: 365f36df92
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- moviebrowser: more clarity in bookmark menu
2016-11-17 01:48:32 +01:00
vanhofen
d9b77ffd7b moviebrowser: use red key to remove all user bookmarks
Origin commit data
------------------
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
2016-11-17 01:48:32 +01:00
vanhofen
65b818f8aa locale: small changes in moviebrowser's bookmark locales
Origin commit data
------------------
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
2016-11-17 01:48:32 +01:00
vanhofen
0b6c5638ef moviebrowser: fix input for end mark and lastplay mark
Origin commit data
------------------
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
2016-11-17 01:48:32 +01:00
vanhofen
8ef59f67c7 timerlist: reduce flicker-effects while timerlist construction
Origin commit data
------------------
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
2016-11-17 00:18:09 +01:00
vanhofen
2a64edef4f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/nhttpd/Makefile.am


Origin commit data
------------------
Commit: 2eafc848f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)
2016-11-16 23:43:57 +01:00
TangoCash
e912e06163 Merge pull request #3 from neutrino-mp/master
move linux-dvb-headers out of the way for non-coolstream hardware

Origin commit data
------------------
Commit: 6128741ac2
Author: TangoCash <eric@loxat.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)
2016-11-16 21:43:53 +01:00
vanhofen
0b775a0c4f lcd4l: reduce console spam in module detection
Origin commit data
------------------
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
2016-11-16 20:43:28 +01:00
Stefan Seyfried
24d2ccfea6 make sure the private dvb headers are used on coolstream
Origin commit data
------------------
Commit: 045587f6ec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)
2016-11-16 20:30:14 +01:00
vanhofen
c29825efcc Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/timerd/timermanager.cpp


Origin commit data
------------------
Commit: 506f7acbdd
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)
2016-11-16 20:17:27 +01:00
TangoCash
51969fed8f timermanager: try fix autoAdjustToEPG for (repeating) timers
Origin commit data
------------------
Commit: 8cb0bef8e1
Author: TangoCash <eric@loxat.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)
2016-11-16 20:09:17 +01:00
Stefan Seyfried
58daceb3cf 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
------------------
Commit: 5e1efd222f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-16 (Sun, 16 Feb 2014)
2016-11-16 20:09:10 +01:00
Jacek Jendrzej
fad0d05a29 src/gui/channellist.cpp cancel paint_events thread on hide
Origin commit data
------------------
Commit: f957bbaa37
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-16 (Wed, 16 Nov 2016)
2016-11-16 19:29:19 +01:00
vanhofen
db78c06768 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 3a34b22e10
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)
2016-11-16 01:25:09 +01:00
vanhofen
bc96754e47 lcd4l: fix nevis build
Origin commit data
------------------
Commit: 1b50438766
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)

Origin message was:
------------------
- lcd4l: fix nevis build
2016-11-16 01:24:31 +01:00
vanhofen
906b52926d lcd4l: try to fix ModeCam detection; add some new features:
* Resolution detection
* AspectRatio detection
* Videotext detection
* DolbyDigital detection


Origin commit data
------------------
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
2016-11-16 00:55:52 +01:00
vanhofen
13da8f1513 record.cpp: avoid segfault in CRecordManager::getUseCI()
Origin commit data
------------------
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()
2016-11-16 00:49:45 +01:00
TangoCash
bc10689bd7 timermanager: disable autoAdjustToEPG for repeating timers
Origin commit data
------------------
Commit: b657ef8b3c
Author: TangoCash <eric@loxat.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)

Origin message was:
------------------
- timermanager: disable autoAdjustToEPG for repeating timers
2016-11-15 21:30:12 +01:00
Thilo Graf
ffa144101a Merge branch 'master' into pu/msgbox
Conflicts:
 	src/gui/followscreenings.cpp


Origin commit data
------------------
Commit: 2e8c700dd2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)

Origin message was:
------------------
Merge branch 'master' into pu/msgbox

Conflicts:
  	src/gui/followscreenings.cpp
2016-11-15 19:49:27 +01:00
Thilo Graf
3b78068800 CInfoViewer: add missing shadow for timescale
enableShadow() needs enum option.


Origin commit data
------------------
Commit: c8ad32b1e4
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)
2016-11-15 19:00:21 +01:00
vanhofen
c94723bf8e followscreenings: re-add possibility to show followscreenings in every case
This commit replaces formerly commit 69d0362c07


Origin commit data
------------------
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 69d0362c07
2016-11-15 00:05:02 +01:00
vanhofen
c0a3c0f5e3 Revert "Recording Menu: Add option "Always show timer pick list""
This reverts commit 69d0362c07.


Origin commit data
------------------
Commit: 226ec2c57d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)
2016-11-14 23:05:36 +01:00
vanhofen
7f4aad9b4a Revert "- deutsch.locale: minor changes in menu.hint_record_tevents"
This reverts commit b00f976d54.


Origin commit data
------------------
Commit: 23cbcbcdb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)
2016-11-14 23:05:20 +01:00
vanhofen
b0d3e0f4ee Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: ca86828ff1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)
2016-11-14 23:02:33 +01:00
vanhofen
66639b877f followscreenings: allow to turn off followscreenings list
Origin commit data
------------------
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
2016-11-14 22:58:43 +01:00
Thilo Graf
561957223c Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Commit: aa40d88300
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)
2016-11-14 20:38:01 +01:00
Jacek Jendrzej
4dbaafb40d src/gui/widget/menue.cpp try fix hide info_box (in channellist)
Origin commit data
------------------
Commit: 99c57d3075
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-14 (Mon, 14 Nov 2016)
2016-11-14 19:27:09 +01:00
vanhofen
a874ef4707 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 028049500d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)
2016-11-14 10:43:44 +01:00
vanhofen
c6851f5bbd moviebrowser: add PREVPLAYDATE/RECORDDATE sort buttons to footer
Origin commit data
------------------
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
2016-11-14 10:09:34 +01:00
vanhofen
08861d56ab Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 73d3abcdef
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)
2016-11-13 20:25:22 +01:00
Thilo Graf
ce278342b5 CMovieBrowser: unfify and reduce flicker effects of connect line
Connectline object can handle hide behavior itself.


Origin commit data
------------------
Commit: 5dc6255b43
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)
2016-11-13 16:44:08 +01:00
Thilo Graf
8068350e02 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Commit: b4f94a8964
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)
2016-11-13 16:04:39 +01:00
vanhofen
c84c215ac5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 3e818b1e3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)
2016-11-13 01:48:39 +01:00
Stefan Seyfried
d9758e5c13 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
------------------
Commit: 5948f045aa
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
2016-11-13 01:44:59 +01:00
Stefan Seyfried
bff69630e4 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
------------------
Commit: 7154f36258
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
2016-11-13 01:44:45 +01:00
Stefan Seyfried
95e8550dad 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
------------------
Commit: 0531618643
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
2016-11-13 01:43:55 +01:00
Stefan Seyfried
7e35a8e7df neutrinoyparser: fix string literal warning with newer gcc
Origin commit data
------------------
Commit: ee5f73c64d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
2016-11-13 01:43:37 +01:00
Thilo Graf
d9b71722a5 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Commit: 5394f4b2e1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
2016-11-12 22:31:11 +01:00
vanhofen
b21fed6d25 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: e40d4c44b5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
2016-11-12 22:05:01 +01:00
vanhofen
af321e4411 moviebrowser: limit cover to one third of m_cBoxFrameInfo1 width
Origin commit data
------------------
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
2016-11-12 22:03:05 +01:00
vanhofen
9533a9ba4e cc_item_picture: reset keep_aspect variables after use
Origin commit data
------------------
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
2016-11-12 22:00:12 +01:00
vanhofen
b3b0c90b2c moviebrowser: fix MB_INFO_SPACER's empty content
Origin commit data
------------------
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
2016-11-12 20:40:28 +01:00