Emulation/pcsxr
1
0
Fork 0
mirror of https://github.com/iCatButler/pcsxr.git synced 2024-06-02 11:17:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rebranding.

Browse source 
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@67621 e17a0e51-4ae3-4d35-97c3-1a29b211df97
This commit is contained in:
SND\edgbla_cp 2011-06-08 09:27:25 +00:00
parent c7eb23ccf1
commit 5f868fa161
109 changed files with 6127 additions and 6424 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -6,4 +6,4 @@ SUBDIRS += plugins/bladesio1 plugins/gxvideo
SUBDIRS += $(PEOPSXGL)
EXTRA_DIST = AUTHORS COPYING INSTALL NEWS README ChangeLog ChangeLog.df
EXTRA_DIST = AUTHORS COPYING INSTALL NEWS README ChangeLog ChangeLog.df strip_fPIC.sh

4
configure.ac
View file

@ -1,4 +1,4 @@
AC_INIT([pcsx], [1.9])
AC_INIT([pcsxr], [1.9.93])
AC_CANONICAL_HOST
AC_CANONICAL_BUILD
@ -19,7 +19,7 @@ LT_INIT([disable-static])
AM_GLIB_GNU_GETTEXT
IT_PROG_INTLTOOL([0.35.0])
GETTEXT_PACKAGE=pcsx
GETTEXT_PACKAGE=pcsxr
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["${GETTEXT_PACKAGE}"], [gettext domain])

8
data/Makefile.am
View file

@ -1,7 +1,7 @@
glade_DATA = pcsx.glade2
gladedir = $(datadir)/pcsx
glade_DATA = pcsxr.glade2
gladedir = $(datadir)/pcsxr
desktopdir = $(datadir)/applications
desktop_DATA = pcsx.desktop
desktop_DATA = pcsxr.desktop
EXTRA_DIST = $(glade_DATA) pcsx.desktop
EXTRA_DIST = $(glade_DATA) pcsxr.desktop

6
data/pcsx.desktop → data/pcsxr.desktop
View file

@ -2,7 +2,7 @@
Version=1.0
Encoding=UTF-8
Type=Application
Name=PCSX
Name=PCSXR
GenericName=PlayStation Emulator
GenericName[ru_RU]=Эмулятор PlayStation
GenericName[zh_CN]=PlayStation 模拟器
@ -11,6 +11,6 @@ Comment=Sony PlayStation emulator
Comment[ru_RU]=Эмулятор Sony PlayStation
Comment[zh_CN]=Sony PlayStation 模拟器
Comment[zh_TW]=Sony PlayStation 模擬器
Exec=pcsx
Icon=pcsx-icon
Exec=pcsxr
Icon=pcsxr-icon
Categories=Game;

12
data/pcsx.glade2 → data/pcsxr.glade2
View file

@ -4,10 +4,10 @@
<!-- interface-naming-policy project-wide -->
<widget class="GtkWindow" id="MainWindow">
<property name="visible">True</property>
<property name="title" translatable="yes">PCSX</property>
<property name="title" translatable="yes">PCSXR</property>
<property name="resizable">False</property>
<property name="window_position">center</property>
<property name="icon_name">pcsx-icon.png</property>
<property name="icon_name">pcsxr-icon.png</property>
<signal name="destroy" handler="OnDestroy"/>
<child>
<widget class="GtkVBox" id="vbox18">
@ -641,8 +641,8 @@
<child>
<widget class="GtkMenu" id="help1_menu">
<child>
<widget class="GtkImageMenuItem" id="about_pcsx1">
<property name="label" translatable="yes">_About PCSX...</property>
<widget class="GtkImageMenuItem" id="about_pcsxr1">
<property name="label" translatable="yes">_About PCSXR...</property>
<property name="visible">True</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
@ -818,7 +818,7 @@
<property name="width_request">354</property>
<property name="height_request">174</property>
<property name="visible">True</property>
<property name="pixbuf">pcsx.jpg</property>
<property name="pixbuf">pcsxr.jpg</property>
</widget>
<packing>
<property name="position">2</property>
@ -840,7 +840,7 @@
</widget>
<widget class="GtkDialog" id="ConfDlg">
<property name="visible">True</property>
<property name="title" translatable="yes">Configure PCSX</property>
<property name="title" translatable="yes">Configure PCSXR</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="type_hint">dialog</property>

4
debian-upstream/pcsxr.menu
View file

@ -1,5 +1,5 @@
?package(pcsxr): \
needs="X11" \
section="Applications/Emulators" \
title="PCSX PlayStation Emulator" \
command="/usr/games/pcsx"
title="PCSXR PlayStation Emulator" \
command="/usr/games/pcsxr"

5
doc/Makefile.am
View file

@ -1,3 +1,2 @@
EXTRA_DIST = keys.txt tweaks.txt
man_MANS = pcsx.1
man_MANS = pcsxr.1
EXTRA_DIST = keys.txt tweaks.txt $(man_MANS)

14
doc/pcsx.1 → doc/pcsxr.1
View file

@ -1,14 +1,15 @@
.\" Hey, EMACS: -*- nroff -*-
.TH PCSX 1 "October 01, 2005"
.TH PCSXR 1 "October 01, 2005"
.SH NAME
pcsx - Playstation emulator
pcsxr - Playstation emulator
.SH SYPNOSIS
.B pcsx
.B pcsxr
.I [options] [file]
.SH DESCRIPTION
PCSX is a plugin-based Playstation emulator able to play most PSX games. It provides CPU, BIOS, and basic system emulation and relies on plugins for sound, input, and graphics emulation.
PCSXR is a plugin-based PlayStation emulator able to play most PSX games. It provides CPU, BIOS, and basic system emulation and relies on plugins for sound, input, and graphics emulation.
.PP
.SH OPTIONS
.TP
.B -runcd
Runs CD-ROM from drive
.TP
@ -24,6 +25,9 @@ Specify a different config file
.B -psxout
Enable PSX output
.TP
.B -slowboot
Enable BIOS Logo
.TP
.B -load STATENUM
Loads savestate STATENUM
.TP
@ -31,5 +35,5 @@ Loads savestate STATENUM
Display help message
.TP
.SH AUTHOR
pcsx was written by Linuzappz <linuzappz@pcsx.net>. PCSX-df was written by Ryan Schultz <schultz.ryan@gmail.com> and Andrew Burton <adb@iinet.net.au>. PCSX-Reloaded was written by Wei Mingzhi <weimingzhi@gmail.com>.
PCSX was written by Linuzappz <linuzappz@pcsx.net>. PCSX-df was written by Ryan Schultz <schultz.ryan@gmail.com> and Andrew Burton <adb@iinet.net.au>. PCSX-Reloaded was written by Wei Mingzhi <weimingzhi@gmail.com>.
This manual page was written by Ryan Schultz <schultz.ryan@gmail.com> for the Debian Project.

2
doc/tweaks.txt
View file

@ -1,4 +1,4 @@
There are several toggles in PCSX to allow you to modify emulation
There are several toggles in PCSXR to allow you to modify emulation
behavior; this may allow certain games to work that would not otherwise
function. These can all be found at Configuration -> CPU.

8
gui/Cheat.c
View file

