diff --git a/bochs/iodev/sound/soundlnx.cc b/bochs/iodev/sound/soundlnx.cc index 6bf3bf9dc..3a5ffdaec 100644 --- a/bochs/iodev/sound/soundlnx.cc +++ b/bochs/iodev/sound/soundlnx.cc @@ -42,7 +42,7 @@ bx_sound_linux_c::bx_sound_linux_c() wave_device[1] = NULL; wave_fd[0] = -1; wave_fd[1] = -1; - BX_INFO(("Sound lowlevel module 'linux' initialized")); + BX_INFO(("Sound lowlevel module 'oss' initialized")); } bx_sound_linux_c::~bx_sound_linux_c() diff --git a/bochs/iodev/sound/soundmod.cc b/bochs/iodev/sound/soundmod.cc index e7cf4c26d..379c6bb44 100644 --- a/bochs/iodev/sound/soundmod.cc +++ b/bochs/iodev/sound/soundmod.cc @@ -91,6 +91,18 @@ void bx_soundmod_ctl_c::init() #if BX_WITH_SDL } else if (!strcmp(driver, "sdl")) { soundmod = new bx_sound_sdl_c(); +#endif +#if (defined(linux) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) + } else if (!strcmp(driver, "oss")) { + soundmod = new bx_sound_linux_c(); +#endif +#if defined(macintosh) + } else if (!strcmp(driver, "osx")) { + soundmod = new bx_sound_osx_c(); +#endif +#if defined(WIN32) + } else if (!strcmp(driver, "win")) { + soundmod = new bx_sound_windows_c(); #endif } else if (!strcmp(driver, "dummy")) { soundmod = new bx_sound_lowlevel_c(); diff --git a/bochs/iodev/sound/soundosx.cc b/bochs/iodev/sound/soundosx.cc index d66810de6..772cbb786 100644 --- a/bochs/iodev/sound/soundosx.cc +++ b/bochs/iodev/sound/soundosx.cc @@ -2,7 +2,7 @@ // $Id$ ///////////////////////////////////////////////////////////////////////// // -// Copyright (C) 2004-2011 The Bochs Project +// Copyright (C) 2004-2013 The Bochs Project // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -85,7 +85,7 @@ bx_sound_osx_c::bx_sound_osx_c() tail = 0; for (int i=0; i