Commit Graph

556 Commits

Author SHA1 Message Date
vanhofen
ca99393430 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)



------------------
This commit was generated by Migit
2017-03-12 22:03:03 +01: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
f5984b6843 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 114392256c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-10 15:21:17 +01:00
vanhofen
07da62e157 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	lib/hardware/coolstream/hd2/libcoolstream/cs_api.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c95f1f7a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)



------------------
This commit was generated by Migit
2017-03-10 15:10:04 +01:00
vanhofen
283c5857f5 hardware_caps: just changes in comments
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff6046bb56
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- hardware_caps: just changes in comments

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

------------------
This commit was generated by Migit
2017-03-10 15:07:52 +01:00
vanhofen
76ef7b2aef hardware_caps/Makefile: use @HWLIB_CFLAGS@ instead of defines
Origin commit data
------------------
Branch: ni/coolstream
Commit: 24b159f84c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- hardware_caps/Makefile: use @HWLIB_CFLAGS@ instead of defines

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

------------------
This commit was generated by Migit
2017-03-10 15:07:52 +01:00
vanhofen
c3a4e426ca hardware_caps: use define instead of value; better readability
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cca1e02c3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- hardware_caps: use define instead of value; better readability

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

------------------
This commit was generated by Migit
2017-03-10 15:07:52 +01:00
vanhofen
096ef211b2 Revert "hardware_caps.cpp: Add hw ifdef for cs_get_chip_type()"
This reverts commit 5b9c48fbf1
because libcoolstream now is updated


Origin commit data
------------------
Branch: ni/coolstream
Commit: 83de4ba055
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)



------------------
This commit was generated by Migit
2017-03-10 15:07:52 +01:00
Michael Liebmann
98da577319 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e09df1d91
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-10 14:50:04 +01:00
Michael Liebmann
063adf347d hd2/libcoolstream/*.h: Update for new libcoolstream functions
- cs_get_lib_version()
 - cs_compare_lib_versions()
 - GetVideoSystem()
 - GetVideoSystemFormatName()
 - Add CS_CHIP_NEVIS definitions


Origin commit data
------------------
Branch: ni/coolstream
Commit: ab6ca5b606
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)



------------------
This commit was generated by Migit
2017-03-10 14:35:32 +01:00
Michael Liebmann
e0afe07ae2 hd1/libcoolstream/cs_api.h: Update for new libcoolstream functions
- cs_get_lib_version()
 - cs_compare_lib_versions()
 - cs_get_chip_type() (dummy function for compatibility with hd2)
 - Add CS_CHIP_xxx definitions


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7eecd09eca
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)



------------------
This commit was generated by Migit
2017-03-10 14:35:32 +01:00
vanhofen
1385d11930 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8fb706226a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-10 00:31:02 +01:00
Michael Liebmann
68a2255560 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: fee5cd0175
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-09 (Thu, 09 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-09 17:34:42 +01:00
Michael Liebmann
5b9c48fbf1 hardware_caps.cpp: Add hw ifdef for cs_get_chip_type()
Origin commit data
------------------
Branch: ni/coolstream
Commit: f5cdaff282
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-09 (Thu, 09 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-09 17:34:25 +01:00
Michael Liebmann
acedcfb372 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 94492c4271
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-09 (Thu, 09 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-09 15:17:25 +01:00
vanhofen
8e2360a18a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4ed2244c39
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-09 13:43:47 +01:00
vanhofen
ff3043a1fa hardware_caps: add latest coolstream models
Origin commit data
------------------
Branch: ni/coolstream
Commit: b546ed517e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)

Origin message was:
------------------
- hardware_caps: add latest coolstream models

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

------------------
This commit was generated by Migit
2017-03-09 12:51:44 +01:00
vanhofen
b67a4fc3b3 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e4d5a0d28
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-09 10:08:13 +01:00
Michael Liebmann
d5b808b0b9 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ad59776d1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-08 00:35:16 +01:00
Jacek Jendrzej
4c19475bd1 make neutrino compatible with new ffmpeg
Origin commit data
------------------
Branch: ni/coolstream
Commit: bfa589eb08
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-07 (Tue, 07 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-07 15:00:17 +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
vanhofen
09e19facfe Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/Makefile.am
	src/Makefile.am
	src/neutrino.cpp


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



------------------
This commit was generated by Migit
2017-03-06 22:40:18 +01:00
vanhofen
6d8078cf73 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/Makefile.am


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



------------------
This commit was generated by Migit
2017-03-06 22:07:52 +01:00
Michael Liebmann
875905608d Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: bab10ee438
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-06 22:06:38 +01:00
vanhofen
a60fcac65b move public libcoolstream-headers to hardware directory
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2029a684e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- move public libcoolstream-headers to hardware directory

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

------------------
This commit was generated by Migit
2017-03-06 21:49:32 +01:00
vanhofen
c8efd4141c port hardware_caps from Neutrino-MP
Origin commit data
------------------
Branch: ni/coolstream
Commit: 29fd05002f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- port hardware_caps from Neutrino-MP

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

------------------
This commit was generated by Migit
2017-03-06 21:49: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
5e5451332e Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)



------------------
This commit was generated by Migit
2017-02-28 16:55:39 +01:00
vanhofen
bf56f9f0bc Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7829247fe8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)



------------------
This commit was generated by Migit
2017-02-28 15:36:23 +01:00
Michael Liebmann
ff6188530e osd resolution: Use COsdHelpers::changeOsdResolution() to adjust...
...OSD resolution after switching video format


Origin commit data
------------------
Branch: ni/coolstream
Commit: ff11dd44ab
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)



------------------
This commit was generated by Migit
2017-02-28 15:04:09 +01:00
vanhofen
3b3c8d975b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: f5ef33794a
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:59 +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
477d25a765 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b3c5b557d8
Author: vanhofen <vanhofen@gmx.de>
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 12:30:00 +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
050bb47fb1 lib/libtuxtxt/tuxtxt.cpp: align to seife and tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a687bccace
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)

Origin message was:
------------------
- lib/libtuxtxt/tuxtxt.cpp: align to seife and tuxbox

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

------------------
This commit was generated by Migit
2017-02-15 22:59:24 +01:00
vanhofen
6bb52f0731 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/driver/screenshot.cpp
	src/neutrino.cpp


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



------------------
This commit was generated by Migit
2017-02-15 22:54:00 +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
ff7b7dfde7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/libdvbsub/dvbsub.cpp
	lib/libtuxtxt/tuxtxt.cpp
	src/driver/lcdd.cpp
	src/zapit/src/femanager.cpp


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



------------------
This commit was generated by Migit
2017-02-12 23:04:09 +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