summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY1
-rw-r--r--dvbspu.h8
-rw-r--r--spu.h5
4 files changed, 10 insertions, 5 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ea9354a2..de4ede68 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -639,6 +639,7 @@ Sven Goethel <sgoethel@jausoft.com>
for making switching audio channels work without stopping/restarting the DMX
for fixing initializing the highlight area in cDvbSpuDecoder
for suggesting to add cDevice::GetSTC()
+ for making some changes to the SPU decoder interface
Jan Rieger <jan@ricomp.de>
for suggestions and testing raw keyboard input
diff --git a/HISTORY b/HISTORY
index c2a7c343..a5f24577 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2904,3 +2904,4 @@ Video Disk Recorder Revision History
- In order to avoid problems on UTF-8 systems, VDR now checks for the presence
of UTF-8 at program start, and if it is, exists and tells the user to turn off
UTF-8 before starting VDR.
+- Some changes to the SPU decoder interface (thanks to Sven Goethel).
diff --git a/dvbspu.h b/dvbspu.h
index df717c1b..e0f3d0c6 100644
--- a/dvbspu.h
+++ b/dvbspu.h
@@ -8,7 +8,7 @@
*
* parts of this file are derived from the OMS program.
*
- * $Id: dvbspu.h 1.4 2004/05/31 08:49:20 kls Exp $
+ * $Id: dvbspu.h 1.5 2004/06/12 12:57:55 kls Exp $
*/
#ifndef __DVBSPU_H
@@ -132,9 +132,6 @@ class cDvbSpuDecoder:public cSpuDecoder {
int ScaleYres(int value);
void DrawBmp(sDvbSpuRect & size, cBitmap * bmp);
- void Draw();
- void Hide();
-
public:
cDvbSpuDecoder();
~cDvbSpuDecoder();
@@ -147,6 +144,9 @@ class cDvbSpuDecoder:public cSpuDecoder {
uint32_t palette);
void clearHighlight(void);
void Empty(void);
+ void Hide(void);
+ void Draw(void);
+ bool IsVisible(void) { return osd != NULL; }
void processSPU(uint32_t pts, uint8_t * buf);
};
diff --git a/spu.h b/spu.h
index 1ccc74b9..053cf1a9 100644
--- a/spu.h
+++ b/spu.h
@@ -6,7 +6,7 @@
* This code is distributed under the terms and conditions of the
* GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
*
- * $Id: spu.h 1.1 2002/09/08 14:17:51 kls Exp $
+ * $Id: spu.h 1.2 2004/06/12 12:56:27 kls Exp $
*/
#ifndef __SPU_VDR_H
@@ -32,6 +32,9 @@ class cSpuDecoder {
uint32_t palette) = 0;
virtual void clearHighlight(void) = 0;
virtual void Empty(void) = 0;
+ virtual void Hide(void) = 0;
+ virtual void Draw(void) = 0;
+ virtual bool IsVisible(void) = 0;
virtual void processSPU(uint32_t pts, uint8_t * buf) = 0;
};