summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--HISTORY1
-rw-r--r--HISTORY.DE1
-rw-r--r--conflictcheck.h4
-rw-r--r--mail.c2
-rw-r--r--menu_main.c2
-rw-r--r--menu_myedittimer.c4
-rw-r--r--menu_search.c10
-rw-r--r--menu_searchresults.c6
-rw-r--r--menu_searchtemplate.c10
-rw-r--r--menu_whatson.c6
-rw-r--r--searchtimer_thread.c2
11 files changed, 31 insertions, 17 deletions
diff --git a/HISTORY b/HISTORY
index 110b863..c93440b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -44,6 +44,7 @@ fixes:
and active LIEMIKUUTIO
- 'avoid repeats' combined with 'pause on ... recordings' created to less timers, thanks
to spockele@vdrportal for reporting
+- fixed some compiler warnings with g++ 4.3
2007-09-02: Version 0.9.23
new:
diff --git a/HISTORY.DE b/HISTORY.DE
index 3c3a2ab..941d8d4 100644
--- a/HISTORY.DE
+++ b/HISTORY.DE
@@ -51,6 +51,7 @@ fixes:
und aktivem LIEMIKUUTIO versehen wurde.
- 'Wiederholung vermeiden' kombiniert mit 'Pause, wenn ... Aufnahmen existieren' hat
zu wenige Timer erzeugt, Danke an spockele@vdrportal für den Hinweis
+- einige Compilerwarnungen von g++ 4.3 behoben
2007-09-02: Version 0.9.23
diff --git a/conflictcheck.h b/conflictcheck.h
index ea344b3..b24fa99 100644
--- a/conflictcheck.h
+++ b/conflictcheck.h
@@ -153,7 +153,7 @@ class cConflictCheckDevice
{
if (IsTunedTo(Channel))
{
- if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid(0) && ! HasPid(Channel->Apid(0)))
+ if ((Channel->Vpid() && !HasPid(Channel->Vpid())) || (Channel->Apid(0) && ! HasPid(Channel->Apid(0))))
{
#ifdef DO_MULTIPLE_RECORDINGS
#ifndef DO_MULTIPLE_CA_CHANNELS
@@ -242,7 +242,7 @@ class cConflictCheckDevice
result = hasPriority;
if (Priority >= 0 && Receiving()) {
if (IsTunedTo(Channel)) {
- if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid(0) && !HasPid(Channel->Apid(0))) {
+ if ((Channel->Vpid() && !HasPid(Channel->Vpid())) || (Channel->Apid(0) && !HasPid(Channel->Apid(0)))) {
#ifdef DO_MULTIPLE_RECORDINGS
if (CamSlot() && Channel->Ca() >= CA_ENCRYPTED_MIN) {
if (CamSlot()->CanDecrypt(Channel))
diff --git a/mail.c b/mail.c
index 4f3bd3f..74c1404 100644
--- a/mail.c
+++ b/mail.c
@@ -74,10 +74,12 @@ bool cMailTimerNotification::operator< (const cMailTimerNotification &N) const
const cEvent* event = GetEvent();
const cEvent* eventOther = N.GetEvent();
if (event && eventOther) // sort event by start time and channel
+ {
if (event->StartTime() == eventOther->StartTime())
return channel->Number() < channelOther->Number();
else
return event->StartTime() < eventOther->StartTime();
+ }
return false;
}
diff --git a/menu_main.c b/menu_main.c
index c6e5939..69e3370 100644
--- a/menu_main.c
+++ b/menu_main.c
@@ -166,10 +166,12 @@ eOSState cMenuSearchMain::Record(void)
int tm = tmNone;
cTimer *timer = Timers.GetMatch(item->event, &tm);
if (timer)
+ {
if (EPGSearchConfig.useVDRTimerEditMenu)
return AddSubMenu(new cMenuEditTimer(timer));
else
return AddSubMenu(new cMenuMyEditTimer(timer, false, item->event, item->channel));
+ }
}
cTimer *timer = new cTimer(item->event);
diff --git a/menu_myedittimer.c b/menu_myedittimer.c
index 03524a6..078c3b8 100644
--- a/menu_myedittimer.c
+++ b/menu_myedittimer.c
@@ -310,8 +310,8 @@ eOSState cMenuMyEditTimer::ProcessKey(eKeys Key)
SetHelp(addIfConfirmed?NULL:trVDR("Button$Delete"), NULL, NULL, NULL);
}
- if ((Key == kYellow) && (iOnDirectoryItem && !InEditMode(ItemText, tr("Directory"), directory) ||
- iOnFileItem && !InEditMode(ItemText, tr("File"), file)))
+ if ((Key == kYellow) && ((iOnDirectoryItem && !InEditMode(ItemText, tr("Directory"), directory)) ||
+ (iOnFileItem && !InEditMode(ItemText, tr("File"), file))))
{
if (iOnDirectoryItem)
strcpy(directory, "");
diff --git a/menu_search.c b/menu_search.c
index bd95aa2..9b2dd3d 100644
--- a/menu_search.c
+++ b/menu_search.c
@@ -56,10 +56,12 @@ void cMenuSearchExtItem::Set(void)
ostringstream line;
if (searchExt->useAsSearchTimer)
- if (searchExt->IsActiveAt(time(NULL)))
- line << ">";
- else
- line << "!";
+ {
+ if (searchExt->IsActiveAt(time(NULL)))
+ line << ">";
+ else
+ line << "!";
+ }
line << "\t";
if (searchExt->search && strlen(searchExt->search) > 0)
diff --git a/menu_searchresults.c b/menu_searchresults.c
index 76fc2c9..1e15e3e 100644
--- a/menu_searchresults.c
+++ b/menu_searchresults.c
@@ -186,10 +186,12 @@ eOSState cMenuSearchResults::Record(void)
int tm = tmNone;
cTimer *timer = Timers.GetMatch(item->event, &tm);
if (timer)
- if (EPGSearchConfig.useVDRTimerEditMenu)
+ {
+ if (EPGSearchConfig.useVDRTimerEditMenu)
return AddSubMenu(new cMenuEditTimer(timer));
- else
+ else
return AddSubMenu(new cMenuMyEditTimer(timer, false, item->event));
+ }
}
cTimer *timer = new cTimer(item->event);
diff --git a/menu_searchtemplate.c b/menu_searchtemplate.c
index 0c02fc5..b5c8b04 100644
--- a/menu_searchtemplate.c
+++ b/menu_searchtemplate.c
@@ -56,10 +56,12 @@ void cMenuSearchTemplateItem::Set(void)
ostringstream line;
if (searchExt->useAsSearchTimer)
- if (searchExt->IsActiveAt(time(NULL)))
- line << ">";
- else
- line << "!";
+ {
+ if (searchExt->IsActiveAt(time(NULL)))
+ line << ">";
+ else
+ line << "!";
+ }
line << "\t";
if (searchExt->search && strlen(searchExt->search) > 0)
diff --git a/menu_whatson.c b/menu_whatson.c
index d55479b..32de452 100644
--- a/menu_whatson.c
+++ b/menu_whatson.c
@@ -468,10 +468,12 @@ eOSState cMenuWhatsOnSearch::Record(void)
int tm = tmNone;
cTimer *timer = Timers.GetMatch(item->event, &tm);
if (timer)
- if (EPGSearchConfig.useVDRTimerEditMenu)
+ {
+ if (EPGSearchConfig.useVDRTimerEditMenu)
return AddSubMenu(new cMenuEditTimer(timer));
- else
+ else
return AddSubMenu(new cMenuMyEditTimer(timer, false, item->event, item->channel));
+ }
}
cTimer *timer = NULL;
diff --git a/searchtimer_thread.c b/searchtimer_thread.c
index ae832c0..d376071 100644
--- a/searchtimer_thread.c
+++ b/searchtimer_thread.c
@@ -871,7 +871,7 @@ void cSearchTimerThread::CheckManualTimers()
}
}
LogFile.Log(3,"selected candidate is '%s~%s' (%s - %s)", event->Title(), event->ShortText()?event->ShortText():"", GETDATESTRING(event), GETTIMESTRING(event));
- if (maxweight > 0 && event->StartTime() - bstart != ti->StartTime() || event->EndTime() + bstop != ti->StopTime())
+ if ((maxweight > 0 && event->StartTime() - bstart != ti->StartTime()) || (event->EndTime() + bstop != ti->StopTime()))
ModifyManualTimer(event, ti, bstart, bstop);
else if (maxweight == 0)
LogFile.Log(3,"selected candidate is too bad");
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-24 03:38:39 +0000