diff options
| -rw-r--r-- | dxr3interface_spu_encoder.c | 30 | ||||
| -rw-r--r-- | dxr3interface_spu_encoder.h | 1 | ||||
| -rw-r--r-- | dxr3osd.c | 3 |
3 files changed, 2 insertions, 32 deletions
diff --git a/dxr3interface_spu_encoder.c b/dxr3interface_spu_encoder.c index d99d4b5..acf7c72 100644 --- a/dxr3interface_spu_encoder.c +++ b/dxr3interface_spu_encoder.c @@ -593,36 +593,6 @@ void cSPUEncoder::encode_do_control(int x, int y, encodedata* ed, pixbuf* pb) } // ================================== -// Stop spu display -void cSPUEncoder::StopSpu(void) -{ - uint8_t ed[10]; - /* packet size */ - ed[0] = 0; - ed[1] = 10; - - /* pointer to the SP_DCSQT */ - ed[2] = 0; - ed[3] = 4; - - /* SP_DCSQT */ - /* display duration... */ - ed[4] = 0x00; - ed[5] = 0x00; //duration before turn on command occurs (will not be used) - - /* pointer to next command block */ - ed[6] = 0; //since this is the last command block, this - ed[7] = 4;//points back to itself - - /* 0x02: stop displaying */ - ed[8] = 0x02; - - /* 0xFF: end sequence */ - ed[9] = 0xFF; - cDxr3Interface::instance()->WriteSpu(ed, 10); -} - -// ================================== // we _only_ write usefull data void cSPUEncoder::CalculateActiveOsdArea() { diff --git a/dxr3interface_spu_encoder.h b/dxr3interface_spu_encoder.h index abecf54..a05d626 100644 --- a/dxr3interface_spu_encoder.h +++ b/dxr3interface_spu_encoder.h @@ -80,7 +80,6 @@ public: int Flush(cPalette *Palette); void CopyBlockIntoOSD(int numWindow, int linewidth, int x0,int y0, int x1, int y1, const tIndex *data); - void StopSpu(void); void SetPalette(int numWindow, cPalette* commonPalette, cPalette* windowPalette); void Clear(void); @@ -21,6 +21,7 @@ */ #include "dxr3interface.h" +#include "spuencoder.h" #include "dxr3osd.h" #include "dxr3interface_spu_encoder.h" @@ -97,7 +98,7 @@ void cDxr3Osd::SetActive(bool On) } else { - Spu->StopSpu(); + cSpuEncoder::instance()->clearOsd(); } } } |