mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 17:01:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: db9e856c38
Author: vanhofen <vanhofen@gmx.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
This commit is contained in:
vanhofen
2017-02-19 23:22:48 +01:00
parent 886f9f4073 bb9e1d06e4
commit eabacd65bf
7 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/fb_accel.h
View File

@@ -129,7 +129,7 @@ class CFbAccelCSHD2
fb_pixel_t * getBackBufferPointer() const; fb_pixel_t * getBackBufferPointer() const;
void setBlendMode(uint8_t); void setBlendMode(uint8_t);
void setBlendLevel(int); void setBlendLevel(int);
int scaleFont(int size); int scale2Res(int size);
bool fullHdAvailable(); bool fullHdAvailable();
void setOsdResolutions(); void setOsdResolutions();
uint32_t getWidth4FB_HW_ACC(const uint32_t x, const uint32_t w, const bool max=true); uint32_t getWidth4FB_HW_ACC(const uint32_t x, const uint32_t w, const bool max=true);

7
src/driver/fb_accel_cs_hd2.cpp
View File

@@ -290,8 +290,13 @@ void CFbAccelCSHD2::setBlendLevel(int level)
usleep(20000); usleep(20000);
} }
int CFbAccelCSHD2::scaleFont(int size) int CFbAccelCSHD2::scale2Res(int size)
{ {
/*
The historic resolution 1280x720 is default for some values/sizes.
So let's scale these values to other resolutions.
*/
if (screeninfo.xres == 1920) if (screeninfo.xres == 1920)
size += size/2; size += size/2;

2
src/driver/fb_generic.h
View File

@@ -277,7 +277,7 @@ class CFrameBuffer : public sigc::trackable
virtual void blitBox2FB(const fb_pixel_t* boxBuf, uint32_t width, uint32_t height, uint32_t xoff, uint32_t yoff); virtual void blitBox2FB(const fb_pixel_t* boxBuf, uint32_t width, uint32_t height, uint32_t xoff, uint32_t yoff);
virtual void mark(int x, int y, int dx, int dy); virtual void mark(int x, int y, int dx, int dy);
virtual int scaleFont(int size) { return size; }; virtual int scale2Res(int size) { return size; };
virtual bool fullHdAvailable() { return false; }; virtual bool fullHdAvailable() { return false; };
virtual void setOsdResolutions(); virtual void setOsdResolutions();
std::vector<osd_resolution_t> osd_resolutions; std::vector<osd_resolution_t> osd_resolutions;

4
src/driver/neutrinofonts.cpp
View File

@@ -180,7 +180,7 @@ void CNeutrinoFonts::SetupNeutrinoFonts(bool initRenderClass/*=true*/)
for (int i = 0; i < SNeutrinoSettings::FONT_TYPE_COUNT; i++) { for (int i = 0; i < SNeutrinoSettings::FONT_TYPE_COUNT; i++) {
if (g_Font[i]) delete g_Font[i]; if (g_Font[i]) delete g_Font[i];
#ifdef ENABLE_CHANGE_OSD_RESOLUTION #ifdef ENABLE_CHANGE_OSD_RESOLUTION
fontSize = CFrameBuffer::getInstance()->scaleFont(CNeutrinoApp::getInstance()->getConfigFile()->getInt32(locale_real_names[neutrino_font[i].name], neutrino_font[i].defaultsize)) + neutrino_font[i].size_offset * fontDescr.size_offset; fontSize = CFrameBuffer::getInstance()->scale2Res(CNeutrinoApp::getInstance()->getConfigFile()->getInt32(locale_real_names[neutrino_font[i].name], neutrino_font[i].defaultsize)) + neutrino_font[i].size_offset * fontDescr.size_offset;
#else #else
fontSize = CNeutrinoApp::getInstance()->getConfigFile()->getInt32(locale_real_names[neutrino_font[i].name], neutrino_font[i].defaultsize) + neutrino_font[i].size_offset * fontDescr.size_offset; fontSize = CNeutrinoApp::getInstance()->getConfigFile()->getInt32(locale_real_names[neutrino_font[i].name], neutrino_font[i].defaultsize) + neutrino_font[i].size_offset * fontDescr.size_offset;
#endif #endif
@@ -188,7 +188,7 @@ void CNeutrinoFonts::SetupNeutrinoFonts(bool initRenderClass/*=true*/)
} }
if (g_SignalFont) delete g_SignalFont; if (g_SignalFont) delete g_SignalFont;
#ifdef ENABLE_CHANGE_OSD_RESOLUTION #ifdef ENABLE_CHANGE_OSD_RESOLUTION
fontSize = CFrameBuffer::getInstance()->scaleFont(signal_font.defaultsize) + signal_font.size_offset * fontDescr.size_offset; fontSize = CFrameBuffer::getInstance()->scale2Res(signal_font.defaultsize) + signal_font.size_offset * fontDescr.size_offset;
#else #else
fontSize = signal_font.defaultsize + signal_font.size_offset * fontDescr.size_offset; fontSize = signal_font.defaultsize + signal_font.size_offset * fontDescr.size_offset;
#endif #endif

2
src/gui/infoclock.cpp
View File

@@ -77,7 +77,7 @@ void CInfoClock::initCCLockItems()
//set height, NOTE: height is strictly bound to settings //set height, NOTE: height is strictly bound to settings
height = g_settings.infoClockFontSize; height = g_settings.infoClockFontSize;
#ifdef ENABLE_CHANGE_OSD_RESOLUTION #ifdef ENABLE_CHANGE_OSD_RESOLUTION
height = CFrameBuffer::getInstance()->scaleFont(height); height = CFrameBuffer::getInstance()->scale2Res(height);
#endif #endif
initClockFont(0, height); initClockFont(0, height);

6
src/gui/volumebar.cpp
View File

@@ -55,7 +55,7 @@ void CVolumeBar::initVarVolumeBar()
vb_item_offset = OFFSET_INNER_SMALL; vb_item_offset = OFFSET_INNER_SMALL;
height = g_settings.volume_size; //default height height = g_settings.volume_size; //default height
#ifdef ENABLE_CHANGE_OSD_RESOLUTION #ifdef ENABLE_CHANGE_OSD_RESOLUTION
height = CFrameBuffer::getInstance()->scaleFont(height); height = CFrameBuffer::getInstance()->scale2Res(height);
#endif #endif
//assume volume value as pointer to global setting //assume volume value as pointer to global setting
@@ -96,7 +96,7 @@ void CVolumeBar::initVolumeBarSize()
//scale //scale
vb_pbw = 200; vb_pbw = 200;
#ifdef ENABLE_CHANGE_OSD_RESOLUTION #ifdef ENABLE_CHANGE_OSD_RESOLUTION
vb_pbw = CFrameBuffer::getInstance()->scaleFont(vb_pbw); vb_pbw = CFrameBuffer::getInstance()->scale2Res(vb_pbw);
#endif #endif
vb_pbh = height-4*vb_item_offset; vb_pbh = height-4*vb_item_offset;
@@ -374,7 +374,7 @@ void CVolumeHelper::initVolBarSize()
g_settings.volume_size = max(g_settings.volume_size, icon_height); g_settings.volume_size = max(g_settings.volume_size, icon_height);
vol_height = g_settings.volume_size; vol_height = g_settings.volume_size;
#ifdef ENABLE_CHANGE_OSD_RESOLUTION #ifdef ENABLE_CHANGE_OSD_RESOLUTION
vol_height = CFrameBuffer::getInstance()->scaleFont(vol_height); vol_height = CFrameBuffer::getInstance()->scale2Res(vol_height);
#endif #endif
if (g_settings.volume_digits) { if (g_settings.volume_digits) {

20
src/system/settings.h
View File

@@ -971,10 +971,10 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
#define DEFAULT_LCD_AUTODIMM 0x00 #define DEFAULT_LCD_AUTODIMM 0x00
#define DEFAULT_LCD_SHOW_VOLUME 0x01 #define DEFAULT_LCD_SHOW_VOLUME 0x01
#define CORNER_RADIUS_LARGE 11 #define CORNER_RADIUS_LARGE CFrameBuffer::getInstance()->scale2Res(11)
#define CORNER_RADIUS_MID 7 #define CORNER_RADIUS_MID CFrameBuffer::getInstance()->scale2Res(7)
#define CORNER_RADIUS_SMALL 5 #define CORNER_RADIUS_SMALL CFrameBuffer::getInstance()->scale2Res(5)
#define CORNER_RADIUS_MIN 3 #define CORNER_RADIUS_MIN CFrameBuffer::getInstance()->scale2Res(3)
#define CORNER_RADIUS_NONE 0 #define CORNER_RADIUS_NONE 0
#define RADIUS_LARGE (g_settings.rounded_corners ? CORNER_RADIUS_LARGE : 0) #define RADIUS_LARGE (g_settings.rounded_corners ? CORNER_RADIUS_LARGE : 0)
@@ -984,12 +984,12 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
#define RADIUS_NONE 0 #define RADIUS_NONE 0
// offsets // offsets
#define OFFSET_SHADOW 6 #define OFFSET_SHADOW CFrameBuffer::getInstance()->scale2Res(6)
#define OFFSET_INTER 6 #define OFFSET_INTER CFrameBuffer::getInstance()->scale2Res(6)
#define OFFSET_INNER_LARGE 20 #define OFFSET_INNER_LARGE CFrameBuffer::getInstance()->scale2Res(20)
#define OFFSET_INNER_MID 10 #define OFFSET_INNER_MID CFrameBuffer::getInstance()->scale2Res(10)
#define OFFSET_INNER_SMALL 5 #define OFFSET_INNER_SMALL CFrameBuffer::getInstance()->scale2Res(5)
#define OFFSET_INNER_MIN 2 #define OFFSET_INNER_MIN CFrameBuffer::getInstance()->scale2Res(2)
#define OFFSET_INNER_NONE 0 #define OFFSET_INNER_NONE 0
#define SCROLLBAR_WIDTH OFFSET_INNER_MID + 2*OFFSET_INNER_MIN #define SCROLLBAR_WIDTH OFFSET_INNER_MID + 2*OFFSET_INNER_MIN