mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 01:11:06 +02:00
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 444d315a09
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-17 (Sat, 17 Jun 2017)
This commit is contained in:
@@ -156,17 +156,10 @@ int COsdHelpers::isVideoSystem1080(int res)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef ENABLE_CHANGE_OSD_RESOLUTION
|
|
||||||
int COsdHelpers::getVideoSystem()
|
int COsdHelpers::getVideoSystem()
|
||||||
{
|
{
|
||||||
return videoDecoder->GetVideoSystem();
|
return videoDecoder->GetVideoSystem();
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
int COsdHelpers::getVideoSystem()
|
|
||||||
{
|
|
||||||
return g_settings.video_Mode;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
uint32_t COsdHelpers::getOsdResolution()
|
uint32_t COsdHelpers::getOsdResolution()
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user