* Move data and pixmaps folders inside gui folder to reflect codeplex branch.

* Enable overclock feature in config file.

32 files changed, 63 insertions, 27 deletions

diff --git a/Makefile.am b/Makefile.am
index 29a4af60..a13437a9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS =  data
+SUBDIRS =  gui/data
 SUBDIRS += doc
-SUBDIRS += pixmaps
+SUBDIRS += gui/data/pixmaps
 SUBDIRS += po
 SUBDIRS += libpcsxcore
 SUBDIRS += gui
diff --git a/configure.ac b/configure.ac
index 6f8166a6..ce160659 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_INIT([pcsxr], [1.9.95])
 AC_CONFIG_MACRO_DIRS([m4])
 AC_CANONICAL_HOST
 AC_CANONICAL_BUILD
-AM_INIT_AUTOMAKE(foreign)
+AM_INIT_AUTOMAKE(foreign subdir-objects)
 AM_MAINTAINER_MODE
 
 AC_CONFIG_HEADERS([include/config.h:include/config.h.in])
@@ -40,7 +40,7 @@ AC_SUBST(GTK3_CFLAGS)
 AC_SUBST(GTK3_LIBS)
 
 AC_CONFIG_FILES([Makefile
-data/Makefile
+gui/data/Makefile
 doc/Makefile
 libpcsxcore/Makefile
 gui/Makefile
@@ -51,7 +51,7 @@ plugins/dfxvideo/Makefile
 plugins/dfcdrom/Makefile
 plugins/dfnet/Makefile
 plugins/peopsxgl/Makefile
-pixmaps/Makefile
+gui/data/pixmaps/Makefile
 po/Makefile.in])
 
 AC_CHECK_LIB(dl, dlsym, [LIBS="$LIBS -ldl"], [])
diff --git a/gui/Config.c b/gui/Config.c
index 4988757d..16c29c9a 100755..100644
--- a/gui/Config.c
+++ b/gui/Config.c
@@ -62,6 +62,16 @@ static boolean GetValueb(char *src, char *name) {
 	return FALSE;
 }
 
+static long GetValuef(char *src, char *name) {
+    char *tmp = strstr(src, name);
+    if (tmp != NULL) {
+        tmp += strlen(name);
+        while ((*tmp == ' ') || (*tmp == '=')) tmp++;
+        if (*tmp != '\n') return atof(tmp);
+    }
+    return 0.0f;
+}
+
 #define SetValue(name, var) \
 	fprintf(f, "%s = %s\n", name, var);
 
