mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 10:51:05 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,081 Commits 2 Branches 9 Tags
cdbbdaff3b13a9003bff43936e73cb6f0bc456f2
Commit Graph

36 Commits

Author SHA1 Message Date
vanhofen
dd6d985e19 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
------------------
Commit: 1107088c0b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)
 2017-03-29 08:05:10 +02:00
Michael Liebmann
edee66e5cb fb_accel hd1/hd2: Add fb_accel_cs_hdx.cpp for common functions 
- Add 'class CFbAccelCSHDx' to fb_accel.h
 - Some small code updates


Origin commit data
------------------
Commit: 3c1f2bfe05
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)
 2017-03-28 23:56:57 +02:00
Michael Liebmann
19b0917c6f CFbAccelCSHD[1|2]::setMode(): Insert cVideo::updateOsdScreenInfo() 
Origin commit data
------------------
Commit: 40a4ec4262
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)
 2017-03-28 23:56:56 +02:00
vanhofen
d98f9e816c framebuffer: fix unscaled paintings; this fixes our starbar 
Origin commit data
------------------
Commit: f6f1a71b39
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)

Origin message was:
------------------
- framebuffer: fix unscaled paintings; this fixes our starbar
 2017-03-28 12:36:26 +02:00
vanhofen
7e99dfa7d7 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: b435c29e1d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)
 2017-03-26 23:24:10 +02:00
Michael Liebmann
0541c8a8e7 CFbAccelCSHD2::setMode: Fix if ENABLE_CHANGE_OSD_RESOLUTION is not defined 
Origin commit data
------------------
Commit: 515ab1fe59
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-23 (Thu, 23 Mar 2017)
 2017-03-23 21:32:48 +01:00
vanhofen
856fc0f6da Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 13c7e927b7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-05 (Sun, 05 Mar 2017)
 2017-03-05 20:43:50 +01:00
Michael Liebmann
eead3caf46 CFbAccelCSHD2::setMode: Fix value for screeninfo.yres_virtual 
Origin commit data
------------------
Commit: 53460e54da
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-05 (Sun, 05 Mar 2017)
 2017-03-05 19:54:09 +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
71998d0131 osd resolution: Add 'mode' to osd_resolution_struct_t 
- Use COsdSetup::OSDMODE_XXX enums to identify various resolutions


Origin commit data
------------------
Commit: 653e574937
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)
 2017-02-28 15:04:09 +01:00
vanhofen
f306db6bd8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 7c423bcb8d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)
 2017-02-23 15:24:49 +01:00
Michael Liebmann
f74245d8ab Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 1dccb68ad1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-23 (Thu, 23 Feb 2017)
 2017-02-23 15:14:54 +01:00
Stefan Seyfried
1b4480023b fb_accel: move hd2 specific parts from fader to fb_accel 
Origin commit data
------------------
Commit: 41e420d35d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
 2017-02-23 15:14:27 +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
0f4ed6c34a 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
------------------
Commit: 7c7d5f08dd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
 2017-02-21 06:38:48 +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
6fa6152445 framebuffer: Add fbCopyArea function 
- Copies areas within the frame buffer
 - Hardware accelerated function for cs hd2
 - Copying overlapping areas does not always work correctly
 without hardware acceleration


Origin commit data
------------------
Commit: cc5a1b3b31
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-19 (Sun, 19 Feb 2017)

Origin message was:
------------------
framebuffer: Add fbCopyArea function

 - Copies areas within the frame buffer
 - Hardware accelerated function for cs hd2
 - Copying overlapping areas does not always work correctly
  without hardware acceleration
 2017-02-20 00:09:46 +01:00
vanhofen
557cbe021f Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: aac7acd827
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-19 23:34:53 +01:00
vanhofen
0d149b95b1 move ENABLE_CHANGE_OSD_RESOLUTION to scale2Res() function 
Origin commit data
------------------
Commit: 43dbfed1ba
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)

Origin message was:
------------------
- move ENABLE_CHANGE_OSD_RESOLUTION to scale2Res() function
 2017-02-19 23:31:46 +01:00
vanhofen
507153a053 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: db9e856c38
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-19 23:22:48 +01:00
vanhofen
0f93a1d522 framebuffer: rename scaleFont() to scale2Res() 
Origin commit data
------------------
Commit: e631c3e3c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)

