summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--displaymenu.c5
-rw-r--r--menuitem.c4
-rw-r--r--menuitem.h2
3 files changed, 4 insertions, 7 deletions
diff --git a/displaymenu.c b/displaymenu.c
index 445be51..6fa5af1 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -468,10 +468,7 @@ bool cNopacityDisplayMenu::SetItemRecording(const cRecording *Recording, int Ind
if ((int)menuItems.size() <= Index)
menuItems.resize(currentNumItems);
if (!menuItems[Index]) {
- bool isFolder = false;
- if (Total > 0)
- isFolder = true;
- cNopacityMenuItem *item = new cNopacityRecordingMenuItem(osd, Recording, Selectable, isFolder, Level, Total, New, &videoWindowRect);
+ cNopacityMenuItem *item = new cNopacityRecordingMenuItem(osd, Recording, Selectable, Level, Total, New, &videoWindowRect);
cPoint itemSize;
menuItems[Index].reset(item);
menuView->GetMenuItemSize(MenuCategory(), &itemSize);
diff --git a/menuitem.c b/menuitem.c
index 6fc6295..553bf94 100644
--- a/menuitem.c
+++ b/menuitem.c
@@ -1125,9 +1125,9 @@ void cNopacityTimerMenuItem::DrawLogo(int logoWidth, int logoHeight) {
}
// cNopacityRecordingMenuItem -------------
-cNopacityRecordingMenuItem::cNopacityRecordingMenuItem(cOsd *osd, const cRecording *Recording, bool sel, bool isFolder, int Level, int Total, int New, cRect *vidWin) : cNopacityMenuItem (osd, "", sel) {
+cNopacityRecordingMenuItem::cNopacityRecordingMenuItem(cOsd *osd, const cRecording *Recording, bool sel, int Level, int Total, int New, cRect *vidWin) : cNopacityMenuItem (osd, "", sel) {
this->Recording = Recording;
- this->isFolder = isFolder;
+ this->isFolder = (Total > 0) ? true : false;
this->Level = Level;
this->Total = Total;
this->New = New;
diff --git a/menuitem.h b/menuitem.h
index fc7ba0b..6f7a3fb 100644
--- a/menuitem.h
+++ b/menuitem.h
@@ -188,7 +188,7 @@ private:
int CheckScrollableRecording(void);
int CheckScrollableFolder(void);
public:
- cNopacityRecordingMenuItem(cOsd *osd, const cRecording *Recording, bool sel, bool isFolder, int Level, int Total, int New, cRect *vidWin);
+ cNopacityRecordingMenuItem(cOsd *osd, const cRecording *Recording, bool sel, int Level, int Total, int New, cRect *vidWin);
~cNopacityRecordingMenuItem(void);
void CreatePixmapTextScroller(int totalWidth);
void CreateText(void);