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

* Enable overclock feature in config file.

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

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"], [])

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

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

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

pixmaps/Makefile.am

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

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