summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitar Petrovski <dimeptr@gmail.com>2012-10-30 10:24:18 (GMT)
committerDimitar Petrovski <dimeptr@gmail.com>2012-10-30 10:24:18 (GMT)
commite6817415cfb958010c64f22b98f4536817223098 (patch)
tree458452b46dde769f2d46d1bdb65f076f0b685c86
parentc38e894109fb25110a6cc0123deb5eafb7bba52f (diff)
downloadvdr-plugin-eepg-e6817415cfb958010c64f22b98f4536817223098.tar.gz
vdr-plugin-eepg-e6817415cfb958010c64f22b98f4536817223098.tar.bz2
add separators in setup menu
change charset export logic change thread times
-rw-r--r--eepg.c41
-rw-r--r--epghandler.c2
-rw-r--r--po/mk_MK.po2
-rw-r--r--util.c4
4 files changed, 29 insertions, 20 deletions
diff --git a/eepg.c b/eepg.c
index 370c848..7239c23 100644
--- a/eepg.c
+++ b/eepg.c
@@ -111,7 +111,13 @@ public:
cMenuSetupPremiereEpg::cMenuSetupPremiereEpg (void)
{
data = cSetupEEPG::getInstance();
- SetSection (tr ("PremiereEPG"));
+ cOsdItem *item = new cOsdItem(tr ("PremiereEPG"));
+
+ if (item) {
+ item->SetSelectable(false);
+ Add(item);
+ }
+// AddCategory (tr ("PremiereEPG"));
optDisp[0] = tr ("off");
for (unsigned int i = 1; i < NUM_PATS; i++) {
snprintf (buff[i], sizeof (buff[i]), optPats[i], "Event", 1);
@@ -121,7 +127,12 @@ cMenuSetupPremiereEpg::cMenuSetupPremiereEpg (void)
Add (new cMenuEditBoolItem (tr ("Show order information"), &data->OrderInfo));
Add (new cMenuEditBoolItem (tr ("Show rating information"), &data->RatingInfo));
Add (new cMenuEditBoolItem (tr ("Fix EPG data"), &data->FixEpg));
- SetSection (tr ("General"));
+ item = new cOsdItem(tr ("General"));
+ if (item) {
+ item->SetSelectable(false);
+ Add(item);
+ }
+// AddCategory (tr ("General"));
Add (new cMenuEditBoolItem (tr ("Display summary message"), &data->DisplayMessage));
Add (new cMenuEditBoolItem (tr ("Replace Empty Short Text with Category - Genre"), &data->ReplaceEmptyShText));
#ifdef DEBUG
@@ -178,6 +189,7 @@ private:
bool EndChannels, EndThemes; //only used for ??
int MHWStartTime; //only used for MHW1
bool ChannelsOk;
+ int prevNid;
//int Format; //the format that this filter currently is processing
std::map < int, int >ChannelSeq; // ChannelSeq[ChannelId] returns the recordnumber of the channel
@@ -243,6 +255,7 @@ cFilterEEPG::cFilterEEPG (void)
{
nSummaries = 0;
nTitles = 0;
+ prevNid = 0;
Trigger ();
//Set (0x00, 0x00);
}
@@ -269,12 +282,16 @@ void cFilterEEPG::SetStatus (bool On)
for (int i = 0; i <= HIGHEST_FORMAT; i++)
UnprocessedFormat[i] = 0; //pid 0 is assumed to be nonvalid for EEPG transfers
AddFilter (0, 0);
- if (Channel()->Nid() == 0x01) {
- setenv("VDR_CHARSET_OVERRIDE", "ISO-8859-9", true);
- LogD(0, prep("setenv VDR_CHARSET_OVERRIDE ISO-8859-9"));
- } else {
- unsetenv("VDR_CHARSET_OVERRIDE");
- LogD(0, prep("clear VDR_CHARSET_OVERRIDE"));
+ int nid = Channel()->Nid();
+ if (nid != prevNid) {
+ if (nid == 0x01 && prevNid != 0x01) {
+ setenv("VDR_CHARSET_OVERRIDE", "ISO-8859-9", true);
+ LogD(0, prep("setenv VDR_CHARSET_OVERRIDE ISO-8859-9"));
+ } else if (nid != 0x01 && (prevNid == 0x01 || prevNid == 0)){
+ unsetenv("VDR_CHARSET_OVERRIDE");
+ LogD(0, prep("clear VDR_CHARSET_OVERRIDE"));
+ }
+ prevNid = nid;
}
}
cFilter::SetStatus (On);
@@ -2845,14 +2862,6 @@ void cFilterEEPG::Process (u_short Pid, u_char Tid, const u_char * Data, int Len
// LogD(2, prep("Pid: 0x%02x Tid: %d Length: %d PMT pid: 0x%04x"), Pid, Tid, Length, pmtpid);
// LogD(2, prep("Source: %d Transponder: %d"), Source () , Transponder ());
- if (Channel()->Nid() == 0x01) {
- setenv("VDR_CHARSET_OVERRIDE", "ISO-8859-9", true);
- LogD(0, prep("setenv VDR_CHARSET_OVERRIDE ISO-8859-9"));
- }
- else {
- unsetenv("VDR_CHARSET_OVERRIDE");
- LogD(0, prep("clear VDR_CHARSET_OVERRIDE"));
- }
if (Pid == 0 && Tid == SI::TableIdPAT) {
if (!pmtnext || now > pmtnext) {
if (pmtpid)
diff --git a/epghandler.c b/epghandler.c
index 4e7ab30..5bfabf1 100644
--- a/epghandler.c
+++ b/epghandler.c
@@ -163,7 +163,7 @@ bool cEEpgHandler::HandleEvent(cEvent* Event) {
if (equivHandler->getEquiChanMap().count(*Event->ChannelID().ToString()) <= 0)
return true;
- //if (modified)
+ if (modified)
equivHandler->updateEquivalent(Event->ChannelID(), Event);
//TODO just to see the difference
diff --git a/po/mk_MK.po b/po/mk_MK.po
index b7701bf..5224001 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -26,7 +26,7 @@ msgid "off"
msgstr "исклучено"
msgid "Tag option events"
-msgstr "Тагуван опцоини настани"
+msgstr "Таг за опцоини настани"
msgid "Show order information"
msgstr "Прикажи информации за нарачка"
diff --git a/util.c b/util.c
index 415f213..7554319 100644
--- a/util.c
+++ b/util.c
@@ -150,7 +150,7 @@ struct tChannelIDCompare
};
cTimeMs LastAddEventThread;
-enum { INSERT_TIMEOUT_IN_MS = 10000 };
+enum { INSERT_TIMEOUT_IN_MS = 5000 };
class cAddEventThread : public cThread
{
@@ -250,7 +250,7 @@ void AddEvent(cEvent *Event, tChannelID ChannelID)
// if (!AddEventThread.Active())
// AddEventThread.Start();
if (!AddEventThread.Active() && LastAddEventThread.TimedOut()){
- LastAddEventThread.Set(INSERT_TIMEOUT_IN_MS * 2);
+ LastAddEventThread.Set(INSERT_TIMEOUT_IN_MS * 1.5);
AddEventThread.Start();
}