vdr-plugin-yaepghd

- Fixed a bug in channel listing (Rolf Ahrenberg).

- Fixed theme selection on the setup page (Rolf Ahrenberg).

- Fixed cPlugin::ConfigDirectory() to called only from main thread (Rolf Ahrenberg).

#

# Makefile for a Video Disk Recorder plugin

#

# The official name of this plugin.

# This name will be used in the '-P...' option of VDR to load the plugin.

# By default the main source file also carries this name.

# IMPORTANT: the presence of this macro is important for the Make.config

# file. So it must be defined, even if it is not used here!

PLUGIN = yaepghd

### The version number of this plugin (taken from the main source file):

LIBDIR = ../../lib

TMPDIR = /tmp

### Allow user defined options to overwrite defaults:

-include $(VDRDIR)/Make.config

### The object files (add further files here):

### The main target:

#define APIVERSION "1.6.0"

#define APIVERSNUM 10600 // Version * 10000 + Major * 100 + Minor

+

// When loading plugins, VDR searches them by their APIVERSION, which

// may be smaller than VDRVERSION in case there have been no changes to

// VDR header files since the last APIVERSION. This allows compiled

diff -Nru vdr-1.6.0-vanilla/dvbosd.c vdr-1.6.0-yaepghd/dvbosd.c

--- vdr-1.6.0-vanilla/dvbosd.c 2007-09-16 11:55:54.000000000 +0300

+++ vdr-1.6.0-yaepghd/dvbosd.c 2009-01-24 23:40:51.000000000 +0200

msgstr ""

"Project-Id-Version: Yaepghd 0.0.1\n"

"Report-Msgid-Bugs-To: <see README>\n"

"PO-Revision-Date: 2009-01-28 10:51+0200\n"

"Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"

"Language-Team: <vdr@linuxtv.org>\n"

msgid "No Info"

msgstr "Keine Daten verf?gbar."

msgid "Page up"

msgid "Page down"

msgid "Once"

msgstr "Sobald"

msgstr "Frequenz"

msgid "24h"

msgid "12h"

msgid "Up"

msgid "Down"

msgid "Manual"

msgid "Semi-automatic"

msgid "Automatic"

msgid "Hide mainmenu entry"

msgstr "Hauptmen?eintrag verstecken"

msgstr ""

msgid "Channel change"

msgid "Time format"

msgid "Channel order"

msgid "Yet another EPG in HD"

msgid "YaepgHD"

msgstr ""

"Project-Id-Version: Yaepghd 0.0.1\n"

"Report-Msgid-Bugs-To: <see README>\n"

"PO-Revision-Date: 2009-01-28 10:51+0200\n"

"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"

"Language-Team: <vdr@linuxtv.org>\n"

msgid "No Info"

msgstr "Ei tietoja"

msgid "Page up"

msgstr "Sivu ylös"

msgstr "Piilota valinta päävalikosta"

msgid "Replace original schedule"

msgid "Channel change"

msgstr "Kanavanvaihto"

msgstr "Kellonajan esitysmuoto"

msgid "Channel order"

msgstr "Kanavajärjetys"

msgid "Yet another EPG in HD"

msgid "YaepgHD"

msgstr "Ohjelmaopas (YaepgHD)"

tar -xzf /put/your/path/here/vdr-yaepghd-X.Y.Z.tgz

ln -s yaepghd-X.Y.Z yaepghd

cd /put/your/path/here/VDR

cp -R PLUGINS/src/yaepghd/yaepghd /path/to/vdrconf/plugins/

make

make plugins

Notes:

- Video window doesn't scale back to normal when quiting the plugin

with FF cards.

eventTimeFont="Accidental Presidency;20"

eventDescFont="Accidental Presidency;20"

eventDateFont="Accidental Presidency;20"

gridEventColor=FFFFFFFF

gridSelFg=FF000000

gridSelBg=FFF8AF31

eventTimeColor=FF1B537C

eventDescColor=FFFFFFFF

eventDateColor=FF1B537C

tlineBoxColor=FFFFFFFF

gridEventGeom=154,288,516,234

gridChanGeom=25,288,113,234

gridTimeGeom=154,251,516,32

gridDateGeom=25,251,113,32

eventTitleGeom=144,20,306,70

eventDescGeom=25,135,425,115

eventDateGeom=25,96,117,37

tlineLocGeom=154,283,516,3

tlineBoxGeom=0,0,9,3

vidWinGeom=456,32,196,130

#include <vdr/osd.h>

