mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
15,038 Commits 2 Branches 9 Tags
da27b51fdd7d1036c40232fdd55a052b7bb1e813
Commit Graph

762 Commits

Author SHA1 Message Date
vanhofen
86c64163c7 Revert "hardware_caps.cpp: Add hw ifdef for cs_get_chip_type()" 
This reverts commit ec191c5a38
because libcoolstream now is updated


Origin commit data
------------------
Commit: 83de4ba055
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 15:07:52 +01:00
Michael Liebmann
90c7bffdeb Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 5e09df1d91
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 14:50:04 +01:00
Michael Liebmann
cd4922c0c2 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
------------------
Commit: ab6ca5b606
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 14:35:32 +01:00
Michael Liebmann
5b136d4c55 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
------------------
Commit: 7eecd09eca
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 14:35:32 +01:00
vanhofen
38dd0be012 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 8fb706226a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 00:31:02 +01:00
Michael Liebmann
fffa20b430 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: fee5cd0175
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-09 (Thu, 09 Mar 2017)
 2017-03-09 17:34:42 +01:00
Michael Liebmann
ec191c5a38 hardware_caps.cpp: Add hw ifdef for cs_get_chip_type() 
Origin commit data
------------------
Commit: f5cdaff282
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-09 (Thu, 09 Mar 2017)
 2017-03-09 17:34:25 +01:00
Michael Liebmann
42c7b9035d Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 94492c4271
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-09 (Thu, 09 Mar 2017)
 2017-03-09 15:17:25 +01:00
vanhofen
afe0a772a9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 4ed2244c39
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)
 2017-03-09 13:43:47 +01:00
vanhofen
17fd0362e1 hardware_caps: add latest coolstream models 
Origin commit data
------------------
Commit: b546ed517e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)

Origin message was:
------------------
- hardware_caps: add latest coolstream models
 2017-03-09 12:51:44 +01:00
vanhofen
77be049b29 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 2e4d5a0d28
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)
 2017-03-09 10:08:13 +01:00
Michael Liebmann
dc44b76596 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 7ad59776d1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)
 2017-03-08 00:35:16 +01:00
Stefan Seyfried
6d86f585cb Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 6f1cfd42bb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-07 (Tue, 07 Mar 2017)
 2017-03-07 19:43:06 +01:00
Jacek Jendrzej
7364e139ad make neutrino compatible with new ffmpeg 
Origin commit data
------------------
Commit: bfa589eb08
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-07 (Tue, 07 Mar 2017)
 2017-03-07 15:00:17 +01:00
vanhofen
b5ce0f99fb 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
------------------
Commit: 73ea6fddcb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 23:26:32 +01:00
vanhofen
3a863c91f0 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/Makefile.am
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Commit: e2d5f6ebf1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 22:40:18 +01:00
vanhofen
fdda0de766 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/Makefile.am


Origin commit data
------------------
Commit: c582725f40
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 22:07:52 +01:00
Michael Liebmann
eb3e1116ac Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: bab10ee438
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 22:06:38 +01:00
vanhofen
97391211a4 move public libcoolstream-headers to hardware directory 
Origin commit data
------------------
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
 2017-03-06 21:49:32 +01:00
vanhofen
459cf4d8ea port hardware_caps from Neutrino-MP 
Origin commit data
------------------
Commit: 29fd05002f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- port hardware_caps from Neutrino-MP
 2017-03-06 21:49:32 +01:00
Jacek Jendrzej
ade02e6dbb subpagetable is unsigned 
Origin commit data
------------------
Commit: e10cb00613
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
 subpagetable is unsigned
 2017-03-06 15:50:06 +01:00
Stefan Seyfried
ee422ef114 hw_caps: add caps for 14:9 AR and broken tuner driver 
Origin commit data
------------------
Commit: 3a7a202818
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)
 2017-03-04 20:28:21 +01:00
vanhofen
68e2832f96 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)
 2017-02-28 16:55:39 +01:00
vanhofen
f5d9d25957 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.h


Origin commit data
------------------
Commit: 7829247fe8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)
 2017-02-28 15:36:23 +01:00
Michael Liebmann
84759d6c05 osd resolution: Use COsdHelpers::changeOsdResolution() to adjust... 
...OSD resolution after switching video format


Origin commit data
------------------
Commit: ff11dd44ab
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)
 2017-02-28 15:04:09 +01:00