@ -313,7 +313,7 @@ static void OnCheatListDlg_OpenClicked(GtkWidget *widget, gpointer user_data) {
filter = gtk_file_filter_new ();
gtk_file_filter_add_pattern (filter, "*.cht");
gtk_file_filter_set_name (filter, _("PCSX Cheat Code Files (*.cht)"));
gtk_file_filter_set_name (filter, _("PCSXR Cheat Code Files (*.cht)"));
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
filter = gtk_file_filter_new ();
@ -353,7 +353,7 @@ static void OnCheatListDlg_SaveClicked(GtkWidget *widget, gpointer user_data) {
filter = gtk_file_filter_new();
gtk_file_filter_add_pattern(filter, "*.cht");
gtk_file_filter_set_name(filter, _("PCSX Cheat Code Files (*.cht)"));
gtk_file_filter_set_name(filter, _("PCSXR Cheat Code Files (*.cht)"));
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(chooser), filter);
filter = gtk_file_filter_new();
@ -389,7 +389,7 @@ void RunCheatListDialog() {
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "CheatListDlg", NULL);
xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "CheatListDlg", NULL);
if (!xml) {
g_warning(_("Error: Glade interface could not be loaded!"));
return;
@ -1119,7 +1119,7 @@ void RunCheatSearchDialog() {
GtkTreeSelection *treesel;
GtkTreeViewColumn *column;
xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "CheatSearchDlg", NULL);
xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "CheatSearchDlg", NULL);
if (!xml) {
g_warning(_("Error: Glade interface could not be loaded!"));
return;

10
gui/ConfDlg.c
View file

@ -98,7 +98,7 @@ void ConfigurePlugins() {
UpdatePluginsBIOS();
xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "ConfDlg", NULL);
xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "ConfDlg", NULL);
if (!xml) {
g_warning(_("Error: Glade interface could not be loaded!"));
@ -109,7 +109,7 @@ void ConfigurePlugins() {
ConfDlg = glade_xml_get_widget(xml, "ConfDlg");
gtk_window_set_title(GTK_WINDOW(ConfDlg), _("Configure PCSX"));
gtk_window_set_title(GTK_WINDOW(ConfDlg), _("Configure PCSXR"));
/* Set the paths in the file choosers to be based on the saved configurations */
widget = glade_xml_get_widget(xml, "GtkFileChooser_Bios");
@ -194,7 +194,7 @@ void OnConf_Net() {
return;
}
xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "NetDlg", NULL);
xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "NetDlg", NULL);
if (!xml) {
g_warning(_("Error: Glade interface could not be loaded!"));
@ -671,7 +671,7 @@ void UpdatePluginsBIOS() {
scan_bios_dir(Config.BiosDir);
// The BIOS list always contains the PCSX internal BIOS
// The BIOS list always contains the PCSXR internal BIOS
add_bios_to_list(_("Simulate PSX BIOS"), "HLE");
}
@ -842,7 +842,7 @@ void OnCpu_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) {
void OnConf_Cpu() {
GladeXML *xml;
xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "CpuDlg", NULL);
xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "CpuDlg", NULL);
if (!xml) {
g_warning("We could not load the interface!");

4
gui/Config.c
View file

@ -82,13 +82,13 @@ int LoadConfig(PcsxConfig *Conf) {
// Ryan says: use dotdir, dotdir is GOOD
// No giant homedir names
strncpy(cfgfile, getenv("HOME"), 200);
strcat(cfgfile, PCSX_DOT_DIR);
strcat(cfgfile, PCSXR_DOT_DIR);
// proceed to load the cfg file
// append its name
strcat(cfgfile, cfgfile_basename);
// file is now ~/.pcsx/pcsx.cfg (or whatever cfgfile_basename is)
// file is now ~/.pcsxr/pcsxr.cfg (or whatever cfgfile_basename is)
if (stat(cfgfile, &buf) == -1) {
// the config file doesn't exist!
/* TODO Error checking? */

2
gui/DebugMemory.c
View file

@ -254,7 +254,7 @@ void RunDebugMemoryDialog() {
PangoFontDescription *pfd;
int i;
xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "MemViewDlg", NULL);
xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "MemViewDlg", NULL);
if (!xml) {
g_warning(_("Error: Glade interface could not be loaded!"));
return;

12
gui/Gtk2Gui.c
View file

@ -213,7 +213,7 @@ void StartGui() {
return;
}*/
xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "MainWindow", NULL);
xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "MainWindow", NULL);
if (!xml) {
g_warning("We could not load the interface!");
@ -221,9 +221,9 @@ void StartGui() {
}
Window = glade_xml_get_widget(xml, "MainWindow");
gtk_window_set_title(GTK_WINDOW(Window), "PCSX");
gtk_window_set_icon_from_file(GTK_WINDOW(Window), PIXMAPDIR "pcsx-icon.png", NULL);
gtk_window_set_default_icon_from_file(PIXMAPDIR "pcsx-icon.png", NULL);
gtk_window_set_title(GTK_WINDOW(Window), "PCSXR");
gtk_window_set_icon_from_file(GTK_WINDOW(Window), PIXMAPDIR "pcsxr-icon.png", NULL);
gtk_window_set_default_icon_from_file(PIXMAPDIR "pcsxr-icon.png", NULL);
ResetMenuSlots(xml);
// Set up callbacks
@ -363,7 +363,7 @@ void StartGui() {
G_CALLBACK(RunCheatSearchDialog), NULL, NULL, G_CONNECT_AFTER);
// Help menu
widget = glade_xml_get_widget(xml, "about_pcsx1");
widget = glade_xml_get_widget(xml, "about_pcsxr1");
g_signal_connect_data(GTK_OBJECT(widget), "activate",
G_CALLBACK(OnHelp_About), NULL, NULL, G_CONNECT_AFTER);
@ -786,7 +786,7 @@ void state_load(gchar *state_filename) {
fclose(fp);
// If the window exists, then we are loading the state from within
// within the PCSX GUI. We need to initialise the plugins first
// within the PCSXR GUI. We need to initialise the plugins first
if (Window) {
destroy_main_window();

20
gui/Linux.h
View file

@ -26,16 +26,16 @@
#include "Cheat.h"
#define DEFAULT_MEM_CARD_1 "/.pcsx/memcards/card1.mcd"
#define DEFAULT_MEM_CARD_2 "/.pcsx/memcards/card2.mcd"
#define MEMCARD_DIR "/.pcsx/memcards/"
#define PLUGINS_DIR "/.pcsx/plugins/"
#define PLUGINS_CFG_DIR "/.pcsx/plugins/cfg/"
#define PCSX_DOT_DIR "/.pcsx/"
#define BIOS_DIR "/.pcsx/bios/"
#define STATES_DIR "/.pcsx/sstates/"
#define CHEATS_DIR "/.pcsx/cheats/"
#define PATCHES_DIR "/.pcsx/patches/"
#define DEFAULT_MEM_CARD_1 "/.pcsxr/memcards/card1.mcd"
#define DEFAULT_MEM_CARD_2 "/.pcsxr/memcards/card2.mcd"
#define MEMCARD_DIR "/.pcsxr/memcards/"
#define PLUGINS_DIR "/.pcsxr/plugins/"
#define PLUGINS_CFG_DIR "/.pcsxr/plugins/cfg/"
#define PCSXR_DOT_DIR "/.pcsxr/"
#define BIOS_DIR "/.pcsxr/bios/"
#define STATES_DIR "/.pcsxr/sstates/"
#define CHEATS_DIR "/.pcsxr/cheats/"
#define PATCHES_DIR "/.pcsxr/patches/"
extern gboolean UseGui;
extern int StatesC;

30
gui/LnxMain.c
View file

@ -78,8 +78,8 @@ static void CreateHomeConfigDir(char *directory) {
}
static void CheckSubDir() {
// make sure that ~/.pcsx exists
CreateHomeConfigDir(PCSX_DOT_DIR);
// make sure that ~/.pcsxr exists
CreateHomeConfigDir(PCSXR_DOT_DIR);
CreateHomeConfigDir(BIOS_DIR);
CreateHomeConfigDir(MEMCARD_DIR);
@ -109,7 +109,7 @@ static void ScanPlugins(gchar* scandir) {
match(filename, "cfg.*") == 0) {
continue; /* Skip this file */
} else {
/* Create a symlink from this file to the directory ~/.pcsx/plugin */
/* Create a symlink from this file to the directory ~/.pcsxr/plugin */
linkname = g_build_filename (getenv("HOME"), PLUGINS_DIR, ent->d_name, NULL);
symlink(filename, linkname);
@ -145,7 +145,7 @@ static void ScanBios(gchar* scandir) {
match(filename, ".*\\.BIN$") == 0) {
continue; /* Skip this file */
} else {
/* Create a symlink from this file to the directory ~/.pcsx/plugin */
/* Create a symlink from this file to the directory ~/.pcsxr/plugin */
linkname = g_build_filename(getenv("HOME"), BIOS_DIR, ent->d_name, NULL);
symlink(filename, linkname);
@ -220,8 +220,8 @@ static void ScanAllPlugins (void) {
ScanBios("/usr/lib32/games/psemu/bios");
ScanBios("/usr/share/psemu");
ScanBios("/usr/share/psemu/bios");
ScanBios("/usr/share/pcsx");
ScanBios("/usr/share/pcsx/bios");
ScanBios("/usr/share/pcsxr");
ScanBios("/usr/share/pcsxr/bios");
ScanBios("/usr/local/lib/games/psemu");
ScanBios("/usr/local/lib/games/psemu/bios");
ScanBios("/usr/local/lib64/games/psemu");
@ -230,8 +230,8 @@ static void ScanAllPlugins (void) {
ScanBios("/usr/local/lib32/games/psemu/bios");
ScanBios("/usr/local/share/psemu");
ScanBios("/usr/local/share/psemu/bios");
ScanBios("/usr/local/share/pcsx");
ScanBios("/usr/local/share/pcsx/bios");
ScanBios("/usr/local/share/pcsxr");
ScanBios("/usr/local/share/pcsxr/bios");
ScanBios(PACKAGE_DATA_DIR);
ScanBios(PSEMU_DATA_DIR);
ScanBios(PACKAGE_DATA_DIR "/bios");
@ -245,17 +245,17 @@ static void ScanAllPlugins (void) {
ScanPlugins(currentdir);
g_free(currentdir);
// Check for bad links in ~/.pcsx/plugins/
// Check for bad links in ~/.pcsxr/plugins/
currentdir = g_build_filename(getenv("HOME"), PLUGINS_DIR, NULL);
CheckSymlinksInPath(currentdir);
g_free(currentdir);
// Check for bad links in ~/.pcsx/plugins/cfg
// Check for bad links in ~/.pcsxr/plugins/cfg
currentdir = g_build_filename(getenv("HOME"), PLUGINS_CFG_DIR, NULL);
CheckSymlinksInPath(currentdir);
g_free(currentdir);
// Check for bad links in ~/.pcsx/bios
// Check for bad links in ~/.pcsxr/bios
currentdir = g_build_filename(getenv("HOME"), BIOS_DIR, NULL);
CheckSymlinksInPath(currentdir);
g_free(currentdir);
@ -288,7 +288,7 @@ int main(int argc, char *argv[]) {
// what is the name of the config file?
// it may be redefined by -cfg on the command line
strcpy(cfgfile_basename, "pcsx.cfg");
strcpy(cfgfile_basename, "pcsxr.cfg");
// read command line options
for (i = 1; i < argc; i++) {
@ -325,12 +325,12 @@ int main(int argc, char *argv[]) {
!strcmp(argv[i], "--help")) {
printf(PACKAGE_STRING "\n");
printf("%s\n", _(
" pcsx [options] [file]\n"
" pcsxr [options] [file]\n"
"\toptions:\n"
"\t-runcd\t\tRuns CD-ROM\n"
"\t-cdfile FILE\tRuns a CD image file\n"
"\t-nogui\t\tDon't open the GTK GUI\n"
"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n"
"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsxr/pcsxr.cfg)\n"
"\t-psxout\t\tEnable PSX output\n"
"\t-slowboot\tEnable BIOS Logo\n"
"\t-load STATENUM\tLoads savestate STATENUM (1-9)\n"
@ -362,7 +362,7 @@ int main(int argc, char *argv[]) {
// if the config file doesn't exist
if (LoadConfig() == -1) {
if (!UseGui) {
printf(_("PCSX cannot be configured without using the GUI -- you should restart without -nogui.\n"));
printf(_("PCSXR cannot be configured without using the GUI -- you should restart without -nogui.\n"));
return 1;
}

18
gui/Makefile.am
View file

@ -1,4 +1,4 @@
AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"${datadir}/pcsx/\" \
AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"${datadir}/pcsxr/\" \
-DPIXMAPDIR=\"${datadir}/pixmaps/\" \
-DLOCALE_DIR=\"${datadir}/locale/\" \
$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
@ -6,19 +6,27 @@ AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"${datadir}/pcsx/\" \
-DPSEMU_DATA_DIR=\"${datadir}/psemu\" \
-DDEF_PLUGIN_DIR=\"${libdir}/games/psemu\"
bin_PROGRAMS = pcsx
bin_PROGRAMS = pcsxr
pcsx_SOURCES = \
pcsxr_SOURCES = \
LnxMain.c \
Linux.h \
nopic.h \
Plugin.c \
Config.c \
Gtk2Gui.c \
MemcardDlg.c \
MemcardDlg.h \
ConfDlg.c \
ConfDlg.h \
Cheat.c \
Cheat.h \
DebugMemory.c \
AboutDlg.c
DebugMemory.h \
AboutDlg.c \
AboutDlg.h \
gdk-compat.h
pcsx_LDADD = \
pcsxr_LDADD = \
../libpcsxcore/libpcsxcore.a \
$(GTK2_LIBS) $(GLADE2_LIBS) -lpthread -lz -lm -lXext -lXtst

6
gui/MemcardDlg.c
View file

@ -433,8 +433,8 @@ static void OnMcd_New(GtkWidget *widget, gpointer user_data) {
GTK_STOCK_SAVE, GTK_RESPONSE_OK,
NULL);
// Card should be put into $HOME/.pcsx/memcards
path = g_build_filename(g_get_home_dir(), ".pcsx", "memcards", NULL);
// Card should be put into $HOME/.pcsxr/memcards
path = g_build_filename(g_get_home_dir(), ".pcsxr", "memcards", NULL);
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser), path);
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(chooser), _("New Memory Card.mcd"));
gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(chooser), TRUE);
@ -692,7 +692,7 @@ void OnConf_Mcds() {
GtkTreeSelection *treesel1, *treesel2;
gchar *str;
xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "McdsDlg", NULL);
xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "McdsDlg", NULL);
if (!xml) {
g_warning("We could not load the interface!");

6
gui/Plugin.c
View file

@ -324,7 +324,7 @@ int _OpenPlugins() {
ret = SPU_open();
if (ret < 0) { SysMessage(_("Error opening SPU plugin!")); return -1; }
SPU_registerCallback(SPUirq);
ret = GPU_open(&gpuDisp, "PCSX", NULL);
ret = GPU_open(&gpuDisp, "PCSXR", NULL);
if (ret < 0) { SysMessage(_("Error opening GPU plugin!")); return -1; }
GPU_registerCallback(GPUbusy);
ret = PAD1_open(&gpuDisp);
@ -342,9 +342,9 @@ int _OpenPlugins() {
char dotdir[MAXPATHLEN];
strncpy(dotdir, getenv("HOME"), MAXPATHLEN-100);
strcat(dotdir, "/.pcsx/plugins/");
strcat(dotdir, "/.pcsxr/plugins/");
strcpy(info.EmuName, "PCSX " PACKAGE_VERSION);
strcpy(info.EmuName, "PCSXR " PACKAGE_VERSION);
strncpy(info.CdromID, CdromId, 9);
strncpy(info.CdromLabel, CdromLabel, 9);
info.psxMem = psxM;

3
libpcsxcore/Makefile.am
View file

@ -10,6 +10,7 @@ libpcsxcore_a_SOURCES = \
$(top_builddir)/libpcsxcore/psxdma.c \
$(top_builddir)/libpcsxcore/disr3000a.c \
$(top_builddir)/libpcsxcore/gpu.c \
$(top_builddir)/libpcsxcore/gpu.h \
$(top_builddir)/libpcsxcore/spu.c \
$(top_builddir)/libpcsxcore/sio.c \
$(top_builddir)/libpcsxcore/psxhw.c \
@ -68,8 +69,10 @@ libpcsxcore_a_SOURCES += \
else
if ARCH_X86
libpcsxcore_a_SOURCES += \
$(top_builddir)/libpcsxcore/ix86/iGte.h \
$(top_builddir)/libpcsxcore/ix86/iR3000A.c \
$(top_builddir)/libpcsxcore/ix86/ix86.c \
$(top_builddir)/libpcsxcore/ix86/ix86.h \
$(top_builddir)/libpcsxcore/
endif
endif

8
libpcsxcore/debug.c
View file

@ -21,7 +21,7 @@
#include "socket.h"
/*
PCSX Debug console protocol description, version 1.0
PCSXR Debug console protocol description, version 1.0
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Commands number are formatted using %03X (yes)
@ -37,7 +37,7 @@ Basic commands (1xx):
100 <message>
Sends a dumb message. Will be replied with a 200 reply, followed by the message.
101
Gets PCSX version.
Gets PCSXR version.
102
Gets protocol version.
103
@ -143,14 +143,14 @@ Spontaneous messages (0xx):
010 / 011 / 012 / 013 / 014 / 015 / 016
Execution hit mapping flow automatic breakpoint.
030 <number>@<PC>
Execution hit breakpoint, PCSX is paused. Displays PC's value.
Execution hit breakpoint, PCSXR is paused. Displays PC's value.
Basic commands acknowledge (2xx):
--------------------------------
200 <message>
Sends a dumb message.
201 <message>
Returns PCSX version.
Returns PCSXR version.
202 <message>
Returns protocol version.
203 <status>

8
libpcsxcore/misc.c
View file

@ -494,7 +494,7 @@ int Load(const char *ExePath) {
// STATES
static const char PcsxHeader[32] = "STv4 PCSX v" PACKAGE_VERSION;
static const char PcsxrHeader[32] = "STv4 PCSXR v" PACKAGE_VERSION;
// Savestate Versioning!
// If you make changes to the savestate version, please increment the value below.
@ -510,7 +510,7 @@ int SaveState(const char *file) {
f = gzopen(file, "wb");
if (f == NULL) return -1;
gzwrite(f, (void *)PcsxHeader, 32);
gzwrite(f, (void *)PcsxrHeader, 32);
gzwrite(f, (void *)&SaveVersion, sizeof(u32));
gzwrite(f, (void *)&Config.HLE, sizeof(boolean));
@ -572,7 +572,7 @@ int LoadState(const char *file) {
gzread(f, &version, sizeof(u32));
gzread(f, &hle, sizeof(boolean));
if (strncmp("STv4 PCSX", header, 9) != 0 || version != SaveVersion || hle != Config.HLE) {
if (strncmp("STv4 PCSXR", header, 10) != 0 || version != SaveVersion || hle != Config.HLE) {
gzclose(f);
return -1;
}
@ -627,7 +627,7 @@ int CheckState(const char *file) {
gzclose(f);
if (strncmp("STv4 PCSX", header, 9) != 0 || version != SaveVersion || hle != Config.HLE)
if (strncmp("STv4 PCSXR", header, 10) != 0 || version != SaveVersion || hle != Config.HLE)
return -1;
return 0;

380
libpcsxcore/r3000a.c
View file

@ -1,111 +1,111 @@
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
/*
* R3000A CPU functions.
*/
#include "r3000a.h"
#include "cdrom.h"
#include "mdec.h"
#include "gpu.h"
/***************************************************************************
* Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
/*
* R3000A CPU functions.
*/
#include "r3000a.h"
#include "cdrom.h"
#include "mdec.h"
#include "gpu.h"
#include "gte.h"
R3000Acpu *psxCpu = NULL;
psxRegisters psxRegs;
int psxInit() {
SysPrintf(_("Running PCSX Version %s (%s).\n"), PACKAGE_VERSION, __DATE__);
#ifdef PSXREC
if (Config.Cpu == CPU_INTERPRETER) {
psxCpu = &psxInt;
} else psxCpu = &psxRec;
#else
psxCpu = &psxInt;
#endif
Log = 0;
if (psxMemInit() == -1) return -1;
return psxCpu->Init();
}
void psxReset() {
psxCpu->Reset();
psxMemReset();
memset(&psxRegs, 0, sizeof(psxRegs));
psxRegs.pc = 0xbfc00000; // Start in bootstrap
psxRegs.CP0.r[12] = 0x10900000; // COP0 enabled | BEV = 1 | TS = 1
psxRegs.CP0.r[15] = 0x00000002; // PRevID = Revision ID, same as R3000A
psxHwReset();
psxBiosInit();
if (!Config.HLE)
psxExecuteBios();
#ifdef EMU_LOG
EMU_LOG("*BIOS END*\n");
#endif
Log = 0;
}
void psxShutdown() {
psxMemShutdown();
psxBiosShutdown();
psxCpu->Shutdown();
}
void psxException(u32 code, u32 bd) {
// Set the Cause
psxRegs.CP0.n.Cause = code;
// Set the EPC & PC
if (bd) {
#ifdef PSXCPU_LOG
PSXCPU_LOG("bd set!!!\n");
#endif
SysPrintf("bd set!!!\n");
psxRegs.CP0.n.Cause |= 0x80000000;
psxRegs.CP0.n.EPC = (psxRegs.pc - 4);
} else
psxRegs.CP0.n.EPC = (psxRegs.pc);
if (psxRegs.CP0.n.Status & 0x400000)
psxRegs.pc = 0xbfc00180;
else
psxRegs.pc = 0x80000080;
// Set the Status
psxRegs.CP0.n.Status = (psxRegs.CP0.n.Status &~0x3f) |
((psxRegs.CP0.n.Status & 0xf) << 2);
if (Config.HLE) psxBiosException();
}
R3000Acpu *psxCpu = NULL;
psxRegisters psxRegs;
int psxInit() {
SysPrintf(_("Running PCSXR Version %s (%s).\n"), PACKAGE_VERSION, __DATE__);
#ifdef PSXREC
if (Config.Cpu == CPU_INTERPRETER) {
psxCpu = &psxInt;
} else psxCpu = &psxRec;
#else
psxCpu = &psxInt;
#endif
Log = 0;
if (psxMemInit() == -1) return -1;
return psxCpu->Init();
}
void psxReset() {
psxCpu->Reset();
psxMemReset();
memset(&psxRegs, 0, sizeof(psxRegs));
psxRegs.pc = 0xbfc00000; // Start in bootstrap
psxRegs.CP0.r[12] = 0x10900000; // COP0 enabled | BEV = 1 | TS = 1
psxRegs.CP0.r[15] = 0x00000002; // PRevID = Revision ID, same as R3000A
psxHwReset();
psxBiosInit();
if (!Config.HLE)
psxExecuteBios();
#ifdef EMU_LOG
EMU_LOG("*BIOS END*\n");
#endif
Log = 0;
}
void psxShutdown() {
psxMemShutdown();
psxBiosShutdown();
psxCpu->Shutdown();
}
void psxException(u32 code, u32 bd) {
// Set the Cause
psxRegs.CP0.n.Cause = code;
// Set the EPC & PC
if (bd) {
#ifdef PSXCPU_LOG
PSXCPU_LOG("bd set!!!\n");
#endif
SysPrintf("bd set!!!\n");
psxRegs.CP0.n.Cause |= 0x80000000;
psxRegs.CP0.n.EPC = (psxRegs.pc - 4);
} else
psxRegs.CP0.n.EPC = (psxRegs.pc);
if (psxRegs.CP0.n.Status & 0x400000)
psxRegs.pc = 0xbfc00180;
else
psxRegs.pc = 0x80000080;
// Set the Status
psxRegs.CP0.n.Status = (psxRegs.CP0.n.Status &~0x3f) |
((psxRegs.CP0.n.Status & 0xf) << 2);
if (Config.HLE) psxBiosException();
}
void psxBranchTest() {
// GameShark Sampler: Give VSync pin some delay before exception eats it
if (psxHu32(0x1070) & psxHu32(0x1074)) {
@ -146,53 +146,53 @@ void psxBranchTest() {
}
#endif
if ((psxRegs.cycle - psxNextsCounter) >= psxNextCounter)
psxRcntUpdate();
if ((psxRegs.cycle - psxNextsCounter) >= psxNextCounter)
psxRcntUpdate();
if (psxRegs.interrupt) {
if ((psxRegs.interrupt & (1 << PSXINT_SIO)) && !Config.Sio) { // sio
if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_SIO].sCycle) >= psxRegs.intCycle[PSXINT_SIO].cycle) {
psxRegs.interrupt &= ~(1 << PSXINT_SIO);
sioInterrupt();
}
}
if (psxRegs.interrupt & (1 << PSXINT_CDR)) { // cdr
if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_CDR].sCycle) >= psxRegs.intCycle[PSXINT_CDR].cycle) {
psxRegs.interrupt &= ~(1 << PSXINT_CDR);
cdrInterrupt();
}
}
if (psxRegs.interrupt & (1 << PSXINT_CDREAD)) { // cdr read
if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_CDREAD].sCycle) >= psxRegs.intCycle[PSXINT_CDREAD].cycle) {
psxRegs.interrupt &= ~(1 << PSXINT_CDREAD);
cdrReadInterrupt();
}
}
if (psxRegs.interrupt & (1 << PSXINT_GPUDMA)) { // gpu dma
if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_GPUDMA].sCycle) >= psxRegs.intCycle[PSXINT_GPUDMA].cycle) {
psxRegs.interrupt &= ~(1 << PSXINT_GPUDMA);
gpuInterrupt();
}
}
if (psxRegs.interrupt & (1 << PSXINT_MDECOUTDMA)) { // mdec out dma
if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_MDECOUTDMA].sCycle) >= psxRegs.intCycle[PSXINT_MDECOUTDMA].cycle) {
psxRegs.interrupt &= ~(1 << PSXINT_MDECOUTDMA);
mdec1Interrupt();
}
}
if (psxRegs.interrupt & (1 << PSXINT_SPUDMA)) { // spu dma
if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_SPUDMA].sCycle) >= psxRegs.intCycle[PSXINT_SPUDMA].cycle) {
psxRegs.interrupt &= ~(1 << PSXINT_SPUDMA);
spuInterrupt();
}
}
if (psxRegs.interrupt & (1 << PSXINT_GPUBUSY)) { // gpu busy
if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_GPUBUSY].sCycle) >= psxRegs.intCycle[PSXINT_GPUBUSY].cycle) {
psxRegs.interrupt &= ~(1 << PSXINT_GPUBUSY);
GPU_idle();
}
if ((psxRegs.interrupt & (1 << PSXINT_SIO)) && !Config.Sio) { // sio
if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_SIO].sCycle) >= psxRegs.intCycle[PSXINT_SIO].cycle) {
psxRegs.interrupt &= ~(1 << PSXINT_SIO);
sioInterrupt();
}
}
if (psxRegs.interrupt & (1 << PSXINT_CDR)) { // cdr
if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_CDR].sCycle) >= psxRegs.intCycle[PSXINT_CDR].cycle) {
psxRegs.interrupt &= ~(1 << PSXINT_CDR);
cdrInterrupt();
}
}
if (psxRegs.interrupt & (1 << PSXINT_CDREAD)) { // cdr read
if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_CDREAD].sCycle) >= psxRegs.intCycle[PSXINT_CDREAD].cycle) {
psxRegs.interrupt &= ~(1 << PSXINT_CDREAD);
cdrReadInterrupt();
}
}
if (psxRegs.interrupt & (1 << PSXINT_GPUDMA)) { // gpu dma
if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_GPUDMA].sCycle) >= psxRegs.intCycle[PSXINT_GPUDMA].cycle) {
psxRegs.interrupt &= ~(1 << PSXINT_GPUDMA);
gpuInterrupt();
}
}
if (psxRegs.interrupt & (1 << PSXINT_MDECOUTDMA)) { // mdec out dma
if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_MDECOUTDMA].sCycle) >= psxRegs.intCycle[PSXINT_MDECOUTDMA].cycle) {
psxRegs.interrupt &= ~(1 << PSXINT_MDECOUTDMA);
mdec1Interrupt();
}
}
if (psxRegs.interrupt & (1 << PSXINT_SPUDMA)) { // spu dma
if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_SPUDMA].sCycle) >= psxRegs.intCycle[PSXINT_SPUDMA].cycle) {
psxRegs.interrupt &= ~(1 << PSXINT_SPUDMA);
spuInterrupt();
}
}
if (psxRegs.interrupt & (1 << PSXINT_GPUBUSY)) { // gpu busy
if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_GPUBUSY].sCycle) >= psxRegs.intCycle[PSXINT_GPUBUSY].cycle) {
psxRegs.interrupt &= ~(1 << PSXINT_GPUBUSY);
GPU_idle();
}
}
if (psxRegs.interrupt & (1 << PSXINT_MDECINDMA)) { // mdec in
if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_MDECINDMA].sCycle) >= psxRegs.intCycle[PSXINT_MDECINDMA].cycle) {
psxRegs.interrupt &= ~(1 << PSXINT_MDECINDMA);
@ -234,42 +234,42 @@ void psxBranchTest() {
cdrLidSeekInterrupt();
}
}
}
}
void psxJumpTest() {
if (!Config.HLE && Config.PsxOut) {
u32 call = psxRegs.GPR.n.t1 & 0xff;
switch (psxRegs.pc & 0x1fffff) {
case 0xa0:
#ifdef PSXBIOS_LOG
if (call != 0x28 && call != 0xe) {
PSXBIOS_LOG("Bios call a0: %s (%x) %x,%x,%x,%x\n", biosA0n[call], call, psxRegs.GPR.n.a0, psxRegs.GPR.n.a1, psxRegs.GPR.n.a2, psxRegs.GPR.n.a3); }
#endif
if (biosA0[call])
biosA0[call]();
break;
case 0xb0:
#ifdef PSXBIOS_LOG
if (call != 0x17 && call != 0xb) {
PSXBIOS_LOG("Bios call b0: %s (%x) %x,%x,%x,%x\n", biosB0n[call], call, psxRegs.GPR.n.a0, psxRegs.GPR.n.a1, psxRegs.GPR.n.a2, psxRegs.GPR.n.a3); }
#endif
if (biosB0[call])
biosB0[call]();
break;
case 0xc0:
#ifdef PSXBIOS_LOG
PSXBIOS_LOG("Bios call c0: %s (%x) %x,%x,%x,%x\n", biosC0n[call], call, psxRegs.GPR.n.a0, psxRegs.GPR.n.a1, psxRegs.GPR.n.a2, psxRegs.GPR.n.a3);
#endif
if (biosC0[call])
biosC0[call]();
break;
}
}
}
void psxExecuteBios() {
while (psxRegs.pc != 0x80030000)
psxCpu->ExecuteBlock();
}
}
}
void psxJumpTest() {
if (!Config.HLE && Config.PsxOut) {
u32 call = psxRegs.GPR.n.t1 & 0xff;
switch (psxRegs.pc & 0x1fffff) {
case 0xa0:
#ifdef PSXBIOS_LOG
if (call != 0x28 && call != 0xe) {
PSXBIOS_LOG("Bios call a0: %s (%x) %x,%x,%x,%x\n", biosA0n[call], call, psxRegs.GPR.n.a0, psxRegs.GPR.n.a1, psxRegs.GPR.n.a2, psxRegs.GPR.n.a3); }
#endif
if (biosA0[call])
biosA0[call]();
break;
case 0xb0:
#ifdef PSXBIOS_LOG
if (call != 0x17 && call != 0xb) {
PSXBIOS_LOG("Bios call b0: %s (%x) %x,%x,%x,%x\n", biosB0n[call], call, psxRegs.GPR.n.a0, psxRegs.GPR.n.a1, psxRegs.GPR.n.a2, psxRegs.GPR.n.a3); }
#endif
if (biosB0[call])
biosB0[call]();
break;
case 0xc0:
#ifdef PSXBIOS_LOG
PSXBIOS_LOG("Bios call c0: %s (%x) %x,%x,%x,%x\n", biosC0n[call], call, psxRegs.GPR.n.a0, psxRegs.GPR.n.a1, psxRegs.GPR.n.a2, psxRegs.GPR.n.a3);
#endif
if (biosC0[call])
biosC0[call]();
break;
}
}
}
void psxExecuteBios() {
while (psxRegs.pc != 0x80030000)
psxCpu->ExecuteBlock();
}

2
libpcsxcore/socket.c
View file

@ -119,7 +119,7 @@ void GetClient() {
}
#endif
sprintf(hello, "000 PCSX Version %s - Debug console\r\n", PACKAGE_VERSION);
sprintf(hello, "000 PCSXR Version %s - Debug console\r\n", PACKAGE_VERSION);
WriteSocket(hello, strlen(hello));
ptr = 0;
}

12
macosx/ConfigurationController.m
View file

