Commit Graph

46 Commits

Author SHA1 Message Date
vanhofen
cfa5aa6414 infoicons: avoid extern CInfoIcons; use getInstance() instead of this
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a34b06137
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- infoicons: avoid extern CInfoIcons; use getInstance() instead of this

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

------------------
This commit was generated by Migit
2018-01-03 10:49:50 +01:00
vanhofen
53186bb33d screensaver: move more repeatedly used code to screensaver's code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c1058382f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- screensaver: move more repeatedly used code to screensaver's code

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

------------------
This commit was generated by Migit
2017-11-25 09:58:55 +01:00
vanhofen
1d0ccd2e0e neutrino: move screensaver members to screensaver's code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a08024e9c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- neutrino: move screensaver members to screensaver's code

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

------------------
This commit was generated by Migit
2017-11-25 09:58:55 +01:00
vanhofen
ab5d217f63 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb76978295
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-09 08:43:52 +02:00
Jacek Jendrzej
a67cecd575 remove double includes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6576729fd1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-08 (Fri, 08 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-08 21:21:32 +02:00
vanhofen
ddc3b2865d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9ff856310d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)


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

------------------
This commit was generated by Migit
2017-05-23 18:29:49 +02:00
Jacek Jendrzej
67490319f9 src/gui/screensaver.cpp try to fix segfault on stop
Origin commit data
------------------
Branch: ni/coolstream
Commit: fcc3a12e88
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-23 (Tue, 23 May 2017)


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

------------------
This commit was generated by Migit
2017-05-23 17:52:16 +02:00
vanhofen
3fb69ef421 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 728959949b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-08 20:35:37 +01:00
Michael Liebmann
7ecb045555 Merge branch 'master' into pu/fb-modules
Origin commit data
------------------
Branch: ni/coolstream
Commit: ef61905a2d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-08 (Wed, 08 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-08 20:16:41 +01:00
vanhofen
54d7d92401 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgview.h


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



------------------
This commit was generated by Migit
2017-02-08 08:02:39 +01:00
Stefan Seyfried
c6eae66341 reduce impact of driver/pictureviewer.h header file
before, more than 175 files depended on it, now it's about 35


Origin commit data
------------------
Branch: ni/coolstream
Commit: 47b1a8b642
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)



------------------
This commit was generated by Migit
2017-02-07 18:38:45 +01:00
Thilo Graf
b2eb4b1889 CScreenSaver: ensure full cleanup of infoclock after stopped screensaver
This provokes re init of info clock.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 622e7a4dd2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-07 (Tue, 07 Feb 2017)



------------------
This commit was generated by Migit
2017-02-07 17:12:25 +01:00
Michael Liebmann
32bbcaaa83 screensaver: Use black background for the clock
Origin commit data
------------------
Branch: ni/coolstream
Commit: c62f964dde
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-24 (Tue, 24 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-31 16:36:40 +01:00
vanhofen
37030339ad Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/screensaver.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 47d0b6efb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-25 (Wed, 25 Jan 2017)



------------------
This commit was generated by Migit
2017-01-25 21:02:22 +01:00
Michael Liebmann
be42403466 screensaver: Use black background for the clock
Origin commit data
------------------
Branch: ni/coolstream
Commit: 88c38030ab
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-24 (Tue, 24 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-25 16:33:44 +01:00
vanhofen
40d4834a65 screensaver: fix clock positions
Origin commit data
------------------
Branch: ni/coolstream
Commit: 75d20b6ecb
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)

Origin message was:
------------------
- screensaver: fix clock positions

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

------------------
This commit was generated by Migit
2016-12-19 17:21:51 +01:00
vanhofen
18ded7d353 screensaver: fix clock positions
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e077bb7ee
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-18 (Sun, 18 Dec 2016)

Origin message was:
------------------
- screensaver: fix clock positions

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

------------------
This commit was generated by Migit
2016-12-18 01:22:24 +01:00
vanhofen
3739b4de04 Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/components/cc_detailsline.h
	src/gui/components/cc_item_infobox.h
	src/gui/infoviewer.cpp
	src/gui/upnpbrowser.cpp
	src/gui/widget/keyboard_input.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)