#include <vdr/device.h>

#include <vdr/thread.h>

#if defined(APIVERSNUM) && APIVERSNUM < 10600

#error "VDR-1.6.0 API version or greater is required!"

/**

* Macros

*/

#ifdef DEBUG

#define ASSERT assert

#define GRID_TIME_FONT THEME_FONT("gridTimeFont")

#define GRID_DATE_FONT THEME_FONT("gridDateFont")

#define EVENT_TITLE_FONT THEME_FONT("eventTitleFont")

#define EVENT_TIME_FONT THEME_FONT("eventTimeFont")

#define EVENT_DESC_FONT THEME_FONT("eventDescFont")

#define EVENT_DATE_FONT THEME_FONT("eventDateFont")

#define GRID_DATE_COLOR THEME_COLOR("gridDateColor")

#define GRID_SEP_COLOR THEME_COLOR("gridSepColor")

#define EVENT_TITLE_COLOR THEME_COLOR("eventTitleColor")

#define EVENT_TIME_COLOR THEME_COLOR("eventTimeColor")

#define EVENT_DESC_COLOR THEME_COLOR("eventDescColor")

#define EVENT_DATE_COLOR THEME_COLOR("eventDateColor")

#define GRID_TIME_GEOM THEME_GEOM("gridTimeGeom")

#define GRID_DATE_GEOM THEME_GEOM("gridDateGeom")

#define EVENT_TITLE_GEOM THEME_GEOM("eventTitleGeom")

#define EVENT_TIME_GEOM THEME_GEOM("eventTimeGeom")

#define EVENT_DESC_GEOM THEME_GEOM("eventDescGeom")

#define EVENT_DATE_GEOM THEME_GEOM("eventDateGeom")

#define TEXT_BORDER THEME_IVAL("textBorder")

#define TEXT_SPACE THEME_IVAL("textSpace")

#define REC_DLG_IMG THEME_IMAGE("recDlgImage")

#define REC_DLG_FONT THEME_FONT("recDlgFont")

#define REC_DLG_COLOR THEME_COLOR("recDlgColor")

#define MSG_BOX_FONT THEME_FONT("msgBoxFont")

#define MSG_BOX_COLOR THEME_COLOR("msgBoxColor")

#define MSG_BOX_GEOM THEME_GEOM("msgBoxGeom")

/* Manner in which channel is changed while in YAEPG */

enum eChanneChangeType {

* Private Data

*/

static int iHideMenuEntry = false;

static int iReplaceOrgSchedule = false;

static int iChannelChange = CHANNEL_CHANGE_MANUAL;

static int iTimeFormat = TIME_FORMAT_12H;

static int iChannelOrder = CHANNEL_ORDER_DOWN;

static std::string sThemeName = "default";

static std::string sThemeDir = "";

AddElement("gridTimeFont", THEME_FONT);

AddElement("gridDateFont", THEME_FONT);

AddElement("eventTitleFont", THEME_FONT);

AddElement("eventTimeFont", THEME_FONT);

AddElement("eventDescFont", THEME_FONT);

AddElement("eventDateFont", THEME_FONT);

AddElement("gridTimeColor", THEME_COLOR);

AddElement("gridDateColor", THEME_COLOR);

AddElement("eventTitleColor", THEME_COLOR);

AddElement("eventTimeColor", THEME_COLOR);

AddElement("eventDescColor", THEME_COLOR);

AddElement("eventDateColor", THEME_COLOR);

AddElement("gridTimeGeom", THEME_GEOM);

AddElement("gridDateGeom", THEME_GEOM);

AddElement("eventTitleGeom", THEME_GEOM);

AddElement("eventTimeGeom", THEME_GEOM);

AddElement("eventDescGeom", THEME_GEOM);

AddElement("eventDateGeom", THEME_GEOM);

AddElement("textBorder", THEME_IVAL);

AddElement("textSpace", THEME_IVAL);

AddElement("recDlgImage", THEME_IMAGE);

AddElement("recDlgGeom", THEME_GEOM);

AddElement("recDlgColor", THEME_COLOR);

AddElement("msgBoxFont", THEME_FONT);

AddElement("msgBoxGeom", THEME_GEOM);

AddElement("msgBoxColor", THEME_COLOR);

}

cYaepgTheme *

*s-- = '\0';

}

/* Break text up into lines */

char *line, *nextLine = tokText;

chanInfo[i].nameBox.FgColor(GRID_CHAN_COLOR);

chanInfo[i].nameBox.BgColor(clrTransparent);

