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

some compil warning fixes

Browse Source 
Origin commit data
------------------
Commit: a471b2af10
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-23 (Sat, 23 Apr 2016)
This commit is contained in:
Jacek Jendrzej
2016-04-23 21:19:04 +02:00
parent b06b3db436
commit 958e33ddd6
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/volume.cpp
View File

@@ -100,8 +100,8 @@ void CVolume::setVolume(const neutrino_msg_t key)
hideVolscale(); hideVolscale();
showVolscale(); showVolscale();
neutrino_msg_data_t data; neutrino_msg_data_t data = 0;
uint64_t timeoutEnd; uint64_t timeoutEnd = 0;
int vol = g_settings.current_volume; int vol = g_settings.current_volume;
do { do {

3
src/gui/lua/lua_video.cpp
View File

@@ -152,7 +152,8 @@ int CLuaInstVideo::PlayFile(lua_State *L)
bool sp = false; bool sp = false;
if (luaL_testudata(L, 1, LUA_CLASSNAME) == NULL) if (luaL_testudata(L, 1, LUA_CLASSNAME) == NULL)
sp = D->singlePlay; if (D)
sp = D->singlePlay;
if ((sp == false) && (CMoviePlayerGui::getInstance().getBlockedFromPlugin() == false)) if ((sp == false) && (CMoviePlayerGui::getInstance().getBlockedFromPlugin() == false))
CMoviePlayerGui::getInstance().setBlockedFromPlugin(true); CMoviePlayerGui::getInstance().setBlockedFromPlugin(true);

4
src/gui/movieplayer.cpp
View File

@@ -2065,10 +2065,10 @@ void CMoviePlayerGui::handleMovieBrowser(neutrino_msg_t msg, int /*position*/)
int lastplaystop = p_movie_info ? p_movie_info->bookmarks.lastPlayStop/60:0; int lastplaystop = p_movie_info ? p_movie_info->bookmarks.lastPlayStop/60:0;
snprintf(play_pos, sizeof(play_pos), "%3d %s", lastplaystop, unit_short_minute); snprintf(play_pos, sizeof(play_pos), "%3d %s", lastplaystop, unit_short_minute);
char start_pos[32] = {0}; char start_pos[32] = {0};
if (p_movie_info->bookmarks.start != 0) if (p_movie_info && p_movie_info->bookmarks.start != 0)
snprintf(start_pos, sizeof(start_pos), "%3d %s", p_movie_info->bookmarks.start/60, unit_short_minute); snprintf(start_pos, sizeof(start_pos), "%3d %s", p_movie_info->bookmarks.start/60, unit_short_minute);
char end_pos[32] = {0}; char end_pos[32] = {0};
if (p_movie_info->bookmarks.end != 0) if (p_movie_info && p_movie_info->bookmarks.end != 0)
snprintf(end_pos, sizeof(end_pos), "%3d %s", p_movie_info->bookmarks.end/60, unit_short_minute); snprintf(end_pos, sizeof(end_pos), "%3d %s", p_movie_info->bookmarks.end/60, unit_short_minute);
bookStartMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_LASTMOVIESTOP, isMovieBrowser, play_pos, &cSelectedMenuBookStart[1])); bookStartMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_LASTMOVIESTOP, isMovieBrowser, play_pos, &cSelectedMenuBookStart[1]));

3
src/timerd/timermanager.cpp
View File

@@ -814,7 +814,7 @@ CTimerEvent::CTimerEvent( CTimerd::CTimerEventTypes evtype, time_t announcetime,
stopTime = stoptime; stopTime = stoptime;
repeatCount = repeatcount; repeatCount = repeatcount;
previousState = CTimerd::TIMERSTATE_SCHEDULED; previousState = CTimerd::TIMERSTATE_SCHEDULED;
#if 0 //never used
time_t diff = 0; time_t diff = 0;
time_t mtime = time(NULL); time_t mtime = time(NULL);
struct tm *tmtime = localtime(&mtime); struct tm *tmtime = localtime(&mtime);
@@ -832,6 +832,7 @@ CTimerEvent::CTimerEvent( CTimerd::CTimerEventTypes evtype, time_t announcetime,
{ {
diff+=3600; diff+=3600;
} }
#endif
#if 0 //FIXME EPG vs manual timer ? #if 0 //FIXME EPG vs manual timer ?
printf("############## CTimerEvent dst %d -> %d diff %d\n", isdst1, isdst2, diff); printf("############## CTimerEvent dst %d -> %d diff %d\n", isdst1, isdst2, diff);
alarmTime += diff; alarmTime += diff;