ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup of Qt GUI video driver viewport loading/unloading. Use QObject::deleteLater for a cleaner shutdown of a viewport.

This commit is contained in:
harry 2023-05-11 08:05:14 -04:00
parent 52c53dfe5b
commit 58b87387eb
5 changed files with 112 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/drivers/Qt/ConsoleViewerGL.cpp
View File

@ -136,6 +136,8 @@ ConsoleViewGL_t::ConsoleViewGL_t(QWidget *parent)
ConsoleViewGL_t::~ConsoleViewGL_t(void) ConsoleViewGL_t::~ConsoleViewGL_t(void)
{ {
//printf("Destroying GL Viewport\n");
if ( localBuf ) if ( localBuf )
{ {
free( localBuf ); localBuf = NULL; free( localBuf ); localBuf = NULL;

2
src/drivers/Qt/ConsoleViewerQWidget.cpp
View File

@ -120,6 +120,8 @@ ConsoleViewQWidget_t::ConsoleViewQWidget_t(QWidget *parent)
ConsoleViewQWidget_t::~ConsoleViewQWidget_t(void) ConsoleViewQWidget_t::~ConsoleViewQWidget_t(void)
{ {
//printf("Destroying QPainter Viewport\n");
if ( localBuf ) if ( localBuf )
{ {
free( localBuf ); localBuf = nullptr; free( localBuf ); localBuf = nullptr;

2
src/drivers/Qt/ConsoleViewerSDL.cpp
View File

@ -122,6 +122,8 @@ ConsoleViewSDL_t::ConsoleViewSDL_t(QWidget *parent)
ConsoleViewSDL_t::~ConsoleViewSDL_t(void) ConsoleViewSDL_t::~ConsoleViewSDL_t(void)
{ {
//printf("Destroying SDL Viewport\n");
if ( localBuf ) if ( localBuf )
{ {
free( localBuf ); localBuf = NULL; free( localBuf ); localBuf = NULL;

181
src/drivers/Qt/ConsoleWindow.cpp
View File

@ -152,31 +152,7 @@ consoleWin_t::consoleWin_t(QWidget *parent)
g_config->getOption( "SDL.Sound.UseGlobalFocus", &soundUseGlobalFocus ); g_config->getOption( "SDL.Sound.UseGlobalFocus", &soundUseGlobalFocus );
g_config->getOption ("SDL.VideoDriver", &videoDriver); g_config->getOption ("SDL.VideoDriver", &videoDriver);
if ( videoDriver == ConsoleViewerBase::VIDEO_DRIVER_SDL) loadVideoDriver( videoDriver );
{
viewport_SDL = new ConsoleViewSDL_t(this);
setCentralWidget(viewport_SDL);
viewport_Interface = static_cast<ConsoleViewerBase*>(viewport_SDL);
}
else if ( videoDriver == ConsoleViewerBase::VIDEO_DRIVER_QPAINTER)
{
viewport_QWidget = new ConsoleViewQWidget_t(this);
setCentralWidget(viewport_QWidget);
viewport_Interface = static_cast<ConsoleViewerBase*>(viewport_QWidget);
}
else
{
viewport_GL = new ConsoleViewGL_t(this);
setCentralWidget(viewport_GL);
viewport_Interface = static_cast<ConsoleViewerBase*>(viewport_GL);
}
setViewportAspect();
setWindowTitle( tr(FCEU_NAME_AND_VERSION) ); setWindowTitle( tr(FCEU_NAME_AND_VERSION) );
setWindowIcon(QIcon(":fceux1.png")); setWindowIcon(QIcon(":fceux1.png"));
@ -327,18 +303,8 @@ consoleWin_t::~consoleWin_t(void)
//fceuWrapperClose(); //fceuWrapperClose();
//FCEU_WRAPPER_UNLOCK(); //FCEU_WRAPPER_UNLOCK();
if ( viewport_GL != NULL ) unloadVideoDriver();
{
delete viewport_GL; viewport_GL = NULL;
}
if ( viewport_SDL != NULL )
{
delete viewport_SDL; viewport_SDL = NULL;
}
if ( viewport_QWidget != NULL )
{
delete viewport_QWidget; viewport_QWidget = NULL;
}
delete mutex; delete mutex;
// LoadGame() checks for an IP and if it finds one begins a network session // LoadGame() checks for an IP and if it finds one begins a network session
@ -1977,6 +1943,99 @@ void consoleWin_t::createMainMenu(void)
#endif #endif
}; };
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
//---------------------------------------------------------------------------
int consoleWin_t::unloadVideoDriver(void)
{
viewport_Interface = NULL;
if (viewport_GL != NULL)
{
if ( viewport_GL == centralWidget() )
{
takeCentralWidget();
}
else
{
printf("Error: Central Widget Failed!\n");
}
viewport_GL->deleteLater();
viewport_GL = NULL;
}
if (viewport_SDL != NULL)
{
if ( viewport_SDL == centralWidget() )
{
takeCentralWidget();
}
else
{
printf("Error: Central Widget Failed!\n");
}
viewport_SDL->deleteLater();
viewport_SDL = NULL;
}
if (viewport_QWidget != NULL)
{
if ( viewport_QWidget == centralWidget() )
{
takeCentralWidget();
}
else
{
printf("Error: Central Widget Failed!\n");
}
viewport_QWidget->deleteLater();
viewport_QWidget = NULL;
}
return 0;
}
//---------------------------------------------------------------------------
void consoleWin_t::videoDriverDestroyed(QObject* obj)
{
if (viewport_GL == obj)
{
//printf("GL Video Driver Destroyed\n");
if (viewport_Interface == static_cast<ConsoleViewerBase*>(viewport_GL))
{
viewport_Interface = NULL;
}
viewport_GL = NULL;
}
if (viewport_SDL == obj)
{
//printf("SDL Video Driver Destroyedi\n");
if (viewport_Interface == static_cast<ConsoleViewerBase*>(viewport_SDL))
{
viewport_Interface = NULL;
}
viewport_SDL = NULL;
}
if (viewport_QWidget == obj)
{
//printf("QPainter Video Driver Destroyed\n");
if (viewport_Interface == static_cast<ConsoleViewerBase*>(viewport_QWidget))
{
viewport_Interface = NULL;
}
viewport_QWidget = NULL;
}
printf("Video Driver Destroyed: %p\n", obj);
//printf("viewport_GL: %p\n", viewport_GL);
//printf("viewport_SDL: %p\n", viewport_SDL);
//printf("viewport_Qt: %p\n", viewport_QWidget);
//printf("viewport_Interface: %p\n", viewport_Interface);
}
//---------------------------------------------------------------------------
int consoleWin_t::loadVideoDriver( int driverId, bool force ) int consoleWin_t::loadVideoDriver( int driverId, bool force )
{ {
if (viewport_Interface) if (viewport_Interface)
@ -1985,46 +2044,7 @@ int consoleWin_t::loadVideoDriver( int driverId, bool force )
{ // Already Loaded { // Already Loaded
if (force) if (force)
{ {
switch (viewport_Interface->driver()) unloadVideoDriver();
{
case ConsoleViewerBase::VIDEO_DRIVER_OPENGL:
{
if ( viewport_GL == centralWidget() )
{
takeCentralWidget();
}
delete viewport_GL;
viewport_GL = NULL;
}
break;
case ConsoleViewerBase::VIDEO_DRIVER_SDL:
{
if ( viewport_SDL == centralWidget() )
{
takeCentralWidget();
}
delete viewport_SDL;
viewport_SDL = NULL;
}
break;
case ConsoleViewerBase::VIDEO_DRIVER_QPAINTER:
{
if ( viewport_QWidget == centralWidget() )
{
takeCentralWidget();
}
delete viewport_QWidget;
viewport_QWidget = NULL;
}
break;
default:
printf("Error: Invalid video driver\n");
break;
}
} }
else else
{ {
@ -2046,6 +2066,8 @@ int consoleWin_t::loadVideoDriver( int driverId, bool force )
setViewportAspect(); setViewportAspect();
viewport_SDL->init(); viewport_SDL->init();
connect( viewport_SDL, SIGNAL(destroyed(QObject*)), this, SLOT(videoDriverDestroyed(QObject*)) );
} }
break; break;
case ConsoleViewerBase::VIDEO_DRIVER_OPENGL: case ConsoleViewerBase::VIDEO_DRIVER_OPENGL:
@ -2059,8 +2081,11 @@ int consoleWin_t::loadVideoDriver( int driverId, bool force )
setViewportAspect(); setViewportAspect();
viewport_GL->init(); viewport_GL->init();
connect( viewport_GL, SIGNAL(destroyed(QObject*)), this, SLOT(videoDriverDestroyed(QObject*)) );
} }
break; break;
default:
case ConsoleViewerBase::VIDEO_DRIVER_QPAINTER: case ConsoleViewerBase::VIDEO_DRIVER_QPAINTER:
{ {
viewport_QWidget = new ConsoleViewQWidget_t(this); viewport_QWidget = new ConsoleViewQWidget_t(this);
@ -2072,6 +2097,8 @@ int consoleWin_t::loadVideoDriver( int driverId, bool force )
setViewportAspect(); setViewportAspect();
viewport_QWidget->init(); viewport_QWidget->init();
connect( viewport_QWidget, SIGNAL(destroyed(QObject*)), this, SLOT(videoDriverDestroyed(QObject*)) );
} }
break; break;
} }

2
src/drivers/Qt/ConsoleWindow.h
View File

@ -158,6 +158,7 @@ class consoleWin_t : public QMainWindow
#endif #endif
int loadVideoDriver( int driverId, bool force = false ); int loadVideoDriver( int driverId, bool force = false );
int unloadVideoDriver(void);
double getRefreshRate(void){ return refreshRate; } double getRefreshRate(void){ return refreshRate; }
@ -466,6 +467,7 @@ class consoleWin_t : public QMainWindow
void toggleUseBgPaletteForVideo(bool); void toggleUseBgPaletteForVideo(bool);
void videoBgColorChanged( QColor &c ); void videoBgColorChanged( QColor &c );
void loadRomRequestCB( QString s ); void loadRomRequestCB( QString s );
void videoDriverDestroyed( QObject *obj );
}; };