Stefan Seyfried
9960939337 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 5c95139207
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
 2017-02-22 08:44:53 +01:00
vanhofen
59b2a3b072 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: f5ef33794a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-21 (Tue, 21 Feb 2017)
 2017-02-21 15:14:59 +01:00
vanhofen
25f833735d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 047318afa8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-21 (Tue, 21 Feb 2017)
 2017-02-21 15:14:31 +01:00
Michael Liebmann
a26c4afdd5 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: eb0d7afa95
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-21 (Tue, 21 Feb 2017)
 2017-02-21 06:39:24 +01:00
Stefan Seyfried
08e4d55f88 tuxtxt: remove dead code, unnecessary header includes 
Origin commit data
------------------
Commit: cdc9935b83
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-21 06:38:48 +01:00
Stefan Seyfried
5709592f5d tuxtxt: remove old, unused input code 
Origin commit data
------------------
Commit: 291eaa0450
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-21 06:38:48 +01:00
Stefan Seyfried
95d1629a50 tuxtxt: remove old framebuffer device code 
Origin commit data
------------------
Commit: b3a79a3a33
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-21 06:38:48 +01:00
Stefan Seyfried
b94eb7dd30 tuxtxt: remove unused dmx variable 
Origin commit data
------------------
Commit: dfddc62d0c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-21 06:38:48 +01:00
Stefan Seyfried
8c63d840c5 libtuxtxt: remove unused fd parameter from tuxtx_main() 
Origin commit data
------------------
Commit: 418819e261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-21 06:38:48 +01:00
vanhofen
ec7785f5f3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: b3c5b557d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)
 2017-02-20 12:30:00 +01:00
vanhofen
321a2f470f 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
------------------
Commit: 58b3f87cf5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)
 2017-02-20 12:29:23 +01:00
Michael Liebmann
2821cf8d16 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: d76c9c536c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-20 (Mon, 20 Feb 2017)
 2017-02-20 00:11:48 +01:00
Michael Liebmann
8cad1eb1a8 tuxtxt: Use hw blitting with fbCopyArea() for cs hd2 
Origin commit data
------------------
Commit: b7110faaf6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-20 00:09:46 +01:00
Stefan Seyfried
cb43773c3c tuxtxt: remove dead code, unnecessary header includes 
Origin commit data
------------------
Commit: 50cf26441f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-19 18:14:57 +01:00
Stefan Seyfried
d08d5f0622 tuxtxt: remove old, unused input code 
Origin commit data
------------------
Commit: 98b7904a47
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-19 18:04:50 +01:00
Stefan Seyfried
4e25c4d67b tuxtxt: remove old framebuffer device code 
Origin commit data
------------------
Commit: 39bb1c5cad
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-19 14:34:44 +01:00
Stefan Seyfried
b505dafde1 tuxtxt: remove unused dmx variable 
Origin commit data
------------------
Commit: e906fc70e3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-19 12:09:03 +01:00
Stefan Seyfried
71f351bdfe libtuxtxt: remove unused fd parameter from tuxtx_main() 
Origin commit data
------------------
Commit: eb3fa7f2af
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-19 11:52:37 +01:00
vanhofen
8e781dcf7e lib/libtuxtxt/tuxtxt.cpp: align to seife and tuxbox 
Origin commit data
------------------
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
 2017-02-15 22:59:24 +01:00
vanhofen
25046a4627 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
------------------
Commit: 7102774beb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
 2017-02-15 22:54:00 +01:00
vanhofen
298fdbfe36 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
------------------
Commit: 3ff64707df
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
 2017-02-15 21:52:59 +01:00
Michael Liebmann
b37a04311e tuxtxt: Fix display in 1280x720 mode 
Origin commit data
------------------
Commit: 979bac14f0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-15 (Wed, 15 Feb 2017)
 2017-02-15 20:24:41 +01:00
Stefan Seyfried
00e83ba596 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
------------------
Commit: c977c98217
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
 2017-02-15 18:38:03 +01:00
Michael Liebmann
47c93ee999 libtuxtxt: Transfer from neutrino-mp for better compatibility 
Origin commit data
------------------
Commit: 5612baaff7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-15 (Wed, 15 Feb 2017)
 2017-02-15 18:38:03 +01:00
Stefan Seyfried
689feeee28 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
------------------
Commit: f51278b094
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
 2017-02-15 00:31:26 +01:00