More order with log_quiet and ifdef GEKKO

This commit is contained in:
fabio.olimpieri 2014-01-27 11:02:36 +00:00
parent b3056e1671
commit ee727e3dfb
5 changed files with 12 additions and 17 deletions

View File

@ -884,9 +884,10 @@ static int cfgfile_parse_host (struct uae_prefs *p, char *option, char *value)
if (p->gfx_correct_ratio > 100) p->gfx_correct_ratio = 100;
return 1;
}
#endif
if (cfgfile_yesno (option, value, "logfile", &p->logfile))
if (cfgfile_yesno (option, value, "write_logfile", &p->write_logfile))
return 1;
#endif
#ifdef DRIVESOUND
if (cfgfile_intval (option, value, "floppy0sound", &p->dfxclick[0], 1)
|| cfgfile_intval (option, value, "floppy1sound", &p->dfxclick[1], 1)
@ -2506,8 +2507,8 @@ void default_prefs (struct uae_prefs *p, int type)
p->mountinfo = &options_mountinfo;
#endif
p->use_wheel_input = 0;
#ifdef GEKKO
p->use_wheel_input = 0;
p->smb_enable = 0;
strcpy (p->SmbUser,"User");
strcpy (p->SmbPwd, "Password");
@ -2516,8 +2517,8 @@ void default_prefs (struct uae_prefs *p, int type)
p->Port= PORT_DEFAULT;
p->rumble= 0;
p->gfx_correct_ratio = 100;
p->write_logfile= 0;
#endif
p->logfile= 0;
#ifdef UAE_MINI
default_prefs_mini (p, 0);

View File

@ -1313,13 +1313,8 @@ void gui_notify_state (int state)
{
}
extern int log_quiet;
int gui_update (void)
{
#ifndef GEKKO
log_quiet = 1;
#endif
return 0;
}

View File

@ -244,9 +244,9 @@ struct uae_prefs {
int statecapturerate, statecapturebuffersize;
#endif
int use_wheel_input;
int logfile;
#ifdef GEKKO
int use_wheel_input;
int write_logfile;
int smb_enable;
char SmbUser[32];
char SmbPwd[32];

View File

@ -61,8 +61,6 @@
#include "windows.h"
#endif
extern int log_quiet;
struct uae_prefs currprefs, changed_prefs;
static int restart_program;
@ -79,6 +77,7 @@ bool usbismount = false;
bool networkisinit = false;
bool smbismount = false;
bool sdismount = false;
int log_quiet = 0;
#if defined(GEKKO)
@ -1140,7 +1139,7 @@ int main (int argc, char **argv)
printf("\x1b[2J");
printf("\x1b[2;0H");
if (!(log_quiet = !currprefs.logfile)) set_logfile("/uae/uae.log");
if (!(log_quiet = !currprefs.write_logfile)) set_logfile("/uae/uae.log");
#endif

View File

@ -8,4 +8,4 @@ smb_ip=192.168.0.1
# Enable logfile
logfile=false
write_logfile=false