Commit Graph

97 Commits

Author SHA1 Message Date
vanhofen
79c24b3173 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 470a8b62dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)



------------------
This commit was generated by Migit
2017-08-23 15:24:38 +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
gixxpunk
4c908eafae Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2594a60728
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-29 21:29:56 +02:00
Michael Liebmann
8d1a669301 lib-libtuxtxt-tuxtxt.cpp avoid segfault, supplement to 6771de1
Origin commit data
------------------
Branch: ni/coolstream
Commit: a6344b3527
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-29 15:05:30 +02:00
vanhofen
144725ebcd Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a1baacc7d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-26 22:51:16 +02:00
Jacek Jendrzej
6771de1f2d lib/libtuxtxt/tuxtxt.cpp avoid segfault, FIXME
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7aec84d124
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-26 11:53:59 +02:00
gixxpunk
3ace53ce3e Merge branch 'master' of github.com:tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8f3783987a
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-04-26 (Wed, 26 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-26 11:17:46 +02:00
Michael Liebmann
fddb8f5760 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1852183fa6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-04-24 (Mon, 24 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-24 22:35:45 +02:00
Michael Liebmann
72ac3f9fd4 lib/libtuxtxt/Makefile.am: Fix FREETYPE_CFLAGS
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a08685b57
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-04-24 (Mon, 24 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-24 22:34:51 +02:00
vanhofen
1a928cce60 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1107088c0b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)



------------------
This commit was generated by Migit
2017-03-29 08:05:10 +02:00
Michael Liebmann
6823a03aa4 lib/libtuxtxt/tuxtxt.cpp: Update for hd1/hd2
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e08f4cb92
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-28 23:56:57 +02:00
vanhofen
de0263121b tuxtxt.cpp: align to tuxbox-neutrino
Origin commit data
------------------
Branch: ni/coolstream
Commit: f599f3aa98
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-11 (Sat, 11 Mar 2017)

Origin message was:
------------------
- tuxtxt.cpp: align to tuxbox-neutrino

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

------------------
This commit was generated by Migit
2017-03-11 12:50:36 +01:00
vanhofen
038c20d9b4 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/moviebrowser/mb.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 73ea6fddcb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)



------------------
This commit was generated by Migit
2017-03-06 23:26:32 +01:00
Jacek Jendrzej
4e013de774 subpagetable is unsigned
Origin commit data
------------------
Branch: ni/coolstream
Commit: e10cb00613
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
 subpagetable is unsigned

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

------------------
This commit was generated by Migit
2017-03-06 15:50:06 +01: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
Michael Liebmann
d27afe52d0 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb0d7afa95
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
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 06:39:24 +01:00
Stefan Seyfried
2ded710c6e tuxtxt: remove dead code, unnecessary header includes
Origin commit data
------------------
Branch: ni/coolstream
Commit: cdc9935b83
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
f647b4a09f tuxtxt: remove old, unused input code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 291eaa0450
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
95048c1ebb tuxtxt: remove old framebuffer device code
Origin commit data
------------------
Branch: ni/coolstream
Commit: b3a79a3a33
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
1a998d3135 tuxtxt: remove unused dmx variable
Origin commit data
------------------
Branch: ni/coolstream
Commit: dfddc62d0c
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
90fa290ed5 libtuxtxt: remove unused fd parameter from tuxtx_main()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 418819e261
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
vanhofen
bb60fbe8a2 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/driver/fb_accel.h
	src/driver/fb_accel_cs_hd1.cpp
	src/driver/fb_accel_cs_hd2.cpp
	src/driver/fb_generic.cpp
	src/driver/fb_generic.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 58b3f87cf5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)



