Commit Graph

490 Commits

Author SHA1 Message Date
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
af8fe3ebc6 Merge branch 'ni/mp' into ni/cst-next
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
2016-08-26 19:13:47 +02:00
Michael Liebmann
dd5f370fcc analogclock: Save background for using transparent clock images
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d04ea65f4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-22 (Mon, 22 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-22 16:37:04 +02:00
Michael Liebmann
2c4ccf9555 Merge branch 'cst-next' into nmp-cst-next
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
2016-08-19 17:40:48 +02:00
vanhofen
1a26af0576 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/epgview.cpp


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



------------------
This commit was generated by Migit
2016-08-14 22:05:07 +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
6f9255e0c4 allow tmdb in moviebrowser/movieplayer to satisfy Knicko ;)
Origin commit data
------------------
Branch: ni/coolstream
Commit: a66b6677ab
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-03 (Wed, 03 Aug 2016)

Origin message was:
------------------
- allow tmdb in moviebrowser/movieplayer to satisfy Knicko ;)

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

------------------
This commit was generated by Migit
2016-08-03 00:53:41 +02:00
vanhofen
45df54a682 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/epgview.cpp
	src/gui/infoviewer.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp


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



------------------
This commit was generated by Migit
2016-08-02 11:43:59 +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
vanhofen
1d14f8630a add/use //NI tags instead of /*NI*/; just cosmetic changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7927af07cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)

Origin message was:
------------------
- add/use //NI tags instead of /*NI*/; just cosmetic changes

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

------------------
This commit was generated by Migit
2016-07-31 21:04:37 +02:00
vanhofen
dc943d450e disable new tmdb code; we use imdb
Origin commit data
------------------
Branch: ni/coolstream
Commit: a05c67187f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)

Origin message was:
------------------
- disable new tmdb code; we use imdb

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

------------------
This commit was generated by Migit
2016-07-31 16:33:36 +02:00
vanhofen
d5953343ea Revert "- disable new tmdb code; we use imdb"
This reverts commit 423b4d858e.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3eb2b8aaf4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)



------------------
This commit was generated by Migit
2016-07-31 16:18:27 +02:00
vanhofen
423b4d858e disable new tmdb code; we use imdb
Origin commit data
------------------
Branch: ni/coolstream
Commit: 073d867d81
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-29 (Fri, 29 Jul 2016)

Origin message was:
------------------
- disable new tmdb code; we use imdb

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

------------------
This commit was generated by Migit
2016-07-29 21:10:13 +02:00
vanhofen
7cfc6ad001 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/epgview.cpp
	src/gui/infoviewer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4999c74ac0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-29 (Fri, 29 Jul 2016)



------------------
This commit was generated by Migit
2016-07-29 20:55:15 +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
vanhofen
a86bc779b4 NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


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

------------------
This commit was generated by Migit
2016-05-19 22:59:54 +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
Thilo Graf
faaba99131 CInfoViewer: try to fix possible display errors on epg text and rest time
Use of hide() before paint and increase width of rest time box should help
to avoid this issue.


Origin commit data
------------------
Branch: ni/coolstream
Commit: f080dd21ab
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-17 (Wed, 17 Feb 2016)



------------------
This commit was generated by Migit
2016-02-17 10:46:59 +01:00
vanhofen
65838e4afd infoviewer: show movieplayers infoviewer in vzap mode if needed
Origin commit data
------------------
Branch: ni/coolstream
Commit: 944dab5a8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-04 (Thu, 04 Feb 2016)

Origin message was:
------------------
- infoviewer: show movieplayers infoviewer in vzap mode if needed

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

------------------
This commit was generated by Migit
2016-02-04 00:14:57 +01:00
vanhofen
27add16559 movieplayer: add virtual zap mode for moviebrowser playlists
This commit fixes virtual zap for timeshift mode too.
TODO: virtual zap for fileplayer playlists


Origin commit data
------------------
Branch: ni/coolstream
Commit: fb2967ca8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-03 (Wed, 03 Feb 2016)

Origin message was:
------------------
- movieplayer: add virtual zap mode for moviebrowser playlists

This commit fixes virtual zap for timeshift mode too.
TODO: virtual zap for fileplayer playlists


------------------
This commit was generated by Migit
2016-02-03 16:27:07 +01:00
vanhofen
580ba7e449 infoviewer: move VZAP-code to right place
Origin commit data
------------------
Branch: ni/coolstream
Commit: 32d3c2e467
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-01 (Mon, 01 Feb 2016)

Origin message was:
------------------
- infoviewer: move VZAP-code to right place

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

------------------
This commit was generated by Migit
2016-02-01 21:24:54 +01:00
[CST] Focus
8ba2554d42 gui/infoviewer.cpp: fix crash if one of objects missed,
forward all keys to movieplayer in file play mode, excluding only screenshot, OK, home


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ec5af21f7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-02-01 (Mon, 01 Feb 2016)



