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

Fixes after merge

Browse source
This commit is contained in:
Dimitris Panokostas 2017-09-27 22:37:23 +02:00
parent 6cfac026cd
commit bf1e07c5a9
14 changed files with 83 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/include/uae.h
View file

@ -31,7 +31,7 @@ extern void target_addtorecent (const TCHAR*, int);
extern void target_run (void);
extern void target_quit (void);
extern void target_restart (void);
extern void target_startup_msg(TCHAR *title, TCHAR *msg);
extern void target_startup_msg(const TCHAR *title, const TCHAR *msg);
extern void stripslashes (TCHAR *p);
extern void fixtrailing (TCHAR *p);
extern void getpathpart (TCHAR *outpath, int size, const TCHAR *inpath);

4
src/main.cpp
View file

@ -691,10 +691,8 @@ static void initialize_sdl2()
static int real_main2 (int argc, TCHAR **argv)
{
printf("Amiberry-SDL2 by Dimitris (MiDWaN) Panokostas\n");
initialize_sdl2();
keyboard_settrans();
set_config_changed();
if (restart_config[0]) {
default_prefs(&currprefs, true, 0);

2
src/osdep/hardfile_amiberry.cpp → src/osdep/amiberry_hardfile.cpp
View file

@ -38,7 +38,7 @@ struct uae_driveinfo {
#define CACHE_SIZE 16384
#define CACHE_FLUSH_TIME 5
static TCHAR *hdz[] = { _T("hdz"), _T("zip"), NULL };
static const TCHAR *hdz[] = { _T("hdz"), _T("zip"), NULL };
int hdf_open_target(struct hardfiledata *hfd, const TCHAR *pname)
{

16
src/osdep/gui/PanelConfig.cpp
View file

@ -37,13 +37,15 @@ bool LoadConfigByName(const char* name)
{
if(emulating) {
uae_restart(-1, config->FullPath);
} else {
txtName->setText(config->Name);
txtDesc->setText(config->Description);
target_cfgfile_load(&changed_prefs, config->FullPath, 0, 0);
strcpy(last_active_config, config->Name);
DisableResume();
RefreshAllPanels();
}
else {
txtName->setText(config->Name);
txtDesc->setText(config->Description);
target_cfgfile_load(&changed_prefs, config->FullPath, 0, 0);
strcpy(last_active_config, config->Name);
DisableResume();
RefreshAllPanels();
}
}
return false;

20
src/osdep/gui/PanelInput.cpp
View file

@ -33,8 +33,10 @@ static gcn::UaeDropDown* cboAutofire;
static gcn::Label* lblMouseSpeed;
static gcn::Label* lblMouseSpeedInfo;
static gcn::Slider* sldMouseSpeed;
#ifdef PANDORA
static gcn::Label *lblTapDelay;
static gcn::UaeDropDown* cboTapDelay;
#endif
static gcn::UaeCheckBox* chkMouseHack;
static gcn::UaeCheckBox* chkCustomCtrl;
@ -259,7 +261,7 @@ public:
changed_prefs.input_joymouse_multiplier = mousespeed_values[int(sldMouseSpeed->getValue())];
RefreshPanelInput();
}
#ifdef PANDORA
else if (actionEvent.getSource() == cboTapDelay)
{
if(cboTapDelay->getSelected() == 0)
@ -269,7 +271,7 @@ public:
else
changed_prefs.pandora_tapDelay = 2;
}
#endif
else if (actionEvent.getSource() == chkMouseHack)
{
changed_prefs.input_tablet = chkMouseHack->isSelected() ? TABLET_MOUSEHACK : TABLET_OFF;
@ -457,6 +459,7 @@ void InitPanelInput(const struct _ConfigCategory& category)
sldMouseSpeed->addActionListener(inputActionListener);
lblMouseSpeedInfo = new gcn::Label(".25");
#ifdef PANDORA
lblTapDelay = new gcn::Label("Tap Delay:");
lblTapDelay->setSize(100, LABEL_HEIGHT);
lblTapDelay->setAlignment(gcn::Graphics::RIGHT);
@ -465,7 +468,8 @@ void InitPanelInput(const struct _ConfigCategory& category)
cboTapDelay->setBaseColor(gui_baseCol);
cboTapDelay->setId("cboTapDelay");
cboTapDelay->addActionListener(inputActionListener);
#endif
chkMouseHack = new gcn::UaeCheckBox("Enable mousehack");
chkMouseHack->setId("MouseHack");
chkMouseHack->addActionListener(inputActionListener);
@ -634,10 +638,13 @@ void InitPanelInput(const struct _ConfigCategory& category)
posY += sldMouseSpeed->getHeight() + DISTANCE_NEXT_Y * 2;
category.panel->add(chkMouseHack, DISTANCE_BORDER + lblA->getWidth() + 8, posY);
#ifdef PANDORA
category.panel->add(lblTapDelay, 300, posY);
category.panel->add(cboTapDelay, 300 + lblTapDelay->getWidth() + 8, posY);
posY += cboTapDelay->getHeight() + DISTANCE_NEXT_Y;
#else
posY += chkMouseHack->getHeight() + DISTANCE_NEXT_Y;
#endif
category.panel->add(chkCustomCtrl, DISTANCE_BORDER + lblA->getWidth() + 8, posY);
posY += chkCustomCtrl->getHeight() + DISTANCE_NEXT_Y;
category.panel->add(lblA, DISTANCE_BORDER, posY);
@ -687,8 +694,10 @@ void ExitPanelInput()
delete lblMouseSpeed;
delete sldMouseSpeed;
delete lblMouseSpeedInfo;
#ifdef PANDORA
delete lblTapDelay;
delete cboTapDelay;
#endif
delete chkMouseHack;
delete chkCustomCtrl;
@ -784,13 +793,14 @@ void RefreshPanelInput()
break;
}
}
#ifdef PANDORA
if (changed_prefs.pandora_tapDelay == 10)
cboTapDelay->setSelected(0);
else if (changed_prefs.pandora_tapDelay == 5)
cboTapDelay->setSelected(1);
else
cboTapDelay->setSelected(2);
#endif
chkMouseHack->setSelected(changed_prefs.input_tablet == TABLET_MOUSEHACK);
chkCustomCtrl->setSelected(changed_prefs.customControls);

2
src/osdep/gui/main_window.cpp
View file

@ -24,7 +24,7 @@ static TCHAR startup_title[MAX_STARTUP_TITLE] = _T("");
static TCHAR startup_message[MAX_STARTUP_MESSAGE] = _T("");
void target_startup_msg(TCHAR* title, TCHAR* msg)
void target_startup_msg(const TCHAR* title, const TCHAR* msg)
{
_tcsncpy(startup_title, title, MAX_STARTUP_TITLE);
_tcsncpy(startup_message, msg, MAX_STARTUP_MESSAGE);

8
src/osdep/picasso96.h
View file

@ -645,9 +645,11 @@ extern int p96hsync_counter;
#ifdef __cplusplus
extern "C" {
#endif
void copy_screen_8bit(uae_u8 *dst, uae_u8 *src, int bytes, uae_u32 *clut);
void copy_screen_16bit_swap(uae_u8 *dst, uae_u8 *src, int bytes);
void copy_screen_32bit_to_16bit(uae_u8 *dst, uae_u8 *src, int bytes);
void copy_screen_8bit(uae_u8 *dst, uae_u8 *src, int bytes, uae_u32 *clut);
void copy_screen_16bit_swap(uae_u8 *dst, uae_u8 *src, int bytes);
void copy_screen_16bit_swap_arm(uae_u8 *dst, uae_u8 *src, int bytes);
void copy_screen_32bit_to_16bit_neon(uae_u8 *dst, uae_u8 *src, int bytes);
void copy_screen_32bit_to_16bit_arm(uae_u8 *dst, uae_u8 *src, int bytes);
#ifdef __cplusplus
}
#endif

2
src/sounddep/sound.cpp
View file

@ -219,7 +219,7 @@ bool cdaudio_catchup(void)
/* Try to determine whether sound is available. This is only for GUI purposes. */
int setup_sound(void)
{
if (pandora_start_sound(currprefs.sound_freq, 16, currprefs.sound_stereo) != 0)
if (amiberry_start_sound(currprefs.sound_freq, 16, currprefs.sound_stereo) != 0)
return 0;
sound_available = 1;

1
src/sounddep/sound.h
View file

@ -6,6 +6,7 @@
* Copyright 1997 Bernd Schmidt
*/
#pragma once
#define DEFAULT_SOUND_CHANNELS 2
#define SOUND_BUFFERS_COUNT 4

9
src/statusline.cpp
View file

@ -66,15 +66,20 @@ void draw_status_line_single(uae_u8 *buf, int y, int totalwidth)
x += 100 - (TD_WIDTH * (currprefs.nr_floppies - 1)) - TD_WIDTH;
if(nr_units() < 1)
x += TD_WIDTH;
#ifdef PANDORA
if(currprefs.pandora_hide_idle_led)
x += TD_WIDTH;
#endif
if(picasso_on)
memset (buf + (x - 4) * 2, 0, (prSDLScreen->w - x + 4) * 2);
memset (buf + (x - 4) * 2, 0, (screen->w - x + 4) * 2);
else
memset (buf + (x - 4) * gfxvidinfo.drawbuffer.pixbytes, 0, (gfxvidinfo.drawbuffer.outwidth - x + 4) * gfxvidinfo.drawbuffer.pixbytes);
#ifdef PANDORA
for (led = (currprefs.pandora_hide_idle_led == 0) ? -2 : -1; led < (currprefs.nr_floppies+1); led++) {
#else
for (led = -2; led < (currprefs.nr_floppies + 1); led++) {
#endif
int num1 = -1, num2 = -1, num3 = -1;
if (led == 0 && nr_units() < 1)

5
src/traps.cpp
View file

@ -107,10 +107,9 @@ unsigned int define_trap(TrapHandler handler_func, int flags, const TCHAR *name)
target_startup_msg(_T("Internal error"), _T("Ran out of emulator traps."));
uae_restart(1, nullptr);
return -1;
} else {
}
int i;
unsigned int trap_num;
struct Trap *trap;
uaecptr addr = here();
for (int i = 0; i < trap_count; i++) {