frodovdr
/
vdr-plugin-tvguide
mirror of https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Cosmetic changes

This commit is contained in:
kamel5 2018-03-08 14:20:23 +01:00 committed by kamel5
parent e476e0e8c0
commit 82fb45a088
8 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grid.h
View File

@ -55,4 +55,4 @@ public:
virtual void debug() {}; virtual void debug() {};
}; };
#endif //__TVGUIDE_GRID_H #endif //__TVGUIDE_GRID_H

6
recmanager.c
View File

@ -710,7 +710,7 @@ const cEvent **cRecManager::LoadReruns(const cEvent *event, int &numResults) {
strQuery += "~"; strQuery += "~";
if (!isempty(event->ShortText())) if (!isempty(event->ShortText()))
strQuery += event->ShortText(); strQuery += event->ShortText();
data.useSubTitle = true; data.useSubTitle = true;
} else { } else {
data.useSubTitle = false; data.useSubTitle = false;
} }
@ -769,7 +769,7 @@ const cEvent **cRecManager::WhatsOnNow(bool nowOrNext, int &numResults) {
#if VDRVERSNUM >= 20301 #if VDRVERSNUM >= 20301
LOCK_SCHEDULES_READ; LOCK_SCHEDULES_READ;
LOCK_CHANNELS_READ; LOCK_CHANNELS_READ;
const cChannels* channels = Channels; // const cChannels* channels = Channels;
const cSchedules* schedules = Schedules; const cSchedules* schedules = Schedules;
#else #else
cSchedulesLock schedulesLock; cSchedulesLock schedulesLock;
@ -846,7 +846,7 @@ const cEvent **cRecManager::UserDefinedTime(int userTime, int &numResults) {
#if VDRVERSNUM >= 20301 #if VDRVERSNUM >= 20301
LOCK_CHANNELS_READ; LOCK_CHANNELS_READ;
LOCK_SCHEDULES_READ; LOCK_SCHEDULES_READ;
const cChannels* channels = Channels; // const cChannels* channels = Channels;
const cSchedules* schedules = Schedules; const cSchedules* schedules = Schedules;
#else #else
cSchedulesLock schedulesLock; cSchedulesLock schedulesLock;

32
recmenuitem.c
View File

@ -562,7 +562,7 @@ void cRecMenuItemSelect::DrawValue(void) {
} }
eRecMenuState cRecMenuItemSelect::ProcessKey(eKeys Key) { eRecMenuState cRecMenuItemSelect::ProcessKey(eKeys Key) {
int oldValue = currentVal; // int oldValue = currentVal;
switch (Key & ~k_Repeat) { switch (Key & ~k_Repeat) {
case kLeft: case kLeft:
currentVal--; currentVal--;
@ -664,7 +664,7 @@ void cRecMenuItemSelectDirectory::DrawValue(void) {
} }
eRecMenuState cRecMenuItemSelectDirectory::ProcessKey(eKeys Key) { eRecMenuState cRecMenuItemSelectDirectory::ProcessKey(eKeys Key) {
int oldValue = currentVal; // int oldValue = currentVal;
switch (Key & ~k_Repeat) { switch (Key & ~k_Repeat) {
case kLeft: case kLeft:
currentVal--; currentVal--;
@ -1180,18 +1180,18 @@ eRecMenuState cRecMenuItemText::ProcessKey(eKeys Key) {
case kDown|k_Repeat: case kDown|k_Repeat:
case kDown: case kDown:
if (InEditMode()) { if (InEditMode()) {
if (insert && newchar) { if (insert && newchar) {
// create a new character in insert mode // create a new character in insert mode
if (lengthUtf8 < length - 1) if (lengthUtf8 < length - 1)
Insert(); Insert();
} }
if (uppercase) if (uppercase)
valueUtf8[pos] = Utf8to(upper, Inc(Utf8to(lower, valueUtf8[pos]), NORMALKEY(Key) == kUp)); valueUtf8[pos] = Utf8to(upper, Inc(Utf8to(lower, valueUtf8[pos]), NORMALKEY(Key) == kUp));
else else
valueUtf8[pos] = Inc( valueUtf8[pos], NORMALKEY(Key) == kUp); valueUtf8[pos] = Inc( valueUtf8[pos], NORMALKEY(Key) == kUp);
newchar = false; newchar = false;
consumed = true; consumed = true;
} }
break; break;
case k0|k_Repeat ... k9|k_Repeat: case k0|k_Repeat ... k9|k_Repeat:
case k0 ... k9: { case k0 ... k9: {
@ -1901,7 +1901,7 @@ void cRecMenuItemEvent::Show(void) {
} }
eRecMenuState cRecMenuItemEvent::ProcessKey(eKeys Key) { eRecMenuState cRecMenuItemEvent::ProcessKey(eKeys Key) {
bool consumed = false; // bool consumed = false;
switch (Key & ~k_Repeat) { switch (Key & ~k_Repeat) {
case kOk: case kOk:
return action; return action;
@ -2960,4 +2960,4 @@ eRecMenuState cRecMenuItemFavoriteStatic::ProcessKey(eKeys Key) {
break; break;
} }
return rmsNotConsumed; return rmsNotConsumed;
} }

6
recmenus.c
View File

@ -411,7 +411,7 @@ cRecMenuConfirmRerunUsed::cRecMenuConfirmRerunUsed(const cEvent *original, const
// --- cRecMenuEditTimer --------------------------------------------------------- // --- cRecMenuEditTimer ---------------------------------------------------------
#if VDRVERSNUM >= 20301 #if VDRVERSNUM >= 20301
cRecMenuEditTimer::cRecMenuEditTimer(const cTimer *timer, eRecMenuState nextState) { cRecMenuEditTimer::cRecMenuEditTimer(const cTimer *timer, eRecMenuState nextState) {
const cTimer *originalTimer; // const cTimer *originalTimer;
#else #else
cRecMenuEditTimer::cRecMenuEditTimer(cTimer *timer, eRecMenuState nextState) { cRecMenuEditTimer::cRecMenuEditTimer(cTimer *timer, eRecMenuState nextState) {
#endif #endif
@ -1429,7 +1429,7 @@ void cRecMenuTimeline::GetTimersForDay(void) {
timersToday.clear(); timersToday.clear();
#if VDRVERSNUM >= 20301 #if VDRVERSNUM >= 20301
LOCK_TIMERS_READ; LOCK_TIMERS_READ;
const cTimers* timers = Timers; // const cTimers* timers = Timers;
for (const cTimer *t = Timers->First(); t; t = Timers->Next(t)) { for (const cTimer *t = Timers->First(); t; t = Timers->Next(t)) {
#else #else
for (cTimer *t = Timers.First(); t; t = Timers.Next(t)) { for (cTimer *t = Timers.First(); t; t = Timers.Next(t)) {
@ -1632,4 +1632,4 @@ int cRecMenuFavorites::GetTotalNumMenuItems(void) {
cTVGuideSearchTimer cRecMenuFavorites::GetFavorite(void) { cTVGuideSearchTimer cRecMenuFavorites::GetFavorite(void) {
cRecMenuItemFavorite *activeItem = dynamic_cast<cRecMenuItemFavorite*>(GetActiveMenuItem()); cRecMenuItemFavorite *activeItem = dynamic_cast<cRecMenuItemFavorite*>(GetActiveMenuItem());
return activeItem->GetFavorite(); return activeItem->GetFavorite();
} }

8
timerconflict.c
View File

@ -79,9 +79,9 @@ void cTVGuideTimerConflicts::AddConflict(std::string epgSearchConflictLine) {
} }
void cTVGuideTimerConflicts::CalculateConflicts(void) { void cTVGuideTimerConflicts::CalculateConflicts(void) {
numConflicts = conflicts.size(); numConflicts = conflicts.size();
time_t startTime = 0; // time_t startTime = 0;
time_t endTime = 0; // time_t endTime = 0;
for (int i=0; i < numConflicts; i++) { for (int i=0; i < numConflicts; i++) {
cTimeInterval *unionSet = NULL; cTimeInterval *unionSet = NULL;
int numTimers = conflicts[i]->timerIDs.size(); int numTimers = conflicts[i]->timerIDs.size();
@ -184,4 +184,4 @@ std::vector<cTVGuideTimerConflict*> cTVGuideTimerConflicts::GetConflictsBetween(
conflictsFound.push_back(conflicts[i]); conflictsFound.push_back(conflicts[i]);
} }
return conflictsFound; return conflictsFound;
} }

2
tools.c
View File

@ -463,7 +463,7 @@ int afuzzy_checkSUB(const char *t, AFUZZY *fuzzy)
return 0; return 0;
} }
static int afuzzy_checkFLT(const char *t, AFUZZY *fuzzy) int afuzzy_checkFLT(const char *t, AFUZZY *fuzzy)
{ {
register Uint FilterR = 0; register Uint FilterR = 0;
register Uint FilterR1; register Uint FilterR1;

32
tools.h
View File

@ -45,27 +45,27 @@ typedef unsigned int Uint;
typedef struct typedef struct
{ {
Uint *R, Uint *R,
*R1, *R1,
*RP, *RP,
*S, *S,
*RI; *RI;
Uint *FilterS; Uint *FilterS;
int Map[256]; int Map[256];
int FilterMap[256]; int FilterMap[256];
int k; int k;
Uint mask_ok; Uint mask_ok;
Uint filter_ok; Uint filter_ok;
Uint filter_shift; Uint filter_shift;
int r_size; int r_size;
int FilterSet; int FilterSet;
} AFUZZY; } AFUZZY;
void afuzzy_init(const char *p, int kerr, int UseFilter, AFUZZY *fuzzy); void afuzzy_init(const char *p, int kerr, int UseFilter, AFUZZY *fuzzy);
void afuzzy_free(AFUZZY *fuzzy); void afuzzy_free(AFUZZY *fuzzy);
int afuzzy_checkSUB(const char *t, AFUZZY *fuzzy); int afuzzy_checkSUB(const char *t, AFUZZY *fuzzy);
static int afuzzy_checkFLT(const char *t, AFUZZY *fuzzy); int afuzzy_checkFLT(const char *t, AFUZZY *fuzzy);
#endif #endif
#endif // __TVGUIDETOOLS_H #endif // __TVGUIDETOOLS_H

10
view.c
View File

@ -137,9 +137,9 @@ void cView::DrawHeader(void) {
} else { } else {
#if VDRVERSNUM >= 20301 #if VDRVERSNUM >= 20301
LOCK_TIMERS_READ; LOCK_TIMERS_READ;
ti=Timers->GetMatch(event, &timerMatch); ti = Timers->GetMatch(event, &timerMatch);
#else #else
ti=Timers.GetMatch(event, &timerMatch); ti = Timers.GetMatch(event, &timerMatch);
#endif #endif
} }
if (timerMatch == tmFull) { if (timerMatch == tmFull) {
@ -357,7 +357,7 @@ void cView::DrawActors(std::vector<cActor> *actors) {
int y = 2 * border + fontHeaderLarge->Height(); int y = 2 * border + fontHeaderLarge->Height();
if (!Running()) if (!Running())
return; return;
cImageLoader imgLoader; cImageLoader imgLoader;
int actor = 0; int actor = 0;
for (int row = 0; row < picLines; row++) { for (int row = 0; row < picLines; row++) {
for (int col = 0; col < picsPerLine; col++) { for (int col = 0; col < picsPerLine; col++) {
@ -475,7 +475,7 @@ bool cView::KeyUp(void) {
if (!scrollable) if (!scrollable)
return false; return false;
int aktHeight = pixmapContent->DrawPort().Point().Y(); int aktHeight = pixmapContent->DrawPort().Point().Y();
int lineHeight = font->Height(); // int lineHeight = font->Height();
if (aktHeight >= 0) { if (aktHeight >= 0) {
return false; return false;
} }
@ -1053,4 +1053,4 @@ void cMovieView::Action(void) {
} }
DrawScrollbar(); DrawScrollbar();
osdManager.flush(); osdManager.flush();
} }