Commit Graph

416 Commits

Author SHA1 Message Date
vanhofen
8b3bb7edd2 infoviewer: fix radiotext icon for webradio
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 953793f763
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-09 (Thu, 09 Nov 2017)

Origin message was:
------------------
- infoviewer: fix radiotext icon for webradio

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-16 19:43:26 +01:00
TangoCash
eb30e0f2af infoviewer: fix FIXME comment in 96ef0a09e7
Origin commit data
------------------
Commit: e2770e7731
Author: TangoCash <eric@loxat.de>
Date: 2017-11-07 (Tue, 07 Nov 2017)

Origin message was:
------------------
- infoviewer: fix FIXME comment in 96ef0a09e7
2017-11-16 19:43:26 +01:00
vanhofen
d06b94f3d4 infoviewer: try to get meta data from stream when epg is empty
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: e31eec2d06
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-05 (Sun, 05 Nov 2017)

Origin message was:
------------------
- infoviewer: try to get meta data from stream when epg is empty

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-16 19:43:26 +01:00
vanhofen
830e5736ae infoviewer: try to fix showLivestreamInfo() for audiostreams
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: ab39aa544c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-04 (Sat, 04 Nov 2017)

Origin message was:
------------------
- infoviewer: try to fix showLivestreamInfo() for audiostreams

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-16 19:43:26 +01:00
vanhofen
d88857a07f infoviewer: fix timeout for new mode_webradio
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 14c2a27a62
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- infoviewer: fix timeout for new mode_webradio

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-16 19:43:26 +01:00
vanhofen
ab30c38463 rename IS_WEBTV => IS_WEBCHAN
Conflicts:
	src/zapit/src/capmt.cpp

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


Origin commit data
------------------
Commit: 740fd3ac0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename IS_WEBTV => IS_WEBCHAN

 Conflicts:
	src/zapit/src/capmt.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-16 19:43:26 +01:00
vanhofen
ba98bb87f5 add webradio; first steps
Conflicts:
	data/Makefile.am
	data/scripts/backup.sh
	src/neutrino.cpp
	src/zapit/include/zapit/zapit.h

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


Origin commit data
------------------
Commit: 3fd544737a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- add webradio; first steps

 Conflicts:
	data/Makefile.am
	data/scripts/backup.sh
	src/neutrino.cpp
	src/zapit/include/zapit/zapit.h

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-16 19:43:26 +01:00
Jacek Jendrzej
f4c51e829b Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 7ad4a0e6cc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-02 (Mon, 02 Oct 2017)
2017-10-02 13:56:25 +02:00
Stefan Seyfried
c9d4fdd9cc 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
------------------
Commit: 0d9139054a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)
2017-10-02 13:43:57 +02:00
Jacek Jendrzej
384b18ad8e Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 4fc73acffc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-29 (Fri, 29 Sep 2017)
2017-09-29 10:49:27 +02:00
vanhofen
20451a9be6 rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
Origin commit data
------------------
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
2017-09-29 10:34:23 +02:00
Michael Liebmann
e137542efe Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: abfb02aa47
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-21 (Thu, 21 Sep 2017)
2017-09-21 09:07:15 +02:00
vanhofen
402c567fe7 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
------------------
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>
2017-09-20 21:29:53 +02:00
Jacek Jendrzej
c066cf6bf2 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 6be63f736c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)
2017-08-23 13:10:49 +02:00
Jacek Jendrzej
96edd2f2c1 some inits and never read var
Origin commit data
------------------
Commit: ba600f0e5c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)
2017-08-23 12:58:26 +02:00
Jacek Jendrzej
973b9ebe54 some inits warnings
Origin commit data
------------------
Commit: c99486520e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)
2017-08-21 14:42:24 +02:00
Jacek Jendrzej
6824f87be8 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: ed416416cd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-14 (Mon, 14 Aug 2017)
2017-08-14 16:26:49 +02:00
Thilo Graf
bb3910fc95 Revert "infoviewer.cpp: handle timeout of mode upnp like mode ts"
This reverts commit 673305f913.


