mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-27 15:32:52 +02:00
Fix compile neutrino-mp
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:
@@ -348,7 +348,7 @@ int CCAMMenuHandler::handleCamMsg(const neutrino_msg_t msg, neutrino_msg_data_t
|
||||
char * tptr = sptr;
|
||||
int bpos = 0;
|
||||
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;
|
||||
tptr[li] = 0;
|
||||
printf("CCAMMenuHandler::handleCamMsg: subtitle: %s\n", sptr);
|
||||
|
@@ -1437,7 +1437,7 @@ void CFileBrowser::paintSMSKey()
|
||||
|
||||
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]);
|
||||
int len = fnt_small->getRenderWidth(cKey);
|
||||
fnt_small->RenderString(x + width - skwidth, y + height - foheight + foheight/2 + skheight/2, len, cKey, COL_MENUHEAD_TEXT);
|
||||
|
@@ -2228,7 +2228,7 @@ bool CMoviePlayerGui::mountIso(CFile *file)
|
||||
return false;
|
||||
}
|
||||
|
||||
void CMoviePlayerGui::makeScreenShot(bool autoshot, bool forcover)
|
||||
void CMoviePlayerGui::makeScreenShot(bool autoshot, bool /*forcover*/)
|
||||
{
|
||||
if (autoshot && (autoshot_done || !g_settings.auto_cover))
|
||||
return;
|
||||
|
@@ -292,6 +292,8 @@ std::string json_out_error(std::string _error) {
|
||||
//-----------------------------------------------------------------------------
|
||||
// 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::stringstream ss;
|
||||
for (size_t i = 0; i < s.length(); ++i) {
|
||||
@@ -305,4 +307,4 @@ std::string json_convert_string(std::string s) {
|
||||
}
|
||||
return ss.str();
|
||||
}
|
||||
|
||||
#pragma GCC diagnostic pop
|
||||
|
Reference in New Issue
Block a user