Merge pull request #1 from joncampbell123/master

Latest commits
This commit is contained in:
Wengier
2020-11-13 01:48:10 -05:00
committed by GitHub
4 changed files with 9 additions and 6 deletions

View File

@@ -999,7 +999,7 @@ fi
dnl FEATURE: FFMPEG output support
AH_TEMPLATE(C_AVCODEC,[Define to 1 to use FFMPEG libavcodec for video capture])
AC_ARG_ENABLE(avcodec,AC_HELP_STRING([--enable-avcodec],[Enable FFMPEG avcodec support]),,enable_ffmpeg=no)
AC_ARG_ENABLE(avcodec,AC_HELP_STRING([--enable-avcodec],[Enable FFMPEG avcodec support]),enable_ffmpeg=yes,enable_ffmpeg=no)
if test x$enable_ffmpeg = xyes; then
if test x$have_ffmpeg = xyes; then
if test x$have_avcodec_h = xyes; then

View File

@@ -1598,7 +1598,7 @@ protected:
public:
ShowSBInfo(GUI::Screen *parent, int x, int y, const char *title) :
ToplevelWindow(parent, x, y, 320, 230, title) {
std::string sbinfo = "Sound Blaster type: "+GetSBtype()+"\nSound Blaster base: "+GetSBbase()+"\nSound Blaster IRQ: "+std::to_string(GetSBirq())+"\nSound Blaster Low DMA: "+std::to_string(GetSBldma())+"\nSound Blaster High DMA: "+std::to_string(GetSBhdma());
std::string sbinfo = "Sound Blaster type: "+GetSBtype()+"\nSound Blaster base: "+GetSBbase()+"\nSound Blaster IRQ: "+std::to_string(GetSBirq())+"\nSound Blaster Low DMA: "+std::to_string((unsigned int)GetSBldma())+"\nSound Blaster High DMA: "+std::to_string((unsigned int)GetSBhdma());
std::istringstream in(sbinfo.c_str());
int r=0;
if (in) for (std::string line; std::getline(in, line); ) {

View File

@@ -7855,7 +7855,7 @@ bool DOSBOX_parse_argv() {
control->opt_break_start = true;
}
else if (optname == "silent") {
putenv("SDL_VIDEODRIVER=dummy");
putenv(const_cast<char*>("SDL_VIDEODRIVER=dummy"));
control->opt_exit = true;
control->opt_fastlaunch = true;
}
@@ -9308,7 +9308,7 @@ bool video_frameskip_common_menu_callback(DOSBoxMenu * const menu,DOSBoxMenu::it
SetVal("render", "frameskip", tmp1);
for (unsigned int i=0;i<=10;i++) {
sprintf(tmp2,"frameskip_%u",i);
mainMenu.get_item(tmp2).check(f==i).refresh_item(mainMenu);
mainMenu.get_item(tmp2).check((unsigned int)f==i).refresh_item(mainMenu);
}
return true;
}

View File

@@ -400,14 +400,17 @@ void INT10_SetCursorShape(uint8_t first,uint8_t last) {
if (machine==MCH_CGA || machine==MCH_MCGA || machine==MCH_AMSTRAD) goto dowrite;
if (IS_TANDY_ARCH) goto dowrite;
/* Skip CGA cursor emulation if EGA/VGA system is active */
if (!(real_readb(BIOSMEM_SEG,BIOSMEM_VIDEO_CTL) & 0x8)) {
if (!(real_readb(BIOSMEM_SEG,BIOSMEM_VIDEO_CTL) & 0x8)) { /* if video subsystem is ACTIVE (bit is cleared) [https://www.stanislavs.org/helppc/bios_data_area.html] */
/* Check for CGA type 01, invisible */
if ((first & 0x60) == 0x20) {
first=0x1e;
first=0x1e | 0x20; /* keep the cursor invisible! */
last=0x00;
goto dowrite;
}
/* Check if we need to convert CGA Bios cursor values */
/* FIXME: Some sources including [https://www.stanislavs.org/helppc/bios_data_area.html] [https://www.matrix-bios.nl/system/bda.html]
* suggest CGA alphanumeric cursor emulation occurs when bit 0 is SET. This code checks whether the bit is CLEARED.
* This test and emulation may have the bit backwards. VERIFY ON REAL HARDWARE -- J.C */
if (!(real_readb(BIOSMEM_SEG,BIOSMEM_VIDEO_CTL) & 0x1)) { // set by int10 fun12 sub34
// if (CurMode->mode>0x3) goto dowrite; //Only mode 0-3 are text modes on cga
if ((first & 0xe0) || (last & 0xe0)) goto dowrite;