Origin commit data
------------------
Commit: 40fee47523
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)
2017-08-12 11:27:55 +02:00
Jacek Jendrzej
ee0fb81ab4 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 61f1c51d50
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-12 (Sat, 12 Aug 2017)
2017-08-12 10:02:55 +02:00
GetAway
673305f913 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
------------------
Commit: 0225b043db
Author: GetAway <get-away@t-online.de>
Date: 2017-08-11 (Fri, 11 Aug 2017)
2017-08-11 20:14:49 +02:00
Jacek Jendrzej
4643ac3f51 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: ca83324763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
2017-06-07 16:20:47 +02:00
Stefan Seyfried
b93f4e419a Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: abec1c311b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)
2017-03-04 19:32:30 +01:00
Michael Liebmann
3a8adb94f0 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 6c3b5dcd93
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-02 (Thu, 02 Mar 2017)
2017-03-02 23:38:19 +01:00
TangoCash
900748ae27 fix blinking clock in some modes (thx dbo)
Origin commit data
------------------
Commit: 16537620a6
Author: TangoCash <eric@loxat.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
2017-03-01 18:16:09 +01:00
Michael Liebmann
f74929b4ba CInfoViewer::showTitle: Add parameter forcePaintButtonBar
Origin commit data
------------------
Commit: cc05d272f2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)
2017-02-28 15:04:09 +01:00
Stefan Seyfried
f6d5a96838 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
------------------
Commit: 2303d94300
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
84b16a8a24 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
------------------
Commit: 9082ddf287
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-05 13:37:53 +01:00
Stefan Seyfried
f9341822cf Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: 7497722646
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-01 (Wed, 01 Feb 2017)
2017-02-01 22:03:40 +01:00
Michael Liebmann
0146fd687e CInfoViewer: Use flag Font::FULLBG for RenderString()
dependent on g_settings.theme.infobar_gradient_*


Origin commit data
------------------
Commit: a7ef709e55
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-25 (Wed, 25 Jan 2017)
2017-01-31 16:36:42 +01:00
Thilo Graf
38357598cf CInfoViewer: enable kill text items after killed title
This causes repaint text on next view of infobar.


Origin commit data
------------------
Commit: 0de9490326
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-23 (Mon, 23 Jan 2017)
2017-01-31 16:36:42 +01:00
Thilo Graf
2748077074 Experimental try to rework isPainted()
Origin commit data
------------------
Commit: 26eb4d079b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-19 (Thu, 19 Jan 2017)
2017-01-31 16:36:41 +01:00
Stefan Seyfried
eab48f2ed9 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)
2016-12-04 18:02:51 +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
Stefan Seyfried
2e7aa7be4a Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: 2c92d112d0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
2016-11-12 18:06:26 +01:00
Thilo Graf
d34322b568 Merge branch 'master' into pu/msgbox
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: 3efaac5725
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)
2016-11-10 10:27:22 +01:00
vanhofen
026ca785fc infoviewer: use small vertical offset around channellogo
Origin commit data
------------------
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
2016-11-08 22:02:57 +01:00
Thilo Graf
57786208c5 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Commit: ab9bf2ffa6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)
2016-11-02 21:05:36 +01:00
Jacek Jendrzej
4a56be854e fix possible segfault and negative height
Origin commit data
------------------
Commit: b8849d53b5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-10-31 (Mon, 31 Oct 2016)
2016-10-31 15:53:29 +01:00
Thilo Graf
4300865679 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
------------------
Commit: a17d61de8c
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-30 (Tue, 30 Aug 2016)
2016-10-24 10:31:25 +02:00
Stefan Seyfried
54189f271a Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
2016-10-22 11:37:40 +02:00
vanhofen
892603fe68 rename customcolor.h -> color_custom.h; reduce unneeded inludes
Origin commit data
------------------
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
2016-10-10 14:19:55 +02:00
vanhofen
f21851aec0 rename SHADOW_OFFSET -> OFFSET_SHADOW
Origin commit data
------------------
Commit: 5d450c60d3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename SHADOW_OFFSET -> OFFSET_SHADOW
2016-10-10 14:19:55 +02:00
vanhofen
8419c90eb4 infoviewer: align progressbar/sigbox code to latest changes
Origin commit data
------------------
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
2016-10-10 14:19:55 +02:00
Thilo Graf
5a54632b1b CInfoViewer: allow fe change without new sigbox object
Origin commit data
------------------
Commit: ad189f180d
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-28 (Wed, 28 Sep 2016)
2016-09-28 21:12:32 +02:00
vanhofen
fa2686a90e add listModeKey() function to simplify these calls
Origin commit data
------------------
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
2016-09-09 10:42:46 +02:00
vanhofen
78230ead13 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
------------------
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
2016-08-14 21:55:18 +02:00
vanhofen
7df47f3cae minor code cosmetics; no binary changes
Origin commit data
------------------
Commit: adb48f523d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)

Origin message was:
------------------
- minor code cosmetics; no binary changes
2016-08-02 11:36:29 +02:00
TangoCash
9d86befe20 adding Live-TV look alike EPG-Infos in Movieplayer incl. TMDB
Origin commit data
------------------
Commit: 44ca60eb17
Author: TangoCash <eric@loxat.de>
Date: 2016-03-07 (Mon, 07 Mar 2016)
2016-07-28 15:02:20 +02:00
Jacek Jendrzej
1486711d16 some never read compil warning fixes
Origin commit data
------------------
Commit: 0d9fbd5378
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-24 (Sun, 24 Apr 2016)
2016-04-24 17:18:37 +02:00
Thilo Graf
002c435e15 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
------------------
Commit: 74caa1a949
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-10 (Sun, 10 Apr 2016)
2016-04-10 14:12:03 +02:00