From d3045e71a6f5b27a56ef21e86fc5f57118f04b92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Strohh=C3=A4cker?= Date: Sun, 29 Mar 2009 09:34:18 +0000 Subject: [PATCH] use ioctl audio playing routines when possible, otherwise audio extraction (vista and the likes) Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3333 --- src/dos/dos_programs.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/dos/dos_programs.cpp b/src/dos/dos_programs.cpp index c8795282..06697d7c 100644 --- a/src/dos/dos_programs.cpp +++ b/src/dos/dos_programs.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002-2008 The DOSBox Team + * Copyright (C) 2002-2009 The DOSBox Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: dos_programs.cpp,v 1.91 2009-02-01 14:24:36 qbix79 Exp $ */ +/* $Id: dos_programs.cpp,v 1.92 2009-03-29 09:34:18 c2woody Exp $ */ #include "dosbox.h" #include @@ -253,7 +253,7 @@ public: MSCDEX_SetCDInterface(CDROM_USE_SDL, num); } else { #if defined (WIN32) -/* // Check OS + // Check OS OSVERSIONINFO osi; osi.dwOSVersionInfoSize = sizeof(osi); GetVersionEx(&osi); @@ -262,8 +262,7 @@ public: MSCDEX_SetCDInterface(CDROM_USE_IOCTL_DX, num); } else { MSCDEX_SetCDInterface(CDROM_USE_IOCTL_DIO, num); - } */ - MSCDEX_SetCDInterface(CDROM_USE_IOCTL_DX, num); + } #else MSCDEX_SetCDInterface(CDROM_USE_IOCTL_DIO, num); #endif