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

fix warnings

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@303 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 9f87f97094
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-02-08 (Mon, 08 Feb 2010)

Origin message was:
------------------
-fix warnings

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@303 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
Jacek Jendrzej
2010-02-08 11:23:09 +00:00
parent d12766b885
commit b75a14126a
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/stream2file.h
View File

@@ -30,7 +30,7 @@ enum stream2file_error_msg_t
STREAM2FILE_INVALID_PID = -3, STREAM2FILE_INVALID_PID = -3,
STREAM2FILE_PES_FILTER_FAILURE = -4, STREAM2FILE_PES_FILTER_FAILURE = -4,
STREAM2FILE_DVR_OPEN_FAILURE = -5, STREAM2FILE_DVR_OPEN_FAILURE = -5,
STREAM2FILE_RECORDING_THREADS_FAILED = -6, STREAM2FILE_RECORDING_THREADS_FAILED = -6
}; };
enum stream2file_status_t enum stream2file_status_t

2
src/gui/epgplus.cpp
View File

@@ -789,7 +789,7 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu
this->paint (); this->paint ();
unsigned long long timeoutEnd = CRCInput::calcTimeoutEnd (g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); uint64_t timeoutEnd = CRCInput::calcTimeoutEnd (g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]);
bool loop = true; bool loop = true;
while (loop) { while (loop) {
g_RCInput->getMsgAbsoluteTimeout (&msg, &data, &timeoutEnd); g_RCInput->getMsgAbsoluteTimeout (&msg, &data, &timeoutEnd);

2
src/gui/imageinfo.cpp
View File

@@ -95,7 +95,7 @@ int CImageInfo::exec(CMenuTarget* parent, const std::string &)
while (1) while (1)
{ {
neutrino_msg_data_t data; neutrino_msg_data_t data;
unsigned long long timeoutEnd = CRCInput::calcTimeoutEnd_MS(100); uint64_t timeoutEnd = CRCInput::calcTimeoutEnd_MS(100);
g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd ); g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd );
if (msg <= CRCInput::RC_MaxRC) if (msg <= CRCInput::RC_MaxRC)

6
src/gui/pluginlist.h
View File

@@ -47,7 +47,7 @@ class CPluginList : public CMenuTarget
enum result_ enum result_
{ {
close = 0, close = 0,
resume = 1, resume = 1
} result; } result;
private: private:
@@ -90,7 +90,7 @@ class CPluginList : public CMenuTarget
virtual CPluginList::result_ pluginSelected(); virtual CPluginList::result_ pluginSelected();
public: public:
CPluginList(const neutrino_locale_t Name, const uint32_t listtype); CPluginList(const neutrino_locale_t Name, const uint32_t listtype);
virtual ~CPluginList(); virtual ~CPluginList();
@@ -103,7 +103,7 @@ class CPluginChooser : public CPluginList
private: private:
char* selected_plugin; char* selected_plugin;
protected: protected:
CPluginList::result_ pluginSelected(); CPluginList::result_ pluginSelected();
public: public:

10
src/gui/rc_lock.cpp
View File

@@ -49,12 +49,12 @@ int CRCLock::exec(CMenuTarget* parent, const std::string &actionKey)
parent->hide(); parent->hide();
bool no_input = (actionKey == NO_USER_INPUT); bool no_input = (actionKey == NO_USER_INPUT);
if (ShowLocalizedMessage(LOCALE_RCLOCK_TITLE, LOCALE_RCLOCK_LOCKMSG, if (ShowLocalizedMessage(LOCALE_RCLOCK_TITLE, LOCALE_RCLOCK_LOCKMSG,
CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbCancel, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbCancel,
NEUTRINO_ICON_INFO,450,no_input ? 5 : -1,no_input) == CMessageBox::mbrCancel) NEUTRINO_ICON_INFO,450,no_input ? 5 : -1,no_input) == CMessageBox::mbrCancel)
return menu_return::RETURN_EXIT_ALL; return menu_return::RETURN_EXIT_ALL;
// -- Lockup Box // -- Lockup Box
lockBox(); lockBox();
ShowLocalizedMessage(LOCALE_RCLOCK_TITLE, LOCALE_RCLOCK_UNLOCKMSG, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO,450, no_input ? 5 : -1); ShowLocalizedMessage(LOCALE_RCLOCK_TITLE, LOCALE_RCLOCK_UNLOCKMSG, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO,450, no_input ? 5 : -1);
@@ -66,7 +66,7 @@ void CRCLock::lockBox()
neutrino_msg_t msg; neutrino_msg_t msg;
neutrino_msg_data_t data; neutrino_msg_data_t data;
unsigned long long timeoutEnd; uint64_t timeoutEnd;
// -- Loop until release key pressed // -- Loop until release key pressed
// -- Key sequence: <RED> <DBOX> within 5 secs // -- Key sequence: <RED> <DBOX> within 5 secs
@@ -92,7 +92,7 @@ void CRCLock::lockBox()
// -- so be it... // -- so be it...
if (msg > CRCInput::RC_MaxRC) { if (msg > CRCInput::RC_MaxRC) {
CNeutrinoApp::getInstance()->handleMsg(msg, data); CNeutrinoApp::getInstance()->handleMsg(msg, data);
} else { } else {
CVFD::getInstance()->showRCLock(); CVFD::getInstance()->showRCLock();
// Since showRCLock blocks 2secs for each key we eat all // Since showRCLock blocks 2secs for each key we eat all

6
src/neutrino_menue.cpp
View File

@@ -303,7 +303,7 @@ CVideoSettings::CVideoSettings() : CMenuWidget(LOCALE_VIDEOMENU_HEAD, NEUTRINO_I
changeNotify(LOCALE_VIDEOMENU_SCART, NULL); changeNotify(LOCALE_VIDEOMENU_SCART, NULL);
changeNotify(LOCALE_VIDEOMENU_CINCH, NULL); changeNotify(LOCALE_VIDEOMENU_CINCH, NULL);
} }
}; }
void CVideoSettings::nextMode(void) void CVideoSettings::nextMode(void)
{ {
@@ -427,12 +427,12 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void *)
} }
return true; return true;
}; }
void CVideoSettings::paint() void CVideoSettings::paint()
{ {
CMenuWidget::paint(); CMenuWidget::paint();
}; }
#ifdef TEST_MENU #ifdef TEST_MENU
class CTestMenu : public CMenuTarget class CTestMenu : public CMenuTarget