Origin message was:
------------------
- framebuffer: rename scaleFont() to scale2Res()
 2017-02-19 23:22:12 +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
dd6b4d740d Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: aa5f8e9a65
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-15 (Wed, 15 Feb 2017)
 2017-02-15 18:40:47 +01:00
Michael Liebmann
f2e312a727 fb_accel_cs_hd2: add missing getBackBufferPointer() 
Origin commit data
------------------
Commit: 84edb25f3f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-15 (Wed, 15 Feb 2017)
 2017-02-15 18:39:02 +01:00
Michael Liebmann
15c81625d6 Merge branch 'master' into pu/fb-setmode 
Fix merge conflict


Origin commit data
------------------
Commit: 65f81b146d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-14 (Tue, 14 Feb 2017)
 2017-02-14 20:11:08 +01:00
Stefan Seyfried
78419473da implement getWidth4FB_HW_ACC in fb_accel class 
This helper to determine alignment for hardware blitting is now in
system/helpers.h, where it does not really belong. Put it into the
framebuffer class instead. Framebuffers that don't need it will just
get a dummy function, the cs_hd2 framebuffer gets the real thing.
Also add a bool function that indicates the need for alignment.


Origin commit data
------------------
Commit: b6909fb815
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)
 2017-02-14 20:01:55 +01:00
vanhofen
8704cb914a 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
	src/gui/osd_setup.cpp
	src/neutrino.cpp
	src/neutrino.h
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: ba8bdde8c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
 2017-02-13 21:41:04 +01:00
Michael Liebmann
0c20bf9af6 neutrino: Add switch osd resolution when supported from hardware 
- At the moment supported hardware: CS HD2

 Currently known problems:
 -------------------------
 - Display menus after changing resolution (Reboot required)
 - Display headers after changing resolution hd => fullhd (Reboot required)
 - Display infobar after changing resolution hd => fullhd (Reboot required)
 - Screenshot broken (With new driver and set resolution to 1280x720)


Origin commit data
------------------
Commit: 7b158903f8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
neutrino: Add switch osd resolution when supported from hardware

 - At the moment supported hardware: CS HD2

 Currently known problems:
 -------------------------
 - Display menus after changing resolution (Reboot required)
 - Display headers after changing resolution hd => fullhd (Reboot required)
 - Display infobar after changing resolution hd => fullhd (Reboot required)
 - Screenshot broken (With new driver and set resolution to 1280x720)
 2017-02-13 12:51:14 +01:00
Michael Liebmann
dec085f4ee CFbAccelCSHD2: Add scaleFont()function for font upscaling when fullhd is aktiv 
Origin commit data
------------------
Commit: 88c834221b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)
 2017-02-13 12:51:14 +01:00
Michael Liebmann
c9958d4e6b CFbAccelCSHD2::setMode: Update for new framebuffer driver (full hd) 
Origin commit data
------------------
Commit: 33125aed06
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)
 2017-02-13 12:51:14 +01:00
vanhofen
f7b4d9e941 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/driver/fb_accel_cs_hd1.cpp
	src/driver/fb_accel_cs_hd2.cpp


Origin commit data
------------------
Commit: 1e5b102802
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
 2017-02-08 20:38:28 +01:00
Thilo Graf
8296507bf5 fb_accel_cs_hdx: remove dub includes, add includes into common header file 
Origin commit data
------------------
Commit: 8fe7504007
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
 2017-02-08 20:16:07 +01:00
Michael Liebmann
c6c4f88a06 fb_accel: Some renaming nevis => hd1 & apollo => hd2 
Origin commit data
------------------
Commit: f94afc1593
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-08 (Wed, 08 Feb 2017)
 2017-02-08 13:32:46 +01:00
Michael Liebmann
adbb76744c fb_accel: Rename CFbAccelCSApollo class => CFbAccelCSHD2 
Rename fb_accel_cs_apollo.cpp => fb_accel_cs_hd2.cpp


Origin commit data
------------------
Commit: a4afe1e8e0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-08 (Wed, 08 Feb 2017)

Origin message was:
------------------
fb_accel: Rename CFbAccelCSApollo class => CFbAccelCSHD2

 Rename fb_accel_cs_apollo.cpp => fb_accel_cs_hd2.cpp
 2017-02-08 12:52:26 +01:00