@@ -71,6 +81,9 @@ static boolean GetValueb(char *src, char *name) {
 #define SetValueb(name, var) \
 	fprintf(f, "%s = %d\n", name, (var) ? 1 : 0);
 
+#define SetValuef(name, var) \
+    fprintf(f, "%s = %f\n", name, var);
+
 int LoadConfig(PcsxConfig *Conf) {
 	struct stat buf;
 	FILE *f;
@@ -148,7 +161,7 @@ int LoadConfig(PcsxConfig *Conf) {
 
 	Config.Cpu     = GetValuel(data, "Cpu");
 	Config.PsxType = GetValuel(data, "PsxType");
-    //GetValue(data, "PsxClock", &(Config.PsxClock));
+    Config.PsxClock = GetValuef(data, "PsxClock");
 
     Config.PGXP_GTE = GetValueb(data, "PGXP_GTE");
     Config.PGXP_Cache = GetValueb(data, "PGXP_Cache");
@@ -216,7 +229,7 @@ void SaveConfig() {
 
 	SetValuel("Cpu",     (long)Config.Cpu);
     SetValuel("PsxType", (long)Config.PsxType);
-    //SetValue("PsxClock", Config.PsxClock);
+    SetValuef("PsxClock", Config.PsxClock);
 
     SetValueb("PGXP_GTE", Config.PGXP_GTE);
     SetValueb("PGXP_Cache", Config.PGXP_Cache);
diff --git a/data/Makefile.am b/gui/data/Makefile.am
index 8f1ce6a2..8f1ce6a2 100644
--- a/data/Makefile.am
+++ b/gui/data/Makefile.am
diff --git a/data/pcsxr.desktop b/gui/data/pcsxr.desktop
index c284f003..c284f003 100644
--- a/data/pcsxr.desktop
+++ b/gui/data/pcsxr.desktop
diff --git a/data/pcsxr.ui b/gui/data/pcsxr.ui
index 23b7d449..2d8f2ddf 100644
--- a/data/pcsxr.ui
+++ b/gui/data/pcsxr.ui
@@ -4,16 +4,16 @@
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkIconFactory" id="iconfactory1">
     <sources>
-      <source stock-id="generated-icon-iso-open-png" filename="iso-open.png"/>
-      <source stock-id="generated-icon-pad-png" filename="pad.png"/>
-      <source stock-id="generated-icon-cdr-png" filename="cdr.png"/>
-      <source stock-id="generated-icon-gpu-png" filename="gpu.png"/>
-      <source stock-id="generated-icon-sio1-png" filename="sio1.png"/>
-      <source stock-id="generated-icon-memcard-png" filename="memcard.png"/>
-      <source stock-id="generated-icon-iso-reopen-png" filename="iso-reopen.png"/>
-      <source stock-id="generated-icon-spu-png" filename="spu.png"/>
-      <source stock-id="generated-icon-play-png" filename="play.png"/>
-      <source stock-id="generated-icon-cd-png" filename="cd.png"/>
+      <source stock-id="generated-icon-iso-open-png" filename="pcsxr-iso-open.png"/>
+      <source stock-id="generated-icon-pad-png" filename="pcsxr-plugin-pad.png"/>
+      <source stock-id="generated-icon-cdr-png" filename="pcsxr-plugin-cdr.png"/>
+      <source stock-id="generated-icon-gpu-png" filename="pcsxr-plugin-gpu.png"/>
+      <source stock-id="generated-icon-sio1-png" filename="pcsxr-plugin-sio1.png"/>
+      <source stock-id="generated-icon-memcard-png" filename="pcsxr-memcard.png"/>
+      <source stock-id="generated-icon-iso-reopen-png" filename="pcsxr-iso-reopen.png"/>
+      <source stock-id="generated-icon-spu-png" filename="pcsxr-plugin-spu.png"/>
+      <source stock-id="generated-icon-play-png" filename="pcsxr-play.png"/>
+      <source stock-id="generated-icon-cd-png" filename="pcsxr-cd-open.png"/>
     </sources>
   </object>
   <object class="GtkAboutDialog" id="AboutDlg">
diff --git a/gui/data/pixmaps/Makefile.am b/gui/data/pixmaps/Makefile.am
new file mode 100644
index 00000000..904ffe34
--- /dev/null
+++ b/gui/data/pixmaps/Makefile.am
@@ -0,0 +1,30 @@
+pixmapdir = "$(datadir)/pcsxr"
+pixmap_DATA = \
+    pcsxr-cd-open.png \
+    pcsxr-iso-open.png \
+    pcsxr-iso-reopen.png \
+    pcsxr-memcard.png \
+    pcsxr-play.png \
+    pcsxr-plugin-cdr.png \
+    pcsxr-plugin-gpu.png \
+    pcsxr-plugin-pad.png \
+    pcsxr-plugin-sio1.png \
+    pcsxr-plugin-spu.png \
+    pcsxr.png
+
+icondir = "$(datadir)/pixmaps"
+icon_DATA = pcsxr-icon.png
+
+EXTRA_DIST = \
+    pcsxr-cd-open.png \
+    pcsxr-iso-open.png \
+    pcsxr-iso-reopen.png \
+    pcsxr-memcard.png \
+    pcsxr-play.png \
+    pcsxr-plugin-cdr.png \
+    pcsxr-plugin-gpu.png \
+    pcsxr-plugin-pad.png \
+    pcsxr-plugin-sio1.png \
+    pcsxr-plugin-spu.png \
+    pcsxr.png \
+    pcsxr-icon.png
diff --git a/pixmaps/cd.png b/gui/data/pixmaps/pcsxr-cd-open.png
index 1f07c0e7..1f07c0e7 100755..100644
--- a/pixmaps/cd.png
+++ b/gui/data/pixmaps/pcsxr-cd-open.png
diff --git a/pixmaps/pcsxr-icon.png b/gui/data/pixmaps/pcsxr-icon.png
index 2cc9839f..2cc9839f 100755..100644
--- a/pixmaps/pcsxr-icon.png
+++ b/gui/data/pixmaps/pcsxr-icon.png
diff --git a/pixmaps/iso-open.png b/gui/data/pixmaps/pcsxr-iso-open.png
index 3daaea2a..3daaea2a 100755..100644
--- a/pixmaps/iso-open.png
+++ b/gui/data/pixmaps/pcsxr-iso-open.png
diff --git a/pixmaps/iso-reopen.png b/gui/data/pixmaps/pcsxr-iso-reopen.png
index 3294074a..3294074a 100755..100644
--- a/pixmaps/iso-reopen.png
+++ b/gui/data/pixmaps/pcsxr-iso-reopen.png
diff --git a/pixmaps/memcard.png b/gui/data/pixmaps/pcsxr-memcard.png
index 2b061b6d..2b061b6d 100755..100644
--- a/pixmaps/memcard.png
+++ b/gui/data/pixmaps/pcsxr-memcard.png
diff --git a/pixmaps/play.png b/gui/data/pixmaps/pcsxr-play.png
index ce003e4d..ce003e4d 100755..100644
--- a/pixmaps/play.png
+++ b/gui/data/pixmaps/pcsxr-play.png
diff --git a/pixmaps/cdr.png b/gui/data/pixmaps/pcsxr-plugin-cdr.png
index 72737547..72737547 100755..100644
--- a/pixmaps/cdr.png
+++ b/gui/data/pixmaps/pcsxr-plugin-cdr.png
diff --git a/pixmaps/gpu.png b/gui/data/pixmaps/pcsxr-plugin-gpu.png
index e49595f3..e49595f3 100755..100644
--- a/pixmaps/gpu.png
+++ b/gui/data/pixmaps/pcsxr-plugin-gpu.png
diff --git a/pixmaps/pad.png b/gui/data/pixmaps/pcsxr-plugin-pad.png
index 186e7be8..186e7be8 100755..100644
--- a/pixmaps/pad.png
+++ b/gui/data/pixmaps/pcsxr-plugin-pad.png
diff --git a/pixmaps/sio1.png b/gui/data/pixmaps/pcsxr-plugin-sio1.png
index e9340ade..e9340ade 100644
--- a/pixmaps/sio1.png
+++ b/gui/data/pixmaps/pcsxr-plugin-sio1.png
diff --git a/pixmaps/spu.png b/gui/data/pixmaps/pcsxr-plugin-spu.png
index 53c9ac51..53c9ac51 100755..100644
--- a/pixmaps/spu.png
+++ b/gui/data/pixmaps/pcsxr-plugin-spu.png
diff --git a/pixmaps/pcsxr.png b/gui/data/pixmaps/pcsxr.png
index 8dc59052..8dc59052 100755..100644
--- a/pixmaps/pcsxr.png
+++ b/gui/data/pixmaps/pcsxr.png
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
deleted file mode 100644
index e77fda4e..00000000
--- a/pixmaps/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-pixmapdir = "$(datadir)/pcsxr"
-pixmap_DATA = pcsxr.png iso-open.png iso-reopen.png cd.png cdr.png gpu.png memcard.png pad.png play.png sio1.png spu.png
-
-icondir = "$(datadir)/pixmaps"
-icon_DATA = pcsxr-icon.png
-
-EXTRA_DIST = pcsxr.png iso-open.png iso-reopen.png cd.png cdr.png gpu.png memcard.png pad.png play.png sio1.png spu.png pcsxr-icon.png
diff --git a/po/LINGUAS b/po/LINGUAS
index f9b86bf6..0f5e43ec 100755..100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,9 +1,9 @@
 zh_CN
 zh_TW
 pt_BR
-ru_RU
+ru
 it
-fr_FR
-hu_HU
+fr
+hu
 ko_KR
 es
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 3d02752c..3d02752c 100755..100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
diff --git a/po/Makevars b/po/Makevars
index 7d3f81b4..7d3f81b4 100755..100644
--- a/po/Makevars
+++ b/po/Makevars
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 953ed3b5..953ed3b5 100755..100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
diff --git a/po/fr_FR.po b/po/fr.po
index 50025af0..50025af0 100755..100644
--- a/po/fr_FR.po
+++ b/po/fr.po
diff --git a/po/hu_HU.po b/po/hu.po
index 3f9f8832..3f9f8832 100755..100644
--- a/po/hu_HU.po
+++ b/po/hu.po
diff --git a/po/it.po b/po/it.po
index a4b65c50..a4b65c50 100755..100644
--- a/po/it.po
+++ b/po/it.po
diff --git a/po/pcsxr.pot b/po/pcsxr.pot
index 9c31b34b..9c31b34b 100755..100644
--- a/po/pcsxr.pot
+++ b/po/pcsxr.pot
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2a12c5b7..2a12c5b7 100755..100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
diff --git a/po/ru_RU.po b/po/ru.po
index 5120c6f6..5120c6f6 100755..100644
--- a/po/ru_RU.po
+++ b/po/ru.po
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8835751a..8835751a 100755..100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1380fd88..1380fd88 100755..100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po