From 5ff172c987fc2c6c516c38a2d5018ac1726c54b7 Mon Sep 17 00:00:00 2001 From: kamel5 Date: Thu, 11 Jul 2019 14:40:41 +0200 Subject: Rename timer.* to timemanager.* --- Makefile | 2 +- styledpixmap.h | 2 +- timeline.h | 2 +- timemanager.c | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ timemanager.h | 52 +++++++++++++++++ timer.c | 178 -------------------------------------------------------- timer.h | 52 ----------------- timerconflict.c | 2 +- tvguideosd.h | 2 +- 9 files changed, 235 insertions(+), 235 deletions(-) create mode 100644 timemanager.c create mode 100644 timemanager.h delete mode 100644 timer.c delete mode 100644 timer.h diff --git a/Makefile b/Makefile index 5bf1277..8fb9824 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ endif ### The object files (add further files here): -OBJS = $(PLUGIN).o channelepg.o channelgroup.o channelgroups.o channeljump.o config.o detailview.o dummygrid.o epggrid.o fontmanager.o footer.o geometrymanager.o grid.o headergrid.o imagecache.o imageloader.o imagemagickwrapper.o imagescaler.o osdmanager.o recmanager.o recmenu.o recmenuitem.o recmenuview.o recmenus.o searchtimer.o setup.o statusheader.o styledpixmap.o switchtimer.o timeline.o timer.o timerconflict.o tools.o tvguideosd.o view.o +OBJS = $(PLUGIN).o channelepg.o channelgroup.o channelgroups.o channeljump.o config.o detailview.o dummygrid.o epggrid.o fontmanager.o footer.o geometrymanager.o grid.o headergrid.o imagecache.o imageloader.o imagemagickwrapper.o imagescaler.o osdmanager.o recmanager.o recmenu.o recmenuitem.o recmenuview.o recmenus.o searchtimer.o setup.o statusheader.o styledpixmap.o switchtimer.o timeline.o timemanager.o timerconflict.o tools.o tvguideosd.o view.o ### The main target: diff --git a/styledpixmap.h b/styledpixmap.h index af463fe..c0416c5 100644 --- a/styledpixmap.h +++ b/styledpixmap.h @@ -3,7 +3,7 @@ #include #include -#include "timer.h" +#include "timemanager.h" #include "config.h" enum eBackgroundType { diff --git a/timeline.h b/timeline.h index da207bf..45fe673 100644 --- a/timeline.h +++ b/timeline.h @@ -1,7 +1,7 @@ #ifndef __TVGUIDE_TIMELINE_H #define __TVGUIDE_TIMELINE_H -#include "timer.h" +#include "timemanager.h" #include "styledpixmap.h" // --- cTimeLine ------------------------------------------------------------- diff --git a/timemanager.c b/timemanager.c new file mode 100644 index 0000000..a38e57a --- /dev/null +++ b/timemanager.c @@ -0,0 +1,178 @@ +#include +#include +#include "config.h" +#include "timemanager.h" + +cTimeManager::~cTimeManager(void) { +} + +cString cTimeManager::printTime(time_t displayTime) { + struct tm *ts; + ts = localtime(&displayTime); + cString strTime = cString::sprintf("%d.%d-%d:%d.%d", ts->tm_mday, ts->tm_mon+1, ts->tm_hour, ts->tm_min, ts->tm_sec); + return strTime; +} + + +void cTimeManager::Now() { + t = time(0); + tStart = t; + tStart = GetRounded(); + if (config.displayMode == eVertical) { + tEnd = tStart + (geoManager.osdHeight - geoManager.statusHeaderHeight - geoManager.channelHeaderHeight - geoManager.channelGroupsHeight - geoManager.footerHeight)/geoManager.minutePixel*60; + } else if (config.displayMode == eHorizontal) { + tEnd = tStart + (geoManager.osdWidth - geoManager.channelHeaderWidth - geoManager.channelGroupsWidth)/geoManager.minutePixel*60; + } +} + +void cTimeManager::AddStep(int step) { + tStart += step*60; + tEnd += step*60; +} + +bool cTimeManager::DelStep(int step) { + if ((tStart - step*60)+30*60 < t) { + return true; + } + tStart -= step*60; + tEnd -= step*60; + return false; +} + +void cTimeManager::SetTime(time_t newTime) { + tStart = newTime; + if (config.displayMode == eVertical) { + tEnd = tStart + (geoManager.osdHeight - geoManager.statusHeaderHeight - geoManager.channelHeaderHeight - geoManager.channelGroupsHeight - geoManager.footerHeight)/geoManager.minutePixel*60; + } else if (config.displayMode == eHorizontal) { + tEnd = tStart + (geoManager.osdWidth - geoManager.channelHeaderWidth - geoManager.channelGroupsWidth)/geoManager.minutePixel*60; + } +} + +time_t cTimeManager::getPrevPrimetime(time_t current) { + tm *st = localtime(¤t); + if (st->tm_hour < 21) { + current -= 24 * 60* 60; + st = localtime(¤t); + } + st->tm_hour = 20; + st->tm_min = 0; + time_t primeTime = mktime(st); + return primeTime; +} + +time_t cTimeManager::getNextPrimetime(time_t current){ + tm *st = localtime(¤t); + if (st->tm_hour > 19) { + current += 24 * 60* 60; + st = localtime(¤t); + } + st->tm_hour = 20; + st->tm_min = 0; + time_t primeTime = mktime(st); + return primeTime; +} + +bool cTimeManager::tooFarInPast(time_t current) { + if (current < t) { + return true; + } + return false; +} + +cString cTimeManager::GetCurrentTime() { + char buf[25]; + t = time(0); + tm *st = localtime(&t); + //snprintf(text, sizeof(text), "%d:%02d", st->tm_hour, st->tm_min); + if (config.timeFormat == e12Hours) { + strftime(buf, sizeof(buf), "%I:%M %p", st); + } else if (config.timeFormat == e24Hours) + strftime(buf, sizeof(buf), "%H:%M", st); + return buf; + +} + +cString cTimeManager::GetDate() { + char text[6]; + tm *st = localtime(&tStart); + snprintf(text, sizeof(text), "%d.%d", st->tm_mday, st->tm_mon+1); + return text; +} + +cString cTimeManager::GetWeekday() { + return WeekDayName(tStart); +} + +int cTimeManager::GetTimelineOffset() { + tm *st = localtime(&tStart); + int offset = st->tm_hour*60; + offset += st->tm_min; + return offset; +} + +time_t cTimeManager::GetRounded() { + tm *rounded = localtime ( &tStart ); + rounded->tm_sec = 0; + if (rounded->tm_min > 29) + rounded->tm_min = 30; + else + rounded->tm_min = 0; + return mktime(rounded); +} + +bool cTimeManager::NowVisible(void) { + if (t > tStart) + return true; + return false; +} + + +void cTimeManager::debug() { + esyslog("t: %s, tStart: %s, tEnd: %s", *TimeString(t), *TimeString(tStart), *TimeString(tEnd)); +} + +// --- cTimeInterval ------------------------------------------------------------- + +cTimeInterval::cTimeInterval(time_t start, time_t stop) { + this->start = start; + this->stop = stop; +} + +cTimeInterval::~cTimeInterval(void) { +} + +cTimeInterval *cTimeInterval::Intersect(cTimeInterval *interval) { + time_t startIntersect, stopIntersect; + + if ((stop <= interval->Start()) || (interval->Stop() <= start)) { + return NULL; + } + + if (start <= interval->Start()) { + startIntersect = interval->Start(); + } else { + startIntersect = start; + } + if (stop <= interval->Stop()) { + stopIntersect = stop; + } else { + stopIntersect = interval->Stop(); + } + return new cTimeInterval(startIntersect, stopIntersect); +} + +cTimeInterval *cTimeInterval::Union(cTimeInterval *interval) { + time_t startUnion, stopUnion; + + if (start <= interval->Start()) { + startUnion = start; + } else { + startUnion = interval->Start(); + } + if (stop <= interval->Stop()) { + stopUnion = interval->Stop(); + } else { + stopUnion = stop; + } + return new cTimeInterval(startUnion, stopUnion); +} diff --git a/timemanager.h b/timemanager.h new file mode 100644 index 0000000..35f28c7 --- /dev/null +++ b/timemanager.h @@ -0,0 +1,52 @@ +#ifndef __TVGUIDE_TIMEMANAGER_H +#define __TVGUIDE_TIMEMANAGER_H + +#include + +// --- cTimeManager ------------------------------------------------------------- + +class cTimeManager { + private: + time_t t; + time_t tStart; + time_t tEnd; + public: + cTimeManager(){}; + virtual ~cTimeManager(void); + static cString printTime(time_t displayTime); + void Now(); + time_t GetNow() { return t; }; + void AddStep(int step); + bool DelStep(int step); + void SetTime(time_t newTime); + time_t Get() {return t;}; + time_t GetStart() {return tStart;}; + time_t GetEnd() {return tEnd;}; + cString GetCurrentTime(); + cString GetDate(); + cString GetWeekday(); + time_t getPrevPrimetime(time_t current); + time_t getNextPrimetime(time_t current); + bool tooFarInPast(time_t current); + int GetTimelineOffset(); + time_t GetRounded(); + bool NowVisible(void); + void debug(); +}; + +// --- cTimeInterval ------------------------------------------------------------- + +class cTimeInterval { + private: + time_t start; + time_t stop; + public: + cTimeInterval(time_t start, time_t stop); + virtual ~cTimeInterval(void); + time_t Start(void) { return start; }; + time_t Stop(void) { return stop; }; + cTimeInterval *Intersect(cTimeInterval *interval); + cTimeInterval *Union(cTimeInterval *interval); +}; + +#endif //__TVGUIDE_TIMEMANAGER_H diff --git a/timer.c b/timer.c deleted file mode 100644 index b236443..0000000 --- a/timer.c +++ /dev/null @@ -1,178 +0,0 @@ -#include -#include -#include "config.h" -#include "timer.h" - -cTimeManager::~cTimeManager(void) { -} - -cString cTimeManager::printTime(time_t displayTime) { - struct tm *ts; - ts = localtime(&displayTime); - cString strTime = cString::sprintf("%d.%d-%d:%d.%d", ts->tm_mday, ts->tm_mon+1, ts->tm_hour, ts->tm_min, ts->tm_sec); - return strTime; -} - - -void cTimeManager::Now() { - t = time(0); - tStart = t; - tStart = GetRounded(); - if (config.displayMode == eVertical) { - tEnd = tStart + (geoManager.osdHeight - geoManager.statusHeaderHeight - geoManager.channelHeaderHeight - geoManager.channelGroupsHeight - geoManager.footerHeight)/geoManager.minutePixel*60; - } else if (config.displayMode == eHorizontal) { - tEnd = tStart + (geoManager.osdWidth - geoManager.channelHeaderWidth - geoManager.channelGroupsWidth)/geoManager.minutePixel*60; - } -} - -void cTimeManager::AddStep(int step) { - tStart += step*60; - tEnd += step*60; -} - -bool cTimeManager::DelStep(int step) { - if ((tStart - step*60)+30*60 < t) { - return true; - } - tStart -= step*60; - tEnd -= step*60; - return false; -} - -void cTimeManager::SetTime(time_t newTime) { - tStart = newTime; - if (config.displayMode == eVertical) { - tEnd = tStart + (geoManager.osdHeight - geoManager.statusHeaderHeight - geoManager.channelHeaderHeight - geoManager.channelGroupsHeight - geoManager.footerHeight)/geoManager.minutePixel*60; - } else if (config.displayMode == eHorizontal) { - tEnd = tStart + (geoManager.osdWidth - geoManager.channelHeaderWidth - geoManager.channelGroupsWidth)/geoManager.minutePixel*60; - } -} - -time_t cTimeManager::getPrevPrimetime(time_t current) { - tm *st = localtime(¤t); - if (st->tm_hour < 21) { - current -= 24 * 60* 60; - st = localtime(¤t); - } - st->tm_hour = 20; - st->tm_min = 0; - time_t primeTime = mktime(st); - return primeTime; -} - -time_t cTimeManager::getNextPrimetime(time_t current){ - tm *st = localtime(¤t); - if (st->tm_hour > 19) { - current += 24 * 60* 60; - st = localtime(¤t); - } - st->tm_hour = 20; - st->tm_min = 0; - time_t primeTime = mktime(st); - return primeTime; -} - -bool cTimeManager::tooFarInPast(time_t current) { - if (current < t) { - return true; - } - return false; -} - -cString cTimeManager::GetCurrentTime() { - char buf[25]; - t = time(0); - tm *st = localtime(&t); - //snprintf(text, sizeof(text), "%d:%02d", st->tm_hour, st->tm_min); - if (config.timeFormat == e12Hours) { - strftime(buf, sizeof(buf), "%I:%M %p", st); - } else if (config.timeFormat == e24Hours) - strftime(buf, sizeof(buf), "%H:%M", st); - return buf; - -} - -cString cTimeManager::GetDate() { - char text[6]; - tm *st = localtime(&tStart); - snprintf(text, sizeof(text), "%d.%d", st->tm_mday, st->tm_mon+1); - return text; -} - -cString cTimeManager::GetWeekday() { - return WeekDayName(tStart); -} - -int cTimeManager::GetTimelineOffset() { - tm *st = localtime(&tStart); - int offset = st->tm_hour*60; - offset += st->tm_min; - return offset; -} - -time_t cTimeManager::GetRounded() { - tm *rounded = localtime ( &tStart ); - rounded->tm_sec = 0; - if (rounded->tm_min > 29) - rounded->tm_min = 30; - else - rounded->tm_min = 0; - return mktime(rounded); -} - -bool cTimeManager::NowVisible(void) { - if (t > tStart) - return true; - return false; -} - - -void cTimeManager::debug() { - esyslog("t: %s, tStart: %s, tEnd: %s", *TimeString(t), *TimeString(tStart), *TimeString(tEnd)); -} - -// --- cTimeInterval ------------------------------------------------------------- - -cTimeInterval::cTimeInterval(time_t start, time_t stop) { - this->start = start; - this->stop = stop; -} - -cTimeInterval::~cTimeInterval(void) { -} - -cTimeInterval *cTimeInterval::Intersect(cTimeInterval *interval) { - time_t startIntersect, stopIntersect; - - if ((stop <= interval->Start()) || (interval->Stop() <= start)) { - return NULL; - } - - if (start <= interval->Start()) { - startIntersect = interval->Start(); - } else { - startIntersect = start; - } - if (stop <= interval->Stop()) { - stopIntersect = stop; - } else { - stopIntersect = interval->Stop(); - } - return new cTimeInterval(startIntersect, stopIntersect); -} - -cTimeInterval *cTimeInterval::Union(cTimeInterval *interval) { - time_t startUnion, stopUnion; - - if (start <= interval->Start()) { - startUnion = start; - } else { - startUnion = interval->Start(); - } - if (stop <= interval->Stop()) { - stopUnion = interval->Stop(); - } else { - stopUnion = stop; - } - return new cTimeInterval(startUnion, stopUnion); -} diff --git a/timer.h b/timer.h deleted file mode 100644 index 35f28c7..0000000 --- a/timer.h +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef __TVGUIDE_TIMEMANAGER_H -#define __TVGUIDE_TIMEMANAGER_H - -#include - -// --- cTimeManager ------------------------------------------------------------- - -class cTimeManager { - private: - time_t t; - time_t tStart; - time_t tEnd; - public: - cTimeManager(){}; - virtual ~cTimeManager(void); - static cString printTime(time_t displayTime); - void Now(); - time_t GetNow() { return t; }; - void AddStep(int step); - bool DelStep(int step); - void SetTime(time_t newTime); - time_t Get() {return t;}; - time_t GetStart() {return tStart;}; - time_t GetEnd() {return tEnd;}; - cString GetCurrentTime(); - cString GetDate(); - cString GetWeekday(); - time_t getPrevPrimetime(time_t current); - time_t getNextPrimetime(time_t current); - bool tooFarInPast(time_t current); - int GetTimelineOffset(); - time_t GetRounded(); - bool NowVisible(void); - void debug(); -}; - -// --- cTimeInterval ------------------------------------------------------------- - -class cTimeInterval { - private: - time_t start; - time_t stop; - public: - cTimeInterval(time_t start, time_t stop); - virtual ~cTimeInterval(void); - time_t Start(void) { return start; }; - time_t Stop(void) { return stop; }; - cTimeInterval *Intersect(cTimeInterval *interval); - cTimeInterval *Union(cTimeInterval *interval); -}; - -#endif //__TVGUIDE_TIMEMANAGER_H diff --git a/timerconflict.c b/timerconflict.c index e57d6ff..1920a9c 100644 --- a/timerconflict.c +++ b/timerconflict.c @@ -2,7 +2,7 @@ #include #include #include "tools.h" -#include "timer.h" +#include "timemanager.h" #include "timerconflict.h" cTVGuideTimerConflict::cTVGuideTimerConflict(void) { diff --git a/tvguideosd.h b/tvguideosd.h index 9b02c70..ee4b750 100644 --- a/tvguideosd.h +++ b/tvguideosd.h @@ -1,7 +1,7 @@ #ifndef __TVGUIDE_TVGUIDEOSD_H #define __TVGUIDE_TVGUIDEOSD_H -#include "timer.h" +#include "timemanager.h" #include "grid.h" #include "channelepg.h" #include "statusheader.h" -- cgit v1.2.3