Commit Graph

409 Commits

Author SHA1 Message Date
Jacek Jendrzej
a91765a685 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ad4a0e6cc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-02 (Mon, 02 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-02 13:56:25 +02:00
Stefan Seyfried
ef71d00d7f remove "using namespace std" from header files
"using namespace std" in headers is considered bad practice, so move it
either into the respective cpp files or (for files which have lots of
other std::xxx usage anyway) just write it out explicitly.
Looking at the headers and the affected cpp files, one can actually see
why it is bad practice, as it's spreading very far ;-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d9139054a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 13:43:57 +02:00
Jacek Jendrzej
43eeb40008 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4fc73acffc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-29 (Fri, 29 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-29 10:49:27 +02:00
vanhofen
3df3b9eafe rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
Origin commit data
------------------
Branch: ni/coolstream
Commit: 99cc7f850a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now

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

------------------
This commit was generated by Migit
2017-09-29 10:34:23 +02:00
Michael Liebmann
106e64707d Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: abfb02aa47
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-21 (Thu, 21 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-21 09:07:15 +02:00
vanhofen
bdbe2f5ab8 add and use FRAME_WIDTH defines; ...
replace other fixed frame widths with OFFSET defines

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ee3e54741
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-20 (Wed, 20 Sep 2017)

Origin message was:
------------------
- add and use FRAME_WIDTH defines; ...

replace other fixed frame widths with OFFSET defines

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-09-20 21:29:53 +02:00
Jacek Jendrzej
e36f298e5d Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6be63f736c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-23 13:10:49 +02:00
Jacek Jendrzej
d7856dc0ce some inits and never read var
Origin commit data
------------------
Branch: ni/coolstream
Commit: ba600f0e5c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-23 12:58:26 +02:00
Jacek Jendrzej
c592fe60d6 some inits warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: c99486520e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-21 14:42:24 +02:00
Jacek Jendrzej
c751391c58 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: ed416416cd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-14 (Mon, 14 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-14 16:26:49 +02:00
Thilo Graf
cc78c40678 Revert "infoviewer.cpp: handle timeout of mode upnp like mode ts"
This reverts commit 6f7b583b59.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 40fee47523
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)



------------------
This commit was generated by Migit
2017-08-12 11:27:55 +02:00
Jacek Jendrzej
6b67ced603 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 61f1c51d50
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-12 (Sat, 12 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-12 10:02:55 +02:00
GetAway
6f7b583b59 infoviewer.cpp: handle timeout of mode upnp like mode ts
Signed-off-by: Thilo Graf <dbt@novatux.de>

Infobar timeout in the upnp mode is fixed to 6 sec.
Because it's acting about streams, so we should use the same timeout
such as with playing a movie file.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0225b043db
Author: GetAway <get-away@t-online.de>
Date: 2017-08-11 (Fri, 11 Aug 2017)



------------------
This commit was generated by Migit
2017-08-11 20:14:49 +02:00
Jacek Jendrzej
0b9ac652bf Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca83324763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-07 16:20:47 +02:00
Stefan Seyfried
a5cbcf84af Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: abec1c311b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-04 19:32:30 +01:00
Michael Liebmann
264bdc3a86 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c3b5dcd93
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-02 (Thu, 02 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-02 23:38:19 +01:00
TangoCash
d10dda73e1 fix blinking clock in some modes (thx dbo)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 16537620a6
Author: TangoCash <eric@loxat.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-01 18:16:09 +01:00
Michael Liebmann
7329fb6294 CInfoViewer::showTitle: Add parameter forcePaintButtonBar
Origin commit data
------------------
Branch: ni/coolstream
Commit: cc05d272f2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-28 15:04:09 +01:00
Stefan Seyfried
86f609bc17 replace fontrenderer.h include with forward declaration
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2303d94300
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)



------------------
This commit was generated by Migit
2017-02-07 17:23:42 +01:00
Stefan Seyfried
7e25a8dace replace fontrenderer.h include with forward declaration
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9082ddf287
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)



------------------
This commit was generated by Migit
2017-02-05 13:37:53 +01:00
Stefan Seyfried
b887345480 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7497722646
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-01 (Wed, 01 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-01 22:03:40 +01:00
Michael Liebmann
1d472ccf02 CInfoViewer: Use flag Font::FULLBG for RenderString()
dependent on g_settings.theme.infobar_gradient_*


Origin commit data
------------------
Branch: ni/coolstream
Commit: a7ef709e55
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-25 (Wed, 25 Jan 2017)



------------------
This commit was generated by Migit
2017-01-31 16:36:42 +01:00
Thilo Graf
1eb76c353d CInfoViewer: enable kill text items after killed title
This causes repaint text on next view of infobar.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0de9490326
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-23 (Mon, 23 Jan 2017)



------------------
This commit was generated by Migit
2017-01-31 16:36:42 +01:00
Thilo Graf
4b52331066 Experimental try to rework isPainted()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 26eb4d079b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-19 (Thu, 19 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-31 16:36:41 +01:00
Stefan Seyfried
776aea7c95 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-04 18:02:51 +01:00
Thilo Graf
4d952e9f00 CInfoViewer: add missing shadow for timescale
enableShadow() needs enum option.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c8ad32b1e4
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)



------------------
This commit was generated by Migit
2016-11-15 19:00:21 +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
Thilo Graf
0018c2b158 Merge branch 'master' into pu/msgbox
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3efaac5725
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)



------------------
This commit was generated by Migit
2016-11-10 10:27:22 +01:00
vanhofen
92f79c9f15 infoviewer: use small vertical offset around channellogo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 21b2fbd03c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- infoviewer: use small vertical offset around channellogo

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

------------------
This commit was generated by Migit
2016-11-08 22:02:57 +01:00
Thilo Graf
8b6a60f100 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ab9bf2ffa6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-02 21:05:36 +01:00
Jacek Jendrzej
8412a9b608 fix possible segfault and negative height
Origin commit data
------------------
Branch: ni/coolstream
Commit: b8849d53b5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-10-31 (Mon, 31 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-31 15:53:29 +01:00
Thilo Graf
8ca8486085 Shadow: try to optimize shadow areas
* cleanup inner part of box on round corners, frames considered
* adopt implementations in some gui classes
* some debug lines removed
* test menu adopted
* try to fix corner caluculation to avoid transparent holes


Origin commit data
------------------
Branch: ni/coolstream
Commit: a17d61de8c
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-30 (Tue, 30 Aug 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:25 +02:00
Stefan Seyfried
3f75ef5f47 Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-22 11:37:40 +02:00
vanhofen
bb756163b1 rename customcolor.h -> color_custom.h; reduce unneeded inludes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 104d21e784
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename customcolor.h -> color_custom.h; reduce unneeded inludes

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

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
b59278067e rename SHADOW_OFFSET -> OFFSET_SHADOW
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d450c60d3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename SHADOW_OFFSET -> OFFSET_SHADOW

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

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
b9174571ca infoviewer: align progressbar/sigbox code to latest changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: d77858683b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- infoviewer: align progressbar/sigbox code to latest changes

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

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
Thilo Graf
74e7a6901f CInfoViewer: allow fe change without new sigbox object
Origin commit data
------------------
Branch: ni/coolstream
Commit: ad189f180d
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-28 (Wed, 28 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-28 21:12:32 +02:00
vanhofen
58b62b0445 add listModeKey() function to simplify these calls
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2911e638c7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- add listModeKey() function to simplify these calls

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

------------------
This commit was generated by Migit
2016-09-09 10:42:46 +02:00
vanhofen
1c1c5a05f3 colors: some internal renamings
* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable


Origin commit data
------------------
Branch: ni/coolstream
Commit: bc39d1e14e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-14 (Sun, 14 Aug 2016)

Origin message was:
------------------
- colors: some internal renamings

* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable


------------------
This commit was generated by Migit
2016-08-14 21:55:18 +02:00
vanhofen
97b471ebcf minor code cosmetics; no binary changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: adb48f523d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)

Origin message was:
------------------
- minor code cosmetics; no binary changes

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

------------------
This commit was generated by Migit
2016-08-02 11:36:29 +02:00
TangoCash
d4cb71e80b adding Live-TV look alike EPG-Infos in Movieplayer incl. TMDB
Origin commit data
------------------
Branch: ni/coolstream
Commit: 44ca60eb17
Author: TangoCash <eric@loxat.de>
Date: 2016-03-07 (Mon, 07 Mar 2016)


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

------------------
This commit was generated by Migit
2016-07-28 15:02:20 +02:00
Jacek Jendrzej
beae26be1d some never read compil warning fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d9fbd5378
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-24 (Sun, 24 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-24 17:18:37 +02:00
Thilo Graf
d9cf02eef5 CInfoViewer: remove clock object interval allocation
Already allocated with default value (1s) by constructor and
also not required, because internal clock timer is not used here.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 74caa1a949
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-10 (Sun, 10 Apr 2016)



------------------
This commit was generated by Migit
2016-04-10 14:12:03 +02:00
[CST] Focus
f02dae27c7 neutrino: add webtv channel list mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 302642cee7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-23 (Wed, 23 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-23 16:36:00 +03:00
defans
da3b79ea70 infoviewer: don't handle volume keys in movieplayer
Origin commit data
------------------
Branch: ni/coolstream
Commit: de490421e3
Author: defans <defans@bluepeercrew.us>
Date: 2016-03-10 (Thu, 10 Mar 2016)

Origin message was:
------------------
- infoviewer: don't handle volume keys in movieplayer

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

------------------
This commit was generated by Migit
2016-03-10 22:23:45 +01:00
vanhofen
5ef7eb27a1 infoviewer: we don't have starttimes in livestream mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a12d3ef8d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)

Origin message was:
------------------
- infoviewer: we don't have starttimes in livestream mode

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

------------------
This commit was generated by Migit
2016-03-03 09:46:42 +01:00
Michael Liebmann
f21a74ff57 Display of livestream infos in IV if no EPG data available
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb1826ebee
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-03-03 (Thu, 03 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-03 09:46:42 +01:00
Thilo Graf
112207f338 Infoclock: unify handling in some classes with singleton
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59d9b7068e
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)


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

------------------
This commit was generated by Migit
2016-02-29 08:05:05 +01:00
Thilo Graf
7428d84357 CInfoViewer: use binary operators for zap mode statements
Origin commit data
------------------
Branch: ni/coolstream
Commit: f75402e571
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-19 (Fri, 19 Feb 2016)


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

------------------
This commit was generated by Migit
2016-02-24 15:06:15 +01:00
vanhofen
4debe1d47b infoviewer: fix display of small rec/ts box; rename most variables
Origin commit data
------------------
Branch: ni/coolstream
Commit: 219ce9c8ed
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-18 (Thu, 18 Feb 2016)

Origin message was:
------------------
- infoviewer: fix display of small rec/ts box; rename most variables

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

------------------
This commit was generated by Migit
2016-02-18 21:38:10 +01:00