Merge branch 'uncool/dvbsi++' commit '7ea3a20a808'

...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp
This commit is contained in:
Stefan Seyfried
2012-11-03 10:43:14 +01:00
123 changed files with 1901 additions and 1088 deletions

View File

@@ -232,7 +232,7 @@ unsigned char SMSKeyInput::getOldKey() const
{
return m_oldKey;
}
#if 0
const timeval* SMSKeyInput::getOldKeyTime() const
{
return &m_oldKeyTime;
@@ -248,7 +248,7 @@ int SMSKeyInput::getTimeout() const
{
return m_timeout;
}
#endif
void SMSKeyInput::setTimeout(int timeout)
{
m_timeout = timeout;