------------------
This commit was generated by Migit
2016-02-01 16:47:21 +03:00
Thilo Graf
51a58422e3 CInfoViewer: reduce flicker effects for infobar text
Origin commit data
------------------
Branch: ni/coolstream
Commit: 162938b3a3
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-30 (Sat, 30 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-30 17:39:23 +01:00
Michael Liebmann
71ab60d980 Merge branch 'cst-next' into nmp-cst-next
Conflicts: src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c657e2d892
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-29 (Fri, 29 Jan 2016)



------------------
This commit was generated by Migit
2016-01-29 15:41:18 +01:00
Michael Liebmann
c115466fba CInfoViewer::show_Data: Avoid overwriting button text
Origin commit data
------------------
Branch: ni/coolstream
Commit: 73ec7e9671
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-29 (Fri, 29 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-29 15:31:12 +01:00
Michael Liebmann
8372065c10 CCDraw: Set cc_gradient_bg_cleanup to true
Except menu headers: Disable cleanup when save screen is disabled


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c72fe94bc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-29 (Fri, 29 Jan 2016)

Origin message was:
------------------
CCDraw: Set cc_gradient_bg_cleanup to true

 Except menu headers: Disable cleanup when save screen is disabled


------------------
This commit was generated by Migit
2016-01-29 15:31:12 +01:00
Thilo Graf
403d33158d CInfoViewer: use gradient settings for infobar text box too
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2207019bfd
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-14 (Thu, 14 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-29 15:31:12 +01:00
Michael Liebmann
cad1407f90 Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: f628ca6af8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-28 (Thu, 28 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-28 05:32:50 +01:00
defans
36d8afd1dc infoviewer: simplify body height calculation
Origin commit data
------------------
Branch: ni/coolstream
Commit: fcd8352daf
Author: defans <defans@bluepeercrew.us>
Date: 2016-01-27 (Wed, 27 Jan 2016)

Origin message was:
------------------
- infoviewer: simplify body height calculation

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

------------------
This commit was generated by Migit
2016-01-27 00:13:17 +01:00
Michael Liebmann
3f0fb538fe Fix ghost text in infoviewer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8dd426d714
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-26 20:00:22 +01:00
Thilo Graf
979f02de64 CInfoViewer: try to fix shadow and background behavior in vzap mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4cded5afb6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-23 (Sat, 23 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-26 20:00:22 +01:00
Thilo Graf
e501374d13 CInfoViewer: unified vars for body position
Origin commit data
------------------
Branch: ni/coolstream
Commit: b23e3c15c3
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-23 (Sat, 23 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-26 20:00:22 +01:00
Thilo Graf
b3af2f049c CInfoViewer: remove shadow offset from init,
items works with its own values


Origin commit data
------------------
Branch: ni/coolstream
Commit: da0b867098
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-24 (Sun, 24 Jan 2016)



------------------
This commit was generated by Migit
2016-01-26 20:00:22 +01:00
defans
37ac9cd625 CInfoViewer: reset zapmode if not in default mode
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 12c3a15c10
Author: defans <defans@bluepeercrew.us>
Date: 2016-01-24 (Sun, 24 Jan 2016)



------------------
This commit was generated by Migit
2016-01-26 20:00:22 +01:00
Michael Liebmann
b46710d6a8 Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: db8a9e6388
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-25 (Mon, 25 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-25 13:20:10 +01:00
Stefan Seyfried
fea7c86ba5 infoviewer: change show_Data() semantics slightly
the "calledFromEvent" parameter was only used to force display of "no
EPG available". It was set to true when calling from an "zap complete"
or "epg event received" event, which is good, but also when calling from
the display update timer, which is "strange".
Now setting this parameter to false forces the update of the current
event (if available) which is done from display update timer.
This fixes the update of the remaining time display with constantly
displayed infobar (radio mode).


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9a6f9ea786
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-23 (Sat, 23 Jan 2016)



------------------
This commit was generated by Migit
2016-01-25 08:44:26 +01:00
Stefan Seyfried
50cb7dd5d3 Merge remote-tracking branch 'n/cst-next-fixed'
Origin commit data
------------------
Branch: ni/coolstream
Commit: f5c72d35c8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-24 (Sun, 24 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-24 13:15:43 +01:00
Stefan Seyfried
b95452b3bd infoviewer: change show_Data() semantics slightly
the "calledFromEvent" parameter was only used to force display of "no
EPG available". It was set to true when calling from an "zap complete"
or "epg event received" event, which is good, but also when calling from
the display update timer, which is "strange".
Now setting this parameter to false forces the update of the current
event (if available) which is done from display update timer.
This fixes the update of the remaining time display with constantly
displayed infobar (radio mode).


Origin commit data
------------------
Branch: ni/coolstream
Commit: 09a8bc88ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-23 (Sat, 23 Jan 2016)



------------------
This commit was generated by Migit
2016-01-23 13:17:56 +01:00
Stefan Seyfried
0aa77127a3 infoviewer: get rid of "gotTime" variable
It was set from EVT_TIMESET, which is no longer used, and can be
replaced easily by the (already used) "timeset" from sectionsd.
Races and locking can safely be ignored in this case.


Origin commit data
------------------
Branch: ni/coolstream
Commit: f107519131
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-23 (Sat, 23 Jan 2016)



------------------
This commit was generated by Migit
2016-01-23 13:16:10 +01:00
Michael Liebmann
05221269e6 Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 343f45aa1e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-23 (Sat, 23 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-23 05:08:52 +01:00
vanhofen
0b8fa55400 infoviewer: fix overlaps on buttons while zapping
Origin commit data
------------------
Branch: ni/coolstream
Commit: 23242e605c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-22 (Fri, 22 Jan 2016)

Origin message was:
------------------
- infoviewer: fix overlaps on buttons while zapping

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

------------------
This commit was generated by Migit
2016-01-22 10:49:45 +01:00
Michael Liebmann
6b1841a1b0 Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: b6d2bad857
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-21 (Thu, 21 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-21 17:57:38 +01:00