@ -1,7 +1,7 @@
#import "ConfigurationController.h"
#import "PcsxController.h"
#import "PcsxrController.h"
#import "PluginList.h"
#import "PcsxPlugin.h"
#import "PcsxrPlugin.h"
#include "psxcommon.h"
#include "plugins.h"
@ -16,7 +16,7 @@
NSString *key = [self keyForSender:sender];
if (key) {
[[NSUserDefaults standardUserDefaults] setInteger:[sender intValue] forKey:key];
[PcsxController setConfigFromDefaults];
[PcsxrController setConfigFromDefaults];
}
}
@ -29,7 +29,7 @@
NSString *key = [self keyForSender:sender];
if (key) {
[[NSUserDefaults standardUserDefaults] setInteger:![sender intValue] forKey:key];
[PcsxController setConfigFromDefaults];
[PcsxrController setConfigFromDefaults];
}
}
@ -101,7 +101,7 @@
} else {
return;
}
[PcsxController setConfigFromDefaults];
[PcsxrController setConfigFromDefaults];
if ([sender pullsDown]) {
NSArray *items = [sender itemArray];
@ -148,7 +148,7 @@
}
// special cases
if (![PcsxController biosAvailable]) {
if (![PcsxrController biosAvailable]) {
// no bios means always use HLE
[usesHleCell setState:NSOnState];
[usesHleCell setEnabled:NO];

2
macosx/EmuThread.h
View file

@ -1,6 +1,6 @@
//
// EmuThread.h
// Pcsx
// Pcsxr
//
// Created by Gil Pedersen on Sun Sep 21 2003.
// Copyright (c) 2003 __MyCompanyName__. All rights reserved.

792
macosx/EmuThread.m
View file

@ -1,399 +1,399 @@
//
// EmuThread.m
// Pcsx
//
// Created by Gil Pedersen on Sun Sep 21 2003.
// Copyright (c) 2003 __MyCompanyName__. All rights reserved.
//
#import <ExceptionHandling/NSExceptionHandler.h>
#import <AppKit/NSApplication.h>
#include <pthread.h>
#include <setjmp.h>
#import "EmuThread.h"
#include "psxcommon.h"
#include "plugins.h"
#include "misc.h"
EmuThread *emuThread;
NSString *defrostPath = nil;
static int safeEvent;
static int paused;
static int runbios;
static pthread_cond_t eventCond;
static pthread_mutex_t eventMutex;
#define EMUEVENT_NONE 0
#define EMUEVENT_PAUSE (1<<0)
#define EMUEVENT_RESET (1<<1)
#define EMUEVENT_STOP (1<<2)
@implementation EmuThread
- (void)EmuThreadRun:(id)anObject
{
pool = [[NSAutoreleasePool alloc] init];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(emuWindowDidClose:)
name:@"emuWindowDidClose" object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(emuWindowWantPause:)
name:@"emuWindowWantPause" object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(emuWindowWantResume:)
name:@"emuWindowWantResume" object:nil];
// we shouldn't change the priority, since we might depend on subthreads
//[NSThread setThreadPriority:1.0-((1.0-[NSThread threadPriority])/4.0)];
// Do processing here
if (OpenPlugins() == -1)
goto done;
setjmp(restartJmp);
int res = CheckCdrom();
if (res == -1) {
ClosePlugins();
SysMessage(_("Could not check CD-ROM!\n"));
goto done;
}
//
// EmuThread.m
// Pcsxr
//
// Created by Gil Pedersen on Sun Sep 21 2003.
// Copyright (c) 2003 __MyCompanyName__. All rights reserved.
//
// Auto-detect: region first, then rcnt reset
#import <ExceptionHandling/NSExceptionHandler.h>
#import <AppKit/NSApplication.h>
#include <pthread.h>
#include <setjmp.h>
#import "EmuThread.h"
#include "psxcommon.h"
#include "plugins.h"
#include "misc.h"
EmuThread *emuThread;
NSString *defrostPath = nil;
static int safeEvent;
static int paused;
static int runbios;
static pthread_cond_t eventCond;
static pthread_mutex_t eventMutex;
#define EMUEVENT_NONE 0
#define EMUEVENT_PAUSE (1<<0)
#define EMUEVENT_RESET (1<<1)
#define EMUEVENT_STOP (1<<2)
@implementation EmuThread
- (void)EmuThreadRun:(id)anObject
{
pool = [[NSAutoreleasePool alloc] init];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(emuWindowDidClose:)
name:@"emuWindowDidClose" object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(emuWindowWantPause:)
name:@"emuWindowWantPause" object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(emuWindowWantResume:)
name:@"emuWindowWantResume" object:nil];
// we shouldn't change the priority, since we might depend on subthreads
//[NSThread setThreadPriority:1.0-((1.0-[NSThread threadPriority])/4.0)];
// Do processing here
if (OpenPlugins() == -1)
goto done;
setjmp(restartJmp);
int res = CheckCdrom();
if (res == -1) {
ClosePlugins();
SysMessage(_("Could not check CD-ROM!\n"));
goto done;
}
// Auto-detect: region first, then rcnt reset
EmuReset();
LoadCdrom();
if (defrostPath) {
LoadState([defrostPath fileSystemRepresentation]);
[defrostPath release]; defrostPath = nil;
}
psxCpu->Execute();
done:
[pool release]; pool = nil;
emuThread = nil;
return;
}
- (void)EmuThreadRunBios:(id)anObject
{
pool = [[NSAutoreleasePool alloc] init];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(emuWindowDidClose:)
name:@"emuWindowDidClose" object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(emuWindowWantPause:)
name:@"emuWindowWantPause" object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(emuWindowWantResume:)
name:@"emuWindowWantResume" object:nil];
// we shouldn't change the priority, since we might depend on subthreads
//[NSThread setThreadPriority:1.0-((1.0-[NSThread threadPriority])/4.0)];
// Do processing here
if (OpenPlugins() == -1)
goto done;
EmuReset();
psxCpu->Execute();
done:
[pool release]; pool = nil;
emuThread = nil;
return;
}
- (void)dealloc
{
// remove all registered observers
[[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:nil];
if (pool)
[pool release];
[super dealloc];
}
- (void)emuWindowDidClose:(NSNotification *)aNotification
{
[EmuThread stop];
}
- (void)emuWindowWantPause:(NSNotification *)aNotification
{
wasPaused = [EmuThread pause];
}
- (void)emuWindowWantResume:(NSNotification *)aNotification
{
if (!wasPaused) {
[EmuThread resume];
}
wasPaused = NO;
}
/* called periodically from the emulation thread */
- (void)handleEvents
{
/* only do a trylock here, since we're not interested in blocking,
and we can just handle events next time round */
if (pthread_mutex_trylock(&eventMutex) == 0) {
while (safeEvent) {
if (safeEvent & EMUEVENT_STOP) {
/* signify that the emulation has stopped */
[emuThread autorelease];
emuThread = nil;
paused = NO;
/* better unlock the mutex before killing ourself */
pthread_mutex_unlock(&eventMutex);
ClosePlugins();
SysClose();
//[[NSThread currentThread] autorelease];
[NSThread exit];
return;
}
if (safeEvent & EMUEVENT_RESET) {
#if 0
/* signify that the emulation has stopped */
[emuThread autorelease];
emuThread = nil;
/* better unlock the mutex before killing ourself */
pthread_mutex_unlock(&eventMutex);
ClosePlugins();
// start a new emulation thread
[EmuThread run];
//[[NSThread currentThread] autorelease];
[NSThread exit];
return;
#else
safeEvent &= ~EMUEVENT_RESET;
pthread_mutex_unlock(&eventMutex);
longjmp(restartJmp, 0);
#endif
}
if (safeEvent & EMUEVENT_PAUSE) {
paused = 2;
/* wait until we're signalled */
pthread_cond_wait(&eventCond, &eventMutex);
}
}
pthread_mutex_unlock(&eventMutex);
}
}
+ (void)run
{
int err;
if (emuThread) {
[EmuThread resume];
return;
}
if (pthread_mutex_lock(&eventMutex) != 0) {
err = pthread_cond_init(&eventCond, NULL);
if (err) return;
err = pthread_mutex_init(&eventMutex, NULL);
if (err) return;
pthread_mutex_lock(&eventMutex);
}
safeEvent = EMUEVENT_NONE;
paused = NO;
runbios = NO;
if (SysInit() != 0) {
pthread_mutex_unlock(&eventMutex);
return;
}
emuThread = [[EmuThread alloc] init];
[NSThread detachNewThreadSelector:@selector(EmuThreadRun:)
toTarget:emuThread withObject:nil];
pthread_mutex_unlock(&eventMutex);
}
+ (void)runBios
{
int err;
if (emuThread) {
[EmuThread resume];
return;
}
if (pthread_mutex_lock(&eventMutex) != 0) {
err = pthread_cond_init(&eventCond, NULL);
if (err) return;
err = pthread_mutex_init(&eventMutex, NULL);
if (err) return;
pthread_mutex_lock(&eventMutex);
}
safeEvent = EMUEVENT_NONE;
paused = NO;
runbios = YES;
if (SysInit() != 0) {
pthread_mutex_unlock(&eventMutex);
return;
}
emuThread = [[EmuThread alloc] init];
[NSThread detachNewThreadSelector:@selector(EmuThreadRunBios:)
toTarget:emuThread withObject:nil];
pthread_mutex_unlock(&eventMutex);
}
+ (void)stop
{
pthread_mutex_lock(&eventMutex);
safeEvent = EMUEVENT_STOP;
pthread_mutex_unlock(&eventMutex);
// wake it if it's sleeping
pthread_cond_broadcast(&eventCond);
}
+ (BOOL)pause
{
if (paused || ![EmuThread active])
return YES;
pthread_mutex_lock(&eventMutex);
safeEvent |= EMUEVENT_PAUSE;
paused = 1;
pthread_mutex_unlock(&eventMutex);
pthread_cond_broadcast(&eventCond);
return NO;
}
+ (BOOL)pauseSafe
{
if ((paused == 2) || ![EmuThread active])
return YES;
[EmuThread pause];
while ([EmuThread isPaused] != 2) [NSThread sleepUntilDate:[[NSDate date] addTimeInterval:0.05]];
return NO;
}
+ (void)resume
{
if (!paused || ![EmuThread active])
return;
pthread_mutex_lock(&eventMutex);
safeEvent &= ~EMUEVENT_PAUSE;
paused = NO;
pthread_mutex_unlock(&eventMutex);
pthread_cond_broadcast(&eventCond);
}
+ (void)reset
{
pthread_mutex_lock(&eventMutex);
safeEvent = EMUEVENT_RESET;
pthread_mutex_unlock(&eventMutex);
pthread_cond_broadcast(&eventCond);
}
// must only be called from within the emulation thread!!!
+ (void)resetNow
{
/* signify that the emulation has stopped */
[emuThread autorelease];
emuThread = nil;
ClosePlugins();
// start a new emulation thread
[EmuThread run];
//[[NSThread currentThread] autorelease];
[NSThread exit];
return;
}
+ (BOOL)isPaused
{
return paused;
}
+ (BOOL)isRunBios
{
return runbios;
}
+ (BOOL)active
{
return emuThread ? YES : NO;
}
+ (void)freezeAt:(NSString *)path which:(int)num
{
BOOL emuWasPaused = [EmuThread pauseSafe];
char Text[256];
GPU_freeze(2, (GPUFreeze_t *)&num);
int ret = SaveState([path fileSystemRepresentation]);
if (ret == 0) sprintf (Text, _("*PCSX*: Saved State %d"), num+1);
else sprintf (Text, _("*PCSX*: Error Saving State %d"), num+1);
GPU_displayText(Text);
if (!emuWasPaused) {
[EmuThread resume];
}
}
+ (BOOL)defrostAt:(NSString *)path
{
const char *cPath = [path fileSystemRepresentation];
if (CheckState(cPath) != 0)
return NO;
defrostPath = [path retain];
[EmuThread reset];
GPU_displayText(_("*PCSX*: Loaded State"));
return YES;
}
@end
LoadCdrom();
if (defrostPath) {
LoadState([defrostPath fileSystemRepresentation]);
[defrostPath release]; defrostPath = nil;
}
psxCpu->Execute();
done:
[pool release]; pool = nil;
emuThread = nil;
return;
}
- (void)EmuThreadRunBios:(id)anObject
{
pool = [[NSAutoreleasePool alloc] init];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(emuWindowDidClose:)
name:@"emuWindowDidClose" object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(emuWindowWantPause:)
name:@"emuWindowWantPause" object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(emuWindowWantResume:)
name:@"emuWindowWantResume" object:nil];
// we shouldn't change the priority, since we might depend on subthreads
//[NSThread setThreadPriority:1.0-((1.0-[NSThread threadPriority])/4.0)];
// Do processing here
if (OpenPlugins() == -1)
goto done;
EmuReset();
psxCpu->Execute();
done:
[pool release]; pool = nil;
emuThread = nil;
return;
}
- (void)dealloc
{
// remove all registered observers
[[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:nil];
if (pool)
[pool release];
[super dealloc];
}
- (void)emuWindowDidClose:(NSNotification *)aNotification
{
[EmuThread stop];
}
- (void)emuWindowWantPause:(NSNotification *)aNotification
{
wasPaused = [EmuThread pause];
}
- (void)emuWindowWantResume:(NSNotification *)aNotification
{
if (!wasPaused) {
[EmuThread resume];
}
wasPaused = NO;
}
/* called periodically from the emulation thread */
- (void)handleEvents
{
/* only do a trylock here, since we're not interested in blocking,
and we can just handle events next time round */
if (pthread_mutex_trylock(&eventMutex) == 0) {
while (safeEvent) {
if (safeEvent & EMUEVENT_STOP) {
/* signify that the emulation has stopped */
[emuThread autorelease];
emuThread = nil;
paused = NO;
/* better unlock the mutex before killing ourself */
pthread_mutex_unlock(&eventMutex);
ClosePlugins();
SysClose();
//[[NSThread currentThread] autorelease];
[NSThread exit];
return;
}
if (safeEvent & EMUEVENT_RESET) {
#if 0
/* signify that the emulation has stopped */
[emuThread autorelease];
emuThread = nil;
/* better unlock the mutex before killing ourself */
pthread_mutex_unlock(&eventMutex);
ClosePlugins();
// start a new emulation thread
[EmuThread run];
//[[NSThread currentThread] autorelease];
[NSThread exit];
return;
#else
safeEvent &= ~EMUEVENT_RESET;
pthread_mutex_unlock(&eventMutex);
longjmp(restartJmp, 0);
#endif
}
if (safeEvent & EMUEVENT_PAUSE) {
paused = 2;
/* wait until we're signalled */
pthread_cond_wait(&eventCond, &eventMutex);
}
}
pthread_mutex_unlock(&eventMutex);
}
}
+ (void)run
{
int err;
if (emuThread) {
[EmuThread resume];
return;
}
if (pthread_mutex_lock(&eventMutex) != 0) {
err = pthread_cond_init(&eventCond, NULL);
if (err) return;
err = pthread_mutex_init(&eventMutex, NULL);
if (err) return;
pthread_mutex_lock(&eventMutex);
}
safeEvent = EMUEVENT_NONE;
paused = NO;
runbios = NO;
if (SysInit() != 0) {
pthread_mutex_unlock(&eventMutex);
return;
}
emuThread = [[EmuThread alloc] init];
[NSThread detachNewThreadSelector:@selector(EmuThreadRun:)
toTarget:emuThread withObject:nil];
pthread_mutex_unlock(&eventMutex);
}
+ (void)runBios
{
int err;
if (emuThread) {
[EmuThread resume];
return;
}
if (pthread_mutex_lock(&eventMutex) != 0) {
err = pthread_cond_init(&eventCond, NULL);
if (err) return;
err = pthread_mutex_init(&eventMutex, NULL);
if (err) return;
pthread_mutex_lock(&eventMutex);
}
safeEvent = EMUEVENT_NONE;
paused = NO;
runbios = YES;
if (SysInit() != 0) {
pthread_mutex_unlock(&eventMutex);
return;
}
emuThread = [[EmuThread alloc] init];
[NSThread detachNewThreadSelector:@selector(EmuThreadRunBios:)
toTarget:emuThread withObject:nil];
pthread_mutex_unlock(&eventMutex);
}
+ (void)stop
{
pthread_mutex_lock(&eventMutex);
safeEvent = EMUEVENT_STOP;
pthread_mutex_unlock(&eventMutex);
// wake it if it's sleeping
pthread_cond_broadcast(&eventCond);
}
+ (BOOL)pause
{
if (paused || ![EmuThread active])
return YES;
pthread_mutex_lock(&eventMutex);
safeEvent |= EMUEVENT_PAUSE;
paused = 1;
pthread_mutex_unlock(&eventMutex);
pthread_cond_broadcast(&eventCond);
return NO;
}
+ (BOOL)pauseSafe
{
if ((paused == 2) || ![EmuThread active])
return YES;
[EmuThread pause];
while ([EmuThread isPaused] != 2) [NSThread sleepUntilDate:[[NSDate date] addTimeInterval:0.05]];
return NO;
}
+ (void)resume
{
if (!paused || ![EmuThread active])
return;
pthread_mutex_lock(&eventMutex);
safeEvent &= ~EMUEVENT_PAUSE;
paused = NO;
pthread_mutex_unlock(&eventMutex);
pthread_cond_broadcast(&eventCond);
}
+ (void)reset
{
pthread_mutex_lock(&eventMutex);
safeEvent = EMUEVENT_RESET;
pthread_mutex_unlock(&eventMutex);
pthread_cond_broadcast(&eventCond);
}
// must only be called from within the emulation thread!!!
+ (void)resetNow
{
/* signify that the emulation has stopped */
[emuThread autorelease];
emuThread = nil;
ClosePlugins();
// start a new emulation thread
[EmuThread run];
//[[NSThread currentThread] autorelease];
[NSThread exit];
return;
}
+ (BOOL)isPaused
{
return paused;
}
+ (BOOL)isRunBios
{
return runbios;
}
+ (BOOL)active
{
return emuThread ? YES : NO;
}
+ (void)freezeAt:(NSString *)path which:(int)num
{
BOOL emuWasPaused = [EmuThread pauseSafe];
char Text[256];
GPU_freeze(2, (GPUFreeze_t *)&num);
int ret = SaveState([path fileSystemRepresentation]);
if (ret == 0) sprintf (Text, _("*PCSXR*: Saved State %d"), num+1);
else sprintf (Text, _("*PCSXR*: Error Saving State %d"), num+1);
GPU_displayText(Text);
if (!emuWasPaused) {
[EmuThread resume];
}
}
+ (BOOL)defrostAt:(NSString *)path
{
const char *cPath = [path fileSystemRepresentation];
if (CheckState(cPath) != 0)
return NO;
defrostPath = [path retain];
[EmuThread reset];
GPU_displayText(_("*PCSXR*: Loaded State"));
return YES;
}
@end

2
macosx/English.lproj/AddPluginSheet.nib/classes.nib generated
View file

@ -3,7 +3,7 @@
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{
ACTIONS = {closeAddPluginSheet = id; };
CLASS = PcsxPluginDocument;
CLASS = PcsxrPluginDocument;
LANGUAGE = ObjC;
OUTLETS = {addPluginSheet = NSWindow; pluginName = NSTextField; };
SUPERCLASS = NSDocument;

4
macosx/English.lproj/InfoPlist.strings
View file

@ -1,6 +1,6 @@
/* Localized versions of Info.plist keys */
CFBundleName = "PCSX";
CFBundleName = "PCSXR";
CFBundleShortVersionString = "PCSX-Reloaded";
CFBundleGetInfoString = "Playstation Emulator based on PCSX-df Project.";
CFBundleGetInfoString = "PlayStation Emulator based on PCSX-df Project.";
NSHumanReadableCopyright = "Copyright (c) 2003-2005 PCSX Team, Gil Pedersen.\nCopyright (c) 2009-2010 PCSX-Reloaded Team.";

25
macosx/English.lproj/PCSX.nib/classes.nib generated
View file

@ -1,25 +0,0 @@
{
IBClasses = (
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{
ACTIONS = {
defrost = id;
ejectCD = id;
freeze = id;
fullscreen = id;
pause = id;
preferences = id;
reset = id;
runBios = id;
runCD = id;
runExe = id;
runIso = id;
};
CLASS = PcsxController;
LANGUAGE = ObjC;
OUTLETS = {memCardWindow = NSWindow; preferenceWindow = NSWindow; };
SUPERCLASS = NSObject;
}
);
IBVersion = 1;
}

21
macosx/English.lproj/PCSX.nib/info.nib generated
View file

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>442 353 492 320 0 0 1024 746 </string>
<key>IBEditorPositions</key>
<dict>
<key>29</key>
<string>134 613 219 44 0 0 1024 746 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
<integer>29</integer>
</array>
<key>IBSystem Version</key>
<string>8P2137</string>
</dict>
</plist>

BIN
macosx/English.lproj/PCSX.nib/objects.nib generated
View file

Binary file not shown.

20
macosx/Info.plist
View file

@ -24,7 +24,7 @@
<key>LSTypeIsPackage</key>
<true/>
<key>NSDocumentClass</key>
<string>PcsxPluginDocument</string>
<string>PcsxrPluginDocument</string>
</dict>
<dict>
<key>CFBundleTypeExtensions</key>
@ -50,9 +50,9 @@
<string>mcr</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>pcsxmemcard</string>
<string>pcsxrmemcard</string>
<key>CFBundleTypeName</key>
<string>PCSX Memory Card</string>
<string>PCSXR Memory Card</string>
<key>CFBundleTypeOSTypes</key>
<array>
<string>Pmcr</string>
@ -65,12 +65,12 @@
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>pcsxstate</string>
<string>pcsxrstate</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>pcsxfreeze</string>
<string>pcsxrfreeze</string>
<key>CFBundleTypeName</key>
<string>PCSX Freeze State</string>
<string>PCSXR Freeze State</string>
<key>CFBundleTypeOSTypes</key>
<array>
<string>Pfrz</string>
@ -84,23 +84,23 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key>
<string>PCSX.icns</string>
<string>PCSXR.icns</string>
<key>CFBundleIdentifier</key>
<string>com.codeplex.pcsxr</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>PCSX</string>
<string>PCSXR</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>PCSX-Reloaded SVN</string>
<key>CFBundleSignature</key>
<string>Pcsx</string>
<string>Pcsxr</string>
<key>CFBundleVersion</key>
<string>SVN</string>
<key>NSMainNibFile</key>
<string>PCSX</string>
<string>PCSXR</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
</dict>

976
macosx/Pcsx.xcodeproj/project.pbxproj
View file

@ -1,976 +0,0 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 42;
objects = {
/* Begin PBXBuildFile section */
2B143D06078A2CBD00AF745A /* PCSX.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D01078A2CBD00AF745A /* PCSX.icns */; };
2B143D07078A2CBD00AF745A /* pcsxfreeze.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D02078A2CBD00AF745A /* pcsxfreeze.icns */; };
2B143D08078A2CBD00AF745A /* pcsxmemcard.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D03078A2CBD00AF745A /* pcsxmemcard.icns */; };
2B143D09078A2CBD00AF745A /* psxbios.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D04078A2CBD00AF745A /* psxbios.icns */; };
2B143D0A078A2CBD00AF745A /* psxplugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D05078A2CBD00AF745A /* psxplugin.icns */; };
2B3E356D06937D1C00763C7D /* PcsxPluginDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B3E356B06937D1C00763C7D /* PcsxPluginDocument.m */; };
2B3E35BC069384D100763C7D /* AddPluginSheet.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2B3E35BA069384D100763C7D /* AddPluginSheet.nib */; };
2B400D910789F58A00BA271E /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B02C04304E145D000880C5B /* Carbon.framework */; };
2B4DE99205FF9307003EFEF0 /* PluginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B4DE98E05FF9307003EFEF0 /* PluginController.m */; };
2BB3D6A305427FE200831ACB /* Configuration.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2BA178B00514CE260026D74D /* Configuration.nib */; };
2BB3D6A405427FE200831ACB /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2BA178B20514CE260026D74D /* InfoPlist.strings */; };
2BB3D6A505427FE200831ACB /* PCSX.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2BA178B40514CE260026D74D /* PCSX.nib */; };
2BB3D6A705427FE200831ACB /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2BBB1786051E0D9700B84448 /* Credits.rtf */; };
2BB3D6BE05427FE200831ACB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BA178A505148D9D0026D74D /* main.m */; };
2BB3D6BF05427FE200831ACB /* PcsxController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B75FD3D051C56D200D12034 /* PcsxController.m */; };
2BB3D6C005427FE200831ACB /* ConfigurationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B75FD4B051C8A7400D12034 /* ConfigurationController.m */; };
2BB3D6C105427FE200831ACB /* PluginList.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BBB1127051DC00500B84448 /* PluginList.m */; };
2BB3D6C205427FE200831ACB /* EmuThread.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BBB1792051E113B00B84448 /* EmuThread.m */; };
2BB3D6C305427FE200831ACB /* Plugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BBB17DA051E4D0F00B84448 /* Plugin.c */; };
2BB3D6C405427FE200831ACB /* PcsxPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BA44361052DB2EA00E21DDD /* PcsxPlugin.m */; };
2BB3D6C605427FE200831ACB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BC4786204C7FD3600CAB520 /* Cocoa.framework */; };
2BB3D6C705427FE200831ACB /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B6E8AAE04C832040017A3B1 /* System.framework */; };
2BB3D6C805427FE200831ACB /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B6E8AB404C8327C0017A3B1 /* IOKit.framework */; };
556A148312B6DE1A007DE998 /* pasm.s in Sources */ = {isa = PBXBuildFile; fileRef = 556A147B12B6DE1A007DE998 /* pasm.s */; };
556A148412B6DE1A007DE998 /* ppc.c in Sources */ = {isa = PBXBuildFile; fileRef = 556A147D12B6DE1A007DE998 /* ppc.c */; };
556A148512B6DE1A007DE998 /* pR3000A.c in Sources */ = {isa = PBXBuildFile; fileRef = 556A148012B6DE1A007DE998 /* pR3000A.c */; };
556A148612B6DE1A007DE998 /* reguse.c in Sources */ = {isa = PBXBuildFile; fileRef = 556A148112B6DE1A007DE998 /* reguse.c */; };
559366CA12B694DF004ACC1E /* iR3000A-64.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C112B694DF004ACC1E /* iR3000A-64.c */; };
559366CB12B694DF004ACC1E /* ix86-64.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C212B694DF004ACC1E /* ix86-64.c */; };
559366CD12B694DF004ACC1E /* ix86_cpudetect.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C512B694DF004ACC1E /* ix86_cpudetect.c */; };
559366CE12B694DF004ACC1E /* ix86_fpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C612B694DF004ACC1E /* ix86_fpu.c */; };
559366CF12B694DF004ACC1E /* ix86_mmx.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C712B694DF004ACC1E /* ix86_mmx.c */; };
559366D012B694DF004ACC1E /* ix86_sse.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C812B694DF004ACC1E /* ix86_sse.c */; };
712FD1E81093096F00575A92 /* debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 712FD1E51093096F00575A92 /* debug.c */; };
712FD1E91093096F00575A92 /* socket.c in Sources */ = {isa = PBXBuildFile; fileRef = 712FD1E61093096F00575A92 /* socket.c */; };
713B530E110B75650002F164 /* ppf.c in Sources */ = {isa = PBXBuildFile; fileRef = 713B530C110B75650002F164 /* ppf.c */; };
713CB2E411FC49DA0033B6A8 /* DFCdrom.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71F93F6C11FB8E9D007A5A7C /* DFCdrom.psxplugin */; };
7192F42A129C412E0042D946 /* gpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 7192F428129C412E0042D946 /* gpu.c */; };
719594B211AEFE8C004AD686 /* psxcommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 719594B011AEFE8C004AD686 /* psxcommon.c */; };
71AD2DF410C3575300365243 /* PeopsSPU.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71AD2DD110C356FD00365243 /* PeopsSPU.psxplugin */; };
71AD2DF510C3575C00365243 /* PeopsSoftGL.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71AD2DDC10C3570900365243 /* PeopsSoftGL.psxplugin */; };
71D888D6130F04F100F150FF /* PeopsXGL.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71D888D4130F04DC00F150FF /* PeopsXGL.psxplugin */; };
71F2C0881200B6B000322AD9 /* DFInput.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71F2C0861200B69B00322AD9 /* DFInput.psxplugin */; };
71F4C5890FDED12800529849 /* cdriso.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5600FDED12800529849 /* cdriso.c */; };
71F4C58B0FDED12800529849 /* cdrom.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5620FDED12800529849 /* cdrom.c */; };
71F4C58D0FDED12800529849 /* cheat.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5640FDED12800529849 /* cheat.c */; };
71F4C5910FDED12800529849 /* decode_xa.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5680FDED12800529849 /* decode_xa.c */; };
71F4C5930FDED12800529849 /* disr3000a.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C56A0FDED12800529849 /* disr3000a.c */; };
71F4C5940FDED12800529849 /* gte.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C56B0FDED12800529849 /* gte.c */; };
71F4C5960FDED12800529849 /* mdec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C56D0FDED12800529849 /* mdec.c */; };
71F4C5980FDED12800529849 /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C56F0FDED12800529849 /* misc.c */; };
71F4C59A0FDED12800529849 /* plugins.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5710FDED12800529849 /* plugins.c */; };
71F4C59D0FDED12800529849 /* psxbios.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5740FDED12800529849 /* psxbios.c */; };
71F4C5A00FDED12800529849 /* psxcounters.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5770FDED12800529849 /* psxcounters.c */; };
71F4C5A20FDED12800529849 /* psxdma.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5790FDED12800529849 /* psxdma.c */; };
71F4C5A40FDED12800529849 /* psxhle.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C57B0FDED12800529849 /* psxhle.c */; };
71F4C5A60FDED12800529849 /* psxhw.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C57D0FDED12800529849 /* psxhw.c */; };
71F4C5A80FDED12800529849 /* psxinterpreter.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C57F0FDED12800529849 /* psxinterpreter.c */; };
71F4C5A90FDED12800529849 /* psxmem.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5800FDED12800529849 /* psxmem.c */; };
71F4C5AB0FDED12800529849 /* r3000a.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5820FDED12800529849 /* r3000a.c */; };
71F4C5AD0FDED12800529849 /* sio.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5840FDED12800529849 /* sio.c */; };
71F4C5AF0FDED12800529849 /* spu.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5860FDED12800529849 /* spu.c */; };
71F4C5B90FDED16D00529849 /* iR3000A.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5B50FDED16D00529849 /* iR3000A.c */; };
71F4C5BA0FDED16D00529849 /* ix86.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5B60FDED16D00529849 /* ix86.c */; };
/* End PBXBuildFile section */
/* Begin PBXBuildRule section */
2BB3D6D005427FE200831ACB /* PBXBuildRule */ = {
isa = PBXBuildRule;
compilerSpec = com.apple.compilers.gcc;
fileType = sourcecode.c;
isEditable = 1;
outputFiles = (
);
};
2BD707B705559AE300CB5D9B /* PBXBuildRule */ = {
isa = PBXBuildRule;
compilerSpec = com.apple.compilers.gcc;
filePatterns = pasm.s;
fileType = sourcecode.asm;
isEditable = 1;
outputFiles = (
"$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).o",
);
script = "as -o $(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).o $(INPUT_FILE_PATH)";
};
/* End PBXBuildRule section */
/* Begin PBXContainerItemProxy section */
713CB2DD11FC49720033B6A8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 71F93F6311FB8E9D007A5A7C /* DFCdrom.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 8D57630D048677EA00EA77CD;
remoteInfo = DFCdrom;
};
71AD2DD010C356FD00365243 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 71AD2DC710C356FD00365243 /* PeopsSPU.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 8D576316048677EA00EA77CD;
remoteInfo = PeopsSPU;
};
71AD2DDB10C3570900365243 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 71AD2DD210C3570900365243 /* PeopsSoftGPU.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 2BAF50930632BB1A00DB9A16;
remoteInfo = gpuPeopsSoftGL;
};
71AD2DE810C3572200365243 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 71AD2DC710C356FD00365243 /* PeopsSPU.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 8D57630D048677EA00EA77CD;
remoteInfo = PeopsSPU;
};
71AD2DEA10C3572500365243 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 71AD2DD210C3570900365243 /* PeopsSoftGPU.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 2BAF50920632BB1A00DB9A16;
remoteInfo = gpuPeopsSoftGL;
};
71D888D3130F04DC00F150FF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 71D888CE130F04DC00F150FF /* PeopsXGL.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 2BAF50930632BB1A00DB9A16;
remoteInfo = gpuPeopsXGL;
};
71D88A00130F090400F150FF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 71D888CE130F04DC00F150FF /* PeopsXGL.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 2BAF50920632BB1A00DB9A16;
remoteInfo = gpuPeopsXGL;
};
71F2C0851200B69B00322AD9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 71F2C07E1200B69B00322AD9 /* DFInput.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 8D576316048677EA00EA77CD;
remoteInfo = DFInput;
};
71F2C0BB1200B75100322AD9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 71F2C07E1200B69B00322AD9 /* DFInput.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 8D57630D048677EA00EA77CD;
remoteInfo = DFInput;
};
71F93F6B11FB8E9D007A5A7C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 71F93F6311FB8E9D007A5A7C /* DFCdrom.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 8D576316048677EA00EA77CD;
remoteInfo = DFCdrom;
};
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
71AD2DF010C3573400365243 /* Copy PlugIns */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 13;
files = (
71D888D6130F04F100F150FF /* PeopsXGL.psxplugin in Copy PlugIns */,
71F2C0881200B6B000322AD9 /* DFInput.psxplugin in Copy PlugIns */,
713CB2E411FC49DA0033B6A8 /* DFCdrom.psxplugin in Copy PlugIns */,
71AD2DF510C3575C00365243 /* PeopsSoftGL.psxplugin in Copy PlugIns */,
71AD2DF410C3575300365243 /* PeopsSPU.psxplugin in Copy PlugIns */,
);
name = "Copy PlugIns";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
2B02C04304E145D000880C5B /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
2B143D01078A2CBD00AF745A /* PCSX.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = PCSX.icns; sourceTree = "<group>"; };
2B143D02078A2CBD00AF745A /* pcsxfreeze.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = pcsxfreeze.icns; sourceTree = "<group>"; };
2B143D03078A2CBD00AF745A /* pcsxmemcard.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = pcsxmemcard.icns; sourceTree = "<group>"; };
2B143D04078A2CBD00AF745A /* psxbios.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = psxbios.icns; sourceTree = "<group>"; };
2B143D05078A2CBD00AF745A /* psxplugin.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = psxplugin.icns; sourceTree = "<group>"; };
2B2189D204D96C7A00179945 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
2B3E356A06937D1C00763C7D /* PcsxPluginDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxPluginDocument.h; sourceTree = "<group>"; };
2B3E356B06937D1C00763C7D /* PcsxPluginDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxPluginDocument.m; sourceTree = "<group>"; };
2B3E35BB069384D100763C7D /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = AddPluginSheet.nib; sourceTree = "<group>"; };
2B4DE98D05FF9307003EFEF0 /* PluginController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PluginController.h; sourceTree = "<group>"; };
2B4DE98E05FF9307003EFEF0 /* PluginController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PluginController.m; sourceTree = "<group>"; };
2B690C760635C65C00CDA575 /* ExceptionHandling.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ExceptionHandling.framework; path = /System/Library/Frameworks/ExceptionHandling.framework; sourceTree = "<absolute>"; };
2B6E8AAE04C832040017A3B1 /* System.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = System.framework; path = /System/Library/Frameworks/System.framework; sourceTree = "<absolute>"; };
2B6E8AB404C8327C0017A3B1 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
2B75FD3C051C56D200D12034 /* PcsxController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PcsxController.h; sourceTree = "<group>"; };
2B75FD3D051C56D200D12034 /* PcsxController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PcsxController.m; sourceTree = "<group>"; };
2B75FD4A051C8A7400D12034 /* ConfigurationController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ConfigurationController.h; sourceTree = "<group>"; };
2B75FD4B051C8A7400D12034 /* ConfigurationController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ConfigurationController.m; sourceTree = "<group>"; };
2B976C00074C14B4007C050A /* Kernel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kernel.framework; path = /System/Library/Frameworks/Kernel.framework; sourceTree = "<absolute>"; };
2BA178A505148D9D0026D74D /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
2BA178B10514CE260026D74D /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Configuration.nib; sourceTree = "<group>"; };
2BA178B30514CE260026D74D /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = InfoPlist.strings; sourceTree = "<group>"; };
2BA178B50514CE260026D74D /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = PCSX.nib; sourceTree = "<group>"; };
2BA44360052DB2EA00E21DDD /* PcsxPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxPlugin.h; sourceTree = "<group>"; };
2BA44361052DB2EA00E21DDD /* PcsxPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxPlugin.m; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
2BB3D6CF05427FE200831ACB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
2BB3D6D105427FE200831ACB /* PCSX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PCSX.app; sourceTree = BUILT_PRODUCTS_DIR; };
2BBB1126051DC00500B84448 /* PluginList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginList.h; sourceTree = "<group>"; };
2BBB1127051DC00500B84448 /* PluginList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PluginList.m; sourceTree = "<group>"; };
2BBB1787051E0D9700B84448 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = Credits.rtf; sourceTree = "<group>"; };
2BBB1791051E113B00B84448 /* EmuThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmuThread.h; sourceTree = "<group>"; };
2BBB1792051E113B00B84448 /* EmuThread.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EmuThread.m; sourceTree = "<group>"; };
2BBB17DA051E4D0F00B84448 /* Plugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = Plugin.c; sourceTree = SOURCE_ROOT; };
2BC4786204C7FD3600CAB520 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
556A147B12B6DE1A007DE998 /* pasm.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = pasm.s; sourceTree = "<group>"; };
556A147C12B6DE1A007DE998 /* pGte.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pGte.h; sourceTree = "<group>"; };
556A147D12B6DE1A007DE998 /* ppc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ppc.c; sourceTree = "<group>"; };
556A147E12B6DE1A007DE998 /* ppc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ppc.h; sourceTree = "<group>"; };
556A147F12B6DE1A007DE998 /* ppc_mnemonics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ppc_mnemonics.h; sourceTree = "<group>"; };
556A148012B6DE1A007DE998 /* pR3000A.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pR3000A.c; sourceTree = "<group>"; };
556A148112B6DE1A007DE998 /* reguse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = reguse.c; sourceTree = "<group>"; };
556A148212B6DE1A007DE998 /* reguse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = reguse.h; sourceTree = "<group>"; };
559366C012B694DF004ACC1E /* iGte.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iGte.h; sourceTree = "<group>"; };
559366C112B694DF004ACC1E /* iR3000A-64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "iR3000A-64.c"; sourceTree = "<group>"; };
559366C212B694DF004ACC1E /* ix86-64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "ix86-64.c"; sourceTree = "<group>"; };
559366C312B694DF004ACC1E /* ix86-64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ix86-64.h"; sourceTree = "<group>"; };
559366C412B694DF004ACC1E /* ix86_3dnow.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_3dnow.c; sourceTree = "<group>"; };
559366C512B694DF004ACC1E /* ix86_cpudetect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_cpudetect.c; sourceTree = "<group>"; };
559366C612B694DF004ACC1E /* ix86_fpu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_fpu.c; sourceTree = "<group>"; };
559366C712B694DF004ACC1E /* ix86_mmx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_mmx.c; sourceTree = "<group>"; };
559366C812B694DF004ACC1E /* ix86_sse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_sse.c; sourceTree = "<group>"; };
712FD1E51093096F00575A92 /* debug.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = debug.c; sourceTree = "<group>"; };
712FD1E61093096F00575A92 /* socket.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = socket.c; sourceTree = "<group>"; };
712FD1E71093096F00575A92 /* socket.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = socket.h; sourceTree = "<group>"; };
713B530C110B75650002F164 /* ppf.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = ppf.c; sourceTree = "<group>"; };
713B530D110B75650002F164 /* ppf.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = ppf.h; sourceTree = "<group>"; };
7161C2810FDED6D000225F97 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
7161C2970FDED75300225F97 /* ExtendedKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtendedKeys.h; sourceTree = "<group>"; };
7192F428129C412E0042D946 /* gpu.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = gpu.c; sourceTree = "<group>"; };
7192F429129C412E0042D946 /* gpu.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = gpu.h; sourceTree = "<group>"; };
719594AF11AEFE8C004AD686 /* gte_divider.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = gte_divider.h; sourceTree = "<group>"; };
719594B011AEFE8C004AD686 /* psxcommon.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = psxcommon.c; sourceTree = "<group>"; };
71AD2DC710C356FD00365243 /* PeopsSPU.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PeopsSPU.xcodeproj; path = plugins/DFSound/PeopsSPU.xcodeproj; sourceTree = SOURCE_ROOT; };
71AD2DD210C3570900365243 /* PeopsSoftGPU.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PeopsSoftGPU.xcodeproj; path = plugins/DFXVideo/PeopsSoftGPU.xcodeproj; sourceTree = SOURCE_ROOT; };
71D888CE130F04DC00F150FF /* PeopsXGL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PeopsXGL.xcodeproj; path = plugins/PeopsXgl/PeopsXGL.xcodeproj; sourceTree = "<group>"; };
71F2C07E1200B69B00322AD9 /* DFInput.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = DFInput.xcodeproj; path = plugins/DFInput/DFInput.xcodeproj; sourceTree = "<group>"; };
71F4C5600FDED12800529849 /* cdriso.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cdriso.c; sourceTree = "<group>"; };
71F4C5610FDED12800529849 /* cdriso.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cdriso.h; sourceTree = "<group>"; };
71F4C5620FDED12800529849 /* cdrom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cdrom.c; sourceTree = "<group>"; };
71F4C5630FDED12800529849 /* cdrom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cdrom.h; sourceTree = "<group>"; };
71F4C5640FDED12800529849 /* cheat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cheat.c; sourceTree = "<group>"; };
71F4C5650FDED12800529849 /* cheat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cheat.h; sourceTree = "<group>"; };
71F4C5660FDED12800529849 /* coff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coff.h; sourceTree = "<group>"; };
71F4C5670FDED12800529849 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
71F4C5680FDED12800529849 /* decode_xa.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = decode_xa.c; sourceTree = "<group>"; };
71F4C5690FDED12800529849 /* decode_xa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decode_xa.h; sourceTree = "<group>"; };
71F4C56A0FDED12800529849 /* disr3000a.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = disr3000a.c; sourceTree = "<group>"; };
71F4C56B0FDED12800529849 /* gte.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gte.c; sourceTree = "<group>"; };
71F4C56C0FDED12800529849 /* gte.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gte.h; sourceTree = "<group>"; };
71F4C56D0FDED12800529849 /* mdec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mdec.c; sourceTree = "<group>"; };
71F4C56E0FDED12800529849 /* mdec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mdec.h; sourceTree = "<group>"; };
71F4C56F0FDED12800529849 /* misc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = misc.c; sourceTree = "<group>"; };
71F4C5700FDED12800529849 /* misc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = misc.h; sourceTree = "<group>"; };
71F4C5710FDED12800529849 /* plugins.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = plugins.c; sourceTree = "<group>"; };
71F4C5720FDED12800529849 /* plugins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = plugins.h; sourceTree = "<group>"; };
71F4C5730FDED12800529849 /* psemu_plugin_defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psemu_plugin_defs.h; sourceTree = "<group>"; };
71F4C5740FDED12800529849 /* psxbios.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psxbios.c; sourceTree = "<group>"; };
71F4C5750FDED12800529849 /* psxbios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psxbios.h; sourceTree = "<group>"; };
71F4C5760FDED12800529849 /* psxcommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psxcommon.h; sourceTree = "<group>"; };
71F4C5770FDED12800529849 /* psxcounters.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psxcounters.c; sourceTree = "<group>"; };
71F4C5780FDED12800529849 /* psxcounters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psxcounters.h; sourceTree = "<group>"; };
71F4C5790FDED12800529849 /* psxdma.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psxdma.c; sourceTree = "<group>"; };
71F4C57A0FDED12800529849 /* psxdma.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psxdma.h; sourceTree = "<group>"; };
71F4C57B0FDED12800529849 /* psxhle.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psxhle.c; sourceTree = "<group>"; };
71F4C57C0FDED12800529849 /* psxhle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psxhle.h; sourceTree = "<group>"; };
71F4C57D0FDED12800529849 /* psxhw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psxhw.c; sourceTree = "<group>"; };
71F4C57E0FDED12800529849 /* psxhw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psxhw.h; sourceTree = "<group>"; };
71F4C57F0FDED12800529849 /* psxinterpreter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psxinterpreter.c; sourceTree = "<group>"; };
71F4C5800FDED12800529849 /* psxmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psxmem.c; sourceTree = "<group>"; };
71F4C5810FDED12800529849 /* psxmem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psxmem.h; sourceTree = "<group>"; };
71F4C5820FDED12800529849 /* r3000a.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = r3000a.c; sourceTree = "<group>"; };
71F4C5830FDED12800529849 /* r3000a.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = r3000a.h; sourceTree = "<group>"; };
71F4C5840FDED12800529849 /* sio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sio.c; sourceTree = "<group>"; };
71F4C5850FDED12800529849 /* sio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sio.h; sourceTree = "<group>"; };
71F4C5860FDED12800529849 /* spu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = spu.c; sourceTree = "<group>"; };
71F4C5870FDED12800529849 /* spu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = spu.h; sourceTree = "<group>"; };
71F4C5880FDED12800529849 /* system.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = system.h; sourceTree = "<group>"; };
71F4C5B40FDED16D00529849 /* iGte.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iGte.h; sourceTree = "<group>"; };
71F4C5B50FDED16D00529849 /* iR3000A.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = iR3000A.c; sourceTree = "<group>"; };
71F4C5B60FDED16D00529849 /* ix86.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86.c; sourceTree = "<group>"; };
71F4C5B70FDED16D00529849 /* ix86.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ix86.h; sourceTree = "<group>"; };
71F703A611B3A673007DD5C5 /* sjisfont.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = sjisfont.h; sourceTree = "<group>"; };
71F93F6311FB8E9D007A5A7C /* DFCdrom.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = DFCdrom.xcodeproj; path = plugins/DFCdrom/DFCdrom.xcodeproj; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
2BB3D6C505427FE200831ACB /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
2BB3D6C605427FE200831ACB /* Cocoa.framework in Frameworks */,
2BB3D6C705427FE200831ACB /* System.framework in Frameworks */,
2BB3D6C805427FE200831ACB /* IOKit.framework in Frameworks */,
2B400D910789F58A00BA271E /* Carbon.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
0249A662FF388D9811CA2CEA /* External Frameworks and Libraries */ = {
isa = PBXGroup;
children = (
2B976C00074C14B4007C050A /* Kernel.framework */,
2B02C04304E145D000880C5B /* Carbon.framework */,
2BC4786204C7FD3600CAB520 /* Cocoa.framework */,
2B6E8AAE04C832040017A3B1 /* System.framework */,
2B6E8AB404C8327C0017A3B1 /* IOKit.framework */,
2B2189D204D96C7A00179945 /* CoreFoundation.framework */,
2B690C760635C65C00CDA575 /* ExceptionHandling.framework */,
);
name = "External Frameworks and Libraries";
sourceTree = "<group>";
};
08FB7794FE84155DC02AAC07 /* Pcsx */ = {
isa = PBXGroup;
children = (
08FB7795FE84155DC02AAC07 /* Source */,
0249A662FF388D9811CA2CEA /* External Frameworks and Libraries */,
1AB674ADFE9D54B511CA2CBB /* Products */,
2BB3D6CF05427FE200831ACB /* Info.plist */,
);
name = Pcsx;
sourceTree = "<group>";
};
08FB7795FE84155DC02AAC07 /* Source */ = {
isa = PBXGroup;
children = (
2BCE23B204C6B52C007C2DA3 /* libpcsxcore */,
2BC4787804C7FDBD00CAB520 /* MacOSX */,
);
name = Source;
sourceTree = "<group>";
};
1AB674ADFE9D54B511CA2CBB /* Products */ = {
isa = PBXGroup;
children = (
2BBD6C1D04C893F500A83E33 /* PlugIns */,
2BB3D6D105427FE200831ACB /* PCSX.app */,
);
name = Products;
sourceTree = "<group>";
};
2B143D00078A2CBD00AF745A /* icons */ = {
isa = PBXGroup;
children = (
2B143D01078A2CBD00AF745A /* PCSX.icns */,
2B143D02078A2CBD00AF745A /* pcsxfreeze.icns */,
2B143D03078A2CBD00AF745A /* pcsxmemcard.icns */,
2B143D04078A2CBD00AF745A /* psxbios.icns */,
2B143D05078A2CBD00AF745A /* psxplugin.icns */,
);
path = icons;
sourceTree = "<group>";
};
2BA178AD0514CE260026D74D /* Resources */ = {
isa = PBXGroup;
children = (
2BBB1786051E0D9700B84448 /* Credits.rtf */,
2BA178B00514CE260026D74D /* Configuration.nib */,
2BA178B20514CE260026D74D /* InfoPlist.strings */,
2BA178B40514CE260026D74D /* PCSX.nib */,
2B3E35BA069384D100763C7D /* AddPluginSheet.nib */,
);
name = Resources;
path = English.lproj;
sourceTree = "<group>";
};
2BBD6C1D04C893F500A83E33 /* PlugIns */ = {
isa = PBXGroup;
children = (
71D888CE130F04DC00F150FF /* PeopsXGL.xcodeproj */,
71F2C07E1200B69B00322AD9 /* DFInput.xcodeproj */,
71F93F6311FB8E9D007A5A7C /* DFCdrom.xcodeproj */,
71AD2DD210C3570900365243 /* PeopsSoftGPU.xcodeproj */,
71AD2DC710C356FD00365243 /* PeopsSPU.xcodeproj */,
);
name = PlugIns;
sourceTree = "<group>";
};
2BC4787804C7FDBD00CAB520 /* MacOSX */ = {
isa = PBXGroup;
children = (
2BA178AD0514CE260026D74D /* Resources */,
2B143D00078A2CBD00AF745A /* icons */,
7161C2810FDED6D000225F97 /* config.h */,
2BA178A505148D9D0026D74D /* main.m */,
2BBB17DA051E4D0F00B84448 /* Plugin.c */,
2B75FD3C051C56D200D12034 /* PcsxController.h */,
2B75FD3D051C56D200D12034 /* PcsxController.m */,
2B75FD4A051C8A7400D12034 /* ConfigurationController.h */,
2B75FD4B051C8A7400D12034 /* ConfigurationController.m */,
2B4DE98D05FF9307003EFEF0 /* PluginController.h */,
2B4DE98E05FF9307003EFEF0 /* PluginController.m */,
2BBB1791051E113B00B84448 /* EmuThread.h */,
2BBB1792051E113B00B84448 /* EmuThread.m */,
7161C2970FDED75300225F97 /* ExtendedKeys.h */,
2BBB1126051DC00500B84448 /* PluginList.h */,
2BBB1127051DC00500B84448 /* PluginList.m */,
2BA44360052DB2EA00E21DDD /* PcsxPlugin.h */,
2BA44361052DB2EA00E21DDD /* PcsxPlugin.m */,
2B3E356A06937D1C00763C7D /* PcsxPluginDocument.h */,
2B3E356B06937D1C00763C7D /* PcsxPluginDocument.m */,
);
name = MacOSX;
sourceTree = "<group>";
};
2BCE23B204C6B52C007C2DA3 /* libpcsxcore */ = {
isa = PBXGroup;
children = (
71F4C5B30FDED15800529849 /* ix86 */,
559366BF12B694DF004ACC1E /* ix86_64 */,
556A147A12B6DE1A007DE998 /* ppc */,
71F4C5600FDED12800529849 /* cdriso.c */,
71F4C5610FDED12800529849 /* cdriso.h */,
71F4C5620FDED12800529849 /* cdrom.c */,
71F4C5630FDED12800529849 /* cdrom.h */,
71F4C5640FDED12800529849 /* cheat.c */,
71F4C5650FDED12800529849 /* cheat.h */,
71F4C5660FDED12800529849 /* coff.h */,
712FD1E51093096F00575A92 /* debug.c */,
71F4C5670FDED12800529849 /* debug.h */,
71F4C5680FDED12800529849 /* decode_xa.c */,
71F4C5690FDED12800529849 /* decode_xa.h */,
71F4C56A0FDED12800529849 /* disr3000a.c */,
7192F428129C412E0042D946 /* gpu.c */,
7192F429129C412E0042D946 /* gpu.h */,
71F4C56B0FDED12800529849 /* gte.c */,
71F4C56C0FDED12800529849 /* gte.h */,
719594AF11AEFE8C004AD686 /* gte_divider.h */,
71F4C56D0FDED12800529849 /* mdec.c */,
71F4C56E0FDED12800529849 /* mdec.h */,
71F4C56F0FDED12800529849 /* misc.c */,
71F4C5700FDED12800529849 /* misc.h */,
71F4C5710FDED12800529849 /* plugins.c */,
71F4C5720FDED12800529849 /* plugins.h */,
713B530C110B75650002F164 /* ppf.c */,
713B530D110B75650002F164 /* ppf.h */,
71F4C5730FDED12800529849 /* psemu_plugin_defs.h */,
71F4C5740FDED12800529849 /* psxbios.c */,
71F4C5750FDED12800529849 /* psxbios.h */,
719594B011AEFE8C004AD686 /* psxcommon.c */,
71F4C5760FDED12800529849 /* psxcommon.h */,
71F4C5770FDED12800529849 /* psxcounters.c */,
71F4C5780FDED12800529849 /* psxcounters.h */,
71F4C5790FDED12800529849 /* psxdma.c */,
71F4C57A0FDED12800529849 /* psxdma.h */,
71F4C57B0FDED12800529849 /* psxhle.c */,
71F4C57C0FDED12800529849 /* psxhle.h */,
71F4C57D0FDED12800529849 /* psxhw.c */,
71F4C57E0FDED12800529849 /* psxhw.h */,
71F4C57F0FDED12800529849 /* psxinterpreter.c */,
71F4C5800FDED12800529849 /* psxmem.c */,
71F4C5810FDED12800529849 /* psxmem.h */,
71F4C5820FDED12800529849 /* r3000a.c */,
71F4C5830FDED12800529849 /* r3000a.h */,
71F4C5840FDED12800529849 /* sio.c */,
71F4C5850FDED12800529849 /* sio.h */,
71F703A611B3A673007DD5C5 /* sjisfont.h */,
712FD1E61093096F00575A92 /* socket.c */,
712FD1E71093096F00575A92 /* socket.h */,
71F4C5860FDED12800529849 /* spu.c */,
71F4C5870FDED12800529849 /* spu.h */,
71F4C5880FDED12800529849 /* system.h */,
);
name = libpcsxcore;
path = ../libpcsxcore;
sourceTree = "<group>";
};
556A147A12B6DE1A007DE998 /* ppc */ = {
isa = PBXGroup;
children = (
556A147B12B6DE1A007DE998 /* pasm.s */,
556A147C12B6DE1A007DE998 /* pGte.h */,
556A147D12B6DE1A007DE998 /* ppc.c */,
556A147E12B6DE1A007DE998 /* ppc.h */,
556A147F12B6DE1A007DE998 /* ppc_mnemonics.h */,
556A148012B6DE1A007DE998 /* pR3000A.c */,
556A148112B6DE1A007DE998 /* reguse.c */,
556A148212B6DE1A007DE998 /* reguse.h */,
);
path = ppc;
sourceTree = "<group>";
};
559366BF12B694DF004ACC1E /* ix86_64 */ = {
isa = PBXGroup;
children = (
559366C012B694DF004ACC1E /* iGte.h */,
559366C112B694DF004ACC1E /* iR3000A-64.c */,
559366C212B694DF004ACC1E /* ix86-64.c */,
559366C312B694DF004ACC1E /* ix86-64.h */,
559366C412B694DF004ACC1E /* ix86_3dnow.c */,
559366C512B694DF004ACC1E /* ix86_cpudetect.c */,
559366C612B694DF004ACC1E /* ix86_fpu.c */,
559366C712B694DF004ACC1E /* ix86_mmx.c */,
559366C812B694DF004ACC1E /* ix86_sse.c */,
);
path = ix86_64;
sourceTree = "<group>";
};
71AD2DCD10C356FD00365243 /* Products */ = {
isa = PBXGroup;
children = (
71AD2DD110C356FD00365243 /* PeopsSPU.psxplugin */,
);
name = Products;
sourceTree = "<group>";
};
71AD2DD810C3570900365243 /* Products */ = {
isa = PBXGroup;
children = (
71AD2DDC10C3570900365243 /* PeopsSoftGL.psxplugin */,
);
name = Products;
sourceTree = "<group>";
};
71D888CF130F04DC00F150FF /* Products */ = {
isa = PBXGroup;
children = (
71D888D4130F04DC00F150FF /* PeopsXGL.psxplugin */,
);
name = Products;
sourceTree = "<group>";
};
71F2C07F1200B69B00322AD9 /* Products */ = {
isa = PBXGroup;
children = (
71F2C0861200B69B00322AD9 /* DFInput.psxplugin */,
);
name = Products;
sourceTree = "<group>";
};
71F4C5B30FDED15800529849 /* ix86 */ = {
isa = PBXGroup;
children = (
71F4C5B40FDED16D00529849 /* iGte.h */,
71F4C5B50FDED16D00529849 /* iR3000A.c */,
71F4C5B60FDED16D00529849 /* ix86.c */,
71F4C5B70FDED16D00529849 /* ix86.h */,
);
path = ix86;
sourceTree = "<group>";
};
71F93F6411FB8E9D007A5A7C /* Products */ = {
isa = PBXGroup;
children = (
71F93F6C11FB8E9D007A5A7C /* DFCdrom.psxplugin */,
);
name = Products;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
2BB3D68205427FE200831ACB /* PCSX */ = {
isa = PBXNativeTarget;
buildConfigurationList = 71F353F30FD98DFE00CBEC28 /* Build configuration list for PBXNativeTarget "PCSX" */;
buildPhases = (
2BB3D6A205427FE200831ACB /* Resources */,
2BB3D6A805427FE200831ACB /* Sources */,
2BB3D6C505427FE200831ACB /* Frameworks */,
71AD2DF010C3573400365243 /* Copy PlugIns */,
);
buildRules = (
2BD707B705559AE300CB5D9B /* PBXBuildRule */,
2BB3D6D005427FE200831ACB /* PBXBuildRule */,
);
dependencies = (
71AD2DE910C3572200365243 /* PBXTargetDependency */,
71AD2DEB10C3572500365243 /* PBXTargetDependency */,
713CB2DE11FC49720033B6A8 /* PBXTargetDependency */,
71F2C0BC1200B75100322AD9 /* PBXTargetDependency */,
71D88A01130F090400F150FF /* PBXTargetDependency */,
);
name = PCSX;
productInstallPath = "$(USER_APPS_DIR)";
productName = "Pcsx-MacOSX";
productReference = 2BB3D6D105427FE200831ACB /* PCSX.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
08FB7793FE84155DC02AAC07 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 71F353F80FD98DFE00CBEC28 /* Build configuration list for PBXProject "Pcsx" */;
compatibilityVersion = "Xcode 2.4";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
Japanese,
French,
German,
);
mainGroup = 08FB7794FE84155DC02AAC07 /* Pcsx */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 71F93F6411FB8E9D007A5A7C /* Products */;
ProjectRef = 71F93F6311FB8E9D007A5A7C /* DFCdrom.xcodeproj */;
},
{
ProductGroup = 71F2C07F1200B69B00322AD9 /* Products */;
ProjectRef = 71F2C07E1200B69B00322AD9 /* DFInput.xcodeproj */;
},
{
ProductGroup = 71AD2DD810C3570900365243 /* Products */;
ProjectRef = 71AD2DD210C3570900365243 /* PeopsSoftGPU.xcodeproj */;
},
{
ProductGroup = 71AD2DCD10C356FD00365243 /* Products */;
ProjectRef = 71AD2DC710C356FD00365243 /* PeopsSPU.xcodeproj */;
},
{
ProductGroup = 71D888CF130F04DC00F150FF /* Products */;
ProjectRef = 71D888CE130F04DC00F150FF /* PeopsXGL.xcodeproj */;
},
);
projectRoot = "";
targets = (
2BB3D68205427FE200831ACB /* PCSX */,
);
};
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
71AD2DD110C356FD00365243 /* PeopsSPU.psxplugin */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = PeopsSPU.psxplugin;
remoteRef = 71AD2DD010C356FD00365243 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
71AD2DDC10C3570900365243 /* PeopsSoftGL.psxplugin */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = PeopsSoftGL.psxplugin;
remoteRef = 71AD2DDB10C3570900365243 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
71D888D4130F04DC00F150FF /* PeopsXGL.psxplugin */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = PeopsXGL.psxplugin;
remoteRef = 71D888D3130F04DC00F150FF /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
71F2C0861200B69B00322AD9 /* DFInput.psxplugin */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = DFInput.psxplugin;
remoteRef = 71F2C0851200B69B00322AD9 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
71F93F6C11FB8E9D007A5A7C /* DFCdrom.psxplugin */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = DFCdrom.psxplugin;
remoteRef = 71F93F6B11FB8E9D007A5A7C /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */
2BB3D6A205427FE200831ACB /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
2BB3D6A305427FE200831ACB /* Configuration.nib in Resources */,
2BB3D6A405427FE200831ACB /* InfoPlist.strings in Resources */,
2BB3D6A505427FE200831ACB /* PCSX.nib in Resources */,
2BB3D6A705427FE200831ACB /* Credits.rtf in Resources */,
2B3E35BC069384D100763C7D /* AddPluginSheet.nib in Resources */,
2B143D06078A2CBD00AF745A /* PCSX.icns in Resources */,
2B143D07078A2CBD00AF745A /* pcsxfreeze.icns in Resources */,
2B143D08078A2CBD00AF745A /* pcsxmemcard.icns in Resources */,
2B143D09078A2CBD00AF745A /* psxbios.icns in Resources */,
2B143D0A078A2CBD00AF745A /* psxplugin.icns in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
2BB3D6A805427FE200831ACB /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
2BB3D6BE05427FE200831ACB /* main.m in Sources */,
2BB3D6BF05427FE200831ACB /* PcsxController.m in Sources */,
2BB3D6C005427FE200831ACB /* ConfigurationController.m in Sources */,
2BB3D6C105427FE200831ACB /* PluginList.m in Sources */,
2BB3D6C205427FE200831ACB /* EmuThread.m in Sources */,
2BB3D6C305427FE200831ACB /* Plugin.c in Sources */,
2BB3D6C405427FE200831ACB /* PcsxPlugin.m in Sources */,
2B4DE99205FF9307003EFEF0 /* PluginController.m in Sources */,
2B3E356D06937D1C00763C7D /* PcsxPluginDocument.m in Sources */,
71F4C5890FDED12800529849 /* cdriso.c in Sources */,
71F4C58B0FDED12800529849 /* cdrom.c in Sources */,
71F4C58D0FDED12800529849 /* cheat.c in Sources */,
71F4C5910FDED12800529849 /* decode_xa.c in Sources */,
71F4C5930FDED12800529849 /* disr3000a.c in Sources */,
71F4C5940FDED12800529849 /* gte.c in Sources */,
71F4C5960FDED12800529849 /* mdec.c in Sources */,
71F4C5980FDED12800529849 /* misc.c in Sources */,
71F4C59A0FDED12800529849 /* plugins.c in Sources */,
71F4C59D0FDED12800529849 /* psxbios.c in Sources */,
71F4C5A00FDED12800529849 /* psxcounters.c in Sources */,
71F4C5A20FDED12800529849 /* psxdma.c in Sources */,
71F4C5A40FDED12800529849 /* psxhle.c in Sources */,
71F4C5A60FDED12800529849 /* psxhw.c in Sources */,
71F4C5A80FDED12800529849 /* psxinterpreter.c in Sources */,
71F4C5A90FDED12800529849 /* psxmem.c in Sources */,
71F4C5AB0FDED12800529849 /* r3000a.c in Sources */,
71F4C5AD0FDED12800529849 /* sio.c in Sources */,
71F4C5AF0FDED12800529849 /* spu.c in Sources */,
71F4C5B90FDED16D00529849 /* iR3000A.c in Sources */,
71F4C5BA0FDED16D00529849 /* ix86.c in Sources */,
712FD1E81093096F00575A92 /* debug.c in Sources */,
712FD1E91093096F00575A92 /* socket.c in Sources */,
713B530E110B75650002F164 /* ppf.c in Sources */,
719594B211AEFE8C004AD686 /* psxcommon.c in Sources */,
7192F42A129C412E0042D946 /* gpu.c in Sources */,
559366CA12B694DF004ACC1E /* iR3000A-64.c in Sources */,
559366CB12B694DF004ACC1E /* ix86-64.c in Sources */,
559366CD12B694DF004ACC1E /* ix86_cpudetect.c in Sources */,
559366CE12B694DF004ACC1E /* ix86_fpu.c in Sources */,
559366CF12B694DF004ACC1E /* ix86_mmx.c in Sources */,
559366D012B694DF004ACC1E /* ix86_sse.c in Sources */,
556A148312B6DE1A007DE998 /* pasm.s in Sources */,
556A148412B6DE1A007DE998 /* ppc.c in Sources */,
556A148512B6DE1A007DE998 /* pR3000A.c in Sources */,
556A148612B6DE1A007DE998 /* reguse.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
713CB2DE11FC49720033B6A8 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = DFCdrom;
targetProxy = 713CB2DD11FC49720033B6A8 /* PBXContainerItemProxy */;
};
71AD2DE910C3572200365243 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = PeopsSPU;
targetProxy = 71AD2DE810C3572200365243 /* PBXContainerItemProxy */;
};
71AD2DEB10C3572500365243 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = gpuPeopsSoftGL;
targetProxy = 71AD2DEA10C3572500365243 /* PBXContainerItemProxy */;
};
71D88A01130F090400F150FF /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = gpuPeopsXGL;
targetProxy = 71D88A00130F090400F150FF /* PBXContainerItemProxy */;
};
71F2C0BC1200B75100322AD9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = DFInput;
targetProxy = 71F2C0BB1200B75100322AD9 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
2B3E35BA069384D100763C7D /* AddPluginSheet.nib */ = {
isa = PBXVariantGroup;
children = (
2B3E35BB069384D100763C7D /* English */,
);
name = AddPluginSheet.nib;
sourceTree = "<group>";
};
2BA178B00514CE260026D74D /* Configuration.nib */ = {
isa = PBXVariantGroup;
children = (
2BA178B10514CE260026D74D /* English */,
);
name = Configuration.nib;
sourceTree = "<group>";
};
2BA178B20514CE260026D74D /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
2BA178B30514CE260026D74D /* English */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
};
2BA178B40514CE260026D74D /* PCSX.nib */ = {
isa = PBXVariantGroup;
children = (
2BA178B50514CE260026D74D /* English */,
);
name = PCSX.nib;
sourceTree = "<group>";
};
2BBB1786051E0D9700B84448 /* Credits.rtf */ = {
isa = PBXVariantGroup;
children = (
2BBB1787051E0D9700B84448 /* English */,
);
name = Credits.rtf;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
71F353F40FD98DFE00CBEC28 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
DEBUGGING_SYMBOLS = YES;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_ASM_KEYWORD = YES;
GCC_ENABLE_CPP_EXCEPTIONS = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G3;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)",
__MACOSX__,
);
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "PCSX_VERSION=\\\"1.5\\\" XA_HACK=1";
GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
GCC_WARN_UNKNOWN_PRAGMAS = NO;
INFOPLIST_FILE = Info.plist;
OTHER_CFLAGS = (
"-fomit-frame-pointer",
"-funroll-loops",
"-falign-loops=16",
);
OTHER_REZFLAGS = "";
PRODUCT_NAME = PCSX;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wmost";
WRAPPER_EXTENSION = app;
ZERO_LINK = NO;
};
name = Development;
};
71F353F50FD98DFE00CBEC28 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUGGING_SYMBOLS = NO;
GCC_DYNAMIC_NO_PIC = YES;
GCC_ENABLE_ASM_KEYWORD = YES;
GCC_ENABLE_CPP_EXCEPTIONS = NO;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_CPU = "";
GCC_MODEL_TUNING = "";
GCC_OPTIMIZATION_LEVEL = s;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)",
__MACOSX__,
);
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "PCSX_VERSION=\\\"1.5\\\" XA_HACK=1";
GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
GCC_WARN_UNKNOWN_PRAGMAS = NO;
INFOPLIST_FILE = Info.plist;
OTHER_CFLAGS = (
"-fomit-frame-pointer",
"-funroll-loops",
"-falign-loops=16",
);
OTHER_REZFLAGS = "";
PRODUCT_NAME = PCSX;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wmost";
WRAPPER_EXTENSION = app;
ZERO_LINK = NO;
};
name = Deployment;
};
71F353F90FD98DFE00CBEC28 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
GCC_MODEL_TUNING = "";
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
HEADER_SEARCH_PATHS = (
../include,
../libpcsxcore,
../macosx,
);
MACOSX_DEPLOYMENT_TARGET = 10.4;
ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)";
OTHER_LDFLAGS = (
"-lz",
"-lSystemStubs",
);
SDKROOT = "";
};
name = Development;
};
71F353FA0FD98DFE00CBEC28 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = (
i386,
ppc,
);
ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
GCC_DYNAMIC_NO_PIC = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
GCC_MODEL_TUNING = "";
GCC_OPTIMIZATION_LEVEL = 2;
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_UNROLL_LOOPS = YES;
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
HEADER_SEARCH_PATHS = (
../include,
../libpcsxcore,
../macosx,
);
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "-fomit-frame-pointer";
OTHER_LDFLAGS = (
"-lz",
"-lSystemStubs",
);
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Deployment;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
71F353F30FD98DFE00CBEC28 /* Build configuration list for PBXNativeTarget "PCSX" */ = {
isa = XCConfigurationList;
buildConfigurations = (
71F353F40FD98DFE00CBEC28 /* Development */,
71F353F50FD98DFE00CBEC28 /* Deployment */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Development;
};
71F353F80FD98DFE00CBEC28 /* Build configuration list for PBXProject "Pcsx" */ = {
isa = XCConfigurationList;
buildConfigurations = (
71F353F90FD98DFE00CBEC28 /* Development */,
71F353FA0FD98DFE00CBEC28 /* Deployment */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Development;
};
/* End XCConfigurationList section */
};
rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
}

