ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed ini.c/.h in gtk sources and used GKeyFile from glib instead.

This commit is contained in:
yabause 2006-10-12 22:58:00 +00:00
parent ab7a815544
commit 2bb587f843
2 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/gtk/Makefile.am
View File

@ -1,4 +1,4 @@
bin_PROGRAMS = desmume bin_PROGRAMS = desmume
desmume_SOURCES = main.c desmume.c ini.c dToolsList.c tools/ioregsView.c desmume_SOURCES = main.c desmume.c dToolsList.c tools/ioregsView.c
desmume_LDADD = ../libdesmume.a $(GTK_LIBS) desmume_LDADD = ../libdesmume.a $(GTK_LIBS)
desmume_CFLAGS = $(GTK_CFLAGS) desmume_CFLAGS = $(GTK_CFLAGS)

48
desmume/src/gtk/main.c
View File

@ -12,7 +12,6 @@
#include "../debug.h" #include "../debug.h"
#include "desmume.h" #include "desmume.h"
#include "ini.h"
#include <string.h> #include <string.h>
#include <libgen.h> #include <libgen.h>
@ -45,22 +44,16 @@ const char *Ini_Keypad_Values[DESMUME_NB_KEYS] =
#define CONFIG_FILE "desmume.ini" #define CONFIG_FILE "desmume.ini"
ini_file_t *Config_INI;
int Write_ConfigFile() int Write_ConfigFile()
{ {
int i; int i;
char buffer[64]; GKeyFile * keyfile;
ini_file_t *ini;
ini = ini_blank_new(); keyfile = g_key_file_new();
ini_add_section(ini, "KEYS");
for(i = 0; i < DESMUME_NB_KEYS; i++) for(i = 0; i < DESMUME_NB_KEYS; i++)
{ {
sprintf(buffer, "%d", Keypad_Config[i]); g_key_file_set_integer(keyfile, "KEYS", Ini_Keypad_Values[i], Keypad_Config[i]);
ini_add_value(ini, "KEYS", Ini_Keypad_Values[i], buffer);
} }
// if(FirmwareFile[0]) // if(FirmwareFile[0])
@ -69,8 +62,9 @@ int Write_ConfigFile()
// ini_add_value(ini, "FIRMWARE", "FILE", FirmwareFile); // ini_add_value(ini, "FIRMWARE", "FILE", FirmwareFile);
// } // }
ini_write(ini, CONFIG_FILE); g_file_set_contents(CONFIG_FILE, g_key_file_to_data(keyfile, 0, 0), -1, 0);
ini_free_file(ini);
g_key_file_free(keyfile);
return 0; return 0;
} }
@ -78,29 +72,29 @@ int Write_ConfigFile()
void Load_DefaultConfig(); void Load_DefaultConfig();
int Read_ConfigFile() int Read_ConfigFile()
{ {
int i; int i, tmp;
ini_file_t *ini; GKeyFile * keyfile = g_key_file_new();
GError * error = NULL;
Load_DefaultConfig(); Load_DefaultConfig();
ini = ini_parse(CONFIG_FILE); g_key_file_load_from_file(keyfile, CONFIG_FILE, G_KEY_FILE_NONE, 0);
if(ini) const char *c;
for(i = 0; i < DESMUME_NB_KEYS; i++)
{ {
const char *c; tmp = g_key_file_get_integer(keyfile, "KEYS", Ini_Keypad_Values[i], &error);
if (error != NULL) {
for(i = 0; i < DESMUME_NB_KEYS; i++) g_error_free(error);
{ error = NULL;
c = ini_req_value(ini, "KEYS", Ini_Keypad_Values[i]); } else {
if(c && *c != '0' && *c != '\0') { Keypad_Config[i] = atoi(c); } Keypad_Config[i] = g_key_file_get_integer(keyfile, "KEYS", Ini_Keypad_Values[i], &error);
} }
// c = ini_req_value(ini, "FIRMWARE", "FILE");
// if(c && *c != '0' && *c != '\0') LoadFirmware(c);
ini_free_file(ini);
} }
g_key_file_free(keyfile);
return 0; return 0;
} }