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

Fix compile neutrino-mp

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 821ccf34a5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-12 (Tue, 12 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-01-12 23:53:06 +01:00
parent 39664c39f4
commit d4947770df
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/cam_menu.cpp
View File

@@ -348,7 +348,7 @@ int CCAMMenuHandler::handleCamMsg(const neutrino_msg_t msg, neutrino_msg_data_t
char * tptr = sptr; char * tptr = sptr;
int bpos = 0; int bpos = 0;
for(int li = 0; li < slen; li++) { for(int li = 0; li < slen; li++) {
if((tptr[li] == 0x8A) || ((bpos > 38) && (tptr[li] == 0x20)) ) { if(((unsigned char)tptr[li] == 0x8A) || ((bpos > 38) && (tptr[li] == 0x20)) ) {
bpos = 0; bpos = 0;
tptr[li] = 0; tptr[li] = 0;
printf("CCAMMenuHandler::handleCamMsg: subtitle: %s\n", sptr); printf("CCAMMenuHandler::handleCamMsg: subtitle: %s\n", sptr);

2
src/gui/filebrowser.cpp
View File

@@ -1437,7 +1437,7 @@ void CFileBrowser::paintSMSKey()
if(m_SMSKeyInput.getOldKey()!=0) if(m_SMSKeyInput.getOldKey()!=0)
{ {
char cKey[2] = {m_SMSKeyInput.getOldKey(), 0}; char cKey[2] = {(char)m_SMSKeyInput.getOldKey(), 0};
cKey[0] = toupper(cKey[0]); cKey[0] = toupper(cKey[0]);
int len = fnt_small->getRenderWidth(cKey); int len = fnt_small->getRenderWidth(cKey);
fnt_small->RenderString(x + width - skwidth, y + height - foheight + foheight/2 + skheight/2, len, cKey, COL_MENUHEAD_TEXT); fnt_small->RenderString(x + width - skwidth, y + height - foheight + foheight/2 + skheight/2, len, cKey, COL_MENUHEAD_TEXT);

2
src/gui/movieplayer.cpp
View File

@@ -2228,7 +2228,7 @@ bool CMoviePlayerGui::mountIso(CFile *file)
return false; return false;
} }
void CMoviePlayerGui::makeScreenShot(bool autoshot, bool forcover) void CMoviePlayerGui::makeScreenShot(bool autoshot, bool /*forcover*/)
{ {
if (autoshot && (autoshot_done || !g_settings.auto_cover)) if (autoshot && (autoshot_done || !g_settings.auto_cover))
return; return;

4
src/nhttpd/yhttpd_core/helper.cpp
View File

@@ -292,6 +292,8 @@ std::string json_out_error(std::string _error) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// JSON: convert string to JSON-String // JSON: convert string to JSON-String
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsign-compare"
std::string json_convert_string(std::string s) { std::string json_convert_string(std::string s) {
std::stringstream ss; std::stringstream ss;
for (size_t i = 0; i < s.length(); ++i) { for (size_t i = 0; i < s.length(); ++i) {
@@ -305,4 +307,4 @@ std::string json_convert_string(std::string s) {
} }
return ss.str(); return ss.str();
} }
#pragma GCC diagnostic pop