mirror of
https://github.com/jojo61/vdr-plugin-softhdcuvid.git
synced 2023-10-10 13:37:41 +02:00
More fixes for OSD
This commit is contained in:
parent
8838d4c754
commit
780c594ba2
@ -895,23 +895,15 @@ bool cOglCmdCopyBufferToOutputFb::Execute(void) {
|
||||
pthread_mutex_lock(&OSDMutex);
|
||||
fb->BindRead();
|
||||
oFb->BindWrite();
|
||||
// glClear(GL_COLOR_BUFFER_BIT);
|
||||
|
||||
//#ifdef PLACEBO
|
||||
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
|
||||
glPixelStorei(GL_PACK_ALIGNMENT, 1);
|
||||
if (posd)
|
||||
glReadPixels(0, 0 ,fb->Width(), fb->Height(),GL_RGBA,GL_UNSIGNED_BYTE,posd);
|
||||
//#else
|
||||
#if 0
|
||||
fb->Blit(x, y + fb->Height(), x + fb->Width(), y);
|
||||
glFlush();
|
||||
#endif
|
||||
ActivateOsd(oFb->texture,x, y, fb->Width() ,fb->Height());
|
||||
oFb->Unbind();
|
||||
glFlush();
|
||||
pthread_mutex_unlock(&OSDMutex);
|
||||
|
||||
ActivateOsd(oFb->texture,x, y, fb->Width() ,fb->Height());
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -2062,11 +2054,11 @@ cOglOsd::cOglOsd(int Left, int Top, uint Level, std::shared_ptr<cOglThread> oglT
|
||||
cOglOsd::~cOglOsd() {
|
||||
OsdClose();
|
||||
SetActive(false);
|
||||
|
||||
#if 0
|
||||
if (posd)
|
||||
free(posd);
|
||||
posd = 0;
|
||||
|
||||
#endif
|
||||
oglThread->DoCmd(new cOglCmdDeleteFb(bFb));
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user