xavi
/
pcsxr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

. 

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@83100 e17a0e51-4ae3-4d35-97c3-1a29b211df97
This commit is contained in:
SND\edgbla_cp 2013-02-23 02:54:51 +00:00
parent d3b43b5b64
commit 56fc32e977
13 changed files with 897 additions and 852 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS
View File

@ -23,7 +23,7 @@ PCSX-Reloaded Authors/Contributors: avlex (Help on xcode project)
Benoît Gschwind (MDEC decoder improvements)
ckain (Various bugfixes)
Dario (Various bugfixes)
edgbla (Root counters, various core/plugin fixes)
edgbla (Root counters, SIO1, various core/plugin fixes)
Firnis (GTE code from PCSX-Revolution Project)
Hopkat (Sound plugin improvements, core fixes)
Gabriele Gorla (MDEC decoder)

1
plugins/bladesio1/connection.c
View File

@ -29,6 +29,7 @@
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <netdb.h>
#include <unistd.h>
#endif
#include "typedefs.h"

38
plugins/bladesio1/gui.c
View File

@ -97,16 +97,14 @@ void OnCopyIP(GtkWidget *widget, gpointer user_data) {
/***************************************************************************/
static
s32 configure() {
void configure() {
GtkBuilder *builder;
GtkWidget *widget, *MainWindow;
builder = gtk_builder_new();
if (!gtk_builder_add_from_file(builder, DATADIR "sio1.ui", NULL)) {
if(!gtk_builder_add_from_file(builder, DATADIR "sio1.ui", NULL))
g_warning("We could not load the interface!");
return 0;
}
settingsRead();
@ -144,31 +142,26 @@ s32 configure() {
settings.port = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
widget = gtk_builder_get_object(builder, "rbDisabled");
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
settings.player = PLAYER_DISABLED;
}
else {
widget = gtk_builder_get_object(builder, "rbServer");
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
settings.player = PLAYER_MASTER;
} else {
else
settings.player = PLAYER_SLAVE;
}
}
settingsWrite();
gtk_widget_destroy(MainWindow);
return 1;
}
gtk_widget_destroy(MainWindow);
return 0;
}
static
s32 about() {
void about() {
const char *authors[]= {"edgbla <edgbla@yandex.ru>", NULL};
GtkWidget *widget;
@ -194,13 +187,22 @@ int main(int argc, char *argv[]) {
gtk_init(&argc, &argv);
if(argc > 1) {
if(!strcmp(argv[1], "configure"))
return configure();
if(!strcmp(argv[1], "about"))
return about();
if (argc < 2) {
printf ("Usage: cfgBladeSio1 {about | configure}\n");
return 0;
}
if (strcmp(argv[1], "configure") != 0 &&
strcmp(argv[1], "about") != 0) {
printf ("Usage: cfgBladeSio1 {about | configure}\n");
return 0;
}
if(!strcmp(argv[1], "configure"))
configure();
else if(!strcmp(argv[1], "about"))
about();
return 0;
}

26
plugins/dfcdrom/cdrcfg-0.1df/main.c
View File

@ -206,6 +206,13 @@ static void OnConfigExit(GtkWidget *widget, gpointer user_data) {
long CDRconfigure() {
LoadConf();
builder = gtk_builder_new();
if (!gtk_builder_add_from_file(builder, DATADIR "dfcdrom.ui", NULL)) {
g_warning("We could not load the interface!");
return 0;
}
MainWindow = gtk_builder_get_object(builder, "CfgWnd");
gtk_window_set_title(GTK_WINDOW(MainWindow), _("CDR configuration"));
@ -268,20 +275,21 @@ int main(int argc, char *argv[]) {
gtk_init(&argc, &argv);
if (argc != 2) return 0;
if (strcmp(argv[1], "configure") == 0) {
builder = gtk_builder_new();
if (!gtk_builder_add_from_file(builder, DATADIR "dfcdrom.ui", NULL)) {
g_warning("We could not load the interface!");
if (argc < 2) {
printf ("Usage: cfgBladeSio1 {about | configure}\n");
return 0;
}
if (strcmp(argv[1], "configure") != 0 &&
strcmp(argv[1], "about") != 0) {
printf ("Usage: cfgBladeSio1 {about | configure}\n");
return 0;
}
if(!strcmp(argv[1], "configure"))
CDRconfigure();
} else {
else if(!strcmp(argv[1], "about"))
CDRabout();
}
return 0;
}

18
plugins/dfinput/cfg-gtk.c
View File

@ -775,11 +775,21 @@ int main(int argc, char *argv[]) {
gtk_init(&argc, &argv);
if (argc > 1 && !strcmp(argv[1], "-about")) {
PADabout();
} else {
PADconfigure();
if (argc < 2) {
printf ("Usage: cfgDFInput {about | configure}\n");
return 0;
}
if (strcmp(argv[1], "configure") != 0 &&
strcmp(argv[1], "about") != 0) {
printf ("Usage: cfgDFInput {about | configure}\n");
return 0;
}
if(!strcmp(argv[1], "configure"))
PADconfigure();
else if(!strcmp(argv[1], "about"))
PADabout();
return 0;
}

4
plugins/dfinput/pad.c
View File

@ -655,7 +655,7 @@ long PADconfigure(void) {
if (pid == 0) {
if (fork() == 0) {
execl("cfg/cfgDFInput", "cfgDFInput", NULL);
execl("cfg/cfgDFInput", "cfgDFInput", "configure", NULL);
}
exit(0);
} else if (pid > 0) {
@ -670,7 +670,7 @@ void PADabout(void) {
if (pid == 0) {
if (fork() == 0) {
execl("cfg/cfgDFInput", "cfgDFInput", "-about", NULL);
execl("cfg/cfgDFInput", "cfgDFInput", "about", NULL);
}
exit(0);
} else if (pid > 0) {

17
plugins/dfnet/gui.c
View File

@ -214,19 +214,32 @@ int main(int argc, char *argv[]) {
gtk_init(&argc, &argv);
if (argc < 2) {
printf ("Usage: cfgDFNet {about | configure | open | wait | pause | message}\n");
return 0;
}
if (strcmp(argv[1], "configure") != 0 &&
strcmp(argv[1], "about") != 0) {
printf ("Usage: cfgDFNet {about | configure | open | wait | pause | message}\n");
return 0;
}
if(argc > 1) {
if (!strcmp(argv[1], "configure")) {
CFGconfigure();
} else if (!strcmp(argv[1], "about")) {
CFGabout();
} else if (!strcmp(argv[1], "open")) {
return CFGopen();
} else if (!strcmp(argv[1], "wait")) {
CFGwait();
} else if (!strcmp(argv[1], "pause")) {
return CFGpause();
} else if (!strcmp(argv[1], "about")) {
CFGabout();
} else if (!strcmp(argv[1], "message")) {
CFGmessage(&argv[2], argc - 2);
}
}
return 0;
}

4
plugins/dfsound/spu.c
View File

@ -1436,7 +1436,7 @@ long CALLBACK SPUconfigure(void)
#elif defined (_MACOSX)
DoConfiguration();
#else
StartCfgTool("CFG");
StartCfgTool("configure");
#endif
return 0;
@ -1451,7 +1451,7 @@ void CALLBACK SPUabout(void)
#elif defined (_MACOSX)
DoAbout();
#else
StartCfgTool("ABOUT");
StartCfgTool("about");
#endif
}

15
plugins/dfsound/spucfg-0.1df/main.c
View File

@ -66,19 +66,20 @@ int main(int argc, char *argv[])
textdomain (GETTEXT_PACKAGE);
#endif
if (argc != 2) {
printf ("Usage: cfgDFSound {ABOUT | CFG}\n");
if (argc < 2) {
printf ("Usage: cfgDFSound {about | configure}\n");
return 0;
}
if (strcmp(argv[1], "CFG") != 0 && strcmp(argv[1], "ABOUT") != 0) {
printf ("Usage: cfgDFSound {ABOUT | CFG}\n");
if (strcmp(argv[1], "configure") != 0 &&
strcmp(argv[1], "about") != 0) {
printf ("Usage: cfgDFSound {about | configure}\n");
return 0;
}
gtk_init(&argc, &argv);
if (strcmp(argv[1], "ABOUT") == 0) {
if (strcmp(argv[1], "about") == 0) {
const char *authors[]= {"Pete Bernert and the P.E.Op.S. team", "Ryan Schultz", "Andrew Burton", NULL};
widget = gtk_about_dialog_new ();
gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG (widget), "dfsound PCSXR Sound Plugin");
@ -94,7 +95,7 @@ int main(int argc, char *argv[])
return 0;
}
else if (strcmp(argv[1], "configure") == 0) {
builder = gtk_builder_new();
if (!gtk_builder_add_from_file(builder, DATADIR "dfsound.ui", NULL)) {
@ -231,6 +232,8 @@ int main(int argc, char *argv[])
gtk_widget_show(MainWindow);
gtk_main();
}
return 0;
}

7
plugins/dfxvideo/cfg.c
View File

@ -217,15 +217,12 @@ void ExecCfg(char *arg) {
void SoftDlgProc(void)
{
ExecCfg("CFG");
ExecCfg("configure");
}
void AboutDlgProc(void)
{
char args[256];
sprintf(args, "ABOUT");
ExecCfg(args);
ExecCfg("about");
}
void ReadConfig(void)

17
plugins/dfxvideo/gpucfg-0.1df/main.c
View File

@ -117,19 +117,20 @@ main (int argc, char *argv[])
textdomain (GETTEXT_PACKAGE);
#endif
if (argc!=2) {
printf("Usage: cfgDFXVideo {ABOUT | CFG}\n");
if (argc < 2) {
printf ("Usage: cfgDFXVideo {about | configure}\n");
return 0;
}
if(strcmp(argv[1],"CFG")!=0 && strcmp(argv[1],"ABOUT")!=0) {
printf("Usage: cfgDFXVideo {ABOUT | CFG}\n");
if (strcmp(argv[1], "configure") != 0 &&
strcmp(argv[1], "about") != 0) {
printf ("Usage: cfgDFXVideo {about | configure}\n");
return 0;
}
gtk_init (&argc, &argv);
if (strcmp(argv[1], "ABOUT") == 0) {
if (strcmp(argv[1], "about") == 0) {
const char *authors[]= {"Pete Bernert and the P.E.Op.S. team", "Ryan Schultz", "Andrew Burton", NULL};
widget = gtk_about_dialog_new ();
gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG (widget), "P.E.Op.S PCSXR Video Plugin");
@ -145,7 +146,7 @@ main (int argc, char *argv[])
return 0;
}
else {
builder = gtk_builder_new();
if (!gtk_builder_add_from_file(builder, DATADIR "dfxvideo.ui", NULL)) {
@ -328,6 +329,8 @@ main (int argc, char *argv[])
on_use_fixes_toggled(widget, NULL);
gtk_main ();
}
return 0;
}

10
plugins/peopsxgl/gpu.c
View File

@ -3057,7 +3057,7 @@ void StartCfgTool(char *arg) // linux: start external cfg tool
long CALLBACK GPUconfigure(void)
{
StartCfgTool("CFG");
StartCfgTool("configure");
return 0;
}
@ -3141,15 +3141,11 @@ void CALLBACK GPUabout(void)
{
#ifdef _WINDOWS
HWND hWP=GetActiveWindow(); // to be sure
DialogBox(hInst,MAKEINTRESOURCE(IDD_DIALOG_ABOUT),
hWP,(DLGPROC)AboutDlgProc);
DialogBox(hInst,MAKEINTRESOURCE(IDD_DIALOG_ABOUT), hWP,(DLGPROC)AboutDlgProc);
#elif defined(_MACGL)
AboutDlgProc();
#else
StartCfgTool("ABOUT");
StartCfgTool("about");
#endif
}

16
plugins/peopsxgl/gpucfg/main.c
View File

@ -239,6 +239,17 @@ int main( int argc, char **argv ) {
gtk_init( &argc, &argv );
if (argc < 2) {
printf ("Usage: cfgpeopsxgl {about | configure}\n");
return 0;
}
if (strcmp(argv[1], "configure") != 0 &&
strcmp(argv[1], "about") != 0) {
printf ("Usage: cfgpeopsxgl {about | configure}\n");
return 0;
}
builder = gtk_builder_new();
// Load the glade file
@ -249,7 +260,7 @@ int main( int argc, char **argv ) {
}
// Display the About dialog when the emulator ask for it
if ( argv[1] && strcmp( argv[1], "ABOUT" ) == 0 ) {
if ( argv[1] && strcmp( argv[1], "about" ) == 0 ) {
GtkWidget *widget;
const char *authors[]= {"Adapted from P.E.Op.S OpenGL GPU by Pete Bernert", NULL};
@ -264,7 +275,7 @@ int main( int argc, char **argv ) {
return 0;
}
else {
// Get widgets from the glade file
window = GTK_WIDGET( gtk_builder_get_object( builder, "MainDialog" ) );
btnCancel = GTK_WIDGET( gtk_builder_get_object( builder, "btnCancel" ) );
@ -746,6 +757,7 @@ int main( int argc, char **argv ) {
gtk_widget_show( window );
gtk_main();
}
return 0;
}