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

fix 64bit format string warnings

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: c41c7b3002
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-27 (Tue, 27 Jan 2015)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-01-27 10:58:43 +01:00
parent dd41d82ef5
commit 190c9bb2a7
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/moviebrowser.cpp
View File

@@ -30,7 +30,7 @@
Author: Günther@tuxbox.berlios.org Author: Günther@tuxbox.berlios.org
based on code of Steffen Hehn 'McClean' based on code of Steffen Hehn 'McClean'
(C) 2009-2014 Stefan Seyfried (C) 2009-2015 Stefan Seyfried
****************************************************************************/ ****************************************************************************/
@@ -1212,7 +1212,7 @@ std::string CMovieBrowser::getScreenshotName(std::string movie, bool is_dir)
void CMovieBrowser::refreshMovieInfo(void) void CMovieBrowser::refreshMovieInfo(void)
{ {
TRACE("[mb]->%s m_vMovieInfo.size %d\n", __func__, m_vMovieInfo.size()); TRACE("[mb]->%s m_vMovieInfo.size %d\n", __func__, (int)m_vMovieInfo.size());
//reset text before new init, m_pcInfo must be clean //reset text before new init, m_pcInfo must be clean
std::string emptytext = " "; std::string emptytext = " ";
m_pcInfo->setText(&emptytext); m_pcInfo->setText(&emptytext);

2
src/neutrino.cpp
View File

@@ -2286,7 +2286,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
m_idletime = time(NULL); m_idletime = time(NULL);
if (m_screensaver) if (m_screensaver)
{ {
printf("[neutrino] CSreenSaver stop; msg: %X\n", msg); printf("[neutrino] CSreenSaver stop; msg: %lX\n", msg);
screensaver(false); screensaver(false);
videoDecoder->StopPicture(); videoDecoder->StopPicture();

2
src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
View File

@@ -569,7 +569,7 @@ std::string CNeutrinoYParser::func_get_audio_pids_as_dropdown(CyhookHandler *,
if(para == "apid") if(para == "apid")
idx_as_id=false; idx_as_id=false;
else if(!para.empty() && ("channel="== para.substr(0,8))){ else if(!para.empty() && ("channel="== para.substr(0,8))){
if (sscanf(para.c_str(), "channel=%llx:audio=%i:", &current_channel_id,&selected_apid) == 2) { if (sscanf(para.c_str(), "channel=%" SCNx64 ":audio=%i:", &current_channel_id,&selected_apid) == 2) {
if(current_channel_id != 0 && CZapit::getInstance()->GetCurrentChannelID() != current_channel_id){ if(current_channel_id != 0 && CZapit::getInstance()->GetCurrentChannelID() != current_channel_id){
channel = CServiceManager::getInstance()->FindChannel(current_channel_id); channel = CServiceManager::getInstance()->FindChannel(current_channel_id);
} }