summaryrefslogtreecommitdiff
path: root/recmenuitem.c
diff options
context:
space:
mode:
Diffstat (limited to 'recmenuitem.c')
-rw-r--r--recmenuitem.c166
1 files changed, 83 insertions, 83 deletions
diff --git a/recmenuitem.c b/recmenuitem.c
index bf10b71..918014a 100644
--- a/recmenuitem.c
+++ b/recmenuitem.c
@@ -30,7 +30,7 @@ void cRecMenuItem::SetGeometry(int x, int y, int width) {
void cRecMenuItem::SetPixmaps(void) {
if (!pixmap)
- pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
+ pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
else
pixmap->SetViewPort(cRect(x, y, width, height));
}
@@ -76,7 +76,7 @@ cRecMenuItemButton::cRecMenuItemButton(const char *text, eRecMenuState action, b
cRecMenuItemButton::~cRecMenuItemButton(void) {
if (pixmapText)
- osdManager.releasePixmap(pixmapText);
+ osdManager.DestroyPixmap(pixmapText);
}
int cRecMenuItemButton::GetWidth(void) {
@@ -89,8 +89,8 @@ void cRecMenuItemButton::SetPixmaps(void) {
width = width / 2;
}
if (!pixmap) {
- pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
- pixmapText = osdManager.requestPixmap(5, cRect(x, y, width, height));
+ pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+ pixmapText = osdManager.CreatePixmap(5, cRect(x, y, width, height));
} else {
pixmap->SetViewPort(cRect(x, y, width, height));
pixmapText->SetViewPort(cRect(x, y, width, height));
@@ -158,8 +158,8 @@ void cRecMenuItemButtonYesNo::SetPixmaps(void) {
int noX = x + 52 * width / 100;
int yPixmaps = y + geoManager.borderRecMenus / 2;
if (!pixmap) {
- pixmap = osdManager.requestPixmap(4, cRect(yesX, yPixmaps, buttonWidth, height));
- pixmapNo = new cStyledPixmap(osdManager.requestPixmap(4, cRect(noX, yPixmaps, buttonWidth, height)));
+ pixmap = osdManager.CreatePixmap(4, cRect(yesX, yPixmaps, buttonWidth, height));
+ pixmapNo = new cStyledPixmap(osdManager.CreatePixmap(4, cRect(noX, yPixmaps, buttonWidth, height)));
} else {
pixmap->SetViewPort(cRect(yesX, yPixmaps, buttonWidth, height));
pixmapNo->SetViewPort(cRect(noX, yPixmaps, buttonWidth, height));
@@ -343,13 +343,13 @@ cRecMenuItemInt::cRecMenuItemInt(cString text,
cRecMenuItemInt::~cRecMenuItemInt(void) {
if (pixmapVal)
- osdManager.releasePixmap(pixmapVal);
+ osdManager.DestroyPixmap(pixmapVal);
}
void cRecMenuItemInt::SetPixmaps(void) {
if (!pixmap) {
- pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
- pixmapVal = osdManager.requestPixmap(5, cRect(x, y, width, height));
+ pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+ pixmapVal = osdManager.CreatePixmap(5, cRect(x, y, width, height));
} else {
pixmap->SetViewPort(cRect(x, y, width, height));
pixmapVal->SetViewPort(cRect(x, y, width, height));
@@ -464,13 +464,13 @@ cRecMenuItemBool::cRecMenuItemBool(cString text,
cRecMenuItemBool::~cRecMenuItemBool(void) {
if (pixmapVal)
- osdManager.releasePixmap(pixmapVal);
+ osdManager.DestroyPixmap(pixmapVal);
}
void cRecMenuItemBool::SetPixmaps(void) {
if (!pixmap) {
- pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
- pixmapVal = osdManager.requestPixmap(5, cRect(x, y, width, height));
+ pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+ pixmapVal = osdManager.CreatePixmap(5, cRect(x, y, width, height));
} else {
pixmap->SetViewPort(cRect(x, y, width, height));
pixmapVal->SetViewPort(cRect(x, y, width, height));
@@ -551,13 +551,13 @@ cRecMenuItemSelect::cRecMenuItemSelect(cString text,
cRecMenuItemSelect::~cRecMenuItemSelect(void) {
if (pixmapVal)
- osdManager.releasePixmap(pixmapVal);
+ osdManager.DestroyPixmap(pixmapVal);
}
void cRecMenuItemSelect::SetPixmaps(void) {
if (!pixmap) {
- pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
- pixmapVal = osdManager.requestPixmap(5, cRect(x, y, width, height));
+ pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+ pixmapVal = osdManager.CreatePixmap(5, cRect(x, y, width, height));
} else {
pixmap->SetViewPort(cRect(x, y, width, height));
pixmapVal->SetViewPort(cRect(x, y, width, height));
@@ -659,13 +659,13 @@ cRecMenuItemSelectDirectory::cRecMenuItemSelectDirectory(cString text,
cRecMenuItemSelectDirectory::~cRecMenuItemSelectDirectory(void) {
if (pixmapVal)
- osdManager.releasePixmap(pixmapVal);
+ osdManager.DestroyPixmap(pixmapVal);
}
void cRecMenuItemSelectDirectory::SetPixmaps(void) {
if (!pixmap) {
- pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
- pixmapVal = osdManager.requestPixmap(5, cRect(x, y, width, height));
+ pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+ pixmapVal = osdManager.CreatePixmap(5, cRect(x, y, width, height));
} else {
pixmap->SetViewPort(cRect(x, y, width, height));
pixmapVal->SetViewPort(cRect(x, y, width, height));
@@ -793,13 +793,13 @@ cRecMenuItemText::cRecMenuItemText(cString title,
cRecMenuItemText::~cRecMenuItemText(void) {
if (pixmapVal)
- osdManager.releasePixmap(pixmapVal);
+ osdManager.DestroyPixmap(pixmapVal);
if (pixmapKeyboard)
delete pixmapKeyboard;
if (pixmapKeyboardHighlight)
- osdManager.releasePixmap(pixmapKeyboardHighlight);
+ osdManager.DestroyPixmap(pixmapKeyboardHighlight);
if (pixmapKeyboardIcons)
- osdManager.releasePixmap(pixmapKeyboardIcons);
+ osdManager.DestroyPixmap(pixmapKeyboardIcons);
delete[] valueUtf8;
delete[] allowedUtf8;
delete[] charMapUtf8;
@@ -813,11 +813,11 @@ void cRecMenuItemText::SetPixmaps(void) {
int keyboardX = x + (100 - keyboardWidth)*width / 100;
int keyboardY = y + height;
if (!pixmap) {
- pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
- pixmapVal = osdManager.requestPixmap(5, cRect(xPixmapVal, yPixmapVal, widthPixmapVal, heightPixmapVal));
- pixmapKeyboard = new cStyledPixmap(osdManager.requestPixmap(-1, cRect(keyboardX, keyboardY, keyboardWidth*width/100, keyboardHeight)));
- pixmapKeyboardHighlight = osdManager.requestPixmap(-1, cRect(keyboardX, keyboardY, keyboardWidth*width/100, keyboardHeight));
- pixmapKeyboardIcons = osdManager.requestPixmap(-1, cRect(keyboardX, keyboardY, keyboardWidth*width/100, keyboardHeight));
+ pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+ pixmapVal = osdManager.CreatePixmap(5, cRect(xPixmapVal, yPixmapVal, widthPixmapVal, heightPixmapVal));
+ pixmapKeyboard = new cStyledPixmap(osdManager.CreatePixmap(-1, cRect(keyboardX, keyboardY, keyboardWidth*width/100, keyboardHeight)));
+ pixmapKeyboardHighlight = osdManager.CreatePixmap(-1, cRect(keyboardX, keyboardY, keyboardWidth*width/100, keyboardHeight));
+ pixmapKeyboardIcons = osdManager.CreatePixmap(-1, cRect(keyboardX, keyboardY, keyboardWidth*width/100, keyboardHeight));
} else {
pixmap->SetViewPort(cRect(x, y, width, height));
pixmapVal->SetViewPort(cRect(xPixmapVal, yPixmapVal, widthPixmapVal, heightPixmapVal));
@@ -1350,13 +1350,13 @@ cRecMenuItemTime::cRecMenuItemTime(cString text,
cRecMenuItemTime::~cRecMenuItemTime(void) {
if (pixmapVal)
- osdManager.releasePixmap(pixmapVal);
+ osdManager.DestroyPixmap(pixmapVal);
}
void cRecMenuItemTime::SetPixmaps(void) {
if (!pixmap) {
- pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
- pixmapVal = osdManager.requestPixmap(5, cRect(x, y, width, height));
+ pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+ pixmapVal = osdManager.CreatePixmap(5, cRect(x, y, width, height));
} else {
pixmap->SetViewPort(cRect(x, y, width, height));
pixmapVal->SetViewPort(cRect(x, y, width, height));
@@ -1489,13 +1489,13 @@ cRecMenuItemDay::cRecMenuItemDay(cString text,
cRecMenuItemDay::~cRecMenuItemDay(void) {
if (pixmapVal)
- osdManager.releasePixmap(pixmapVal);
+ osdManager.DestroyPixmap(pixmapVal);
}
void cRecMenuItemDay::SetPixmaps(void) {
if (!pixmap) {
- pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
- pixmapVal = osdManager.requestPixmap(5, cRect(x, y, width, height));
+ pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+ pixmapVal = osdManager.CreatePixmap(5, cRect(x, y, width, height));
} else {
pixmap->SetViewPort(cRect(x, y, width, height));
pixmapVal->SetViewPort(cRect(x, y, width, height));
@@ -1580,16 +1580,16 @@ cRecMenuItemTimer::cRecMenuItemTimer(const cTimer *timer,
cRecMenuItemTimer::~cRecMenuItemTimer(void) {
if (pixmapIcons)
- osdManager.releasePixmap(pixmapIcons);
+ osdManager.DestroyPixmap(pixmapIcons);
if (pixmapStatus)
- osdManager.releasePixmap(pixmapStatus);
+ osdManager.DestroyPixmap(pixmapStatus);
}
void cRecMenuItemTimer::SetPixmaps(void) {
if (!pixmap) {
- pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
- pixmapStatus = osdManager.requestPixmap(5, cRect(x, y, width, height));
- pixmapIcons = osdManager.requestPixmap(6, cRect(x, y, width, height));
+ pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+ pixmapStatus = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+ pixmapIcons = osdManager.CreatePixmap(6, cRect(x, y, width, height));
} else {
pixmap->SetViewPort(cRect(x, y, width, height));
pixmapStatus->SetViewPort(cRect(x, y, width, height));
@@ -1765,13 +1765,13 @@ cRecMenuItemTimerConflictHeader::cRecMenuItemTimerConflictHeader(time_t conflict
cRecMenuItemTimerConflictHeader::~cRecMenuItemTimerConflictHeader(void) {
if (pixmapStatus)
- osdManager.releasePixmap(pixmapStatus);
+ osdManager.DestroyPixmap(pixmapStatus);
}
void cRecMenuItemTimerConflictHeader::SetPixmaps(void) {
if (!pixmap) {
- pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
- pixmapStatus = osdManager.requestPixmap(5, cRect(x, y, width, height));
+ pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+ pixmapStatus = osdManager.CreatePixmap(5, cRect(x, y, width, height));
} else {
pixmap->SetViewPort(cRect(x, y, width, height));
pixmapStatus->SetViewPort(cRect(x, y, width, height));
@@ -1845,17 +1845,17 @@ cRecMenuItemEvent::cRecMenuItemEvent(const cEvent *event,
cRecMenuItemEvent::~cRecMenuItemEvent(void) {
if (pixmapIcons)
- osdManager.releasePixmap(pixmapIcons);
+ osdManager.DestroyPixmap(pixmapIcons);
if (pixmapText)
- osdManager.releasePixmap(pixmapText);
+ osdManager.DestroyPixmap(pixmapText);
}
void cRecMenuItemEvent::SetPixmaps(void) {
if (!pixmap) {
- pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
- pixmapText = osdManager.requestPixmap(5, cRect(x, y, width - height / 2 - 10, height));
+ pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+ pixmapText = osdManager.CreatePixmap(5, cRect(x, y, width - height / 2 - 10, height));
pixmapText->Fill(clrTransparent);
- pixmapIcons = osdManager.requestPixmap(6, cRect(x, y, width, height));
+ pixmapIcons = osdManager.CreatePixmap(6, cRect(x, y, width, height));
pixmapIcons->Fill(clrTransparent);
} else {
pixmap->SetViewPort(cRect(x, y, width, height));
@@ -1998,13 +1998,13 @@ cRecMenuItemChannelChooser::cRecMenuItemChannelChooser(cString text,
cRecMenuItemChannelChooser::~cRecMenuItemChannelChooser(void) {
if (pixmapChannel)
- osdManager.releasePixmap(pixmapChannel);
+ osdManager.DestroyPixmap(pixmapChannel);
}
void cRecMenuItemChannelChooser::SetPixmaps(void) {
if (!pixmap) {
- pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
- pixmapChannel = osdManager.requestPixmap(5, cRect(x, y, width, height));
+ pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+ pixmapChannel = osdManager.CreatePixmap(5, cRect(x, y, width, height));
} else {
pixmap->SetViewPort(cRect(x, y, width, height));
pixmapChannel->SetViewPort(cRect(x, y, width, height));
@@ -2151,16 +2151,16 @@ cRecMenuItemDayChooser::cRecMenuItemDayChooser(cString text,
cRecMenuItemDayChooser::~cRecMenuItemDayChooser(void) {
if (pixmapWeekdays)
- osdManager.releasePixmap(pixmapWeekdays);
+ osdManager.DestroyPixmap(pixmapWeekdays);
if (pixmapWeekdaysSelect)
- osdManager.releasePixmap(pixmapWeekdaysSelect);
+ osdManager.DestroyPixmap(pixmapWeekdaysSelect);
}
void cRecMenuItemDayChooser::SetPixmaps(void) {
if (!pixmap) {
- pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
- pixmapWeekdays = osdManager.requestPixmap(5, cRect(x, y, width, height));
- pixmapWeekdaysSelect = osdManager.requestPixmap(6, cRect(x, y, width, height));
+ pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+ pixmapWeekdays = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+ pixmapWeekdaysSelect = osdManager.CreatePixmap(6, cRect(x, y, width, height));
} else {
pixmap->SetViewPort(cRect(x, y, width, height));
pixmapWeekdays->SetViewPort(cRect(x, y, width, height));
@@ -2286,13 +2286,13 @@ cRecMenuItemRecording::cRecMenuItemRecording(const cRecording *recording, bool a
cRecMenuItemRecording::~cRecMenuItemRecording(void) {
if (pixmapText)
- osdManager.releasePixmap(pixmapText);
+ osdManager.DestroyPixmap(pixmapText);
}
void cRecMenuItemRecording::SetPixmaps(void) {
if (!pixmap) {
- pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
- pixmapText = osdManager.requestPixmap(5, cRect(x, y, width, height));
+ pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+ pixmapText = osdManager.CreatePixmap(5, cRect(x, y, width, height));
pixmapText->Fill(clrTransparent);
} else {
pixmap->SetViewPort(cRect(x, y, width, height));
@@ -2371,20 +2371,20 @@ cRecMenuItemTimelineHeader::cRecMenuItemTimelineHeader(time_t day, int numTimers
cRecMenuItemTimelineHeader::~cRecMenuItemTimelineHeader(void) {
if (pixmapTimeline)
- osdManager.releasePixmap(pixmapTimeline);
+ osdManager.DestroyPixmap(pixmapTimeline);
if (pixmapTimerInfo)
- osdManager.releasePixmap(pixmapTimerInfo);
+ osdManager.DestroyPixmap(pixmapTimerInfo);
if (pixmapTimerConflicts)
- osdManager.releasePixmap(pixmapTimerConflicts);
+ osdManager.DestroyPixmap(pixmapTimerConflicts);
}
void cRecMenuItemTimelineHeader::SetPixmaps(void) {
if (!pixmap) {
- pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
- pixmapTimeline = osdManager.requestPixmap(5, cRect(x, y, width, height));
- pixmapTimerInfo = osdManager.requestPixmap(6, cRect(x, y + 3 * font->Height() / 2, width, 2 * font->Height()));
+ pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+ pixmapTimeline = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+ pixmapTimerInfo = osdManager.CreatePixmap(6, cRect(x, y + 3 * font->Height() / 2, width, 2 * font->Height()));
if (conflicts.size() > 0) {
- pixmapTimerConflicts = osdManager.requestPixmap(6, cRect(x, y, width, height));
+ pixmapTimerConflicts = osdManager.CreatePixmap(6, cRect(x, y, width, height));
}
} else {
pixmap->SetViewPort(cRect(x, y, width, height));
@@ -2560,17 +2560,17 @@ cRecMenuItemTimelineTimer::cRecMenuItemTimelineTimer(const cTimer *timer, time_t
cRecMenuItemTimelineTimer::~cRecMenuItemTimelineTimer(void) {
if (pixmapBack)
- osdManager.releasePixmap(pixmapBack);
+ osdManager.DestroyPixmap(pixmapBack);
if (pixmapTimerConflicts)
- osdManager.releasePixmap(pixmapTimerConflicts);
+ osdManager.DestroyPixmap(pixmapTimerConflicts);
}
void cRecMenuItemTimelineTimer::SetPixmaps(void) {
if (!pixmap) {
- pixmapBack = osdManager.requestPixmap(4, cRect(x, y, width, height));
- pixmap = osdManager.requestPixmap(5, cRect(x, y, width, height));
+ pixmapBack = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+ pixmap = osdManager.CreatePixmap(5, cRect(x, y, width, height));
if (conflicts.size() > 0) {
- pixmapTimerConflicts = osdManager.requestPixmap(6, cRect(x, y, width, height));
+ pixmapTimerConflicts = osdManager.CreatePixmap(6, cRect(x, y, width, height));
}
} else {
pixmapBack->SetViewPort(cRect(x, y, width, height));
@@ -2727,16 +2727,16 @@ cRecMenuItemSearchTimer::cRecMenuItemSearchTimer(cTVGuideSearchTimer timer,
cRecMenuItemSearchTimer::~cRecMenuItemSearchTimer(void) {
if (pixmapText)
- osdManager.releasePixmap(pixmapText);
+ osdManager.DestroyPixmap(pixmapText);
if (pixmapIcons)
- osdManager.releasePixmap(pixmapIcons);
+ osdManager.DestroyPixmap(pixmapIcons);
}
void cRecMenuItemSearchTimer::SetPixmaps(void) {
if (!pixmap) {
- pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
- pixmapText = osdManager.requestPixmap(5, cRect(x, y, width, height));
- pixmapIcons = osdManager.requestPixmap(6, cRect(x, y, width, height));
+ pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+ pixmapText = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+ pixmapIcons = osdManager.CreatePixmap(6, cRect(x, y, width, height));
} else {
pixmap->SetViewPort(cRect(x, y, width, height));
pixmapText->SetViewPort(cRect(x, y, width, height));
@@ -2854,16 +2854,16 @@ cRecMenuItemFavorite::cRecMenuItemFavorite(cTVGuideSearchTimer favorite,
cRecMenuItemFavorite::~cRecMenuItemFavorite(void) {
if (pixmapText)
- osdManager.releasePixmap(pixmapText);
+ osdManager.DestroyPixmap(pixmapText);
if (pixmapIcons)
- osdManager.releasePixmap(pixmapIcons);
+ osdManager.DestroyPixmap(pixmapIcons);
}
void cRecMenuItemFavorite::SetPixmaps(void) {
if (!pixmap) {
- pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
- pixmapText = osdManager.requestPixmap(5, cRect(x, y, width, height));
- pixmapIcons = osdManager.requestPixmap(6, cRect(x, y, width, height));
+ pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+ pixmapText = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+ pixmapIcons = osdManager.CreatePixmap(6, cRect(x, y, width, height));
} else {
pixmap->SetViewPort(cRect(x, y, width, height));
pixmapText->SetViewPort(cRect(x, y, width, height));
@@ -2929,16 +2929,16 @@ cRecMenuItemFavoriteStatic::cRecMenuItemFavoriteStatic(std::string text, eRecMen
cRecMenuItemFavoriteStatic::~cRecMenuItemFavoriteStatic(void) {
if (pixmapText)
- osdManager.releasePixmap(pixmapText);
+ osdManager.DestroyPixmap(pixmapText);
if (pixmapIcons)
- osdManager.releasePixmap(pixmapIcons);
+ osdManager.DestroyPixmap(pixmapIcons);
}
void cRecMenuItemFavoriteStatic::SetPixmaps(void) {
if (!pixmap) {
- pixmap = osdManager.requestPixmap(4, cRect(x, y, width, height));
- pixmapText = osdManager.requestPixmap(5, cRect(x, y, width, height));
- pixmapIcons = osdManager.requestPixmap(6, cRect(x, y, width, height));
+ pixmap = osdManager.CreatePixmap(4, cRect(x, y, width, height));
+ pixmapText = osdManager.CreatePixmap(5, cRect(x, y, width, height));
+ pixmapIcons = osdManager.CreatePixmap(6, cRect(x, y, width, height));
} else {
pixmap->SetViewPort(cRect(x, y, width, height));
pixmapText->SetViewPort(cRect(x, y, width, height));
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-27 02:08:44 +0000