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

Renamed a few of the files and class objects to be more appropriate to what the actually are.

This commit is contained in:
Matthew Budd 2020-07-05 16:37:26 -04:00
parent f2e7b66c61
commit 824bdda083
8 changed files with 31 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fceux.pro
View File

@ -294,17 +294,17 @@ SOURCES += src/drivers/common/scalebit.cpp
SOURCES += src/drivers/common/vidblit.cpp SOURCES += src/drivers/common/vidblit.cpp
SOURCES += src/drivers/common/nes_ntsc.c SOURCES += src/drivers/common/nes_ntsc.c
HEADERS += src/drivers/Qt/GameApp.h HEADERS += src/drivers/Qt/ConsoleWindow.h
HEADERS += src/drivers/Qt/GameViewerGL.h HEADERS += src/drivers/Qt/GameViewerGL.h
HEADERS += src/drivers/Qt/GameViewerSDL.h HEADERS += src/drivers/Qt/GameViewerSDL.h
HEADERS += src/drivers/Qt/GamePadConf.h HEADERS += src/drivers/Qt/GamePadConf.h
HEADERS += src/drivers/Qt/GameSoundConf.h HEADERS += src/drivers/Qt/ConsoleSoundConf.h
SOURCES += src/drivers/Qt/main.cpp SOURCES += src/drivers/Qt/main.cpp
SOURCES += src/drivers/Qt/GameApp.cpp SOURCES += src/drivers/Qt/ConsoleWindow.cpp
SOURCES += src/drivers/Qt/GameViewerGL.cpp SOURCES += src/drivers/Qt/GameViewerGL.cpp
SOURCES += src/drivers/Qt/GameViewerSDL.cpp SOURCES += src/drivers/Qt/GameViewerSDL.cpp
SOURCES += src/drivers/Qt/GamePadConf.cpp SOURCES += src/drivers/Qt/GamePadConf.cpp
SOURCES += src/drivers/Qt/GameSoundConf.cpp SOURCES += src/drivers/Qt/ConsoleSoundConf.cpp
SOURCES += src/drivers/Qt/fceuWrapper.cpp SOURCES += src/drivers/Qt/fceuWrapper.cpp
SOURCES += src/drivers/Qt/config.cpp SOURCES += src/drivers/Qt/config.cpp
SOURCES += src/drivers/Qt/input.cpp SOURCES += src/drivers/Qt/input.cpp

36
src/drivers/Qt/GameSoundConf.cpp → src/drivers/Qt/ConsoleSoundConf.cpp
View File

