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

Successful integration of Qt movie play window.

This commit is contained in:
Matthew Budd 2020-11-07 13:32:40 -05:00
parent 018204089a
commit e42232777e
5 changed files with 89 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/drivers/Qt/ConsoleUtilities.cpp
View File

@ -198,6 +198,12 @@ fceuDecIntValidtor::fceuDecIntValidtor( int min, int max, QObject *parent)
this->max = max; this->max = max;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void fceuDecIntValidtor::setMinMax( int min, int max)
{
this->min = min;
this->max = max;
}
//---------------------------------------------------------------------------
QValidator::State fceuDecIntValidtor::validate(QString &input, int &pos) const QValidator::State fceuDecIntValidtor::validate(QString &input, int &pos) const
{ {
int i, v; int i, v;

5
src/drivers/Qt/ConsoleUtilities.h
View File

@ -1,4 +1,7 @@
// ConsoleUtilities.h // ConsoleUtilities.h
#pragma once
#include <QValidator> #include <QValidator>
int getDirFromFile( const char *path, char *dir ); int getDirFromFile( const char *path, char *dir );
@ -16,6 +19,8 @@ class fceuDecIntValidtor : public QValidator
fceuDecIntValidtor( int min, int max, QObject *parent); fceuDecIntValidtor( int min, int max, QObject *parent);
QValidator::State validate(QString &input, int &pos) const; QValidator::State validate(QString &input, int &pos) const;
void setMinMax( int min, int max );
private: private:
int min; int min;
int max; int max;

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

@ -1614,81 +1614,6 @@ void consoleWin_t::openMovie(void)
win->show(); win->show();
} }
//void consoleWin_t::openMovie(void)
//{
// int ret, useNativeFileDialogVal;
// QString filename;
// std::string last;
// char dir[512];
// char replayReadOnlySetting;
// QFileDialog dialog(this, tr("Open FM2 Movie") );
//
// dialog.setFileMode(QFileDialog::ExistingFile);
//
// dialog.setNameFilter(tr("FM2 Movies (*.fm2) ;; All files (*)"));
//
// dialog.setViewMode(QFileDialog::List);
// dialog.setFilter( QDir::AllEntries | QDir::AllDirs | QDir::Hidden );
// dialog.setLabelText( QFileDialog::Accept, tr("Open") );
//
// g_config->getOption ("SDL.LastOpenMovie", &last );
//
// getDirFromFile( last.c_str(), dir );
//
// dialog.setDirectory( tr(dir) );
//
// // Check config option to use native file dialog or not
// g_config->getOption ("SDL.UseNativeFileDialog", &useNativeFileDialogVal);
//
// dialog.setOption(QFileDialog::DontUseNativeDialog, !useNativeFileDialogVal);
//
// dialog.show();
// ret = dialog.exec();
//
// if ( ret )
// {
// QStringList fileList;
// fileList = dialog.selectedFiles();
//
// if ( fileList.size() > 0 )
// {
// filename = fileList[0];
// }
// }
//
// if ( filename.isNull() )
// {
// return;
// }
// qDebug() << "selected file path : " << filename.toUtf8();
//
// int pauseframe;
// g_config->getOption ("SDL.PauseFrame", &pauseframe);
// g_config->setOption ("SDL.PauseFrame", 0);
//
// FCEUI_printf ("Playing back movie located at %s\n", filename.toStdString().c_str() );
//
// if (suggestReadOnlyReplay)
// {
// replayReadOnlySetting = true;
// }
// else
// {
// replayReadOnlySetting = FCEUI_GetMovieToggleReadOnly();
// }
//
// fceuWrapperLock();
// if (FCEUI_LoadMovie( filename.toStdString().c_str(),
// replayReadOnlySetting, pauseframe ? pauseframe : false) == false)
// {
// printf("Error: Could not open movie file: %s \n", filename.toStdString().c_str() );
// }
// g_config->setOption ("SDL.LastOpenMovie", filename.toStdString().c_str() );
// fceuWrapperUnLock();
//
// return;
//}
void consoleWin_t::stopMovie(void) void consoleWin_t::stopMovie(void)
{ {
fceuWrapperLock(); fceuWrapperLock();

86
src/drivers/Qt/MoviePlay.cpp
View File

@ -8,6 +8,7 @@
#include <QHeaderView> #include <QHeaderView>
#include <QCloseEvent> #include <QCloseEvent>
#include <QFileDialog> #include <QFileDialog>
#include <QMessageBox>
#include <QGridLayout> #include <QGridLayout>
#include "../../fceu.h" #include "../../fceu.h"
@ -32,6 +33,7 @@ MoviePlayDialog_t::MoviePlayDialog_t(QWidget *parent)
QGridLayout *grid; QGridLayout *grid;
QLabel *lbl; QLabel *lbl;
QPushButton *okButton, *cancelButton; QPushButton *okButton, *cancelButton;
bool replayReadOnlySetting;
setWindowTitle("Movie Play"); setWindowTitle("Movie Play");
@ -57,8 +59,12 @@ MoviePlayDialog_t::MoviePlayDialog_t(QWidget *parent)
openReadOnly = new QCheckBox( tr("Open Read-Only") ); openReadOnly = new QCheckBox( tr("Open Read-Only") );
pauseAtFrame = new QCheckBox( tr("Pause Movie At Frame") ); pauseAtFrame = new QCheckBox( tr("Pause Movie At Frame") );
validator = new fceuDecIntValidtor( 0, 100000000, this );
pauseAtFrameEntry = new QLineEdit(); pauseAtFrameEntry = new QLineEdit();
pauseAtFrameEntry->setValidator( validator );
vbox->addWidget( openReadOnly ); vbox->addWidget( openReadOnly );
vbox->addLayout( hbox ); vbox->addLayout( hbox );
hbox->addWidget( pauseAtFrame ); hbox->addWidget( pauseAtFrame );
@ -121,6 +127,20 @@ MoviePlayDialog_t::MoviePlayDialog_t(QWidget *parent)
connect( movBrowseBtn , SIGNAL(clicked(void)) , this, SLOT(openMovie(void)) ); connect( movBrowseBtn , SIGNAL(clicked(void)) , this, SLOT(openMovie(void)) );
connect( movSelBox , SIGNAL(activated(int)), this, SLOT(movieSelect(int)) ); connect( movSelBox , SIGNAL(activated(int)), this, SLOT(movieSelect(int)) );
connect( pauseAtFrame , SIGNAL(stateChanged(int)), this, SLOT(pauseAtFrameChange(int)) );
if (suggestReadOnlyReplay)
{
replayReadOnlySetting = true;
}
else
{
replayReadOnlySetting = FCEUI_GetMovieToggleReadOnly();
}
openReadOnly->setChecked( replayReadOnlySetting );
pauseAtFrameEntry->setEnabled( pauseAtFrame->isChecked() );
doScan(); doScan();
updateMovieText(); updateMovieText();
@ -156,6 +176,11 @@ void MoviePlayDialog_t::movieSelect(int index)
updateMovieText(); updateMovieText();
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void MoviePlayDialog_t::pauseAtFrameChange(int state)
{
pauseAtFrameEntry->setEnabled( state != Qt::Unchecked );
}
//----------------------------------------------------------------------------
void MoviePlayDialog_t::clearMovieText(void) void MoviePlayDialog_t::clearMovieText(void)
{ {
movLenLbl->clear(); movLenLbl->clear();
@ -168,6 +193,7 @@ void MoviePlayDialog_t::clearMovieText(void)
emuUsedLbl->clear(); emuUsedLbl->clear();
palUsedLbl->clear(); palUsedLbl->clear();
newppuUsedLbl->clear(); newppuUsedLbl->clear();
pauseAtFrameEntry->clear();
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void MoviePlayDialog_t::updateMovieText(void) void MoviePlayDialog_t::updateMovieText(void)
@ -191,6 +217,8 @@ void MoviePlayDialog_t::updateMovieText(void)
if ( fp == NULL ) if ( fp == NULL )
{ {
sprintf( stmp, "Error: Failed to open file '%s'", path.c_str() );
showErrorMsgWindow( stmp );
clearMovieText(); clearMovieText();
return; return;
} }
@ -200,9 +228,12 @@ void MoviePlayDialog_t::updateMovieText(void)
{ {
double div; double div;
validator->setMinMax( 0, info.num_frames );
sprintf(stmp, "%u", (unsigned)info.num_frames); sprintf(stmp, "%u", (unsigned)info.num_frames);
movFramesLbl->setText( tr(stmp) ); movFramesLbl->setText( tr(stmp) );
pauseAtFrameEntry->setText( tr(stmp) );
div = (FCEUI_GetCurrentVidSystem(0,0)) ? 50.006977968268290849 : 60.098813897440515532; // PAL timing div = (FCEUI_GetCurrentVidSystem(0,0)) ? 50.006977968268290849 : 60.098813897440515532; // PAL timing
double tempCount = (info.num_frames / div) + 0.005; // +0.005s for rounding double tempCount = (info.num_frames / div) + 0.005; // +0.005s for rounding
@ -247,9 +278,22 @@ void MoviePlayDialog_t::updateMovieText(void)
palUsedLbl->setText( tr(info.pal ? "On" : "Off") ); palUsedLbl->setText( tr(info.pal ? "On" : "Off") );
newppuUsedLbl->setText( tr(info.ppuflag ? "On" : "Off") ); newppuUsedLbl->setText( tr(info.ppuflag ? "On" : "Off") );
if ( GameInfo )
{
strcpy( stmp, md5_asciistr(GameInfo->MD5) );
if ( strcmp( stmp, md5_asciistr(info.md5_of_rom_used) ) != 0 )
{
sprintf( stmp, "Warning: Selected movie file '%s' may not have been created using the currently loaded ROM.", path.c_str() );
showWarningMsgWindow( stmp );
}
}
} }
else else
{ {
sprintf( stmp, "Error: Selected file '%s' does not have a recognized movie format.", path.c_str() );
showErrorMsgWindow( stmp );
clearMovieText(); clearMovieText();
} }
delete fp; delete fp;
@ -392,13 +436,11 @@ void MoviePlayDialog_t::playMovie(void)
path = movSelBox->itemText(idx).toStdString(); path = movSelBox->itemText(idx).toStdString();
if (suggestReadOnlyReplay) replayReadOnlySetting = openReadOnly->isChecked();
if ( pauseAtFrame->isChecked() )
{ {
replayReadOnlySetting = true; pauseframe = strtol( pauseAtFrameEntry->text().toStdString().c_str(), NULL, 0 );
}
else
{
replayReadOnlySetting = FCEUI_GetMovieToggleReadOnly();
} }
fceuWrapperLock(); fceuWrapperLock();
@ -411,7 +453,9 @@ void MoviePlayDialog_t::playMovie(void)
if ( movieLoadError ) if ( movieLoadError )
{ {
printf("Error: Could not open movie file: %s \n", path.c_str() ); char stmp[256];
sprintf( stmp, "Error: Could not load movie file: %s \n", path.c_str() );
showErrorMsgWindow( stmp );
} }
else else
{ {
@ -487,15 +531,29 @@ void MoviePlayDialog_t::openMovie(void)
addFileToList( filename.toStdString().c_str(), true ); addFileToList( filename.toStdString().c_str(), true );
updateMovieText(); updateMovieText();
//fceuWrapperLock();
//if (FCEUI_LoadMovie( filename.toStdString().c_str(),
// replayReadOnlySetting, pauseframe ? pauseframe : false) == false)
//{
// printf("Error: Could not open movie file: %s \n", filename.toStdString().c_str() );
//}
g_config->setOption ("SDL.LastOpenMovie", filename.toStdString().c_str() ); g_config->setOption ("SDL.LastOpenMovie", filename.toStdString().c_str() );
//fceuWrapperUnLock();
return; return;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void MoviePlayDialog_t::showErrorMsgWindow(const char *str)
{
QMessageBox msgBox(this);
msgBox.setIcon( QMessageBox::Critical );
msgBox.setText( tr(str) );
msgBox.show();
msgBox.exec();
}
//----------------------------------------------------------------------------
void MoviePlayDialog_t::showWarningMsgWindow(const char *str)
{
QMessageBox msgBox(this);
msgBox.setIcon( QMessageBox::Warning );
msgBox.setText( tr(str) );
msgBox.show();
msgBox.exec();
}
//----------------------------------------------------------------------------

7
src/drivers/Qt/MoviePlay.h
View File

@ -16,6 +16,7 @@
#include <QGroupBox> #include <QGroupBox>
#include "Qt/main.h" #include "Qt/main.h"
#include "Qt/ConsoleUtilities.h"
class MoviePlayDialog_t : public QDialog class MoviePlayDialog_t : public QDialog
{ {
@ -45,6 +46,8 @@ class MoviePlayDialog_t : public QDialog
QLabel *palUsedLbl; QLabel *palUsedLbl;
QLabel *newppuUsedLbl; QLabel *newppuUsedLbl;
fceuDecIntValidtor *validator;
private: private:
void doScan(void); void doScan(void);
void clearMovieText(void); void clearMovieText(void);
@ -52,6 +55,8 @@ class MoviePlayDialog_t : public QDialog
int addFileToList( const char *file, bool setActive = false ); int addFileToList( const char *file, bool setActive = false );
bool checkMD5Sum( const char *path, const char *md5 ); bool checkMD5Sum( const char *path, const char *md5 );
void scanDirectory( const char *dirPath, const char *md5 ); void scanDirectory( const char *dirPath, const char *md5 );
void showErrorMsgWindow(const char *str);
void showWarningMsgWindow(const char *str);
public slots: public slots:
void closeWindow(void); void closeWindow(void);
@ -59,6 +64,6 @@ class MoviePlayDialog_t : public QDialog
void openMovie(void); void openMovie(void);
void playMovie(void); void playMovie(void);
void movieSelect(int index); void movieSelect(int index);
//void readOnlyReplayChanged( int state ); void pauseAtFrameChange(int state);
}; };