summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Neumann <fnu@yavdr.org>2017-05-23 16:30:16 (GMT)
committerFrank Neumann <fnu@yavdr.org>2017-05-23 16:30:16 (GMT)
commit7bfd6f27292607ecb1e20b04e0fea8400fcaffe0 (patch)
tree7df987cbb2c2ab273a3143630848a19ee6fad27c
parentb08459c154b41421bcfde5fb585738af78e59f12 (diff)
downloadvdr-plugin-epgsearch-7bfd6f27292607ecb1e20b04e0fea8400fcaffe0.tar.gz
vdr-plugin-epgsearch-7bfd6f27292607ecb1e20b04e0fea8400fcaffe0.tar.bz2
polishing code formatting.
-rw-r--r--blacklist.c6
-rw-r--r--epgsearchsetup.c2
-rw-r--r--menu_announcelist.c2
-rw-r--r--menu_commands.c2
-rw-r--r--menu_deftimercheckmethod.c2
-rw-r--r--menu_dirselect.c2
-rw-r--r--menu_event.c8
-rw-r--r--menu_searchedit.c8
-rw-r--r--menu_searchresults.c2
-rw-r--r--menu_timersdone.c2
-rw-r--r--menu_whatson.c4
-rw-r--r--searchtimer_thread.c2
12 files changed, 20 insertions, 22 deletions
diff --git a/blacklist.c b/blacklist.c
index 324938a..8549c01 100644
--- a/blacklist.c
+++ b/blacklist.c
@@ -636,10 +636,8 @@ const cEvent * cBlacklist::GetEventByBlacklist(const cSchedule *schedule, const
cSearchResults* cBlacklist::Run(cSearchResults* pSearchResults, int MarginStop)
{
LogFile.Log(3,"start search for blacklist '%s'", search);
-
- LOCK_CHANNELS_READ;
- LOCK_SCHEDULES_READ;
-
+ LOCK_CHANNELS_READ;
+ LOCK_SCHEDULES_READ;
const cSchedule *Schedule = Schedules->First();
while (Schedule) {
diff --git a/epgsearchsetup.c b/epgsearchsetup.c
index b0d4674..851c115 100644
--- a/epgsearchsetup.c
+++ b/epgsearchsetup.c
@@ -52,7 +52,7 @@ const char *cMenuSetupMailNotification::MailBoxChars = " abcdefghijklmnopqrs
// ------------------
// cMenuSetupSubMenu
cMenuSetupSubMenu::cMenuSetupSubMenu(const char* Title, cEPGSearchConfig* Data)
-: cOsdMenu(Title, 33)
+:cOsdMenu(Title, 33)
{
SetMenuCategory(mcSetupPlugins);
data = Data;
diff --git a/menu_announcelist.c b/menu_announcelist.c
index 5a80b62..125fbeb 100644
--- a/menu_announcelist.c
+++ b/menu_announcelist.c
@@ -86,7 +86,7 @@ eOSState cMenuAnnounceList::ProcessKey(eKeys Key)
// --- cMenuAnnounceDetails -------------------------------------------------------
cMenuAnnounceDetails::cMenuAnnounceDetails(const cEvent* Event, const cSearchExt* Search)
- :cOsdMenu("", 25), event(Event)
+:cOsdMenu("", 25), event(Event)
{
SetMenuCategory(mcEvent);
cMenuAnnounceList::showsDetails = true;
diff --git a/menu_commands.c b/menu_commands.c
index b1ed8db..0ceb1af 100644
--- a/menu_commands.c
+++ b/menu_commands.c
@@ -43,7 +43,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
// --- cMenuSearchCommands ---------------------------------------------------------
cMenuSearchCommands::cMenuSearchCommands(const char *Title, const cEvent* Event, bool DirectCall, cSearchExt* Search)
- :cOsdMenu(Title)
+:cOsdMenu(Title)
{
SetMenuCategory(mcCommand);
diff --git a/menu_deftimercheckmethod.c b/menu_deftimercheckmethod.c
index 45c4291..ce37dd5 100644
--- a/menu_deftimercheckmethod.c
+++ b/menu_deftimercheckmethod.c
@@ -118,7 +118,7 @@ void cDefTimerCheckModes::SetMode(const cChannel* channel, int mode)
// --- cMenuDefTimerCheckMethod ---------------------------------------------------------
cMenuDefTimerCheckMethod::cMenuDefTimerCheckMethod()
- :cOsdMenu(tr("Default timer check method"), 20)
+:cOsdMenu(tr("Default timer check method"), 20)
{
SetMenuCategory(mcSetupPlugins);
CheckModes[0] = tr("no check");
diff --git a/menu_dirselect.c b/menu_dirselect.c
index 50906bd..4f9cfc4 100644
--- a/menu_dirselect.c
+++ b/menu_dirselect.c
@@ -62,7 +62,7 @@ int cMenuDirItem::Compare(const cListObject &ListObject) const
// --- cMenuDirSelect ---------------------------------------------------------
cMenuDirSelect::cMenuDirSelect(char* szDirectory)
- :cOsdMenu(tr("Select directory"))
+:cOsdMenu(tr("Select directory"))
{
SetMenuCategory(mcTimerEdit);
diff --git a/menu_event.c b/menu_event.c
index 2e91b39..e94b54a 100644
--- a/menu_event.c
+++ b/menu_event.c
@@ -29,10 +29,10 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
#include "epgsearchtools.h"
// --- cMenuEventSearch ------------------------------------------------------------
-cMenuEventSearch::cMenuEventSearch(const cEvent* Event, cEventObjects& EventObjects, MenuEventSurfMode SurfMode)
- :cOsdMenu(tr("Event")),
- eventObjects(EventObjects),
- surfMode(SurfMode)
+cMenuEventSearch::cMenuEventSearch(const cEvent* Event, cEventObjects& EventObjects, MenuEventSurfMode SurfMode)
+:cOsdMenu(tr("Event")),
+eventObjects(EventObjects),
+surfMode(SurfMode)
{
SetMenuCategory(mcEvent);
diff --git a/menu_searchedit.c b/menu_searchedit.c
index 9a2276e..89c508d 100644
--- a/menu_searchedit.c
+++ b/menu_searchedit.c
@@ -47,7 +47,7 @@ cSearchExtCats SearchExtCats;
// --- cMenuEditSearchExt --------------------------------------------------------
cMenuEditSearchExt::cMenuEditSearchExt(cSearchExt *SearchExt, bool New, bool Template, bool FromEPG)
- :cOsdMenu(tr("Edit search"),32)
+:cOsdMenu(tr("Edit search"),32)
{
SetMenuCategory(mcPlugin);
templateMode = Template;
@@ -819,7 +819,7 @@ eOSState cMenuEditSearchExt::ProcessKey(eKeys Key)
// --- cMenuEditDaysOfWeek --------------------------------------------------------
cMenuEditDaysOfWeek::cMenuEditDaysOfWeek(int* DaysOfWeek, int Offset, bool Negate)
- :cOsdMenu(tr("Edit user-defined days of week"),30)
+:cOsdMenu(tr("Edit user-defined days of week"),30)
{
SetMenuCategory(mcPlugin);
int i=0;
@@ -863,7 +863,7 @@ eOSState cMenuEditDaysOfWeek::ProcessKey(eKeys Key)
// --- cMenuSearchEditCompCats --------------------------------------------------------
cMenuSearchEditCompCats::cMenuSearchEditCompCats(int* catarrayAvoidRepeats)
- :cOsdMenu(tr("Compare categories"),30)
+:cOsdMenu(tr("Compare categories"),30)
{
SetMenuCategory(mcPlugin);
search_catarrayAvoidRepeats = catarrayAvoidRepeats;
@@ -1054,7 +1054,7 @@ eOSState cMenuBlacklistsSelection::ProcessKey(eKeys Key)
// --- cMenuCatValuesSelect --------------------------------------------------------
cMenuCatValuesSelect::cMenuCatValuesSelect(char* CatValues, int CatIndex, int SearchMode)
- :cOsdMenu(tr("Values for EPG category"), 1, 40)
+:cOsdMenu(tr("Values for EPG category"), 1, 40)
{
SetMenuCategory(mcPlugin);
diff --git a/menu_searchresults.c b/menu_searchresults.c
index b3d3e8f..4d647d4 100644
--- a/menu_searchresults.c
+++ b/menu_searchresults.c
@@ -196,7 +196,7 @@ void cMenuSearchResultsItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Inde
const cEvent *cMenuSearchResults::scheduleEventInfo = NULL;
cMenuSearchResults::cMenuSearchResults(cMenuTemplate* MenuTemplate)
- :cOsdMenu("", MenuTemplate->Tab(0), MenuTemplate->Tab(1), MenuTemplate->Tab(2), MenuTemplate->Tab(3), MenuTemplate->Tab(4))
+:cOsdMenu("", MenuTemplate->Tab(0), MenuTemplate->Tab(1), MenuTemplate->Tab(2), MenuTemplate->Tab(3), MenuTemplate->Tab(4))
{
SetMenuCategory(mcSchedule);
diff --git a/menu_timersdone.c b/menu_timersdone.c
index 7b7fe04..5120bad 100644
--- a/menu_timersdone.c
+++ b/menu_timersdone.c
@@ -66,7 +66,7 @@ int cMenuTimerDoneItem::Compare(const cListObject &ListObject) const
// --- cMenuTimersDone ----------------------------------------------------------
cMenuTimersDone::cMenuTimersDone(cSearchExt* Search)
- :cOsdMenu("", 4, 15)
+:cOsdMenu("", 4, 15)
{
SetMenuCategory(mcTimer);
diff --git a/menu_whatson.c b/menu_whatson.c
index 14ff5b6..253251d 100644
--- a/menu_whatson.c
+++ b/menu_whatson.c
@@ -304,7 +304,7 @@ time_t cMenuWhatsOnSearch::seekTime = 0;
int cMenuWhatsOnSearch::shiftTime = 0;
cMenuWhatsOnSearch::cMenuWhatsOnSearch(const cSchedules *Schedules, int CurrentChannelNr)
- :cOsdMenu("", GetTab(1), GetTab(2), GetTab(3), GetTab(4), GetTab(5))
+:cOsdMenu("", GetTab(1), GetTab(2), GetTab(3), GetTab(4), GetTab(5))
{
if (currentShowMode == showNow)
SetMenuCategory(mcScheduleNow);
@@ -633,7 +633,7 @@ eOSState cMenuWhatsOnSearch::Record(void)
ERROR(tr("Epgsearch: RemoteTimerModifications failed"));
}
else {
- gl_timerStatusMonitor->SetConflictCheckAdvised();
+ gl_timerStatusMonitor->SetConflictCheckAdvised();
timer->Matches();
Timers->SetModified();
LogFile.iSysLog("timer %s added (active)", *timer->ToDescr());
diff --git a/searchtimer_thread.c b/searchtimer_thread.c
index 1d1fcb4..7d7ddaa 100644
--- a/searchtimer_thread.c
+++ b/searchtimer_thread.c
@@ -310,7 +310,7 @@ void cSearchTimerThread::Action(void)
const cTimer *t = GetTimer(searchExt, pEvent, bTimesMatchExactly);
char* Summary = NULL;
- uint timerMod = tmNoChange;
+ uint timerMod = tmNoChange;
if (t)
{ // already exists