4
macosx/PcsxController.h → macosx/PcsxrController.h
View file

@ -1,10 +1,10 @@
/* PcsxController */
/* PcsxrController */
#import <Cocoa/Cocoa.h>
#import "EmuThread.h"
#import "PluginList.h"
@interface PcsxController : NSObject
@interface PcsxrController : NSObject
{
NSWindowController *preferencesController;
NSWindowController *memCardController;

38
macosx/PcsxController.m → macosx/PcsxrController.m
View file

@ -1,5 +1,5 @@
#import <Cocoa/Cocoa.h>
#import "PcsxController.h"
#import "PcsxrController.h"
#import "ConfigurationController.h"
#import "EmuThread.h"
#include "psxcommon.h"
@ -12,7 +12,7 @@ NSDictionary *prefByteKeys;
NSMutableArray *biosList;
NSString *saveStatePath;
@implementation PcsxController
@implementation PcsxrController
- (IBAction)ejectCD:(id)sender
{
@ -124,14 +124,14 @@ NSString *saveStatePath;
- (IBAction)freeze:(id)sender
{
int num = [sender tag];
NSString *path = [NSString stringWithFormat:@"%@/%s-%3.3d.pcsxstate", saveStatePath, CdromId, num];
NSString *path = [NSString stringWithFormat:@"%@/%s-%3.3d.pcsxrstate", saveStatePath, CdromId, num];
[EmuThread freezeAt:path which:num-1];
}
- (IBAction)defrost:(id)sender
{
NSString *path = [NSString stringWithFormat:@"%@/%s-%3.3d.pcsxstate", saveStatePath, CdromId, [sender tag]];
NSString *path = [NSString stringWithFormat:@"%@/%s-%3.3d.pcsxrstate", saveStatePath, CdromId, [sender tag]];
[EmuThread defrostAt:path];
}
@ -169,7 +169,7 @@ NSString *saveStatePath;
if (![EmuThread active] || [EmuThread isRunBios])
return NO;
NSString *path = [NSString stringWithFormat:@"%@/%s-%3.3d.pcsxstate", saveStatePath, CdromId, [menuItem tag]];
NSString *path = [NSString stringWithFormat:@"%@/%s-%3.3d.pcsxrstate", saveStatePath, CdromId, [menuItem tag]];
return (CheckState((char *)[path fileSystemRepresentation]) == 0);
}
@ -203,14 +203,14 @@ NSString *saveStatePath;
[self preferences:nil];
NSRunCriticalAlertPanel(NSLocalizedString(@"Missing plugins!", nil),
NSLocalizedString(@"Pcsx is missing one or more critical plugins. You will need to install these in order to play games.", nil),
NSLocalizedString(@"Pcsxr is missing one or more critical plugins. You will need to install these in order to play games.", nil),
nil, nil, nil);
}
if (![PcsxController biosAvailable]) {
if (![PcsxrController biosAvailable]) {
NSRunInformationalAlertPanel(NSLocalizedString(@"Missing BIOS!", nil),
NSLocalizedString(@"Pcsx wasn't able to locate any Playstation BIOS ROM files. This means that it will run in BIOS simulation mode which is less stable and compatible than using a real Playstation BIOS.\n"
@"If you have a BIOS available, please copy it to\n~/Library/Application Support/Pcsx/Bios/", nil),
NSLocalizedString(@"Pcsxr wasn't able to locate any Playstation BIOS ROM files. This means that it will run in BIOS simulation mode which is less stable and compatible than using a real Playstation BIOS.\n"
@"If you have a BIOS available, please copy it to\n~/Library/Application Support/Pcsxr/Bios/", nil),
nil, nil, nil);
}
@ -351,39 +351,39 @@ NSString *saveStatePath;
if (![dfm fileExistsAtPath:supportPath isDirectory:&dir])
[dfm createDirectoryAtPath:supportPath attributes:nil];
path = [NSString stringWithFormat:@"%@/Pcsx", supportPath];
path = [NSString stringWithFormat:@"%@/Pcsxr", supportPath];
if (![dfm fileExistsAtPath:path isDirectory:&dir])
[dfm createDirectoryAtPath:path attributes:nil];
path = [NSString stringWithFormat:@"%@/Pcsx/Bios", supportPath];
path = [NSString stringWithFormat:@"%@/Pcsxr/Bios", supportPath];
if (![dfm fileExistsAtPath:path isDirectory:&dir])
[dfm createDirectoryAtPath:path attributes:nil];
path = [NSString stringWithFormat:@"%@/Pcsx/Memory Cards", supportPath];
path = [NSString stringWithFormat:@"%@/Pcsxr/Memory Cards", supportPath];
if (![dfm fileExistsAtPath:path isDirectory:&dir])
[dfm createDirectoryAtPath:path attributes:nil];
path = [NSString stringWithFormat:@"%@/Pcsx/Patches", supportPath];
path = [NSString stringWithFormat:@"%@/Pcsxr/Patches", supportPath];
if (![dfm fileExistsAtPath:path isDirectory:&dir])
[dfm createDirectoryAtPath:path attributes:nil];
saveStatePath = [[NSString stringWithFormat:@"%@/Pcsx/Save States", supportPath] retain];
saveStatePath = [[NSString stringWithFormat:@"%@/Pcsxr/Save States", supportPath] retain];
if (![dfm fileExistsAtPath:saveStatePath isDirectory:&dir])
[dfm createDirectoryAtPath:saveStatePath attributes:nil];
path = [NSString stringWithFormat:@"%@/Pcsx/Memory Cards/Mcd001.mcr", supportPath];
path = [NSString stringWithFormat:@"%@/Pcsxr/Memory Cards/Mcd001.mcr", supportPath];
str = [path fileSystemRepresentation];
if (str != nil) strncpy(Config.Mcd1, str, 255);
path = [NSString stringWithFormat:@"%@/Pcsx/Memory Cards/Mcd002.mcr", supportPath];
path = [NSString stringWithFormat:@"%@/Pcsxr/Memory Cards/Mcd002.mcr", supportPath];
str = [path fileSystemRepresentation];
if (str != nil) strncpy(Config.Mcd2, str, 255);
path = [NSString stringWithFormat:@"%@/Pcsx/Bios/", supportPath];
path = [NSString stringWithFormat:@"%@/Pcsxr/Bios/", supportPath];
str = [path fileSystemRepresentation];
if (str != nil) strncpy(Config.BiosDir, str, 255);
path = [NSString stringWithFormat:@"%@/Pcsx/Patches/", supportPath];
path = [NSString stringWithFormat:@"%@/Pcsxr/Patches/", supportPath];
str = [path fileSystemRepresentation];
if (str != nil) strncpy(Config.PatchesDir, str, 255);
} else {
@ -418,7 +418,7 @@ NSString *saveStatePath;
}
}
[PcsxController setConfigFromDefaults];
[PcsxrController setConfigFromDefaults];
}

