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

Merge branch 'uncool/dvbsi++' commit 610ce926f5

Browse Source 
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


Origin commit data
------------------
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)
This commit is contained in:
Stefan Seyfried
2012-12-30 21:35:20 +01:00
parent 0ee262ece5 a3d94d7962
commit 6e17b3f254
84 changed files with 898 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/videosettings.cpp
View File

@@ -403,9 +403,9 @@ void CVideoSettings::setupVideoSystem(bool do_ask)
g_settings.video_Mode = prev_video_mode;
videoDecoder->SetVideoSystem(g_settings.video_Mode);
}
else
prev_video_mode = g_settings.video_Mode;
}
else
prev_video_mode = g_settings.video_Mode;
}
}
@@ -446,6 +446,7 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void * /*
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_VIDEOMODE))
{
setupVideoSystem(true/*ask*/);
return true;
}
#if 0
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_CONTRAST))