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

lcd4l: avoid taking address of packed members

Browse Source 
Should fix possible compiler warnings with -Waddress-of-packed-member.
Comes with newer compilers e.g gcc 9.x


Origin commit data
------------------
Branch: ni/coolstream
Commit: af2f80a9e9
Author: Thilo Graf <dbt@novatux.de>
Date: 2020-01-23 (Thu, 23 Jan 2020)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2020-01-23 21:15:51 +01:00
committed by vanhofen
parent 599f61e924
commit d2f3d67c94
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/driver/lcd4l.cpp
View File

@@ -856,29 +856,32 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
Info2 = shortEpgData.info2;
}
if ((CurrentNext.current_zeit.dauer > 0) && (CurrentNext.current_zeit.dauer < 86400))
time_t cur_duration = CurrentNext.current_zeit.dauer;
time_t cur_start_time = CurrentNext.current_zeit.startzeit;
if ((cur_duration > 0) && (cur_duration < 86400))
{
Progress = 100 * (time(NULL) - CurrentNext.current_zeit.startzeit) / CurrentNext.current_zeit.dauer;
Progress = 100 * (time(NULL) - cur_start_time) / cur_duration;
int total = CurrentNext.current_zeit.dauer / 60;
int done = (abs(time(NULL) - CurrentNext.current_zeit.startzeit) + 30) / 60;
int total = cur_duration / 60;
int done = (abs(time(NULL) - cur_start_time) + 30) / 60;
int todo = total - done;
if ((time(NULL) < CurrentNext.current_zeit.startzeit) && todo >= 0)
if ((time(NULL) < cur_start_time) && todo >= 0)
{
done = 0;
todo = CurrentNext.current_zeit.dauer / 60;
todo = cur_duration / 60;
}
snprintf(Duration, sizeof(Duration), "%d/%d", done, total);
}
tm_struct = localtime(&CurrentNext.current_zeit.startzeit);
tm_struct = localtime(&cur_start_time);
snprintf(Start, sizeof(Start), "%02d:%02d", tm_struct->tm_hour, tm_struct->tm_min);
}
if (CSectionsdClient::epgflags::has_next)
{
Event += "\n" + CurrentNext.next_name;
tm_struct = localtime(&CurrentNext.next_zeit.startzeit);
time_t next_start_time = CurrentNext.next_zeit.startzeit;
tm_struct = localtime(&next_start_time);
snprintf(End, sizeof(End), "%02d:%02d", tm_struct->tm_hour, tm_struct->tm_min);
}
}