------------------
This commit was generated by Migit
2017-02-20 12:29:23 +01:00
Michael Liebmann
5b18cd2d9d Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: d76c9c536c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-20 (Mon, 20 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-20 00:11:48 +01:00
Michael Liebmann
e6c0521928 tuxtxt: Use hw blitting with fbCopyArea() for cs hd2
Origin commit data
------------------
Branch: ni/coolstream
Commit: b7110faaf6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
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-20 00:09:46 +01:00
vanhofen
5708ad998c Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/driver/fb_generic.h


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



------------------
This commit was generated by Migit
2017-02-15 21:52:59 +01:00
Michael Liebmann
07b0dd6c9b tuxtxt: Fix display in 1280x720 mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 979bac14f0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-15 (Wed, 15 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-15 20:24:41 +01:00
Stefan Seyfried
af247d098a tuxtxt: convert to int-pointer arithmetic, work with all framebuffers
This converts the drawing code from byte-pointer to fb_pixel_t-pointer
arithmetic, making the calculations more obvious and probably more
efficient.
Additionally, the color tables are now generated in a way that it should
work regardless of the frame buffer color format. Allows to remove a few
hardware specific #ifdefs.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c977c98217
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 18:38:03 +01:00
Michael Liebmann
aaef3934cb libtuxtxt: Transfer from neutrino-mp for better compatibility
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5612baaff7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-15 (Wed, 15 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-15 18:38:03 +01:00
vanhofen
6e85f1b0ca Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


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



------------------
This commit was generated by Migit
2017-02-12 23:01:15 +01:00
Stefan Seyfried
184f520208 set useful thread names for all spawned threads
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5188f721c4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-12 22:55:36 +01:00
vanhofen
ba43886fb8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a0d262c596
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-20 (Tue, 20 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-20 21:40:42 +01:00
Jacek Jendrzej
98fb189edc lib/libtuxtxt/tuxtxt_common.h fix out of bounds
Origin commit data
------------------
Branch: ni/coolstream
Commit: 20268781e3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-20 (Tue, 20 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-20 16:35:43 +01:00
vanhofen
06167cc8d0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec448e14fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-23 21:57:00 +02:00
Stefan Seyfried
58f77a1311 fix Makefiles to include SIGC_CFLAGS
now that the framebuffer class includes libsigc++, the path
to it must be known to all parts using framebuffer.h


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



------------------
This commit was generated by Migit
2016-10-23 17:22:16 +02:00
gixxpunk
2e09d77141 use default values for freetype fontcaches (needs testing!)
Origin commit data
------------------
Branch: ni/coolstream
Commit: e6fafadcea
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2016-07-07 (Thu, 07 Jul 2016)

Origin message was:
------------------
- use default values for freetype fontcaches (needs testing!)

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

------------------
This commit was generated by Migit
2016-07-07 17:46:18 +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
Stefan Seyfried
1364beedc3 port HWLIB_CFLAGS from neutrino-mp to neutrino-hd
Origin commit data
------------------
Branch: ni/coolstream
Commit: 79d800f955
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-12 (Tue, 12 Jan 2016)

Origin message was:
------------------
- port HWLIB_CFLAGS from neutrino-mp to neutrino-hd

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

------------------
This commit was generated by Migit
2016-01-14 22:29:00 +01:00
Jacek Jendrzej
3d261f9210 tuxtxt.cpp: fixheap buffer overflow
Origin commit data
------------------
Branch: ni/coolstream
Commit: 160dda776c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-06-22 (Mon, 22 Jun 2015)


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

------------------
This commit was generated by Migit
2015-06-22 19:24:53 +02:00
Jacek Jendrzej
893056e7bb tuxtxt.cpp:fix error array-bound
Origin commit data
------------------
Branch: ni/coolstream
Commit: fd84ed4100
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)


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

------------------
This commit was generated by Migit
2015-03-19 17:20:36 +01:00
[CST] Focus
0db70a4f29 lib/libtuxtxt/tuxtxt.cpp: set 16:9 mode by default
Origin commit data
------------------
Branch: ni/coolstream
Commit: f71396e455
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)


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

------------------
This commit was generated by Migit
2014-10-16 13:56:09 +04:00
gixxpunk
1e1c193e93 tuxtxt: pageinfo = NULL
Origin commit data
------------------
Branch: ni/coolstream
Commit: b2c37c556f
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2013-10-20 (Sun, 20 Oct 2013)

Origin message was:
------------------
- tuxtxt: pageinfo = NULL

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

------------------
This commit was generated by Migit
2013-10-20 21:07:59 +02:00
Michael Liebmann
ec6bf71c64 Replacing obsolete 'INCLUDES' with 'AM_CPPFLAGS' in all Makefile.am
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5091e920fc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-14 (Mon, 14 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-17 04:22:49 +02:00
[CST] Focus
46f1deca39 Makefiles.am: add conditional include for libcoolstream
Origin commit data
------------------
Branch: ni/coolstream
Commit: d3d2efe475
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-11 14:17:16 +04:00
Jacek Jendrzej
67c5d7c91e remove doubles include
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)


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

------------------
This commit was generated by Migit
2012-09-11 20:31:33 +02:00
vanhofen
f7e19eabc2 tuxtxt: fix creation of /var/tuxbox/config/tuxtxt/
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e1a3265e6
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-09-05 (Wed, 05 Sep 2012)

Origin message was:
------------------
- tuxtxt: fix creation of /var/tuxbox/config/tuxtxt/

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

------------------
This commit was generated by Migit
2012-09-05 23:42:10 +02:00
Jacek Jendrzej
97fd0a377f tuxtxt.h: remove unnecessary header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9a889e1496
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-08-21 (Tue, 21 Aug 2012)


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

------------------
This commit was generated by Migit
2012-08-21 14:06:18 +02:00
Jacek Jendrzej
8dc4ef8796 comment out never used
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9124c20f31
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-08-04 (Sat, 04 Aug 2012)


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

------------------
This commit was generated by Migit
2012-08-04 10:03:19 +02:00
Michael Liebmann
0ce6e40d80 Add missing $(top_builddir) to Makefile.am
Origin commit data
------------------
Branch: ni/coolstream
Commit: f36ee26d87
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-04-22 (Sun, 22 Apr 2012)

Origin message was:
------------------
* Add missing $(top_builddir) to Makefile.am

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

------------------
This commit was generated by Migit
2012-04-27 16:54:01 +01:00
[CST] Bas
dcb46bbbe1 Merge branch 'dvbsi++' of c00lstreamtech.de:cst-private-neutrino into includecleanup
Conflicts:
	src/eitd/SIlanguage.cpp
	src/eitd/SIsections.cpp
	src/eitd/dmx.cpp
	src/eitd/dmxapi.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ce9eb10ed0
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-03-08 (Thu, 08 Mar 2012)



------------------
This commit was generated by Migit
2012-03-08 12:17:03 +08:00
Jacek Jendrzej
a8e2c3cab6 remove never used volues
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2138 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2591100c42
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-03-04 (Sun, 04 Mar 2012)



------------------
This commit was generated by Migit
2012-03-04 17:25:48 +00:00