mirror of
https://github.com/Oibaf66/uae-wii.git
synced 2024-11-24 11:39:18 +01:00
More order with log_quiet and ifdef GEKKO
This commit is contained in:
parent
b3056e1671
commit
ee727e3dfb
@ -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;
|
if (p->gfx_correct_ratio > 100) p->gfx_correct_ratio = 100;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
#endif
|
if (cfgfile_yesno (option, value, "write_logfile", &p->write_logfile))
|
||||||
if (cfgfile_yesno (option, value, "logfile", &p->logfile))
|
|
||||||
return 1;
|
return 1;
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef DRIVESOUND
|
#ifdef DRIVESOUND
|
||||||
if (cfgfile_intval (option, value, "floppy0sound", &p->dfxclick[0], 1)
|
if (cfgfile_intval (option, value, "floppy0sound", &p->dfxclick[0], 1)
|
||||||
|| cfgfile_intval (option, value, "floppy1sound", &p->dfxclick[1], 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;
|
p->mountinfo = &options_mountinfo;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
p->use_wheel_input = 0;
|
|
||||||
#ifdef GEKKO
|
#ifdef GEKKO
|
||||||
|
p->use_wheel_input = 0;
|
||||||
p->smb_enable = 0;
|
p->smb_enable = 0;
|
||||||
strcpy (p->SmbUser,"User");
|
strcpy (p->SmbUser,"User");
|
||||||
strcpy (p->SmbPwd, "Password");
|
strcpy (p->SmbPwd, "Password");
|
||||||
@ -2516,8 +2517,8 @@ void default_prefs (struct uae_prefs *p, int type)
|
|||||||
p->Port= PORT_DEFAULT;
|
p->Port= PORT_DEFAULT;
|
||||||
p->rumble= 0;
|
p->rumble= 0;
|
||||||
p->gfx_correct_ratio = 100;
|
p->gfx_correct_ratio = 100;
|
||||||
#endif
|
p->write_logfile= 0;
|
||||||
p->logfile= 0;
|
#endif
|
||||||
|
|
||||||
#ifdef UAE_MINI
|
#ifdef UAE_MINI
|
||||||
default_prefs_mini (p, 0);
|
default_prefs_mini (p, 0);
|
||||||
|
@ -1313,13 +1313,8 @@ void gui_notify_state (int state)
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
extern int log_quiet;
|
|
||||||
int gui_update (void)
|
int gui_update (void)
|
||||||
{
|
{
|
||||||
#ifndef GEKKO
|
|
||||||
log_quiet = 1;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -244,9 +244,9 @@ struct uae_prefs {
|
|||||||
int statecapturerate, statecapturebuffersize;
|
int statecapturerate, statecapturebuffersize;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int use_wheel_input;
|
|
||||||
int logfile;
|
|
||||||
#ifdef GEKKO
|
#ifdef GEKKO
|
||||||
|
int use_wheel_input;
|
||||||
|
int write_logfile;
|
||||||
int smb_enable;
|
int smb_enable;
|
||||||
char SmbUser[32];
|
char SmbUser[32];
|
||||||
char SmbPwd[32];
|
char SmbPwd[32];
|
||||||
|
@ -61,8 +61,6 @@
|
|||||||
#include "windows.h"
|
#include "windows.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern int log_quiet;
|
|
||||||
|
|
||||||
struct uae_prefs currprefs, changed_prefs;
|
struct uae_prefs currprefs, changed_prefs;
|
||||||
|
|
||||||
static int restart_program;
|
static int restart_program;
|
||||||
@ -78,7 +76,8 @@ struct gui_info gui_data;
|
|||||||
bool usbismount = false;
|
bool usbismount = false;
|
||||||
bool networkisinit = false;
|
bool networkisinit = false;
|
||||||
bool smbismount = false;
|
bool smbismount = false;
|
||||||
bool sdismount = false;
|
bool sdismount = false;
|
||||||
|
int log_quiet = 0;
|
||||||
|
|
||||||
#if defined(GEKKO)
|
#if defined(GEKKO)
|
||||||
|
|
||||||
@ -1140,7 +1139,7 @@ int main (int argc, char **argv)
|
|||||||
printf("\x1b[2J");
|
printf("\x1b[2J");
|
||||||
printf("\x1b[2;0H");
|
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
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user