6
macosx/PcsxPlugin.h → macosx/PcsxrPlugin.h
View file

@ -1,6 +1,6 @@
//
// PcsxPlugin.h
// Pcsx
// PcsxrPlugin.h
// Pcsxr
//
// Created by Gil Pedersen on Fri Oct 03 2003.
// Copyright (c) 2003 __MyCompanyName__. All rights reserved.
@ -9,7 +9,7 @@
#import <Foundation/Foundation.h>
@interface PcsxPlugin : NSObject {
@interface PcsxrPlugin : NSObject {
CFBundleRef pluginRef;
NSString *path;

24
macosx/PcsxPlugin.m → macosx/PcsxrPlugin.m
View file

@ -1,17 +1,17 @@
//
// PcsxPlugin.m
// Pcsx
// PcsxrPlugin.m
// Pcsxr
//
// Created by Gil Pedersen on Fri Oct 03 2003.
// Copyright (c) 2003 __MyCompanyName__. All rights reserved.
//
#import <Cocoa/Cocoa.h>
#import "PcsxPlugin.h"
#import "PcsxrPlugin.h"
#include "psxcommon.h"
#include "plugins.h"
@implementation PcsxPlugin
@implementation PcsxrPlugin
+ (NSString *)getPrefixForType:(int)aType
{
@ -28,7 +28,7 @@
+ (NSString *)getDefaultKeyForType:(int)aType
{
//return @"Plugin" [PcsxPlugin getPrefixForType:aType];
//return @"Plugin" [PcsxrPlugin getPrefixForType:aType];
switch (aType) {
case PSE_LT_GPU: return @"PluginGPU";
case PSE_LT_CDR: return @"PluginCDR";
@ -173,7 +173,7 @@
return 0;
}
sprintf(symbol, "%sinit", [[PcsxPlugin getPrefixForType:aType] lossyCString]);
sprintf(symbol, "%sinit", [[PcsxrPlugin getPrefixForType:aType] lossyCString]);
init = initArg = SysLoadSym(pluginRef, symbol);
if (SysLibError() == nil) {
if (aType != PSE_LT_PAD)
@ -186,7 +186,7 @@
active |= aType;
} else {
NSRunCriticalAlertPanel(NSLocalizedString(@"Plugin Initialization Failed!", nil),
[NSString stringWithFormat:NSLocalizedString(@"Pcsx failed to initialize the selected %s plugin (error=%i).\nThe plugin might not work with your system.", nil), [PcsxPlugin getPrefixForType:aType], res],
[NSString stringWithFormat:NSLocalizedString(@"Pcsxr failed to initialize the selected %s plugin (error=%i).\nThe plugin might not work with your system.", nil), [PcsxrPlugin getPrefixForType:aType], res],
nil, nil, nil);
}
@ -198,7 +198,7 @@
char symbol[255];
long (*shutdown)(void);
sprintf(symbol, "%sshutdown", [[PcsxPlugin getPrefixForType:aType] lossyCString]);
sprintf(symbol, "%sshutdown", [[PcsxrPlugin getPrefixForType:aType] lossyCString]);
shutdown = SysLoadSym(pluginRef, symbol);
if (SysLibError() == nil) {
active &= ~aType;
@ -212,7 +212,7 @@
{
char symbol[255];
sprintf(symbol, "%sabout", [[PcsxPlugin getPrefixForType:aType] lossyCString]);
sprintf(symbol, "%sabout", [[PcsxrPlugin getPrefixForType:aType] lossyCString]);
SysLoadSym(pluginRef, symbol);
return (SysLibError() == nil);
@ -222,7 +222,7 @@
{
char symbol[255];
sprintf(symbol, "%sconfigure", [[PcsxPlugin getPrefixForType:aType] lossyCString]);
sprintf(symbol, "%sconfigure", [[PcsxrPlugin getPrefixForType:aType] lossyCString]);
SysLoadSym(pluginRef, symbol);
return (SysLibError() == nil);
@ -233,7 +233,7 @@
NSArray *arg;
char symbol[255];
sprintf(symbol, "%sabout", [[PcsxPlugin getPrefixForType:aType] lossyCString]);
sprintf(symbol, "%sabout", [[PcsxrPlugin getPrefixForType:aType] lossyCString]);
arg = [[NSArray alloc] initWithObjects:[NSString stringWithCString:symbol],
[NSNumber numberWithInt:0], nil];
@ -247,7 +247,7 @@
NSArray *arg;
char symbol[255];
sprintf(symbol, "%sconfigure", [[PcsxPlugin getPrefixForType:aType] lossyCString]);
sprintf(symbol, "%sconfigure", [[PcsxrPlugin getPrefixForType:aType] lossyCString]);
arg = [[NSArray alloc] initWithObjects:[NSString stringWithCString:symbol],
[NSNumber numberWithInt:1], nil];

6
macosx/PcsxPluginDocument.h → macosx/PcsxrPluginDocument.h
View file

@ -1,6 +1,6 @@
//
// PcsxPluginDocument.h
// Pcsx
// PcsxrPluginDocument.h
// Pcsxr
//
// Created by Gil Pedersen on Thu Jul 01 2004.
// Copyright (c) 2004 __MyCompanyName__. All rights reserved.
@ -9,7 +9,7 @@
#import <AppKit/AppKit.h>
@interface PcsxPluginDocument : NSDocument {
@interface PcsxrPluginDocument : NSDocument {
IBOutlet NSWindow *addPluginSheet;
IBOutlet NSTextField *pluginName;

10
macosx/PcsxPluginDocument.m → macosx/PcsxrPluginDocument.m
View file

@ -1,15 +1,15 @@
//
// PcsxPluginDocument.m
// Pcsx
// PcsxrPluginDocument.m
// Pcsxr
//
// Created by Gil Pedersen on Thu Jul 01 2004.
// Copyright (c) 2004 __MyCompanyName__. All rights reserved.
//
#import "PcsxPluginDocument.h"
#import "PcsxrPluginDocument.h"
@implementation PcsxPluginDocument
@implementation PcsxrPluginDocument
- (BOOL)showAddPluginSheet:(NSWindow *)window forName:(NSString *)name
// User has asked to see the custom display. Display it.
@ -79,7 +79,7 @@
- (NSString *)windowNibName {
// Implement this to return a nib to load OR implement -makeWindowControllers to manually create your controllers.
return @"PcsxPluginDocument";
return @"PcsxrPluginDocument";
}
- (NSData *)dataRepresentationOfType:(NSString *)type {

4
macosx/Plugin.c
View file

@ -1,4 +1,4 @@
/* Pcsx - Pc Psx Emulator
/* Pcsxr - Pc Psx Emulator
* Copyright (C) 1999-2002 Pcsx Team
*
* This program is free software; you can redistribute it and/or modify
@ -78,7 +78,7 @@ int _OpenPlugins() {
ret = SPU_open();
if (ret < 0) { SysMessage(_("Error Opening SPU Plugin")); return -1; }
SPU_registerCallback(SPUirq);
ret = GPU_open(&gpuDisp, "PCSX", NULL);
ret = GPU_open(&gpuDisp, "PCSXR", NULL);
if (ret < 0) { SysMessage(_("Error Opening GPU Plugin")); return -1; }
GPU_registerCallback(GPUbusy);
ret = PAD1_open(&gpuDisp);

12
macosx/PluginController.m
View file

@ -1,18 +1,18 @@
#import "PluginController.h"
#import "PcsxPlugin.h"
#import "PcsxController.h"
#import "PcsxrPlugin.h"
#import "PcsxrController.h"
@implementation PluginController
- (IBAction)doAbout:(id)sender
{
PcsxPlugin *plugin = [plugins objectAtIndex:[pluginMenu indexOfSelectedItem]];
PcsxrPlugin *plugin = [plugins objectAtIndex:[pluginMenu indexOfSelectedItem]];
[plugin aboutAs:pluginType];
}
- (IBAction)doConfigure:(id)sender
{
PcsxPlugin *plugin = [plugins objectAtIndex:[pluginMenu indexOfSelectedItem]];
PcsxrPlugin *plugin = [plugins objectAtIndex:[pluginMenu indexOfSelectedItem]];
[plugin configureAs:pluginType];
}
@ -22,7 +22,7 @@
if (sender==pluginMenu) {
int index = [pluginMenu indexOfSelectedItem];
if (index != -1) {
PcsxPlugin *plugin = [plugins objectAtIndex:index];
PcsxrPlugin *plugin = [plugins objectAtIndex:index];
if (![[PluginList list] setActivePlugin:plugin forType:pluginType]) {
/* plugin won't initialize */
@ -51,7 +51,7 @@
// remember the list
pluginType = type;
plugins = [list retain];
defaultKey = [[PcsxPlugin getDefaultKeyForType:pluginType] retain];
defaultKey = [[PcsxrPlugin getDefaultKeyForType:pluginType] retain];
// clear the previous menu items
[pluginMenu removeAllItems];

16
macosx/PluginList.h
View file

@ -1,13 +1,13 @@
//
// PluginList.h
// Pcsx
// Pcsxr
//
// Created by Gil Pedersen on Sun Sep 21 2003.
// Copyright (c) 2003 __MyCompanyName__. All rights reserved.
//
#import <Cocoa/Cocoa.h>
#import "PcsxPlugin.h"
#import "PcsxrPlugin.h"
//extern NSMutableArray *plugins;
@ -16,10 +16,10 @@
@private
NSMutableArray *pluginList;
PcsxPlugin *activeGpuPlugin;
PcsxPlugin *activeSpuPlugin;
PcsxPlugin *activeCdrPlugin;
PcsxPlugin *activePadPlugin;
PcsxrPlugin *activeGpuPlugin;
PcsxrPlugin *activeSpuPlugin;
PcsxrPlugin *activeCdrPlugin;
PcsxrPlugin *activePadPlugin;
BOOL missingPlugins;
}
@ -30,7 +30,7 @@
- (NSArray *)pluginsForType:(int)typeMask;
- (BOOL)hasPluginAtPath:(NSString *)path;
- (BOOL)configured;
- (PcsxPlugin *)activePluginForType:(int)type;
- (BOOL)setActivePlugin:(PcsxPlugin *)plugin forType:(int)type;
- (PcsxrPlugin *)activePluginForType:(int)type;
- (BOOL)setActivePlugin:(PcsxrPlugin *)plugin forType:(int)type;
@end

26
macosx/PluginList.m
View file

@ -1,6 +1,6 @@
//
// PluginList.m
// Pcsx
// Pcsxr
//
// Created by Gil Pedersen on Sun Sep 21 2003.
// Copyright (c) 2003 __MyCompanyName__. All rights reserved.
@ -8,7 +8,7 @@
#import "EmuThread.h"
#import "PluginList.h"
#import "PcsxPlugin.h"
#import "PcsxrPlugin.h"
#include "psxcommon.h"
#include "plugins.h"
@ -44,7 +44,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
[dirEnum skipDescendents]; /* don't enumerate this
directory */
PcsxPlugin *plugin = [[PcsxPlugin alloc] initWithPath:pname];
PcsxrPlugin *plugin = [[PcsxrPlugin alloc] initWithPath:pname];
if (plugin != nil) {
[plugins addObject:plugin];
}
@ -63,7 +63,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
type = typeMask;
for (i=0; i<[plugins count]; i++) {
PcsxPlugin *plugin = [plugins objectAtIndex:i];
PcsxrPlugin *plugin = [plugins objectAtIndex:i];
if ([plugin getType] == type) {
[list addObject:plugin];
}
@ -99,7 +99,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
missingPlugins = NO;
for (i=0; i<sizeof(*typeList); i++) {
NSString *path = [defaults stringForKey:[PcsxPlugin getDefaultKeyForType:typeList[i]]];
NSString *path = [defaults stringForKey:[PcsxrPlugin getDefaultKeyForType:typeList[i]]];
if (nil == path) {
missingPlugins = YES;
continue;
@ -108,7 +108,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
continue;
if (![self hasPluginAtPath:path]) {
PcsxPlugin *plugin = [[PcsxPlugin alloc] initWithPath:path];
PcsxrPlugin *plugin = [[PcsxrPlugin alloc] initWithPath:path];
if (plugin) {
[pluginList addObject:plugin];
if (![self setActivePlugin:plugin forType:typeList[i]])
@ -167,7 +167,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
directory */
if (![self hasPluginAtPath:pname]) {
PcsxPlugin *plugin = [[PcsxPlugin alloc] initWithPath:pname];
PcsxrPlugin *plugin = [[PcsxrPlugin alloc] initWithPath:pname];
if (plugin != nil) {
[pluginList addObject:plugin];
}
@ -178,7 +178,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
// check the we have the needed plugins
missingPlugins = NO;
for (i=0; i<sizeof(*typeList); i++) {
PcsxPlugin *plugin = [self activePluginForType:typeList[i]];
PcsxrPlugin *plugin = [self activePluginForType:typeList[i]];
if (nil == plugin) {
NSArray *list = [self pluginsForType:typeList[i]];
int j;
@ -199,7 +199,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
int i;
for (i=0; i<[pluginList count]; i++) {
PcsxPlugin *plugin = [pluginList objectAtIndex:i];
PcsxrPlugin *plugin = [pluginList objectAtIndex:i];
if ([plugin getType] & typeMask) {
[types addObject:plugin];
@ -241,7 +241,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
return !bad;
}
- (PcsxPlugin *)activePluginForType:(int)type
- (PcsxrPlugin *)activePluginForType:(int)type
{
switch (type) {
case PSE_LT_GPU: return activeGpuPlugin;
@ -254,9 +254,9 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
return nil;
}
- (BOOL)setActivePlugin:(PcsxPlugin *)plugin forType:(int)type
- (BOOL)setActivePlugin:(PcsxrPlugin *)plugin forType:(int)type
{
PcsxPlugin **pluginPtr;
PcsxrPlugin **pluginPtr;
switch (type) {
case PSE_LT_GPU: pluginPtr = &activeGpuPlugin; break;
case PSE_LT_CDR: pluginPtr = &activeCdrPlugin; break;
@ -303,7 +303,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
str = "Invalid Plugin";
}
char **dst = [PcsxPlugin getConfigEntriesForType:type];
char **dst = [PcsxrPlugin getConfigEntriesForType:type];
while (*dst) {
strncpy(*dst, str, 255);
dst++;

0
macosx/icons/PCSX.icns → macosx/icons/PCSXR.icns Normal file → Executable file
View file

0
macosx/icons/pcsxfreeze.icns → macosx/icons/pcsxrfreeze.icns Normal file → Executable file
View file

0
macosx/icons/pcsxmemcard.icns → macosx/icons/pcsxrmemcard.icns Normal file → Executable file
View file

2
macosx/plugins/DFCdrom/Info.plist
View file

@ -9,7 +9,7 @@
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
<string>net.pcsx.DFCdrom</string>
<string>net.pcsxr.DFCdrom</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>

2
macosx/plugins/DFCdrom/macsrc/PluginConfigController.m
View file

@ -22,7 +22,7 @@
#import "PluginConfigController.h"
#include "cdr.h"
#define APP_ID @"net.pcsx.DFCdrom"
#define APP_ID @"net.pcsxr.DFCdrom"
#define PrefsKey APP_ID @" Settings"
static PluginConfigController *windowController;

12
macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj
View file

@ -63,7 +63,7 @@
71D88862130F032700F150FF /* SDL_error_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 71D8882C130F032700F150FF /* SDL_error_c.h */; };
71E861B611FF75AC001C1826 /* PadView.h in Headers */ = {isa = PBXBuildFile; fileRef = 71E861AC11FF75AC001C1826 /* PadView.h */; };
71E861B711FF75AC001C1826 /* PadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71E861AD11FF75AC001C1826 /* PadView.m */; };
71E861BC11FF75BA001C1826 /* NetPcsxHIDInputPluginMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 71E861BA11FF75BA001C1826 /* NetPcsxHIDInputPluginMain.nib */; };
71E861BC11FF75BA001C1826 /* NetPcsxrHIDInputPluginMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 71E861BA11FF75BA001C1826 /* NetPcsxrHIDInputPluginMain.nib */; };
8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */; };
8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; };
/* End PBXBuildFile section */
@ -127,7 +127,7 @@
71E861AB11FF75AC001C1826 /* PadController.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = PadController.m; path = macsrc/PadController.m; sourceTree = "<group>"; };
71E861AC11FF75AC001C1826 /* PadView.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = PadView.h; path = macsrc/PadView.h; sourceTree = "<group>"; };
71E861AD11FF75AC001C1826 /* PadView.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = PadView.m; path = macsrc/PadView.m; sourceTree = "<group>"; };
71E861BB11FF75BA001C1826 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NetPcsxHIDInputPluginMain.nib; sourceTree = "<group>"; };
71E861BB11FF75BA001C1826 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NetPcsxrHIDInputPluginMain.nib; sourceTree = "<group>"; };
8D576316048677EA00EA77CD /* DFInput.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DFInput.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; };
8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
/* End PBXFileReference section */
@ -177,7 +177,7 @@
isa = PBXGroup;
children = (
7136F51812011BB4001973D9 /* Credits.rtf */,
71E861BA11FF75BA001C1826 /* NetPcsxHIDInputPluginMain.nib */,
71E861BA11FF75BA001C1826 /* NetPcsxrHIDInputPluginMain.nib */,
8D576317048677EA00EA77CD /* Info.plist */,
8D5B49A704867FD3000E48DA /* InfoPlist.strings */,
);
@ -431,7 +431,7 @@
buildActionMask = 2147483647;
files = (
8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */,
71E861BC11FF75BA001C1826 /* NetPcsxHIDInputPluginMain.nib in Resources */,
71E861BC11FF75BA001C1826 /* NetPcsxrHIDInputPluginMain.nib in Resources */,
7136F51A12011BB4001973D9 /* Credits.rtf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -487,12 +487,12 @@
name = Credits.rtf;
sourceTree = "<group>";
};
71E861BA11FF75BA001C1826 /* NetPcsxHIDInputPluginMain.nib */ = {
71E861BA11FF75BA001C1826 /* NetPcsxrHIDInputPluginMain.nib */ = {
isa = PBXVariantGroup;
children = (
71E861BB11FF75BA001C1826 /* English */,
);
name = NetPcsxHIDInputPluginMain.nib;
name = NetPcsxrHIDInputPluginMain.nib;
sourceTree = "<group>";
};
8D5B49A704867FD3000E48DA /* InfoPlist.strings */ = {

33
macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/classes.nib generated
View file

@ -1,33 +0,0 @@
{
IBClasses = (
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{
CLASS = NetPcsxHIDInputPluginMappingCell;
LANGUAGE = ObjC;
SUPERCLASS = NSTextFieldCell;
},
{
ACTIONS = {cancel = id; ok = id; setKey = id; };
CLASS = NetPcsxHIDInputPluginPadController;
LANGUAGE = ObjC;
OUTLETS = {
controllerView = NetPcsxHIDInputPluginPadView;
controllerView1 = id;
controllerView2 = id;
};
SUPERCLASS = NSWindowController;
},
{
ACTIONS = {setDevice = id; setType = id; };
CLASS = NetPcsxHIDInputPluginPadView;
LANGUAGE = ObjC;
OUTLETS = {
deviceMenu = NSPopUpButton;
tableView = NSTableView;
typeMenu = NSPopUpButton;
};
SUPERCLASS = NSView;
}
);
IBVersion = 1;
}

21
macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/info.nib generated
View file

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>54 67 576 240 0 0 1024 746 </string>
<key>IBEditorPositions</key>
<dict>
<key>16</key>
<string>293 323 437 378 0 0 1024 746 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
<integer>16</integer>
</array>
<key>IBSystem Version</key>
<string>8P2137</string>
</dict>
</plist>

BIN
macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/keyedobjects.nib generated
View file

Binary file not shown.

2
macosx/plugins/DFInput/macsrc/ControllerList.h
View file

@ -19,7 +19,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses>.
*/
#define ControllerList NetPcsxHIDInputPluginControllerList
#define ControllerList NetPcsxrHIDInputPluginControllerList
#import <Foundation/Foundation.h>
#import <AppKit/NSTableView.h>

2
macosx/plugins/DFInput/macsrc/MappingCell.h
View file

@ -19,7 +19,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses>.
*/
#define MappingCell NetPcsxHIDInputPluginMappingCell
#define MappingCell NetPcsxrHIDInputPluginMappingCell
#import <AppKit/AppKit.h>

2
macosx/plugins/DFInput/macsrc/PadController.h
View file

@ -19,7 +19,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses>.
*/
#define PadController NetPcsxHIDInputPluginPadController
#define PadController NetPcsxrHIDInputPluginPadController
#import <Cocoa/Cocoa.h>
#import "PadView.h"

4
macosx/plugins/DFInput/macsrc/PadController.m
View file

@ -26,7 +26,7 @@
static NSWindow *padWindow;
static PadController *padController;
#define APP_ID @"net.pcsx.DFInputPlugin"
#define APP_ID @"net.pcsxr.DFInputPlugin"
void DoAbout() {
// Get parent application instance
@ -63,7 +63,7 @@ long DoConfiguration() {
if (padWindow == nil) {
if (padController == nil) {
padController = [[PadController alloc] initWithWindowNibName:@"NetPcsxHIDInputPluginMain"];
padController = [[PadController alloc] initWithWindowNibName:@"NetPcsxrHIDInputPluginMain"];
}
padWindow = [padController window];
}

2
macosx/plugins/DFInput/macsrc/PadView.h
View file

@ -19,7 +19,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses>.
*/
#define PadView NetPcsxHIDInputPluginPadView
#define PadView NetPcsxrHIDInputPluginPadView
#import <Cocoa/Cocoa.h>
#import "ControllerList.h"

4
macosx/plugins/DFInput/macsrc/cfg.c
View file

@ -118,7 +118,7 @@ void LoadPADConfig() {
SetDefaultConfig();
sprintf(buf, "%s/Library/Preferences/net.pcsx.DFInput.plist", getenv("HOME"));
sprintf(buf, "%s/Library/Preferences/net.pcsxr.DFInput.plist", getenv("HOME"));
fp = fopen(buf, "r");
if (fp == NULL) {
@ -272,7 +272,7 @@ void SavePADConfig() {
int i;
char buf[256];
sprintf(buf, "%s/Library/Preferences/net.pcsx.DFInput.plist", getenv("HOME"));
sprintf(buf, "%s/Library/Preferences/net.pcsxr.DFInput.plist", getenv("HOME"));
fp = fopen(buf, "w");
if (fp == NULL) {

BIN
macosx/plugins/DFSound/English.lproj/InfoPlist.strings
View file

Binary file not shown.

12
macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
View file

@ -1,7 +1,7 @@
/* All the various stuff needed for configuration is done here,
including reading the Config file and displaying a dialog box
AboutDlgProc() is a plug-in function called from the PCSX app, as is
AboutDlgProc() is a plug-in function called from the PCSXR app, as is
DlgProc()
*/
@ -74,7 +74,7 @@ void PrepFactoryDefaultPreferences(void)
// THE place to find the names of settings.
// If it's not here, you can't set it.
// create or read a sub-dictionary beneath the main PCSX app prefs.
// create or read a sub-dictionary beneath the main PCSXR app prefs.
// dictionary is named "net.sf.GpuOpenGLPlugin Settings"
// and contains all our key/values
// the prefs .plist will store this dictionary ("net.sf...") as an object
@ -125,12 +125,12 @@ void PrepFactoryDefaultPreferences(void)
void ReadConfig(void)
{
// set up PCSX GPU plug's global variables according to user preferences.
// this is called from the PCSX GPU plugin thread via GPUOpen.
// set up PCSXR GPU plug's global variables according to user preferences.
// this is called from the PCSXR GPU plugin thread via GPUOpen.
// has nothing to do with the Configuration dialog box, btw., other than the
// fact that the config dialog writes to user prefs. This only reads, which
// is important because PCSX will change its globals on the fly
// is important because PCSXR will change its globals on the fly
// and saving those new ad hoc changes is Bad for the user.
PrepFactoryDefaultPreferences(); // in case user deletes, or on new startup
@ -139,7 +139,7 @@ void ReadConfig(void)
NSDictionary* keyValues = [[NSUserDefaults standardUserDefaults] dictionaryForKey:PrefsKey];
// bind all prefs settings to their PCSX counterparts
// bind all prefs settings to their PCSXR counterparts
// with a little finagling to make it work as expected
iShowFPS = [[keyValues objectForKey:@"FPS Counter"] boolValue];

4
macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h
View file

@ -1,7 +1,7 @@
/***************************************************************************
PluginWindowController.h
The big bad boy that controls/creates the game window, the openGLView, and
communicates with PCSX itself
communicates with PCSXR itself
PeopsOpenGPU
Created by Gil Pedersen on Mon April 11 2004.
@ -20,7 +20,7 @@
/*
In truth, this controller should be the ONLY place that glues between the
running PCSX gpu and the mac interface.
running PCSXR gpu and the mac interface.
ATM, some of the glue is here, some of it in drawgl.m, and a couple
of bits are in the config controller...
*/

2
macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m
View file

@ -1,7 +1,7 @@
/***************************************************************************
PluginWindowController.m
The big bad boy that controls/creates the game window, the openGLView, and
communicates with PCSX itself
communicates with PCSXR itself
PeopsOpenGPU

8
pixmaps/Makefile.am
View file

@ -1,7 +1,7 @@
pixmapdir = "$(datadir)/pcsx"
pixmap_DATA = pcsx.jpg
pixmapdir = "$(datadir)/pcsxr"
pixmap_DATA = pcsxr.jpg
icondir = "$(datadir)/pixmaps"
icon_DATA = pcsx-icon.png
icon_DATA = pcsxr-icon.png
EXTRA_DIST = pcsx.jpg pcsx-icon.png
EXTRA_DIST = pcsxr.jpg pcsxr-icon.png

0
pixmaps/pcsx-icon.png → pixmaps/pcsxr-icon.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
pixmaps/pcsx.jpg → pixmaps/pcsxr.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB

2
plugins/bladesio1/Makefile.am
View file

@ -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/\" \

6
plugins/dfcdrom/Makefile.am
View file

@ -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)

246
plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2 → plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui
View file

@ -1,76 +1,66 @@
<?xml version="1.0"?>
<glade-interface>
<!-- interface-requires gtk+ 2.6 -->
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkDialog" id="CfgWnd">
<object class="GtkDialog" id="CfgWnd">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">CDR configuration</property>
<property name="modal">True</property>
<property name="window_position">center</property>
<property name="type_hint">normal</property>
<property name="has_separator">False</property>
<signal name="show" handler="on_cfg_dialog_show"/>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1">
<object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<widget class="GtkVBox" id="vbox1">
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<widget class="GtkFrame" id="frame1">
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<child>
<widget class="GtkHBox" id="hbox5">
<object class="GtkHBox" id="hbox5">
<property name="visible">True</property>
<property name="border_width">10</property>
<child>
<widget class="GtkComboBoxEntry" id="cddev_comboboxentry">
<object class="GtkComboBoxEntry" id="cddev_comboboxentry">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Choose your CD-ROM device or type its path if it's not listed</property>
</widget>
<property name="tooltip_text" translatable="yes">Choose your CD-ROM device or type its path if it's not listed</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
</widget>
</object>
</child>
<child>
<widget class="GtkLabel" id="cdr_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Select CD-ROM device</property>
</widget>
<packing>
<property name="type">label_item</property>
</packing>
</child>
</widget>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkFrame" id="frame2">
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<child>
<widget class="GtkVBox" id="vbox2">
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<widget class="GtkHBox" id="hbox1">
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="border_width">5</property>
<child>
<widget class="GtkLabel" id="readmode_label">
<object class="GtkLabel" id="readmode_label">
<property name="visible">True</property>
<property name="xpad">5</property>
<property name="ypad">5</property>
<property name="label" translatable="yes">Select read mode:</property>
</widget>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@ -78,16 +68,21 @@
</packing>
</child>
<child>
<widget class="GtkComboBox" id="readmode_combobox">
<object class="GtkComboBox" id="readmode_combobox">
<property name="visible">True</property>
<property name="items" translatable="yes">Normal (No Cache)
Threaded - Faster (With Cache)</property>
</widget>
<property name="model">liststoreReadMode</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertextReadMode"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</widget>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@ -95,24 +90,24 @@ Threaded - Faster (With Cache)</property>
</packing>
</child>
<child>
<widget class="GtkHSeparator" id="hseparator1">
<object class="GtkHSeparator" id="hseparator1">
<property name="visible">True</property>
</widget>
</object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="hbox2">
<object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="spacing">5</property>
<child>
<widget class="GtkLabel" id="label4">
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="label" translatable="yes">Cache Size (Def. 64):</property>
</widget>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@ -120,13 +115,12 @@ Threaded - Faster (With Cache)</property>
</packing>
</child>
<child>
<widget class="GtkSpinButton" id="spinCacheSize">
<object class="GtkSpinButton" id="spinCacheSize">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">32 32 2048 1 16 0</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
</widget>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@ -134,30 +128,30 @@ Threaded - Faster (With Cache)</property>
<property name="position">1</property>
</packing>
</child>
</widget>
</object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child>
<widget class="GtkHSeparator" id="hseparator2">
<object class="GtkHSeparator" id="hseparator2">
<property name="visible">True</property>
</widget>
</object>
<packing>
<property name="expand">False</property>
<property name="position">3</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="hbox4">
<object class="GtkHBox" id="hbox4">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="spacing">5</property>
<child>
<widget class="GtkLabel" id="label7">
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="label" translatable="yes">Spindown Time:</property>
</widget>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@ -165,25 +159,16 @@ Threaded - Faster (With Cache)</property>
</packing>
</child>
<child>
<widget class="GtkComboBox" id="comboSpinDown">
<object class="GtkComboBox" id="comboSpinDown">
<property name="visible">True</property>
<property name="items" translatable="yes">Default
125ms
250ms
500ms
1s
2s
4s
8s
16s
32s
1min
2min
4min
8min
16min
32min</property>
</widget>
<property name="model">liststoreSpindownTime</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertextSpindownTime"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@ -191,30 +176,30 @@ Threaded - Faster (With Cache)</property>
<property name="position">1</property>
</packing>
</child>
</widget>
</object>
<packing>
<property name="position">4</property>
</packing>
</child>
<child>
<widget class="GtkHSeparator" id="hseparator3">
<object class="GtkHSeparator" id="hseparator3">
<property name="visible">True</property>
</widget>
</object>
<packing>
<property name="expand">False</property>
<property name="position">5</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="hbox3">
<object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="spacing">5</property>
<child>
<widget class="GtkLabel" id="label5">
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="label" translatable="yes">Cdrom Speed (Def. 0 = MAX):</property>
</widget>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@ -222,13 +207,12 @@ Threaded - Faster (With Cache)</property>
</packing>
</child>
<child>
<widget class="GtkSpinButton" id="spinCdrSpeed">
<object class="GtkSpinButton" id="spinCdrSpeed">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">0 0 100 1 4 0</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
</widget>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@ -236,25 +220,22 @@ Threaded - Faster (With Cache)</property>
<property name="position">1</property>
</packing>
</child>
</widget>
</object>
<packing>
<property name="position">6</property>
</packing>
</child>
<child>
<widget class="GtkHSeparator" id="cfg_hseparator">
<object class="GtkHSeparator" id="cfg_hseparator">
<property name="visible">True</property>
<accessibility>
<atkproperty name="AtkObject::accessible-name" translatable="yes">hseparator</atkproperty>
</accessibility>
</widget>
</object>
<packing>
<property name="expand">False</property>
<property name="position">7</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="subQ_button">
<object class="GtkCheckButton" id="subQ_button">
<property name="label" translatable="yes">Enable subchannel read</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@ -262,63 +243,126 @@ Threaded - Faster (With Cache)</property>
<property name="border_width">10</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">8</property>
</packing>
</child>
</widget>
</object>
</child>
<child>
<widget class="GtkLabel" id="options_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Options</property>
</widget>
<packing>
<property name="type">label_item</property>
</packing>
</child>
</widget>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</widget>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="cfg_dialog-action_area">
<object class="GtkHButtonBox" id="cfg_dialog-action_area">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="cfg_closebutton">
<object class="GtkButton" id="cfg_closebutton">
<property name="label">gtk-close</property>
<property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_cfg_cancelbutton_clicked"/>
</widget>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
</widget>
</object>
<packing>
<property name="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
</widget>
</object>
</child>
</widget>
</glade-interface>
<action-widgets>
<action-widget response="-6">cfg_closebutton</action-widget>
</action-widgets>
</object>
<object class="GtkListStore" id="liststoreReadMode">
<columns>
<!-- column-name Item -->
<column type="gchararray"/>
</columns>
<data>
<row>
<col id="0" translatable="yes">Normal (No Cache)</col>
</row>
<row>
<col id="0" translatable="yes">Threaded - Faster (With Cache)</col>
</row>
</data>
</object>
<object class="GtkListStore" id="liststoreSpindownTime">
<columns>
<!-- column-name Item -->
<column type="gchararray"/>
</columns>
<data>
<row>
<col id="0" translatable="yes">Default</col>
</row>
<row>
<col id="0" translatable="yes">125ms</col>
</row>
<row>
<col id="0" translatable="yes">250ms</col>
</row>
<row>
<col id="0" translatable="yes">500ms</col>
</row>
<row>
<col id="0" translatable="yes">1s</col>
</row>
<row>
<col id="0" translatable="yes">2s</col>
</row>
<row>
<col id="0" translatable="yes">4s</col>
</row>
<row>
<col id="0" translatable="yes">8s</col>
</row>
<row>
<col id="0" translatable="yes">16s</col>
</row>
<row>
<col id="0" translatable="yes">32s</col>
</row>
<row>
<col id="0" translatable="yes">1min</col>
</row>
<row>
<col id="0" translatable="yes">2min</col>
</row>
<row>
<col id="0" translatable="yes">4min</col>
</row>
<row>
<col id="0" translatable="yes">8min</col>
</row>
<row>
<col id="0" translatable="yes">16min</col>
</row>
<row>
<col id="0" translatable="yes">32min</col>
</row>
</data>
</object>
</interface>

56
plugins/dfcdrom/cdrcfg-0.1df/main.c
View file

@ -22,9 +22,9 @@
#include "../cfg.c"
#include <gtk/gtk.h>
#include <glade/glade.h>
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();

2
plugins/dfinput/Makefile.am
View file

@ -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)

2
plugins/dfinput/pad.c
View file

@ -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) {

2
plugins/dfnet/Makefile.am
View file

@ -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/\" \

8
plugins/dfsound/Makefile.am
View file

@ -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)

4
plugins/dfsound/pulseaudio.c
View file

@ -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);

233
plugins/dfsound/spucfg-0.1df/dfsound.glade2 → plugins/dfsound/spucfg-0.1df/dfsound.ui
View file

@ -1,8 +1,8 @@
<?xml version="1.0"?>
<glade-interface>
<!-- interface-requires gtk+ 2.8 -->
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy project-wide -->
<widget class="GtkWindow" id="CfgWnd">
<object class="GtkWindow" id="CfgWnd">
<property name="visible">True</property>
<property name="border_width">10</property>
<property name="title" translatable="yes">Configure Sound</property>
@ -12,23 +12,23 @@
<property name="type_hint">dialog</property>
<signal name="destroy" handler="on_CfgWnd_destroy"/>
<child>
<widget class="GtkVBox" id="vbox1">
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkFrame" id="frame1">
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<child>
<widget class="GtkAlignment" id="alignment4">
<object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<property name="right_padding">12</property>
<child>
<widget class="GtkTable" id="table1">
<object class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="n_rows">3</property>
@ -36,24 +36,24 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
<widget class="GtkLabel" id="label1v">
<object class="GtkLabel" id="label1v">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Volume:</property>
<property name="justify">right</property>
</widget>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label9">
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Interpolation:</property>
<property name="justify">right</property>
</widget>
</object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
@ -62,12 +62,12 @@
</packing>
</child>
<child>
<widget class="GtkLabel" id="label8">
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Reverb:</property>
<property name="justify">right</property>
</widget>
</object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
@ -76,14 +76,16 @@
</packing>
</child>
<child>
<widget class="GtkComboBox" id="cbVolume2">
<object class="GtkComboBox" id="cbVolume2">
<property name="visible">True</property>
<property name="items" translatable="yes">None
Low
Medium
Loud
Loudest</property>
</widget>
<property name="model">liststoreVolume</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertextVolume"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@ -91,12 +93,16 @@ Loudest</property>
</packing>
</child>
<child>
<widget class="GtkComboBox" id="cbReverb2">
<object class="GtkComboBox" id="cbReverb2">
<property name="visible">True</property>
<property name="items" translatable="yes">Off
Simple
Playstation</property>
</widget>
<property name="model">liststoreReverb</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertextReverb"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@ -107,13 +113,16 @@ Playstation</property>
</packing>
</child>
<child>
<widget class="GtkComboBox" id="cbInterpolation2">
<object class="GtkComboBox" id="cbInterpolation2">
<property name="visible">True</property>
<property name="items" translatable="yes">None
Simple
Gaussian
Cubic</property>
</widget>
<property name="model">liststoreInterpolation</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertextInterpolation"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@ -123,104 +132,84 @@ Cubic</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
</widget>
</object>
</child>
</widget>
</object>
</child>
<child>
<widget class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;General&lt;/b&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="type">label_item</property>
</packing>
</child>
</widget>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkFrame" id="frame2">
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<child>
<widget class="GtkAlignment" id="alignment2">
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<property name="right_padding">12</property>
<child>
<widget class="GtkVBox" id="vbox3">
<object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkCheckButton" id="chkXASpeed">
<object class="GtkCheckButton" id="chkXASpeed">
<property name="label" translatable="yes">Adjust XA speed</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip" translatable="yes">Choose this if XA music is played too quickly.</property>
<property name="tooltip_text" translatable="yes">Choose this if XA music is played too quickly.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
</widget>
</object>
</child>
</widget>
</object>
</child>
<child>
<widget class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;XA Music&lt;/b&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="type">label_item</property>
</packing>
</child>
</widget>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkFrame" id="frame3">
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<child>
<widget class="GtkAlignment" id="alignment3">
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<property name="right_padding">12</property>
<child>
<widget class="GtkVBox" id="vbox4">
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkCheckButton" id="chkHiCompat">
<object class="GtkCheckButton" id="chkHiCompat">
<property name="label" translatable="yes">High compatibility mode</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip" translatable="yes">Use the asynchronous SPU interface.</property>
<property name="tooltip_text" translatable="yes">Use the asynchronous SPU interface.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@ -228,15 +217,15 @@ Cubic</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="chkIRQWait">
<object class="GtkCheckButton" id="chkIRQWait">
<property name="label" translatable="yes">SPU IRQ Wait</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip" translatable="yes">Wait for CPU; only useful for some games.</property>
<property name="tooltip_text" translatable="yes">Wait for CPU; only useful for some games.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@ -244,15 +233,15 @@ Cubic</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="chkDisStereo">
<object class="GtkCheckButton" id="chkDisStereo">
<property name="label" translatable="yes">Single channel sound</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip" translatable="yes">Play only one channel for a performance boost.</property>
<property name="tooltip_text" translatable="yes">Play only one channel for a performance boost.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@ -260,62 +249,112 @@ Cubic</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="chkFreqResponse">
<object class="GtkCheckButton" id="chkFreqResponse">
<property name="label" translatable="yes">Frequency Response - Output Filter</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
</widget>
</object>
<packing>
<property name="position">3</property>
</packing>
</child>
</widget>
</object>
</child>
</widget>
</object>
</child>
<child>
<widget class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;Compatibility&lt;/b&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="type">label_item</property>
</packing>
</child>
</widget>
</object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child>
<widget class="GtkHButtonBox" id="hbuttonbox1">
<object class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="spacing">12</property>
<property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="btn_close">
<object class="GtkButton" id="btn_close">
<property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
</widget>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
</widget>
</object>
<packing>
<property name="position">3</property>
</packing>
</child>
</widget>
</object>
</child>
</widget>
</glade-interface>
</object>
<object class="GtkListStore" id="liststoreVolume">
<columns>
<!-- column-name Item -->
<column type="gchararray"/>
</columns>
<data>
<row>
<col id="0" translatable="yes">None</col>
</row>
<row>
<col id="0" translatable="yes">Low</col>
</row>
<row>
<col id="0" translatable="yes">Medium</col>
</row>
<row>
<col id="0" translatable="yes">Loud</col>
</row>
<row>
<col id="0" translatable="yes">Loudest</col>
</row>
</data>
</object>
<object class="GtkListStore" id="liststoreReverb">
<columns>
<!-- column-name Item -->
<column type="gchararray"/>
</columns>
<data>
<row>
<col id="0" translatable="yes">Off</col>
</row>
<row>
<col id="0" translatable="yes">Simple</col>
</row>
<row>
<col id="0" translatable="yes">Playstation</col>
</row>
</data>
</object>
<object class="GtkListStore" id="liststoreInterpolation">
<columns>
<!-- column-name Item -->
<column type="gchararray"/>
</columns>
<data>
<row>
<col id="0" translatable="yes">None</col>
</row>
<row>
<col id="0" translatable="yes">Simple</col>
</row>
<row>
<col id="0" translatable="yes">Gaussian</col>
</row>
<row>
<col id="0" translatable="yes">Cubic</col>
</row>
</data>
</object>
</interface>

64
plugins/dfsound/spucfg-0.1df/main.c
View file

@ -6,7 +6,6 @@
#include <string.h>
#include <sys/stat.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
#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);

4
plugins/dfxvideo/Makefile.am
View file

@ -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

6
plugins/dfxvideo/cfg.c
View file

@ -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);

8
plugins/dfxvideo/gpu.c
View file

@ -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");

4
plugins/dfxvideo/gpucfg-0.1df/main.c
View file

@ -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)
{

6
plugins/gxvideo/Makefile.am
View file

@ -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

6
plugins/gxvideo/cfg.c
View file

@ -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

4
plugins/gxvideo/gpu.c
View file

@ -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");

2
plugins/gxvideo/gpucfg/main.c
View file

@ -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),

10
plugins/peopsxgl/gpu.c
View file

@ -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);

8
po/POTFILES.in
View file

@ -1,4 +1,4 @@
[type: gettext/glade]data/pcsx.glade2
[type: gettext/glade]data/pcsxr.glade2
gui/AboutDlg.c
gui/AboutDlg.h
gui/Cheat.c
@ -39,7 +39,7 @@ libpcsxcore/sio.c
libpcsxcore/socket.c
libpcsxcore/spu.c
plugins/dfcdrom/cdr.c
[type: gettext/glade]plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2
[type: gettext/glade]plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui
plugins/dfcdrom/cdrcfg-0.1df/main.c
plugins/dfcdrom/cdr-linux.c
plugins/dfcdrom/cdr-null.c
@ -68,7 +68,7 @@ plugins/dfsound/pulseaudio.c
plugins/dfsound/registers.c
plugins/dfsound/reverb.c
plugins/dfsound/spu.c
[type: gettext/glade]plugins/dfsound/spucfg-0.1df/dfsound.glade2
[type: gettext/glade]plugins/dfsound/spucfg-0.1df/dfsound.ui
plugins/dfsound/xa.c
plugins/dfxvideo/cfg.c
plugins/dfxvideo/draw.c
@ -95,7 +95,7 @@ plugins/bladesio1/gui.c
plugins/bladesio1/settings.c
plugins/bladesio1/settings.h
plugins/bladesio1/sio1.c
[type: gettext/glade]plugins/bladesio1/sio1.glade2
[type: gettext/glade]plugins/bladesio1/sio1.ui
plugins/bladesio1/sio1.h
win32/gui/AboutDlg.c
win32/gui/CheatDlg.c

1106
po/fr_FR.po
View file

File diff suppressed because it is too large Load diff

1120
po/hu_HU.po
View file

File diff suppressed because it is too large Load diff

1156
po/it.po
View file

File diff suppressed because it is too large Load diff

930
po/pcsx.pot → po/pcsxr.pot
View file

File diff suppressed because it is too large Load diff

1100
po/pt_BR.po
View file

File diff suppressed because it is too large Load diff

1093
po/ru_RU.po
View file

File diff suppressed because it is too large Load diff

1367
po/zh_CN.po
View file

File diff suppressed because it is too large Load diff

1110
po/zh_TW.po
View file

File diff suppressed because it is too large Load diff

8
win32/gui/AboutDlg.c
View file

@ -23,7 +23,7 @@
#include "psxcommon.h"
char *LabelAuthors = { N_(
"PCSX - A PlayStation Emulator\n\n"
"PCSXR - A PlayStation Emulator\n\n"
"Original Authors:\n"
"main coder: linuzappz\n"
"co-coders: shadow\n"
@ -46,9 +46,9 @@ LRESULT WINAPI AboutDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
SetWindowText(hDlg, _("About"));
Button_SetText(GetDlgItem(hDlg, IDOK), _("OK"));
Static_SetText(GetDlgItem(hDlg, IDC_PCSX_ABOUT_TEXT), _("PCSX EMU\n"));
Static_SetText(GetDlgItem(hDlg, IDC_PCSX_ABOUT_AUTHORS), _(LabelAuthors));
Static_SetText(GetDlgItem(hDlg, IDC_PCSX_ABOUT_GREETS), _(LabelGreets));
Static_SetText(GetDlgItem(hDlg, IDC_PCSXR_ABOUT_TEXT), _("PCSXR EMU\n"));
Static_SetText(GetDlgItem(hDlg, IDC_PCSXR_ABOUT_AUTHORS), _(LabelAuthors));
Static_SetText(GetDlgItem(hDlg, IDC_PCSXR_ABOUT_GREETS), _(LabelGreets));
Button_SetText(GetDlgItem(hDlg,IDOK), _("OK"));
return TRUE;

4
win32/gui/CheatDlg.c
View file

@ -279,7 +279,7 @@ LRESULT WINAPI CheatDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
memset(&szFileTitle, 0, sizeof(szFileTitle));
memset(&szFilter, 0, sizeof(szFilter));
strcpy(szFilter, _("PCSX Cheat Code Files"));
strcpy(szFilter, _("PCSXR Cheat Code Files"));
strcatz(szFilter, "*.*");
ofn.lStructSize = sizeof(OPENFILENAME);
@ -308,7 +308,7 @@ LRESULT WINAPI CheatDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
memset(&szFileTitle, 0, sizeof(szFileTitle));
memset(&szFilter, 0, sizeof(szFilter));
strcpy(szFilter, _("PCSX Cheat Code Files"));
strcpy(szFilter, _("PCSXR Cheat Code Files"));
strcatz(szFilter, "*.*");
ofn.lStructSize = sizeof(OPENFILENAME);

2
win32/gui/Win32.h
View file

@ -35,7 +35,7 @@ extern int CancelQuit;
extern char cfgfile[256];
extern int Running;
extern boolean UseGui;
extern char PcsxDir[256];
extern char PcsxrDir[256];
void strcatz(char *dst, char *src);

38
win32/gui/WndMain.c
View file

@ -51,7 +51,7 @@ int CancelQuit = 0;
char cfgfile[256];
int Running = 0;
boolean UseGui = TRUE;
char PcsxDir[256];
char PcsxrDir[256];
static HDC hDC;
static HDC hdcmem;
@ -135,7 +135,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
char cdfile[MAXPATHLEN] = "", buf[4096];
int loadstatenum = -1;
strcpy(cfgfile, "Software\\Pcsx");
strcpy(cfgfile, "Software\\Pcsxr");
gApp.hInstance = hInstance;
@ -146,7 +146,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
Running = 0;
GetCurrentDirectory(256, PcsxDir);
GetCurrentDirectory(256, PcsxrDir);
memset(&Config, 0, sizeof(PcsxConfig));
strcpy(Config.Net, "Disabled");
@ -212,7 +212,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
Config.SlowBoot = TRUE;
} else if (strcmp(arg, "-help") == 0) {
MessageBox(gApp.hWnd, _(
"Usage: pcsx [options]\n"
"Usage: pcsxr [options]\n"
"\toptions:\n"
"\t-nogui\t\tDon't open the GUI\n"
"\t-psxout\t\tEnable PSX output\n"
@ -220,7 +220,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
"\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
"\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
"\t-help\t\tDisplay this message"),
"PCSX", 0);
"PCSXR", 0);
return 0;
}
@ -303,8 +303,8 @@ void States_Load(int num) {
ret = LoadState(Text);
if (ret == 0)
sprintf(Text, _("*PCSX*: Loaded State %d"), num+1);
else sprintf(Text, _("*PCSX*: Error Loading State %d"), num+1);
sprintf(Text, _("*PCSXR*: Loaded State %d"), num+1);
else sprintf(Text, _("*PCSXR*: Error Loading State %d"), num+1);
GPU_displayText(Text);
Running = 1;
@ -325,8 +325,8 @@ void States_Save(int num) {
GPU_freeze(2, (GPUFreeze_t *)&num);
ret = SaveState(Text);
if (ret == 0)
sprintf(Text, _("*PCSX*: Saved State %d"), num+1);
else sprintf(Text, _("*PCSX*: Error Saving State %d"), num+1);
sprintf(Text, _("*PCSXR*: Saved State %d"), num+1);
else sprintf(Text, _("*PCSXR*: Error Saving State %d"), num+1);
GPU_displayText(Text);
Running = 1;
@ -344,7 +344,7 @@ void OnStates_LoadOther() {
memset(&szFileTitle, 0, sizeof(szFileTitle));
memset(&szFilter, 0, sizeof(szFilter));
strcpy(szFilter, _("PCSX State Format"));
strcpy(szFilter, _("PCSXR State Format"));
strcatz(szFilter, "*.*");
ofn.lStructSize = sizeof(OPENFILENAME);
@ -371,8 +371,8 @@ void OnStates_LoadOther() {
ret = LoadState(szFileName);
if (ret == 0)
sprintf(Text, _("*PCSX*: Loaded State %s"), szFileName);
else sprintf(Text, _("*PCSX*: Error Loading State %s"), szFileName);
sprintf(Text, _("*PCSXR*: Loaded State %s"), szFileName);
else sprintf(Text, _("*PCSXR*: Error Loading State %s"), szFileName);
GPU_displayText(Text);
Running = 1;
@ -390,7 +390,7 @@ void OnStates_SaveOther() {
memset(&szFileTitle, 0, sizeof(szFileTitle));
memset(&szFilter, 0, sizeof(szFilter));
strcpy(szFilter, _("PCSX State Format"));
strcpy(szFilter, _("PCSXR State Format"));
strcatz(szFilter, "*.*");
ofn.lStructSize = sizeof(OPENFILENAME);
@ -417,8 +417,8 @@ void OnStates_SaveOther() {
ret = SaveState(szFileName);
if (ret == 0)
sprintf(Text, _("*PCSX*: Saved State %s"), szFileName);
else sprintf(Text, _("*PCSX*: Error Saving State %s"), szFileName);
sprintf(Text, _("*PCSXR*: Saved State %s"), szFileName);
else sprintf(Text, _("*PCSXR*: Error Saving State %s"), szFileName);
GPU_displayText(Text);
Running = 1;
@ -1729,7 +1729,7 @@ void CreateMainWindow(int nCmdShow) {
WNDCLASS wc;
HWND hWnd;
wc.lpszClassName = "PCSX Main";
wc.lpszClassName = "PCSXR Main";
wc.lpfnWndProc = MainWndProc;
wc.style = 0;
wc.hInstance = gApp.hInstance;
@ -1742,8 +1742,8 @@ void CreateMainWindow(int nCmdShow) {
RegisterClass(&wc);
hWnd = CreateWindow("PCSX Main",
"PCSX",
hWnd = CreateWindow("PCSXR Main",
"PCSXR",
WS_CAPTION | WS_POPUPWINDOW | WS_MINIMIZEBOX,
CW_USEDEFAULT,
0,
@ -1871,7 +1871,7 @@ void SysMessage(const char *fmt, ...) {
va_start(list,fmt);
vsprintf(tmp,fmt,list);
va_end(list);
MessageBox(0, tmp, _("Pcsx Msg"), 0);
MessageBox(0, tmp, _("Pcsxr Msg"), 0);
}
static char *err = N_("Error Loading Symbol");

0
win32/gui/pcsx.bmp → win32/gui/pcsxr.bmp
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 181 KiB

After

Width:  |  Height:  |  Size: 181 KiB

Some files were not shown because too many files have changed in this diff Show more