chanInfo[i].nameBox.Flags((eTextFlags)(TBOX_VALIGN_LEFT | TBOX_HALIGN_CENTER));

chanInfo[i].nameBox.Y(geom.y + ROUND((float)i * (chanRowHeight + (float)horizSpace)));

chanInfo[i].nameBox.H(ROUND(chanRowHeight));

chanInfo[i].nameBox.Generate();

YAEPG_INFO("Drawing grid channels at (%d %d)", geom.x, geom.y);

for (int i = 0; i < (int)chanInfo.size(); i++) {

chanInfo[i].nameBox.Draw(bmp);

}

}

void

cYaepgGridDate::UpdateTime(time_t _t)

{

t = _t;

Generate();

}

box.Draw(bmp);

}

/*

*****************************************************************************

* cYaepgEventTime

localtime_r(&t, &locTime);

if (iTimeFormat == TIME_FORMAT_24H) {

snprintf(timeStr, sizeof(timeStr), "%s %02d:%02d",

} else {

snprintf(timeStr, sizeof(timeStr), "%s %d:%02d%s",

FMT_12HR(locTime.tm_hour), locTime.tm_min,

FMT_AMPM(locTime.tm_hour));

}

};

const char *cYaepgHelpBar::helpStrs[4] = {

trNOOP("Page up"),

trNOOP("Page down"),

trVDR("Button$Switch")

for (int i = 0; i < 4; i++) {

boxes[i].Text(tr(helpStrs[i]));

boxes[i].Font(GRID_EVENT_FONT);

boxes[i].BgColor(clrTransparent);

boxes[i].Flags((eTextFlags)(TBOX_VALIGN_LEFT | TBOX_HALIGN_CENTER));

boxes[i].X(geom.x + (i * boxWidth) + dotDiam);

}

for (int i = 0; i < 4; i++) {

boxes[i].Draw(bmp);

}

}

return state;

}

/*

*****************************************************************************

* cYaepgRecDlg

t = event->StartTime();

localtime_r(&t, &locTime);

freqs[1][5] = ' ';

freqInput.UpdateStra((char **)freqs);

}

bmp->DrawBitmap(geom.x, geom.y, *MSG_BG_IMG);

msgBox.Draw(bmp);

}

#ifdef YAEPGHD_REEL_EHD

/*

static cReelVidWin *reelVidWin = NULL;

#endif

/*

*****************************************************************************

* cYaepgHd

time_t startTime;

tArea mainWin;

cBitmap *mainBmp;

std::vector< cChannel * > chanVec;

const cEvent *event;

cTimeMs lastInput;

cYaepgGridTime *gridTime;

cYaepgGridDate *gridDate;

cYaepgEventTitle *eventTitle;

cYaepgEventTime *eventTime;

cYaepgEventDesc *eventDesc;

cYaepgEventDate *eventDate;

cYaepgTimeLine *timeLine;

cYaepgHelpBar *helpBar;

public:

cYaepghd(void);

void UpdateEvent(const cEvent *newEvent);

void MoveCursor(eCursorDir dir);

void SwitchToCurrentChannel(bool closeVidWin = false);

void Draw(void);

};

gridTime(NULL),

gridDate(NULL),

eventTitle(NULL),

eventTime(NULL),

eventDesc(NULL),

eventDate(NULL),

timeLine(NULL),

helpBar(NULL)

{

memset(&mainWin, 0, sizeof(mainWin));

chanVec.clear();

delete gridDate;

delete timeLine;

delete eventTitle;

delete eventTime;

delete eventDesc;

delete eventDate;

BG_IMAGE->Bpp());

osd->SetAreas(&mainWin, 1);

/* Set up the video window parameters */

if (VID_WIN_GEOM.w != 0 && VID_WIN_GEOM.h != 0) {

osd->vidWin.x1 = VID_WIN_GEOM.x;

osd->vidWin.y2 = VID_WIN_GEOM.y + VID_WIN_GEOM.h;

osd->vidWin.bpp = 12;

}

#ifdef YAEPGHD_REEL_EHD

reelVidWin->Open(VID_WIN_GEOM);

timeLine = new cYaepgTimeLine(t);

const cEvent *e = gridEvents->Event();

eventTitle = new cYaepgEventTitle(e);

eventTime = new cYaepgEventTime(e);

eventDesc = new cYaepgEventDesc(e);

eventDate = new cYaepgEventDate();

Draw();

}

eOSState

cYaepghd::ProcessKey(eKeys key)

