diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 37806cc21..676b71140 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -668,7 +668,6 @@ set (PCH_SOURCES audiolib/src/drivers.cpp audiolib/src/driver_adlib.cpp - audiolib/src/driver_nosound.cpp audiolib/src/driver_sdl.cpp audiolib/src/driver_winmm.cpp audiolib/src/formats.cpp diff --git a/source/audiolib/include/sndcards.h b/source/audiolib/include/sndcards.h index bc6acffd7..b272480c7 100644 --- a/source/audiolib/include/sndcards.h +++ b/source/audiolib/include/sndcards.h @@ -33,7 +33,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. typedef enum { - ASS_NoSound, ASS_SDL, ASS_DirectSound, ASS_OPL3, diff --git a/source/audiolib/src/driver_nosound.cpp b/source/audiolib/src/driver_nosound.cpp deleted file mode 100644 index fc7a786e8..000000000 --- a/source/audiolib/src/driver_nosound.cpp +++ /dev/null @@ -1,83 +0,0 @@ -/* - Copyright (C) 2009 Jonathon Fowler - - 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 the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - */ - -/** - * Stub driver for no output - */ - -#include "compat.h" -#include "midifuncs.h" - -int NoSoundDrv_GetError(void) { return 0; } - -const char *NoSoundDrv_ErrorString(int ErrorNumber) -{ - UNREFERENCED_PARAMETER(ErrorNumber); - return "No sound, Ok."; -} - -int NoSoundDrv_PCM_Init(int *mixrate, int *numchannels, void *initdata) -{ - UNREFERENCED_PARAMETER(mixrate); - UNREFERENCED_PARAMETER(numchannels); - UNREFERENCED_PARAMETER(initdata); - return 0; -} - -void NoSoundDrv_PCM_Shutdown(void) {} - -int NoSoundDrv_PCM_BeginPlayback(char *BufferStart, int BufferSize, int NumDivisions, void (*CallBackFunc)(void)) -{ - UNREFERENCED_PARAMETER(BufferStart); - UNREFERENCED_PARAMETER(BufferSize); - UNREFERENCED_PARAMETER(NumDivisions); - UNREFERENCED_PARAMETER(CallBackFunc); - return 0; -} - -void NoSoundDrv_PCM_StopPlayback(void) {} -void NoSoundDrv_PCM_Lock(void) {} -void NoSoundDrv_PCM_Unlock(void) {} - -int NoSoundDrv_MIDI_Init(midifuncs *funcs) -{ - Bmemset(funcs, 0, sizeof(midifuncs)); - return 0; -} - -void NoSoundDrv_MIDI_Shutdown(void) {} - -int NoSoundDrv_MIDI_StartPlayback(void (*service)(void)) -{ - UNREFERENCED_PARAMETER(service); - return 0; -} - -void NoSoundDrv_MIDI_HaltPlayback(void) {} -uint32_t NoSoundDrv_MIDI_GetTick(void) { return 0; } - -void NoSoundDrv_MIDI_SetTempo(int tempo, int division) -{ - UNREFERENCED_PARAMETER(tempo); - UNREFERENCED_PARAMETER(division); -} - -void NoSoundDrv_MIDI_Lock(void) {} -void NoSoundDrv_MIDI_Unlock(void) {} diff --git a/source/audiolib/src/driver_nosound.h b/source/audiolib/src/driver_nosound.h deleted file mode 100644 index 9d0f7496b..000000000 --- a/source/audiolib/src/driver_nosound.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - Copyright (C) 2009 Jonathon Fowler - - 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 the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - */ - -#include "midifuncs.h" - -#include - -int NoSoundDrv_GetError(void); -const char *NoSoundDrv_ErrorString( int ErrorNumber ); - -int NoSoundDrv_PCM_Init(int * mixrate, int * numchannels, void * initdata); -void NoSoundDrv_PCM_Shutdown(void); -int NoSoundDrv_PCM_BeginPlayback(char *BufferStart, int BufferSize, - int NumDivisions, void ( *CallBackFunc )( void ) ); -void NoSoundDrv_PCM_StopPlayback(void); -void NoSoundDrv_PCM_Lock(void); -void NoSoundDrv_PCM_Unlock(void); - -int NoSoundDrv_MIDI_Init(midifuncs *); -void NoSoundDrv_MIDI_Shutdown(void); -int NoSoundDrv_MIDI_StartPlayback(void (*service)(void)); -void NoSoundDrv_MIDI_HaltPlayback(void); -uint32_t NoSoundDrv_MIDI_GetTick(void); -void NoSoundDrv_MIDI_SetTempo(int tempo, int division); -void NoSoundDrv_MIDI_Lock(void); -void NoSoundDrv_MIDI_Unlock(void); \ No newline at end of file diff --git a/source/audiolib/src/drivers.cpp b/source/audiolib/src/drivers.cpp index d33da4c5c..114c3dd27 100644 --- a/source/audiolib/src/drivers.cpp +++ b/source/audiolib/src/drivers.cpp @@ -25,7 +25,6 @@ #include "drivers.h" -#include "driver_nosound.h" #include "driver_adlib.h" #ifdef RENDERTYPESDL diff --git a/source/audiolib/src/fx_man.cpp b/source/audiolib/src/fx_man.cpp index 2d3d10799..28154ee31 100644 --- a/source/audiolib/src/fx_man.cpp +++ b/source/audiolib/src/fx_man.cpp @@ -62,8 +62,6 @@ int FX_Init(int numvoices, int numchannels, int mixrate, void *initdata) SoundCard = ASS_SDL; #elif defined RENDERTYPEWIN SoundCard = ASS_DirectSound; -#else - SoundCard = ASS_NoSound; #endif } @@ -76,8 +74,8 @@ int FX_Init(int numvoices, int numchannels, int mixrate, void *initdata) if (SoundDriver_IsPCMSupported(SoundCard) == 0) { // unsupported cards fall back to no sound - MV_Printf("Couldn't init %s, falling back to no sound...\n", SoundDriver_GetName(SoundCard)); - SoundCard = ASS_NoSound; + FX_SetErrorCode(FX_InvalidCard); + return FX_Error; } int status = FX_Ok;