Commit Graph

11 Commits

Author SHA1 Message Date
vanhofen
b6954dec34 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 11d7263bcd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)



------------------
This commit was generated by Migit
2017-09-25 11:41:44 +02:00
Stefan Seyfried
2c8ba76b80 fb_accel: fix blit after time_monotonic_ms fix
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e85889d7b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-24 (Sun, 24 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-24 13:56:49 +02:00
Stefan Seyfried
267ba4b9f4 change time_monotonic_ms() from time_t to int64_t
time_monotonic_ms values did wrap every ~24 days, leading to problems
in code that did not cope with that. Instead of fixing all places where
relative comparisons with time_monotonic_ms() are made, just use a
bigger datatype. Convert all users to the new type.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 99ff4857ff
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)



------------------
This commit was generated by Migit
2017-09-23 21:35:01 +02:00
vanhofen
7e6242f666 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 047318afa8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-21 (Tue, 21 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-21 15:14:31 +01:00
Stefan Seyfried
4583af1385 fb_accel_glfb: fix color palette setting
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9385bd8bd9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-21 06:38:48 +01:00
Stefan Seyfried
adb8a608d5 fb_generic: add swidth variable, "stride in fb_pixel_t units"
this should allow to use fb_pixel_t pointer arithmetics more often
instead of byte pointers


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c7d5f08dd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)



------------------
This commit was generated by Migit
2017-02-21 06:38:48 +01:00
Stefan Seyfried
aaf24788d4 fb_accel_glfb: fix color palette setting
Origin commit data
------------------
Branch: ni/coolstream
Commit: dce9f53654
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-19 17:57:59 +01:00
Stefan Seyfried
b3e69e0a64 fb_generic: add swidth variable, "stride in fb_pixel_t units"
this should allow to use fb_pixel_t pointer arithmetics more often
instead of byte pointers


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



------------------
This commit was generated by Migit
2017-02-15 20:30:52 +01:00
vanhofen
8872419ed1 fix build; try to port our framebuffer changes (need fixes!)
Origin commit data
------------------
Branch: ni/coolstream
Commit: fa727d1bff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)

Origin message was:
------------------
- fix build; try to port our framebuffer changes (need fixes!)

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

------------------
This commit was generated by Migit
2017-02-08 09:45:53 +01:00
Stefan Seyfried
a553cc417a fb_accel: add backend for GL framebuffer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2498ebb314
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-07 17:23:42 +01:00
Stefan Seyfried
23da2a34ef fb_accel: add backend for GL framebuffer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 05d4017b36
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-06 00:15:37 +01:00