summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--changrp.c20
-rw-r--r--conflictcheck_thread.c2
-rw-r--r--epgsearchext.h2
-rw-r--r--epgsearchsetup.c2
-rw-r--r--epgsearchtools.c4
-rw-r--r--epgsearchtools.h5
-rw-r--r--mainmenushortcut.c5
-rw-r--r--menu_blacklistedit.c12
-rw-r--r--menu_commands.c6
-rw-r--r--menu_main.c2
-rw-r--r--menu_myedittimer.c4
-rw-r--r--menu_quicksearch.c12
-rw-r--r--menu_searchactions.c4
-rw-r--r--menu_searchedit.c14
-rw-r--r--menu_searchresults.c4
-rw-r--r--menu_templateedit.c12
-rw-r--r--menu_whatson.c2
-rw-r--r--searchtimer_thread.c6
18 files changed, 60 insertions, 58 deletions
diff --git a/changrp.c b/changrp.c
index 45be2c3..33aa93c 100644
--- a/changrp.c
+++ b/changrp.c
@@ -351,14 +351,14 @@ eOSState cMenuChannelGroups::Delete(void)
if (search)
{
cString Message = cString::sprintf("%s %s", tr("Channel group used by:"), search->search);
- Skins.Message(mtInfo, Message);
- return osContinue;
+ INFO(Message);
+ return osContinue;
}
if (Interface->Confirm(tr("Edit$Delete group?"))) {
- ChannelGroups.Del(curGroup);
- ChannelGroups.Save();
- cOsdMenu::Del(Current());
- Display();
+ ChannelGroups.Del(curGroup);
+ ChannelGroups.Save();
+ cOsdMenu::Del(Current());
+ Display();
}
}
return osContinue;
@@ -464,13 +464,13 @@ eOSState cMenuEditChannelGroup::ProcessKey(eKeys Key)
case kOk:
if (strlen(name) == 0)
{
- Skins.Message(mtError, tr("Group name is empty!"));
- return osContinue;
+ ERROR(tr("Group name is empty!"));
+ return osContinue;
}
if (addIfConfirmed && ChannelGroups.GetGroupByName(name))
{
- Skins.Message(mtError, tr("Group name already exists!"));
- return osContinue;
+ ERROR(tr("Group name already exists!"));
+ return osContinue;
}
{
diff --git a/conflictcheck_thread.c b/conflictcheck_thread.c
index aa14ef2..71e31c5 100644
--- a/conflictcheck_thread.c
+++ b/conflictcheck_thread.c
@@ -126,7 +126,7 @@ void cConflictCheckThread::Action(void)
bool doMessage = EPGSearchConfig.noConflMsgWhileReplay == 0 ||
!cDevice::PrimaryDevice()->Replaying() ||
conflictCheck.nextRelevantConflictDate - now < 2*60*60;
- if (doMessage && SendMsg(msgfmt, true,7) == kOk)
+ if (doMessage && SendMsg(msgfmt, true,7, mtWarning) == kOk)
{
m_plugin->showConflicts = true;
cRemote::CallPlugin("epgsearch");
diff --git a/epgsearchext.h b/epgsearchext.h
index e416a12..3e4648e 100644
--- a/epgsearchext.h
+++ b/epgsearchext.h
@@ -36,8 +36,6 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
#include "epgsearchtools.h"
#define MAXOSDTEXTWIDTH 45
-#define ERROR(T) Skins.Message(mtError, T)
-#define INFO(I) Skins.Message(mtInfo, I)
typedef enum
{
diff --git a/epgsearchsetup.c b/epgsearchsetup.c
index bb9a380..521fd84 100644
--- a/epgsearchsetup.c
+++ b/epgsearchsetup.c
@@ -921,7 +921,7 @@ eOSState cMenuSetupMailNotification::TestMailAccount()
if (M.TestMailAccount(data->MailAddressTo, data->MailAddress, data->MailServer, data->MailAuthUser, data->MailAuthPass))
return AddSubMenu(new cMenuText("", M.scriptReply.c_str(), fontSml));
else
- Skins.Message(mtError, tr("Mail account check failed!"));
+ ERROR(tr("Mail account check failed!"));
return osContinue;
}
diff --git a/epgsearchtools.c b/epgsearchtools.c
index 4b0fb51..3324f64 100644
--- a/epgsearchtools.c
+++ b/epgsearchtools.c
@@ -435,9 +435,9 @@ bool SendViaSVDRP(cString SVDRPcmd)
return bSuccess;
}
-int SendMsg(cString Message, bool confirm, int seconds)
+int SendMsg(cString Message, bool confirm, int seconds, eMessageType messageType)
{
- int Keys = Skins.QueueMessage(mtInfo, Message, seconds, confirm?seconds+2:0);
+ int Keys = Skins.QueueMessage(messageType, Message, seconds, confirm?seconds+2:0);
return Keys;
}
diff --git a/epgsearchtools.h b/epgsearchtools.h
index 069cb1e..fed2620 100644
--- a/epgsearchtools.h
+++ b/epgsearchtools.h
@@ -109,6 +109,9 @@ using std::string;
#define CONTENT_DESCRIPTOR_MAX 255
+#define ERROR(T) Skins.Message(mtError, T)
+#define INFO(I) Skins.Message(mtInfo, I)
+
extern const char AllowedChars[];
extern char* ConfigDir;
@@ -148,7 +151,7 @@ inline char *strreplacei(char *s, const char *s1, const char s2)
void sleepMSec(long ms);
void sleepSec(long s);
bool SendViaSVDRP(cString SVDRPcmd);
-int SendMsg(cString Message, bool confirm = false, int seconds = 0);
+int SendMsg(cString Message, bool confirm = false, int seconds = 0, eMessageType messageType = mtInfo);
bool InEditMode(const char* ItemText, const char* ItemName, const char* ItemValue);
cSearchExt* TriggeredFromSearchTimer(const cTimer* timer);
int TriggeredFromSearchTimerID(const cTimer* timer);
diff --git a/mainmenushortcut.c b/mainmenushortcut.c
index 7461330..1baedfe 100644
--- a/mainmenushortcut.c
+++ b/mainmenushortcut.c
@@ -28,6 +28,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
#include <vdr/plugin.h>
#include "services.h"
#include "mainmenushortcut.h"
+#include "epgsearchtools.h"
static const char SETUPENTRY[] = "MainMenuEntryEnabled";
@@ -64,12 +65,12 @@ cOsdMenu *cMainMenuShortcut::GetEpgSearchMenu(const char *serviceName)
if (epgSearchPlugin->Service(serviceName, serviceData)) {
menu = serviceData->Menu;
} else {
- Skins.Message(mtError, tr("This version of EPGSearch does not support this service!"));
+ ERROR(tr("This version of EPGSearch does not support this service!"));
}
delete serviceData;
} else {
- Skins.Message(mtError, tr("EPGSearch does not exist!"));
+ ERROR(tr("EPGSearch does not exist!"));
}
return menu;
}
diff --git a/menu_blacklistedit.c b/menu_blacklistedit.c
index 9637bd3..d568376 100644
--- a/menu_blacklistedit.c
+++ b/menu_blacklistedit.c
@@ -356,21 +356,21 @@ eOSState cMenuBlacklistEdit::ProcessKey(eKeys Key)
data.channelMin = ch;
else
{
- Skins.Message(mtError, tr("*** Invalid Channel ***"));
- break;
+ ERROR(tr("*** Invalid Channel ***"));
+ break;
}
ch = Channels.GetByNumber(channelMax);
if (ch)
data.channelMax = ch;
else
{
- Skins.Message(mtError, tr("*** Invalid Channel ***"));
- break;
+ ERROR(tr("*** Invalid Channel ***"));
+ break;
}
if (channelMin > channelMax)
{
- Skins.Message(mtError, tr("Please check channel criteria!"));
- return osContinue;
+ ERROR(tr("Please check channel criteria!"));
+ return osContinue;
}
}
if (data.useChannel==2)
diff --git a/menu_commands.c b/menu_commands.c
index 309aef5..25533db 100644
--- a/menu_commands.c
+++ b/menu_commands.c
@@ -107,8 +107,8 @@ eOSState cMenuSearchCommands::Switch(void)
return osEnd;
else
{
- Skins.Message(mtInfo, trVDR("Can't switch channel!"));
- return osContinue;
+ INFO(trVDR("Can't switch channel!"));
+ return osContinue;
}
}
@@ -200,7 +200,7 @@ eOSState cMenuSearchCommands::AddToSwitchList(void)
time_t now = time(NULL);
if (now >= event->StartTime())
{
- Skins.Message(mtError, tr("Already running!"));
+ ERROR(tr("Already running!"));
return osBack;
}
cSwitchTimer* switchTimer = SwitchTimers.InSwitchList(event);
diff --git a/menu_main.c b/menu_main.c
index a38e640..1b48602 100644
--- a/menu_main.c
+++ b/menu_main.c
@@ -258,7 +258,7 @@ eOSState cMenuSearchMain::Switch(void)
if (channel && cDevice::PrimaryDevice()->SwitchChannel(channel, true))
return osEnd;
}
- Skins.Message(mtInfo, trVDR("Can't switch channel!"));
+ INFO(trVDR("Can't switch channel!"));
return osContinue;
}
diff --git a/menu_myedittimer.c b/menu_myedittimer.c
index c727501..256518f 100644
--- a/menu_myedittimer.c
+++ b/menu_myedittimer.c
@@ -327,8 +327,8 @@ eOSState cMenuMyEditTimer::ProcessKey(eKeys Key)
cChannel *ch = Channels.GetByNumber(channel);
if (!ch)
{
- Skins.Message(mtError, tr("*** Invalid Channel ***"));
- break;
+ ERROR(tr("*** Invalid Channel ***"));
+ break;
}
string fullaux = "";
diff --git a/menu_quicksearch.c b/menu_quicksearch.c
index 9a4e94a..0250ef3 100644
--- a/menu_quicksearch.c
+++ b/menu_quicksearch.c
@@ -253,21 +253,21 @@ eOSState cMenuQuickSearch::ProcessKey(eKeys Key)
data.channelMin = ch;
else
{
- Skins.Message(mtError, tr("*** Invalid Channel ***"));
- break;
+ ERROR(tr("*** Invalid Channel ***"));
+ break;
}
ch = Channels.GetByNumber(channelMax);
if (ch)
data.channelMax = ch;
else
{
- Skins.Message(mtError, tr("*** Invalid Channel ***"));
- break;
+ ERROR(tr("*** Invalid Channel ***"));
+ break;
}
if (channelMin > channelMax)
{
- Skins.Message(mtError, tr("Please check channel criteria!"));
- return osContinue;
+ ERROR(tr("Please check channel criteria!"));
+ return osContinue;
}
}
if (data.useChannel==2)
diff --git a/menu_searchactions.c b/menu_searchactions.c
index 42c9e0c..ce5be9e 100644
--- a/menu_searchactions.c
+++ b/menu_searchactions.c
@@ -99,7 +99,7 @@ eOSState cMenuSearchActions::OnOffSearchtimer(void)
if (!EPGSearchConfig.useSearchTimers) // enable search timer thread if necessary
{
cSearchTimerThread::Init((cPluginEpgsearch*) cPluginManager::GetPlugin("epgsearch"), true);
- Skins.Message(mtInfo, tr("Search timers activated in setup."));
+ INFO(tr("Search timers activated in setup."));
}
}
}
@@ -122,7 +122,7 @@ eOSState cMenuSearchActions::Execute()
if (!EPGSearchConfig.useSearchTimers) // enable search timer thread if necessary
{
cSearchTimerThread::Init((cPluginEpgsearch*) cPluginManager::GetPlugin("epgsearch"), true);
- Skins.Message(mtInfo, tr("Search timers activated in setup."));
+ INFO(tr("Search timers activated in setup."));
}
if (Interface->Confirm(tr("Run search timer update?")))
updateForced = 3; // with message about completion
diff --git a/menu_searchedit.c b/menu_searchedit.c
index c312278..4444625 100644
--- a/menu_searchedit.c
+++ b/menu_searchedit.c
@@ -648,21 +648,21 @@ eOSState cMenuEditSearchExt::ProcessKey(eKeys Key)
data.channelMin = ch;
else
{
- Skins.Message(mtError, tr("*** Invalid Channel ***"));
- break;
+ ERROR(tr("*** Invalid Channel ***"));
+ break;
}
ch = Channels.GetByNumber(channelMax);
if (ch)
data.channelMax = ch;
else
{
- Skins.Message(mtError, tr("*** Invalid Channel ***"));
- break;
+ ERROR(tr("*** Invalid Channel ***"));
+ break;
}
if (channelMin > channelMax)
{
- Skins.Message(mtError, tr("Please check channel criteria!"));
- return osContinue;
+ ERROR(tr("Please check channel criteria!"));
+ return osContinue;
}
}
if (data.useChannel==2)
@@ -729,7 +729,7 @@ eOSState cMenuEditSearchExt::ProcessKey(eKeys Key)
if (searchExt->useAsSearchTimer && !EPGSearchConfig.useSearchTimers) // enable search timer thread if necessary
{
cSearchTimerThread::Init((cPluginEpgsearch*) cPluginManager::GetPlugin("epgsearch"), true);
- Skins.Message(mtInfo, tr("Search timers activated in setup."));
+ INFO(tr("Search timers activated in setup."));
}
SearchExts.Save();
diff --git a/menu_searchresults.c b/menu_searchresults.c
index 6c7c261..04b564a 100644
--- a/menu_searchresults.c
+++ b/menu_searchresults.c
@@ -305,7 +305,7 @@ eOSState cMenuSearchResults::Switch(void)
if (channel && cDevice::PrimaryDevice()->SwitchChannel(channel, true))
return osEnd;
}
- Skins.Message(mtInfo, trVDR("Can't switch channel!"));
+ INFO(trVDR("Can't switch channel!"));
return osContinue;
}
@@ -819,7 +819,7 @@ cRecording *cMenuSearchResultsForRecs::GetRecording(cMenuSearchResultsItem *Item
{
cRecording *recording = Recordings.GetByName(Item->FileName());
if (!recording)
- Skins.Message(mtError, tr("Error while accessing recording!"));
+ ERROR(tr("Error while accessing recording!"));
return recording;
}
diff --git a/menu_templateedit.c b/menu_templateedit.c
index 0a3a201..7b91f1d 100644
--- a/menu_templateedit.c
+++ b/menu_templateedit.c
@@ -192,21 +192,21 @@ eOSState cMenuEditTemplate::ProcessKey(eKeys Key)
data.channelMin = ch;
else
{
- Skins.Message(mtError, tr("*** Invalid Channel ***"));
- break;
+ ERROR(tr("*** Invalid Channel ***"));
+ break;
}
ch = Channels.GetByNumber(channelMax);
if (ch)
data.channelMax = ch;
else
{
- Skins.Message(mtError, tr("*** Invalid Channel ***"));
- break;
+ ERROR(tr("*** Invalid Channel ***"));
+ break;
}
if (channelMin > channelMax)
{
- Skins.Message(mtError, tr("Please check channel criteria!"));
- return osContinue;
+ ERROR(tr("Please check channel criteria!"));
+ return osContinue;
}
}
if (data.useChannel==2)
diff --git a/menu_whatson.c b/menu_whatson.c
index 4f1cc03..1143419 100644
--- a/menu_whatson.c
+++ b/menu_whatson.c
@@ -509,7 +509,7 @@ eOSState cMenuWhatsOnSearch::Switch(void)
if (cDevice::PrimaryDevice()->SwitchChannel(item->channel, true))
return osEnd;
}
- Skins.Message(mtInfo, trVDR("Can't switch channel!"));
+ INFO(trVDR("Can't switch channel!"));
return osContinue;
}
diff --git a/searchtimer_thread.c b/searchtimer_thread.c
index 6c97639..b042555 100644
--- a/searchtimer_thread.c
+++ b/searchtimer_thread.c
@@ -523,7 +523,7 @@ void cSearchTimerThread::Action(void)
if (announceList.Count() > 0)
{
cString msgfmt = cString::sprintf(tr("%d new broadcast(s) found! Show them?"), announceList.Count());
- if (SendMsg(msgfmt, true,7) == kOk)
+ if (SendMsg(msgfmt, true, 7) == kOk)
{
m_plugin->showAnnounces = true;
cRemote::CallPlugin("epgsearch");
@@ -564,7 +564,7 @@ void cSearchTimerThread::Action(void)
!cDevice::PrimaryDevice()->Replaying() ||
conflictCheck.nextRelevantConflictDate - now < 2*60*60 ||
(updateForced & UPDS_WITH_OSD);
- if (doMessage && SendMsg(msgfmt, true,7) == kOk)
+ if (doMessage && SendMsg(msgfmt, true,7,mtWarning) == kOk)
{
m_plugin->showConflicts = true;
cRemote::CallPlugin("epgsearch");
@@ -1050,7 +1050,7 @@ void cSearchTimerThread::CheckEPGHours()
if (EPGSearchConfig.checkEPGWarnByOSD)
{
cString msgfmt = cString::sprintf(tr("small EPG content on:%s"), sBuffer.c_str());
- SendMsg(msgfmt);
+ SendMsg(msgfmt, false, 0, mtWarning);
}
if (EPGSearchConfig.checkEPGWarnByMail)
{
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-24 08:53:40 +0000