From 5f868fa161d5827e45a060a0b17b44a997625315 Mon Sep 17 00:00:00 2001 From: "SND\\edgbla_cp" Date: Wed, 8 Jun 2011 09:27:25 +0000 Subject: Rebranding. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@67621 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- plugins/bladesio1/Makefile.am | 2 +- plugins/dfcdrom/Makefile.am | 6 +- plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2 | 324 ------------------------ plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui | 368 ++++++++++++++++++++++++++++ plugins/dfcdrom/cdrcfg-0.1df/main.c | 56 ++--- plugins/dfinput/Makefile.am | 2 +- plugins/dfinput/pad.c | 2 +- plugins/dfnet/Makefile.am | 2 +- plugins/dfsound/Makefile.am | 8 +- plugins/dfsound/pulseaudio.c | 4 +- plugins/dfsound/spucfg-0.1df/dfsound.glade2 | 321 ------------------------ plugins/dfsound/spucfg-0.1df/dfsound.ui | 360 +++++++++++++++++++++++++++ plugins/dfsound/spucfg-0.1df/main.c | 64 ++--- plugins/dfxvideo/Makefile.am | 4 +- plugins/dfxvideo/cfg.c | 6 +- plugins/dfxvideo/gpu.c | 8 +- plugins/dfxvideo/gpucfg-0.1df/main.c | 4 +- plugins/gxvideo/Makefile.am | 6 +- plugins/gxvideo/cfg.c | 6 +- plugins/gxvideo/gpu.c | 4 +- plugins/gxvideo/gpucfg/main.c | 2 +- plugins/peopsxgl/gpu.c | 10 +- 22 files changed, 823 insertions(+), 746 deletions(-) delete mode 100644 plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2 create mode 100644 plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui delete mode 100644 plugins/dfsound/spucfg-0.1df/dfsound.glade2 create mode 100644 plugins/dfsound/spucfg-0.1df/dfsound.ui (limited to 'plugins') diff --git a/plugins/bladesio1/Makefile.am b/plugins/bladesio1/Makefile.am index f6d4e5a3..0a51c332 100644 --- a/plugins/bladesio1/Makefile.am +++ b/plugins/bladesio1/Makefile.am @@ -3,7 +3,7 @@ libdir = @libdir@/games/psemu/ lib_LTLIBRARIES = libBladeSio1.la -libBladeSio1_la_SOURCES = sio1.c settings.c +libBladeSio1_la_SOURCES = sio1.c sio1.h settings.c settings.h libBladeSio1_la_LDFLAGS = -module -avoid-version AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ diff --git a/plugins/dfcdrom/Makefile.am b/plugins/dfcdrom/Makefile.am index 387a3544..b001ab0f 100644 --- a/plugins/dfcdrom/Makefile.am +++ b/plugins/dfcdrom/Makefile.am @@ -23,13 +23,13 @@ endif AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK2_CFLAGS) $(GLADE2_CFLAGS) \ + $(GTK2_CFLAGS) \ -I../../libpcsxcore -I../../include bin_PROGRAMS = cfgDFCdrom cfgDFCdrom_SOURCES = cdrcfg-0.1df/main.c -cfgDFCdrom_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS) +cfgDFCdrom_LDADD = $(GTK2_LIBS) -glade_DATA = cdrcfg-0.1df/dfcdrom.glade2 +glade_DATA = cdrcfg-0.1df/dfcdrom.ui gladedir = $(datadir)/psemu/ EXTRA_DIST = $(glade_DATA) diff --git a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2 b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2 deleted file mode 100644 index 25610e2e..00000000 --- a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2 +++ /dev/null @@ -1,324 +0,0 @@ - - - - - - True - 5 - CDR configuration - True - center - normal - False - - - - True - vertical - - - True - vertical - - - True - 0 - - - True - 10 - - - True - Choose your CD-ROM device or type its path if it's not listed - - - 0 - - - - - - - True - Select CD-ROM device - - - label_item - - - - - 0 - - - - - True - 0 - - - True - vertical - - - True - 5 - - - True - 5 - 5 - Select read mode: - - - False - False - 0 - - - - - True - Normal (No Cache) -Threaded - Faster (With Cache) - - - 1 - - - - - False - False - 0 - - - - - True - - - False - 1 - - - - - True - 5 - 5 - - - True - Cache Size (Def. 64): - - - False - False - 0 - - - - - True - True - 32 32 2048 1 16 0 - 1 - True - - - False - False - end - 1 - - - - - 2 - - - - - True - - - False - 3 - - - - - True - 5 - 5 - - - True - Spindown Time: - - - False - False - 0 - - - - - True - Default -125ms -250ms -500ms -1s -2s -4s -8s -16s -32s -1min -2min -4min -8min -16min -32min - - - False - False - end - 1 - - - - - 4 - - - - - True - - - False - 5 - - - - - True - 5 - 5 - - - True - Cdrom Speed (Def. 0 = MAX): - - - False - False - 0 - - - - - True - True - 0 0 100 1 4 0 - 1 - True - - - False - False - end - 1 - - - - - 6 - - - - - True - - hseparator - - - - False - 7 - - - - - Enable subchannel read - True - True - False - 10 - True - True - - - False - False - 8 - - - - - - - True - Options - - - label_item - - - - - 1 - - - - - 1 - - - - - True - end - - - gtk-close - -6 - True - True - True - False - True - - - - False - False - 0 - - - - - False - end - 0 - - - - - - diff --git a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui new file mode 100644 index 00000000..c16dfd17 --- /dev/null +++ b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui @@ -0,0 +1,368 @@ + + + + + + True + 5 + CDR configuration + True + center + normal + + + + True + vertical + + + True + vertical + + + True + 0 + + + True + 10 + + + True + Choose your CD-ROM device or type its path if it's not listed + + + 0 + + + + + + + 0 + + + + + True + 0 + + + True + vertical + + + True + 5 + + + True + 5 + 5 + Select read mode: + + + False + False + 0 + + + + + True + liststoreReadMode + + + + 0 + + + + + 1 + + + + + False + False + 0 + + + + + True + + + False + 1 + + + + + True + 5 + 5 + + + True + Cache Size (Def. 64): + + + False + False + 0 + + + + + True + True + 1 + True + + + False + False + end + 1 + + + + + 2 + + + + + True + + + False + 3 + + + + + True + 5 + 5 + + + True + Spindown Time: + + + False + False + 0 + + + + + True + liststoreSpindownTime + + + + 0 + + + + + False + False + end + 1 + + + + + 4 + + + + + True + + + False + 5 + + + + + True + 5 + 5 + + + True + Cdrom Speed (Def. 0 = MAX): + + + False + False + 0 + + + + + True + True + 1 + True + + + False + False + end + 1 + + + + + 6 + + + + + True + + + False + 7 + + + + + Enable subchannel read + True + True + False + 10 + True + True + + + False + False + 8 + + + + + + + 1 + + + + + 1 + + + + + True + end + + + gtk-close + True + True + True + False + True + + + + False + False + 0 + + + + + False + end + 0 + + + + + + cfg_closebutton + + + + + + + + + + Normal (No Cache) + + + Threaded - Faster (With Cache) + + + + + + + + + + + Default + + + 125ms + + + 250ms + + + 500ms + + + 1s + + + 2s + + + 4s + + + 8s + + + 16s + + + 32s + + + 1min + + + 2min + + + 4min + + + 8min + + + 16min + + + 32min + + + + diff --git a/plugins/dfcdrom/cdrcfg-0.1df/main.c b/plugins/dfcdrom/cdrcfg-0.1df/main.c index fbbe29d5..0b62a801 100644 --- a/plugins/dfcdrom/cdrcfg-0.1df/main.c +++ b/plugins/dfcdrom/cdrcfg-0.1df/main.c @@ -22,9 +22,9 @@ #include "../cfg.c" #include -#include -GtkWidget *MainWindow; +GtkBuilder *builder; +GtkWidget *widget, *MainWindow; // function to check if the device is a cdrom int is_cdrom(const char *device) { @@ -174,27 +174,23 @@ void fill_drives_list(GtkWidget *widget) { } static void OnConfigExit(GtkWidget *widget, gpointer user_data) { - GladeXML *xml; - - xml = glade_get_widget_tree(MainWindow); - - widget = glade_xml_get_widget(xml, "cddev_comboboxentry"); + widget = gtk_builder_get_object(builder, "cddev_comboboxentry"); strncpy(CdromDev, gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(widget)))), 255); CdromDev[255] = '\0'; - widget = glade_xml_get_widget(xml, "readmode_combobox"); + widget = gtk_builder_get_object(builder, "readmode_combobox"); ReadMode = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); - widget = glade_xml_get_widget(xml, "subQ_button"); + widget = gtk_builder_get_object(builder, "subQ_button"); UseSubQ = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - widget = glade_xml_get_widget(xml, "spinCacheSize"); + widget = gtk_builder_get_object(builder, "spinCacheSize"); CacheSize = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); - widget = glade_xml_get_widget(xml, "spinCdrSpeed"); + widget = gtk_builder_get_object(builder, "spinCdrSpeed"); CdrSpeed = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); - widget = glade_xml_get_widget(xml, "comboSpinDown"); + widget = gtk_builder_get_object(builder, "comboSpinDown"); SpinDown = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); SaveConf(); @@ -204,45 +200,36 @@ static void OnConfigExit(GtkWidget *widget, gpointer user_data) { } long CDRconfigure() { - GladeXML *xml; - GtkWidget *widget; - LoadConf(); - xml = glade_xml_new(DATADIR "dfcdrom.glade2", "CfgWnd", NULL); - if (xml == NULL) { - g_warning("We could not load the interface!"); - return -1; - } - - MainWindow = glade_xml_get_widget(xml, "CfgWnd"); + MainWindow = gtk_builder_get_object(builder, "CfgWnd"); gtk_window_set_title(GTK_WINDOW(MainWindow), _("CDR configuration")); - widget = glade_xml_get_widget(xml, "CfgWnd"); + widget = gtk_builder_get_object(builder, "CfgWnd"); g_signal_connect_data(GTK_OBJECT(widget), "delete_event", G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER); - widget = glade_xml_get_widget(xml, "cfg_closebutton"); + widget = gtk_builder_get_object(builder, "cfg_closebutton"); g_signal_connect_data(GTK_OBJECT(widget), "clicked", G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER); - widget = glade_xml_get_widget(xml, "cddev_comboboxentry"); + widget = gtk_builder_get_object(builder, "cddev_comboboxentry"); fill_drives_list(widget); gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(widget))), CdromDev); - widget = glade_xml_get_widget(xml, "readmode_combobox"); + widget = gtk_builder_get_object(builder, "readmode_combobox"); gtk_combo_box_set_active(GTK_COMBO_BOX(widget), ReadMode); - widget = glade_xml_get_widget(xml, "subQ_button"); + widget = gtk_builder_get_object(builder, "subQ_button"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), UseSubQ); - widget = glade_xml_get_widget(xml, "spinCacheSize"); + widget = gtk_builder_get_object(builder, "spinCacheSize"); gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), (float)CacheSize); - widget = glade_xml_get_widget(xml, "spinCdrSpeed"); + widget = gtk_builder_get_object(builder, "spinCdrSpeed"); gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), (float)CdrSpeed); - widget = glade_xml_get_widget(xml, "comboSpinDown"); + widget = gtk_builder_get_object(builder, "comboSpinDown"); gtk_combo_box_set_active(GTK_COMBO_BOX(widget), SpinDown); gtk_widget_show(MainWindow); @@ -279,8 +266,15 @@ 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!"); + return 0; + } + CDRconfigure(); } else { CDRabout(); diff --git a/plugins/dfinput/Makefile.am b/plugins/dfinput/Makefile.am index c9ea709d..cceed304 100644 --- a/plugins/dfinput/Makefile.am +++ b/plugins/dfinput/Makefile.am @@ -3,7 +3,7 @@ libdir = @libdir@/games/psemu/ lib_LTLIBRARIES = libDFInput.la -libDFInput_la_SOURCES = cfg.c pad.c pad.h sdljoy.c xkb.c analog.c util.c +libDFInput_la_SOURCES = cfg.c pad.c pad.h sdljoy.c xkb.c analog.c util.c util.h libDFInput_la_LDFLAGS = -module -avoid-version libDFInput_la_LIBADD = -lpthread -lX11 $(SDL_LIBS) diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c index fcb86b5e..501ba008 100644 --- a/plugins/dfinput/pad.c +++ b/plugins/dfinput/pad.c @@ -578,7 +578,7 @@ static long PADreadPort(int num, PadDataS *pad) { pad->buttonStatus = (g.PadState[num].KeyStatus & g.PadState[num].JoyKeyStatus); - // ePSXe different from pcsx, swap bytes + // ePSXe different from pcsxr, swap bytes pad->buttonStatus = (pad->buttonStatus >> 8) | (pad->buttonStatus << 8); switch (g.cfg.PadDef[num].Type) { diff --git a/plugins/dfnet/Makefile.am b/plugins/dfnet/Makefile.am index 4db81928..d67a106b 100644 --- a/plugins/dfnet/Makefile.am +++ b/plugins/dfnet/Makefile.am @@ -3,7 +3,7 @@ libdir = @libdir@/games/psemu/ lib_LTLIBRARIES = libDFNet.la -libDFNet_la_SOURCES = dfnet.c unix.c cfg.c +libDFNet_la_SOURCES = dfnet.c dfnet.h unix.c cfg.c libDFNet_la_LDFLAGS = -module -avoid-version AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ diff --git a/plugins/dfsound/Makefile.am b/plugins/dfsound/Makefile.am index 3b48eefd..54ee4315 100644 --- a/plugins/dfsound/Makefile.am +++ b/plugins/dfsound/Makefile.am @@ -5,7 +5,7 @@ libdir = @libdir@/games/psemu/ lib_LTLIBRARIES = libDFSound.la -libDFSound_la_SOURCES = spu.c cfg.c dma.c freeze.c registers.c externals.c +libDFSound_la_SOURCES = adsr.c adsr.h spu.c spu.h cfg.c cfg.h dma.c dma.h gauss_i.h freeze.c reverb.c reverb.h registers.c registers.h externals.c externals.h dsoundoss.h psemuxa.h regs.h xa.c xa.h stdafx.h libDFSound_la_CPPFLAGS = $(AM_CPPFLAGS) libDFSound_la_LDFLAGS = -module -avoid-version @@ -42,10 +42,10 @@ endif bin_PROGRAMS = cfgDFSound cfgDFSound_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -DDATADIR=\"${datadir}/psemu/\" \ - $(GTK2_CFLAGS) $(GLADE2_CFLAGS) $(AM_CPPFLAGS) + $(GTK2_CFLAGS) $(AM_CPPFLAGS) cfgDFSound_SOURCES = spucfg-0.1df/main.c -cfgDFSound_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS) +cfgDFSound_LDADD = $(GTK2_LIBS) -glade_DATA = spucfg-0.1df/dfsound.glade2 +glade_DATA = spucfg-0.1df/dfsound.ui gladedir = $(datadir)/psemu/ EXTRA_DIST = $(glade_DATA) diff --git a/plugins/dfsound/pulseaudio.c b/plugins/dfsound/pulseaudio.c index 19b1e0b8..bd43bb5a 100644 --- a/plugins/dfsound/pulseaudio.c +++ b/plugins/dfsound/pulseaudio.c @@ -150,7 +150,7 @@ void SetupSound (void) // Acquire context //////////////////////////////////////////////////////// device.api = pa_threaded_mainloop_get_api (device.mainloop); - device.context = pa_context_new (device.api, "PCSX"); + device.context = pa_context_new (device.api, "PCSXR"); pa_context_set_state_callback (device.context, context_state_cb, &device); if (device.context == NULL) @@ -214,7 +214,7 @@ void SetupSound (void) //fprintf (stderr, "Target buffer size: %lu\n", buffer_attributes.tlength); // Acquire new stream using spec ////////////////////////////////////////// - device.stream = pa_stream_new (device.context, "PCSX", &device.spec, NULL); + device.stream = pa_stream_new (device.context, "PCSXR", &device.spec, NULL); if (device.stream == NULL) { error_number = pa_context_errno (device.context); diff --git a/plugins/dfsound/spucfg-0.1df/dfsound.glade2 b/plugins/dfsound/spucfg-0.1df/dfsound.glade2 deleted file mode 100644 index d2729bb8..00000000 --- a/plugins/dfsound/spucfg-0.1df/dfsound.glade2 +++ /dev/null @@ -1,321 +0,0 @@ - - - - - - True - 10 - Configure Sound - False - True - center - dialog - - - - True - vertical - 6 - - - True - 0 - - - True - 6 - 6 - 12 - 12 - - - True - 6 - 3 - 2 - 6 - 6 - - - True - 0 - Volume: - right - - - GTK_FILL - - - - - - True - 0 - Interpolation: - right - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - Reverb: - right - - - 1 - 2 - GTK_FILL - - - - - - True - None -Low -Medium -Loud -Loudest - - - 1 - 2 - GTK_FILL - - - - - True - Off -Simple -Playstation - - - 1 - 2 - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - None -Simple -Gaussian -Cubic - - - 1 - 2 - 2 - 3 - GTK_FILL - GTK_FILL - - - - - - - - - True - <b>General</b> - True - - - label_item - - - - - 0 - - - - - True - 0 - - - True - 6 - 6 - 12 - 12 - - - True - 6 - vertical - 6 - - - Adjust XA speed - True - True - False - Choose this if XA music is played too quickly. - True - True - - - False - False - 0 - - - - - - - - - True - <b>XA Music</b> - True - - - label_item - - - - - 1 - - - - - True - 0 - - - True - 6 - 6 - 12 - 12 - - - True - 6 - vertical - 6 - - - High compatibility mode - True - True - False - Use the asynchronous SPU interface. - True - True - - - False - False - 0 - - - - - SPU IRQ Wait - True - True - False - Wait for CPU; only useful for some games. - True - True - - - False - False - 1 - - - - - Single channel sound - True - True - False - Play only one channel for a performance boost. - True - True - - - False - False - 2 - - - - - Frequency Response - Output Filter - True - True - False - True - - - 3 - - - - - - - - - True - <b>Compatibility</b> - True - - - label_item - - - - - 2 - - - - - True - 12 - end - - - gtk-close - True - True - True - False - True - - - False - False - 0 - - - - - 3 - - - - - - diff --git a/plugins/dfsound/spucfg-0.1df/dfsound.ui b/plugins/dfsound/spucfg-0.1df/dfsound.ui new file mode 100644 index 00000000..e0012de4 --- /dev/null +++ b/plugins/dfsound/spucfg-0.1df/dfsound.ui @@ -0,0 +1,360 @@ + + + + + + True + 10 + Configure Sound + False + True + center + dialog + + + + True + vertical + 6 + + + True + 0 + + + True + 6 + 6 + 12 + 12 + + + True + 6 + 3 + 2 + 6 + 6 + + + True + 0 + Volume: + right + + + GTK_FILL + + + + + + True + 0 + Interpolation: + right + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + Reverb: + right + + + 1 + 2 + GTK_FILL + + + + + + True + liststoreVolume + + + + 0 + + + + + 1 + 2 + GTK_FILL + + + + + True + liststoreReverb + + + + 0 + + + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + liststoreInterpolation + + + + 0 + + + + + 1 + 2 + 2 + 3 + GTK_FILL + GTK_FILL + + + + + + + + + 0 + + + + + True + 0 + + + True + 6 + 6 + 12 + 12 + + + True + 6 + vertical + 6 + + + Adjust XA speed + True + True + False + Choose this if XA music is played too quickly. + True + True + + + False + False + 0 + + + + + + + + + 1 + + + + + True + 0 + + + True + 6 + 6 + 12 + 12 + + + True + 6 + vertical + 6 + + + High compatibility mode + True + True + False + Use the asynchronous SPU interface. + True + True + + + False + False + 0 + + + + + SPU IRQ Wait + True + True + False + Wait for CPU; only useful for some games. + True + True + + + False + False + 1 + + + + + Single channel sound + True + True + False + Play only one channel for a performance boost. + True + True + + + False + False + 2 + + + + + Frequency Response - Output Filter + True + True + False + True + + + 3 + + + + + + + + + 2 + + + + + True + 12 + end + + + gtk-close + True + True + True + False + True + + + False + False + 0 + + + + + 3 + + + + + + + + + + + + + None + + + Low + + + Medium + + + Loud + + + Loudest + + + + + + + + + + + Off + + + Simple + + + Playstation + + + + + + + + + + + None + + + Simple + + + Gaussian + + + Cubic + + + + diff --git a/plugins/dfsound/spucfg-0.1df/main.c b/plugins/dfsound/spucfg-0.1df/main.c index fc5976cb..f8a85bb8 100644 --- a/plugins/dfsound/spucfg-0.1df/main.c +++ b/plugins/dfsound/spucfg-0.1df/main.c @@ -6,7 +6,6 @@ #include #include -#include #include #ifdef ENABLE_NLS @@ -18,6 +17,9 @@ #define WRITEBINARY "wb" #define CONFIG_FILENAME "dfsound.cfg" +GtkBuilder *builder; +GtkWidget *widget, *MainWindow; + void SaveConfig(GtkWidget *widget, gpointer user_datal); /* This function checks for the value being outside the accepted range, @@ -45,16 +47,12 @@ void on_about_clicked (GtkWidget *widget, gpointer user_data) void OnConfigClose(GtkWidget *widget, gpointer user_data) { - GladeXML *xml = (GladeXML *)user_data; - - gtk_widget_destroy(glade_xml_get_widget(xml, "CfgWnd")); + gtk_widget_destroy(gtk_builder_get_object(builder, "CfgWnd")); gtk_exit(0); } int main(int argc, char *argv[]) { - GtkWidget *widget; - GladeXML *xml; FILE *in; char t[256]; int len, val = 0; @@ -84,7 +82,7 @@ int main(int argc, char *argv[]) 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_name (GTK_ABOUT_DIALOG (widget), "dfsound PCSX Sound Plugin"); + gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (widget), "dfsound PCSXR Sound Plugin"); gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (widget), "1.6"); gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (widget), authors); gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (widget), "http://pcsx-df.sourceforge.net/"); @@ -98,11 +96,14 @@ int main(int argc, char *argv[]) return 0; } - xml = glade_xml_new(DATADIR "dfsound.glade2", "CfgWnd", NULL); - if (!xml) { + builder = gtk_builder_new(); + + if (!gtk_builder_add_from_file(builder, DATADIR "dfsound.ui", NULL)) { g_warning("We could not load the interface!"); - return 255; - } + return 0; + } + + MainWindow = gtk_builder_get_object(builder, "CfgWnd"); strcpy(cfg, CONFIG_FILENAME); @@ -129,7 +130,7 @@ int main(int argc, char *argv[]) val = set_limit (p, len, -1, 4) + 1; } else val = 2; - gtk_combo_box_set_active(GTK_COMBO_BOX (glade_xml_get_widget(xml, "cbVolume2")), val); + gtk_combo_box_set_active(GTK_COMBO_BOX (gtk_builder_get_object(builder, "cbVolume2")), val); if (pB) { strcpy(t, "\nUseInterpolation"); @@ -141,7 +142,7 @@ int main(int argc, char *argv[]) val = set_limit (p, len, 0, 3); } else val = 2; - gtk_combo_box_set_active(GTK_COMBO_BOX (glade_xml_get_widget(xml, "cbInterpolation2")), val); + gtk_combo_box_set_active(GTK_COMBO_BOX (gtk_builder_get_object(builder, "cbInterpolation2")), val); if (pB) { strcpy(t, "\nXAPitch"); @@ -153,7 +154,7 @@ int main(int argc, char *argv[]) val = set_limit (p, len, 0, 1); } else val = 0; - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "chkXASpeed")), val); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "chkXASpeed")), val); if (pB) { strcpy(t, "\nHighCompMode"); @@ -165,7 +166,7 @@ int main(int argc, char *argv[]) val = set_limit (p, len, 0, 1); } else val = 1; - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "chkHiCompat")), val); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "chkHiCompat")), val); if (pB) { strcpy(t, "\nSPUIRQWait"); @@ -178,7 +179,7 @@ int main(int argc, char *argv[]) val = set_limit (p, len, 0, 1); } else val = 1; - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "chkIRQWait")), val); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "chkIRQWait")), val); if (pB) { strcpy(t, "\nDisStereo"); @@ -191,7 +192,7 @@ int main(int argc, char *argv[]) val = set_limit (p, len, 0, 1); } else val = 0; - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "chkDisStereo")), val); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "chkDisStereo")), val); if (pB) { strcpy(t, "\nFreqResponse"); @@ -204,7 +205,7 @@ int main(int argc, char *argv[]) val = set_limit (p, len, 0, 1); } else val = 0; - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "chkFreqResponse")), val); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "chkFreqResponse")), val); if (pB) { strcpy(t, "\nUseReverb"); @@ -216,18 +217,18 @@ int main(int argc, char *argv[]) val = set_limit (p, len, 0, 2); } else val = 2; - gtk_combo_box_set_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "cbReverb2")), val); + gtk_combo_box_set_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "cbReverb2")), val); if (pB) free(pB); - widget = glade_xml_get_widget(xml, "CfgWnd"); + widget = gtk_builder_get_object(builder, "CfgWnd"); g_signal_connect_data(GTK_OBJECT(widget), "destroy", - G_CALLBACK(SaveConfig), xml, NULL, 0); + G_CALLBACK(SaveConfig), builder, NULL, 0); - widget = glade_xml_get_widget(xml, "btn_close"); + widget = gtk_builder_get_object(builder, "btn_close"); g_signal_connect_data(GTK_OBJECT(widget), "clicked", - G_CALLBACK(OnConfigClose), xml, NULL, G_CONNECT_AFTER); + G_CALLBACK(OnConfigClose), builder, NULL, G_CONNECT_AFTER); gtk_main(); return 0; @@ -235,7 +236,6 @@ int main(int argc, char *argv[]) void SaveConfig(GtkWidget *widget, gpointer user_data) { - GladeXML *xml = (GladeXML *)user_data; FILE *fp; int val; @@ -245,28 +245,28 @@ void SaveConfig(GtkWidget *widget, gpointer user_data) gtk_exit(0); } - val = gtk_combo_box_get_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "cbVolume2"))); + val = gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "cbVolume2"))); fprintf(fp, "\nVolume = %d\n", val - 1); - val = gtk_combo_box_get_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "cbInterpolation2"))); + val = gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "cbInterpolation2"))); fprintf(fp, "\nUseInterpolation = %d\n", val); - val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkXASpeed"))); + val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "chkXASpeed"))); fprintf(fp, "\nXAPitch = %d\n", val); - val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkHiCompat"))); + val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "chkHiCompat"))); fprintf(fp, "\nHighCompMode = %d\n", val); - val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkIRQWait"))); + val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "chkIRQWait"))); fprintf(fp, "\nSPUIRQWait = %d\n", val); - val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkDisStereo"))); + val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "chkDisStereo"))); fprintf(fp, "\nDisStereo = %d\n", val); - val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkFreqResponse"))); + val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "chkFreqResponse"))); fprintf(fp, "\nFreqResponse = %d\n", val); - val = gtk_combo_box_get_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "cbReverb2"))); + val = gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "cbReverb2"))); fprintf(fp, "\nUseReverb = %d\n", val); fclose(fp); diff --git a/plugins/dfxvideo/Makefile.am b/plugins/dfxvideo/Makefile.am index a7515a21..7e56a9c6 100644 --- a/plugins/dfxvideo/Makefile.am +++ b/plugins/dfxvideo/Makefile.am @@ -17,9 +17,9 @@ libdir = @libdir@/games/psemu/ lib_LTLIBRARIES = libDFXVideo.la -libDFXVideo_la_SOURCES = gpu.c cfg.c draw.c fps.c key.c menu.c prim.c soft.c zn.c +libDFXVideo_la_SOURCES = gpu.c gpu.h cfg.c cfg.h draw.c draw.h fps.c fps.h key.c key.h menu.c menu.h prim.c prim.h soft.c soft.h zn.c swap.h externals.h hq2x.h hq3x.h interp.h if X86_NASM -libDFXVideo_la_SOURCES += i386.asm +libDFXVideo_la_SOURCES += i386.asm macros.inc AM_CPPFLAGS += -DUSE_NASM=1 endif libDFXVideo_la_LDFLAGS = -module -avoid-version diff --git a/plugins/dfxvideo/cfg.c b/plugins/dfxvideo/cfg.c index 70c08461..09d0485c 100644 --- a/plugins/dfxvideo/cfg.c +++ b/plugins/dfxvideo/cfg.c @@ -96,7 +96,7 @@ void ReadConfigFile() { strcpy(t,"cfg/dfxvideo.cfg"); in = fopen(t,"rb"); - if(!in) sprintf(t,"%s/.pcsx/plugins/dfxvideo.cfg",getenv("HOME")); + if(!in) sprintf(t,"%s/.pcsxr/plugins/dfxvideo.cfg",getenv("HOME")); else fclose(in); } else fclose(in); @@ -188,7 +188,7 @@ void ExecCfg(char *arg) { return; } - sprintf(cfg, "%s/.pcsx/plugins/cfg/cfgDFXVideo", getenv("HOME")); + sprintf(cfg, "%s/.pcsxr/plugins/cfg/cfgDFXVideo", getenv("HOME")); if (stat(cfg, &buf) != -1) { if (fork() == 0) { execl(cfg, "cfgDFXVideo", arg, NULL); @@ -256,7 +256,7 @@ void WriteConfig(void) { { strcpy(t,"cfg/dfxvideo.cfg"); out = fopen(t,"rb"); - if(!out) sprintf(t,"%s/.pcsx/plugins/dfxvideo.cfg",getenv("HOME")); + if(!out) sprintf(t,"%s/.pcsxr/plugins/dfxvideo.cfg",getenv("HOME")); else fclose(out); } else fclose(out); diff --git a/plugins/dfxvideo/gpu.c b/plugins/dfxvideo/gpu.c index bd14f28f..ef06be1a 100644 --- a/plugins/dfxvideo/gpu.c +++ b/plugins/dfxvideo/gpu.c @@ -294,9 +294,9 @@ static void DoTextSnapShot(int iNum) char *pB; #ifdef _WINDOWS - sprintf(szTxt,"snap\\pcsx%04d.txt",iNum); + sprintf(szTxt,"snap\\pcsxr%04d.txt",iNum); #else - sprintf(szTxt,"%s/pcsx%04d.txt",getenv("HOME"),iNum); + sprintf(szTxt,"%s/pcsxr%04d.txt",getenv("HOME"),iNum); #endif if ((txtfile = fopen(szTxt, "wb")) == NULL) @@ -356,9 +356,9 @@ void CALLBACK GPUmakeSnapshot(void) { snapshotnr++; #ifdef _WINDOWS - sprintf(filename,"snap\\pcsx%04ld.bmp",snapshotnr); + sprintf(filename,"snap\\pcsxr%04ld.bmp",snapshotnr); #else - sprintf(filename, "%s/pcsx%04ld.bmp", getenv("HOME"), snapshotnr); + sprintf(filename, "%s/pcsxr%04ld.bmp", getenv("HOME"), snapshotnr); #endif bmpfile = fopen(filename,"rb"); diff --git a/plugins/dfxvideo/gpucfg-0.1df/main.c b/plugins/dfxvideo/gpucfg-0.1df/main.c index 07d362e3..4edc0a25 100644 --- a/plugins/dfxvideo/gpucfg-0.1df/main.c +++ b/plugins/dfxvideo/gpucfg-0.1df/main.c @@ -144,7 +144,7 @@ main (int argc, char *argv[]) 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_name (GTK_ABOUT_DIALOG (widget), "P.E.Op.S PCSX Video Plugin"); + gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (widget), "P.E.Op.S PCSXR Video Plugin"); gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (widget), "1.17"); gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (widget), authors); gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (widget), "http://pcsx-df.sourceforge.net/"); @@ -178,7 +178,7 @@ main (int argc, char *argv[]) fclose(in); } else{ pB=0;printf("Couldn't find config file %s\n", cfg);} -/* ADB TODO Parse this like we parse the config file in PCSX - use common functions! */ +/* ADB TODO Parse this like we parse the config file in PCSXR - use common functions! */ val=1; if(pB) { diff --git a/plugins/gxvideo/Makefile.am b/plugins/gxvideo/Makefile.am index 0f6499c1..9f753f91 100644 --- a/plugins/gxvideo/Makefile.am +++ b/plugins/gxvideo/Makefile.am @@ -16,15 +16,15 @@ bindir = @libdir@/games/psemu/ libdir = @libdir@/games/psemu/ noinst_LTLIBRARIES = libcfg.la libglobals.la -libcfg_la_SOURCES = cfg.c +libcfg_la_SOURCES = cfg.c cfg.h globals.h libglobals_la_SOURCES = globals.c lib_LTLIBRARIES = libGXVideo.la -libGXVideo_la_SOURCES = gpu.c draw.c fps.c key.c menu.c prim.c soft.c +libGXVideo_la_SOURCES = gpu.c gpu.h draw.c draw.h fps.c fps.h key.c key.h menu.c menu.h prim.c prim.h soft.c soft.h gpu_utils.h interp.h swap.h if X86_NASM -libGXVideo_la_SOURCES += i386.asm +libGXVideo_la_SOURCES += i386.asm macros.inc AM_CPPFLAGS += -DUSE_NASM=1 endif libGXVideo_la_LDFLAGS = -module -avoid-version diff --git a/plugins/gxvideo/cfg.c b/plugins/gxvideo/cfg.c index 7b18327a..b64bd99d 100644 --- a/plugins/gxvideo/cfg.c +++ b/plugins/gxvideo/cfg.c @@ -78,7 +78,7 @@ void ReadConfigFile() { strcpy(cfg_file_name, "cfg/" DEFAULT_CFG_NAME); f_in = fopen(cfg_file_name, "rb"); if (!f_in) - snprintf(cfg_file_name, 255, "%s/.pcsx/plugins/" DEFAULT_CFG_NAME, getenv("HOME")); + snprintf(cfg_file_name, 255, "%s/.pcsxr/plugins/" DEFAULT_CFG_NAME, getenv("HOME")); else fclose(f_in); } else @@ -175,7 +175,7 @@ void ExecCfg(char const * arg) { return; } - sprintf(cfg, "%s/.pcsx/plugins/cfg/cfgGXVideo", getenv("HOME")); + sprintf(cfg, "%s/.pcsxr/plugins/cfg/cfgGXVideo", getenv("HOME")); if (stat(cfg, &buf) != -1) { if (fork() == 0) { execl(cfg, "cfgGXVideo", arg, NULL); @@ -230,7 +230,7 @@ void WriteConfig(void) { strcpy(cfg_file_name, "cfg/" DEFAULT_CFG_NAME); f_out = fopen(cfg_file_name, "rb"); if (!f_out) - snprintf(cfg_file_name, 255, "%s/.pcsx/plugins/" DEFAULT_CFG_NAME, getenv("HOME")); + snprintf(cfg_file_name, 255, "%s/.pcsxr/plugins/" DEFAULT_CFG_NAME, getenv("HOME")); else fclose(f_out); } else diff --git a/plugins/gxvideo/gpu.c b/plugins/gxvideo/gpu.c index 22544950..853c7da3 100644 --- a/plugins/gxvideo/gpu.c +++ b/plugins/gxvideo/gpu.c @@ -217,9 +217,9 @@ void CALLBACK GPUmakeSnapshot(void) { // do { // snapshotnr++; //#ifdef _WINDOWS - // sprintf(filename,"snap\\pcsx%04ld.bmp",snapshotnr); + // sprintf(filename,"snap\\pcsxr%04ld.bmp",snapshotnr); //#else - // sprintf(filename, "%s/pcsx%04ld.bmp", getenv("HOME"), snapshotnr); + // sprintf(filename, "%s/pcsxr%04ld.bmp", getenv("HOME"), snapshotnr); //#endif // // bmpfile = fopen(filename, "rb"); diff --git a/plugins/gxvideo/gpucfg/main.c b/plugins/gxvideo/gpucfg/main.c index 64691e56..d3d4f93d 100644 --- a/plugins/gxvideo/gpucfg/main.c +++ b/plugins/gxvideo/gpucfg/main.c @@ -165,7 +165,7 @@ int main(int argc, char *argv[]) { "Ryan Schultz", "Andrew Burton", NULL }; widget = gtk_about_dialog_new(); gtk_about_dialog_set_name(GTK_ABOUT_DIALOG (widget), - "P.E.Op.S PCSX Video Plugin"); + "P.E.Op.S PCSXR Video Plugin"); gtk_about_dialog_set_version(GTK_ABOUT_DIALOG (widget), "1.17"); gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG (widget), authors); gtk_about_dialog_set_website(GTK_ABOUT_DIALOG (widget), diff --git a/plugins/peopsxgl/gpu.c b/plugins/peopsxgl/gpu.c index 04710bcd..2527fe39 100644 --- a/plugins/peopsxgl/gpu.c +++ b/plugins/peopsxgl/gpu.c @@ -371,9 +371,9 @@ void DoTextSnapShot(int iNum) FILE *txtfile;char szTxt[256];char * pB; #ifdef _WINDOWS - sprintf(szTxt,"snap\\pcsx%04d.txt",iNum); + sprintf(szTxt,"snap\\pcsxr%04d.txt",iNum); #else - sprintf(szTxt,"%s/pcsx%04d.txt",getenv("HOME"),iNum); + sprintf(szTxt,"%s/pcsxr%04d.txt",getenv("HOME"),iNum); #endif if((txtfile=fopen(szTxt,"wb"))==NULL) @@ -440,9 +440,9 @@ void DoSnapShot(void) { snapshotnr++; #ifdef _WINDOWS - sprintf(filename,"snap/pcsx%04d.bmp",snapshotnr); + sprintf(filename,"snap/pcsxr%04d.bmp",snapshotnr); #else - sprintf(filename,"%s/pcsx%04d.bmp",getenv("HOME"),snapshotnr); + sprintf(filename,"%s/pcsxr%04d.bmp",getenv("HOME"),snapshotnr); #endif bmpfile=fopen(filename,"rb"); if(bmpfile==NULL)break; @@ -2980,7 +2980,7 @@ void StartCfgTool(char *arg) // linux: start external cfg tool return; } - sprintf(cfg, "%s/.pcsx/plugins/cfg/cfgpeopsxgl", getenv("HOME")); + sprintf(cfg, "%s/.pcsxr/plugins/cfg/cfgpeopsxgl", getenv("HOME")); if (stat(cfg, &buf) != -1) { if (fork() == 0) { execl(cfg, "cfgpeopsxgl", arg, NULL); -- cgit v1.2.3