pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refresh a little bit the switchs

Browse source
This commit is contained in:
Chips 2016-04-03 10:15:26 +00:00
parent cad16d836e
commit cea376d5a0
8 changed files with 37 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/od-pandora/gui/PanelMisc.cpp
View file

@ -24,7 +24,8 @@ static gcn::UaeCheckBox* chkStatusLine;
static gcn::UaeCheckBox* chkShowGUI;
#ifdef RASPBERRY
static gcn::UaeCheckBox* chkAspect;
#else
#endif
#ifdef PANDORA_SPECIFIC
static gcn::Label* lblPandoraSpeed;
static gcn::Label* lblPandoraSpeedInfo;
static gcn::Slider* sldPandoraSpeed;
@ -44,7 +45,8 @@ class MiscActionListener : public gcn::ActionListener
#ifdef RASPBERRY
else if (actionEvent.getSource() == chkAspect)
changed_prefs.gfx_correct_aspect = chkAspect->isSelected();
#else
#endif
#ifdef PANDORA_SPECIFIC
else if (actionEvent.getSource() == sldPandoraSpeed)
{
int newspeed = (int) sldPandoraSpeed->getValue();
@ -75,7 +77,8 @@ void InitPanelMisc(const struct _ConfigCategory& category)
#ifdef RASPBERRY
chkAspect = new gcn::UaeCheckBox("4/3 ratio shrink");
chkAspect->addActionListener(miscActionListener);
#else
#endif
#ifdef PANDORA_SPECIFIC
lblPandoraSpeed = new gcn::Label("Pandora Speed:");
lblPandoraSpeed->setSize(110, LABEL_HEIGHT);
lblPandoraSpeed->setAlignment(gcn::Graphics::RIGHT);
@ -96,7 +99,8 @@ void InitPanelMisc(const struct _ConfigCategory& category)
#ifdef RASPBERRY
category.panel->add(chkAspect, DISTANCE_BORDER, posY);
posY += chkAspect->getHeight() + DISTANCE_NEXT_Y;
#else
#endif
#ifdef PANDORA_SPECIFIC
category.panel->add(lblPandoraSpeed, DISTANCE_BORDER, posY);
category.panel->add(sldPandoraSpeed, DISTANCE_BORDER + lblPandoraSpeed->getWidth() + 8, posY);
category.panel->add(lblPandoraSpeedInfo, sldPandoraSpeed->getX() + sldPandoraSpeed->getWidth() + 12, posY);
@ -112,7 +116,8 @@ void ExitPanelMisc(void)
delete chkShowGUI;
#ifdef RASPBERRY
delete chkAspect;
#else
#endif
#ifdef PANDORA_SPECIFIC
delete lblPandoraSpeed;
delete sldPandoraSpeed;
delete lblPandoraSpeedInfo;
@ -129,7 +134,8 @@ void RefreshPanelMisc(void)
chkShowGUI->setSelected(changed_prefs.start_gui);
#ifdef RASPBERRY
chkAspect->setSelected(changed_prefs.gfx_correct_aspect);
#else
#endif
#ifdef PANDORA_SPECIFIC
sldPandoraSpeed->setValue(changed_prefs.pandora_cpu_speed);
snprintf(tmp, 20, "%d MHz", changed_prefs.pandora_cpu_speed);
lblPandoraSpeedInfo->setCaption(tmp);

5
src/od-pandora/inputmode.cpp
View file

@ -66,15 +66,10 @@ void inputmode_redraw(void)
SDL_Rect r;
SDL_Surface* surface;
#ifdef RASPBERRY
r.x=(prSDLScreen->w-160)/2;
r.y=(prSDLScreen->h-160)/2;
#else
r.x=80;
r.y=prSDLScreen->h-200;
r.w=160;
r.h=160;
#endif
if (inputMode[0] && inputMode[1] && inputMode[2])
{

48
src/od-pandora/pandora.cpp
View file

@ -199,29 +199,29 @@ void target_default_options (struct uae_prefs *p, int type)
p->pandora_tapDelay = 10;
p->pandora_stylusOffset = 0;
p->pandora_customControls = 0;
p->pandora_customControls = 0;
#ifdef RASPBERRY
p->pandora_custom_dpad = 1;
p->pandora_custom_dpad = 1;
#else
p->pandora_custom_dpad = 0;
p->pandora_custom_dpad = 0;
#endif
p->pandora_custom_up = 0;
p->pandora_custom_down = 0;
p->pandora_custom_left = 0;
p->pandora_custom_right = 0;
p->pandora_custom_A = 0;
p->pandora_custom_B = 0;
p->pandora_custom_X = 0;
p->pandora_custom_Y = 0;
p->pandora_custom_L = 0;
p->pandora_custom_R = 0;
p->pandora_custom_up = 0;
p->pandora_custom_down = 0;
p->pandora_custom_left = 0;
p->pandora_custom_right = 0;
p->pandora_custom_A = 0;
p->pandora_custom_B = 0;
p->pandora_custom_X = 0;
p->pandora_custom_Y = 0;
p->pandora_custom_L = 0;
p->pandora_custom_R = 0;
p->pandora_button1 = GP2X_BUTTON_X;
p->pandora_button2 = GP2X_BUTTON_A;
p->pandora_autofireButton1 = GP2X_BUTTON_B;
p->pandora_jump = -1;
p->pandora_button1 = GP2X_BUTTON_X;
p->pandora_button2 = GP2X_BUTTON_A;
p->pandora_autofireButton1 = GP2X_BUTTON_B;
p->pandora_jump = -1;
p->picasso96_modeflags = RGBFF_R5G6B5 | RGBFF_R8G8B8A8;
p->picasso96_modeflags = RGBFF_R5G6B5 | RGBFF_R8G8B8A8;
}
@ -578,10 +578,10 @@ void loadAdfDir(void)
void setCpuSpeed()
{
char speedCmd[128];
char speedCmd[128];
#ifdef RASPBERRY
return;
#ifndef PANDORA_SPECIFIC
return;
#endif
currprefs.pandora_cpu_speed = changed_prefs.pandora_cpu_speed;
@ -605,8 +605,8 @@ void setCpuSpeed()
void resetCpuSpeed(void)
{
#ifdef RASPBERRY
return;
#ifndef PANDORA_SPECIFIC
return;
#endif
if(cpuSpeedChanged)
{
@ -915,7 +915,7 @@ void handle_events (void)
else
{
int mouseScale = currprefs.input_joymouse_multiplier / 2;
#ifndef RASPBERRY
#ifdef PANDORA_SPECIFIC
if(rEvent.motion.xrel > 20 || rEvent.motion.xrel < -20 || rEvent.motion.yrel > 20 || rEvent.motion.yrel < -20)
break;
#endif