{

else

state = osEnd;

break;

case kRed:

state = osContinue;

break;

case kGreen:

state = osContinue;

// -12 hours

break;

case k0 ... k9:

if (directChan || (key != k0)) {

directChan = ((directChan * 10) + ((key & ~k_Repeat) - k0)) % 100000;

}

event = newEvent;

eventTitle->UpdateEvent(event);

eventTime->UpdateEvent(event);

eventDesc->UpdateEvent(event);

}

void

if (gridChan && (gridChan->Number() != cDevice::CurrentChannel())) {

/*

* The eHD card doesn't seem to like changing channels while the video

* plane is sacled down. To get around this problem we close/reopen the

* video window across channel changes.

cCondWait::SleepMs(100);

#endif

#ifdef YAEPGHD_REEL_EHD

if (closeVidWin == false) {

gridDate->Draw(mainBmp);

timeLine->Draw(mainBmp);

eventTitle->Draw(mainBmp);

eventTime->Draw(mainBmp);

eventDesc->Draw(mainBmp);

eventDate->Draw(mainBmp);

class cMenuSetupYaepg : public cMenuSetupPage {

private:

int iNewHideMenuEntry;

int iNewReplaceOrgSchedule;

int iNewChannelChange;

int iNewTimeFormat;

int iNewChannelOrder;

int iNewThemeIndex;

char **themes;

int numThemes;

void cMenuSetupYaepg::Store(void)

{

iHideMenuEntry = iNewHideMenuEntry;

iReplaceOrgSchedule = iNewReplaceOrgSchedule;

iChannelChange = iNewChannelChange;

iTimeFormat = iNewTimeFormat;

iChannelOrder = iNewChannelOrder;

sThemeName = themes[iNewThemeIndex];

SetupStore("HideMenuEntry", iHideMenuEntry);

SetupStore("ReplaceOrgSchedule", iReplaceOrgSchedule);

SetupStore("ChannelChange", iChannelChange);

SetupStore("TimeFormat", iTimeFormat);

SetupStore("ChannelOrder", iChannelOrder);

SetupStore("Theme", sThemeName.c_str());

}

}

iNewHideMenuEntry = iHideMenuEntry;

iNewChannelChange = iChannelChange;

iNewTimeFormat = iTimeFormat;

iNewChannelOrder = iChannelOrder;

Add(new cMenuEditBoolItem (tr("Hide mainmenu entry"), &iNewHideMenuEntry));

Add(new cMenuEditBoolItem (tr("Replace original schedule"), &iNewReplaceOrgSchedule));

Add(new cMenuEditStraItem (tr("Channel change"), &iNewChannelChange, CHANNEL_CHANGE_COUNT, CH_CHANGE_MODES));

Add(new cMenuEditStraItem (tr("Time format"), &iNewTimeFormat, TIME_FORMAT_COUNT, TIME_FORMATS));

Add(new cMenuEditStraItem (tr("Channel order"), &iNewChannelOrder, CHANNEL_ORDER_COUNT, CH_ORDER_FORMATS));

}

cMenuSetupYaepg::~cMenuSetupYaepg()

* cPluginYaepghd

*****************************************************************************

*/

static const char *DESCRIPTION = trNOOP("Yet another EPG in HD");

static const char *MAINMENUENTRY = trNOOP("YaepgHD");

virtual void MainThreadHook(void);

virtual cString Active(void);

virtual time_t WakeupTime(void);

virtual cOsdObject *MainMenuAction(void);

virtual cMenuSetupPage *SetupMenu(void);

virtual bool SetupParse(const char *Name, const char *Value);

cOsdObject *

cPluginYaepghd::MainMenuAction(void)

{

}

cMenuSetupPage *

// Parse your own setup parameters and store their values.

if (!strcasecmp(Name, "HideMenuEntry")) { iHideMenuEntry = atoi(Value); }

else if (!strcasecmp(Name, "ChannelChange")) { iChannelChange = atoi(Value); }

else if (!strcasecmp(Name, "TimeFormat")) { iTimeFormat = atoi(Value); }

else if (!strcasecmp(Name, "ChannelOrder")) { iChannelOrder = atoi(Value); }

else if (!strcasecmp(Name, "Theme")) { Utf8Strn0Cpy(themeName, Value, sizeof(themeName)); sThemeName = themeName; }

else { return false; }

bool

cPluginYaepghd::Service(const char *Id, void *Data)

{

{

if (!Data) {

return true;

}

}

return true;

}

return false;

}