@ -2,14 +2,14 @@
// //
#include "../../fceu.h" #include "../../fceu.h"
#include "../../driver.h" #include "../../driver.h"
#include "Qt/GameSoundConf.h" #include "Qt/ConsoleSoundConf.h"
#include "Qt/main.h" #include "Qt/main.h"
#include "Qt/dface.h" #include "Qt/dface.h"
#include "Qt/config.h" #include "Qt/config.h"
#include "Qt/fceuWrapper.h" #include "Qt/fceuWrapper.h"
//---------------------------------------------------- //----------------------------------------------------
GameSndConfDialog_t::GameSndConfDialog_t(QWidget *parent) ConsoleSndConfDialog_t::ConsoleSndConfDialog_t(QWidget *parent)
: QDialog( parent ) : QDialog( parent )
{ {
int buf; int buf;
@ -215,12 +215,12 @@ GameSndConfDialog_t::GameSndConfDialog_t(QWidget *parent)
setLayout( hbox1 ); setLayout( hbox1 );
} }
//---------------------------------------------------- //----------------------------------------------------
GameSndConfDialog_t::~GameSndConfDialog_t(void) ConsoleSndConfDialog_t::~ConsoleSndConfDialog_t(void)
{ {
} }
//---------------------------------------------------- //----------------------------------------------------
void GameSndConfDialog_t::setCheckBoxFromProperty( QCheckBox *cbx, const char *property ) void ConsoleSndConfDialog_t::setCheckBoxFromProperty( QCheckBox *cbx, const char *property )
{ {
int pval; int pval;
g_config->getOption (property, &pval); g_config->getOption (property, &pval);
@ -228,7 +228,7 @@ void GameSndConfDialog_t::setCheckBoxFromProperty( QCheckBox *cbx, const char *
cbx->setCheckState( pval ? Qt::Checked : Qt::Unchecked ); cbx->setCheckState( pval ? Qt::Checked : Qt::Unchecked );
} }
//---------------------------------------------------- //----------------------------------------------------
void GameSndConfDialog_t::setComboBoxFromProperty( QComboBox *cbx, const char *property ) void ConsoleSndConfDialog_t::setComboBoxFromProperty( QComboBox *cbx, const char *property )
{ {
int i, pval; int i, pval;
g_config->getOption (property, &pval); g_config->getOption (property, &pval);
@ -242,7 +242,7 @@ void GameSndConfDialog_t::setComboBoxFromProperty( QComboBox *cbx, const char *
} }
} }
//---------------------------------------------------- //----------------------------------------------------
void GameSndConfDialog_t::setSliderFromProperty( QSlider *slider, QLabel *lbl, const char *property ) void ConsoleSndConfDialog_t::setSliderFromProperty( QSlider *slider, QLabel *lbl, const char *property )
{ {
int pval; int pval;
char stmp[32]; char stmp[32];
@ -252,7 +252,7 @@ void GameSndConfDialog_t::setSliderFromProperty( QSlider *slider, QLabel *lbl,
lbl->setText( stmp ); lbl->setText( stmp );
} }
//---------------------------------------------------- //----------------------------------------------------
void GameSndConfDialog_t::bufSizeChanged(int value) void ConsoleSndConfDialog_t::bufSizeChanged(int value)
{ {
char stmp[32]; char stmp[32];
@ -266,7 +266,7 @@ void GameSndConfDialog_t::bufSizeChanged(int value)
InitSound (); InitSound ();
} }
//---------------------------------------------------- //----------------------------------------------------
void GameSndConfDialog_t::volumeChanged(int value) void ConsoleSndConfDialog_t::volumeChanged(int value)
{ {
char stmp[32]; char stmp[32];
@ -278,7 +278,7 @@ void GameSndConfDialog_t::volumeChanged(int value)
FCEUI_SetSoundVolume (value); FCEUI_SetSoundVolume (value);
} }
//---------------------------------------------------- //----------------------------------------------------
void GameSndConfDialog_t::triangleChanged(int value) void ConsoleSndConfDialog_t::triangleChanged(int value)
{ {
char stmp[32]; char stmp[32];
@ -290,7 +290,7 @@ void GameSndConfDialog_t::triangleChanged(int value)
FCEUI_SetTriangleVolume (value); FCEUI_SetTriangleVolume (value);
} }
//---------------------------------------------------- //----------------------------------------------------
void GameSndConfDialog_t::square1Changed(int value) void ConsoleSndConfDialog_t::square1Changed(int value)
{ {
char stmp[32]; char stmp[32];
@ -302,7 +302,7 @@ void GameSndConfDialog_t::square1Changed(int value)
FCEUI_SetSquare1Volume (value); FCEUI_SetSquare1Volume (value);
} }
//---------------------------------------------------- //----------------------------------------------------
void GameSndConfDialog_t::square2Changed(int value) void ConsoleSndConfDialog_t::square2Changed(int value)
{ {
char stmp[32]; char stmp[32];
@ -314,7 +314,7 @@ void GameSndConfDialog_t::square2Changed(int value)
FCEUI_SetSquare2Volume (value); FCEUI_SetSquare2Volume (value);
} }
//---------------------------------------------------- //----------------------------------------------------
void GameSndConfDialog_t::noiseChanged(int value) void ConsoleSndConfDialog_t::noiseChanged(int value)
{ {
char stmp[32]; char stmp[32];
@ -326,7 +326,7 @@ void GameSndConfDialog_t::noiseChanged(int value)
FCEUI_SetNoiseVolume (value); FCEUI_SetNoiseVolume (value);
} }
//---------------------------------------------------- //----------------------------------------------------
void GameSndConfDialog_t::pcmChanged(int value) void ConsoleSndConfDialog_t::pcmChanged(int value)
{ {
char stmp[32]; char stmp[32];
@ -338,7 +338,7 @@ void GameSndConfDialog_t::pcmChanged(int value)
FCEUI_SetPCMVolume (value); FCEUI_SetPCMVolume (value);
} }
//---------------------------------------------------- //----------------------------------------------------
void GameSndConfDialog_t::enaSoundStateChange(int value) void ConsoleSndConfDialog_t::enaSoundStateChange(int value)
{ {
if ( value ) if ( value )
{ {
@ -357,7 +357,7 @@ void GameSndConfDialog_t::enaSoundStateChange(int value)
} }
} }
//---------------------------------------------------- //----------------------------------------------------
void GameSndConfDialog_t::enaSoundLowPassChange(int value) void ConsoleSndConfDialog_t::enaSoundLowPassChange(int value)
{ {
if (value) if (value)
{ {
@ -372,7 +372,7 @@ void GameSndConfDialog_t::enaSoundLowPassChange(int value)
g_config->save (); g_config->save ();
} }
//---------------------------------------------------- //----------------------------------------------------
void GameSndConfDialog_t::swapDutyCallback(int value) void ConsoleSndConfDialog_t::swapDutyCallback(int value)
{ {
if (value) if (value)
{ {
@ -387,7 +387,7 @@ void GameSndConfDialog_t::swapDutyCallback(int value)
g_config->save (); g_config->save ();
} }
//---------------------------------------------------- //----------------------------------------------------
void GameSndConfDialog_t::soundQualityChanged(int index) void ConsoleSndConfDialog_t::soundQualityChanged(int index)
{ {
//printf("Sound Quality: %i : %i \n", index, qualitySelect->itemData(index).toInt() ); //printf("Sound Quality: %i : %i \n", index, qualitySelect->itemData(index).toInt() );
@ -399,7 +399,7 @@ void GameSndConfDialog_t::soundQualityChanged(int index)
g_config->save (); g_config->save ();
} }
//---------------------------------------------------- //----------------------------------------------------
void GameSndConfDialog_t::soundRateChanged(int index) void ConsoleSndConfDialog_t::soundRateChanged(int index)
{ {
//printf("Sound Rate: %i : %i \n", index, rateSelect->itemData(index).toInt() ); //printf("Sound Rate: %i : %i \n", index, rateSelect->itemData(index).toInt() );

6
src/drivers/Qt/GameSoundConf.h → src/drivers/Qt/ConsoleSoundConf.h
View File

@ -16,13 +16,13 @@
#include <QFrame> #include <QFrame>
#include <QGroupBox> #include <QGroupBox>
class GameSndConfDialog_t : public QDialog class ConsoleSndConfDialog_t : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
GameSndConfDialog_t(QWidget *parent = 0); ConsoleSndConfDialog_t(QWidget *parent = 0);
~GameSndConfDialog_t(void); ~ConsoleSndConfDialog_t(void);
protected: protected:
QCheckBox *enaChkbox; QCheckBox *enaChkbox;

8
src/drivers/Qt/GameApp.cpp → src/drivers/Qt/ConsoleWindow.cpp
View File

@ -2,9 +2,9 @@
// //
#include <QFileDialog> #include <QFileDialog>
#include "Qt/GameApp.h" #include "Qt/ConsoleWindow.h"
#include "Qt/GamePadConf.h" #include "Qt/GamePadConf.h"
#include "Qt/GameSoundConf.h" #include "Qt/ConsoleSoundConf.h"
#include "Qt/fceuWrapper.h" #include "Qt/fceuWrapper.h"
#include "Qt/keyscan.h" #include "Qt/keyscan.h"
#include "Qt/nes_shm.h" #include "Qt/nes_shm.h"
@ -253,11 +253,11 @@ void consoleWin_t::openGamePadConfWin(void)
void consoleWin_t::openGameSndConfWin(void) void consoleWin_t::openGameSndConfWin(void)
{ {
GameSndConfDialog_t *sndConfWin; ConsoleSndConfDialog_t *sndConfWin;
printf("Open Sound Config Window\n"); printf("Open Sound Config Window\n");
sndConfWin = new GameSndConfDialog_t(this); sndConfWin = new ConsoleSndConfDialog_t(this);
sndConfWin->show(); sndConfWin->show();
sndConfWin->exec(); sndConfWin->exec();

0
src/drivers/Qt/GameApp.h → src/drivers/Qt/ConsoleWindow.h
View File

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

@ -14,7 +14,7 @@
#include "Qt/sdl-video.h" #include "Qt/sdl-video.h"
#include "Qt/nes_shm.h" #include "Qt/nes_shm.h"
#include "Qt/unix-netplay.h" #include "Qt/unix-netplay.h"
#include "Qt/GameApp.h" #include "Qt/ConsoleWindow.h"
#include "common/cheat.h" #include "common/cheat.h"
#include "../../fceu.h" #include "../../fceu.h"

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

@ -1,6 +1,6 @@
#include <QApplication> #include <QApplication>
#include "Qt/GameApp.h" #include "Qt/ConsoleWindow.h"
#include "Qt/fceuWrapper.h" #include "Qt/fceuWrapper.h"
consoleWin_t *consoleWindow = NULL; consoleWin_t *consoleWindow = NULL;

6
src/drivers/Qt/sdl-throttle.cpp
View File

@ -3,8 +3,6 @@
#include "Qt/sdl.h" #include "Qt/sdl.h"
#include "Qt/throttle.h" #include "Qt/throttle.h"
#include "Qt/GameApp.h"
#include "Qt/fceuWrapper.h"
static const double Slowest = 0.015625; // 1/64x speed (around 1 fps on NTSC) static const double Slowest = 0.015625; // 1/64x speed (around 1 fps on NTSC)
static const double Fastest = 32; // 32x speed (around 1920 fps on NTSC) static const double Fastest = 32; // 32x speed (around 1920 fps on NTSC)
@ -46,8 +44,6 @@ RefreshThrottleFPS()
//printf("FrameTime: %llu %llu %f %lf \n", fps, fps >> 24, hz, desired_frametime ); //printf("FrameTime: %llu %llu %f %lf \n", fps, fps >> 24, hz, desired_frametime );
//gameWindow->setCyclePeriodms( T );
Lasttime=0; Lasttime=0;
Nexttime=0; Nexttime=0;
InFrame=0; InFrame=0;
@ -99,9 +95,7 @@ SpeedThrottle()
if ( time_left > 0 ) if ( time_left > 0 )
{ {
//fceuWrapperUnLock();
SDL_Delay(time_left); SDL_Delay(time_left);
//fceuWrapperLock();
} }
if (!InFrame) if (!InFrame)