------------------
This commit was generated by Migit
2016-10-10 16:45:30 +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
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
Thilo Graf
304e6f616e CScreenSaver: use common time format
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7091383170
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-05-07 (Sat, 07 May 2016)


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

------------------
This commit was generated by Migit
2016-05-08 16:46:31 +02:00
Thilo Graf
730adcdfb0 CScreenSaver: fix possible render of clock over screen size
check position and size use only possible available screen size


Origin commit data
------------------
Branch: ni/coolstream
Commit: 387d96d2f5
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-21 (Thu, 21 Jan 2016)



------------------
This commit was generated by Migit
2016-01-21 11:00:29 +01:00
Michael Liebmann
40e38a9a75 More replace __FILE__ with __file__
Origin commit data
------------------
Branch: ni/coolstream
Commit: c7b6026ac2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-17 (Sun, 17 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-17 06:14:49 +01:00
Michael Liebmann
db4ec25e60 CScreenSaver: Fix compile when pip is disabled
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d58e43499
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-16 14:44:12 +01:00
defans
a054659c6a screensaver: disable pip while screensaver
Origin commit data
------------------
Branch: ni/coolstream
Commit: 87db52784f
Author: defans <defans@bluepeercrew.us>
Date: 2016-01-16 (Sat, 16 Jan 2016)

Origin message was:
------------------
- screensaver: disable pip while screensaver

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

------------------
This commit was generated by Migit
2016-01-16 12:29:22 +01:00
Thilo Graf
7be34438f6 screensaver: rework timeosd handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: d7ac78c0c2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-07 (Thu, 07 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-10 22:02:00 +01:00
defans
291e699330 screensaver: add optional colored property
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f2c73aed3
Author: defans <defans@bluepeercrew.us>
Date: 2016-01-07 (Thu, 07 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-10 22:02:00 +01:00
Michael Liebmann
1f45b9041e Remove redundant pthread_cancel() call
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0e68d504c9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-03 (Sun, 03 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-03 12:59:44 +01:00
Thilo Graf
165cabba18 Screensaver: add option to show current time instead images
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b3576b4a7
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-27 (Sun, 27 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-27 22:26:23 +01:00
Thilo Graf
1dedce338b Screeansaver: add optional random images
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff667dfef3
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-27 (Sun, 27 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-27 19:46:14 +01:00
Thilo Graf
4be0c5290a CScreenSaver: add signal/slot handler OnBeforeStart(), try to fix infoclock
In some constelations it is not required to enable infoclock after close
screensaver. So it is possible to cotrol this from other objects.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c8bd66801
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-18 (Wed, 18 Nov 2015)



------------------
This commit was generated by Migit
2015-12-27 14:42:28 +01:00
vanhofen
e33323d5ba fix and use ICONSDIR variable; move ICONSSDIR_VAR to global.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: 89a11de651
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-06 (Wed, 06 May 2015)

Origin message was:
------------------
- fix and use ICONSDIR variable; move ICONSSDIR_VAR to global.h

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

------------------
This commit was generated by Migit
2015-05-06 22:58:54 +02:00
vanhofen
91b9e9b609 framebuffer: revival of showFrame() function to allow ...
... pictures like start.jpg, mp3.jpg etc. from /var/tuxbox/icons


Origin commit data
------------------
Branch: ni/coolstream
Commit: edc8527379
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-05 (Tue, 05 May 2015)

Origin message was:
------------------
- framebuffer: revival of showFrame() function to allow ...

... pictures like start.jpg, mp3.jpg etc. from /var/tuxbox/icons


------------------
This commit was generated by Migit
2015-05-05 12:01:04 +02:00
Thilo Graf
69c9b302a9 CScreenSaver: fix wconversion warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 016fc14177
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-01-15 (Thu, 15 Jan 2015)


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

------------------
This commit was generated by Migit
2015-03-29 22:40:10 +02:00
Thilo Graf
00a9aa1af0 CScreenSaver: use unified debug output
Origin commit data
------------------
Branch: ni/coolstream
Commit: be78944eb8
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-01-15 (Thu, 15 Jan 2015)


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

------------------
This commit was generated by Migit
2015-03-29 22:40:09 +02:00
vanhofen
91859dcb45 screensaver: fix restart of clock and mute;
restart is now depending on previous status


Origin commit data
------------------
Branch: ni/coolstream
Commit: aea7e1f772
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-01-09 (Fri, 09 Jan 2015)

Origin message was:
------------------
- screensaver: fix restart of clock and mute;

 restart is now depending on previous status


------------------
This commit was generated by Migit
2015-01-09 15:04:39 +01:00
vanhofen
93652ee718 screensaver: use strcasecmp instead of strcmp
Origin commit data
------------------
Branch: ni/coolstream
Commit: f80f539387
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-01-08 (Thu, 08 Jan 2015)

Origin message was:
------------------
- screensaver: use strcasecmp instead of strcmp

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

------------------
This commit was generated by Migit
2015-01-08 19:59:50 +01:00
defans
167ca5deb0 CSreenSaver: add png files
Origin commit data
------------------
Branch: ni/coolstream
Commit: b32757420a
Author: defans <defans@bluepeercrew.us>
Date: 2015-01-08 (Thu, 08 Jan 2015)


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

------------------
This commit was generated by Migit
2015-01-08 12:23:36 +01:00
vanhofen
9da1d60dcb screensaver: disable clock while screesaver
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c9a158f11
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-30 (Tue, 30 Dec 2014)

Origin message was:
------------------
- screensaver: disable clock while screesaver

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

------------------
This commit was generated by Migit
2014-12-30 00:53:31 +01:00
vanhofen
6d7f074153 screensaver: allow no screensaver_timeout to show first pic only
Thats usefull when you have just one plain black pic in your
 screensaver directory. So you'll get a blank screen w/o pic changes.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b85aa43d87
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-29 (Mon, 29 Dec 2014)

Origin message was:
------------------
- screensaver: allow no screensaver_timeout to show first pic only

 Thats usefull when you have just one plain black pic in your
 screensaver directory. So you'll get a blank screen w/o pic changes.


------------------
This commit was generated by Migit
2014-12-29 23:50:18 +01:00
vanhofen
09dd6563ef screensaver: moving "using namespace std;" to cpp ...
... to avoid the inheritance of this


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f42845160
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)

Origin message was:
------------------
- screensaver: moving "using namespace std;" to cpp ...

 ... to avoid the inheritance of this


------------------
This commit was generated by Migit
2014-12-29 22:13:02 +01:00
vanhofen
098a5ba944 screensaver: add GUI option to change timeout
Origin commit data
------------------
Branch: ni/coolstream
Commit: 153e7dba91
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-29 (Mon, 29 Dec 2014)

Origin message was:
------------------
- screensaver: add GUI option to change timeout

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

------------------
This commit was generated by Migit
2014-12-29 22:13:02 +01:00
vanhofen
6c0e82fcd4 screensaver: user pictureviewer instead of videoDecoder ...
... to avoid interrupts while playing and keep pictures unscaled


Origin commit data
------------------
Branch: ni/coolstream
Commit: ecc98b7def
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-24 (Wed, 24 Dec 2014)

Origin message was:
------------------
- screensaver: user pictureviewer instead of videoDecoder ...

... to avoid interrupts while playing and keep pictures unscaled


------------------
This commit was generated by Migit
2014-12-29 22:13:02 +01:00
vanhofen
f051971c61 screensaver: just add mp3-?.jpg when using DATADIR "/neutrino/icons" ...
... to get the same behavior as usual


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4cf5e8ffd1
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-24 (Wed, 24 Dec 2014)

Origin message was:
------------------
- screensaver: just add mp3-?.jpg when using DATADIR "/neutrino/icons" ...

... to get the same behavior as usual


------------------
This commit was generated by Migit
2014-12-29 22:13:02 +01:00
vanhofen
60f41ce982 screensaver: remove trailing slash from screensaver_dir
Origin commit data
------------------
Branch: ni/coolstream
Commit: 20e49a492a
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-24 (Wed, 24 Dec 2014)

Origin message was:
------------------
- screensaver: remove trailing slash from screensaver_dir

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

------------------
This commit was generated by Migit
2014-12-29 22:13:02 +01:00
defans
1b117eb41e CScreenSaver: add class CScreenSaver
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a23a1c36a
Author: defans <defans@bluepeercrew.us>
Date: 2014-12-29 (Mon, 29 Dec 2014)


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

------------------
This commit was generated by Migit
2014-12-29 22:13:02 +01:00