mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 18:31:12 +02:00
gui/components/cc_frm_clock: simplify; setClockFormat/setClockBlink has now impact on running thread
Conflicts:
src/gui/components/cc_frm_clock.cpp
src/gui/timeosd.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 13118c1148
Author: martii <m4rtii@gmx.de>
Date: 2014-01-10 (Fri, 10 Jan 2014)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -87,11 +87,11 @@ void CTimeOSD::initTimeString()
|
||||
struct tm t;
|
||||
if (m_mode == MODE_DESC) {
|
||||
char tt[20];
|
||||
strftime(tt, sizeof(tt), cl_format_str.c_str(), gmtime_r(&m_time_show, &t));
|
||||
strftime(tt, sizeof(tt), cl_format_str, gmtime_r(&m_time_show, &t));
|
||||
snprintf(cl_timestr, sizeof(cl_timestr), "-%s", tt);
|
||||
}
|
||||
else
|
||||
strftime(cl_timestr, sizeof(cl_timestr), cl_format_str.c_str(), gmtime_r(&m_time_show, &t));
|
||||
strftime(cl_timestr, sizeof(cl_timestr), cl_format_str, gmtime_r(&m_time_show, &t));
|
||||
}
|
||||
|
||||
void CTimeOSD::show(time_t time_show, bool force)
|
||||
|
Reference in New Issue
Block a user