summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile2
-rw-r--r--displayvolume.c71
-rw-r--r--displayvolume.h18
-rw-r--r--lcarsng.c83
4 files changed, 91 insertions, 83 deletions
diff --git a/Makefile b/Makefile
index 624e978..4b274f5 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
### The object files (add further files here):
-OBJS = displaychannel.o displaymenu.o displaymessage.o displayreplay.o displaytracks.o lcarsng.o $(PLUGIN).o
+OBJS = displaychannel.o displaymenu.o displaymessage.o displayreplay.o displaytracks.o displayvolume.o lcarsng.o $(PLUGIN).o
### The main target:
diff --git a/displayvolume.c b/displayvolume.c
new file mode 100644
index 0000000..da73d5a
--- /dev/null
+++ b/displayvolume.c
@@ -0,0 +1,71 @@
+#include "lcarsng.h"
+#include "displayvolume.h"
+#include <vdr/font.h>
+
+// --- cLCARSNGDisplayVolume -----------------------------------------------
+
+cLCARSNGDisplayVolume::cLCARSNGDisplayVolume(void)
+{
+ const cFont *font = cFont::GetFont(fontOsd);
+ int lineHeight = font->Height();
+ frameColor = Theme.Color(clrVolumeFrame);
+ mute = -1;
+ x0 = 0;
+ x1 = lineHeight / 2;
+ x2 = lineHeight;
+ x3 = x2 + Gap;
+ x7 = cOsd::OsdWidth();
+ x6 = x7 - lineHeight / 2;
+ x5 = x6 - lineHeight / 2;
+ x4 = x5 - Gap;
+ y0 = 0;
+ y1 = lineHeight;
+ osd = CreateOsd(cOsd::OsdLeft(), cOsd::OsdTop() + cOsd::OsdHeight() - y1, x0, y0, x7 - 1, y1 - 1);
+ osd->DrawRectangle(x0, y0, x7 - 1, y1 - 1, Theme.Color(clrBackground));
+ osd->DrawRectangle(x0, y0, x1 - 1, y1 - 1, clrTransparent);
+ osd->DrawEllipse (x0, y0, x1 - 1, y1 - 1, frameColor, 7);
+ osd->DrawRectangle(x1, y0, x2 - 1, y1 - 1, frameColor);
+ osd->DrawRectangle(x3, y0, x4 - 1, y1 - 1, frameColor);
+ osd->DrawRectangle(x5, y0, x6 - 1, y1 - 1, frameColor);
+ osd->DrawRectangle(x6, y0, x7 - 1, y1 - 1, clrTransparent);
+ osd->DrawEllipse (x6, y0, x7 - 1, y1 - 1, frameColor, 5);
+}
+
+cLCARSNGDisplayVolume::~cLCARSNGDisplayVolume()
+{
+ delete osd;
+ cDevice::PrimaryDevice()->ScaleVideo(cRect::Null);
+}
+
+void cLCARSNGDisplayVolume::SetVolume(int Current, int Total, bool Mute)
+{
+ int xl = x3 + TextSpacing;
+ int xr = x4 - TextSpacing;
+ int yt = y0 + TextFrame;
+ int yb = y1 - TextFrame;
+ if (mute != Mute) {
+ osd->DrawRectangle(x3, y0, x4 - 1, y1 - 1, frameColor);
+ mute = Mute;
+ }
+ cBitmap bm(Mute ? mute_xpm : volume_xpm);
+ osd->DrawBitmap(xl, y0 + (y1 - y0 - bm.Height()) / 2, bm, Theme.Color(clrVolumeSymbol), frameColor);
+ if (!Mute) {
+ xl += bm.Width() + TextSpacing;
+ int w = (y1 - y0) / 3;
+ int d = TextFrame;
+ int n = (xr - xl + d) / (w + d);
+ int x = xr - n * (w + d);
+ tColor Color = Theme.Color(clrVolumeBarLower);
+ for (int i = 0; i < n; i++) {
+ if (Total * i >= Current * n)
+ Color = Theme.Color(clrVolumeBarUpper);
+ osd->DrawRectangle(x, yt, x + w - 1, yb - 1, Color);
+ x += w + d;
+ }
+ }
+}
+
+void cLCARSNGDisplayVolume::Flush(void)
+{
+ osd->Flush();
+}
diff --git a/displayvolume.h b/displayvolume.h
new file mode 100644
index 0000000..d77c7b1
--- /dev/null
+++ b/displayvolume.h
@@ -0,0 +1,18 @@
+#include "lcarsng.h"
+#include <vdr/font.h>
+
+// --- cLCARSNGDisplayVolume -----------------------------------------------
+
+class cLCARSNGDisplayVolume : public cSkinDisplayVolume {
+private:
+ cOsd *osd;
+ int x0, x1, x2, x3, x4, x5, x6, x7;
+ int y0, y1;
+ tColor frameColor;
+ int mute;
+public:
+ cLCARSNGDisplayVolume(void);
+ virtual ~cLCARSNGDisplayVolume();
+ virtual void SetVolume(int Current, int Total, bool Mute);
+ virtual void Flush(void);
+ };
diff --git a/lcarsng.c b/lcarsng.c
index 1e7a570..4ab490a 100644
--- a/lcarsng.c
+++ b/lcarsng.c
@@ -29,6 +29,7 @@
#include "displaymessage.h"
#include "displayreplay.h"
#include "displaytracks.h"
+#include "displayvolume.h"
#include <vdr/font.h>
#include <vdr/menu.h>
#include <vdr/osd.h>
@@ -259,88 +260,6 @@ int FreeMB(const char *Base, bool Initial)
return lastFreeMB;
}
-// --- cLCARSNGDisplayVolume -----------------------------------------------
-
-class cLCARSNGDisplayVolume : public cSkinDisplayVolume {
-private:
- cOsd *osd;
- int x0, x1, x2, x3, x4, x5, x6, x7;
- int y0, y1;
- tColor frameColor;
- int mute;
-public:
- cLCARSNGDisplayVolume(void);
- virtual ~cLCARSNGDisplayVolume();
- virtual void SetVolume(int Current, int Total, bool Mute);
- virtual void Flush(void);
- };
-
-cLCARSNGDisplayVolume::cLCARSNGDisplayVolume(void)
-{
- const cFont *font = cFont::GetFont(fontOsd);
- int lineHeight = font->Height();
- frameColor = Theme.Color(clrVolumeFrame);
- mute = -1;
- x0 = 0;
- x1 = lineHeight / 2;
- x2 = lineHeight;
- x3 = x2 + Gap;
- x7 = cOsd::OsdWidth();
- x6 = x7 - lineHeight / 2;
- x5 = x6 - lineHeight / 2;
- x4 = x5 - Gap;
- y0 = 0;
- y1 = lineHeight;
- osd = CreateOsd(cOsd::OsdLeft(), cOsd::OsdTop() + cOsd::OsdHeight() - y1, x0, y0, x7 - 1, y1 - 1);
- osd->DrawRectangle(x0, y0, x7 - 1, y1 - 1, Theme.Color(clrBackground));
- osd->DrawRectangle(x0, y0, x1 - 1, y1 - 1, clrTransparent);
- osd->DrawEllipse (x0, y0, x1 - 1, y1 - 1, frameColor, 7);
- osd->DrawRectangle(x1, y0, x2 - 1, y1 - 1, frameColor);
- osd->DrawRectangle(x3, y0, x4 - 1, y1 - 1, frameColor);
- osd->DrawRectangle(x5, y0, x6 - 1, y1 - 1, frameColor);
- osd->DrawRectangle(x6, y0, x7 - 1, y1 - 1, clrTransparent);
- osd->DrawEllipse (x6, y0, x7 - 1, y1 - 1, frameColor, 5);
-}
-
-cLCARSNGDisplayVolume::~cLCARSNGDisplayVolume()
-{
- delete osd;
- cDevice::PrimaryDevice()->ScaleVideo(cRect::Null);
-}
-
-void cLCARSNGDisplayVolume::SetVolume(int Current, int Total, bool Mute)
-{
- int xl = x3 + TextSpacing;
- int xr = x4 - TextSpacing;
- int yt = y0 + TextFrame;
- int yb = y1 - TextFrame;
- if (mute != Mute) {
- osd->DrawRectangle(x3, y0, x4 - 1, y1 - 1, frameColor);
- mute = Mute;
- }
- cBitmap bm(Mute ? mute_xpm : volume_xpm);
- osd->DrawBitmap(xl, y0 + (y1 - y0 - bm.Height()) / 2, bm, Theme.Color(clrVolumeSymbol), frameColor);
- if (!Mute) {
- xl += bm.Width() + TextSpacing;
- int w = (y1 - y0) / 3;
- int d = TextFrame;
- int n = (xr - xl + d) / (w + d);
- int x = xr - n * (w + d);
- tColor Color = Theme.Color(clrVolumeBarLower);
- for (int i = 0; i < n; i++) {
- if (Total * i >= Current * n)
- Color = Theme.Color(clrVolumeBarUpper);
- osd->DrawRectangle(x, yt, x + w - 1, yb - 1, Color);
- x += w + d;
- }
- }
-}
-
-void cLCARSNGDisplayVolume::Flush(void)
-{
- osd->Flush();
-}
-
// --- cLCARSNG ------------------------------------------------------------
cLCARSNG::cLCARSNG(void)
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-25 21:51:49 +0000