From 6039eb05ba6d82ef56f2868c96654c552d117bf9 Mon Sep 17 00:00:00 2001 From: Franklin Wei Date: Wed, 7 Feb 2018 20:04:46 -0500 Subject: sdl: remove non-rockbox drivers We never use any of these other drivers, so having them around just takes up space. Change-Id: Iced812162df1fef3fd55522b7e700acb6c3bcd41 --- apps/plugins/sdl/src/audio/alsa/SDL_alsa_audio.c | 619 ---- apps/plugins/sdl/src/audio/alsa/SDL_alsa_audio.h | 48 - apps/plugins/sdl/src/audio/arts/SDL_artsaudio.c | 362 --- apps/plugins/sdl/src/audio/arts/SDL_artsaudio.h | 60 - apps/plugins/sdl/src/audio/baudio/SDL_beaudio.cc | 225 -- apps/plugins/sdl/src/audio/baudio/SDL_beaudio.h | 39 - apps/plugins/sdl/src/audio/bsd/SDL_bsdaudio.c | 404 --- apps/plugins/sdl/src/audio/bsd/SDL_bsdaudio.h | 58 - apps/plugins/sdl/src/audio/dart/SDL_dart.c | 441 --- apps/plugins/sdl/src/audio/dart/SDL_dart.h | 63 - apps/plugins/sdl/src/audio/dc/SDL_dcaudio.c | 246 -- apps/plugins/sdl/src/audio/dc/SDL_dcaudio.h | 41 - apps/plugins/sdl/src/audio/dc/aica.c | 271 -- apps/plugins/sdl/src/audio/dc/aica.h | 40 - apps/plugins/sdl/src/audio/disk/SDL_diskaudio.c | 186 -- apps/plugins/sdl/src/audio/disk/SDL_diskaudio.h | 41 - apps/plugins/sdl/src/audio/dma/SDL_dmaaudio.c | 455 --- apps/plugins/sdl/src/audio/dma/SDL_dmaaudio.h | 59 - apps/plugins/sdl/src/audio/dmedia/SDL_irixaudio.c | 242 -- apps/plugins/sdl/src/audio/dmedia/SDL_irixaudio.h | 45 - apps/plugins/sdl/src/audio/dsp/SDL_dspaudio.c | 340 --- apps/plugins/sdl/src/audio/dsp/SDL_dspaudio.h | 53 - apps/plugins/sdl/src/audio/esd/SDL_esdaudio.c | 323 --- apps/plugins/sdl/src/audio/esd/SDL_esdaudio.h | 57 - apps/plugins/sdl/src/audio/macosx/SDL_coreaudio.c | 291 -- apps/plugins/sdl/src/audio/macosx/SDL_coreaudio.h | 45 - apps/plugins/sdl/src/audio/macrom/SDL_romaudio.c | 496 ---- apps/plugins/sdl/src/audio/macrom/SDL_romaudio.h | 50 - apps/plugins/sdl/src/audio/mint/SDL_mintaudio.c | 215 -- apps/plugins/sdl/src/audio/mint/SDL_mintaudio.h | 121 - .../sdl/src/audio/mint/SDL_mintaudio_dma8.c | 357 --- .../sdl/src/audio/mint/SDL_mintaudio_dma8.h | 85 - .../sdl/src/audio/mint/SDL_mintaudio_gsxb.c | 436 --- .../sdl/src/audio/mint/SDL_mintaudio_gsxb.h | 104 - apps/plugins/sdl/src/audio/mint/SDL_mintaudio_it.S | 386 --- .../sdl/src/audio/mint/SDL_mintaudio_mcsn.c | 405 --- .../sdl/src/audio/mint/SDL_mintaudio_mcsn.h | 59 - .../sdl/src/audio/mint/SDL_mintaudio_stfa.c | 326 --- .../sdl/src/audio/mint/SDL_mintaudio_stfa.h | 97 - .../sdl/src/audio/mint/SDL_mintaudio_xbios.c | 490 ---- apps/plugins/sdl/src/audio/mme/SDL_mmeaudio.c | 264 -- apps/plugins/sdl/src/audio/mme/SDL_mmeaudio.h | 51 - apps/plugins/sdl/src/audio/nas/SDL_nasaudio.c | 423 --- apps/plugins/sdl/src/audio/nas/SDL_nasaudio.h | 62 - apps/plugins/sdl/src/audio/nds/SDL_ndsaudio.c | 335 --- apps/plugins/sdl/src/audio/nds/SDL_ndsaudio.h | 40 - apps/plugins/sdl/src/audio/nds/sound9.c | 61 - apps/plugins/sdl/src/audio/nds/soundcommon.h | 80 - apps/plugins/sdl/src/audio/nto/SDL_nto_audio.c | 507 ---- apps/plugins/sdl/src/audio/nto/SDL_nto_audio.h | 68 - apps/plugins/sdl/src/audio/paudio/SDL_paudio.c | 511 ---- apps/plugins/sdl/src/audio/paudio/SDL_paudio.h | 57 - apps/plugins/sdl/src/audio/pulse/SDL_pulseaudio.c | 570 ---- apps/plugins/sdl/src/audio/pulse/SDL_pulseaudio.h | 73 - apps/plugins/sdl/src/audio/sun/SDL_sunaudio.c | 432 --- apps/plugins/sdl/src/audio/sun/SDL_sunaudio.h | 55 - .../sdl/src/audio/symbian/SDL_epocaudio.cpp | 614 ---- apps/plugins/sdl/src/audio/symbian/SDL_epocaudio.h | 37 - .../plugins/sdl/src/audio/symbian/streamplayer.cpp | 279 -- apps/plugins/sdl/src/audio/symbian/streamplayer.h | 89 - apps/plugins/sdl/src/audio/ums/SDL_umsaudio.c | 547 ---- apps/plugins/sdl/src/audio/ums/SDL_umsaudio.h | 50 - apps/plugins/sdl/src/audio/windib/SDL_dibaudio.c | 322 --- apps/plugins/sdl/src/audio/windib/SDL_dibaudio.h | 49 - apps/plugins/sdl/src/audio/windx5/SDL_dx5audio.c | 705 ----- apps/plugins/sdl/src/audio/windx5/SDL_dx5audio.h | 55 - apps/plugins/sdl/src/audio/windx5/directx.h | 81 - apps/plugins/sdl/src/cdrom/aix/SDL_syscdrom.c | 660 ----- apps/plugins/sdl/src/cdrom/beos/SDL_syscdrom.cc | 410 --- apps/plugins/sdl/src/cdrom/bsdi/SDL_syscdrom.c | 542 ---- apps/plugins/sdl/src/cdrom/dc/SDL_syscdrom.c | 167 -- apps/plugins/sdl/src/cdrom/freebsd/SDL_syscdrom.c | 406 --- apps/plugins/sdl/src/cdrom/linux/SDL_syscdrom.c | 564 ---- apps/plugins/sdl/src/cdrom/macos/SDL_syscdrom.c | 525 ---- apps/plugins/sdl/src/cdrom/macos/SDL_syscdrom_c.h | 140 - .../plugins/sdl/src/cdrom/macosx/AudioFilePlayer.c | 360 --- .../plugins/sdl/src/cdrom/macosx/AudioFilePlayer.h | 178 -- .../sdl/src/cdrom/macosx/AudioFileReaderThread.c | 610 ---- apps/plugins/sdl/src/cdrom/macosx/CDPlayer.c | 636 ----- apps/plugins/sdl/src/cdrom/macosx/CDPlayer.h | 69 - apps/plugins/sdl/src/cdrom/macosx/SDLOSXCAGuard.c | 199 -- apps/plugins/sdl/src/cdrom/macosx/SDLOSXCAGuard.h | 116 - apps/plugins/sdl/src/cdrom/macosx/SDL_syscdrom.c | 514 ---- apps/plugins/sdl/src/cdrom/macosx/SDL_syscdrom_c.h | 136 - apps/plugins/sdl/src/cdrom/mint/SDL_syscdrom.c | 317 -- apps/plugins/sdl/src/cdrom/openbsd/SDL_syscdrom.c | 416 --- apps/plugins/sdl/src/cdrom/os2/SDL_syscdrom.c | 393 --- apps/plugins/sdl/src/cdrom/osf/SDL_syscdrom.c | 444 --- apps/plugins/sdl/src/cdrom/qnx/SDL_syscdrom.c | 551 ---- apps/plugins/sdl/src/cdrom/win32/SDL_syscdrom.c | 386 --- apps/plugins/sdl/src/hermes/COPYING.LIB | 438 --- apps/plugins/sdl/src/hermes/HeadMMX.h | 100 - apps/plugins/sdl/src/hermes/HeadX86.h | 186 -- apps/plugins/sdl/src/hermes/README | 13 - apps/plugins/sdl/src/hermes/common.inc | 9 - apps/plugins/sdl/src/hermes/mmx_main.asm | 74 - apps/plugins/sdl/src/hermes/mmxp2_32.asm | 405 --- apps/plugins/sdl/src/hermes/x86_main.asm | 75 - apps/plugins/sdl/src/hermes/x86p_16.asm | 490 ---- apps/plugins/sdl/src/hermes/x86p_32.asm | 1044 ------- .../sdl/src/joystick/beos/SDL_bejoystick.cc | 237 -- .../plugins/sdl/src/joystick/bsd/SDL_sysjoystick.c | 608 ---- .../sdl/src/joystick/darwin/SDL_sysjoystick.c | 842 ------ apps/plugins/sdl/src/joystick/dc/SDL_sysjoystick.c | 193 -- .../sdl/src/joystick/linux/SDL_sysjoystick.c | 1218 -------- .../sdl/src/joystick/macos/SDL_sysjoystick.c | 320 --- .../sdl/src/joystick/mint/SDL_sysjoystick.c | 826 ------ .../plugins/sdl/src/joystick/nds/SDL_sysjoystick.c | 150 - .../sdl/src/joystick/riscos/SDL_sysjoystick.c | 176 -- .../sdl/src/joystick/win32/SDL_mmjoystick.c | 407 --- apps/plugins/sdl/src/loadso/beos/SDL_sysloadso.c | 72 - apps/plugins/sdl/src/loadso/dlopen/SDL_sysloadso.c | 69 - apps/plugins/sdl/src/loadso/macos/SDL_sysloadso.c | 106 - apps/plugins/sdl/src/loadso/macosx/SDL_dlcompat.c | 1407 --------- apps/plugins/sdl/src/loadso/mint/SDL_sysloadso.c | 62 - apps/plugins/sdl/src/loadso/os2/SDL_sysloadso.c | 71 - apps/plugins/sdl/src/loadso/win32/SDL_sysloadso.c | 139 - apps/plugins/sdl/src/main/beos/SDL_BeApp.cc | 111 - apps/plugins/sdl/src/main/beos/SDL_BeApp.h | 33 - apps/plugins/sdl/src/main/macos/SDL.r | 1 - apps/plugins/sdl/src/main/macos/SDL.shlib.r | 1 - apps/plugins/sdl/src/main/macos/SDL_main.c | 610 ---- apps/plugins/sdl/src/main/macos/SIZE.r | 1 - apps/plugins/sdl/src/main/macos/exports/Makefile | 39 - apps/plugins/sdl/src/main/macos/exports/SDL.x | 1 - apps/plugins/sdl/src/main/macos/exports/gendef.pl | 43 - apps/plugins/sdl/src/main/macosx/Info.plist.in | 24 - apps/plugins/sdl/src/main/macosx/SDLMain.h | 16 - apps/plugins/sdl/src/main/macosx/SDLMain.m | 381 --- .../sdl/src/main/macosx/SDLMain.nib/classes.nib | 12 - .../sdl/src/main/macosx/SDLMain.nib/info.nib | 12 - .../sdl/src/main/macosx/SDLMain.nib/objects.nib | Bin 1701 -> 0 bytes apps/plugins/sdl/src/main/macosx/info.nib | 1 - .../plugins/sdl/src/main/qtopia/SDL_qtopia_main.cc | 47 - .../plugins/sdl/src/main/symbian/EKA1/SDL_main.cpp | 152 - .../plugins/sdl/src/main/symbian/EKA2/SDL_main.cpp | 1035 ------- apps/plugins/sdl/src/main/symbian/EKA2/sdlexe.cpp | 809 ------ apps/plugins/sdl/src/main/symbian/EKA2/sdllib.cpp | 12 - .../sdl/src/main/symbian/EKA2/vectorbuffer.cpp | 62 - .../sdl/src/main/symbian/EKA2/vectorbuffer.h | 240 -- apps/plugins/sdl/src/main/win32/SDL_win32_main.c | 402 --- apps/plugins/sdl/src/main/win32/version.rc | 38 - apps/plugins/sdl/src/thread/beos/SDL_syssem.c | 142 - apps/plugins/sdl/src/thread/beos/SDL_systhread.c | 96 - apps/plugins/sdl/src/thread/beos/SDL_systhread_c.h | 31 - apps/plugins/sdl/src/thread/dc/SDL_syscond.c | 215 -- apps/plugins/sdl/src/thread/dc/SDL_syscond_c.h | 23 - apps/plugins/sdl/src/thread/dc/SDL_sysmutex.c | 122 - apps/plugins/sdl/src/thread/dc/SDL_sysmutex_c.h | 23 - apps/plugins/sdl/src/thread/dc/SDL_syssem.c | 173 -- apps/plugins/sdl/src/thread/dc/SDL_syssem_c.h | 23 - apps/plugins/sdl/src/thread/dc/SDL_systhread.c | 60 - apps/plugins/sdl/src/thread/dc/SDL_systhread_c.h | 24 - apps/plugins/sdl/src/thread/irix/SDL_syssem.c | 219 -- apps/plugins/sdl/src/thread/irix/SDL_systhread.c | 85 - apps/plugins/sdl/src/thread/irix/SDL_systhread_c.h | 27 - apps/plugins/sdl/src/thread/os2/SDL_syscond.c | 215 -- apps/plugins/sdl/src/thread/os2/SDL_syscond_c.h | 23 - apps/plugins/sdl/src/thread/os2/SDL_sysmutex.c | 108 - apps/plugins/sdl/src/thread/os2/SDL_syssem.c | 192 -- apps/plugins/sdl/src/thread/os2/SDL_systhread.c | 108 - apps/plugins/sdl/src/thread/os2/SDL_systhread_c.h | 28 - apps/plugins/sdl/src/thread/pth/SDL_syscond.c | 164 -- apps/plugins/sdl/src/thread/pth/SDL_sysmutex.c | 87 - apps/plugins/sdl/src/thread/pth/SDL_sysmutex_c.h | 31 - apps/plugins/sdl/src/thread/pth/SDL_systhread.c | 103 - apps/plugins/sdl/src/thread/pth/SDL_systhread_c.h | 31 - apps/plugins/sdl/src/thread/pthread/SDL_syscond.c | 155 - apps/plugins/sdl/src/thread/pthread/SDL_sysmutex.c | 153 - .../sdl/src/thread/pthread/SDL_sysmutex_c.h | 31 - apps/plugins/sdl/src/thread/pthread/SDL_syssem.c | 190 -- .../plugins/sdl/src/thread/pthread/SDL_systhread.c | 120 - .../sdl/src/thread/pthread/SDL_systhread_c.h | 26 - apps/plugins/sdl/src/thread/riscos/SDL_syscond.c | 160 -- apps/plugins/sdl/src/thread/riscos/SDL_sysmutex.c | 153 - .../plugins/sdl/src/thread/riscos/SDL_sysmutex_c.h | 34 - apps/plugins/sdl/src/thread/riscos/SDL_syssem.c | 203 -- apps/plugins/sdl/src/thread/riscos/SDL_systhread.c | 144 - .../sdl/src/thread/riscos/SDL_systhread_c.h | 34 - .../sdl/src/thread/symbian/SDL_sysmutex.cpp | 130 - apps/plugins/sdl/src/thread/symbian/SDL_syssem.cpp | 214 -- .../sdl/src/thread/symbian/SDL_systhread.cpp | 146 - .../sdl/src/thread/symbian/SDL_systhread_c.h | 30 - apps/plugins/sdl/src/thread/win32/SDL_sysmutex.c | 95 - apps/plugins/sdl/src/thread/win32/SDL_syssem.c | 164 -- apps/plugins/sdl/src/thread/win32/SDL_systhread.c | 162 -- .../plugins/sdl/src/thread/win32/SDL_systhread_c.h | 28 - .../sdl/src/thread/win32/win_ce_semaphore.c | 216 -- .../sdl/src/thread/win32/win_ce_semaphore.h | 22 - apps/plugins/sdl/src/timer/beos/SDL_systimer.c | 95 - apps/plugins/sdl/src/timer/dc/SDL_systimer.c | 100 - apps/plugins/sdl/src/timer/macos/FastTimes.c | 352 --- apps/plugins/sdl/src/timer/macos/FastTimes.h | 27 - apps/plugins/sdl/src/timer/macos/SDL_MPWtimer.c | 152 - apps/plugins/sdl/src/timer/macos/SDL_systimer.c | 186 -- apps/plugins/sdl/src/timer/mint/SDL_systimer.c | 149 - apps/plugins/sdl/src/timer/mint/SDL_vbltimer.S | 228 -- apps/plugins/sdl/src/timer/mint/SDL_vbltimer_s.h | 35 - apps/plugins/sdl/src/timer/nds/SDL_systimer.c | 73 - apps/plugins/sdl/src/timer/os2/SDL_systimer.c | 227 -- apps/plugins/sdl/src/timer/riscos/SDL_systimer.c | 233 -- .../plugins/sdl/src/timer/symbian/SDL_systimer.cpp | 114 - apps/plugins/sdl/src/timer/unix/SDL_systimer.c | 240 -- apps/plugins/sdl/src/timer/win32/SDL_systimer.c | 160 -- apps/plugins/sdl/src/timer/wince/SDL_systimer.c | 198 -- apps/plugins/sdl/src/video/Xext/README | 10 - apps/plugins/sdl/src/video/Xext/XME/xme.c | 410 --- .../plugins/sdl/src/video/Xext/Xinerama/Xinerama.c | 324 --- apps/plugins/sdl/src/video/Xext/Xv/Xv.c | 1151 -------- apps/plugins/sdl/src/video/Xext/Xv/Xvlibint.h | 81 - apps/plugins/sdl/src/video/Xext/Xxf86dga/XF86DGA.c | 721 ----- .../plugins/sdl/src/video/Xext/Xxf86dga/XF86DGA2.c | 993 ------- .../plugins/sdl/src/video/Xext/Xxf86vm/XF86VMode.c | 1226 -------- apps/plugins/sdl/src/video/Xext/extensions/Xext.h | 50 - .../sdl/src/video/Xext/extensions/Xinerama.h | 46 - apps/plugins/sdl/src/video/Xext/extensions/Xv.h | 129 - apps/plugins/sdl/src/video/Xext/extensions/Xvlib.h | 433 --- .../sdl/src/video/Xext/extensions/Xvproto.h | 604 ---- .../sdl/src/video/Xext/extensions/extutil.h | 226 -- .../sdl/src/video/Xext/extensions/panoramiXext.h | 52 - .../sdl/src/video/Xext/extensions/panoramiXproto.h | 192 -- .../sdl/src/video/Xext/extensions/xf86dga.h | 265 -- .../sdl/src/video/Xext/extensions/xf86dga1.h | 169 -- .../sdl/src/video/Xext/extensions/xf86dga1str.h | 194 -- .../sdl/src/video/Xext/extensions/xf86dgastr.h | 344 --- .../sdl/src/video/Xext/extensions/xf86vmode.h | 314 -- .../sdl/src/video/Xext/extensions/xf86vmstr.h | 546 ---- apps/plugins/sdl/src/video/Xext/extensions/xme.h | 45 - apps/plugins/sdl/src/video/aalib/SDL_aaevents.c | 202 -- apps/plugins/sdl/src/video/aalib/SDL_aaevents_c.h | 35 - apps/plugins/sdl/src/video/aalib/SDL_aamouse.c | 35 - apps/plugins/sdl/src/video/aalib/SDL_aamouse_c.h | 26 - apps/plugins/sdl/src/video/aalib/SDL_aavideo.c | 388 --- apps/plugins/sdl/src/video/aalib/SDL_aavideo.h | 66 - .../sdl/src/video/ataricommon/SDL_ataric2p.S | 452 --- .../sdl/src/video/ataricommon/SDL_ataric2p_s.h | 75 - .../sdl/src/video/ataricommon/SDL_ataridevmouse.c | 159 -- .../src/video/ataricommon/SDL_ataridevmouse_c.h | 42 - .../sdl/src/video/ataricommon/SDL_atarieddi.S | 42 - .../sdl/src/video/ataricommon/SDL_atarieddi_s.h | 54 - .../sdl/src/video/ataricommon/SDL_atarievents.c | 234 -- .../sdl/src/video/ataricommon/SDL_atarievents_c.h | 52 - .../sdl/src/video/ataricommon/SDL_atarigl.c | 1086 ------- .../sdl/src/video/ataricommon/SDL_atarigl_c.h | 109 - .../sdl/src/video/ataricommon/SDL_atarikeys.h | 140 - .../sdl/src/video/ataricommon/SDL_atarimxalloc.c | 52 - .../sdl/src/video/ataricommon/SDL_atarimxalloc_c.h | 37 - .../sdl/src/video/ataricommon/SDL_atarisuper.h | 61 - .../sdl/src/video/ataricommon/SDL_biosevents.c | 131 - .../sdl/src/video/ataricommon/SDL_biosevents_c.h | 42 - .../sdl/src/video/ataricommon/SDL_gemdosevents.c | 132 - .../sdl/src/video/ataricommon/SDL_gemdosevents_c.h | 42 - .../sdl/src/video/ataricommon/SDL_ikbdevents.c | 124 - .../sdl/src/video/ataricommon/SDL_ikbdevents_c.h | 42 - .../sdl/src/video/ataricommon/SDL_ikbdinterrupt.S | 404 --- .../src/video/ataricommon/SDL_ikbdinterrupt_s.h | 61 - .../sdl/src/video/ataricommon/SDL_xbiosevents.c | 155 - .../sdl/src/video/ataricommon/SDL_xbiosevents_c.h | 48 - .../sdl/src/video/ataricommon/SDL_xbiosinterrupt.S | 212 -- .../src/video/ataricommon/SDL_xbiosinterrupt_s.h | 52 - apps/plugins/sdl/src/video/bwindow/SDL_BView.h | 116 - apps/plugins/sdl/src/video/bwindow/SDL_BWin.h | 290 -- apps/plugins/sdl/src/video/bwindow/SDL_lowvideo.h | 58 - .../plugins/sdl/src/video/bwindow/SDL_sysevents.cc | 415 --- .../sdl/src/video/bwindow/SDL_sysevents_c.h | 31 - apps/plugins/sdl/src/video/bwindow/SDL_sysmouse.cc | 153 - .../plugins/sdl/src/video/bwindow/SDL_sysmouse_c.h | 33 - apps/plugins/sdl/src/video/bwindow/SDL_sysvideo.cc | 841 ------ apps/plugins/sdl/src/video/bwindow/SDL_syswm.cc | 92 - apps/plugins/sdl/src/video/bwindow/SDL_syswm_c.h | 32 - apps/plugins/sdl/src/video/bwindow/SDL_sysyuv.cc | 314 -- apps/plugins/sdl/src/video/bwindow/SDL_sysyuv.h | 73 - apps/plugins/sdl/src/video/caca/SDL_cacaevents.c | 101 - apps/plugins/sdl/src/video/caca/SDL_cacaevents_c.h | 35 - apps/plugins/sdl/src/video/caca/SDL_cacavideo.c | 304 -- apps/plugins/sdl/src/video/caca/SDL_cacavideo.h | 76 - apps/plugins/sdl/src/video/dc/SDL_dcevents.c | 152 - apps/plugins/sdl/src/video/dc/SDL_dcevents_c.h | 33 - apps/plugins/sdl/src/video/dc/SDL_dcmouse.c | 35 - apps/plugins/sdl/src/video/dc/SDL_dcmouse_c.h | 26 - apps/plugins/sdl/src/video/dc/SDL_dcvideo.c | 445 --- apps/plugins/sdl/src/video/dc/SDL_dcvideo.h | 42 - apps/plugins/sdl/src/video/dga/SDL_dgaevents.c | 163 -- apps/plugins/sdl/src/video/dga/SDL_dgaevents_c.h | 28 - apps/plugins/sdl/src/video/dga/SDL_dgamouse.c | 35 - apps/plugins/sdl/src/video/dga/SDL_dgamouse_c.h | 26 - apps/plugins/sdl/src/video/dga/SDL_dgavideo.c | 1101 ------- apps/plugins/sdl/src/video/dga/SDL_dgavideo.h | 124 - .../sdl/src/video/directfb/SDL_DirectFB_events.c | 219 -- .../sdl/src/video/directfb/SDL_DirectFB_events.h | 29 - .../sdl/src/video/directfb/SDL_DirectFB_keys.h | 135 - .../sdl/src/video/directfb/SDL_DirectFB_video.c | 1171 -------- .../sdl/src/video/directfb/SDL_DirectFB_video.h | 62 - .../sdl/src/video/directfb/SDL_DirectFB_yuv.c | 290 -- .../sdl/src/video/directfb/SDL_DirectFB_yuv.h | 38 - apps/plugins/sdl/src/video/fbcon/3dfx_mmio.h | 56 - apps/plugins/sdl/src/video/fbcon/3dfx_regs.h | 83 - apps/plugins/sdl/src/video/fbcon/SDL_fb3dfx.c | 215 -- apps/plugins/sdl/src/video/fbcon/SDL_fb3dfx.h | 29 - apps/plugins/sdl/src/video/fbcon/SDL_fbelo.c | 442 --- apps/plugins/sdl/src/video/fbcon/SDL_fbelo.h | 55 - apps/plugins/sdl/src/video/fbcon/SDL_fbevents.c | 1254 -------- apps/plugins/sdl/src/video/fbcon/SDL_fbevents_c.h | 38 - apps/plugins/sdl/src/video/fbcon/SDL_fbkeys.h | 139 - apps/plugins/sdl/src/video/fbcon/SDL_fbmatrox.c | 280 -- apps/plugins/sdl/src/video/fbcon/SDL_fbmatrox.h | 29 - apps/plugins/sdl/src/video/fbcon/SDL_fbmouse.c | 33 - apps/plugins/sdl/src/video/fbcon/SDL_fbmouse_c.h | 26 - apps/plugins/sdl/src/video/fbcon/SDL_fbriva.c | 222 -- apps/plugins/sdl/src/video/fbcon/SDL_fbriva.h | 36 - apps/plugins/sdl/src/video/fbcon/SDL_fbvideo.c | 1982 ------------- apps/plugins/sdl/src/video/fbcon/SDL_fbvideo.h | 200 -- apps/plugins/sdl/src/video/fbcon/matrox_mmio.h | 51 - apps/plugins/sdl/src/video/fbcon/matrox_regs.h | 376 --- apps/plugins/sdl/src/video/fbcon/riva_mmio.h | 449 --- apps/plugins/sdl/src/video/fbcon/riva_regs.h | 43 - apps/plugins/sdl/src/video/gapi/SDL_gapivideo.c | 1287 --------- apps/plugins/sdl/src/video/gapi/SDL_gapivideo.h | 160 -- apps/plugins/sdl/src/video/gem/SDL_gemevents.c | 375 --- apps/plugins/sdl/src/video/gem/SDL_gemevents_c.h | 33 - apps/plugins/sdl/src/video/gem/SDL_gemmouse.c | 205 -- apps/plugins/sdl/src/video/gem/SDL_gemmouse_c.h | 34 - apps/plugins/sdl/src/video/gem/SDL_gemvideo.c | 1337 --------- apps/plugins/sdl/src/video/gem/SDL_gemvideo.h | 191 -- apps/plugins/sdl/src/video/gem/SDL_gemwm.c | 116 - apps/plugins/sdl/src/video/gem/SDL_gemwm_c.h | 37 - apps/plugins/sdl/src/video/ggi/SDL_ggievents.c | 264 -- apps/plugins/sdl/src/video/ggi/SDL_ggievents_c.h | 29 - apps/plugins/sdl/src/video/ggi/SDL_ggikeys.h | 135 - apps/plugins/sdl/src/video/ggi/SDL_ggimouse.c | 32 - apps/plugins/sdl/src/video/ggi/SDL_ggimouse_c.h | 26 - apps/plugins/sdl/src/video/ggi/SDL_ggivideo.c | 378 --- apps/plugins/sdl/src/video/ggi/SDL_ggivideo.h | 48 - apps/plugins/sdl/src/video/ipod/SDL_ipodvideo.c | 733 ----- apps/plugins/sdl/src/video/ipod/SDL_ipodvideo.h | 38 - .../plugins/sdl/src/video/maccommon/SDL_lowvideo.h | 102 - .../sdl/src/video/maccommon/SDL_macevents.c | 746 ----- .../sdl/src/video/maccommon/SDL_macevents_c.h | 32 - apps/plugins/sdl/src/video/maccommon/SDL_macgl.c | 197 -- apps/plugins/sdl/src/video/maccommon/SDL_macgl_c.h | 47 - apps/plugins/sdl/src/video/maccommon/SDL_mackeys.h | 140 - .../plugins/sdl/src/video/maccommon/SDL_macmouse.c | 129 - .../sdl/src/video/maccommon/SDL_macmouse_c.h | 34 - apps/plugins/sdl/src/video/maccommon/SDL_macwm.c | 442 --- apps/plugins/sdl/src/video/maccommon/SDL_macwm_c.h | 41 - apps/plugins/sdl/src/video/macdsp/SDL_dspvideo.c | 1422 --------- apps/plugins/sdl/src/video/macdsp/SDL_dspvideo.h | 54 - apps/plugins/sdl/src/video/macrom/SDL_romvideo.c | 745 ----- apps/plugins/sdl/src/video/macrom/SDL_romvideo.h | 29 - apps/plugins/sdl/src/video/nanox/SDL_nxevents.c | 382 --- apps/plugins/sdl/src/video/nanox/SDL_nxevents_c.h | 32 - apps/plugins/sdl/src/video/nanox/SDL_nximage.c | 230 -- apps/plugins/sdl/src/video/nanox/SDL_nximage_c.h | 35 - apps/plugins/sdl/src/video/nanox/SDL_nxmodes.c | 84 - apps/plugins/sdl/src/video/nanox/SDL_nxmodes_c.h | 34 - apps/plugins/sdl/src/video/nanox/SDL_nxmouse.c | 79 - apps/plugins/sdl/src/video/nanox/SDL_nxmouse_c.h | 29 - apps/plugins/sdl/src/video/nanox/SDL_nxvideo.c | 544 ---- apps/plugins/sdl/src/video/nanox/SDL_nxvideo.h | 96 - apps/plugins/sdl/src/video/nanox/SDL_nxwm.c | 61 - apps/plugins/sdl/src/video/nanox/SDL_nxwm_c.h | 32 - apps/plugins/sdl/src/video/nds/SDL_ndsevents.c | 83 - apps/plugins/sdl/src/video/nds/SDL_ndsevents_c.h | 51 - apps/plugins/sdl/src/video/nds/SDL_ndsmouse.c | 34 - apps/plugins/sdl/src/video/nds/SDL_ndsmouse_c.h | 26 - apps/plugins/sdl/src/video/nds/SDL_ndsvideo.c | 500 ---- apps/plugins/sdl/src/video/nds/SDL_ndsvideo.h | 61 - apps/plugins/sdl/src/video/os2fslib/SDL_os2fslib.c | 3018 -------------------- apps/plugins/sdl/src/video/os2fslib/SDL_os2fslib.h | 71 - apps/plugins/sdl/src/video/os2fslib/SDL_vkeys.h | 74 - apps/plugins/sdl/src/video/photon/SDL_ph_events.c | 624 ---- .../plugins/sdl/src/video/photon/SDL_ph_events_c.h | 37 - apps/plugins/sdl/src/video/photon/SDL_ph_gl.c | 406 --- apps/plugins/sdl/src/video/photon/SDL_ph_gl.h | 41 - apps/plugins/sdl/src/video/photon/SDL_ph_image.c | 1059 ------- apps/plugins/sdl/src/video/photon/SDL_ph_image_c.h | 59 - apps/plugins/sdl/src/video/photon/SDL_ph_modes.c | 390 --- apps/plugins/sdl/src/video/photon/SDL_ph_modes_c.h | 43 - apps/plugins/sdl/src/video/photon/SDL_ph_mouse.c | 220 -- apps/plugins/sdl/src/video/photon/SDL_ph_mouse_c.h | 39 - apps/plugins/sdl/src/video/photon/SDL_ph_video.c | 648 ----- apps/plugins/sdl/src/video/photon/SDL_ph_video.h | 157 - apps/plugins/sdl/src/video/photon/SDL_ph_wm.c | 118 - apps/plugins/sdl/src/video/photon/SDL_ph_wm_c.h | 37 - apps/plugins/sdl/src/video/photon/SDL_phyuv.c | 504 ---- apps/plugins/sdl/src/video/photon/SDL_phyuv_c.h | 62 - apps/plugins/sdl/src/video/picogui/SDL_pgevents.c | 117 - .../plugins/sdl/src/video/picogui/SDL_pgevents_c.h | 37 - apps/plugins/sdl/src/video/picogui/SDL_pgvideo.c | 364 --- apps/plugins/sdl/src/video/picogui/SDL_pgvideo.h | 50 - apps/plugins/sdl/src/video/ps2gs/SDL_gsevents.c | 977 ------- apps/plugins/sdl/src/video/ps2gs/SDL_gsevents_c.h | 38 - apps/plugins/sdl/src/video/ps2gs/SDL_gskeys.h | 139 - apps/plugins/sdl/src/video/ps2gs/SDL_gsmouse.c | 146 - apps/plugins/sdl/src/video/ps2gs/SDL_gsmouse_c.h | 37 - apps/plugins/sdl/src/video/ps2gs/SDL_gsvideo.c | 689 ----- apps/plugins/sdl/src/video/ps2gs/SDL_gsvideo.h | 95 - apps/plugins/sdl/src/video/ps2gs/SDL_gsyuv.c | 461 --- apps/plugins/sdl/src/video/ps2gs/SDL_gsyuv_c.h | 37 - apps/plugins/sdl/src/video/ps3/SDL_ps3events.c | 44 - apps/plugins/sdl/src/video/ps3/SDL_ps3events_c.h | 41 - apps/plugins/sdl/src/video/ps3/SDL_ps3video.c | 621 ---- apps/plugins/sdl/src/video/ps3/SDL_ps3video.h | 165 -- apps/plugins/sdl/src/video/ps3/SDL_ps3yuv.c | 340 --- apps/plugins/sdl/src/video/ps3/SDL_ps3yuv_c.h | 44 - apps/plugins/sdl/src/video/ps3/spulibs/Makefile | 83 - .../sdl/src/video/ps3/spulibs/bilin_scaler.c | 2050 ------------- apps/plugins/sdl/src/video/ps3/spulibs/fb_writer.c | 193 -- .../plugins/sdl/src/video/ps3/spulibs/spu_common.h | 108 - .../sdl/src/video/ps3/spulibs/yuv2rgb_converter.c | 629 ---- apps/plugins/sdl/src/video/qtopia/SDL_QPEApp.cc | 63 - apps/plugins/sdl/src/video/qtopia/SDL_QPEApp.h | 33 - apps/plugins/sdl/src/video/qtopia/SDL_QWin.cc | 527 ---- apps/plugins/sdl/src/video/qtopia/SDL_QWin.h | 110 - apps/plugins/sdl/src/video/qtopia/SDL_lowvideo.h | 65 - apps/plugins/sdl/src/video/qtopia/SDL_sysevents.cc | 269 -- .../plugins/sdl/src/video/qtopia/SDL_sysevents_c.h | 31 - apps/plugins/sdl/src/video/qtopia/SDL_sysmouse.cc | 56 - apps/plugins/sdl/src/video/qtopia/SDL_sysmouse_c.h | 32 - apps/plugins/sdl/src/video/qtopia/SDL_sysvideo.cc | 403 --- apps/plugins/sdl/src/video/qtopia/SDL_syswm.cc | 35 - apps/plugins/sdl/src/video/qtopia/SDL_syswm_c.h | 28 - apps/plugins/sdl/src/video/quartz/CGS.h | 84 - .../sdl/src/video/quartz/SDL_QuartzEvents.m | 1063 ------- apps/plugins/sdl/src/video/quartz/SDL_QuartzGL.m | 292 -- apps/plugins/sdl/src/video/quartz/SDL_QuartzKeys.h | 146 - .../plugins/sdl/src/video/quartz/SDL_QuartzVideo.h | 229 -- .../plugins/sdl/src/video/quartz/SDL_QuartzVideo.m | 1689 ----------- apps/plugins/sdl/src/video/quartz/SDL_QuartzWM.h | 27 - apps/plugins/sdl/src/video/quartz/SDL_QuartzWM.m | 444 --- .../sdl/src/video/quartz/SDL_QuartzWindow.h | 51 - .../sdl/src/video/quartz/SDL_QuartzWindow.m | 231 -- apps/plugins/sdl/src/video/riscos/SDL_riscosASM.S | 116 - .../src/video/riscos/SDL_riscosFullScreenVideo.c | 777 ----- .../sdl/src/video/riscos/SDL_riscosevents.c | 549 ---- .../sdl/src/video/riscos/SDL_riscosevents_c.h | 34 - .../plugins/sdl/src/video/riscos/SDL_riscosmouse.c | 371 --- .../sdl/src/video/riscos/SDL_riscosmouse_c.h | 44 - .../sdl/src/video/riscos/SDL_riscossprite.c | 265 -- apps/plugins/sdl/src/video/riscos/SDL_riscostask.c | 350 --- apps/plugins/sdl/src/video/riscos/SDL_riscostask.h | 39 - .../plugins/sdl/src/video/riscos/SDL_riscosvideo.c | 316 -- .../plugins/sdl/src/video/riscos/SDL_riscosvideo.h | 62 - apps/plugins/sdl/src/video/riscos/SDL_wimppoll.c | 330 --- apps/plugins/sdl/src/video/riscos/SDL_wimpvideo.c | 501 ---- apps/plugins/sdl/src/video/svga/SDL_svgaevents.c | 412 --- apps/plugins/sdl/src/video/svga/SDL_svgaevents_c.h | 35 - apps/plugins/sdl/src/video/svga/SDL_svgamouse.c | 33 - apps/plugins/sdl/src/video/svga/SDL_svgamouse_c.h | 26 - apps/plugins/sdl/src/video/svga/SDL_svgavideo.c | 584 ---- apps/plugins/sdl/src/video/svga/SDL_svgavideo.h | 58 - .../sdl/src/video/symbian/EKA1/SDL_epocevents.cpp | 626 ---- .../sdl/src/video/symbian/EKA1/SDL_epocvideo.cpp | 1356 --------- .../sdl/src/video/symbian/EKA1/SDL_epocvideo.h | 34 - .../sdl/src/video/symbian/EKA2/SDL_epocevents.cpp | 521 ---- .../sdl/src/video/symbian/EKA2/SDL_epocvideo.cpp | 594 ---- .../sdl/src/video/symbian/EKA2/SDL_epocvideo.h | 51 - apps/plugins/sdl/src/video/symbian/EKA2/dsa.cpp | 1505 ---------- .../plugins/sdl/src/video/symbian/EKA2/dsa_new.cpp | 1443 ---------- .../plugins/sdl/src/video/symbian/EKA2/dsa_old.cpp | 1075 ------- .../sdl/src/video/symbian/SDL_epocevents_c.h | 60 - apps/plugins/sdl/src/video/vgl/SDL_vglevents.c | 299 -- apps/plugins/sdl/src/video/vgl/SDL_vglevents_c.h | 155 - apps/plugins/sdl/src/video/vgl/SDL_vglmouse.c | 56 - apps/plugins/sdl/src/video/vgl/SDL_vglmouse_c.h | 32 - apps/plugins/sdl/src/video/vgl/SDL_vglvideo.c | 624 ---- apps/plugins/sdl/src/video/vgl/SDL_vglvideo.h | 65 - .../plugins/sdl/src/video/wincommon/SDL_lowvideo.h | 152 - .../sdl/src/video/wincommon/SDL_sysevents.c | 855 ------ .../plugins/sdl/src/video/wincommon/SDL_sysmouse.c | 259 -- .../sdl/src/video/wincommon/SDL_sysmouse_c.h | 33 - apps/plugins/sdl/src/video/wincommon/SDL_syswm.c | 297 -- apps/plugins/sdl/src/video/wincommon/SDL_syswm_c.h | 35 - apps/plugins/sdl/src/video/wincommon/SDL_wingl.c | 659 ----- apps/plugins/sdl/src/video/wincommon/SDL_wingl_c.h | 135 - apps/plugins/sdl/src/video/wincommon/wmmsg.h | 1030 ------- apps/plugins/sdl/src/video/windib/SDL_dibevents.c | 704 ----- .../plugins/sdl/src/video/windib/SDL_dibevents_c.h | 35 - apps/plugins/sdl/src/video/windib/SDL_dibvideo.c | 1323 --------- apps/plugins/sdl/src/video/windib/SDL_dibvideo.h | 59 - .../sdl/src/video/windib/SDL_gapidibvideo.h | 56 - apps/plugins/sdl/src/video/windib/SDL_vkeys.h | 75 - apps/plugins/sdl/src/video/windx5/SDL_dx5events.c | 1005 ------- .../plugins/sdl/src/video/windx5/SDL_dx5events_c.h | 37 - apps/plugins/sdl/src/video/windx5/SDL_dx5video.c | 2537 ---------------- apps/plugins/sdl/src/video/windx5/SDL_dx5video.h | 61 - apps/plugins/sdl/src/video/windx5/SDL_dx5yuv.c | 296 -- apps/plugins/sdl/src/video/windx5/SDL_dx5yuv_c.h | 38 - apps/plugins/sdl/src/video/windx5/directx.h | 97 - .../sdl/src/video/wscons/SDL_wsconsevents.c | 233 -- .../sdl/src/video/wscons/SDL_wsconsevents_c.h | 36 - .../plugins/sdl/src/video/wscons/SDL_wsconsmouse.c | 33 - .../sdl/src/video/wscons/SDL_wsconsmouse_c.h | 26 - .../plugins/sdl/src/video/wscons/SDL_wsconsvideo.c | 609 ---- .../plugins/sdl/src/video/wscons/SDL_wsconsvideo.h | 76 - apps/plugins/sdl/src/video/x11/SDL_x11dga.c | 90 - apps/plugins/sdl/src/video/x11/SDL_x11dga_c.h | 33 - apps/plugins/sdl/src/video/x11/SDL_x11dyn.c | 222 -- apps/plugins/sdl/src/video/x11/SDL_x11dyn.h | 93 - apps/plugins/sdl/src/video/x11/SDL_x11events.c | 1414 --------- apps/plugins/sdl/src/video/x11/SDL_x11events_c.h | 34 - apps/plugins/sdl/src/video/x11/SDL_x11gamma.c | 142 - apps/plugins/sdl/src/video/x11/SDL_x11gamma_c.h | 32 - apps/plugins/sdl/src/video/x11/SDL_x11gl.c | 577 ---- apps/plugins/sdl/src/video/x11/SDL_x11gl_c.h | 99 - apps/plugins/sdl/src/video/x11/SDL_x11image.c | 316 -- apps/plugins/sdl/src/video/x11/SDL_x11image_c.h | 38 - apps/plugins/sdl/src/video/x11/SDL_x11modes.c | 1143 -------- apps/plugins/sdl/src/video/x11/SDL_x11modes_c.h | 43 - apps/plugins/sdl/src/video/x11/SDL_x11mouse.c | 288 -- apps/plugins/sdl/src/video/x11/SDL_x11mouse_c.h | 33 - apps/plugins/sdl/src/video/x11/SDL_x11sym.h | 201 -- apps/plugins/sdl/src/video/x11/SDL_x11video.c | 1571 ---------- apps/plugins/sdl/src/video/x11/SDL_x11video.h | 214 -- apps/plugins/sdl/src/video/x11/SDL_x11wm.c | 434 --- apps/plugins/sdl/src/video/x11/SDL_x11wm_c.h | 34 - apps/plugins/sdl/src/video/x11/SDL_x11yuv.c | 538 ---- apps/plugins/sdl/src/video/x11/SDL_x11yuv_c.h | 41 - apps/plugins/sdl/src/video/xbios/SDL_xbios.c | 1116 -------- apps/plugins/sdl/src/video/xbios/SDL_xbios.h | 111 - .../plugins/sdl/src/video/xbios/SDL_xbios_blowup.c | 77 - .../plugins/sdl/src/video/xbios/SDL_xbios_blowup.h | 86 - .../sdl/src/video/xbios/SDL_xbios_centscreen.c | 104 - .../sdl/src/video/xbios/SDL_xbios_centscreen.h | 114 - apps/plugins/sdl/src/video/xbios/SDL_xbios_milan.c | 106 - apps/plugins/sdl/src/video/xbios/SDL_xbios_milan.h | 129 - apps/plugins/sdl/src/video/xbios/SDL_xbios_sb3.c | 83 - apps/plugins/sdl/src/video/xbios/SDL_xbios_sb3.h | 82 - .../sdl/src/video/xbios/SDL_xbios_tveille.c | 63 - .../sdl/src/video/xbios/SDL_xbios_tveille.h | 64 - 530 files changed, 138647 deletions(-) delete mode 100644 apps/plugins/sdl/src/audio/alsa/SDL_alsa_audio.c delete mode 100644 apps/plugins/sdl/src/audio/alsa/SDL_alsa_audio.h delete mode 100644 apps/plugins/sdl/src/audio/arts/SDL_artsaudio.c delete mode 100644 apps/plugins/sdl/src/audio/arts/SDL_artsaudio.h delete mode 100644 apps/plugins/sdl/src/audio/baudio/SDL_beaudio.cc delete mode 100644 apps/plugins/sdl/src/audio/baudio/SDL_beaudio.h delete mode 100644 apps/plugins/sdl/src/audio/bsd/SDL_bsdaudio.c delete mode 100644 apps/plugins/sdl/src/audio/bsd/SDL_bsdaudio.h delete mode 100644 apps/plugins/sdl/src/audio/dart/SDL_dart.c delete mode 100644 apps/plugins/sdl/src/audio/dart/SDL_dart.h delete mode 100644 apps/plugins/sdl/src/audio/dc/SDL_dcaudio.c delete mode 100644 apps/plugins/sdl/src/audio/dc/SDL_dcaudio.h delete mode 100644 apps/plugins/sdl/src/audio/dc/aica.c delete mode 100644 apps/plugins/sdl/src/audio/dc/aica.h delete mode 100644 apps/plugins/sdl/src/audio/disk/SDL_diskaudio.c delete mode 100644 apps/plugins/sdl/src/audio/disk/SDL_diskaudio.h delete mode 100644 apps/plugins/sdl/src/audio/dma/SDL_dmaaudio.c delete mode 100644 apps/plugins/sdl/src/audio/dma/SDL_dmaaudio.h delete mode 100644 apps/plugins/sdl/src/audio/dmedia/SDL_irixaudio.c delete mode 100644 apps/plugins/sdl/src/audio/dmedia/SDL_irixaudio.h delete mode 100644 apps/plugins/sdl/src/audio/dsp/SDL_dspaudio.c delete mode 100644 apps/plugins/sdl/src/audio/dsp/SDL_dspaudio.h delete mode 100644 apps/plugins/sdl/src/audio/esd/SDL_esdaudio.c delete mode 100644 apps/plugins/sdl/src/audio/esd/SDL_esdaudio.h delete mode 100644 apps/plugins/sdl/src/audio/macosx/SDL_coreaudio.c delete mode 100644 apps/plugins/sdl/src/audio/macosx/SDL_coreaudio.h delete mode 100644 apps/plugins/sdl/src/audio/macrom/SDL_romaudio.c delete mode 100644 apps/plugins/sdl/src/audio/macrom/SDL_romaudio.h delete mode 100644 apps/plugins/sdl/src/audio/mint/SDL_mintaudio.c delete mode 100644 apps/plugins/sdl/src/audio/mint/SDL_mintaudio.h delete mode 100644 apps/plugins/sdl/src/audio/mint/SDL_mintaudio_dma8.c delete mode 100644 apps/plugins/sdl/src/audio/mint/SDL_mintaudio_dma8.h delete mode 100644 apps/plugins/sdl/src/audio/mint/SDL_mintaudio_gsxb.c delete mode 100644 apps/plugins/sdl/src/audio/mint/SDL_mintaudio_gsxb.h delete mode 100644 apps/plugins/sdl/src/audio/mint/SDL_mintaudio_it.S delete mode 100644 apps/plugins/sdl/src/audio/mint/SDL_mintaudio_mcsn.c delete mode 100644 apps/plugins/sdl/src/audio/mint/SDL_mintaudio_mcsn.h delete mode 100644 apps/plugins/sdl/src/audio/mint/SDL_mintaudio_stfa.c delete mode 100644 apps/plugins/sdl/src/audio/mint/SDL_mintaudio_stfa.h delete mode 100644 apps/plugins/sdl/src/audio/mint/SDL_mintaudio_xbios.c delete mode 100644 apps/plugins/sdl/src/audio/mme/SDL_mmeaudio.c delete mode 100644 apps/plugins/sdl/src/audio/mme/SDL_mmeaudio.h delete mode 100644 apps/plugins/sdl/src/audio/nas/SDL_nasaudio.c delete mode 100644 apps/plugins/sdl/src/audio/nas/SDL_nasaudio.h delete mode 100644 apps/plugins/sdl/src/audio/nds/SDL_ndsaudio.c delete mode 100644 apps/plugins/sdl/src/audio/nds/SDL_ndsaudio.h delete mode 100644 apps/plugins/sdl/src/audio/nds/sound9.c delete mode 100644 apps/plugins/sdl/src/audio/nds/soundcommon.h delete mode 100644 apps/plugins/sdl/src/audio/nto/SDL_nto_audio.c delete mode 100644 apps/plugins/sdl/src/audio/nto/SDL_nto_audio.h delete mode 100644 apps/plugins/sdl/src/audio/paudio/SDL_paudio.c delete mode 100644 apps/plugins/sdl/src/audio/paudio/SDL_paudio.h delete mode 100644 apps/plugins/sdl/src/audio/pulse/SDL_pulseaudio.c delete mode 100644 apps/plugins/sdl/src/audio/pulse/SDL_pulseaudio.h delete mode 100644 apps/plugins/sdl/src/audio/sun/SDL_sunaudio.c delete mode 100644 apps/plugins/sdl/src/audio/sun/SDL_sunaudio.h delete mode 100644 apps/plugins/sdl/src/audio/symbian/SDL_epocaudio.cpp delete mode 100644 apps/plugins/sdl/src/audio/symbian/SDL_epocaudio.h delete mode 100644 apps/plugins/sdl/src/audio/symbian/streamplayer.cpp delete mode 100644 apps/plugins/sdl/src/audio/symbian/streamplayer.h delete mode 100644 apps/plugins/sdl/src/audio/ums/SDL_umsaudio.c delete mode 100644 apps/plugins/sdl/src/audio/ums/SDL_umsaudio.h delete mode 100644 apps/plugins/sdl/src/audio/windib/SDL_dibaudio.c delete mode 100644 apps/plugins/sdl/src/audio/windib/SDL_dibaudio.h delete mode 100644 apps/plugins/sdl/src/audio/windx5/SDL_dx5audio.c delete mode 100644 apps/plugins/sdl/src/audio/windx5/SDL_dx5audio.h delete mode 100644 apps/plugins/sdl/src/audio/windx5/directx.h delete mode 100644 apps/plugins/sdl/src/cdrom/aix/SDL_syscdrom.c delete mode 100644 apps/plugins/sdl/src/cdrom/beos/SDL_syscdrom.cc delete mode 100644 apps/plugins/sdl/src/cdrom/bsdi/SDL_syscdrom.c delete mode 100644 apps/plugins/sdl/src/cdrom/dc/SDL_syscdrom.c delete mode 100644 apps/plugins/sdl/src/cdrom/freebsd/SDL_syscdrom.c delete mode 100644 apps/plugins/sdl/src/cdrom/linux/SDL_syscdrom.c delete mode 100644 apps/plugins/sdl/src/cdrom/macos/SDL_syscdrom.c delete mode 100644 apps/plugins/sdl/src/cdrom/macos/SDL_syscdrom_c.h delete mode 100644 apps/plugins/sdl/src/cdrom/macosx/AudioFilePlayer.c delete mode 100644 apps/plugins/sdl/src/cdrom/macosx/AudioFilePlayer.h delete mode 100644 apps/plugins/sdl/src/cdrom/macosx/AudioFileReaderThread.c delete mode 100644 apps/plugins/sdl/src/cdrom/macosx/CDPlayer.c delete mode 100644 apps/plugins/sdl/src/cdrom/macosx/CDPlayer.h delete mode 100644 apps/plugins/sdl/src/cdrom/macosx/SDLOSXCAGuard.c delete mode 100644 apps/plugins/sdl/src/cdrom/macosx/SDLOSXCAGuard.h delete mode 100644 apps/plugins/sdl/src/cdrom/macosx/SDL_syscdrom.c delete mode 100644 apps/plugins/sdl/src/cdrom/macosx/SDL_syscdrom_c.h delete mode 100644 apps/plugins/sdl/src/cdrom/mint/SDL_syscdrom.c delete mode 100644 apps/plugins/sdl/src/cdrom/openbsd/SDL_syscdrom.c delete mode 100644 apps/plugins/sdl/src/cdrom/os2/SDL_syscdrom.c delete mode 100644 apps/plugins/sdl/src/cdrom/osf/SDL_syscdrom.c delete mode 100644 apps/plugins/sdl/src/cdrom/qnx/SDL_syscdrom.c delete mode 100644 apps/plugins/sdl/src/cdrom/win32/SDL_syscdrom.c delete mode 100644 apps/plugins/sdl/src/hermes/COPYING.LIB delete mode 100644 apps/plugins/sdl/src/hermes/HeadMMX.h delete mode 100644 apps/plugins/sdl/src/hermes/HeadX86.h delete mode 100644 apps/plugins/sdl/src/hermes/README delete mode 100644 apps/plugins/sdl/src/hermes/common.inc delete mode 100644 apps/plugins/sdl/src/hermes/mmx_main.asm delete mode 100644 apps/plugins/sdl/src/hermes/mmxp2_32.asm delete mode 100644 apps/plugins/sdl/src/hermes/x86_main.asm delete mode 100644 apps/plugins/sdl/src/hermes/x86p_16.asm delete mode 100644 apps/plugins/sdl/src/hermes/x86p_32.asm delete mode 100644 apps/plugins/sdl/src/joystick/beos/SDL_bejoystick.cc delete mode 100644 apps/plugins/sdl/src/joystick/bsd/SDL_sysjoystick.c delete mode 100644 apps/plugins/sdl/src/joystick/darwin/SDL_sysjoystick.c delete mode 100644 apps/plugins/sdl/src/joystick/dc/SDL_sysjoystick.c delete mode 100644 apps/plugins/sdl/src/joystick/linux/SDL_sysjoystick.c delete mode 100644 apps/plugins/sdl/src/joystick/macos/SDL_sysjoystick.c delete mode 100644 apps/plugins/sdl/src/joystick/mint/SDL_sysjoystick.c delete mode 100644 apps/plugins/sdl/src/joystick/nds/SDL_sysjoystick.c delete mode 100644 apps/plugins/sdl/src/joystick/riscos/SDL_sysjoystick.c delete mode 100644 apps/plugins/sdl/src/joystick/win32/SDL_mmjoystick.c delete mode 100644 apps/plugins/sdl/src/loadso/beos/SDL_sysloadso.c delete mode 100644 apps/plugins/sdl/src/loadso/dlopen/SDL_sysloadso.c delete mode 100644 apps/plugins/sdl/src/loadso/macos/SDL_sysloadso.c delete mode 100644 apps/plugins/sdl/src/loadso/macosx/SDL_dlcompat.c delete mode 100644 apps/plugins/sdl/src/loadso/mint/SDL_sysloadso.c delete mode 100644 apps/plugins/sdl/src/loadso/os2/SDL_sysloadso.c delete mode 100644 apps/plugins/sdl/src/loadso/win32/SDL_sysloadso.c delete mode 100644 apps/plugins/sdl/src/main/beos/SDL_BeApp.cc delete mode 100644 apps/plugins/sdl/src/main/beos/SDL_BeApp.h delete mode 100644 apps/plugins/sdl/src/main/macos/SDL.r delete mode 100644 apps/plugins/sdl/src/main/macos/SDL.shlib.r delete mode 100644 apps/plugins/sdl/src/main/macos/SDL_main.c delete mode 100644 apps/plugins/sdl/src/main/macos/SIZE.r delete mode 100644 apps/plugins/sdl/src/main/macos/exports/Makefile delete mode 100644 apps/plugins/sdl/src/main/macos/exports/SDL.x delete mode 100644 apps/plugins/sdl/src/main/macos/exports/gendef.pl delete mode 100644 apps/plugins/sdl/src/main/macosx/Info.plist.in delete mode 100644 apps/plugins/sdl/src/main/macosx/SDLMain.h delete mode 100644 apps/plugins/sdl/src/main/macosx/SDLMain.m delete mode 100644 apps/plugins/sdl/src/main/macosx/SDLMain.nib/classes.nib delete mode 100644 apps/plugins/sdl/src/main/macosx/SDLMain.nib/info.nib delete mode 100644 apps/plugins/sdl/src/main/macosx/SDLMain.nib/objects.nib delete mode 100644 apps/plugins/sdl/src/main/macosx/info.nib delete mode 100644 apps/plugins/sdl/src/main/qtopia/SDL_qtopia_main.cc delete mode 100644 apps/plugins/sdl/src/main/symbian/EKA1/SDL_main.cpp delete mode 100644 apps/plugins/sdl/src/main/symbian/EKA2/SDL_main.cpp delete mode 100644 apps/plugins/sdl/src/main/symbian/EKA2/sdlexe.cpp delete mode 100644 apps/plugins/sdl/src/main/symbian/EKA2/sdllib.cpp delete mode 100644 apps/plugins/sdl/src/main/symbian/EKA2/vectorbuffer.cpp delete mode 100644 apps/plugins/sdl/src/main/symbian/EKA2/vectorbuffer.h delete mode 100644 apps/plugins/sdl/src/main/win32/SDL_win32_main.c delete mode 100644 apps/plugins/sdl/src/main/win32/version.rc delete mode 100644 apps/plugins/sdl/src/thread/beos/SDL_syssem.c delete mode 100644 apps/plugins/sdl/src/thread/beos/SDL_systhread.c delete mode 100644 apps/plugins/sdl/src/thread/beos/SDL_systhread_c.h delete mode 100644 apps/plugins/sdl/src/thread/dc/SDL_syscond.c delete mode 100644 apps/plugins/sdl/src/thread/dc/SDL_syscond_c.h delete mode 100644 apps/plugins/sdl/src/thread/dc/SDL_sysmutex.c delete mode 100644 apps/plugins/sdl/src/thread/dc/SDL_sysmutex_c.h delete mode 100644 apps/plugins/sdl/src/thread/dc/SDL_syssem.c delete mode 100644 apps/plugins/sdl/src/thread/dc/SDL_syssem_c.h delete mode 100644 apps/plugins/sdl/src/thread/dc/SDL_systhread.c delete mode 100644 apps/plugins/sdl/src/thread/dc/SDL_systhread_c.h delete mode 100644 apps/plugins/sdl/src/thread/irix/SDL_syssem.c delete mode 100644 apps/plugins/sdl/src/thread/irix/SDL_systhread.c delete mode 100644 apps/plugins/sdl/src/thread/irix/SDL_systhread_c.h delete mode 100644 apps/plugins/sdl/src/thread/os2/SDL_syscond.c delete mode 100644 apps/plugins/sdl/src/thread/os2/SDL_syscond_c.h delete mode 100644 apps/plugins/sdl/src/thread/os2/SDL_sysmutex.c delete mode 100644 apps/plugins/sdl/src/thread/os2/SDL_syssem.c delete mode 100644 apps/plugins/sdl/src/thread/os2/SDL_systhread.c delete mode 100644 apps/plugins/sdl/src/thread/os2/SDL_systhread_c.h delete mode 100644 apps/plugins/sdl/src/thread/pth/SDL_syscond.c delete mode 100644 apps/plugins/sdl/src/thread/pth/SDL_sysmutex.c delete mode 100644 apps/plugins/sdl/src/thread/pth/SDL_sysmutex_c.h delete mode 100644 apps/plugins/sdl/src/thread/pth/SDL_systhread.c delete mode 100644 apps/plugins/sdl/src/thread/pth/SDL_systhread_c.h delete mode 100644 apps/plugins/sdl/src/thread/pthread/SDL_syscond.c delete mode 100644 apps/plugins/sdl/src/thread/pthread/SDL_sysmutex.c delete mode 100644 apps/plugins/sdl/src/thread/pthread/SDL_sysmutex_c.h delete mode 100644 apps/plugins/sdl/src/thread/pthread/SDL_syssem.c delete mode 100644 apps/plugins/sdl/src/thread/pthread/SDL_systhread.c delete mode 100644 apps/plugins/sdl/src/thread/pthread/SDL_systhread_c.h delete mode 100644 apps/plugins/sdl/src/thread/riscos/SDL_syscond.c delete mode 100644 apps/plugins/sdl/src/thread/riscos/SDL_sysmutex.c delete mode 100644 apps/plugins/sdl/src/thread/riscos/SDL_sysmutex_c.h delete mode 100644 apps/plugins/sdl/src/thread/riscos/SDL_syssem.c delete mode 100644 apps/plugins/sdl/src/thread/riscos/SDL_systhread.c delete mode 100644 apps/plugins/sdl/src/thread/riscos/SDL_systhread_c.h delete mode 100644 apps/plugins/sdl/src/thread/symbian/SDL_sysmutex.cpp delete mode 100644 apps/plugins/sdl/src/thread/symbian/SDL_syssem.cpp delete mode 100644 apps/plugins/sdl/src/thread/symbian/SDL_systhread.cpp delete mode 100644 apps/plugins/sdl/src/thread/symbian/SDL_systhread_c.h delete mode 100644 apps/plugins/sdl/src/thread/win32/SDL_sysmutex.c delete mode 100644 apps/plugins/sdl/src/thread/win32/SDL_syssem.c delete mode 100644 apps/plugins/sdl/src/thread/win32/SDL_systhread.c delete mode 100644 apps/plugins/sdl/src/thread/win32/SDL_systhread_c.h delete mode 100644 apps/plugins/sdl/src/thread/win32/win_ce_semaphore.c delete mode 100644 apps/plugins/sdl/src/thread/win32/win_ce_semaphore.h delete mode 100644 apps/plugins/sdl/src/timer/beos/SDL_systimer.c delete mode 100644 apps/plugins/sdl/src/timer/dc/SDL_systimer.c delete mode 100644 apps/plugins/sdl/src/timer/macos/FastTimes.c delete mode 100644 apps/plugins/sdl/src/timer/macos/FastTimes.h delete mode 100644 apps/plugins/sdl/src/timer/macos/SDL_MPWtimer.c delete mode 100644 apps/plugins/sdl/src/timer/macos/SDL_systimer.c delete mode 100644 apps/plugins/sdl/src/timer/mint/SDL_systimer.c delete mode 100644 apps/plugins/sdl/src/timer/mint/SDL_vbltimer.S delete mode 100644 apps/plugins/sdl/src/timer/mint/SDL_vbltimer_s.h delete mode 100644 apps/plugins/sdl/src/timer/nds/SDL_systimer.c delete mode 100644 apps/plugins/sdl/src/timer/os2/SDL_systimer.c delete mode 100644 apps/plugins/sdl/src/timer/riscos/SDL_systimer.c delete mode 100644 apps/plugins/sdl/src/timer/symbian/SDL_systimer.cpp delete mode 100644 apps/plugins/sdl/src/timer/unix/SDL_systimer.c delete mode 100644 apps/plugins/sdl/src/timer/win32/SDL_systimer.c delete mode 100644 apps/plugins/sdl/src/timer/wince/SDL_systimer.c delete mode 100644 apps/plugins/sdl/src/video/Xext/README delete mode 100644 apps/plugins/sdl/src/video/Xext/XME/xme.c delete mode 100644 apps/plugins/sdl/src/video/Xext/Xinerama/Xinerama.c delete mode 100644 apps/plugins/sdl/src/video/Xext/Xv/Xv.c delete mode 100644 apps/plugins/sdl/src/video/Xext/Xv/Xvlibint.h delete mode 100644 apps/plugins/sdl/src/video/Xext/Xxf86dga/XF86DGA.c delete mode 100644 apps/plugins/sdl/src/video/Xext/Xxf86dga/XF86DGA2.c delete mode 100644 apps/plugins/sdl/src/video/Xext/Xxf86vm/XF86VMode.c delete mode 100644 apps/plugins/sdl/src/video/Xext/extensions/Xext.h delete mode 100644 apps/plugins/sdl/src/video/Xext/extensions/Xinerama.h delete mode 100644 apps/plugins/sdl/src/video/Xext/extensions/Xv.h delete mode 100644 apps/plugins/sdl/src/video/Xext/extensions/Xvlib.h delete mode 100644 apps/plugins/sdl/src/video/Xext/extensions/Xvproto.h delete mode 100644 apps/plugins/sdl/src/video/Xext/extensions/extutil.h delete mode 100644 apps/plugins/sdl/src/video/Xext/extensions/panoramiXext.h delete mode 100644 apps/plugins/sdl/src/video/Xext/extensions/panoramiXproto.h delete mode 100644 apps/plugins/sdl/src/video/Xext/extensions/xf86dga.h delete mode 100644 apps/plugins/sdl/src/video/Xext/extensions/xf86dga1.h delete mode 100644 apps/plugins/sdl/src/video/Xext/extensions/xf86dga1str.h delete mode 100644 apps/plugins/sdl/src/video/Xext/extensions/xf86dgastr.h delete mode 100644 apps/plugins/sdl/src/video/Xext/extensions/xf86vmode.h delete mode 100644 apps/plugins/sdl/src/video/Xext/extensions/xf86vmstr.h delete mode 100644 apps/plugins/sdl/src/video/Xext/extensions/xme.h delete mode 100644 apps/plugins/sdl/src/video/aalib/SDL_aaevents.c delete mode 100644 apps/plugins/sdl/src/video/aalib/SDL_aaevents_c.h delete mode 100644 apps/plugins/sdl/src/video/aalib/SDL_aamouse.c delete mode 100644 apps/plugins/sdl/src/video/aalib/SDL_aamouse_c.h delete mode 100644 apps/plugins/sdl/src/video/aalib/SDL_aavideo.c delete mode 100644 apps/plugins/sdl/src/video/aalib/SDL_aavideo.h delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_ataric2p.S delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_ataric2p_s.h delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_ataridevmouse.c delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_ataridevmouse_c.h delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_atarieddi.S delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_atarieddi_s.h delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_atarievents.c delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_atarievents_c.h delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_atarigl.c delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_atarigl_c.h delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_atarikeys.h delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_atarimxalloc.c delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_atarimxalloc_c.h delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_atarisuper.h delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_biosevents.c delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_biosevents_c.h delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_gemdosevents.c delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_gemdosevents_c.h delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_ikbdevents.c delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_ikbdevents_c.h delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_ikbdinterrupt.S delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_ikbdinterrupt_s.h delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_xbiosevents.c delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_xbiosevents_c.h delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_xbiosinterrupt.S delete mode 100644 apps/plugins/sdl/src/video/ataricommon/SDL_xbiosinterrupt_s.h delete mode 100644 apps/plugins/sdl/src/video/bwindow/SDL_BView.h delete mode 100644 apps/plugins/sdl/src/video/bwindow/SDL_BWin.h delete mode 100644 apps/plugins/sdl/src/video/bwindow/SDL_lowvideo.h delete mode 100644 apps/plugins/sdl/src/video/bwindow/SDL_sysevents.cc delete mode 100644 apps/plugins/sdl/src/video/bwindow/SDL_sysevents_c.h delete mode 100644 apps/plugins/sdl/src/video/bwindow/SDL_sysmouse.cc delete mode 100644 apps/plugins/sdl/src/video/bwindow/SDL_sysmouse_c.h delete mode 100644 apps/plugins/sdl/src/video/bwindow/SDL_sysvideo.cc delete mode 100644 apps/plugins/sdl/src/video/bwindow/SDL_syswm.cc delete mode 100644 apps/plugins/sdl/src/video/bwindow/SDL_syswm_c.h delete mode 100644 apps/plugins/sdl/src/video/bwindow/SDL_sysyuv.cc delete mode 100644 apps/plugins/sdl/src/video/bwindow/SDL_sysyuv.h delete mode 100644 apps/plugins/sdl/src/video/caca/SDL_cacaevents.c delete mode 100644 apps/plugins/sdl/src/video/caca/SDL_cacaevents_c.h delete mode 100644 apps/plugins/sdl/src/video/caca/SDL_cacavideo.c delete mode 100644 apps/plugins/sdl/src/video/caca/SDL_cacavideo.h delete mode 100644 apps/plugins/sdl/src/video/dc/SDL_dcevents.c delete mode 100644 apps/plugins/sdl/src/video/dc/SDL_dcevents_c.h delete mode 100644 apps/plugins/sdl/src/video/dc/SDL_dcmouse.c delete mode 100644 apps/plugins/sdl/src/video/dc/SDL_dcmouse_c.h delete mode 100644 apps/plugins/sdl/src/video/dc/SDL_dcvideo.c delete mode 100644 apps/plugins/sdl/src/video/dc/SDL_dcvideo.h delete mode 100644 apps/plugins/sdl/src/video/dga/SDL_dgaevents.c delete mode 100644 apps/plugins/sdl/src/video/dga/SDL_dgaevents_c.h delete mode 100644 apps/plugins/sdl/src/video/dga/SDL_dgamouse.c delete mode 100644 apps/plugins/sdl/src/video/dga/SDL_dgamouse_c.h delete mode 100644 apps/plugins/sdl/src/video/dga/SDL_dgavideo.c delete mode 100644 apps/plugins/sdl/src/video/dga/SDL_dgavideo.h delete mode 100644 apps/plugins/sdl/src/video/directfb/SDL_DirectFB_events.c delete mode 100644 apps/plugins/sdl/src/video/directfb/SDL_DirectFB_events.h delete mode 100644 apps/plugins/sdl/src/video/directfb/SDL_DirectFB_keys.h delete mode 100644 apps/plugins/sdl/src/video/directfb/SDL_DirectFB_video.c delete mode 100644 apps/plugins/sdl/src/video/directfb/SDL_DirectFB_video.h delete mode 100644 apps/plugins/sdl/src/video/directfb/SDL_DirectFB_yuv.c delete mode 100644 apps/plugins/sdl/src/video/directfb/SDL_DirectFB_yuv.h delete mode 100644 apps/plugins/sdl/src/video/fbcon/3dfx_mmio.h delete mode 100644 apps/plugins/sdl/src/video/fbcon/3dfx_regs.h delete mode 100644 apps/plugins/sdl/src/video/fbcon/SDL_fb3dfx.c delete mode 100644 apps/plugins/sdl/src/video/fbcon/SDL_fb3dfx.h delete mode 100644 apps/plugins/sdl/src/video/fbcon/SDL_fbelo.c delete mode 100644 apps/plugins/sdl/src/video/fbcon/SDL_fbelo.h delete mode 100644 apps/plugins/sdl/src/video/fbcon/SDL_fbevents.c delete mode 100644 apps/plugins/sdl/src/video/fbcon/SDL_fbevents_c.h delete mode 100644 apps/plugins/sdl/src/video/fbcon/SDL_fbkeys.h delete mode 100644 apps/plugins/sdl/src/video/fbcon/SDL_fbmatrox.c delete mode 100644 apps/plugins/sdl/src/video/fbcon/SDL_fbmatrox.h delete mode 100644 apps/plugins/sdl/src/video/fbcon/SDL_fbmouse.c delete mode 100644 apps/plugins/sdl/src/video/fbcon/SDL_fbmouse_c.h delete mode 100644 apps/plugins/sdl/src/video/fbcon/SDL_fbriva.c delete mode 100644 apps/plugins/sdl/src/video/fbcon/SDL_fbriva.h delete mode 100644 apps/plugins/sdl/src/video/fbcon/SDL_fbvideo.c delete mode 100644 apps/plugins/sdl/src/video/fbcon/SDL_fbvideo.h delete mode 100644 apps/plugins/sdl/src/video/fbcon/matrox_mmio.h delete mode 100644 apps/plugins/sdl/src/video/fbcon/matrox_regs.h delete mode 100644 apps/plugins/sdl/src/video/fbcon/riva_mmio.h delete mode 100644 apps/plugins/sdl/src/video/fbcon/riva_regs.h delete mode 100644 apps/plugins/sdl/src/video/gapi/SDL_gapivideo.c delete mode 100644 apps/plugins/sdl/src/video/gapi/SDL_gapivideo.h delete mode 100644 apps/plugins/sdl/src/video/gem/SDL_gemevents.c delete mode 100644 apps/plugins/sdl/src/video/gem/SDL_gemevents_c.h delete mode 100644 apps/plugins/sdl/src/video/gem/SDL_gemmouse.c delete mode 100644 apps/plugins/sdl/src/video/gem/SDL_gemmouse_c.h delete mode 100644 apps/plugins/sdl/src/video/gem/SDL_gemvideo.c delete mode 100644 apps/plugins/sdl/src/video/gem/SDL_gemvideo.h delete mode 100644 apps/plugins/sdl/src/video/gem/SDL_gemwm.c delete mode 100644 apps/plugins/sdl/src/video/gem/SDL_gemwm_c.h delete mode 100644 apps/plugins/sdl/src/video/ggi/SDL_ggievents.c delete mode 100755 apps/plugins/sdl/src/video/ggi/SDL_ggievents_c.h delete mode 100644 apps/plugins/sdl/src/video/ggi/SDL_ggikeys.h delete mode 100644 apps/plugins/sdl/src/video/ggi/SDL_ggimouse.c delete mode 100755 apps/plugins/sdl/src/video/ggi/SDL_ggimouse_c.h delete mode 100644 apps/plugins/sdl/src/video/ggi/SDL_ggivideo.c delete mode 100644 apps/plugins/sdl/src/video/ggi/SDL_ggivideo.h delete mode 100644 apps/plugins/sdl/src/video/ipod/SDL_ipodvideo.c delete mode 100644 apps/plugins/sdl/src/video/ipod/SDL_ipodvideo.h delete mode 100644 apps/plugins/sdl/src/video/maccommon/SDL_lowvideo.h delete mode 100644 apps/plugins/sdl/src/video/maccommon/SDL_macevents.c delete mode 100644 apps/plugins/sdl/src/video/maccommon/SDL_macevents_c.h delete mode 100644 apps/plugins/sdl/src/video/maccommon/SDL_macgl.c delete mode 100644 apps/plugins/sdl/src/video/maccommon/SDL_macgl_c.h delete mode 100644 apps/plugins/sdl/src/video/maccommon/SDL_mackeys.h delete mode 100644 apps/plugins/sdl/src/video/maccommon/SDL_macmouse.c delete mode 100644 apps/plugins/sdl/src/video/maccommon/SDL_macmouse_c.h delete mode 100644 apps/plugins/sdl/src/video/maccommon/SDL_macwm.c delete mode 100644 apps/plugins/sdl/src/video/maccommon/SDL_macwm_c.h delete mode 100644 apps/plugins/sdl/src/video/macdsp/SDL_dspvideo.c delete mode 100644 apps/plugins/sdl/src/video/macdsp/SDL_dspvideo.h delete mode 100644 apps/plugins/sdl/src/video/macrom/SDL_romvideo.c delete mode 100644 apps/plugins/sdl/src/video/macrom/SDL_romvideo.h delete mode 100644 apps/plugins/sdl/src/video/nanox/SDL_nxevents.c delete mode 100644 apps/plugins/sdl/src/video/nanox/SDL_nxevents_c.h delete mode 100644 apps/plugins/sdl/src/video/nanox/SDL_nximage.c delete mode 100644 apps/plugins/sdl/src/video/nanox/SDL_nximage_c.h delete mode 100644 apps/plugins/sdl/src/video/nanox/SDL_nxmodes.c delete mode 100644 apps/plugins/sdl/src/video/nanox/SDL_nxmodes_c.h delete mode 100644 apps/plugins/sdl/src/video/nanox/SDL_nxmouse.c delete mode 100644 apps/plugins/sdl/src/video/nanox/SDL_nxmouse_c.h delete mode 100644 apps/plugins/sdl/src/video/nanox/SDL_nxvideo.c delete mode 100644 apps/plugins/sdl/src/video/nanox/SDL_nxvideo.h delete mode 100644 apps/plugins/sdl/src/video/nanox/SDL_nxwm.c delete mode 100644 apps/plugins/sdl/src/video/nanox/SDL_nxwm_c.h delete mode 100644 apps/plugins/sdl/src/video/nds/SDL_ndsevents.c delete mode 100644 apps/plugins/sdl/src/video/nds/SDL_ndsevents_c.h delete mode 100644 apps/plugins/sdl/src/video/nds/SDL_ndsmouse.c delete mode 100644 apps/plugins/sdl/src/video/nds/SDL_ndsmouse_c.h delete mode 100644 apps/plugins/sdl/src/video/nds/SDL_ndsvideo.c delete mode 100644 apps/plugins/sdl/src/video/nds/SDL_ndsvideo.h delete mode 100644 apps/plugins/sdl/src/video/os2fslib/SDL_os2fslib.c delete mode 100644 apps/plugins/sdl/src/video/os2fslib/SDL_os2fslib.h delete mode 100644 apps/plugins/sdl/src/video/os2fslib/SDL_vkeys.h delete mode 100644 apps/plugins/sdl/src/video/photon/SDL_ph_events.c delete mode 100644 apps/plugins/sdl/src/video/photon/SDL_ph_events_c.h delete mode 100644 apps/plugins/sdl/src/video/photon/SDL_ph_gl.c delete mode 100644 apps/plugins/sdl/src/video/photon/SDL_ph_gl.h delete mode 100644 apps/plugins/sdl/src/video/photon/SDL_ph_image.c delete mode 100644 apps/plugins/sdl/src/video/photon/SDL_ph_image_c.h delete mode 100644 apps/plugins/sdl/src/video/photon/SDL_ph_modes.c delete mode 100644 apps/plugins/sdl/src/video/photon/SDL_ph_modes_c.h delete mode 100644 apps/plugins/sdl/src/video/photon/SDL_ph_mouse.c delete mode 100644 apps/plugins/sdl/src/video/photon/SDL_ph_mouse_c.h delete mode 100644 apps/plugins/sdl/src/video/photon/SDL_ph_video.c delete mode 100644 apps/plugins/sdl/src/video/photon/SDL_ph_video.h delete mode 100644 apps/plugins/sdl/src/video/photon/SDL_ph_wm.c delete mode 100644 apps/plugins/sdl/src/video/photon/SDL_ph_wm_c.h delete mode 100644 apps/plugins/sdl/src/video/photon/SDL_phyuv.c delete mode 100644 apps/plugins/sdl/src/video/photon/SDL_phyuv_c.h delete mode 100644 apps/plugins/sdl/src/video/picogui/SDL_pgevents.c delete mode 100644 apps/plugins/sdl/src/video/picogui/SDL_pgevents_c.h delete mode 100644 apps/plugins/sdl/src/video/picogui/SDL_pgvideo.c delete mode 100644 apps/plugins/sdl/src/video/picogui/SDL_pgvideo.h delete mode 100644 apps/plugins/sdl/src/video/ps2gs/SDL_gsevents.c delete mode 100644 apps/plugins/sdl/src/video/ps2gs/SDL_gsevents_c.h delete mode 100644 apps/plugins/sdl/src/video/ps2gs/SDL_gskeys.h delete mode 100644 apps/plugins/sdl/src/video/ps2gs/SDL_gsmouse.c delete mode 100644 apps/plugins/sdl/src/video/ps2gs/SDL_gsmouse_c.h delete mode 100644 apps/plugins/sdl/src/video/ps2gs/SDL_gsvideo.c delete mode 100644 apps/plugins/sdl/src/video/ps2gs/SDL_gsvideo.h delete mode 100644 apps/plugins/sdl/src/video/ps2gs/SDL_gsyuv.c delete mode 100644 apps/plugins/sdl/src/video/ps2gs/SDL_gsyuv_c.h delete mode 100644 apps/plugins/sdl/src/video/ps3/SDL_ps3events.c delete mode 100644 apps/plugins/sdl/src/video/ps3/SDL_ps3events_c.h delete mode 100644 apps/plugins/sdl/src/video/ps3/SDL_ps3video.c delete mode 100644 apps/plugins/sdl/src/video/ps3/SDL_ps3video.h delete mode 100644 apps/plugins/sdl/src/video/ps3/SDL_ps3yuv.c delete mode 100644 apps/plugins/sdl/src/video/ps3/SDL_ps3yuv_c.h delete mode 100644 apps/plugins/sdl/src/video/ps3/spulibs/Makefile delete mode 100644 apps/plugins/sdl/src/video/ps3/spulibs/bilin_scaler.c delete mode 100644 apps/plugins/sdl/src/video/ps3/spulibs/fb_writer.c delete mode 100644 apps/plugins/sdl/src/video/ps3/spulibs/spu_common.h delete mode 100644 apps/plugins/sdl/src/video/ps3/spulibs/yuv2rgb_converter.c delete mode 100644 apps/plugins/sdl/src/video/qtopia/SDL_QPEApp.cc delete mode 100644 apps/plugins/sdl/src/video/qtopia/SDL_QPEApp.h delete mode 100644 apps/plugins/sdl/src/video/qtopia/SDL_QWin.cc delete mode 100644 apps/plugins/sdl/src/video/qtopia/SDL_QWin.h delete mode 100644 apps/plugins/sdl/src/video/qtopia/SDL_lowvideo.h delete mode 100644 apps/plugins/sdl/src/video/qtopia/SDL_sysevents.cc delete mode 100644 apps/plugins/sdl/src/video/qtopia/SDL_sysevents_c.h delete mode 100644 apps/plugins/sdl/src/video/qtopia/SDL_sysmouse.cc delete mode 100644 apps/plugins/sdl/src/video/qtopia/SDL_sysmouse_c.h delete mode 100644 apps/plugins/sdl/src/video/qtopia/SDL_sysvideo.cc delete mode 100644 apps/plugins/sdl/src/video/qtopia/SDL_syswm.cc delete mode 100644 apps/plugins/sdl/src/video/qtopia/SDL_syswm_c.h delete mode 100644 apps/plugins/sdl/src/video/quartz/CGS.h delete mode 100644 apps/plugins/sdl/src/video/quartz/SDL_QuartzEvents.m delete mode 100644 apps/plugins/sdl/src/video/quartz/SDL_QuartzGL.m delete mode 100644 apps/plugins/sdl/src/video/quartz/SDL_QuartzKeys.h delete mode 100644 apps/plugins/sdl/src/video/quartz/SDL_QuartzVideo.h delete mode 100644 apps/plugins/sdl/src/video/quartz/SDL_QuartzVideo.m delete mode 100644 apps/plugins/sdl/src/video/quartz/SDL_QuartzWM.h delete mode 100644 apps/plugins/sdl/src/video/quartz/SDL_QuartzWM.m delete mode 100644 apps/plugins/sdl/src/video/quartz/SDL_QuartzWindow.h delete mode 100644 apps/plugins/sdl/src/video/quartz/SDL_QuartzWindow.m delete mode 100644 apps/plugins/sdl/src/video/riscos/SDL_riscosASM.S delete mode 100644 apps/plugins/sdl/src/video/riscos/SDL_riscosFullScreenVideo.c delete mode 100644 apps/plugins/sdl/src/video/riscos/SDL_riscosevents.c delete mode 100644 apps/plugins/sdl/src/video/riscos/SDL_riscosevents_c.h delete mode 100644 apps/plugins/sdl/src/video/riscos/SDL_riscosmouse.c delete mode 100644 apps/plugins/sdl/src/video/riscos/SDL_riscosmouse_c.h delete mode 100644 apps/plugins/sdl/src/video/riscos/SDL_riscossprite.c delete mode 100644 apps/plugins/sdl/src/video/riscos/SDL_riscostask.c delete mode 100644 apps/plugins/sdl/src/video/riscos/SDL_riscostask.h delete mode 100644 apps/plugins/sdl/src/video/riscos/SDL_riscosvideo.c delete mode 100644 apps/plugins/sdl/src/video/riscos/SDL_riscosvideo.h delete mode 100644 apps/plugins/sdl/src/video/riscos/SDL_wimppoll.c delete mode 100644 apps/plugins/sdl/src/video/riscos/SDL_wimpvideo.c delete mode 100644 apps/plugins/sdl/src/video/svga/SDL_svgaevents.c delete mode 100644 apps/plugins/sdl/src/video/svga/SDL_svgaevents_c.h delete mode 100644 apps/plugins/sdl/src/video/svga/SDL_svgamouse.c delete mode 100644 apps/plugins/sdl/src/video/svga/SDL_svgamouse_c.h delete mode 100644 apps/plugins/sdl/src/video/svga/SDL_svgavideo.c delete mode 100644 apps/plugins/sdl/src/video/svga/SDL_svgavideo.h delete mode 100644 apps/plugins/sdl/src/video/symbian/EKA1/SDL_epocevents.cpp delete mode 100644 apps/plugins/sdl/src/video/symbian/EKA1/SDL_epocvideo.cpp delete mode 100644 apps/plugins/sdl/src/video/symbian/EKA1/SDL_epocvideo.h delete mode 100644 apps/plugins/sdl/src/video/symbian/EKA2/SDL_epocevents.cpp delete mode 100644 apps/plugins/sdl/src/video/symbian/EKA2/SDL_epocvideo.cpp delete mode 100644 apps/plugins/sdl/src/video/symbian/EKA2/SDL_epocvideo.h delete mode 100644 apps/plugins/sdl/src/video/symbian/EKA2/dsa.cpp delete mode 100644 apps/plugins/sdl/src/video/symbian/EKA2/dsa_new.cpp delete mode 100644 apps/plugins/sdl/src/video/symbian/EKA2/dsa_old.cpp delete mode 100644 apps/plugins/sdl/src/video/symbian/SDL_epocevents_c.h delete mode 100644 apps/plugins/sdl/src/video/vgl/SDL_vglevents.c delete mode 100644 apps/plugins/sdl/src/video/vgl/SDL_vglevents_c.h delete mode 100644 apps/plugins/sdl/src/video/vgl/SDL_vglmouse.c delete mode 100644 apps/plugins/sdl/src/video/vgl/SDL_vglmouse_c.h delete mode 100644 apps/plugins/sdl/src/video/vgl/SDL_vglvideo.c delete mode 100644 apps/plugins/sdl/src/video/vgl/SDL_vglvideo.h delete mode 100644 apps/plugins/sdl/src/video/wincommon/SDL_lowvideo.h delete mode 100644 apps/plugins/sdl/src/video/wincommon/SDL_sysevents.c delete mode 100644 apps/plugins/sdl/src/video/wincommon/SDL_sysmouse.c delete mode 100644 apps/plugins/sdl/src/video/wincommon/SDL_sysmouse_c.h delete mode 100644 apps/plugins/sdl/src/video/wincommon/SDL_syswm.c delete mode 100644 apps/plugins/sdl/src/video/wincommon/SDL_syswm_c.h delete mode 100644 apps/plugins/sdl/src/video/wincommon/SDL_wingl.c delete mode 100644 apps/plugins/sdl/src/video/wincommon/SDL_wingl_c.h delete mode 100644 apps/plugins/sdl/src/video/wincommon/wmmsg.h delete mode 100644 apps/plugins/sdl/src/video/windib/SDL_dibevents.c delete mode 100644 apps/plugins/sdl/src/video/windib/SDL_dibevents_c.h delete mode 100644 apps/plugins/sdl/src/video/windib/SDL_dibvideo.c delete mode 100644 apps/plugins/sdl/src/video/windib/SDL_dibvideo.h delete mode 100644 apps/plugins/sdl/src/video/windib/SDL_gapidibvideo.h delete mode 100644 apps/plugins/sdl/src/video/windib/SDL_vkeys.h delete mode 100644 apps/plugins/sdl/src/video/windx5/SDL_dx5events.c delete mode 100644 apps/plugins/sdl/src/video/windx5/SDL_dx5events_c.h delete mode 100644 apps/plugins/sdl/src/video/windx5/SDL_dx5video.c delete mode 100644 apps/plugins/sdl/src/video/windx5/SDL_dx5video.h delete mode 100644 apps/plugins/sdl/src/video/windx5/SDL_dx5yuv.c delete mode 100644 apps/plugins/sdl/src/video/windx5/SDL_dx5yuv_c.h delete mode 100644 apps/plugins/sdl/src/video/windx5/directx.h delete mode 100644 apps/plugins/sdl/src/video/wscons/SDL_wsconsevents.c delete mode 100644 apps/plugins/sdl/src/video/wscons/SDL_wsconsevents_c.h delete mode 100644 apps/plugins/sdl/src/video/wscons/SDL_wsconsmouse.c delete mode 100644 apps/plugins/sdl/src/video/wscons/SDL_wsconsmouse_c.h delete mode 100644 apps/plugins/sdl/src/video/wscons/SDL_wsconsvideo.c delete mode 100644 apps/plugins/sdl/src/video/wscons/SDL_wsconsvideo.h delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11dga.c delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11dga_c.h delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11dyn.c delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11dyn.h delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11events.c delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11events_c.h delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11gamma.c delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11gamma_c.h delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11gl.c delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11gl_c.h delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11image.c delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11image_c.h delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11modes.c delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11modes_c.h delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11mouse.c delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11mouse_c.h delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11sym.h delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11video.c delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11video.h delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11wm.c delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11wm_c.h delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11yuv.c delete mode 100644 apps/plugins/sdl/src/video/x11/SDL_x11yuv_c.h delete mode 100644 apps/plugins/sdl/src/video/xbios/SDL_xbios.c delete mode 100644 apps/plugins/sdl/src/video/xbios/SDL_xbios.h delete mode 100644 apps/plugins/sdl/src/video/xbios/SDL_xbios_blowup.c delete mode 100644 apps/plugins/sdl/src/video/xbios/SDL_xbios_blowup.h delete mode 100644 apps/plugins/sdl/src/video/xbios/SDL_xbios_centscreen.c delete mode 100644 apps/plugins/sdl/src/video/xbios/SDL_xbios_centscreen.h delete mode 100644 apps/plugins/sdl/src/video/xbios/SDL_xbios_milan.c delete mode 100644 apps/plugins/sdl/src/video/xbios/SDL_xbios_milan.h delete mode 100644 apps/plugins/sdl/src/video/xbios/SDL_xbios_sb3.c delete mode 100644 apps/plugins/sdl/src/video/xbios/SDL_xbios_sb3.h delete mode 100644 apps/plugins/sdl/src/video/xbios/SDL_xbios_tveille.c delete mode 100644 apps/plugins/sdl/src/video/xbios/SDL_xbios_tveille.h (limited to 'apps/plugins/sdl/src') diff --git a/apps/plugins/sdl/src/audio/alsa/SDL_alsa_audio.c b/apps/plugins/sdl/src/audio/alsa/SDL_alsa_audio.c deleted file mode 100644 index f10733e432..0000000000 --- a/apps/plugins/sdl/src/audio/alsa/SDL_alsa_audio.c +++ /dev/null @@ -1,619 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Allow access to a raw mixing buffer */ - -#include -#include /* For kill() */ - -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "../SDL_audiomem.h" -#include "../SDL_audio_c.h" -#include "SDL_alsa_audio.h" - -#ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC -#include "SDL_name.h" -#include "SDL_loadso.h" -#else -#define SDL_NAME(X) X -#endif - - -/* The tag name used by ALSA audio */ -#define DRIVER_NAME "alsa" - -/* Audio driver functions */ -static int ALSA_OpenAudio(_THIS, SDL_AudioSpec *spec); -static void ALSA_WaitAudio(_THIS); -static void ALSA_PlayAudio(_THIS); -static Uint8 *ALSA_GetAudioBuf(_THIS); -static void ALSA_CloseAudio(_THIS); - -#ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC - -static const char *alsa_library = SDL_AUDIO_DRIVER_ALSA_DYNAMIC; -static void *alsa_handle = NULL; -static int alsa_loaded = 0; - -static int (*SDL_NAME(snd_pcm_open))(snd_pcm_t **pcm, const char *name, snd_pcm_stream_t stream, int mode); -static int (*SDL_NAME(snd_pcm_close))(snd_pcm_t *pcm); -static snd_pcm_sframes_t (*SDL_NAME(snd_pcm_writei))(snd_pcm_t *pcm, const void *buffer, snd_pcm_uframes_t size); -static int (*SDL_NAME(snd_pcm_recover))(snd_pcm_t *pcm, int err, int silent); -static int (*SDL_NAME(snd_pcm_prepare))(snd_pcm_t *pcm); -static int (*SDL_NAME(snd_pcm_drain))(snd_pcm_t *pcm); -static const char *(*SDL_NAME(snd_strerror))(int errnum); -static size_t (*SDL_NAME(snd_pcm_hw_params_sizeof))(void); -static size_t (*SDL_NAME(snd_pcm_sw_params_sizeof))(void); -static void (*SDL_NAME(snd_pcm_hw_params_copy))(snd_pcm_hw_params_t *dst, const snd_pcm_hw_params_t *src); -static int (*SDL_NAME(snd_pcm_hw_params_any))(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); -static int (*SDL_NAME(snd_pcm_hw_params_set_access))(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t access); -static int (*SDL_NAME(snd_pcm_hw_params_set_format))(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t val); -static int (*SDL_NAME(snd_pcm_hw_params_set_channels))(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val); -static int (*SDL_NAME(snd_pcm_hw_params_get_channels))(const snd_pcm_hw_params_t *params, unsigned int *val); -static int (*SDL_NAME(snd_pcm_hw_params_set_rate_near))(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); -static int (*SDL_NAME(snd_pcm_hw_params_set_period_size_near))(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir); -static int (*SDL_NAME(snd_pcm_hw_params_get_period_size))(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *frames, int *dir); -static int (*SDL_NAME(snd_pcm_hw_params_set_periods_near))(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir); -static int (*SDL_NAME(snd_pcm_hw_params_get_periods))(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir); -static int (*SDL_NAME(snd_pcm_hw_params_set_buffer_size_near))(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val); -static int (*SDL_NAME(snd_pcm_hw_params_get_buffer_size))(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val); -static int (*SDL_NAME(snd_pcm_hw_params))(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); -/* -*/ -static int (*SDL_NAME(snd_pcm_sw_params_set_avail_min))(snd_pcm_t *pcm, snd_pcm_sw_params_t *swparams, snd_pcm_uframes_t val); -static int (*SDL_NAME(snd_pcm_sw_params_current))(snd_pcm_t *pcm, snd_pcm_sw_params_t *swparams); -static int (*SDL_NAME(snd_pcm_sw_params_set_start_threshold))(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val); -static int (*SDL_NAME(snd_pcm_sw_params))(snd_pcm_t *pcm, snd_pcm_sw_params_t *params); -static int (*SDL_NAME(snd_pcm_nonblock))(snd_pcm_t *pcm, int nonblock); -static int (*SDL_NAME(snd_pcm_wait))(snd_pcm_t *pcm, int timeout); -#define snd_pcm_hw_params_sizeof SDL_NAME(snd_pcm_hw_params_sizeof) -#define snd_pcm_sw_params_sizeof SDL_NAME(snd_pcm_sw_params_sizeof) - -/* cast funcs to char* first, to please GCC's strict aliasing rules. */ -static struct { - const char *name; - void **func; -} alsa_functions[] = { - { "snd_pcm_open", (void**)(char*)&SDL_NAME(snd_pcm_open) }, - { "snd_pcm_close", (void**)(char*)&SDL_NAME(snd_pcm_close) }, - { "snd_pcm_writei", (void**)(char*)&SDL_NAME(snd_pcm_writei) }, - { "snd_pcm_recover", (void**)(char*)&SDL_NAME(snd_pcm_recover) }, - { "snd_pcm_prepare", (void**)(char*)&SDL_NAME(snd_pcm_prepare) }, - { "snd_pcm_drain", (void**)(char*)&SDL_NAME(snd_pcm_drain) }, - { "snd_strerror", (void**)(char*)&SDL_NAME(snd_strerror) }, - { "snd_pcm_hw_params_sizeof", (void**)(char*)&SDL_NAME(snd_pcm_hw_params_sizeof) }, - { "snd_pcm_sw_params_sizeof", (void**)(char*)&SDL_NAME(snd_pcm_sw_params_sizeof) }, - { "snd_pcm_hw_params_copy", (void**)(char*)&SDL_NAME(snd_pcm_hw_params_copy) }, - { "snd_pcm_hw_params_any", (void**)(char*)&SDL_NAME(snd_pcm_hw_params_any) }, - { "snd_pcm_hw_params_set_access", (void**)(char*)&SDL_NAME(snd_pcm_hw_params_set_access) }, - { "snd_pcm_hw_params_set_format", (void**)(char*)&SDL_NAME(snd_pcm_hw_params_set_format) }, - { "snd_pcm_hw_params_set_channels", (void**)(char*)&SDL_NAME(snd_pcm_hw_params_set_channels) }, - { "snd_pcm_hw_params_get_channels", (void**)(char*)&SDL_NAME(snd_pcm_hw_params_get_channels) }, - { "snd_pcm_hw_params_set_rate_near", (void**)(char*)&SDL_NAME(snd_pcm_hw_params_set_rate_near) }, - { "snd_pcm_hw_params_set_period_size_near", (void**)(char*)&SDL_NAME(snd_pcm_hw_params_set_period_size_near) }, - { "snd_pcm_hw_params_get_period_size", (void**)(char*)&SDL_NAME(snd_pcm_hw_params_get_period_size) }, - { "snd_pcm_hw_params_set_periods_near", (void**)(char*)&SDL_NAME(snd_pcm_hw_params_set_periods_near) }, - { "snd_pcm_hw_params_get_periods", (void**)(char*)&SDL_NAME(snd_pcm_hw_params_get_periods) }, - { "snd_pcm_hw_params_set_buffer_size_near", (void**)(char*)&SDL_NAME(snd_pcm_hw_params_set_buffer_size_near) }, - { "snd_pcm_hw_params_get_buffer_size", (void**)(char*)&SDL_NAME(snd_pcm_hw_params_get_buffer_size) }, - { "snd_pcm_hw_params", (void**)(char*)&SDL_NAME(snd_pcm_hw_params) }, - { "snd_pcm_sw_params_set_avail_min", (void**)(char*)&SDL_NAME(snd_pcm_sw_params_set_avail_min) }, - { "snd_pcm_sw_params_current", (void**)(char*)&SDL_NAME(snd_pcm_sw_params_current) }, - { "snd_pcm_sw_params_set_start_threshold", (void**)(char*)&SDL_NAME(snd_pcm_sw_params_set_start_threshold) }, - { "snd_pcm_sw_params", (void**)(char*)&SDL_NAME(snd_pcm_sw_params) }, - { "snd_pcm_nonblock", (void**)(char*)&SDL_NAME(snd_pcm_nonblock) }, - { "snd_pcm_wait", (void**)(char*)&SDL_NAME(snd_pcm_wait) }, -}; - -static void UnloadALSALibrary(void) { - if (alsa_loaded) { - SDL_UnloadObject(alsa_handle); - alsa_handle = NULL; - alsa_loaded = 0; - } -} - -static int LoadALSALibrary(void) { - int i, retval = -1; - - alsa_handle = SDL_LoadObject(alsa_library); - if (alsa_handle) { - alsa_loaded = 1; - retval = 0; - for (i = 0; i < SDL_arraysize(alsa_functions); i++) { - *alsa_functions[i].func = SDL_LoadFunction(alsa_handle,alsa_functions[i].name); - if (!*alsa_functions[i].func) { - retval = -1; - UnloadALSALibrary(); - break; - } - } - } - return retval; -} - -#else - -static void UnloadALSALibrary(void) { - return; -} - -static int LoadALSALibrary(void) { - return 0; -} - -#endif /* SDL_AUDIO_DRIVER_ALSA_DYNAMIC */ - -static const char *get_audio_device(int channels) -{ - const char *device; - - device = SDL_getenv("AUDIODEV"); /* Is there a standard variable name? */ - if ( device == NULL ) { - switch (channels) { - case 6: - device = "plug:surround51"; - break; - case 4: - device = "plug:surround40"; - break; - default: - device = "default"; - break; - } - } - return device; -} - -/* Audio driver bootstrap functions */ - -static int Audio_Available(void) -{ - int available; - int status; - snd_pcm_t *handle; - - available = 0; - if (LoadALSALibrary() < 0) { - return available; - } - status = SDL_NAME(snd_pcm_open)(&handle, get_audio_device(2), SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK); - if ( status >= 0 ) { - available = 1; - SDL_NAME(snd_pcm_close)(handle); - } - UnloadALSALibrary(); - return(available); -} - -static void Audio_DeleteDevice(SDL_AudioDevice *device) -{ - SDL_free(device->hidden); - SDL_free(device); - UnloadALSALibrary(); -} - -static SDL_AudioDevice *Audio_CreateDevice(int devindex) -{ - SDL_AudioDevice *this; - - /* Initialize all variables that we clean on shutdown */ - LoadALSALibrary(); - this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice)); - if ( this ) { - SDL_memset(this, 0, (sizeof *this)); - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - } - if ( (this == NULL) || (this->hidden == NULL) ) { - SDL_OutOfMemory(); - if ( this ) { - SDL_free(this); - } - return(0); - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - /* Set the function pointers */ - this->OpenAudio = ALSA_OpenAudio; - this->WaitAudio = ALSA_WaitAudio; - this->PlayAudio = ALSA_PlayAudio; - this->GetAudioBuf = ALSA_GetAudioBuf; - this->CloseAudio = ALSA_CloseAudio; - - this->free = Audio_DeleteDevice; - - return this; -} - -AudioBootStrap ALSA_bootstrap = { - DRIVER_NAME, "ALSA PCM audio", - Audio_Available, Audio_CreateDevice -}; - -/* This function waits until it is possible to write a full sound buffer */ -static void ALSA_WaitAudio(_THIS) -{ - /* We're in blocking mode, so there's nothing to do here */ -} - - -/* - * http://bugzilla.libsdl.org/show_bug.cgi?id=110 - * "For Linux ALSA, this is FL-FR-RL-RR-C-LFE - * and for Windows DirectX [and CoreAudio], this is FL-FR-C-LFE-RL-RR" - */ -#define SWIZ6(T) \ - T *ptr = (T *) mixbuf; \ - Uint32 i; \ - for (i = 0; i < this->spec.samples; i++, ptr += 6) { \ - T tmp; \ - tmp = ptr[2]; ptr[2] = ptr[4]; ptr[4] = tmp; \ - tmp = ptr[3]; ptr[3] = ptr[5]; ptr[5] = tmp; \ - } - -static __inline__ void swizzle_alsa_channels_6_64bit(_THIS) { SWIZ6(Uint64); } -static __inline__ void swizzle_alsa_channels_6_32bit(_THIS) { SWIZ6(Uint32); } -static __inline__ void swizzle_alsa_channels_6_16bit(_THIS) { SWIZ6(Uint16); } -static __inline__ void swizzle_alsa_channels_6_8bit(_THIS) { SWIZ6(Uint8); } - -#undef SWIZ6 - - -/* - * Called right before feeding this->mixbuf to the hardware. Swizzle channels - * from Windows/Mac order to the format alsalib will want. - */ -static __inline__ void swizzle_alsa_channels(_THIS) -{ - if (this->spec.channels == 6) { - const Uint16 fmtsize = (this->spec.format & 0xFF); /* bits/channel. */ - if (fmtsize == 16) - swizzle_alsa_channels_6_16bit(this); - else if (fmtsize == 8) - swizzle_alsa_channels_6_8bit(this); - else if (fmtsize == 32) - swizzle_alsa_channels_6_32bit(this); - else if (fmtsize == 64) - swizzle_alsa_channels_6_64bit(this); - } - - /* !!! FIXME: update this for 7.1 if needed, later. */ -} - - -static void ALSA_PlayAudio(_THIS) -{ - int status; - snd_pcm_uframes_t frames_left; - const Uint8 *sample_buf = (const Uint8 *) mixbuf; - const int frame_size = (((int) (this->spec.format & 0xFF)) / 8) * this->spec.channels; - - swizzle_alsa_channels(this); - - frames_left = ((snd_pcm_uframes_t) this->spec.samples); - - while ( frames_left > 0 && this->enabled ) { - /* This works, but needs more testing before going live */ - /*SDL_NAME(snd_pcm_wait)(pcm_handle, -1);*/ - - status = SDL_NAME(snd_pcm_writei)(pcm_handle, sample_buf, frames_left); - if ( status < 0 ) { - if ( status == -EAGAIN ) { - /* Apparently snd_pcm_recover() doesn't handle this case - does it assume snd_pcm_wait() above? */ - SDL_Delay(1); - continue; - } - status = SDL_NAME(snd_pcm_recover)(pcm_handle, status, 0); - if ( status < 0 ) { - /* Hmm, not much we can do - abort */ - fprintf(stderr, "ALSA write failed (unrecoverable): %s\n", SDL_NAME(snd_strerror)(status)); - this->enabled = 0; - return; - } - continue; - } - sample_buf += status * frame_size; - frames_left -= status; - } -} - -static Uint8 *ALSA_GetAudioBuf(_THIS) -{ - return(mixbuf); -} - -static void ALSA_CloseAudio(_THIS) -{ - if ( mixbuf != NULL ) { - SDL_FreeAudioMem(mixbuf); - mixbuf = NULL; - } - if ( pcm_handle ) { - SDL_NAME(snd_pcm_drain)(pcm_handle); - SDL_NAME(snd_pcm_close)(pcm_handle); - pcm_handle = NULL; - } -} - -static int ALSA_finalize_hardware(_THIS, SDL_AudioSpec *spec, snd_pcm_hw_params_t *hwparams, int override) -{ - int status; - snd_pcm_uframes_t bufsize; - - /* "set" the hardware with the desired parameters */ - status = SDL_NAME(snd_pcm_hw_params)(pcm_handle, hwparams); - if ( status < 0 ) { - return(-1); - } - - /* Get samples for the actual buffer size */ - status = SDL_NAME(snd_pcm_hw_params_get_buffer_size)(hwparams, &bufsize); - if ( status < 0 ) { - return(-1); - } - if ( !override && bufsize != spec->samples * 2 ) { - return(-1); - } - - /* FIXME: Is this safe to do? */ - spec->samples = bufsize / 2; - - /* This is useful for debugging */ - if ( getenv("SDL_AUDIO_ALSA_DEBUG") ) { - snd_pcm_uframes_t persize = 0; - unsigned int periods = 0; - - SDL_NAME(snd_pcm_hw_params_get_period_size)(hwparams, &persize, NULL); - SDL_NAME(snd_pcm_hw_params_get_periods)(hwparams, &periods, NULL); - - fprintf(stderr, "ALSA: period size = %ld, periods = %u, buffer size = %lu\n", persize, periods, bufsize); - } - return(0); -} - -static int ALSA_set_period_size(_THIS, SDL_AudioSpec *spec, snd_pcm_hw_params_t *params, int override) -{ - const char *env; - int status; - snd_pcm_hw_params_t *hwparams; - snd_pcm_uframes_t frames; - unsigned int periods; - - /* Copy the hardware parameters for this setup */ - snd_pcm_hw_params_alloca(&hwparams); - SDL_NAME(snd_pcm_hw_params_copy)(hwparams, params); - - if ( !override ) { - env = getenv("SDL_AUDIO_ALSA_SET_PERIOD_SIZE"); - if ( env ) { - override = SDL_atoi(env); - if ( override == 0 ) { - return(-1); - } - } - } - - frames = spec->samples; - status = SDL_NAME(snd_pcm_hw_params_set_period_size_near)(pcm_handle, hwparams, &frames, NULL); - if ( status < 0 ) { - return(-1); - } - - periods = 2; - status = SDL_NAME(snd_pcm_hw_params_set_periods_near)(pcm_handle, hwparams, &periods, NULL); - if ( status < 0 ) { - return(-1); - } - - return ALSA_finalize_hardware(this, spec, hwparams, override); -} - -static int ALSA_set_buffer_size(_THIS, SDL_AudioSpec *spec, snd_pcm_hw_params_t *params, int override) -{ - const char *env; - int status; - snd_pcm_hw_params_t *hwparams; - snd_pcm_uframes_t frames; - - /* Copy the hardware parameters for this setup */ - snd_pcm_hw_params_alloca(&hwparams); - SDL_NAME(snd_pcm_hw_params_copy)(hwparams, params); - - if ( !override ) { - env = getenv("SDL_AUDIO_ALSA_SET_BUFFER_SIZE"); - if ( env ) { - override = SDL_atoi(env); - if ( override == 0 ) { - return(-1); - } - } - } - - frames = spec->samples * 2; - status = SDL_NAME(snd_pcm_hw_params_set_buffer_size_near)(pcm_handle, hwparams, &frames); - if ( status < 0 ) { - return(-1); - } - - return ALSA_finalize_hardware(this, spec, hwparams, override); -} - -static int ALSA_OpenAudio(_THIS, SDL_AudioSpec *spec) -{ - int status; - snd_pcm_hw_params_t *hwparams; - snd_pcm_sw_params_t *swparams; - snd_pcm_format_t format; - unsigned int rate; - unsigned int channels; - Uint16 test_format; - - /* Open the audio device */ - /* Name of device should depend on # channels in spec */ - status = SDL_NAME(snd_pcm_open)(&pcm_handle, get_audio_device(spec->channels), SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK); - - if ( status < 0 ) { - SDL_SetError("Couldn't open audio device: %s", SDL_NAME(snd_strerror)(status)); - return(-1); - } - - /* Figure out what the hardware is capable of */ - snd_pcm_hw_params_alloca(&hwparams); - status = SDL_NAME(snd_pcm_hw_params_any)(pcm_handle, hwparams); - if ( status < 0 ) { - SDL_SetError("Couldn't get hardware config: %s", SDL_NAME(snd_strerror)(status)); - ALSA_CloseAudio(this); - return(-1); - } - - /* SDL only uses interleaved sample output */ - status = SDL_NAME(snd_pcm_hw_params_set_access)(pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED); - if ( status < 0 ) { - SDL_SetError("Couldn't set interleaved access: %s", SDL_NAME(snd_strerror)(status)); - ALSA_CloseAudio(this); - return(-1); - } - - /* Try for a closest match on audio format */ - status = -1; - for ( test_format = SDL_FirstAudioFormat(spec->format); - test_format && (status < 0); ) { - switch ( test_format ) { - case AUDIO_U8: - format = SND_PCM_FORMAT_U8; - break; - case AUDIO_S8: - format = SND_PCM_FORMAT_S8; - break; - case AUDIO_S16LSB: - format = SND_PCM_FORMAT_S16_LE; - break; - case AUDIO_S16MSB: - format = SND_PCM_FORMAT_S16_BE; - break; - case AUDIO_U16LSB: - format = SND_PCM_FORMAT_U16_LE; - break; - case AUDIO_U16MSB: - format = SND_PCM_FORMAT_U16_BE; - break; - default: - format = 0; - break; - } - if ( format != 0 ) { - status = SDL_NAME(snd_pcm_hw_params_set_format)(pcm_handle, hwparams, format); - } - if ( status < 0 ) { - test_format = SDL_NextAudioFormat(); - } - } - if ( status < 0 ) { - SDL_SetError("Couldn't find any hardware audio formats"); - ALSA_CloseAudio(this); - return(-1); - } - spec->format = test_format; - - /* Set the number of channels */ - status = SDL_NAME(snd_pcm_hw_params_set_channels)(pcm_handle, hwparams, spec->channels); - channels = spec->channels; - if ( status < 0 ) { - status = SDL_NAME(snd_pcm_hw_params_get_channels)(hwparams, &channels); - if ( status < 0 ) { - SDL_SetError("Couldn't set audio channels"); - ALSA_CloseAudio(this); - return(-1); - } - spec->channels = channels; - } - - /* Set the audio rate */ - rate = spec->freq; - - status = SDL_NAME(snd_pcm_hw_params_set_rate_near)(pcm_handle, hwparams, &rate, NULL); - if ( status < 0 ) { - SDL_SetError("Couldn't set audio frequency: %s", SDL_NAME(snd_strerror)(status)); - ALSA_CloseAudio(this); - return(-1); - } - spec->freq = rate; - - /* Set the buffer size, in samples */ - if ( ALSA_set_period_size(this, spec, hwparams, 0) < 0 && - ALSA_set_buffer_size(this, spec, hwparams, 0) < 0 ) { - /* Failed to set desired buffer size, do the best you can... */ - if ( ALSA_set_period_size(this, spec, hwparams, 1) < 0 ) { - SDL_SetError("Couldn't set hardware audio parameters: %s", SDL_NAME(snd_strerror)(status)); - ALSA_CloseAudio(this); - return(-1); - } - } - - /* Set the software parameters */ - snd_pcm_sw_params_alloca(&swparams); - status = SDL_NAME(snd_pcm_sw_params_current)(pcm_handle, swparams); - if ( status < 0 ) { - SDL_SetError("Couldn't get software config: %s", SDL_NAME(snd_strerror)(status)); - ALSA_CloseAudio(this); - return(-1); - } - status = SDL_NAME(snd_pcm_sw_params_set_avail_min)(pcm_handle, swparams, spec->samples); - if ( status < 0 ) { - SDL_SetError("Couldn't set minimum available samples: %s", SDL_NAME(snd_strerror)(status)); - ALSA_CloseAudio(this); - return(-1); - } - status = SDL_NAME(snd_pcm_sw_params_set_start_threshold)(pcm_handle, swparams, 1); - if ( status < 0 ) { - SDL_SetError("Couldn't set start threshold: %s", SDL_NAME(snd_strerror)(status)); - ALSA_CloseAudio(this); - return(-1); - } - status = SDL_NAME(snd_pcm_sw_params)(pcm_handle, swparams); - if ( status < 0 ) { - SDL_SetError("Couldn't set software audio parameters: %s", SDL_NAME(snd_strerror)(status)); - ALSA_CloseAudio(this); - return(-1); - } - - /* Calculate the final parameters for this audio specification */ - SDL_CalculateAudioSpec(spec); - - /* Allocate mixing buffer */ - mixlen = spec->size; - mixbuf = (Uint8 *)SDL_AllocAudioMem(mixlen); - if ( mixbuf == NULL ) { - ALSA_CloseAudio(this); - return(-1); - } - SDL_memset(mixbuf, spec->silence, spec->size); - - /* Switch to blocking mode for playback */ - SDL_NAME(snd_pcm_nonblock)(pcm_handle, 0); - - /* We're ready to rock and roll. :-) */ - return(0); -} diff --git a/apps/plugins/sdl/src/audio/alsa/SDL_alsa_audio.h b/apps/plugins/sdl/src/audio/alsa/SDL_alsa_audio.h deleted file mode 100644 index 55ae87b8ac..0000000000 --- a/apps/plugins/sdl/src/audio/alsa/SDL_alsa_audio.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _ALSA_PCM_audio_h -#define _ALSA_PCM_audio_h - -#include - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the video functions */ -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData { - /* The audio device handle */ - snd_pcm_t *pcm_handle; - - /* Raw mixing buffer */ - Uint8 *mixbuf; - int mixlen; -}; - -/* Old variable names */ -#define pcm_handle (this->hidden->pcm_handle) -#define mixbuf (this->hidden->mixbuf) -#define mixlen (this->hidden->mixlen) - -#endif /* _ALSA_PCM_audio_h */ diff --git a/apps/plugins/sdl/src/audio/arts/SDL_artsaudio.c b/apps/plugins/sdl/src/audio/arts/SDL_artsaudio.c deleted file mode 100644 index 373f8c1677..0000000000 --- a/apps/plugins/sdl/src/audio/arts/SDL_artsaudio.c +++ /dev/null @@ -1,362 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Allow access to a raw mixing buffer */ - -#ifdef HAVE_SIGNAL_H -#include -#endif -#include - -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "../SDL_audiomem.h" -#include "../SDL_audio_c.h" -#include "../SDL_audiodev_c.h" -#include "SDL_artsaudio.h" - -#ifdef SDL_AUDIO_DRIVER_ARTS_DYNAMIC -#include "SDL_name.h" -#include "SDL_loadso.h" -#else -#define SDL_NAME(X) X -#endif - -/* The tag name used by artsc audio */ -#define ARTS_DRIVER_NAME "arts" - -/* Audio driver functions */ -static int ARTS_OpenAudio(_THIS, SDL_AudioSpec *spec); -static void ARTS_WaitAudio(_THIS); -static void ARTS_PlayAudio(_THIS); -static Uint8 *ARTS_GetAudioBuf(_THIS); -static void ARTS_CloseAudio(_THIS); - -#ifdef SDL_AUDIO_DRIVER_ARTS_DYNAMIC - -static const char *arts_library = SDL_AUDIO_DRIVER_ARTS_DYNAMIC; -static void *arts_handle = NULL; -static int arts_loaded = 0; - -static int (*SDL_NAME(arts_init))(void); -static void (*SDL_NAME(arts_free))(void); -static arts_stream_t (*SDL_NAME(arts_play_stream))(int rate, int bits, int channels, const char *name); -static int (*SDL_NAME(arts_stream_set))(arts_stream_t s, arts_parameter_t param, int value); -static int (*SDL_NAME(arts_stream_get))(arts_stream_t s, arts_parameter_t param); -static int (*SDL_NAME(arts_write))(arts_stream_t s, const void *buffer, int count); -static void (*SDL_NAME(arts_close_stream))(arts_stream_t s); -static int (*SDL_NAME(arts_suspend))(void); -static int (*SDL_NAME(arts_suspended))(void); -static const char *(*SDL_NAME(arts_error_text))(int errorcode); - -static struct { - const char *name; - void **func; -} arts_functions[] = { - { "arts_init", (void **)&SDL_NAME(arts_init) }, - { "arts_free", (void **)&SDL_NAME(arts_free) }, - { "arts_play_stream", (void **)&SDL_NAME(arts_play_stream) }, - { "arts_stream_set", (void **)&SDL_NAME(arts_stream_set) }, - { "arts_stream_get", (void **)&SDL_NAME(arts_stream_get) }, - { "arts_write", (void **)&SDL_NAME(arts_write) }, - { "arts_close_stream", (void **)&SDL_NAME(arts_close_stream) }, - { "arts_suspend", (void **)&SDL_NAME(arts_suspend) }, - { "arts_suspended", (void **)&SDL_NAME(arts_suspended) }, - { "arts_error_text", (void **)&SDL_NAME(arts_error_text) }, -}; - -static void UnloadARTSLibrary() -{ - if ( arts_loaded ) { - SDL_UnloadObject(arts_handle); - arts_handle = NULL; - arts_loaded = 0; - } -} - -static int LoadARTSLibrary(void) -{ - int i, retval = -1; - - arts_handle = SDL_LoadObject(arts_library); - if ( arts_handle ) { - arts_loaded = 1; - retval = 0; - for ( i=0; ihidden); - SDL_free(device); - UnloadARTSLibrary(); -} - -static SDL_AudioDevice *Audio_CreateDevice(int devindex) -{ - SDL_AudioDevice *this; - - /* Initialize all variables that we clean on shutdown */ - LoadARTSLibrary(); - this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice)); - if ( this ) { - SDL_memset(this, 0, (sizeof *this)); - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - } - if ( (this == NULL) || (this->hidden == NULL) ) { - SDL_OutOfMemory(); - if ( this ) { - SDL_free(this); - } - return(0); - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - stream = 0; - - /* Set the function pointers */ - this->OpenAudio = ARTS_OpenAudio; - this->WaitAudio = ARTS_WaitAudio; - this->PlayAudio = ARTS_PlayAudio; - this->GetAudioBuf = ARTS_GetAudioBuf; - this->CloseAudio = ARTS_CloseAudio; - - this->free = Audio_DeleteDevice; - - return this; -} - -AudioBootStrap ARTS_bootstrap = { - ARTS_DRIVER_NAME, "Analog Realtime Synthesizer", - Audio_Available, Audio_CreateDevice -}; - -/* This function waits until it is possible to write a full sound buffer */ -static void ARTS_WaitAudio(_THIS) -{ - Sint32 ticks; - - /* Check to see if the thread-parent process is still alive */ - { static int cnt = 0; - /* Note that this only works with thread implementations - that use a different process id for each thread. - */ - if (parent && (((++cnt)%10) == 0)) { /* Check every 10 loops */ - if ( kill(parent, 0) < 0 ) { - this->enabled = 0; - } - } - } - - /* Use timer for general audio synchronization */ - ticks = ((Sint32)(next_frame - SDL_GetTicks()))-FUDGE_TICKS; - if ( ticks > 0 ) { - SDL_Delay(ticks); - } -} - -static void ARTS_PlayAudio(_THIS) -{ - int written; - - /* Write the audio data */ - written = SDL_NAME(arts_write)(stream, mixbuf, mixlen); - - /* If timer synchronization is enabled, set the next write frame */ - if ( frame_ticks ) { - next_frame += frame_ticks; - } - - /* If we couldn't write, assume fatal error for now */ - if ( written < 0 ) { - this->enabled = 0; - } -#ifdef DEBUG_AUDIO - fprintf(stderr, "Wrote %d bytes of audio data\n", written); -#endif -} - -static Uint8 *ARTS_GetAudioBuf(_THIS) -{ - return(mixbuf); -} - -static void ARTS_CloseAudio(_THIS) -{ - if ( mixbuf != NULL ) { - SDL_FreeAudioMem(mixbuf); - mixbuf = NULL; - } - if ( stream ) { - SDL_NAME(arts_close_stream)(stream); - stream = 0; - } - SDL_NAME(arts_free)(); -} - -static int ARTS_OpenAudio(_THIS, SDL_AudioSpec *spec) -{ - int bits, frag_spec; - Uint16 test_format, format; - int error_code; - - /* Reset the timer synchronization flag */ - frame_ticks = 0.0; - - mixbuf = NULL; - - /* Try for a closest match on audio format */ - format = 0; - bits = 0; - for ( test_format = SDL_FirstAudioFormat(spec->format); - ! format && test_format; ) { -#ifdef DEBUG_AUDIO - fprintf(stderr, "Trying format 0x%4.4x\n", test_format); -#endif - switch ( test_format ) { - case AUDIO_U8: - bits = 8; - format = 1; - break; - case AUDIO_S16LSB: - bits = 16; - format = 1; - break; - default: - format = 0; - break; - } - if ( ! format ) { - test_format = SDL_NextAudioFormat(); - } - } - if ( format == 0 ) { - SDL_SetError("Couldn't find any hardware audio formats"); - return(-1); - } - spec->format = test_format; - - error_code = SDL_NAME(arts_init)(); - if ( error_code != 0 ) { - SDL_SetError("Unable to initialize ARTS: %s", SDL_NAME(arts_error_text)(error_code)); - return(-1); - } - if ( ! ARTS_Suspend() ) { - SDL_SetError("ARTS can not open audio device"); - return(-1); - } - stream = SDL_NAME(arts_play_stream)(spec->freq, bits, spec->channels, "SDL"); - - /* Calculate the final parameters for this audio specification */ - SDL_CalculateAudioSpec(spec); - - /* Determine the power of two of the fragment size */ - for ( frag_spec = 0; (0x01<size; ++frag_spec ); - if ( (0x01<size ) { - SDL_SetError("Fragment size must be a power of two"); - return(-1); - } - frag_spec |= 0x00020000; /* two fragments, for low latency */ - -#ifdef ARTS_P_PACKET_SETTINGS - SDL_NAME(arts_stream_set)(stream, ARTS_P_PACKET_SETTINGS, frag_spec); -#else - SDL_NAME(arts_stream_set)(stream, ARTS_P_PACKET_SIZE, frag_spec&0xffff); - SDL_NAME(arts_stream_set)(stream, ARTS_P_PACKET_COUNT, frag_spec>>16); -#endif - spec->size = SDL_NAME(arts_stream_get)(stream, ARTS_P_PACKET_SIZE); - - /* Allocate mixing buffer */ - mixlen = spec->size; - mixbuf = (Uint8 *)SDL_AllocAudioMem(mixlen); - if ( mixbuf == NULL ) { - return(-1); - } - SDL_memset(mixbuf, spec->silence, spec->size); - - /* Get the parent process id (we're the parent of the audio thread) */ - parent = getpid(); - - /* We're ready to rock and roll. :-) */ - return(0); -} diff --git a/apps/plugins/sdl/src/audio/arts/SDL_artsaudio.h b/apps/plugins/sdl/src/audio/arts/SDL_artsaudio.h deleted file mode 100644 index de3b22822c..0000000000 --- a/apps/plugins/sdl/src/audio/arts/SDL_artsaudio.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_artscaudio_h -#define _SDL_artscaudio_h - -#include - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the video functions */ -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData { - /* The stream descriptor for the audio device */ - arts_stream_t stream; - - /* The parent process id, to detect when application quits */ - pid_t parent; - - /* Raw mixing buffer */ - Uint8 *mixbuf; - int mixlen; - - /* Support for audio timing using a timer, in addition to select() */ - float frame_ticks; - float next_frame; -}; -#define FUDGE_TICKS 10 /* The scheduler overhead ticks per frame */ - -/* Old variable names */ -#define stream (this->hidden->stream) -#define parent (this->hidden->parent) -#define mixbuf (this->hidden->mixbuf) -#define mixlen (this->hidden->mixlen) -#define frame_ticks (this->hidden->frame_ticks) -#define next_frame (this->hidden->next_frame) - -#endif /* _SDL_artscaudio_h */ - diff --git a/apps/plugins/sdl/src/audio/baudio/SDL_beaudio.cc b/apps/plugins/sdl/src/audio/baudio/SDL_beaudio.cc deleted file mode 100644 index de635f8bad..0000000000 --- a/apps/plugins/sdl/src/audio/baudio/SDL_beaudio.cc +++ /dev/null @@ -1,225 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Allow access to the audio stream on BeOS */ - -#include - -#include "../../main/beos/SDL_BeApp.h" - -extern "C" { - -#include "SDL_audio.h" -#include "../SDL_audio_c.h" -#include "../SDL_sysaudio.h" -#include "../../thread/beos/SDL_systhread_c.h" -#include "SDL_beaudio.h" - - -/* Audio driver functions */ -static int BE_OpenAudio(_THIS, SDL_AudioSpec *spec); -static void BE_WaitAudio(_THIS); -static void BE_PlayAudio(_THIS); -static Uint8 *BE_GetAudioBuf(_THIS); -static void BE_CloseAudio(_THIS); - -/* Audio driver bootstrap functions */ - -static int Audio_Available(void) -{ - return(1); -} - -static void Audio_DeleteDevice(SDL_AudioDevice *device) -{ - SDL_free(device->hidden); - SDL_free(device); -} - -static SDL_AudioDevice *Audio_CreateDevice(int devindex) -{ - SDL_AudioDevice *device; - - /* Initialize all variables that we clean on shutdown */ - device = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice)); - if ( device ) { - SDL_memset(device, 0, (sizeof *device)); - device->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *device->hidden)); - } - if ( (device == NULL) || (device->hidden == NULL) ) { - SDL_OutOfMemory(); - if ( device ) { - SDL_free(device); - } - return(0); - } - SDL_memset(device->hidden, 0, (sizeof *device->hidden)); - - /* Set the function pointers */ - device->OpenAudio = BE_OpenAudio; - device->WaitAudio = BE_WaitAudio; - device->PlayAudio = BE_PlayAudio; - device->GetAudioBuf = BE_GetAudioBuf; - device->CloseAudio = BE_CloseAudio; - - device->free = Audio_DeleteDevice; - - return device; -} - -AudioBootStrap BAUDIO_bootstrap = { - "baudio", "BeOS BSoundPlayer", - Audio_Available, Audio_CreateDevice -}; - -/* The BeOS callback for handling the audio buffer */ -static void FillSound(void *device, void *stream, size_t len, - const media_raw_audio_format &format) -{ - SDL_AudioDevice *audio = (SDL_AudioDevice *)device; - - /* Silence the buffer, since it's ours */ - SDL_memset(stream, audio->spec.silence, len); - - /* Only do soemthing if audio is enabled */ - if ( ! audio->enabled ) - return; - - if ( ! audio->paused ) { - if ( audio->convert.needed ) { - SDL_mutexP(audio->mixer_lock); - (*audio->spec.callback)(audio->spec.userdata, - (Uint8 *)audio->convert.buf,audio->convert.len); - SDL_mutexV(audio->mixer_lock); - SDL_ConvertAudio(&audio->convert); - SDL_memcpy(stream,audio->convert.buf,audio->convert.len_cvt); - } else { - SDL_mutexP(audio->mixer_lock); - (*audio->spec.callback)(audio->spec.userdata, - (Uint8 *)stream, len); - SDL_mutexV(audio->mixer_lock); - } - } - return; -} - -/* Dummy functions -- we don't use thread-based audio */ -void BE_WaitAudio(_THIS) -{ - return; -} -void BE_PlayAudio(_THIS) -{ - return; -} -Uint8 *BE_GetAudioBuf(_THIS) -{ - return(NULL); -} - -void BE_CloseAudio(_THIS) -{ - if ( audio_obj ) { - audio_obj->Stop(); - delete audio_obj; - audio_obj = NULL; - } - - /* Quit the Be Application, if there's nothing left to do */ - SDL_QuitBeApp(); -} - -int BE_OpenAudio(_THIS, SDL_AudioSpec *spec) -{ - int valid_datatype = 0; - media_raw_audio_format format; - Uint16 test_format = SDL_FirstAudioFormat(spec->format); - - /* Parse the audio format and fill the Be raw audio format */ - memset(&format, '\0', sizeof (media_raw_audio_format)); - format.byte_order = B_MEDIA_LITTLE_ENDIAN; - format.frame_rate = (float) spec->freq; - format.channel_count = spec->channels; /* !!! FIXME: support > 2? */ - while ((!valid_datatype) && (test_format)) { - valid_datatype = 1; - spec->format = test_format; - switch (test_format) { - case AUDIO_S8: - format.format = media_raw_audio_format::B_AUDIO_CHAR; - break; - - case AUDIO_U8: - format.format = media_raw_audio_format::B_AUDIO_UCHAR; - break; - - case AUDIO_S16LSB: - format.format = media_raw_audio_format::B_AUDIO_SHORT; - break; - - case AUDIO_S16MSB: - format.format = media_raw_audio_format::B_AUDIO_SHORT; - format.byte_order = B_MEDIA_BIG_ENDIAN; - break; - - default: - valid_datatype = 0; - test_format = SDL_NextAudioFormat(); - break; - } - } - - if (!valid_datatype) { /* shouldn't happen, but just in case... */ - SDL_SetError("Unsupported audio format"); - return (-1); - } - - /* Initialize the Be Application, if it's not already started */ - if (SDL_InitBeApp() < 0) { - return (-1); - } - - format.buffer_size = spec->samples; - - /* Calculate the final parameters for this audio specification */ - SDL_CalculateAudioSpec(spec); - - /* Subscribe to the audio stream (creates a new thread) */ - { sigset_t omask; - SDL_MaskSignals(&omask); - audio_obj = new BSoundPlayer(&format, "SDL Audio", FillSound, - NULL, _this); - SDL_UnmaskSignals(&omask); - } - if ( audio_obj->Start() == B_NO_ERROR ) { - audio_obj->SetHasData(true); - } else { - SDL_SetError("Unable to start Be audio"); - return(-1); - } - - /* We're running! */ - return(1); -} - -}; /* Extern C */ diff --git a/apps/plugins/sdl/src/audio/baudio/SDL_beaudio.h b/apps/plugins/sdl/src/audio/baudio/SDL_beaudio.h deleted file mode 100644 index adaf1dee5d..0000000000 --- a/apps/plugins/sdl/src/audio/baudio/SDL_beaudio.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_lowaudio_h -#define _SDL_lowaudio_h - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the video functions */ -#define _THIS SDL_AudioDevice *_this - -struct SDL_PrivateAudioData { - BSoundPlayer *audio_obj; -}; - -/* Old variable names */ -#define audio_obj (_this->hidden->audio_obj) - -#endif /* _SDL_lowaudio_h */ diff --git a/apps/plugins/sdl/src/audio/bsd/SDL_bsdaudio.c b/apps/plugins/sdl/src/audio/bsd/SDL_bsdaudio.c deleted file mode 100644 index e5e0d9480a..0000000000 --- a/apps/plugins/sdl/src/audio/bsd/SDL_bsdaudio.c +++ /dev/null @@ -1,404 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* - * Driver for native OpenBSD/NetBSD audio(4). - * vedge@vedge.com.ar. - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "../SDL_audiomem.h" -#include "../SDL_audio_c.h" -#include "../SDL_audiodev_c.h" -#include "SDL_bsdaudio.h" - -/* The tag name used by NetBSD/OpenBSD audio */ -#ifdef __NetBSD__ -#define BSD_AUDIO_DRIVER_NAME "netbsd" -#define BSD_AUDIO_DRIVER_DESC "Native NetBSD audio" -#else -#define BSD_AUDIO_DRIVER_NAME "openbsd" -#define BSD_AUDIO_DRIVER_DESC "Native OpenBSD audio" -#endif - -/* Open the audio device for playback, and don't block if busy */ -/* #define USE_BLOCKING_WRITES */ - -/* Use timer for synchronization */ -/* #define USE_TIMER_SYNC */ - -/* #define DEBUG_AUDIO */ -/* #define DEBUG_AUDIO_STREAM */ - -#ifdef USE_BLOCKING_WRITES -#define OPEN_FLAGS O_WRONLY -#else -#define OPEN_FLAGS (O_WRONLY|O_NONBLOCK) -#endif - -/* Audio driver functions */ -static void OBSD_WaitAudio(_THIS); -static int OBSD_OpenAudio(_THIS, SDL_AudioSpec *spec); -static void OBSD_PlayAudio(_THIS); -static Uint8 *OBSD_GetAudioBuf(_THIS); -static void OBSD_CloseAudio(_THIS); - -#ifdef DEBUG_AUDIO -static void OBSD_Status(_THIS); -#endif - -/* Audio driver bootstrap functions */ - -static int -Audio_Available(void) -{ - int fd; - int available; - - available = 0; - fd = SDL_OpenAudioPath(NULL, 0, OPEN_FLAGS, 0); - if(fd >= 0) { - available = 1; - close(fd); - } - return(available); -} - -static void -Audio_DeleteDevice(SDL_AudioDevice *device) -{ - SDL_free(device->hidden); - SDL_free(device); -} - -static SDL_AudioDevice -*Audio_CreateDevice(int devindex) -{ - SDL_AudioDevice *this; - - /* Initialize all variables that we clean on shutdown */ - this = (SDL_AudioDevice*)SDL_malloc(sizeof(SDL_AudioDevice)); - if(this) { - SDL_memset(this, 0, (sizeof *this)); - this->hidden = - (struct SDL_PrivateAudioData*)SDL_malloc((sizeof *this->hidden)); - } - if((this == NULL) || (this->hidden == NULL)) { - SDL_OutOfMemory(); - if(this) SDL_free(this); - return(0); - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - audio_fd = -1; - - /* Set the function pointers */ - this->OpenAudio = OBSD_OpenAudio; - this->WaitAudio = OBSD_WaitAudio; - this->PlayAudio = OBSD_PlayAudio; - this->GetAudioBuf = OBSD_GetAudioBuf; - this->CloseAudio = OBSD_CloseAudio; - - this->free = Audio_DeleteDevice; - - return this; -} - -AudioBootStrap BSD_AUDIO_bootstrap = { - BSD_AUDIO_DRIVER_NAME, BSD_AUDIO_DRIVER_DESC, - Audio_Available, Audio_CreateDevice -}; - -/* This function waits until it is possible to write a full sound buffer */ -static void -OBSD_WaitAudio(_THIS) -{ -#ifndef USE_BLOCKING_WRITES /* Not necessary when using blocking writes */ - /* See if we need to use timed audio synchronization */ - if ( frame_ticks ) { - /* Use timer for general audio synchronization */ - Sint32 ticks; - - ticks = ((Sint32)(next_frame - SDL_GetTicks()))-FUDGE_TICKS; - if ( ticks > 0 ) { - SDL_Delay(ticks); - } - } else { - /* Use select() for audio synchronization */ - fd_set fdset; - struct timeval timeout; - - FD_ZERO(&fdset); - FD_SET(audio_fd, &fdset); - timeout.tv_sec = 10; - timeout.tv_usec = 0; -#ifdef DEBUG_AUDIO - fprintf(stderr, "Waiting for audio to get ready\n"); -#endif - if ( select(audio_fd+1, NULL, &fdset, NULL, &timeout) <= 0 ) { - const char *message = - "Audio timeout - buggy audio driver? (disabled)"; - /* In general we should never print to the screen, - but in this case we have no other way of letting - the user know what happened. - */ - fprintf(stderr, "SDL: %s\n", message); - this->enabled = 0; - /* Don't try to close - may hang */ - audio_fd = -1; -#ifdef DEBUG_AUDIO - fprintf(stderr, "Done disabling audio\n"); -#endif - } -#ifdef DEBUG_AUDIO - fprintf(stderr, "Ready!\n"); -#endif - } -#endif /* !USE_BLOCKING_WRITES */ -} - -static void -OBSD_PlayAudio(_THIS) -{ - int written, p=0; - - /* Write the audio data, checking for EAGAIN on broken audio drivers */ - do { - written = write(audio_fd, &mixbuf[p], mixlen-p); - if (written>0) - p += written; - if (written == -1 && errno != 0 && errno != EAGAIN && errno != EINTR) - { - /* Non recoverable error has occurred. It should be reported!!! */ - perror("audio"); - break; - } - - if ( p < written || ((written < 0) && ((errno == 0) || (errno == EAGAIN))) ) { - SDL_Delay(1); /* Let a little CPU time go by */ - } - } while ( p < written ); - - /* If timer synchronization is enabled, set the next write frame */ - if ( frame_ticks ) { - next_frame += frame_ticks; - } - - /* If we couldn't write, assume fatal error for now */ - if ( written < 0 ) { - this->enabled = 0; - } -#ifdef DEBUG_AUDIO - fprintf(stderr, "Wrote %d bytes of audio data\n", written); -#endif -} - -static Uint8 -*OBSD_GetAudioBuf(_THIS) -{ - return(mixbuf); -} - -static void -OBSD_CloseAudio(_THIS) -{ - if(mixbuf != NULL) { - SDL_FreeAudioMem(mixbuf); - mixbuf = NULL; - } - if(audio_fd >= 0) { - close(audio_fd); - audio_fd = -1; - } -} - -#ifdef DEBUG_AUDIO -void -OBSD_Status(_THIS) -{ - audio_info_t info; - - if(ioctl(audio_fd, AUDIO_GETINFO, &info) < 0) { - fprintf(stderr,"AUDIO_GETINFO failed.\n"); - return; - } - - fprintf(stderr,"\n" -"[play/record info]\n" -"buffer size : %d bytes\n" -"sample rate : %i Hz\n" -"channels : %i\n" -"precision : %i-bit\n" -"encoding : 0x%x\n" -"seek : %i\n" -"sample count : %i\n" -"EOF count : %i\n" -"paused : %s\n" -"error occured : %s\n" -"waiting : %s\n" -"active : %s\n" -"", - info.play.buffer_size, - info.play.sample_rate, - info.play.channels, - info.play.precision, - info.play.encoding, - info.play.seek, - info.play.samples, - info.play.eof, - info.play.pause ? "yes" : "no", - info.play.error ? "yes" : "no", - info.play.waiting ? "yes" : "no", - info.play.active ? "yes": "no"); - - fprintf(stderr,"\n" -"[audio info]\n" -"monitor_gain : %i\n" -"hw block size : %d bytes\n" -"hi watermark : %i\n" -"lo watermark : %i\n" -"audio mode : %s\n" -"", - info.monitor_gain, - info.blocksize, - info.hiwat, info.lowat, - (info.mode == AUMODE_PLAY) ? "PLAY" - : (info.mode = AUMODE_RECORD) ? "RECORD" - : (info.mode == AUMODE_PLAY_ALL ? "PLAY_ALL" - : "?")); -} -#endif /* DEBUG_AUDIO */ - -static int -OBSD_OpenAudio(_THIS, SDL_AudioSpec *spec) -{ - char audiodev[64]; - Uint16 format; - audio_info_t info; - - AUDIO_INITINFO(&info); - - /* Calculate the final parameters for this audio specification */ - SDL_CalculateAudioSpec(spec); - -#ifdef USE_TIMER_SYNC - frame_ticks = 0.0; -#endif - - /* Open the audio device */ - audio_fd = SDL_OpenAudioPath(audiodev, sizeof(audiodev), OPEN_FLAGS, 0); - if(audio_fd < 0) { - SDL_SetError("Couldn't open %s: %s", audiodev, strerror(errno)); - return(-1); - } - - /* Set to play mode */ - info.mode = AUMODE_PLAY; - if(ioctl(audio_fd, AUDIO_SETINFO, &info) < 0) { - SDL_SetError("Couldn't put device into play mode"); - return(-1); - } - - mixbuf = NULL; - AUDIO_INITINFO(&info); - for (format = SDL_FirstAudioFormat(spec->format); - format; format = SDL_NextAudioFormat()) - { - switch(format) { - case AUDIO_U8: - info.play.encoding = AUDIO_ENCODING_ULINEAR; - info.play.precision = 8; - break; - case AUDIO_S8: - info.play.encoding = AUDIO_ENCODING_SLINEAR; - info.play.precision = 8; - break; - case AUDIO_S16LSB: - info.play.encoding = AUDIO_ENCODING_SLINEAR_LE; - info.play.precision = 16; - break; - case AUDIO_S16MSB: - info.play.encoding = AUDIO_ENCODING_SLINEAR_BE; - info.play.precision = 16; - break; - case AUDIO_U16LSB: - info.play.encoding = AUDIO_ENCODING_ULINEAR_LE; - info.play.precision = 16; - break; - case AUDIO_U16MSB: - info.play.encoding = AUDIO_ENCODING_ULINEAR_BE; - info.play.precision = 16; - break; - default: - continue; - } - if (ioctl(audio_fd, AUDIO_SETINFO, &info) == 0) - break; - } - - if(!format) { - SDL_SetError("No supported encoding for 0x%x", spec->format); - return(-1); - } - - spec->format = format; - - AUDIO_INITINFO(&info); - info.play.channels = spec->channels; - if (ioctl(audio_fd, AUDIO_SETINFO, &info) == -1) - spec->channels = 1; - AUDIO_INITINFO(&info); - info.play.sample_rate = spec->freq; - info.blocksize = spec->size; - info.hiwat = 5; - info.lowat = 3; - (void)ioctl(audio_fd, AUDIO_SETINFO, &info); - (void)ioctl(audio_fd, AUDIO_GETINFO, &info); - spec->freq = info.play.sample_rate; - /* Allocate mixing buffer */ - mixlen = spec->size; - mixbuf = (Uint8*)SDL_AllocAudioMem(mixlen); - if(mixbuf == NULL) { - return(-1); - } - SDL_memset(mixbuf, spec->silence, spec->size); - - /* Get the parent process id (we're the parent of the audio thread) */ - parent = getpid(); - -#ifdef DEBUG_AUDIO - OBSD_Status(this); -#endif - - /* We're ready to rock and roll. :-) */ - return(0); -} diff --git a/apps/plugins/sdl/src/audio/bsd/SDL_bsdaudio.h b/apps/plugins/sdl/src/audio/bsd/SDL_bsdaudio.h deleted file mode 100644 index c9f69cf544..0000000000 --- a/apps/plugins/sdl/src/audio/bsd/SDL_bsdaudio.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_openbsdaudio_h -#define _SDL_openbsdaudio_h - -#include "../SDL_sysaudio.h" - -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData -{ - /* The file descriptor for the audio device */ - int audio_fd; - - /* The parent process id, to detect when application quits */ - pid_t parent; - - /* Raw mixing buffer */ - Uint8 *mixbuf; - int mixlen; - - /* Support for audio timing using a timer, in addition to select() */ - float frame_ticks; - float next_frame; -}; - -#define FUDGE_TICKS 10 /* The scheduler overhead ticks per frame */ - -/* Old variable names */ -#define audio_fd (this->hidden->audio_fd) -#define parent (this->hidden->parent) -#define mixbuf (this->hidden->mixbuf) -#define mixlen (this->hidden->mixlen) -#define frame_ticks (this->hidden->frame_ticks) -#define next_frame (this->hidden->next_frame) - -#endif /* _SDL_openbsdaudio_h */ diff --git a/apps/plugins/sdl/src/audio/dart/SDL_dart.c b/apps/plugins/sdl/src/audio/dart/SDL_dart.c deleted file mode 100644 index 77e530db51..0000000000 --- a/apps/plugins/sdl/src/audio/dart/SDL_dart.c +++ /dev/null @@ -1,441 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Allow access to a raw mixing buffer */ - -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "../SDL_audio_c.h" -#include "SDL_dart.h" - -// Buffer states: -#define BUFFER_EMPTY 0 -#define BUFFER_USED 1 - -typedef struct _tMixBufferDesc { - int iBufferUsage; // BUFFER_EMPTY or BUFFER_USED - SDL_AudioDevice *pSDLAudioDevice; -} tMixBufferDesc, *pMixBufferDesc; - - -//--------------------------------------------------------------------- -// DARTEventFunc -// -// This function is called by DART, when an event occures, like end of -// playback of a buffer, etc... -//--------------------------------------------------------------------- -LONG APIENTRY DARTEventFunc(ULONG ulStatus, - PMCI_MIX_BUFFER pBuffer, - ULONG ulFlags) -{ - if (ulFlags && MIX_WRITE_COMPLETE) - { // Playback of buffer completed! - - // Get pointer to buffer description - pMixBufferDesc pBufDesc; - - if (pBuffer) - { - pBufDesc = (pMixBufferDesc) (*pBuffer).ulUserParm; - - if (pBufDesc) - { - SDL_AudioDevice *pSDLAudioDevice = pBufDesc->pSDLAudioDevice; - // Set the buffer to be empty - pBufDesc->iBufferUsage = BUFFER_EMPTY; - // And notify DART feeder thread that it will have to work a bit. - if (pSDLAudioDevice) - DosPostEventSem(pSDLAudioDevice->hidden->hevAudioBufferPlayed); - } - } - } - return TRUE; -} - - -int DART_OpenAudio(_THIS, SDL_AudioSpec *spec) -{ - Uint16 test_format = SDL_FirstAudioFormat(spec->format); - int valid_datatype = 0; - MCI_AMP_OPEN_PARMS AmpOpenParms; - MCI_GENERIC_PARMS GenericParms; - int iDeviceOrd = 0; // Default device to be used - int bOpenShared = 1; // Try opening it shared - int iBits = 16; // Default is 16 bits signed - int iFreq = 44100; // Default is 44KHz - int iChannels = 2; // Default is 2 channels (Stereo) - int iNumBufs = 2; // Number of audio buffers: 2 - int iBufSize; - int iOpenMode; - int iSilence; - int rc; - - // First thing is to try to open a given DART device! - SDL_memset(&AmpOpenParms, 0, sizeof(MCI_AMP_OPEN_PARMS)); - // pszDeviceType should contain the device type in low word, and device ordinal in high word! - AmpOpenParms.pszDeviceType = (PSZ) (MCI_DEVTYPE_AUDIO_AMPMIX | (iDeviceOrd << 16)); - - iOpenMode = MCI_WAIT | MCI_OPEN_TYPE_ID; - if (bOpenShared) iOpenMode |= MCI_OPEN_SHAREABLE; - - rc = mciSendCommand( 0, MCI_OPEN, - iOpenMode, - (PVOID) &AmpOpenParms, 0); - if (rc!=MCIERR_SUCCESS) // No audio available?? - return (-1); - // Save the device ID we got from DART! - // We will use this in the next calls! - iDeviceOrd = AmpOpenParms.usDeviceID; - - // Determine the audio parameters from the AudioSpec - if (spec->channels > 2) - spec->channels = 2; // !!! FIXME: more than stereo support in OS/2? - - while ((!valid_datatype) && (test_format)) { - spec->format = test_format; - valid_datatype = 1; - switch (test_format) { - case AUDIO_U8: - // Unsigned 8 bit audio data - iSilence = 0x80; - iBits = 8; - break; - - case AUDIO_S16LSB: - // Signed 16 bit audio data - iSilence = 0x00; - iBits = 16; - break; - - default: - valid_datatype = 0; - test_format = SDL_NextAudioFormat(); - break; - } - } - - if (!valid_datatype) { // shouldn't happen, but just in case... - // Close DART, and exit with error code! - mciSendCommand(iDeviceOrd, MCI_CLOSE, MCI_WAIT, &GenericParms, 0); - SDL_SetError("Unsupported audio format"); - return (-1); - } - - iFreq = spec->freq; - iChannels = spec->channels; - /* Update the fragment size as size in bytes */ - SDL_CalculateAudioSpec(spec); - iBufSize = spec->size; - - // Now query this device if it supports the given freq/bits/channels! - SDL_memset(&(_this->hidden->MixSetupParms), 0, sizeof(MCI_MIXSETUP_PARMS)); - _this->hidden->MixSetupParms.ulBitsPerSample = iBits; - _this->hidden->MixSetupParms.ulFormatTag = MCI_WAVE_FORMAT_PCM; - _this->hidden->MixSetupParms.ulSamplesPerSec = iFreq; - _this->hidden->MixSetupParms.ulChannels = iChannels; - _this->hidden->MixSetupParms.ulFormatMode = MCI_PLAY; - _this->hidden->MixSetupParms.ulDeviceType = MCI_DEVTYPE_WAVEFORM_AUDIO; - _this->hidden->MixSetupParms.pmixEvent = DARTEventFunc; - rc = mciSendCommand (iDeviceOrd, MCI_MIXSETUP, - MCI_WAIT | MCI_MIXSETUP_QUERYMODE, - &(_this->hidden->MixSetupParms), 0); - if (rc!=MCIERR_SUCCESS) - { // The device cannot handle this format! - // Close DART, and exit with error code! - mciSendCommand(iDeviceOrd, MCI_CLOSE, MCI_WAIT, &GenericParms, 0); - SDL_SetError("Audio device doesn't support requested audio format"); - return(-1); - } - // The device can handle this format, so initialize! - rc = mciSendCommand(iDeviceOrd, MCI_MIXSETUP, - MCI_WAIT | MCI_MIXSETUP_INIT, - &(_this->hidden->MixSetupParms), 0); - if (rc!=MCIERR_SUCCESS) - { // The device could not be opened! - // Close DART, and exit with error code! - mciSendCommand(iDeviceOrd, MCI_CLOSE, MCI_WAIT, &GenericParms, 0); - SDL_SetError("Audio device could not be set up"); - return(-1); - } - // Ok, the device is initialized. - // Now we should allocate buffers. For this, we need a place where - // the buffer descriptors will be: - _this->hidden->pMixBuffers = (MCI_MIX_BUFFER *) SDL_malloc(sizeof(MCI_MIX_BUFFER)*iNumBufs); - if (!(_this->hidden->pMixBuffers)) - { // Not enough memory! - // Close DART, and exit with error code! - mciSendCommand(iDeviceOrd, MCI_CLOSE, MCI_WAIT, &GenericParms, 0); - SDL_SetError("Not enough memory for audio buffer descriptors"); - return(-1); - } - // Now that we have the place for buffer list, we can ask DART for the - // buffers! - _this->hidden->BufferParms.ulNumBuffers = iNumBufs; // Number of buffers - _this->hidden->BufferParms.ulBufferSize = iBufSize; // each with this size - _this->hidden->BufferParms.pBufList = _this->hidden->pMixBuffers; // getting descriptorts into this list - // Allocate buffers! - rc = mciSendCommand(iDeviceOrd, MCI_BUFFER, - MCI_WAIT | MCI_ALLOCATE_MEMORY, - &(_this->hidden->BufferParms), 0); - if ((rc!=MCIERR_SUCCESS) || (iNumBufs != _this->hidden->BufferParms.ulNumBuffers) || (_this->hidden->BufferParms.ulBufferSize==0)) - { // Could not allocate memory! - // Close DART, and exit with error code! - SDL_free(_this->hidden->pMixBuffers); _this->hidden->pMixBuffers = NULL; - mciSendCommand(iDeviceOrd, MCI_CLOSE, MCI_WAIT, &GenericParms, 0); - SDL_SetError("DART could not allocate buffers"); - return(-1); - } - // Ok, we have all the buffers allocated, let's mark them! - { - int i; - for (i=0; ihidden->pMixBuffers[i].pBuffer)) || (!pBufferDesc)) - { // Wrong buffer! - // Close DART, and exit with error code! - // Free buffer descriptions - { int j; - for (j=0; jhidden->pMixBuffers[j].ulUserParm)); - } - // and cleanup - mciSendCommand(iDeviceOrd, MCI_BUFFER, MCI_WAIT | MCI_DEALLOCATE_MEMORY, &(_this->hidden->BufferParms), 0); - SDL_free(_this->hidden->pMixBuffers); _this->hidden->pMixBuffers = NULL; - mciSendCommand(iDeviceOrd, MCI_CLOSE, MCI_WAIT, &GenericParms, 0); - SDL_SetError("Error at internal buffer check"); - return(-1); - } - pBufferDesc->iBufferUsage = BUFFER_EMPTY; - pBufferDesc->pSDLAudioDevice = _this; - - _this->hidden->pMixBuffers[i].ulBufferLength = _this->hidden->BufferParms.ulBufferSize; - _this->hidden->pMixBuffers[i].ulUserParm = (ULONG) pBufferDesc; // User parameter: Description of buffer - _this->hidden->pMixBuffers[i].ulFlags = 0; // Some stuff should be flagged here for DART, like end of - // audio data, but as we will continously send - // audio data, there will be no end.:) - SDL_memset(_this->hidden->pMixBuffers[i].pBuffer, iSilence, iBufSize); - } - } - _this->hidden->iNextFreeBuffer = 0; - _this->hidden->iLastPlayedBuf = -1; - // Create event semaphore - if (DosCreateEventSem(NULL, &(_this->hidden->hevAudioBufferPlayed), 0, FALSE)!=NO_ERROR) - { - // Could not create event semaphore! - { - int i; - for (i=0; ihidden->pMixBuffers[i].ulUserParm)); - } - mciSendCommand(iDeviceOrd, MCI_BUFFER, MCI_WAIT | MCI_DEALLOCATE_MEMORY, &(_this->hidden->BufferParms), 0); - SDL_free(_this->hidden->pMixBuffers); _this->hidden->pMixBuffers = NULL; - mciSendCommand(iDeviceOrd, MCI_CLOSE, MCI_WAIT, &GenericParms, 0); - SDL_SetError("Could not create event semaphore"); - return(-1); - } - - // Store the new settings in global variables - _this->hidden->iCurrDeviceOrd = iDeviceOrd; - _this->hidden->iCurrFreq = iFreq; - _this->hidden->iCurrBits = iBits; - _this->hidden->iCurrChannels = iChannels; - _this->hidden->iCurrNumBufs = iNumBufs; - _this->hidden->iCurrBufSize = iBufSize; - - return (0); -} - - - -void DART_ThreadInit(_THIS) -{ - return; -} - -/* This function waits until it is possible to write a full sound buffer */ -void DART_WaitAudio(_THIS) -{ - int i; - pMixBufferDesc pBufDesc; - ULONG ulPostCount; - - DosResetEventSem(_this->hidden->hevAudioBufferPlayed, &ulPostCount); - // If there is already an empty buffer, then return now! - for (i=0; i<_this->hidden->iCurrNumBufs; i++) - { - pBufDesc = (pMixBufferDesc) _this->hidden->pMixBuffers[i].ulUserParm; - if (pBufDesc->iBufferUsage == BUFFER_EMPTY) - return; - } - // If there is no empty buffer, wait for one to be empty! - DosWaitEventSem(_this->hidden->hevAudioBufferPlayed, 1000); // Wait max 1 sec!!! Important! - return; -} - -void DART_PlayAudio(_THIS) -{ - int iFreeBuf = _this->hidden->iNextFreeBuffer; - pMixBufferDesc pBufDesc; - - pBufDesc = (pMixBufferDesc) _this->hidden->pMixBuffers[iFreeBuf].ulUserParm; - pBufDesc->iBufferUsage = BUFFER_USED; - // Send it to DART to be queued - _this->hidden->MixSetupParms.pmixWrite(_this->hidden->MixSetupParms.ulMixHandle, - &(_this->hidden->pMixBuffers[iFreeBuf]), 1); - - _this->hidden->iLastPlayedBuf = iFreeBuf; - iFreeBuf = (iFreeBuf+1) % _this->hidden->iCurrNumBufs; - _this->hidden->iNextFreeBuffer = iFreeBuf; -} - -Uint8 *DART_GetAudioBuf(_THIS) -{ - int iFreeBuf; - Uint8 *pResult; - pMixBufferDesc pBufDesc; - - if (_this) - { - if (_this->hidden) - { - iFreeBuf = _this->hidden->iNextFreeBuffer; - pBufDesc = (pMixBufferDesc) _this->hidden->pMixBuffers[iFreeBuf].ulUserParm; - - if (pBufDesc) - { - if (pBufDesc->iBufferUsage == BUFFER_EMPTY) - { - pResult = _this->hidden->pMixBuffers[iFreeBuf].pBuffer; - return pResult; - } - } else - printf("[DART_GetAudioBuf] : ERROR! pBufDesc = %p\n", pBufDesc); - } else - printf("[DART_GetAudioBuf] : ERROR! _this->hidden = %p\n", _this->hidden); - } else - printf("[DART_GetAudioBuf] : ERROR! _this = %p\n", _this); - return NULL; -} - -void DART_WaitDone(_THIS) -{ - pMixBufferDesc pBufDesc; - ULONG ulPostCount; - APIRET rc; - - pBufDesc = (pMixBufferDesc) _this->hidden->pMixBuffers[_this->hidden->iLastPlayedBuf].ulUserParm; - rc = NO_ERROR; - while ((pBufDesc->iBufferUsage != BUFFER_EMPTY) && (rc==NO_ERROR)) - { - DosResetEventSem(_this->hidden->hevAudioBufferPlayed, &ulPostCount); - rc = DosWaitEventSem(_this->hidden->hevAudioBufferPlayed, 1000); // 1 sec timeout! Important! - } -} - -void DART_CloseAudio(_THIS) -{ - MCI_GENERIC_PARMS GenericParms; - int rc; - - // Stop DART playback - rc = mciSendCommand(_this->hidden->iCurrDeviceOrd, MCI_STOP, MCI_WAIT, &GenericParms, 0); - if (rc!=MCIERR_SUCCESS) - { -#ifdef SFX_DEBUG_BUILD - printf("Could not stop DART playback!\n"); - fflush(stdout); -#endif - } - - // Close event semaphore - DosCloseEventSem(_this->hidden->hevAudioBufferPlayed); - - // Free memory of buffer descriptions - { - int i; - for (i=0; i<_this->hidden->iCurrNumBufs; i++) SDL_free((void *)(_this->hidden->pMixBuffers[i].ulUserParm)); - } - - // Deallocate buffers - rc = mciSendCommand(_this->hidden->iCurrDeviceOrd, MCI_BUFFER, MCI_WAIT | MCI_DEALLOCATE_MEMORY, &(_this->hidden->BufferParms), 0); - - // Free bufferlist - SDL_free(_this->hidden->pMixBuffers); _this->hidden->pMixBuffers = NULL; - - // Close dart - rc = mciSendCommand(_this->hidden->iCurrDeviceOrd, MCI_CLOSE, MCI_WAIT, &(GenericParms), 0); -} - -/* Audio driver bootstrap functions */ - -int Audio_Available(void) -{ - return(1); -} - -void Audio_DeleteDevice(SDL_AudioDevice *device) -{ - SDL_free(device->hidden); - SDL_free(device); -} - -SDL_AudioDevice *Audio_CreateDevice(int devindex) -{ - SDL_AudioDevice *this; - - /* Initialize all variables that we clean on shutdown */ - this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice)); - if ( this ) - { - SDL_memset(this, 0, (sizeof *this)); - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - } - if ( (this == NULL) || (this->hidden == NULL) ) - { - SDL_OutOfMemory(); - if ( this ) - SDL_free(this); - return(0); - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - /* Set the function pointers */ - this->OpenAudio = DART_OpenAudio; - this->ThreadInit = DART_ThreadInit; - this->WaitAudio = DART_WaitAudio; - this->PlayAudio = DART_PlayAudio; - this->GetAudioBuf = DART_GetAudioBuf; - this->WaitDone = DART_WaitDone; - this->CloseAudio = DART_CloseAudio; - - this->free = Audio_DeleteDevice; - - return this; -} - -AudioBootStrap DART_bootstrap = { - "dart", "OS/2 Direct Audio RouTines (DART)", - Audio_Available, Audio_CreateDevice -}; - diff --git a/apps/plugins/sdl/src/audio/dart/SDL_dart.h b/apps/plugins/sdl/src/audio/dart/SDL_dart.h deleted file mode 100644 index 68c27bd9d3..0000000000 --- a/apps/plugins/sdl/src/audio/dart/SDL_dart.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_lowaudio_h -#define _SDL_lowaudio_h - -#define INCL_TYPES -#define INCL_DOSSEMAPHORES -#define INCL_DOSRESOURCES -#define INCL_DOSMISC -#define INCL_DOSERRORS - -#define INCL_OS2MM -#define INCL_MMIOOS2 -#define INCL_MCIOS2 -#include -#include // DART stuff and MMIO stuff - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the audio functions */ -#define _THIS SDL_AudioDevice *_this - -/* The DirectSound objects */ -struct SDL_PrivateAudioData -{ - int iCurrDeviceOrd; - int iCurrFreq; - int iCurrBits; - int iCurrChannels; - int iCurrNumBufs; - int iCurrBufSize; - - int iLastPlayedBuf; - int iNextFreeBuffer; - - MCI_BUFFER_PARMS BufferParms; // Sound buffer parameters - MCI_MIX_BUFFER *pMixBuffers; // Sound buffers - MCI_MIXSETUP_PARMS MixSetupParms; // Mixer setup parameters - HEV hevAudioBufferPlayed; // Event semaphore to indicate that an audio buffer has been played by DART -}; - -#endif /* _SDL_lowaudio_h */ diff --git a/apps/plugins/sdl/src/audio/dc/SDL_dcaudio.c b/apps/plugins/sdl/src/audio/dc/SDL_dcaudio.c deleted file mode 100644 index 88daa8723a..0000000000 --- a/apps/plugins/sdl/src/audio/dc/SDL_dcaudio.c +++ /dev/null @@ -1,246 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org - -*/ -#include "SDL_config.h" - -/* Output dreamcast aica */ - -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "../SDL_audiomem.h" -#include "../SDL_audio_c.h" -#include "../SDL_audiodev_c.h" -#include "SDL_dcaudio.h" - -#include "aica.h" -#include - -/* Audio driver functions */ -static int DCAUD_OpenAudio(_THIS, SDL_AudioSpec *spec); -static void DCAUD_WaitAudio(_THIS); -static void DCAUD_PlayAudio(_THIS); -static Uint8 *DCAUD_GetAudioBuf(_THIS); -static void DCAUD_CloseAudio(_THIS); - -/* Audio driver bootstrap functions */ -static int DCAUD_Available(void) -{ - return 1; -} - -static void DCAUD_DeleteDevice(SDL_AudioDevice *device) -{ - SDL_free(device->hidden); - SDL_free(device); -} - -static SDL_AudioDevice *DCAUD_CreateDevice(int devindex) -{ - SDL_AudioDevice *this; - - /* Initialize all variables that we clean on shutdown */ - this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice)); - if ( this ) { - SDL_memset(this, 0, (sizeof *this)); - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - } - if ( (this == NULL) || (this->hidden == NULL) ) { - SDL_OutOfMemory(); - if ( this ) { - SDL_free(this); - } - return(0); - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - /* Set the function pointers */ - this->OpenAudio = DCAUD_OpenAudio; - this->WaitAudio = DCAUD_WaitAudio; - this->PlayAudio = DCAUD_PlayAudio; - this->GetAudioBuf = DCAUD_GetAudioBuf; - this->CloseAudio = DCAUD_CloseAudio; - - this->free = DCAUD_DeleteDevice; - - spu_init(); - - return this; -} - -AudioBootStrap DCAUD_bootstrap = { - "dcaudio", "Dreamcast AICA audio", - DCAUD_Available, DCAUD_CreateDevice -}; - -/* This function waits until it is possible to write a full sound buffer */ -static void DCAUD_WaitAudio(_THIS) -{ - if (this->hidden->playing) { - /* wait */ - while(aica_get_pos(0)/this->spec.samples == this->hidden->nextbuf) { - thd_pass(); - } - } -} - -#define SPU_RAM_BASE 0xa0800000 - -static void spu_memload_stereo8(int leftpos,int rightpos,void *src0,size_t size) -{ - uint8 *src = src0; - uint32 *left = (uint32*)(leftpos +SPU_RAM_BASE); - uint32 *right = (uint32*)(rightpos+SPU_RAM_BASE); - size = (size+7)/8; - while(size--) { - unsigned lval,rval; - lval = *src++; - rval = *src++; - lval|= (*src++)<<8; - rval|= (*src++)<<8; - lval|= (*src++)<<16; - rval|= (*src++)<<16; - lval|= (*src++)<<24; - rval|= (*src++)<<24; - g2_write_32(left++,lval); - g2_write_32(right++,rval); - g2_fifo_wait(); - } -} - -static void spu_memload_stereo16(int leftpos,int rightpos,void *src0,size_t size) -{ - uint16 *src = src0; - uint32 *left = (uint32*)(leftpos +SPU_RAM_BASE); - uint32 *right = (uint32*)(rightpos+SPU_RAM_BASE); - size = (size+7)/8; - while(size--) { - unsigned lval,rval; - lval = *src++; - rval = *src++; - lval|= (*src++)<<16; - rval|= (*src++)<<16; - g2_write_32(left++,lval); - g2_write_32(right++,rval); - g2_fifo_wait(); - } -} - -static void DCAUD_PlayAudio(_THIS) -{ - SDL_AudioSpec *spec = &this->spec; - unsigned int offset; - - if (this->hidden->playing) { - /* wait */ - while(aica_get_pos(0)/spec->samples == this->hidden->nextbuf) { - thd_pass(); - } - } - - offset = this->hidden->nextbuf*spec->size; - this->hidden->nextbuf^=1; - /* Write the audio data, checking for EAGAIN on broken audio drivers */ - if (spec->channels==1) { - spu_memload(this->hidden->leftpos+offset,this->hidden->mixbuf,this->hidden->mixlen); - } else { - offset/=2; - if ((this->spec.format&255)==8) { - spu_memload_stereo8(this->hidden->leftpos+offset,this->hidden->rightpos+offset,this->hidden->mixbuf,this->hidden->mixlen); - } else { - spu_memload_stereo16(this->hidden->leftpos+offset,this->hidden->rightpos+offset,this->hidden->mixbuf,this->hidden->mixlen); - } - } - - if (!this->hidden->playing) { - int mode; - this->hidden->playing = 1; - mode = (spec->format==AUDIO_S8)?SM_8BIT:SM_16BIT; - if (spec->channels==1) { - aica_play(0,mode,this->hidden->leftpos,0,spec->samples*2,spec->freq,255,128,1); - } else { - aica_play(0,mode,this->hidden->leftpos ,0,spec->samples*2,spec->freq,255,0,1); - aica_play(1,mode,this->hidden->rightpos,0,spec->samples*2,spec->freq,255,255,1); - } - } -} - -static Uint8 *DCAUD_GetAudioBuf(_THIS) -{ - return(this->hidden->mixbuf); -} - -static void DCAUD_CloseAudio(_THIS) -{ - aica_stop(0); - if (this->spec.channels==2) aica_stop(1); - if ( this->hidden->mixbuf != NULL ) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - } -} - -static int DCAUD_OpenAudio(_THIS, SDL_AudioSpec *spec) -{ - Uint16 test_format = SDL_FirstAudioFormat(spec->format); - int valid_datatype = 0; - while ((!valid_datatype) && (test_format)) { - spec->format = test_format; - switch (test_format) { - /* only formats Dreamcast accepts... */ - case AUDIO_S8: - case AUDIO_S16LSB: - valid_datatype = 1; - break; - - default: - test_format = SDL_NextAudioFormat(); - break; - } - } - - if (!valid_datatype) { /* shouldn't happen, but just in case... */ - SDL_SetError("Unsupported audio format"); - return (-1); - } - - if (spec->channels > 2) - spec->channels = 2; /* no more than stereo on the Dreamcast. */ - - /* Update the fragment size as size in bytes */ - SDL_CalculateAudioSpec(spec); - - /* Allocate mixing buffer */ - this->hidden->mixlen = spec->size; - this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen); - if ( this->hidden->mixbuf == NULL ) { - return(-1); - } - SDL_memset(this->hidden->mixbuf, spec->silence, spec->size); - this->hidden->leftpos = 0x11000; - this->hidden->rightpos = 0x11000+spec->size; - this->hidden->playing = 0; - this->hidden->nextbuf = 0; - - /* We're ready to rock and roll. :-) */ - return(0); -} diff --git a/apps/plugins/sdl/src/audio/dc/SDL_dcaudio.h b/apps/plugins/sdl/src/audio/dc/SDL_dcaudio.h deleted file mode 100644 index fba95b3eda..0000000000 --- a/apps/plugins/sdl/src/audio/dc/SDL_dcaudio.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_dcaudio_h -#define _SDL_dcaudio_h - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the video functions */ -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData { - /* The file descriptor for the audio device */ - Uint8 *mixbuf; - Uint32 mixlen; - int playing; - int leftpos,rightpos; - int nextbuf; -}; - -#endif /* _SDL_dcaudio_h */ diff --git a/apps/plugins/sdl/src/audio/dc/aica.c b/apps/plugins/sdl/src/audio/dc/aica.c deleted file mode 100644 index b6a1c93644..0000000000 --- a/apps/plugins/sdl/src/audio/dc/aica.c +++ /dev/null @@ -1,271 +0,0 @@ -/* This file is part of the Dreamcast function library. - * Please see libdream.c for further details. - * - * (c)2000 Dan Potter - * modify BERO - */ -#include "aica.h" - -#include -#include - -/* #define dc_snd_base ((volatile unsigned char *)0x00800000) */ /* arm side */ -#define dc_snd_base ((volatile unsigned char *)0xa0700000) /* dc side */ - -/* Some convienence macros */ -#define SNDREGADDR(x) (0xa0700000 + (x)) -#define CHNREGADDR(ch,x) SNDREGADDR(0x80*(ch)+(x)) - - -#define SNDREG32(x) (*(volatile unsigned long *)SNDREGADDR(x)) -#define SNDREG8(x) (*(volatile unsigned char *)SNDREGADDR(x)) -#define CHNREG32(ch, x) (*(volatile unsigned long *)CHNREGADDR(ch,x)) -#define CHNREG8(ch, x) (*(volatile unsigned long *)CHNREGADDR(ch,x)) - -#define G2_LOCK(OLD) \ - do { \ - if (!irq_inside_int()) \ - OLD = irq_disable(); \ - /* suspend any G2 DMA here... */ \ - while((*(volatile unsigned int *)0xa05f688c) & 0x20) \ - ; \ - } while(0) - -#define G2_UNLOCK(OLD) \ - do { \ - /* resume any G2 DMA here... */ \ - if (!irq_inside_int()) \ - irq_restore(OLD); \ - } while(0) - - -void aica_init() { - int i, j, old = 0; - - /* Initialize AICA channels */ - G2_LOCK(old); - SNDREG32(0x2800) = 0x0000; - - for (i=0; i<64; i++) { - for (j=0; j<0x80; j+=4) { - if ((j&31)==0) g2_fifo_wait(); - CHNREG32(i, j) = 0; - } - g2_fifo_wait(); - CHNREG32(i,0) = 0x8000; - CHNREG32(i,20) = 0x1f; - } - - SNDREG32(0x2800) = 0x000f; - g2_fifo_wait(); - G2_UNLOCK(old); -} - -/* Translates a volume from linear form to logarithmic form (required by - the AICA chip */ -/* int logs[] = { - -0, 40, 50, 58, 63, 68, 73, 77, 80, 83, 86, 89, 92, 94, 97, 99, 101, 103, -105, 107, 109, 111, 112, 114, 116, 117, 119, 120, 122, 123, 125, 126, 127, -129, 130, 131, 133, 134, 135, 136, 137, 139, 140, 141, 142, 143, 144, 145, -146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 156, 157, 158, 159, -160, 161, 162, 162, 163, 164, 165, 166, 166, 167, 168, 169, 170, 170, 171, -172, 172, 173, 174, 175, 175, 176, 177, 177, 178, 179, 180, 180, 181, 182, -182, 183, 183, 184, 185, 185, 186, 187, 187, 188, 188, 189, 190, 190, 191, -191, 192, 193, 193, 194, 194, 195, 196, 196, 197, 197, 198, 198, 199, 199, -200, 201, 201, 202, 202, 203, 203, 204, 204, 205, 205, 206, 206, 207, 207, -208, 208, 209, 209, 210, 210, 211, 211, 212, 212, 213, 213, 214, 214, 215, -215, 216, 216, 217, 217, 217, 218, 218, 219, 219, 220, 220, 221, 221, 222, -222, 222, 223, 223, 224, 224, 225, 225, 225, 226, 226, 227, 227, 228, 228, -228, 229, 229, 230, 230, 230, 231, 231, 232, 232, 232, 233, 233, 234, 234, -234, 235, 235, 236, 236, 236, 237, 237, 238, 238, 238, 239, 239, 240, 240, -240, 241, 241, 241, 242, 242, 243, 243, 243, 244, 244, 244, 245, 245, 245, -246, 246, 247, 247, 247, 248, 248, 248, 249, 249, 249, 250, 250, 250, 251, -251, 251, 252, 252, 252, 253, 253, 253, 254, 254, 254, 255 - -}; */ - -const static unsigned char logs[] = { - 0, 15, 22, 27, 31, 35, 39, 42, 45, 47, 50, 52, 55, 57, 59, 61, - 63, 65, 67, 69, 71, 73, 74, 76, 78, 79, 81, 82, 84, 85, 87, 88, - 90, 91, 92, 94, 95, 96, 98, 99, 100, 102, 103, 104, 105, 106, - 108, 109, 110, 111, 112, 113, 114, 116, 117, 118, 119, 120, 121, - 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, - 135, 136, 137, 138, 138, 139, 140, 141, 142, 143, 144, 145, 146, - 146, 147, 148, 149, 150, 151, 152, 152, 153, 154, 155, 156, 156, - 157, 158, 159, 160, 160, 161, 162, 163, 164, 164, 165, 166, 167, - 167, 168, 169, 170, 170, 171, 172, 173, 173, 174, 175, 176, 176, - 177, 178, 178, 179, 180, 181, 181, 182, 183, 183, 184, 185, 185, - 186, 187, 187, 188, 189, 189, 190, 191, 191, 192, 193, 193, 194, - 195, 195, 196, 197, 197, 198, 199, 199, 200, 200, 201, 202, 202, - 203, 204, 204, 205, 205, 206, 207, 207, 208, 209, 209, 210, 210, - 211, 212, 212, 213, 213, 214, 215, 215, 216, 216, 217, 217, 218, - 219, 219, 220, 220, 221, 221, 222, 223, 223, 224, 224, 225, 225, - 226, 227, 227, 228, 228, 229, 229, 230, 230, 231, 232, 232, 233, - 233, 234, 234, 235, 235, 236, 236, 237, 237, 238, 239, 239, 240, - 240, 241, 241, 242, 242, 243, 243, 244, 244, 245, 245, 246, 246, - 247, 247, 248, 248, 249, 249, 250, 250, 251, 251, 252, 252, 253, 254, 255 -}; - -/* For the moment this is going to have to suffice, until we really - figure out what these mean. */ -#define AICA_PAN(x) ((x)==0x80?(0):((x)<0x80?(0x1f):(0x0f))) -#define AICA_VOL(x) (0xff - logs[128 + (((x) & 0xff) / 2)]) -//#define AICA_VOL(x) (0xff - logs[x&255]) - -static inline unsigned AICA_FREQ(unsigned freq) { - unsigned long freq_lo, freq_base = 5644800; - int freq_hi = 7; - - /* Need to convert frequency to floating point format - (freq_hi is exponent, freq_lo is mantissa) - Formula is ferq = 44100*2^freq_hi*(1+freq_lo/1024) */ - while (freq < freq_base && freq_hi > -8) { - freq_base >>= 1; - --freq_hi; - } - while (freq < freq_base && freq_hi > -8) { - freq_base >>= 1; - freq_hi--; - } - freq_lo = (freq<<10) / freq_base; - return (freq_hi << 11) | (freq_lo & 1023); -} - -/* Sets up a sound channel completely. This is generally good if you want - a quick and dirty way to play notes. If you want a more comprehensive - set of routines (more like PC wavetable cards) see below. - - ch is the channel to play on (0 - 63) - smpptr is the pointer to the sound data; if you're running off the - SH4, then this ought to be (ptr - 0xa0800000); otherwise it's just - ptr. Basically, it's an offset into sound ram. - mode is one of the mode constants (16 bit, 8 bit, ADPCM) - nsamp is the number of samples to play (not number of bytes!) - freq is the sampling rate of the sound - vol is the volume, 0 to 0xff (0xff is louder) - pan is a panning constant -- 0 is left, 128 is center, 255 is right. - - This routine (and the similar ones) owe a lot to Marcus' sound example -- - I hadn't gotten quite this far into dissecting the individual regs yet. */ -void aica_play(int ch,int mode,unsigned long smpptr,int loopst,int loopend,int freq,int vol,int pan,int loopflag) { -/* int i; -*/ - int val; - int old = 0; - - /* Stop the channel (if it's already playing) */ - aica_stop(ch); - /* doesn't seem to be needed, but it's here just in case */ -/* - for (i=0; i<256; i++) { - asm("nop"); - asm("nop"); - asm("nop"); - asm("nop"); - } -*/ - G2_LOCK(old); - /* Envelope setup. The first of these is the loop point, - e.g., where the sample starts over when it loops. The second - is the loop end. This is the full length of the sample when - you are not looping, or the loop end point when you are (though - storing more than that is a waste of memory if you're not doing - volume enveloping). */ - CHNREG32(ch, 8) = loopst & 0xffff; - CHNREG32(ch, 12) = loopend & 0xffff; - - /* Write resulting values */ - CHNREG32(ch, 24) = AICA_FREQ(freq); - - /* Set volume, pan, and some other things that we don't know what - they do =) */ - CHNREG32(ch, 36) = AICA_PAN(pan) | (0xf<<8); - /* Convert the incoming volume and pan into hardware values */ - /* Vol starts at zero so we can ramp */ - vol = AICA_VOL(vol); - CHNREG32(ch, 40) = 0x24 | (vol<<8); - /* Convert the incoming volume and pan into hardware values */ - /* Vol starts at zero so we can ramp */ - - /* If we supported volume envelopes (which we don't yet) then - this value would set that up. The top 4 bits determine the - envelope speed. f is the fastest, 1 is the slowest, and 0 - seems to be an invalid value and does weird things). The - default (below) sets it into normal mode (play and terminate/loop). - CHNREG32(ch, 16) = 0xf010; - */ - CHNREG32(ch, 16) = 0x1f; /* No volume envelope */ - - - /* Set sample format, buffer address, and looping control. If - 0x0200 mask is set on reg 0, the sample loops infinitely. If - it's not set, the sample plays once and terminates. We'll - also set the bits to start playback here. */ - CHNREG32(ch, 4) = smpptr & 0xffff; - val = 0xc000 | 0x0000 | (mode<<7) | (smpptr >> 16); - if (loopflag) val|=0x200; - - CHNREG32(ch, 0) = val; - - G2_UNLOCK(old); - - /* Enable playback */ - /* CHNREG32(ch, 0) |= 0xc000; */ - g2_fifo_wait(); - -#if 0 - for (i=0xff; i>=vol; i--) { - if ((i&7)==0) g2_fifo_wait(); - CHNREG32(ch, 40) = 0x24 | (i<<8);; - } - - g2_fifo_wait(); -#endif -} - -/* Stop the sound on a given channel */ -void aica_stop(int ch) { - g2_write_32(CHNREGADDR(ch, 0),(g2_read_32(CHNREGADDR(ch, 0)) & ~0x4000) | 0x8000); - g2_fifo_wait(); -} - - -/* The rest of these routines can change the channel in mid-stride so you - can do things like vibrato and panning effects. */ - -/* Set channel volume */ -void aica_vol(int ch,int vol) { -// g2_write_8(CHNREGADDR(ch, 41),AICA_VOL(vol)); - g2_write_32(CHNREGADDR(ch, 40),(g2_read_32(CHNREGADDR(ch, 40))&0xffff00ff)|(AICA_VOL(vol)<<8) ); - g2_fifo_wait(); -} - -/* Set channel pan */ -void aica_pan(int ch,int pan) { -// g2_write_8(CHNREGADDR(ch, 36),AICA_PAN(pan)); - g2_write_32(CHNREGADDR(ch, 36),(g2_read_32(CHNREGADDR(ch, 36))&0xffffff00)|(AICA_PAN(pan)) ); - g2_fifo_wait(); -} - -/* Set channel frequency */ -void aica_freq(int ch,int freq) { - g2_write_32(CHNREGADDR(ch, 24),AICA_FREQ(freq)); - g2_fifo_wait(); -} - -/* Get channel position */ -int aica_get_pos(int ch) { -#if 1 - /* Observe channel ch */ - g2_write_32(SNDREGADDR(0x280c),(g2_read_32(SNDREGADDR(0x280c))&0xffff00ff) | (ch<<8)); - g2_fifo_wait(); - /* Update position counters */ - return g2_read_32(SNDREGADDR(0x2814)) & 0xffff; -#else - /* Observe channel ch */ - g2_write_8(SNDREGADDR(0x280d),ch); - /* Update position counters */ - return g2_read_32(SNDREGADDR(0x2814)) & 0xffff; -#endif -} diff --git a/apps/plugins/sdl/src/audio/dc/aica.h b/apps/plugins/sdl/src/audio/dc/aica.h deleted file mode 100644 index 2721e42821..0000000000 --- a/apps/plugins/sdl/src/audio/dc/aica.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _AICA_H_ -#define _AICA_H_ - -#define AICA_MEM 0xa0800000 - -#define SM_8BIT 1 -#define SM_16BIT 0 -#define SM_ADPCM 2 - -void aica_play(int ch,int mode,unsigned long smpptr,int looptst,int loopend,int freq,int vol,int pan,int loopflag); -void aica_stop(int ch); -void aica_vol(int ch,int vol); -void aica_pan(int ch,int pan); -void aica_freq(int ch,int freq); -int aica_get_pos(int ch); - -#endif diff --git a/apps/plugins/sdl/src/audio/disk/SDL_diskaudio.c b/apps/plugins/sdl/src/audio/disk/SDL_diskaudio.c deleted file mode 100644 index c45d3f8c05..0000000000 --- a/apps/plugins/sdl/src/audio/disk/SDL_diskaudio.c +++ /dev/null @@ -1,186 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org - - This file written by Ryan C. Gordon (icculus@icculus.org) -*/ -#include "SDL_config.h" - -/* Output raw audio data to a file. */ - -#if HAVE_STDIO_H -#include -#endif - -#include "SDL_rwops.h" -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "../SDL_audiomem.h" -#include "../SDL_audio_c.h" -#include "../SDL_audiodev_c.h" -#include "SDL_diskaudio.h" - -/* The tag name used by DISK audio */ -#define DISKAUD_DRIVER_NAME "disk" - -/* environment variables and defaults. */ -#define DISKENVR_OUTFILE "SDL_DISKAUDIOFILE" -#define DISKDEFAULT_OUTFILE "/sdlaudio.raw" -#define DISKENVR_WRITEDELAY "SDL_DISKAUDIODELAY" -#define DISKDEFAULT_WRITEDELAY 150 - -/* Audio driver functions */ -static int DISKAUD_OpenAudio(_THIS, SDL_AudioSpec *spec); -static void DISKAUD_WaitAudio(_THIS); -static void DISKAUD_PlayAudio(_THIS); -static Uint8 *DISKAUD_GetAudioBuf(_THIS); -static void DISKAUD_CloseAudio(_THIS); - -static const char *DISKAUD_GetOutputFilename(void) -{ - const char *envr = SDL_getenv(DISKENVR_OUTFILE); - return((envr != NULL) ? envr : DISKDEFAULT_OUTFILE); -} - -/* Audio driver bootstrap functions */ -static int DISKAUD_Available(void) -{ - //const char *envr = SDL_getenv("SDL_AUDIODRIVER"); -// if (envr && (SDL_strcmp(envr, DISKAUD_DRIVER_NAME) == 0)) { - return(1); -// } -// return(0); -} - -static void DISKAUD_DeleteDevice(SDL_AudioDevice *device) -{ - SDL_free(device->hidden); - SDL_free(device); -} - -static SDL_AudioDevice *DISKAUD_CreateDevice(int devindex) -{ - SDL_AudioDevice *this; - const char *envr; - - /* Initialize all variables that we clean on shutdown */ - this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice)); - if ( this ) { - SDL_memset(this, 0, (sizeof *this)); - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - } - if ( (this == NULL) || (this->hidden == NULL) ) { - SDL_OutOfMemory(); - if ( this ) { - SDL_free(this); - } - return(0); - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - envr = SDL_getenv(DISKENVR_WRITEDELAY); - this->hidden->write_delay = (envr) ? SDL_atoi(envr) : DISKDEFAULT_WRITEDELAY; - - /* Set the function pointers */ - this->OpenAudio = DISKAUD_OpenAudio; - this->WaitAudio = DISKAUD_WaitAudio; - this->PlayAudio = DISKAUD_PlayAudio; - this->GetAudioBuf = DISKAUD_GetAudioBuf; - this->CloseAudio = DISKAUD_CloseAudio; - - this->free = DISKAUD_DeleteDevice; - - return this; -} - -AudioBootStrap DISKAUD_bootstrap = { - DISKAUD_DRIVER_NAME, "direct-to-disk audio", - DISKAUD_Available, DISKAUD_CreateDevice -}; - -/* This function waits until it is possible to write a full sound buffer */ -static void DISKAUD_WaitAudio(_THIS) -{ - SDL_Delay(this->hidden->write_delay); -} - -static void DISKAUD_PlayAudio(_THIS) -{ - int written; - - /* Write the audio data */ - written = SDL_RWwrite(this->hidden->output, - this->hidden->mixbuf, 1, - this->hidden->mixlen); - - /* If we couldn't write, assume fatal error for now */ - if ( (Uint32)written != this->hidden->mixlen ) { - this->enabled = 0; - } -#ifdef DEBUG_AUDIO - fprintf(stderr, "Wrote %d bytes of audio data\n", written); -#endif -} - -static Uint8 *DISKAUD_GetAudioBuf(_THIS) -{ - return(this->hidden->mixbuf); -} - -static void DISKAUD_CloseAudio(_THIS) -{ - if ( this->hidden->mixbuf != NULL ) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - } - if ( this->hidden->output != NULL ) { - SDL_RWclose(this->hidden->output); - this->hidden->output = NULL; - } -} - -static int DISKAUD_OpenAudio(_THIS, SDL_AudioSpec *spec) -{ - const char *fname = DISKAUD_GetOutputFilename(); - - /* Open the audio device */ - this->hidden->output = SDL_RWFromFile(fname, "wb"); - if ( this->hidden->output == NULL ) { - return(-1); - } - -#if HAVE_STDIO_H - fprintf(stderr, "WARNING: You are using the SDL disk writer" - " audio driver!\n Writing to file [%s].\n", fname); -#endif - - /* Allocate mixing buffer */ - this->hidden->mixlen = spec->size; - this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen); - if ( this->hidden->mixbuf == NULL ) { - return(-1); - } - SDL_memset(this->hidden->mixbuf, spec->silence, spec->size); - - /* We're ready to rock and roll. :-) */ - return(0); -} - diff --git a/apps/plugins/sdl/src/audio/disk/SDL_diskaudio.h b/apps/plugins/sdl/src/audio/disk/SDL_diskaudio.h deleted file mode 100644 index 24d7c9e34d..0000000000 --- a/apps/plugins/sdl/src/audio/disk/SDL_diskaudio.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_diskaudio_h -#define _SDL_diskaudio_h - -#include "SDL_rwops.h" -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the video functions */ -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData { - /* The file descriptor for the audio device */ - SDL_RWops *output; - Uint8 *mixbuf; - Uint32 mixlen; - Uint32 write_delay; -}; - -#endif /* _SDL_diskaudio_h */ diff --git a/apps/plugins/sdl/src/audio/dma/SDL_dmaaudio.c b/apps/plugins/sdl/src/audio/dma/SDL_dmaaudio.c deleted file mode 100644 index 39f81d90ce..0000000000 --- a/apps/plugins/sdl/src/audio/dma/SDL_dmaaudio.c +++ /dev/null @@ -1,455 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Allow access to a raw mixing buffer */ - -#include -#include /* For strerror() */ -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H -/* This is installed on some systems */ -#include -#else -/* This is recommended by OSS */ -#include -#endif - -#ifndef MAP_FAILED -#define MAP_FAILED ((Uint8 *)-1) -#endif - -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "../SDL_audio_c.h" -#include "../SDL_audiodev_c.h" -#include "SDL_dmaaudio.h" - -/* The tag name used by DMA audio */ -#define DMA_DRIVER_NAME "dma" - -/* Open the audio device for playback, and don't block if busy */ -#define OPEN_FLAGS (O_RDWR|O_NONBLOCK) - -/* Audio driver functions */ -static int DMA_OpenAudio(_THIS, SDL_AudioSpec *spec); -static void DMA_WaitAudio(_THIS); -static void DMA_PlayAudio(_THIS); -static Uint8 *DMA_GetAudioBuf(_THIS); -static void DMA_CloseAudio(_THIS); - -/* Audio driver bootstrap functions */ - -static int Audio_Available(void) -{ - int available; - int fd; - - available = 0; - - fd = SDL_OpenAudioPath(NULL, 0, OPEN_FLAGS, 0); - if ( fd >= 0 ) { - int caps; - struct audio_buf_info info; - - if ( (ioctl(fd, SNDCTL_DSP_GETCAPS, &caps) == 0) && - (caps & DSP_CAP_TRIGGER) && (caps & DSP_CAP_MMAP) && - (ioctl(fd, SNDCTL_DSP_GETOSPACE, &info) == 0) ) { - available = 1; - } - close(fd); - } - return(available); -} - -static void Audio_DeleteDevice(SDL_AudioDevice *device) -{ - SDL_free(device->hidden); - SDL_free(device); -} - -static SDL_AudioDevice *Audio_CreateDevice(int devindex) -{ - SDL_AudioDevice *this; - - /* Initialize all variables that we clean on shutdown */ - this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice)); - if ( this ) { - SDL_memset(this, 0, (sizeof *this)); - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - } - if ( (this == NULL) || (this->hidden == NULL) ) { - SDL_OutOfMemory(); - if ( this ) { - SDL_free(this); - } - return(0); - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - audio_fd = -1; - - /* Set the function pointers */ - this->OpenAudio = DMA_OpenAudio; - this->WaitAudio = DMA_WaitAudio; - this->PlayAudio = DMA_PlayAudio; - this->GetAudioBuf = DMA_GetAudioBuf; - this->CloseAudio = DMA_CloseAudio; - - this->free = Audio_DeleteDevice; - - return this; -} - -AudioBootStrap DMA_bootstrap = { - DMA_DRIVER_NAME, "OSS /dev/dsp DMA audio", - Audio_Available, Audio_CreateDevice -}; - -/* This function waits until it is possible to write a full sound buffer */ -static void DMA_WaitAudio(_THIS) -{ - fd_set fdset; - - /* Check to see if the thread-parent process is still alive */ - { static int cnt = 0; - /* Note that this only works with thread implementations - that use a different process id for each thread. - */ - if (parent && (((++cnt)%10) == 0)) { /* Check every 10 loops */ - if ( kill(parent, 0) < 0 ) { - this->enabled = 0; - } - } - } - - /* See if we need to use timed audio synchronization */ - if ( frame_ticks ) { - /* Use timer for general audio synchronization */ - Sint32 ticks; - - ticks = ((Sint32)(next_frame - SDL_GetTicks()))-FUDGE_TICKS; - if ( ticks > 0 ) { - SDL_Delay(ticks); - } - } else { - /* Use select() for audio synchronization */ - struct timeval timeout; - FD_ZERO(&fdset); - FD_SET(audio_fd, &fdset); - timeout.tv_sec = 10; - timeout.tv_usec = 0; -#ifdef DEBUG_AUDIO - fprintf(stderr, "Waiting for audio to get ready\n"); -#endif - if ( select(audio_fd+1, NULL, &fdset, NULL, &timeout) <= 0 ) { - const char *message = -#ifdef AUDIO_OSPACE_HACK - "Audio timeout - buggy audio driver? (trying ospace)"; -#else - "Audio timeout - buggy audio driver? (disabled)"; -#endif - /* In general we should never print to the screen, - but in this case we have no other way of letting - the user know what happened. - */ - fprintf(stderr, "SDL: %s\n", message); -#ifdef AUDIO_OSPACE_HACK - /* We may be able to use GET_OSPACE trick */ - frame_ticks = (float)(this->spec->samples*1000) / - this->spec->freq; - next_frame = SDL_GetTicks()+frame_ticks; -#else - this->enabled = 0; - /* Don't try to close - may hang */ - audio_fd = -1; -#ifdef DEBUG_AUDIO - fprintf(stderr, "Done disabling audio\n"); -#endif -#endif /* AUDIO_OSPACE_HACK */ - } -#ifdef DEBUG_AUDIO - fprintf(stderr, "Ready!\n"); -#endif - } -} - -static void DMA_PlayAudio(_THIS) -{ - /* If timer synchronization is enabled, set the next write frame */ - if ( frame_ticks ) { - next_frame += frame_ticks; - } - return; -} - -static Uint8 *DMA_GetAudioBuf(_THIS) -{ - count_info info; - int playing; - int filling; - - /* Get number of blocks, looping if we're not using select() */ - do { - if ( ioctl(audio_fd, SNDCTL_DSP_GETOPTR, &info) < 0 ) { - /* Uh oh... */ - this->enabled = 0; - return(NULL); - } - } while ( frame_ticks && (info.blocks < 1) ); -#ifdef DEBUG_AUDIO - if ( info.blocks > 1 ) { - printf("Warning: audio underflow (%d frags)\n", info.blocks-1); - } -#endif - playing = info.ptr / this->spec.size; - filling = (playing + 1)%num_buffers; - return (dma_buf + (filling * this->spec.size)); -} - -static void DMA_CloseAudio(_THIS) -{ - if ( dma_buf != NULL ) { - munmap(dma_buf, dma_len); - dma_buf = NULL; - } - if ( audio_fd >= 0 ) { - close(audio_fd); - audio_fd = -1; - } -} - -static int DMA_ReopenAudio(_THIS, const char *audiodev, int format, int stereo, - SDL_AudioSpec *spec) -{ - int frag_spec; - int value; - - /* Close and then reopen the audio device */ - close(audio_fd); - audio_fd = open(audiodev, O_RDWR, 0); - if ( audio_fd < 0 ) { - SDL_SetError("Couldn't open %s: %s", audiodev, strerror(errno)); - return(-1); - } - - /* Calculate the final parameters for this audio specification */ - SDL_CalculateAudioSpec(spec); - - /* Determine the power of two of the fragment size */ - for ( frag_spec = 0; (0x01<size; ++frag_spec ); - if ( (0x01<size ) { - SDL_SetError("Fragment size must be a power of two"); - return(-1); - } - - /* Set the audio buffering parameters */ - if ( ioctl(audio_fd, SNDCTL_DSP_SETFRAGMENT, &frag_spec) < 0 ) { - SDL_SetError("Couldn't set audio fragment spec"); - return(-1); - } - - /* Set the audio format */ - value = format; - if ( (ioctl(audio_fd, SNDCTL_DSP_SETFMT, &value) < 0) || - (value != format) ) { - SDL_SetError("Couldn't set audio format"); - return(-1); - } - - /* Set mono or stereo audio */ - value = (spec->channels > 1); - if ( (ioctl(audio_fd, SNDCTL_DSP_STEREO, &stereo) < 0) || - (value != stereo) ) { - SDL_SetError("Couldn't set audio channels"); - return(-1); - } - - /* Set the DSP frequency */ - value = spec->freq; - if ( ioctl(audio_fd, SNDCTL_DSP_SPEED, &value) < 0 ) { - SDL_SetError("Couldn't set audio frequency"); - return(-1); - } - spec->freq = value; - - /* We successfully re-opened the audio */ - return(0); -} - -static int DMA_OpenAudio(_THIS, SDL_AudioSpec *spec) -{ - char audiodev[1024]; - int format; - int stereo; - int value; - Uint16 test_format; - struct audio_buf_info info; - - /* Reset the timer synchronization flag */ - frame_ticks = 0.0; - - /* Open the audio device */ - audio_fd = SDL_OpenAudioPath(audiodev, sizeof(audiodev), OPEN_FLAGS, 0); - if ( audio_fd < 0 ) { - SDL_SetError("Couldn't open %s: %s", audiodev, strerror(errno)); - return(-1); - } - dma_buf = NULL; - ioctl(audio_fd, SNDCTL_DSP_RESET, 0); - - /* Get a list of supported hardware formats */ - if ( ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &value) < 0 ) { - SDL_SetError("Couldn't get audio format list"); - return(-1); - } - - /* Try for a closest match on audio format */ - format = 0; - for ( test_format = SDL_FirstAudioFormat(spec->format); - ! format && test_format; ) { -#ifdef DEBUG_AUDIO - fprintf(stderr, "Trying format 0x%4.4x\n", test_format); -#endif - switch ( test_format ) { - case AUDIO_U8: - if ( value & AFMT_U8 ) { - format = AFMT_U8; - } - break; - case AUDIO_S8: - if ( value & AFMT_S8 ) { - format = AFMT_S8; - } - break; - case AUDIO_S16LSB: - if ( value & AFMT_S16_LE ) { - format = AFMT_S16_LE; - } - break; - case AUDIO_S16MSB: - if ( value & AFMT_S16_BE ) { - format = AFMT_S16_BE; - } - break; - case AUDIO_U16LSB: - if ( value & AFMT_U16_LE ) { - format = AFMT_U16_LE; - } - break; - case AUDIO_U16MSB: - if ( value & AFMT_U16_BE ) { - format = AFMT_U16_BE; - } - break; - default: - format = 0; - break; - } - if ( ! format ) { - test_format = SDL_NextAudioFormat(); - } - } - if ( format == 0 ) { - SDL_SetError("Couldn't find any hardware audio formats"); - return(-1); - } - spec->format = test_format; - - /* Set the audio format */ - value = format; - if ( (ioctl(audio_fd, SNDCTL_DSP_SETFMT, &value) < 0) || - (value != format) ) { - SDL_SetError("Couldn't set audio format"); - return(-1); - } - - /* Set mono or stereo audio (currently only two channels supported) */ - stereo = (spec->channels > 1); - ioctl(audio_fd, SNDCTL_DSP_STEREO, &stereo); - if ( stereo ) { - spec->channels = 2; - } else { - spec->channels = 1; - } - - /* Because some drivers don't allow setting the buffer size - after setting the format, we must re-open the audio device - once we know what format and channels are supported - */ - if ( DMA_ReopenAudio(this, audiodev, format, stereo, spec) < 0 ) { - /* Error is set by DMA_ReopenAudio() */ - return(-1); - } - - /* Memory map the audio buffer */ - if ( ioctl(audio_fd, SNDCTL_DSP_GETOSPACE, &info) < 0 ) { - SDL_SetError("Couldn't get OSPACE parameters"); - return(-1); - } - spec->size = info.fragsize; - spec->samples = spec->size / ((spec->format & 0xFF) / 8); - spec->samples /= spec->channels; - num_buffers = info.fragstotal; - dma_len = num_buffers*spec->size; - dma_buf = (Uint8 *)mmap(NULL, dma_len, PROT_WRITE, MAP_SHARED, - audio_fd, 0); - if ( dma_buf == MAP_FAILED ) { - SDL_SetError("DMA memory map failed"); - dma_buf = NULL; - return(-1); - } - SDL_memset(dma_buf, spec->silence, dma_len); - - /* Check to see if we need to use select() workaround */ - { char *workaround; - workaround = SDL_getenv("SDL_DSP_NOSELECT"); - if ( workaround ) { - frame_ticks = (float)(spec->samples*1000)/spec->freq; - next_frame = SDL_GetTicks()+frame_ticks; - } - } - - /* Trigger audio playback */ - value = 0; - ioctl(audio_fd, SNDCTL_DSP_SETTRIGGER, &value); - value = PCM_ENABLE_OUTPUT; - if ( ioctl(audio_fd, SNDCTL_DSP_SETTRIGGER, &value) < 0 ) { - SDL_SetError("Couldn't trigger audio output"); - return(-1); - } - - /* Get the parent process id (we're the parent of the audio thread) */ - parent = getpid(); - - /* We're ready to rock and roll. :-) */ - return(0); -} diff --git a/apps/plugins/sdl/src/audio/dma/SDL_dmaaudio.h b/apps/plugins/sdl/src/audio/dma/SDL_dmaaudio.h deleted file mode 100644 index 9a45f732a1..0000000000 --- a/apps/plugins/sdl/src/audio/dma/SDL_dmaaudio.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_dspaudio_h -#define _SDL_dspaudio_h - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the video functions */ -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData { - /* The file descriptor for the audio device */ - int audio_fd; - - /* The parent process id, to detect when application quits */ - pid_t parent; - - /* Raw mixing buffer */ - Uint8 *dma_buf; - int dma_len; - int num_buffers; - - /* Support for audio timing using a timer, in addition to select() */ - float frame_ticks; - float next_frame; -}; -#define FUDGE_TICKS 10 /* The scheduler overhead ticks per frame */ - -/* Old variable names */ -#define audio_fd (this->hidden->audio_fd) -#define parent (this->hidden->parent) -#define dma_buf (this->hidden->dma_buf) -#define dma_len (this->hidden->dma_len) -#define num_buffers (this->hidden->num_buffers) -#define frame_ticks (this->hidden->frame_ticks) -#define next_frame (this->hidden->next_frame) - -#endif /* _SDL_dspaudio_h */ diff --git a/apps/plugins/sdl/src/audio/dmedia/SDL_irixaudio.c b/apps/plugins/sdl/src/audio/dmedia/SDL_irixaudio.c deleted file mode 100644 index 1dcd2421ec..0000000000 --- a/apps/plugins/sdl/src/audio/dmedia/SDL_irixaudio.c +++ /dev/null @@ -1,242 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Allow access to a raw mixing buffer (For IRIX 6.5 and higher) */ -/* patch for IRIX 5 by Georg Schwarz 18/07/2004 */ - -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "../SDL_audiomem.h" -#include "../SDL_audio_c.h" -#include "SDL_irixaudio.h" - - -#ifndef AL_RESOURCE /* as a test whether we use the old IRIX audio libraries */ -#define OLD_IRIX_AUDIO -#define alClosePort(x) ALcloseport(x) -#define alFreeConfig(x) ALfreeconfig(x) -#define alGetFillable(x) ALgetfillable(x) -#define alNewConfig() ALnewconfig() -#define alOpenPort(x,y,z) ALopenport(x,y,z) -#define alSetChannels(x,y) ALsetchannels(x,y) -#define alSetQueueSize(x,y) ALsetqueuesize(x,y) -#define alSetSampFmt(x,y) ALsetsampfmt(x,y) -#define alSetWidth(x,y) ALsetwidth(x,y) -#endif - -/* Audio driver functions */ -static int AL_OpenAudio(_THIS, SDL_AudioSpec *spec); -static void AL_WaitAudio(_THIS); -static void AL_PlayAudio(_THIS); -static Uint8 *AL_GetAudioBuf(_THIS); -static void AL_CloseAudio(_THIS); - -/* Audio driver bootstrap functions */ - -static int Audio_Available(void) -{ - return 1; -} - -static void Audio_DeleteDevice(SDL_AudioDevice *device) -{ - SDL_free(device->hidden); - SDL_free(device); -} - -static SDL_AudioDevice *Audio_CreateDevice(int devindex) -{ - SDL_AudioDevice *this; - - /* Initialize all variables that we clean on shutdown */ - this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice)); - if ( this ) { - SDL_memset(this, 0, (sizeof *this)); - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - } - if ( (this == NULL) || (this->hidden == NULL) ) { - SDL_OutOfMemory(); - if ( this ) { - SDL_free(this); - } - return(0); - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - /* Set the function pointers */ - this->OpenAudio = AL_OpenAudio; - this->WaitAudio = AL_WaitAudio; - this->PlayAudio = AL_PlayAudio; - this->GetAudioBuf = AL_GetAudioBuf; - this->CloseAudio = AL_CloseAudio; - - this->free = Audio_DeleteDevice; - - return this; -} - -AudioBootStrap DMEDIA_bootstrap = { - "AL", "IRIX DMedia audio", - Audio_Available, Audio_CreateDevice -}; - - -void static AL_WaitAudio(_THIS) -{ - Sint32 timeleft; - - timeleft = this->spec.samples - alGetFillable(audio_port); - if ( timeleft > 0 ) { - timeleft /= (this->spec.freq/1000); - SDL_Delay((Uint32)timeleft); - } -} - -static void AL_PlayAudio(_THIS) -{ - /* Write the audio data out */ - if ( alWriteFrames(audio_port, mixbuf, this->spec.samples) < 0 ) { - /* Assume fatal error, for now */ - this->enabled = 0; - } -} - -static Uint8 *AL_GetAudioBuf(_THIS) -{ - return(mixbuf); -} - -static void AL_CloseAudio(_THIS) -{ - if ( mixbuf != NULL ) { - SDL_FreeAudioMem(mixbuf); - mixbuf = NULL; - } - if ( audio_port != NULL ) { - alClosePort(audio_port); - audio_port = NULL; - } -} - -static int AL_OpenAudio(_THIS, SDL_AudioSpec * spec) -{ - Uint16 test_format = SDL_FirstAudioFormat(spec->format); - long width = 0; - long fmt = 0; - int valid = 0; - -#ifdef OLD_IRIX_AUDIO - { - long audio_param[2]; - audio_param[0] = AL_OUTPUT_RATE; - audio_param[1] = spec->freq; - valid = (ALsetparams(AL_DEFAULT_DEVICE, audio_param, 2) < 0); - } -#else - { - ALpv audio_param; - audio_param.param = AL_RATE; - audio_param.value.i = spec->freq; - valid = (alSetParams(AL_DEFAULT_OUTPUT, &audio_param, 1) < 0); - } -#endif - - while ((!valid) && (test_format)) { - valid = 1; - spec->format = test_format; - - switch (test_format) { - case AUDIO_S8: - width = AL_SAMPLE_8; - fmt = AL_SAMPFMT_TWOSCOMP; - break; - - case AUDIO_S16SYS: - width = AL_SAMPLE_16; - fmt = AL_SAMPFMT_TWOSCOMP; - break; - - default: - valid = 0; - test_format = SDL_NextAudioFormat(); - break; - } - - if (valid) { - ALconfig audio_config = alNewConfig(); - valid = 0; - if (audio_config) { - if (alSetChannels(audio_config, spec->channels) < 0) { - if (spec->channels > 2) { /* can't handle > stereo? */ - spec->channels = 2; /* try again below. */ - } - } - - if ((alSetSampFmt(audio_config, fmt) >= 0) && - ((!width) || (alSetWidth(audio_config, width) >= 0)) && - (alSetQueueSize(audio_config, spec->samples * 2) >= 0) && - (alSetChannels(audio_config, spec->channels) >= 0)) { - - audio_port = alOpenPort("SDL audio", "w", audio_config); - if (audio_port == NULL) { - /* docs say AL_BAD_CHANNELS happens here, too. */ - int err = oserror(); - if (err == AL_BAD_CHANNELS) { - spec->channels = 2; - alSetChannels(audio_config, spec->channels); - audio_port = alOpenPort("SDL audio", "w", - audio_config); - } - } - - if (audio_port != NULL) { - valid = 1; - } - } - - alFreeConfig(audio_config); - } - } - } - - if (!valid) { - SDL_SetError("Unsupported audio format"); - return (-1); - } - - /* Update the fragment size as size in bytes */ - SDL_CalculateAudioSpec(spec); - - /* Allocate mixing buffer */ - mixbuf = (Uint8 *) SDL_AllocAudioMem(spec->size); - if (mixbuf == NULL) { - SDL_OutOfMemory(); - return (-1); - } - SDL_memset(mixbuf, spec->silence, spec->size); - - /* We're ready to rock and roll. :-) */ - return (0); -} - diff --git a/apps/plugins/sdl/src/audio/dmedia/SDL_irixaudio.h b/apps/plugins/sdl/src/audio/dmedia/SDL_irixaudio.h deleted file mode 100644 index c04f497cea..0000000000 --- a/apps/plugins/sdl/src/audio/dmedia/SDL_irixaudio.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_lowaudio_h -#define _SDL_lowaudio_h - -#include - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the audio functions */ -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData { - /* The handle for the audio device */ - ALport audio_port; - - Uint8 *mixbuf; /* The app mixing buffer */ -}; - -/* Old variable names */ -#define audio_port (this->hidden->audio_port) -#define mixbuf (this->hidden->mixbuf) - -#endif /* _SDL_lowaudio_h */ diff --git a/apps/plugins/sdl/src/audio/dsp/SDL_dspaudio.c b/apps/plugins/sdl/src/audio/dsp/SDL_dspaudio.c deleted file mode 100644 index 256c547f9b..0000000000 --- a/apps/plugins/sdl/src/audio/dsp/SDL_dspaudio.c +++ /dev/null @@ -1,340 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org - - Modified in Oct 2004 by Hannu Savolainen - hannu@opensound.com -*/ -#include "SDL_config.h" - -/* Allow access to a raw mixing buffer */ - -#include /* For perror() */ -#include /* For strerror() */ -#include -#include -#include -#include -#include -#include -#include - -#if SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H -/* This is installed on some systems */ -#include -#else -/* This is recommended by OSS */ -#include -#endif - -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "../SDL_audiomem.h" -#include "../SDL_audio_c.h" -#include "../SDL_audiodev_c.h" -#include "SDL_dspaudio.h" - -/* The tag name used by DSP audio */ -#define DSP_DRIVER_NAME "dsp" - -/* Open the audio device for playback, and don't block if busy */ -#define OPEN_FLAGS (O_WRONLY|O_NONBLOCK) - -/* Audio driver functions */ -static int DSP_OpenAudio(_THIS, SDL_AudioSpec *spec); -static void DSP_WaitAudio(_THIS); -static void DSP_PlayAudio(_THIS); -static Uint8 *DSP_GetAudioBuf(_THIS); -static void DSP_CloseAudio(_THIS); - -/* Audio driver bootstrap functions */ - -static int Audio_Available(void) -{ - int fd; - int available; - - available = 0; - fd = SDL_OpenAudioPath(NULL, 0, OPEN_FLAGS, 0); - if ( fd >= 0 ) { - available = 1; - close(fd); - } - return(available); -} - -static void Audio_DeleteDevice(SDL_AudioDevice *device) -{ - SDL_free(device->hidden); - SDL_free(device); -} - -static SDL_AudioDevice *Audio_CreateDevice(int devindex) -{ - SDL_AudioDevice *this; - - /* Initialize all variables that we clean on shutdown */ - this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice)); - if ( this ) { - SDL_memset(this, 0, (sizeof *this)); - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - } - if ( (this == NULL) || (this->hidden == NULL) ) { - SDL_OutOfMemory(); - if ( this ) { - SDL_free(this); - } - return(0); - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - audio_fd = -1; - - /* Set the function pointers */ - this->OpenAudio = DSP_OpenAudio; - this->WaitAudio = DSP_WaitAudio; - this->PlayAudio = DSP_PlayAudio; - this->GetAudioBuf = DSP_GetAudioBuf; - this->CloseAudio = DSP_CloseAudio; - - this->free = Audio_DeleteDevice; - - return this; -} - -AudioBootStrap DSP_bootstrap = { - DSP_DRIVER_NAME, "OSS /dev/dsp standard audio", - Audio_Available, Audio_CreateDevice -}; - -/* This function waits until it is possible to write a full sound buffer */ -static void DSP_WaitAudio(_THIS) -{ - /* Not needed at all since OSS handles waiting automagically */ -} - -static void DSP_PlayAudio(_THIS) -{ - if (write(audio_fd, mixbuf, mixlen)==-1) - { - perror("Audio write"); - this->enabled = 0; - } - -#ifdef DEBUG_AUDIO - fprintf(stderr, "Wrote %d bytes of audio data\n", mixlen); -#endif -} - -static Uint8 *DSP_GetAudioBuf(_THIS) -{ - return(mixbuf); -} - -static void DSP_CloseAudio(_THIS) -{ - if ( mixbuf != NULL ) { - SDL_FreeAudioMem(mixbuf); - mixbuf = NULL; - } - if ( audio_fd >= 0 ) { - close(audio_fd); - audio_fd = -1; - } -} - -static int DSP_OpenAudio(_THIS, SDL_AudioSpec *spec) -{ - char audiodev[1024]; - int format; - int value; - int frag_spec; - Uint16 test_format; - - /* Make sure fragment size stays a power of 2, or OSS fails. */ - /* I don't know which of these are actually legal values, though... */ - if (spec->channels > 8) - spec->channels = 8; - else if (spec->channels > 4) - spec->channels = 4; - else if (spec->channels > 2) - spec->channels = 2; - - /* Open the audio device */ - audio_fd = SDL_OpenAudioPath(audiodev, sizeof(audiodev), OPEN_FLAGS, 0); - if ( audio_fd < 0 ) { - SDL_SetError("Couldn't open %s: %s", audiodev, strerror(errno)); - return(-1); - } - mixbuf = NULL; - - /* Make the file descriptor use blocking writes with fcntl() */ - { long flags; - flags = fcntl(audio_fd, F_GETFL); - flags &= ~O_NONBLOCK; - if ( fcntl(audio_fd, F_SETFL, flags) < 0 ) { - SDL_SetError("Couldn't set audio blocking mode"); - DSP_CloseAudio(this); - return(-1); - } - } - - /* Get a list of supported hardware formats */ - if ( ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &value) < 0 ) { - perror("SNDCTL_DSP_GETFMTS"); - SDL_SetError("Couldn't get audio format list"); - DSP_CloseAudio(this); - return(-1); - } - - /* Try for a closest match on audio format */ - format = 0; - for ( test_format = SDL_FirstAudioFormat(spec->format); - ! format && test_format; ) { -#ifdef DEBUG_AUDIO - fprintf(stderr, "Trying format 0x%4.4x\n", test_format); -#endif - switch ( test_format ) { - case AUDIO_U8: - if ( value & AFMT_U8 ) { - format = AFMT_U8; - } - break; - case AUDIO_S16LSB: - if ( value & AFMT_S16_LE ) { - format = AFMT_S16_LE; - } - break; - case AUDIO_S16MSB: - if ( value & AFMT_S16_BE ) { - format = AFMT_S16_BE; - } - break; -#if 0 -/* - * These formats are not used by any real life systems so they are not - * needed here. - */ - case AUDIO_S8: - if ( value & AFMT_S8 ) { - format = AFMT_S8; - } - break; - case AUDIO_U16LSB: - if ( value & AFMT_U16_LE ) { - format = AFMT_U16_LE; - } - break; - case AUDIO_U16MSB: - if ( value & AFMT_U16_BE ) { - format = AFMT_U16_BE; - } - break; -#endif - default: - format = 0; - break; - } - if ( ! format ) { - test_format = SDL_NextAudioFormat(); - } - } - if ( format == 0 ) { - SDL_SetError("Couldn't find any hardware audio formats"); - DSP_CloseAudio(this); - return(-1); - } - spec->format = test_format; - - /* Set the audio format */ - value = format; - if ( (ioctl(audio_fd, SNDCTL_DSP_SETFMT, &value) < 0) || - (value != format) ) { - perror("SNDCTL_DSP_SETFMT"); - SDL_SetError("Couldn't set audio format"); - DSP_CloseAudio(this); - return(-1); - } - - /* Set the number of channels of output */ - value = spec->channels; - if ( ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &value) < 0 ) { - perror("SNDCTL_DSP_CHANNELS"); - SDL_SetError("Cannot set the number of channels"); - DSP_CloseAudio(this); - return(-1); - } - spec->channels = value; - - /* Set the DSP frequency */ - value = spec->freq; - if ( ioctl(audio_fd, SNDCTL_DSP_SPEED, &value) < 0 ) { - perror("SNDCTL_DSP_SPEED"); - SDL_SetError("Couldn't set audio frequency"); - DSP_CloseAudio(this); - return(-1); - } - spec->freq = value; - - /* Calculate the final parameters for this audio specification */ - SDL_CalculateAudioSpec(spec); - - /* Determine the power of two of the fragment size */ - for ( frag_spec = 0; (0x01U<size; ++frag_spec ); - if ( (0x01U<size ) { - SDL_SetError("Fragment size must be a power of two"); - DSP_CloseAudio(this); - return(-1); - } - frag_spec |= 0x00020000; /* two fragments, for low latency */ - - /* Set the audio buffering parameters */ -#ifdef DEBUG_AUDIO - fprintf(stderr, "Requesting %d fragments of size %d\n", - (frag_spec >> 16), 1<<(frag_spec&0xFFFF)); -#endif - if ( ioctl(audio_fd, SNDCTL_DSP_SETFRAGMENT, &frag_spec) < 0 ) { - perror("SNDCTL_DSP_SETFRAGMENT"); - } -#ifdef DEBUG_AUDIO - { audio_buf_info info; - ioctl(audio_fd, SNDCTL_DSP_GETOSPACE, &info); - fprintf(stderr, "fragments = %d\n", info.fragments); - fprintf(stderr, "fragstotal = %d\n", info.fragstotal); - fprintf(stderr, "fragsize = %d\n", info.fragsize); - fprintf(stderr, "bytes = %d\n", info.bytes); - } -#endif - - /* Allocate mixing buffer */ - mixlen = spec->size; - mixbuf = (Uint8 *)SDL_AllocAudioMem(mixlen); - if ( mixbuf == NULL ) { - DSP_CloseAudio(this); - return(-1); - } - SDL_memset(mixbuf, spec->silence, spec->size); - - /* Get the parent process id (we're the parent of the audio thread) */ - parent = getpid(); - - /* We're ready to rock and roll. :-) */ - return(0); -} diff --git a/apps/plugins/sdl/src/audio/dsp/SDL_dspaudio.h b/apps/plugins/sdl/src/audio/dsp/SDL_dspaudio.h deleted file mode 100644 index 382544f967..0000000000 --- a/apps/plugins/sdl/src/audio/dsp/SDL_dspaudio.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_dspaudio_h -#define _SDL_dspaudio_h - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the video functions */ -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData { - /* The file descriptor for the audio device */ - int audio_fd; - - /* The parent process id, to detect when application quits */ - pid_t parent; - - /* Raw mixing buffer */ - Uint8 *mixbuf; - int mixlen; -}; -#define FUDGE_TICKS 10 /* The scheduler overhead ticks per frame */ - -/* Old variable names */ -#define audio_fd (this->hidden->audio_fd) -#define parent (this->hidden->parent) -#define mixbuf (this->hidden->mixbuf) -#define mixlen (this->hidden->mixlen) -#define frame_ticks (this->hidden->frame_ticks) -#define next_frame (this->hidden->next_frame) - -#endif /* _SDL_dspaudio_h */ diff --git a/apps/plugins/sdl/src/audio/esd/SDL_esdaudio.c b/apps/plugins/sdl/src/audio/esd/SDL_esdaudio.c deleted file mode 100644 index f54b0ea9c5..0000000000 --- a/apps/plugins/sdl/src/audio/esd/SDL_esdaudio.c +++ /dev/null @@ -1,323 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Allow access to an ESD network stream mixing buffer */ - -#include -#include -#include -#include -#include - -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "../SDL_audiomem.h" -#include "../SDL_audio_c.h" -#include "../SDL_audiodev_c.h" -#include "SDL_esdaudio.h" - -#ifdef SDL_AUDIO_DRIVER_ESD_DYNAMIC -#include "SDL_name.h" -#include "SDL_loadso.h" -#else -#define SDL_NAME(X) X -#endif - -/* The tag name used by ESD audio */ -#define ESD_DRIVER_NAME "esd" - -/* Audio driver functions */ -static int ESD_OpenAudio(_THIS, SDL_AudioSpec *spec); -static void ESD_WaitAudio(_THIS); -static void ESD_PlayAudio(_THIS); -static Uint8 *ESD_GetAudioBuf(_THIS); -static void ESD_CloseAudio(_THIS); - -#ifdef SDL_AUDIO_DRIVER_ESD_DYNAMIC - -static const char *esd_library = SDL_AUDIO_DRIVER_ESD_DYNAMIC; -static void *esd_handle = NULL; -static int esd_loaded = 0; - -static int (*SDL_NAME(esd_open_sound))( const char *host ); -static int (*SDL_NAME(esd_close))( int esd ); -static int (*SDL_NAME(esd_play_stream))( esd_format_t format, int rate, - const char *host, const char *name ); -static struct { - const char *name; - void **func; -} esd_functions[] = { - { "esd_open_sound", (void **)&SDL_NAME(esd_open_sound) }, - { "esd_close", (void **)&SDL_NAME(esd_close) }, - { "esd_play_stream", (void **)&SDL_NAME(esd_play_stream) }, -}; - -static void UnloadESDLibrary() -{ - if ( esd_loaded ) { - SDL_UnloadObject(esd_handle); - esd_handle = NULL; - esd_loaded = 0; - } -} - -static int LoadESDLibrary(void) -{ - int i, retval = -1; - - esd_handle = SDL_LoadObject(esd_library); - if ( esd_handle ) { - esd_loaded = 1; - retval = 0; - for ( i=0; i= 0 ) { - available = 1; - SDL_NAME(esd_close)(connection); - } - UnloadESDLibrary(); - return(available); -} - -static void Audio_DeleteDevice(SDL_AudioDevice *device) -{ - SDL_free(device->hidden); - SDL_free(device); - UnloadESDLibrary(); -} - -static SDL_AudioDevice *Audio_CreateDevice(int devindex) -{ - SDL_AudioDevice *this; - - /* Initialize all variables that we clean on shutdown */ - LoadESDLibrary(); - this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice)); - if ( this ) { - SDL_memset(this, 0, (sizeof *this)); - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - } - if ( (this == NULL) || (this->hidden == NULL) ) { - SDL_OutOfMemory(); - if ( this ) { - SDL_free(this); - } - return(0); - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - audio_fd = -1; - - /* Set the function pointers */ - this->OpenAudio = ESD_OpenAudio; - this->WaitAudio = ESD_WaitAudio; - this->PlayAudio = ESD_PlayAudio; - this->GetAudioBuf = ESD_GetAudioBuf; - this->CloseAudio = ESD_CloseAudio; - - this->free = Audio_DeleteDevice; - - return this; -} - -AudioBootStrap ESD_bootstrap = { - ESD_DRIVER_NAME, "Enlightened Sound Daemon", - Audio_Available, Audio_CreateDevice -}; - -/* This function waits until it is possible to write a full sound buffer */ -static void ESD_WaitAudio(_THIS) -{ - Sint32 ticks; - - /* Check to see if the thread-parent process is still alive */ - { static int cnt = 0; - /* Note that this only works with thread implementations - that use a different process id for each thread. - */ - if (parent && (((++cnt)%10) == 0)) { /* Check every 10 loops */ - if ( kill(parent, 0) < 0 ) { - this->enabled = 0; - } - } - } - - /* Use timer for general audio synchronization */ - ticks = ((Sint32)(next_frame - SDL_GetTicks()))-FUDGE_TICKS; - if ( ticks > 0 ) { - SDL_Delay(ticks); - } -} - -static void ESD_PlayAudio(_THIS) -{ - int written; - - /* Write the audio data, checking for EAGAIN on broken audio drivers */ - do { - written = write(audio_fd, mixbuf, mixlen); - if ( (written < 0) && ((errno == 0) || (errno == EAGAIN)) ) { - SDL_Delay(1); /* Let a little CPU time go by */ - } - } while ( (written < 0) && - ((errno == 0) || (errno == EAGAIN) || (errno == EINTR)) ); - - /* Set the next write frame */ - next_frame += frame_ticks; - - /* If we couldn't write, assume fatal error for now */ - if ( written < 0 ) { - this->enabled = 0; - } -} - -static Uint8 *ESD_GetAudioBuf(_THIS) -{ - return(mixbuf); -} - -static void ESD_CloseAudio(_THIS) -{ - if ( mixbuf != NULL ) { - SDL_FreeAudioMem(mixbuf); - mixbuf = NULL; - } - if ( audio_fd >= 0 ) { - SDL_NAME(esd_close)(audio_fd); - audio_fd = -1; - } -} - -/* Try to get the name of the program */ -static char *get_progname(void) -{ - char *progname = NULL; -#ifdef __LINUX__ - FILE *fp; - static char temp[BUFSIZ]; - - SDL_snprintf(temp, SDL_arraysize(temp), "/proc/%d/cmdline", getpid()); - fp = fopen(temp, "r"); - if ( fp != NULL ) { - if ( fgets(temp, sizeof(temp)-1, fp) ) { - progname = SDL_strrchr(temp, '/'); - if ( progname == NULL ) { - progname = temp; - } else { - progname = progname+1; - } - } - fclose(fp); - } -#endif - return(progname); -} - -static int ESD_OpenAudio(_THIS, SDL_AudioSpec *spec) -{ - esd_format_t format; - - /* Convert audio spec to the ESD audio format */ - format = (ESD_STREAM | ESD_PLAY); - switch ( spec->format & 0xFF ) { - case 8: - format |= ESD_BITS8; - break; - case 16: - format |= ESD_BITS16; - break; - default: - SDL_SetError("Unsupported ESD audio format"); - return(-1); - } - if ( spec->channels == 1 ) { - format |= ESD_MONO; - } else { - format |= ESD_STEREO; - } -#if 0 - spec->samples = ESD_BUF_SIZE; /* Darn, no way to change this yet */ -#endif - - /* Open a connection to the ESD audio server */ - audio_fd = SDL_NAME(esd_play_stream)(format, spec->freq, NULL, get_progname()); - if ( audio_fd < 0 ) { - SDL_SetError("Couldn't open ESD connection"); - return(-1); - } - - /* Calculate the final parameters for this audio specification */ - SDL_CalculateAudioSpec(spec); - frame_ticks = (float)(spec->samples*1000)/spec->freq; - next_frame = SDL_GetTicks()+frame_ticks; - - /* Allocate mixing buffer */ - mixlen = spec->size; - mixbuf = (Uint8 *)SDL_AllocAudioMem(mixlen); - if ( mixbuf == NULL ) { - return(-1); - } - SDL_memset(mixbuf, spec->silence, spec->size); - - /* Get the parent process id (we're the parent of the audio thread) */ - parent = getpid(); - - /* We're ready to rock and roll. :-) */ - return(0); -} diff --git a/apps/plugins/sdl/src/audio/esd/SDL_esdaudio.h b/apps/plugins/sdl/src/audio/esd/SDL_esdaudio.h deleted file mode 100644 index da4ae6a04b..0000000000 --- a/apps/plugins/sdl/src/audio/esd/SDL_esdaudio.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_esdaudio_h -#define _SDL_esdaudio_h - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the video functions */ -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData { - /* The file descriptor for the audio device */ - int audio_fd; - - /* The parent process id, to detect when application quits */ - pid_t parent; - - /* Raw mixing buffer */ - Uint8 *mixbuf; - int mixlen; - - /* Support for audio timing using a timer */ - float frame_ticks; - float next_frame; -}; -#define FUDGE_TICKS 10 /* The scheduler overhead ticks per frame */ - -/* Old variable names */ -#define audio_fd (this->hidden->audio_fd) -#define parent (this->hidden->parent) -#define mixbuf (this->hidden->mixbuf) -#define mixlen (this->hidden->mixlen) -#define frame_ticks (this->hidden->frame_ticks) -#define next_frame (this->hidden->next_frame) - -#endif /* _SDL_esdaudio_h */ diff --git a/apps/plugins/sdl/src/audio/macosx/SDL_coreaudio.c b/apps/plugins/sdl/src/audio/macosx/SDL_coreaudio.c deleted file mode 100644 index 31316d1fd9..0000000000 --- a/apps/plugins/sdl/src/audio/macosx/SDL_coreaudio.c +++ /dev/null @@ -1,291 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#include -#include -#include -#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1050 -#include -#endif - -#include "SDL_audio.h" -#include "../SDL_audio_c.h" -#include "../SDL_sysaudio.h" -#include "SDL_coreaudio.h" - - -/* Audio driver functions */ - -static int Core_OpenAudio(_THIS, SDL_AudioSpec *spec); -static void Core_WaitAudio(_THIS); -static void Core_PlayAudio(_THIS); -static Uint8 *Core_GetAudioBuf(_THIS); -static void Core_CloseAudio(_THIS); - -/* Audio driver bootstrap functions */ - -static int Audio_Available(void) -{ - return(1); -} - -static void Audio_DeleteDevice(SDL_AudioDevice *device) -{ - SDL_free(device->hidden); - SDL_free(device); -} - -static SDL_AudioDevice *Audio_CreateDevice(int devindex) -{ - SDL_AudioDevice *this; - - /* Initialize all variables that we clean on shutdown */ - this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice)); - if ( this ) { - SDL_memset(this, 0, (sizeof *this)); - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - } - if ( (this == NULL) || (this->hidden == NULL) ) { - SDL_OutOfMemory(); - if ( this ) { - SDL_free(this); - } - return(0); - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - /* Set the function pointers */ - this->OpenAudio = Core_OpenAudio; - this->WaitAudio = Core_WaitAudio; - this->PlayAudio = Core_PlayAudio; - this->GetAudioBuf = Core_GetAudioBuf; - this->CloseAudio = Core_CloseAudio; - - this->free = Audio_DeleteDevice; - - return this; -} - -AudioBootStrap COREAUDIO_bootstrap = { - "coreaudio", "Mac OS X CoreAudio", - Audio_Available, Audio_CreateDevice -}; - -/* The CoreAudio callback */ -static OSStatus audioCallback (void *inRefCon, - AudioUnitRenderActionFlags *ioActionFlags, - const AudioTimeStamp *inTimeStamp, - UInt32 inBusNumber, - UInt32 inNumberFrames, - AudioBufferList *ioData) -{ - SDL_AudioDevice *this = (SDL_AudioDevice *)inRefCon; - UInt32 remaining, len; - AudioBuffer *abuf; - void *ptr; - UInt32 i; - - /* Only do anything if audio is enabled and not paused */ - if ( ! this->enabled || this->paused ) { - for (i = 0; i < ioData->mNumberBuffers; i++) { - abuf = &ioData->mBuffers[i]; - SDL_memset(abuf->mData, this->spec.silence, abuf->mDataByteSize); - } - return 0; - } - - /* No SDL conversion should be needed here, ever, since we accept - any input format in OpenAudio, and leave the conversion to CoreAudio. - */ - /* - assert(!this->convert.needed); - assert(this->spec.channels == ioData->mNumberChannels); - */ - - for (i = 0; i < ioData->mNumberBuffers; i++) { - abuf = &ioData->mBuffers[i]; - remaining = abuf->mDataByteSize; - ptr = abuf->mData; - while (remaining > 0) { - if (bufferOffset >= bufferSize) { - /* Generate the data */ - SDL_memset(buffer, this->spec.silence, bufferSize); - SDL_mutexP(this->mixer_lock); - (*this->spec.callback)(this->spec.userdata, - buffer, bufferSize); - SDL_mutexV(this->mixer_lock); - bufferOffset = 0; - } - - len = bufferSize - bufferOffset; - if (len > remaining) - len = remaining; - SDL_memcpy(ptr, (char *)buffer + bufferOffset, len); - ptr = (char *)ptr + len; - remaining -= len; - bufferOffset += len; - } - } - - return 0; -} - -/* Dummy functions -- we don't use thread-based audio */ -void Core_WaitAudio(_THIS) -{ - return; -} - -void Core_PlayAudio(_THIS) -{ - return; -} - -Uint8 *Core_GetAudioBuf(_THIS) -{ - return(NULL); -} - -void Core_CloseAudio(_THIS) -{ - OSStatus result; - struct AURenderCallbackStruct callback; - - /* stop processing the audio unit */ - result = AudioOutputUnitStop (outputAudioUnit); - if (result != noErr) { - SDL_SetError("Core_CloseAudio: AudioOutputUnitStop"); - return; - } - - /* Remove the input callback */ - callback.inputProc = 0; - callback.inputProcRefCon = 0; - result = AudioUnitSetProperty (outputAudioUnit, - kAudioUnitProperty_SetRenderCallback, - kAudioUnitScope_Input, - 0, - &callback, - sizeof(callback)); - if (result != noErr) { - SDL_SetError("Core_CloseAudio: AudioUnitSetProperty (kAudioUnitProperty_SetInputCallback)"); - return; - } - - result = CloseComponent(outputAudioUnit); - if (result != noErr) { - SDL_SetError("Core_CloseAudio: CloseComponent"); - return; - } - - SDL_free(buffer); -} - -#define CHECK_RESULT(msg) \ - if (result != noErr) { \ - SDL_SetError("Failed to start CoreAudio: " msg); \ - return -1; \ - } - - -int Core_OpenAudio(_THIS, SDL_AudioSpec *spec) -{ - OSStatus result = noErr; - Component comp; - ComponentDescription desc; - struct AURenderCallbackStruct callback; - AudioStreamBasicDescription requestedDesc; - - /* Setup a AudioStreamBasicDescription with the requested format */ - requestedDesc.mFormatID = kAudioFormatLinearPCM; - requestedDesc.mFormatFlags = kLinearPCMFormatFlagIsPacked; - requestedDesc.mChannelsPerFrame = spec->channels; - requestedDesc.mSampleRate = spec->freq; - - requestedDesc.mBitsPerChannel = spec->format & 0xFF; - if (spec->format & 0x8000) - requestedDesc.mFormatFlags |= kLinearPCMFormatFlagIsSignedInteger; - if (spec->format & 0x1000) - requestedDesc.mFormatFlags |= kLinearPCMFormatFlagIsBigEndian; - - requestedDesc.mFramesPerPacket = 1; - requestedDesc.mBytesPerFrame = requestedDesc.mBitsPerChannel * requestedDesc.mChannelsPerFrame / 8; - requestedDesc.mBytesPerPacket = requestedDesc.mBytesPerFrame * requestedDesc.mFramesPerPacket; - - - /* Locate the default output audio unit */ - desc.componentType = kAudioUnitType_Output; - desc.componentSubType = kAudioUnitSubType_DefaultOutput; - desc.componentManufacturer = kAudioUnitManufacturer_Apple; - desc.componentFlags = 0; - desc.componentFlagsMask = 0; - - comp = FindNextComponent (NULL, &desc); - if (comp == NULL) { - SDL_SetError ("Failed to start CoreAudio: FindNextComponent returned NULL"); - return -1; - } - - /* Open & initialize the default output audio unit */ - result = OpenAComponent (comp, &outputAudioUnit); - CHECK_RESULT("OpenAComponent") - - result = AudioUnitInitialize (outputAudioUnit); - CHECK_RESULT("AudioUnitInitialize") - - /* Set the input format of the audio unit. */ - result = AudioUnitSetProperty (outputAudioUnit, - kAudioUnitProperty_StreamFormat, - kAudioUnitScope_Input, - 0, - &requestedDesc, - sizeof (requestedDesc)); - CHECK_RESULT("AudioUnitSetProperty (kAudioUnitProperty_StreamFormat)") - - /* Set the audio callback */ - callback.inputProc = audioCallback; - callback.inputProcRefCon = this; - result = AudioUnitSetProperty (outputAudioUnit, - kAudioUnitProperty_SetRenderCallback, - kAudioUnitScope_Input, - 0, - &callback, - sizeof(callback)); - CHECK_RESULT("AudioUnitSetProperty (kAudioUnitProperty_SetInputCallback)") - - /* Calculate the final parameters for this audio specification */ - SDL_CalculateAudioSpec(spec); - - /* Allocate a sample buffer */ - bufferOffset = bufferSize = this->spec.size; - buffer = SDL_malloc(bufferSize); - - /* Finally, start processing of the audio unit */ - result = AudioOutputUnitStart (outputAudioUnit); - CHECK_RESULT("AudioOutputUnitStart") - - - /* We're running! */ - return(1); -} diff --git a/apps/plugins/sdl/src/audio/macosx/SDL_coreaudio.h b/apps/plugins/sdl/src/audio/macosx/SDL_coreaudio.h deleted file mode 100644 index c11bc03a2b..0000000000 --- a/apps/plugins/sdl/src/audio/macosx/SDL_coreaudio.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_coreaudio_h -#define _SDL_coreaudio_h - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the video functions */ -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData { - AudioUnit outputAudioUnit; - void *buffer; - UInt32 bufferOffset; - UInt32 bufferSize; -}; - -/* Old variable names */ -#define outputAudioUnit (this->hidden->outputAudioUnit) -#define buffer (this->hidden->buffer) -#define bufferOffset (this->hidden->bufferOffset) -#define bufferSize (this->hidden->bufferSize) - -#endif /* _SDL_coreaudio_h */ diff --git a/apps/plugins/sdl/src/audio/macrom/SDL_romaudio.c b/apps/plugins/sdl/src/audio/macrom/SDL_romaudio.c deleted file mode 100644 index 1b3d49e198..0000000000 --- a/apps/plugins/sdl/src/audio/macrom/SDL_romaudio.c +++ /dev/null @@ -1,496 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#if defined(__APPLE__) && defined(__MACH__) -# include -#elif TARGET_API_MAC_CARBON && (UNIVERSAL_INTERFACES_VERSION > 0x0335) -# include -#else -# include /* SoundManager interface */ -# include -# include -#endif - -#if !defined(NewSndCallBackUPP) && (UNIVERSAL_INTERFACES_VERSION < 0x0335) -#if !defined(NewSndCallBackProc) /* avoid circular redefinition... */ -#define NewSndCallBackUPP NewSndCallBackProc -#endif -#if !defined(NewSndCallBackUPP) -#define NewSndCallBackUPP NewSndCallBackProc -#endif -#endif - -#include "SDL_audio.h" -#include "../SDL_audio_c.h" -#include "../SDL_sysaudio.h" -#include "SDL_romaudio.h" - -/* Audio driver functions */ - -static void Mac_CloseAudio(_THIS); -static int Mac_OpenAudio(_THIS, SDL_AudioSpec *spec); -static void Mac_LockAudio(_THIS); -static void Mac_UnlockAudio(_THIS); - -/* Audio driver bootstrap functions */ - - -static int Audio_Available(void) -{ - return(1); -} - -static void Audio_DeleteDevice(SDL_AudioDevice *device) -{ - SDL_free(device->hidden); - SDL_free(device); -} - -static SDL_AudioDevice *Audio_CreateDevice(int devindex) -{ - SDL_AudioDevice *this; - - /* Initialize all variables that we clean on shutdown */ - this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice)); - if ( this ) { - SDL_memset(this, 0, (sizeof *this)); - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - } - if ( (this == NULL) || (this->hidden == NULL) ) { - SDL_OutOfMemory(); - if ( this ) { - SDL_free(this); - } - return(0); - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - /* Set the function pointers */ - this->OpenAudio = Mac_OpenAudio; - this->CloseAudio = Mac_CloseAudio; - this->LockAudio = Mac_LockAudio; - this->UnlockAudio = Mac_UnlockAudio; - this->free = Audio_DeleteDevice; - -#ifdef __MACOSX__ /* Mac OS X uses threaded audio, so normal thread code is okay */ - this->LockAudio = NULL; - this->UnlockAudio = NULL; -#endif - return this; -} - -AudioBootStrap SNDMGR_bootstrap = { - "sndmgr", "MacOS SoundManager 3.0", - Audio_Available, Audio_CreateDevice -}; - -#if defined(TARGET_API_MAC_CARBON) || defined(USE_RYANS_SOUNDCODE) -/* This works correctly on Mac OS X */ - -#pragma options align=power - -static volatile SInt32 audio_is_locked = 0; -static volatile SInt32 need_to_mix = 0; - -static UInt8 *buffer[2]; -static volatile UInt32 running = 0; -static CmpSoundHeader header; -static volatile Uint32 fill_me = 0; - -static void mix_buffer(SDL_AudioDevice *audio, UInt8 *buffer) -{ - if ( ! audio->paused ) { -#ifdef __MACOSX__ - SDL_mutexP(audio->mixer_lock); -#endif - if ( audio->convert.needed ) { - audio->spec.callback(audio->spec.userdata, - (Uint8 *)audio->convert.buf,audio->convert.len); - SDL_ConvertAudio(&audio->convert); - if ( audio->convert.len_cvt != audio->spec.size ) { - /* Uh oh... probably crashes here */; - } - SDL_memcpy(buffer, audio->convert.buf, audio->convert.len_cvt); - } else { - audio->spec.callback(audio->spec.userdata, buffer, audio->spec.size); - } -#ifdef __MACOSX__ - SDL_mutexV(audio->mixer_lock); -#endif - } - - DecrementAtomic((SInt32 *) &need_to_mix); -} - -static void Mac_LockAudio(_THIS) -{ - IncrementAtomic((SInt32 *) &audio_is_locked); -} - -static void Mac_UnlockAudio(_THIS) -{ - SInt32 oldval; - - oldval = DecrementAtomic((SInt32 *) &audio_is_locked); - if ( oldval != 1 ) /* != 1 means audio is still locked. */ - return; - - /* Did we miss the chance to mix in an interrupt? Do it now. */ - if ( BitAndAtomic (0xFFFFFFFF, (UInt32 *) &need_to_mix) ) { - /* - * Note that this could be a problem if you missed an interrupt - * while the audio was locked, and get preempted by a second - * interrupt here, but that means you locked for way too long anyhow. - */ - mix_buffer (this, buffer[fill_me]); - } -} - -static void callBackProc (SndChannel *chan, SndCommand *cmd_passed ) { - UInt32 play_me; - SndCommand cmd; - SDL_AudioDevice *audio = (SDL_AudioDevice *)chan->userInfo; - - IncrementAtomic((SInt32 *) &need_to_mix); - - fill_me = cmd_passed->param2; /* buffer that has just finished playing, so fill it */ - play_me = ! fill_me; /* filled buffer to play _now_ */ - - if ( ! audio->enabled ) { - return; - } - - /* queue previously mixed buffer for playback. */ - header.samplePtr = (Ptr)buffer[play_me]; - cmd.cmd = bufferCmd; - cmd.param1 = 0; - cmd.param2 = (long)&header; - SndDoCommand (chan, &cmd, 0); - - memset (buffer[fill_me], 0, audio->spec.size); - - /* - * if audio device isn't locked, mix the next buffer to be queued in - * the memory block that just finished playing. - */ - if ( ! BitAndAtomic(0xFFFFFFFF, (UInt32 *) &audio_is_locked) ) { - mix_buffer (audio, buffer[fill_me]); - } - - /* set this callback to run again when current buffer drains. */ - if ( running ) { - cmd.cmd = callBackCmd; - cmd.param1 = 0; - cmd.param2 = play_me; - - SndDoCommand (chan, &cmd, 0); - } -} - -static int Mac_OpenAudio(_THIS, SDL_AudioSpec *spec) { - - SndCallBackUPP callback; - int sample_bits; - int i; - long initOptions; - - /* Very few conversions are required, but... */ - switch (spec->format) { - case AUDIO_S8: - spec->format = AUDIO_U8; - break; - case AUDIO_U16LSB: - spec->format = AUDIO_S16LSB; - break; - case AUDIO_U16MSB: - spec->format = AUDIO_S16MSB; - break; - } - SDL_CalculateAudioSpec(spec); - - /* initialize bufferCmd header */ - memset (&header, 0, sizeof(header)); - callback = (SndCallBackUPP) NewSndCallBackUPP (callBackProc); - sample_bits = spec->size / spec->samples / spec->channels * 8; - -#ifdef DEBUG_AUDIO - fprintf(stderr, - "Audio format 0x%x, channels = %d, sample_bits = %d, frequency = %d\n", - spec->format, spec->channels, sample_bits, spec->freq); -#endif /* DEBUG_AUDIO */ - - header.numChannels = spec->channels; - header.sampleSize = sample_bits; - header.sampleRate = spec->freq << 16; - header.numFrames = spec->samples; - header.encode = cmpSH; - - /* Note that we install the 16bitLittleEndian Converter if needed. */ - if ( spec->format == 0x8010 ) { - header.compressionID = fixedCompression; - header.format = k16BitLittleEndianFormat; - } - - /* allocate 2 buffers */ - for (i=0; i<2; i++) { - buffer[i] = (UInt8*)malloc (sizeof(UInt8) * spec->size); - if (buffer[i] == NULL) { - SDL_OutOfMemory(); - return (-1); - } - memset (buffer[i], 0, spec->size); - } - - /* Create the sound manager channel */ - channel = (SndChannelPtr)SDL_malloc(sizeof(*channel)); - if ( channel == NULL ) { - SDL_OutOfMemory(); - return(-1); - } - if ( spec->channels >= 2 ) { - initOptions = initStereo; - } else { - initOptions = initMono; - } - channel->userInfo = (long)this; - channel->qLength = 128; - if ( SndNewChannel(&channel, sampledSynth, initOptions, callback) != noErr ) { - SDL_SetError("Unable to create audio channel"); - SDL_free(channel); - channel = NULL; - return(-1); - } - - /* start playback */ - { - SndCommand cmd; - cmd.cmd = callBackCmd; - cmd.param2 = 0; - running = 1; - SndDoCommand (channel, &cmd, 0); - } - - return 1; -} - -static void Mac_CloseAudio(_THIS) { - - int i; - - running = 0; - - if (channel) { - SndDisposeChannel (channel, true); - channel = NULL; - } - - for ( i=0; i<2; ++i ) { - if ( buffer[i] ) { - SDL_free(buffer[i]); - buffer[i] = NULL; - } - } -} - -#else /* !TARGET_API_MAC_CARBON && !USE_RYANS_SOUNDCODE */ - -static void Mac_LockAudio(_THIS) -{ - /* no-op. */ -} - -static void Mac_UnlockAudio(_THIS) -{ - /* no-op. */ -} - - -/* This function is called by Sound Manager when it has exhausted one of - the buffers, so we'll zero it to silence and fill it with audio if - we're not paused. -*/ -static pascal -void sndDoubleBackProc (SndChannelPtr chan, SndDoubleBufferPtr newbuf) -{ - SDL_AudioDevice *audio = (SDL_AudioDevice *)newbuf->dbUserInfo[0]; - - /* If audio is quitting, don't do anything */ - if ( ! audio->enabled ) { - return; - } - memset (newbuf->dbSoundData, 0, audio->spec.size); - newbuf->dbNumFrames = audio->spec.samples; - if ( ! audio->paused ) { - if ( audio->convert.needed ) { - audio->spec.callback(audio->spec.userdata, - (Uint8 *)audio->convert.buf,audio->convert.len); - SDL_ConvertAudio(&audio->convert); -#if 0 - if ( audio->convert.len_cvt != audio->spec.size ) { - /* Uh oh... probably crashes here */; - } -#endif - SDL_memcpy(newbuf->dbSoundData, audio->convert.buf, - audio->convert.len_cvt); - } else { - audio->spec.callback(audio->spec.userdata, - (Uint8 *)newbuf->dbSoundData, audio->spec.size); - } - } - newbuf->dbFlags |= dbBufferReady; -} - -static int DoubleBufferAudio_Available(void) -{ - int available; - NumVersion sndversion; - long response; - - available = 0; - sndversion = SndSoundManagerVersion(); - if ( sndversion.majorRev >= 3 ) { - if ( Gestalt(gestaltSoundAttr, &response) == noErr ) { - if ( (response & (1 << gestaltSndPlayDoubleBuffer)) ) { - available = 1; - } - } - } else { - if ( Gestalt(gestaltSoundAttr, &response) == noErr ) { - if ( (response & (1 << gestaltHasASC)) ) { - available = 1; - } - } - } - return(available); -} - -static void Mac_CloseAudio(_THIS) -{ - int i; - - if ( channel != NULL ) { - /* Clean up the audio channel */ - SndDisposeChannel(channel, true); - channel = NULL; - } - for ( i=0; i<2; ++i ) { - if ( audio_buf[i] ) { - SDL_free(audio_buf[i]); - audio_buf[i] = NULL; - } - } -} - -static int Mac_OpenAudio(_THIS, SDL_AudioSpec *spec) -{ - SndDoubleBufferHeader2 audio_dbh; - int i; - long initOptions; - int sample_bits; - SndDoubleBackUPP doubleBackProc; - - /* Check to make sure double-buffered audio is available */ - if ( ! DoubleBufferAudio_Available() ) { - SDL_SetError("Sound manager doesn't support double-buffering"); - return(-1); - } - - /* Very few conversions are required, but... */ - switch (spec->format) { - case AUDIO_S8: - spec->format = AUDIO_U8; - break; - case AUDIO_U16LSB: - spec->format = AUDIO_S16LSB; - break; - case AUDIO_U16MSB: - spec->format = AUDIO_S16MSB; - break; - } - SDL_CalculateAudioSpec(spec); - - /* initialize the double-back header */ - SDL_memset(&audio_dbh, 0, sizeof(audio_dbh)); - doubleBackProc = NewSndDoubleBackProc (sndDoubleBackProc); - sample_bits = spec->size / spec->samples / spec->channels * 8; - - audio_dbh.dbhNumChannels = spec->channels; - audio_dbh.dbhSampleSize = sample_bits; - audio_dbh.dbhCompressionID = 0; - audio_dbh.dbhPacketSize = 0; - audio_dbh.dbhSampleRate = spec->freq << 16; - audio_dbh.dbhDoubleBack = doubleBackProc; - audio_dbh.dbhFormat = 0; - - /* Note that we install the 16bitLittleEndian Converter if needed. */ - if ( spec->format == 0x8010 ) { - audio_dbh.dbhCompressionID = fixedCompression; - audio_dbh.dbhFormat = k16BitLittleEndianFormat; - } - - /* allocate the 2 double-back buffers */ - for ( i=0; i<2; ++i ) { - audio_buf[i] = SDL_calloc(1, sizeof(SndDoubleBuffer)+spec->size); - if ( audio_buf[i] == NULL ) { - SDL_OutOfMemory(); - return(-1); - } - audio_buf[i]->dbNumFrames = spec->samples; - audio_buf[i]->dbFlags = dbBufferReady; - audio_buf[i]->dbUserInfo[0] = (long)this; - audio_dbh.dbhBufferPtr[i] = audio_buf[i]; - } - - /* Create the sound manager channel */ - channel = (SndChannelPtr)SDL_malloc(sizeof(*channel)); - if ( channel == NULL ) { - SDL_OutOfMemory(); - return(-1); - } - if ( spec->channels >= 2 ) { - initOptions = initStereo; - } else { - initOptions = initMono; - } - channel->userInfo = 0; - channel->qLength = 128; - if ( SndNewChannel(&channel, sampledSynth, initOptions, 0L) != noErr ) { - SDL_SetError("Unable to create audio channel"); - SDL_free(channel); - channel = NULL; - return(-1); - } - - /* Start playback */ - if ( SndPlayDoubleBuffer(channel, (SndDoubleBufferHeaderPtr)&audio_dbh) - != noErr ) { - SDL_SetError("Unable to play double buffered audio"); - return(-1); - } - - return 1; -} - -#endif /* TARGET_API_MAC_CARBON || USE_RYANS_SOUNDCODE */ - diff --git a/apps/plugins/sdl/src/audio/macrom/SDL_romaudio.h b/apps/plugins/sdl/src/audio/macrom/SDL_romaudio.h deleted file mode 100644 index 90e19c0695..0000000000 --- a/apps/plugins/sdl/src/audio/macrom/SDL_romaudio.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_romaudio_h -#define _SDL_romaudio_h - -#include "../SDL_sysaudio.h" - -/* This is Ryan's improved MacOS sound code, with locking support */ -#define USE_RYANS_SOUNDCODE - -/* Hidden "this" pointer for the video functions */ -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData { - /* Sound manager audio channel */ - SndChannelPtr channel; -#if defined(TARGET_API_MAC_CARBON) || defined(USE_RYANS_SOUNDCODE) - /* FIXME: Add Ryan's static data here */ -#else - /* Double buffering variables */ - SndDoubleBufferPtr audio_buf[2]; -#endif -}; - -/* Old variable names */ -#define channel (this->hidden->channel) -#define audio_buf (this->hidden->audio_buf) - -#endif /* _SDL_romaudio_h */ diff --git a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio.c b/apps/plugins/sdl/src/audio/mint/SDL_mintaudio.c deleted file mode 100644 index 46ba690c3e..0000000000 --- a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio.c +++ /dev/null @@ -1,215 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* - Audio interrupt variables and callback function - - Patrice Mandin -*/ - -#include - -#include -#include -#include -#include - -#include "SDL_audio.h" -#include "SDL_mintaudio.h" -#include "SDL_mintaudio_stfa.h" - -/* The audio device */ - -SDL_AudioDevice *SDL_MintAudio_device; -Uint8 *SDL_MintAudio_audiobuf[2]; /* Pointers to buffers */ -unsigned long SDL_MintAudio_audiosize; /* Length of audio buffer=spec->size */ -volatile unsigned short SDL_MintAudio_numbuf; /* Buffer to play */ -volatile unsigned short SDL_MintAudio_mutex; -volatile unsigned long SDL_MintAudio_clocktics; -cookie_stfa_t *SDL_MintAudio_stfa; -unsigned short SDL_MintAudio_hasfpu; - -/* MiNT thread variables */ -SDL_bool SDL_MintAudio_mint_present; -SDL_bool SDL_MintAudio_quit_thread; -SDL_bool SDL_MintAudio_thread_finished; -long SDL_MintAudio_thread_pid; - -/* The callback function, called by each driver whenever needed */ - -void SDL_MintAudio_Callback(void) -{ - Uint8 *buffer; - SDL_AudioDevice *audio = SDL_MintAudio_device; - - buffer = SDL_MintAudio_audiobuf[SDL_MintAudio_numbuf]; - SDL_memset(buffer, audio->spec.silence, audio->spec.size); - - if (audio->paused) - return; - - if (audio->convert.needed) { - int silence; - - if ( audio->convert.src_format == AUDIO_U8 ) { - silence = 0x80; - } else { - silence = 0; - } - SDL_memset(audio->convert.buf, silence, audio->convert.len); - audio->spec.callback(audio->spec.userdata, - (Uint8 *)audio->convert.buf,audio->convert.len); - SDL_ConvertAudio(&audio->convert); - SDL_memcpy(buffer, audio->convert.buf, audio->convert.len_cvt); - } else { - audio->spec.callback(audio->spec.userdata, buffer, audio->spec.size); - } -} - -/* Add a new frequency/clock/predivisor to the current list */ -void SDL_MintAudio_AddFrequency(_THIS, Uint32 frequency, Uint32 clock, - Uint32 prediv, int gpio_bits) -{ - int i, p; - - if (MINTAUDIO_freqcount==MINTAUDIO_maxfreqs) { - return; - } - - /* Search where to insert the frequency (highest first) */ - for (p=0; p MINTAUDIO_frequencies[p].frequency) { - break; - } - } - - /* Put all following ones farer */ - if (MINTAUDIO_freqcount>0) { - for (i=MINTAUDIO_freqcount; i>p; i--) { - SDL_memcpy(&MINTAUDIO_frequencies[i], &MINTAUDIO_frequencies[i-1], sizeof(mint_frequency_t)); - } - } - - /* And insert new one */ - MINTAUDIO_frequencies[p].frequency = frequency; - MINTAUDIO_frequencies[p].masterclock = clock; - MINTAUDIO_frequencies[p].predivisor = prediv; - MINTAUDIO_frequencies[p].gpio_bits = gpio_bits; - - MINTAUDIO_freqcount++; -} - -/* Search for the nearest frequency */ -int SDL_MintAudio_SearchFrequency(_THIS, int desired_freq) -{ - int i; - - /* Only 1 freq ? */ - if (MINTAUDIO_freqcount==1) { - return 0; - } - - /* Check the array */ - for (i=0; i= ((MINTAUDIO_frequencies[i].frequency+ - MINTAUDIO_frequencies[i+1].frequency)>>1)) { - return i; - } - } - - /* Not in the array, give the latest */ - return MINTAUDIO_freqcount-1; -} - -/* Check if FPU is present */ -void SDL_MintAudio_CheckFpu(void) -{ - long cookie_fpu; - - SDL_MintAudio_hasfpu = 0; - if (Getcookie(C__FPU, &cookie_fpu) != C_FOUND) { - return; - } - switch ((cookie_fpu>>16)&0xfffe) { - case 2: - case 4: - case 6: - case 8: - case 16: - SDL_MintAudio_hasfpu = 1; - break; - } -} - -/* The thread function, used under MiNT with xbios */ -int SDL_MintAudio_Thread(long param) -{ - SndBufPtr pointers; - SDL_bool buffers_filled[2] = {SDL_FALSE, SDL_FALSE}; - - SDL_MintAudio_thread_finished = SDL_FALSE; - while (!SDL_MintAudio_quit_thread) { - if (Buffptr(&pointers)!=0) - continue; - - if (( (unsigned long)pointers.play>=(unsigned long)SDL_MintAudio_audiobuf[0]) - && ( (unsigned long)pointers.play<=(unsigned long)SDL_MintAudio_audiobuf[1])) - { - /* DMA is reading buffer #0, setup buffer #1 if not already done */ - if (!buffers_filled[1]) { - SDL_MintAudio_numbuf = 1; - SDL_MintAudio_Callback(); - Setbuffer(0, SDL_MintAudio_audiobuf[1], SDL_MintAudio_audiobuf[1] + SDL_MintAudio_audiosize); - buffers_filled[1]=SDL_TRUE; - buffers_filled[0]=SDL_FALSE; - } - } else { - /* DMA is reading buffer #1, setup buffer #0 if not already done */ - if (!buffers_filled[0]) { - SDL_MintAudio_numbuf = 0; - SDL_MintAudio_Callback(); - Setbuffer(0, SDL_MintAudio_audiobuf[0], SDL_MintAudio_audiobuf[0] + SDL_MintAudio_audiosize); - buffers_filled[0]=SDL_TRUE; - buffers_filled[1]=SDL_FALSE; - } - } - - usleep(100); - } - SDL_MintAudio_thread_finished = SDL_TRUE; - return 0; -} - -void SDL_MintAudio_WaitThread(void) -{ - if (!SDL_MintAudio_mint_present) - return; - - if (SDL_MintAudio_thread_finished) - return; - - SDL_MintAudio_quit_thread = SDL_TRUE; - while (!SDL_MintAudio_thread_finished) { - Syield(); - } -} diff --git a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio.h b/apps/plugins/sdl/src/audio/mint/SDL_mintaudio.h deleted file mode 100644 index ba6056ee3a..0000000000 --- a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio.h +++ /dev/null @@ -1,121 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* - MiNT audio driver - - Patrice Mandin -*/ - -#ifndef _SDL_mintaudio_h -#define _SDL_mintaudio_h - -#include "../SDL_sysaudio.h" -#include "SDL_mintaudio_stfa.h" - -/* Hidden "this" pointer for the audio functions */ -#define _THIS SDL_AudioDevice *this - -/* 16 predivisors with 3 clocks max. */ -#define MINTAUDIO_maxfreqs (16*3) - -typedef struct { - Uint32 frequency; - Uint32 masterclock; - Uint32 predivisor; - int gpio_bits; /* in case of external clock */ -} mint_frequency_t; - -struct SDL_PrivateAudioData { - mint_frequency_t frequencies[MINTAUDIO_maxfreqs]; - int freq_count; /* Number of frequencies in the array */ - int numfreq; /* Number of selected frequency */ -}; - -/* Old variable names */ - -#define MINTAUDIO_frequencies (this->hidden->frequencies) -#define MINTAUDIO_freqcount (this->hidden->freq_count) -#define MINTAUDIO_numfreq (this->hidden->numfreq) - -/* _MCH cookie (values>>16) */ -enum { - MCH_ST=0, - MCH_STE, - MCH_TT, - MCH_F30, - MCH_CLONE, - MCH_ARANYM -}; - -/* Master clocks for replay frequencies */ -#define MASTERCLOCK_STE 8010666 /* Not sure of this one */ -#define MASTERCLOCK_TT 16107953 /* Not sure of this one */ -#define MASTERCLOCK_FALCON1 25175000 -#define MASTERCLOCK_FALCON2 32000000 /* Only usable for DSP56K */ -#define MASTERCLOCK_FALCONEXT -1 /* Clock on DSP56K port, unknown */ -#define MASTERCLOCK_44K 22579200 /* Standard clock for 44.1 Khz */ -#define MASTERCLOCK_48K 24576000 /* Standard clock for 48 Khz */ - -/* Master clock predivisors */ -#define MASTERPREDIV_STE 160 -#define MASTERPREDIV_TT 320 -#define MASTERPREDIV_FALCON 256 -#define MASTERPREDIV_MILAN 256 - -/* Variables */ -extern SDL_AudioDevice *SDL_MintAudio_device; -extern Uint8 *SDL_MintAudio_audiobuf[2]; /* Pointers to buffers */ -extern unsigned long SDL_MintAudio_audiosize; /* Length of audio buffer=spec->size */ -extern volatile unsigned short SDL_MintAudio_numbuf; /* Buffer to play */ -extern volatile unsigned short SDL_MintAudio_mutex; -extern cookie_stfa_t *SDL_MintAudio_stfa; -extern volatile unsigned long SDL_MintAudio_clocktics; -extern unsigned short SDL_MintAudio_hasfpu; /* To preserve fpu registers if needed */ - -/* MiNT thread variables */ -extern SDL_bool SDL_MintAudio_mint_present; -extern SDL_bool SDL_MintAudio_quit_thread; -extern SDL_bool SDL_MintAudio_thread_finished; -extern long SDL_MintAudio_thread_pid; - -/* Functions */ -void SDL_MintAudio_Callback(void); -void SDL_MintAudio_AddFrequency(_THIS, Uint32 frequency, Uint32 clock, - Uint32 prediv, int gpio_bits); -int SDL_MintAudio_SearchFrequency(_THIS, int desired_freq); -void SDL_MintAudio_CheckFpu(void); - -/* MiNT thread functions */ -int SDL_MintAudio_Thread(long param); -void SDL_MintAudio_WaitThread(void); - -/* ASM interrupt functions */ -void SDL_MintAudio_GsxbInterrupt(void); -void SDL_MintAudio_EmptyGsxbInterrupt(void); -void SDL_MintAudio_XbiosInterruptMeasureClock(void); -void SDL_MintAudio_XbiosInterrupt(void); -void SDL_MintAudio_Dma8Interrupt(void); -void SDL_MintAudio_StfaInterrupt(void); - -#endif /* _SDL_mintaudio_h */ diff --git a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_dma8.c b/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_dma8.c deleted file mode 100644 index 61feba3d64..0000000000 --- a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_dma8.c +++ /dev/null @@ -1,357 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* - MiNT audio driver - using DMA 8bits (hardware access) - - Patrice Mandin -*/ - -/* Mint includes */ -#include -#include -#include - -#include "SDL_audio.h" -#include "../SDL_audio_c.h" -#include "../SDL_sysaudio.h" - -#include "../../video/ataricommon/SDL_atarimxalloc_c.h" - -#include "SDL_mintaudio.h" -#include "SDL_mintaudio_dma8.h" - -/*--- Defines ---*/ - -#define MINT_AUDIO_DRIVER_NAME "mint_dma8" - -/* Debug print info */ -#define DEBUG_NAME "audio:dma8: " -#if 0 -#define DEBUG_PRINT(what) \ - { \ - printf what; \ - } -#else -#define DEBUG_PRINT(what) -#endif - -/*--- Static variables ---*/ - -static long cookie_snd, cookie_mch; - -/*--- Audio driver functions ---*/ - -static void Mint_CloseAudio(_THIS); -static int Mint_OpenAudio(_THIS, SDL_AudioSpec *spec); -static void Mint_LockAudio(_THIS); -static void Mint_UnlockAudio(_THIS); - -/* To check/init hardware audio */ -static int Mint_CheckAudio(_THIS, SDL_AudioSpec *spec); - -/* Functions called in supervisor mode */ -static void Mint_InitDma(void); -static void Mint_StopReplay(void); -static void Mint_StartReplay(void); - -/*--- Audio driver bootstrap functions ---*/ - -static int Audio_Available(void) -{ - const char *envr = SDL_getenv("SDL_AUDIODRIVER"); - - /* Check if user asked a different audio driver */ - if ((envr) && (SDL_strcmp(envr, MINT_AUDIO_DRIVER_NAME)!=0)) { - DEBUG_PRINT((DEBUG_NAME "user asked a different audio driver\n")); - return 0; - } - - /* Cookie _MCH present ? if not, assume ST machine */ - if (Getcookie(C__MCH, &cookie_mch) == C_NOTFOUND) { - cookie_mch = MCH_ST; - } - - /* Cookie _SND present ? if not, assume ST machine */ - if (Getcookie(C__SND, &cookie_snd) == C_NOTFOUND) { - cookie_snd = SND_PSG; - } - - /* Check if we have 8 bits audio */ - if ((cookie_snd & SND_8BIT)==0) { - DEBUG_PRINT((DEBUG_NAME "no 8 bits sound\n")); - return(0); - } - - /* Check if audio is lockable */ - if (cookie_snd & SND_16BIT) { - if (Locksnd()!=1) { - DEBUG_PRINT((DEBUG_NAME "audio locked by other application\n")); - return(0); - } - - Unlocksnd(); - } - - DEBUG_PRINT((DEBUG_NAME "8 bits audio available!\n")); - return(1); -} - -static void Audio_DeleteDevice(SDL_AudioDevice *device) -{ - SDL_free(device->hidden); - SDL_free(device); -} - -static SDL_AudioDevice *Audio_CreateDevice(int devindex) -{ - SDL_AudioDevice *this; - - /* Initialize all variables that we clean on shutdown */ - this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice)); - if ( this ) { - SDL_memset(this, 0, (sizeof *this)); - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - } - if ( (this == NULL) || (this->hidden == NULL) ) { - SDL_OutOfMemory(); - if ( this ) { - SDL_free(this); - } - return(0); - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - /* Set the function pointers */ - this->OpenAudio = Mint_OpenAudio; - this->CloseAudio = Mint_CloseAudio; - this->LockAudio = Mint_LockAudio; - this->UnlockAudio = Mint_UnlockAudio; - this->free = Audio_DeleteDevice; - - return this; -} - -AudioBootStrap MINTAUDIO_DMA8_bootstrap = { - MINT_AUDIO_DRIVER_NAME, "MiNT DMA 8 bits audio driver", - Audio_Available, Audio_CreateDevice -}; - -static void Mint_LockAudio(_THIS) -{ - Supexec(Mint_StopReplay); -} - -static void Mint_UnlockAudio(_THIS) -{ - Supexec(Mint_StartReplay); -} - -static void Mint_CloseAudio(_THIS) -{ - Supexec(Mint_StopReplay); - - DEBUG_PRINT((DEBUG_NAME "closeaudio: replay stopped\n")); - - /* Disable interrupt */ - Jdisint(MFP_DMASOUND); - - DEBUG_PRINT((DEBUG_NAME "closeaudio: interrupt disabled\n")); - - /* Wait if currently playing sound */ - while (SDL_MintAudio_mutex != 0) { - } - - DEBUG_PRINT((DEBUG_NAME "closeaudio: no more interrupt running\n")); - - /* Clear buffers */ - if (SDL_MintAudio_audiobuf[0]) { - Mfree(SDL_MintAudio_audiobuf[0]); - SDL_MintAudio_audiobuf[0] = SDL_MintAudio_audiobuf[1] = NULL; - } - - DEBUG_PRINT((DEBUG_NAME "closeaudio: buffers freed\n")); -} - -static int Mint_CheckAudio(_THIS, SDL_AudioSpec *spec) -{ - int i, masterprediv, sfreq; - unsigned long masterclock; - - DEBUG_PRINT((DEBUG_NAME "asked: %d bits, ",spec->format & 0x00ff)); - DEBUG_PRINT(("signed=%d, ", ((spec->format & 0x8000)!=0))); - DEBUG_PRINT(("big endian=%d, ", ((spec->format & 0x1000)!=0))); - DEBUG_PRINT(("channels=%d, ", spec->channels)); - DEBUG_PRINT(("freq=%d\n", spec->freq)); - - if (spec->channels > 2) - spec->channels = 2; - - /* Check formats available */ - spec->format = AUDIO_S8; - - /* Calculate and select the closest frequency */ - sfreq=0; - masterclock=MASTERCLOCK_STE; - masterprediv=MASTERPREDIV_STE; - switch(cookie_mch>>16) { -/* - case MCH_STE: - masterclock=MASTERCLOCK_STE; - masterprediv=MASTERPREDIV_STE; - break; -*/ - case MCH_TT: - masterclock=MASTERCLOCK_TT; - masterprediv=MASTERPREDIV_TT; - break; - case MCH_F30: - case MCH_ARANYM: - masterclock=MASTERCLOCK_FALCON1; - masterprediv=MASTERPREDIV_FALCON; - sfreq=1; - break; - } - - MINTAUDIO_freqcount=0; - for (i=sfreq;i<4;i++) { - SDL_MintAudio_AddFrequency(this, masterclock/(masterprediv*(1<freq); - spec->freq=MINTAUDIO_frequencies[MINTAUDIO_numfreq].frequency; - - DEBUG_PRINT((DEBUG_NAME "obtained: %d bits, ",spec->format & 0x00ff)); - DEBUG_PRINT(("signed=%d, ", ((spec->format & 0x8000)!=0))); - DEBUG_PRINT(("big endian=%d, ", ((spec->format & 0x1000)!=0))); - DEBUG_PRINT(("channels=%d, ", spec->channels)); - DEBUG_PRINT(("freq=%d\n", spec->freq)); - - return 0; -} - -static int Mint_OpenAudio(_THIS, SDL_AudioSpec *spec) -{ - SDL_MintAudio_device = this; - - /* Check audio capabilities */ - if (Mint_CheckAudio(this, spec)==-1) { - return -1; - } - - SDL_CalculateAudioSpec(spec); - - /* Allocate memory for audio buffers in DMA-able RAM */ - DEBUG_PRINT((DEBUG_NAME "buffer size=%d\n", spec->size)); - - SDL_MintAudio_audiobuf[0] = Atari_SysMalloc(spec->size *2, MX_STRAM); - if (SDL_MintAudio_audiobuf[0]==NULL) { - SDL_SetError("MINT_OpenAudio: Not enough memory for audio buffer"); - return (-1); - } - SDL_MintAudio_audiobuf[1] = SDL_MintAudio_audiobuf[0] + spec->size ; - SDL_MintAudio_numbuf=0; - SDL_memset(SDL_MintAudio_audiobuf[0], spec->silence, spec->size *2); - SDL_MintAudio_audiosize = spec->size; - SDL_MintAudio_mutex = 0; - - DEBUG_PRINT((DEBUG_NAME "buffer 0 at 0x%08x\n", SDL_MintAudio_audiobuf[0])); - DEBUG_PRINT((DEBUG_NAME "buffer 1 at 0x%08x\n", SDL_MintAudio_audiobuf[1])); - - SDL_MintAudio_CheckFpu(); - - /* Set replay tracks */ - if (cookie_snd & SND_16BIT) { - Settracks(0,0); - Setmontracks(0); - } - - Supexec(Mint_InitDma); - - /* Set interrupt */ - Jdisint(MFP_DMASOUND); - Xbtimer(XB_TIMERA, 8, 1, SDL_MintAudio_Dma8Interrupt); - Jenabint(MFP_DMASOUND); - - if (cookie_snd & SND_16BIT) { - if (Setinterrupt(SI_TIMERA, SI_PLAY)<0) { - DEBUG_PRINT((DEBUG_NAME "Setinterrupt() failed\n")); - } - } - - Supexec(Mint_StartReplay); - - return(1); /* We don't use threaded audio */ -} - -/* Functions called in supervisor mode */ - -static void Mint_InitDma(void) -{ - unsigned long buffer; - unsigned char mode; - SDL_AudioDevice *this = SDL_MintAudio_device; - - Mint_StopReplay(); - - /* Set buffer */ - buffer = (unsigned long) SDL_MintAudio_audiobuf[SDL_MintAudio_numbuf]; - DMAAUDIO_IO.start_high = (buffer>>16) & 255; - DMAAUDIO_IO.start_mid = (buffer>>8) & 255; - DMAAUDIO_IO.start_low = buffer & 255; - - buffer += SDL_MintAudio_audiosize; - DMAAUDIO_IO.end_high = (buffer>>16) & 255; - DMAAUDIO_IO.end_mid = (buffer>>8) & 255; - DMAAUDIO_IO.end_low = buffer & 255; - - mode = 3-MINTAUDIO_frequencies[MINTAUDIO_numfreq].predivisor; - if (this->spec.channels==1) { - mode |= 1<<7; - } - DMAAUDIO_IO.sound_ctrl = mode; -} - -static void Mint_StopReplay(void) -{ - /* Stop replay */ - DMAAUDIO_IO.control=0; -} - -static void Mint_StartReplay(void) -{ - /* Start replay */ - DMAAUDIO_IO.control=3; -} diff --git a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_dma8.h b/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_dma8.h deleted file mode 100644 index a52e5db7a5..0000000000 --- a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_dma8.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* - DMA 8bits and Falcon Codec audio definitions - - Patrice Mandin, Didier Méquignon -*/ - -#ifndef _SDL_mintaudio_dma8_h -#define _SDL_mintaudio_dma8_h - -#define DMAAUDIO_IO_BASE (0xffff8900) -struct DMAAUDIO_IO_S { - unsigned char int_ctrl; - unsigned char control; - - unsigned char dummy1; - unsigned char start_high; - unsigned char dummy2; - unsigned char start_mid; - unsigned char dummy3; - unsigned char start_low; - - unsigned char dummy4; - unsigned char cur_high; - unsigned char dummy5; - unsigned char cur_mid; - unsigned char dummy6; - unsigned char cur_low; - - unsigned char dummy7; - unsigned char end_high; - unsigned char dummy8; - unsigned char end_mid; - unsigned char dummy9; - unsigned char end_low; - - unsigned char dummy10[12]; - - unsigned char track_ctrl; /* CODEC only */ - unsigned char sound_ctrl; - unsigned short sound_data; - unsigned short sound_mask; - - unsigned char dummy11[10]; - - unsigned short dev_ctrl; - unsigned short dest_ctrl; - unsigned short sync_div; - unsigned char track_rec; - unsigned char adderin_input; - unsigned char channel_input; - unsigned char channel_amplification; - unsigned char channel_reduction; - - unsigned char dummy12[6]; - - unsigned char data_direction; - unsigned char dummy13; - unsigned char dev_data; -}; -#define DMAAUDIO_IO ((*(volatile struct DMAAUDIO_IO_S *)DMAAUDIO_IO_BASE)) - -#endif /* _SDL_mintaudio_dma8_h */ diff --git a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_gsxb.c b/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_gsxb.c deleted file mode 100644 index 8d7716a137..0000000000 --- a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_gsxb.c +++ /dev/null @@ -1,436 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* - MiNT audio driver - using XBIOS functions (GSXB compatible driver) - - Patrice Mandin -*/ - -/* Mint includes */ -#include -#include -#include - -#include "SDL_audio.h" -#include "../SDL_audio_c.h" -#include "../SDL_sysaudio.h" - -#include "../../video/ataricommon/SDL_atarimxalloc_c.h" - -#include "SDL_mintaudio.h" -#include "SDL_mintaudio_gsxb.h" - -/*--- Defines ---*/ - -#define MINT_AUDIO_DRIVER_NAME "mint_gsxb" - -/* Debug print info */ -#define DEBUG_NAME "audio:gsxb: " -#if 0 -#define DEBUG_PRINT(what) \ - { \ - printf what; \ - } -#else -#define DEBUG_PRINT(what) -#endif - -/*--- Static variables ---*/ - -static long cookie_snd, cookie_gsxb; - -/*--- Audio driver functions ---*/ - -static void Mint_CloseAudio(_THIS); -static int Mint_OpenAudio(_THIS, SDL_AudioSpec *spec); -static void Mint_LockAudio(_THIS); -static void Mint_UnlockAudio(_THIS); - -/* To check/init hardware audio */ -static int Mint_CheckAudio(_THIS, SDL_AudioSpec *spec); -static void Mint_InitAudio(_THIS, SDL_AudioSpec *spec); - -/* GSXB callbacks */ -static void Mint_GsxbInterrupt(void); -static void Mint_GsxbNullInterrupt(void); - -/*--- Audio driver bootstrap functions ---*/ - -static int Audio_Available(void) -{ - const char *envr = SDL_getenv("SDL_AUDIODRIVER"); - - /* Check if user asked a different audio driver */ - if ((envr) && (SDL_strcmp(envr, MINT_AUDIO_DRIVER_NAME)!=0)) { - DEBUG_PRINT((DEBUG_NAME "user asked a different audio driver\n")); - return(0); - } - - /* Cookie _SND present ? if not, assume ST machine */ - if (Getcookie(C__SND, &cookie_snd) == C_NOTFOUND) { - cookie_snd = SND_PSG; - } - - /* Check if we have 16 bits audio */ - if ((cookie_snd & SND_16BIT)==0) { - DEBUG_PRINT((DEBUG_NAME "no 16 bits sound\n")); - return(0); - } - - /* Cookie GSXB present ? */ - cookie_gsxb = (Getcookie(C_GSXB, &cookie_gsxb) == C_FOUND); - - /* Is it GSXB ? */ - if (((cookie_snd & SND_GSXB)==0) || (cookie_gsxb==0)) { - DEBUG_PRINT((DEBUG_NAME "no GSXB audio\n")); - return(0); - } - - /* Check if audio is lockable */ - if (Locksnd()!=1) { - DEBUG_PRINT((DEBUG_NAME "audio locked by other application\n")); - return(0); - } - - Unlocksnd(); - - DEBUG_PRINT((DEBUG_NAME "GSXB audio available!\n")); - return(1); -} - -static void Audio_DeleteDevice(SDL_AudioDevice *device) -{ - SDL_free(device->hidden); - SDL_free(device); -} - -static SDL_AudioDevice *Audio_CreateDevice(int devindex) -{ - SDL_AudioDevice *this; - - /* Initialize all variables that we clean on shutdown */ - this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice)); - if ( this ) { - SDL_memset(this, 0, (sizeof *this)); - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - } - if ( (this == NULL) || (this->hidden == NULL) ) { - SDL_OutOfMemory(); - if ( this ) { - SDL_free(this); - } - return(0); - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - /* Set the function pointers */ - this->OpenAudio = Mint_OpenAudio; - this->CloseAudio = Mint_CloseAudio; - this->LockAudio = Mint_LockAudio; - this->UnlockAudio = Mint_UnlockAudio; - this->free = Audio_DeleteDevice; - - return this; -} - -AudioBootStrap MINTAUDIO_GSXB_bootstrap = { - MINT_AUDIO_DRIVER_NAME, "MiNT GSXB audio driver", - Audio_Available, Audio_CreateDevice -}; - -static void Mint_LockAudio(_THIS) -{ - /* Stop replay */ - Buffoper(0); -} - -static void Mint_UnlockAudio(_THIS) -{ - /* Restart replay */ - Buffoper(SB_PLA_ENA|SB_PLA_RPT); -} - -static void Mint_CloseAudio(_THIS) -{ - /* Stop replay */ - Buffoper(0); - - /* Uninstall interrupt */ - if (NSetinterrupt(2, SI_NONE, Mint_GsxbNullInterrupt)<0) { - DEBUG_PRINT((DEBUG_NAME "NSetinterrupt() failed in close\n")); - } - - /* Wait if currently playing sound */ - while (SDL_MintAudio_mutex != 0) { - } - - /* Clear buffers */ - if (SDL_MintAudio_audiobuf[0]) { - Mfree(SDL_MintAudio_audiobuf[0]); - SDL_MintAudio_audiobuf[0] = SDL_MintAudio_audiobuf[1] = NULL; - } - - /* Unlock sound system */ - Unlocksnd(); -} - -static int Mint_CheckAudio(_THIS, SDL_AudioSpec *spec) -{ - long snd_format = 0; - int i, resolution, format_signed, format_bigendian; - Uint16 test_format = SDL_FirstAudioFormat(spec->format); - int valid_datatype = 0; - - resolution = spec->format & 0x00ff; - format_signed = ((spec->format & 0x8000)!=0); - format_bigendian = ((spec->format & 0x1000)!=0); - - DEBUG_PRINT((DEBUG_NAME "asked: %d bits, ",spec->format & 0x00ff)); - DEBUG_PRINT(("signed=%d, ", ((spec->format & 0x8000)!=0))); - DEBUG_PRINT(("big endian=%d, ", ((spec->format & 0x1000)!=0))); - DEBUG_PRINT(("channels=%d, ", spec->channels)); - DEBUG_PRINT(("freq=%d\n", spec->freq)); - - if (spec->channels > 2) { - spec->channels = 2; /* no more than stereo! */ - } - - while ((!valid_datatype) && (test_format)) { - /* Check formats available */ - snd_format = Sndstatus(SND_QUERYFORMATS); - spec->format = test_format; - resolution = spec->format & 0xff; - format_signed = (spec->format & (1<<15)); - format_bigendian = (spec->format & (1<<12)); - switch (test_format) { - case AUDIO_U8: - case AUDIO_S8: - if (snd_format & SND_FORMAT8) { - valid_datatype = 1; - snd_format = Sndstatus(SND_QUERY8BIT); - } - break; - - case AUDIO_U16LSB: - case AUDIO_S16LSB: - case AUDIO_U16MSB: - case AUDIO_S16MSB: - if (snd_format & SND_FORMAT16) { - valid_datatype = 1; - snd_format = Sndstatus(SND_QUERY16BIT); - } - break; - - default: - test_format = SDL_NextAudioFormat(); - break; - } - } - - if (!valid_datatype) { - SDL_SetError("Unsupported audio format"); - return (-1); - } - - /* Check signed/unsigned format */ - if (format_signed) { - if (snd_format & SND_FORMATSIGNED) { - /* Ok */ - } else if (snd_format & SND_FORMATUNSIGNED) { - /* Give unsigned format */ - spec->format = spec->format & (~0x8000); - } - } else { - if (snd_format & SND_FORMATUNSIGNED) { - /* Ok */ - } else if (snd_format & SND_FORMATSIGNED) { - /* Give signed format */ - spec->format |= 0x8000; - } - } - - if (format_bigendian) { - if (snd_format & SND_FORMATBIGENDIAN) { - /* Ok */ - } else if (snd_format & SND_FORMATLITTLEENDIAN) { - /* Give little endian format */ - spec->format = spec->format & (~0x1000); - } - } else { - if (snd_format & SND_FORMATLITTLEENDIAN) { - /* Ok */ - } else if (snd_format & SND_FORMATBIGENDIAN) { - /* Give big endian format */ - spec->format |= 0x1000; - } - } - - /* Calculate and select the closest frequency */ - MINTAUDIO_freqcount=0; - for (i=1;i<4;i++) { - SDL_MintAudio_AddFrequency(this, - MASTERCLOCK_44K/(MASTERPREDIV_MILAN*(1<freq); - spec->freq=MINTAUDIO_frequencies[MINTAUDIO_numfreq].frequency; - - DEBUG_PRINT((DEBUG_NAME "obtained: %d bits, ",spec->format & 0x00ff)); - DEBUG_PRINT(("signed=%d, ", ((spec->format & 0x8000)!=0))); - DEBUG_PRINT(("big endian=%d, ", ((spec->format & 0x1000)!=0))); - DEBUG_PRINT(("channels=%d, ", spec->channels)); - DEBUG_PRINT(("freq=%d\n", spec->freq)); - - return 0; -} - -static void Mint_InitAudio(_THIS, SDL_AudioSpec *spec) -{ - int channels_mode, prediv; - void *buffer; - - /* Stop currently playing sound */ - Buffoper(0); - - /* Set replay tracks */ - Settracks(0,0); - Setmontracks(0); - - /* Select replay format */ - switch (spec->format & 0xff) { - case 8: - if (spec->channels==2) { - channels_mode=STEREO8; - } else { - channels_mode=MONO8; - } - break; - case 16: - if (spec->channels==2) { - channels_mode=STEREO16; - } else { - channels_mode=MONO16; - } - break; - default: - channels_mode=STEREO16; - break; - } - if (Setmode(channels_mode)<0) { - DEBUG_PRINT((DEBUG_NAME "Setmode() failed\n")); - } - - prediv = MINTAUDIO_frequencies[MINTAUDIO_numfreq].predivisor; - Devconnect(DMAPLAY, DAC, CLKEXT, prediv, 1); - - /* Set buffer */ - buffer = SDL_MintAudio_audiobuf[SDL_MintAudio_numbuf]; - if (Setbuffer(0, buffer, buffer + spec->size)<0) { - DEBUG_PRINT((DEBUG_NAME "Setbuffer() failed\n")); - } - - /* Install interrupt */ - if (NSetinterrupt(2, SI_PLAY, Mint_GsxbInterrupt)<0) { - DEBUG_PRINT((DEBUG_NAME "NSetinterrupt() failed\n")); - } - - /* Go */ - Buffoper(SB_PLA_ENA|SB_PLA_RPT); - DEBUG_PRINT((DEBUG_NAME "hardware initialized\n")); -} - -static int Mint_OpenAudio(_THIS, SDL_AudioSpec *spec) -{ - /* Lock sound system */ - if (Locksnd()!=1) { - SDL_SetError("Mint_OpenAudio: Audio system already in use"); - return(-1); - } - - SDL_MintAudio_device = this; - - /* Check audio capabilities */ - if (Mint_CheckAudio(this, spec)==-1) { - return -1; - } - - SDL_CalculateAudioSpec(spec); - - /* Allocate memory for audio buffers in DMA-able RAM */ - DEBUG_PRINT((DEBUG_NAME "buffer size=%d\n", spec->size)); - - SDL_MintAudio_audiobuf[0] = Atari_SysMalloc(spec->size *2, MX_STRAM); - if (SDL_MintAudio_audiobuf[0]==NULL) { - SDL_SetError("MINT_OpenAudio: Not enough memory for audio buffer"); - return (-1); - } - SDL_MintAudio_audiobuf[1] = SDL_MintAudio_audiobuf[0] + spec->size ; - SDL_MintAudio_numbuf=0; - SDL_memset(SDL_MintAudio_audiobuf[0], spec->silence, spec->size *2); - SDL_MintAudio_audiosize = spec->size; - SDL_MintAudio_mutex = 0; - - DEBUG_PRINT((DEBUG_NAME "buffer 0 at 0x%08x\n", SDL_MintAudio_audiobuf[0])); - DEBUG_PRINT((DEBUG_NAME "buffer 1 at 0x%08x\n", SDL_MintAudio_audiobuf[1])); - - SDL_MintAudio_CheckFpu(); - - /* Setup audio hardware */ - Mint_InitAudio(this, spec); - - return(1); /* We don't use threaded audio */ -} - -static void Mint_GsxbInterrupt(void) -{ - Uint8 *newbuf; - - if (SDL_MintAudio_mutex) - return; - - SDL_MintAudio_mutex=1; - - SDL_MintAudio_numbuf ^= 1; - SDL_MintAudio_Callback(); - newbuf = SDL_MintAudio_audiobuf[SDL_MintAudio_numbuf]; - Setbuffer(0, newbuf, newbuf + SDL_MintAudio_audiosize); - - SDL_MintAudio_mutex=0; -} - -static void Mint_GsxbNullInterrupt(void) -{ -} diff --git a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_gsxb.h b/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_gsxb.h deleted file mode 100644 index aee26b7ee3..0000000000 --- a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_gsxb.h +++ /dev/null @@ -1,104 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* - * GSXB audio definitions - * - * Patrice Mandin - */ - -#ifndef _SDL_mintaudio_gsxb_h -#define _SDL_mintaudio_gsxb_h - -#include /* for trap_14_xxx macros */ - -/* Bit 5 in cookie _SND */ - -#define SND_GSXB (1<<5) - -/* NSoundcmd modes */ - -#define SETRATE 7 /* Set sample rate */ -#define SET8BITFORMAT 8 /* 8 bits format */ -#define SET16BITFORMAT 9 /* 16 bits format */ -#define SET24BITFORMAT 10 /* 24 bits format */ -#define SET32BITFORMAT 11 /* 32 bits format */ -#define LTATTEN_MASTER 12 /* Attenuation */ -#define RTATTEN_MASTER 13 -#define LTATTEN_MICIN 14 -#define RTATTEN_MICIN 15 -#define LTATTEN_FMGEN 16 -#define RTATTEN_FMGEN 17 -#define LTATTEN_LINEIN 18 -#define RTATTEN_LINEIN 19 -#define LTATTEN_CDIN 20 -#define RTATTEN_CDIN 21 -#define LTATTEN_VIDIN 22 -#define RTATTEN_VIDIN 23 -#define LTATTEN_AUXIN 24 -#define RTATTEN_AUXIN 25 - -/* Setmode modes */ - -#define MONO16 3 -#define STEREO24 4 -#define STEREO32 5 -#define MONO24 6 -#define MONO32 7 - -/* Sndstatus modes */ - -#define SND_QUERYFORMATS 2 -#define SND_QUERYMIXERS 3 -#define SND_QUERYSOURCES 4 -#define SND_QUERYDUPLEX 5 -#define SND_QUERY8BIT 8 -#define SND_QUERY16BIT 9 -#define SND_QUERY24BIT 10 -#define SND_QUERY32BIT 11 - -#define SND_FORMAT8 (1<<0) -#define SND_FORMAT16 (1<<1) -#define SND_FORMAT24 (1<<2) -#define SND_FORMAT32 (1<<3) - -#define SND_FORMATSIGNED (1<<0) -#define SND_FORMATUNSIGNED (1<<1) -#define SND_FORMATBIGENDIAN (1<<2) -#define SND_FORMATLITTLEENDIAN (1<<3) - -/* Devconnect prescalers */ - -#define CLK_44K 1 -#define CLK_22K 3 -#define CLK_11K 7 - -/* Extra xbios functions */ - -#define NSoundcmd(mode,data,data2) \ - (long)trap_14_wwl((short)130,(short)(mode),(short)(data),(long)(data2)) -#define NSetinterrupt(src_inter,cause,inth_addr) \ - (long)trap_14_wwwl((short)135,(short)(src_inter),(short)(cause), \ - (long)(inth_addr)) - -#endif /* _SDL_mintaudio_gsxb_h */ diff --git a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_it.S b/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_it.S deleted file mode 100644 index a2ecac4c65..0000000000 --- a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_it.S +++ /dev/null @@ -1,386 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/* - Audio interrupts - - Patrice Mandin, Didier Méquignon - */ - - .text - - .globl _SDL_MintAudio_Callback - - .globl _SDL_MintAudio_XbiosInterrupt - .globl _SDL_MintAudio_XbiosInterruptMeasureClock - .globl _SDL_MintAudio_Dma8Interrupt - .globl _SDL_MintAudio_StfaInterrupt - - .globl _SDL_MintAudio_mutex - .globl _SDL_MintAudio_audiobuf - .globl _SDL_MintAudio_numbuf - .globl _SDL_MintAudio_audiosize - .globl _SDL_MintAudio_clocktics - .globl _SDL_MintAudio_hasfpu - - .globl _SDL_MintAudio_stfa - -/* - How it works: - - Audio is playing buffer #0 (resp. #1) - - We must calculate a sample in buffer #1 (resp. #0) - so we first call the callback to do it - - Then we swap the buffers -*/ - -#define savptr 0x4a2 -#define savamt 0x46 - -/*--- Save/restore FPU context ---*/ - -#if defined(__mcoldfire__) - -#define SAVE_FPU_CONTEXT \ - lea sp@(-216),sp; \ - fsave sp@; \ - fmovel fpiar,sp@-; \ - lea sp@(-64),sp; \ - fmovemd fp0-fp7,sp@ - -#define RESTORE_FPU_CONTEXT \ - fmovemd sp@,fp0-fp7; \ - lea sp@(64),sp; \ - fmovel sp@+,fpiar; \ - frestore sp@; \ - lea sp@(216),sp - -#else - -#define SAVE_FPU_CONTEXT \ - .chip 68k/68881; \ - fsave sp@-; \ - fmoveml fpcr/fpsr/fpiar,sp@-; \ - fmovemx fp0-fp7,sp@-; \ - .chip 68k - -#define RESTORE_FPU_CONTEXT \ - .chip 68k/68881; \ - fmovemx sp@+,fp0-fp7; \ - fmoveml sp@+,fpcr/fpsr/fpiar; \ - frestore sp@+; \ - .chip 68k - -#endif - -/*--- Xbios interrupt vector to measure Falcon external clock ---*/ - -_SDL_MintAudio_XbiosInterruptMeasureClock: /* 1 mS */ -#if defined(__mcoldfire__) - movel d0,sp@- - - moveql #0,d0 - btst d0,0xFFFF8901:w /* state DMA sound */ -#else - btst #0,0xFFFF8901:w /* state DMA sound */ -#endif - beqs SDL_MintAudio_EndIntMeasure - addql #1,_SDL_MintAudio_clocktics -SDL_MintAudio_EndIntMeasure: -#if defined(__mcoldfire__) - moveql #5,d0 - bclr d0,0xFFFFFA0F:w /* Clear service bit */ - - movel sp@+,d0 -#else - bclr #5,0xFFFFFA0F:w /* Clear service bit */ -#endif - rte - -/*--- Xbios interrupt vector ---*/ - -_SDL_MintAudio_XbiosInterrupt: -#if defined(__mcoldfire__) - lea sp@(-60),sp - moveml d0-d7/a0-a6,sp@ -#else - moveml d0-d7/a0-a6,sp@- -#endif - - /* Reenable interrupts, so other interrupts can work */ - movew #0x2300,sr - - /* Clear service bit, so other MFP interrupts can work */ -#if defined(__mcoldfire__) - moveql #5,d0 - bclr d0,0xfffffa0f:w -#else - bclr #5,0xfffffa0f:w -#endif - - /* Check if we are not already running */ - tstw _SDL_MintAudio_mutex - bne SDL_MintAudio_XbiosEnd - -#if defined(__mcoldfire__) - movew _SDL_MintAudio_mutex,d0 - notl d0 - movew d0,_SDL_MintAudio_mutex - - movew _SDL_MintAudio_numbuf,d1 - eorl #1,d1 - movew d1,_SDL_MintAudio_numbuf -#else - notw _SDL_MintAudio_mutex - - /* Swap buffers */ - eorw #1,_SDL_MintAudio_numbuf -#endif - - /* Save FPU if needed */ - tstw _SDL_MintAudio_hasfpu - beqs SDL_MintAudio_Xbios_nofpu1 - SAVE_FPU_CONTEXT -SDL_MintAudio_Xbios_nofpu1: - - /* Callback */ - jsr _SDL_MintAudio_Callback - - /* Restore FPU if needed */ - tstw _SDL_MintAudio_hasfpu - beqs SDL_MintAudio_Xbios_nofpu2 - RESTORE_FPU_CONTEXT -SDL_MintAudio_Xbios_nofpu2: - - /* Reserve space for registers */ -#if defined(__mcoldfire__) - movel #savamt,d0 - subl d0,savptr -#else - subl #savamt,savptr -#endif - - /* Set new buffer */ - - moveq #0,d0 - movel _SDL_MintAudio_audiosize,d1 - - movew _SDL_MintAudio_numbuf,d0 - lsll #2,d0 - lea _SDL_MintAudio_audiobuf,a0 - movel a0@(d0:l),a1 - - lea a1@(d1:l),a2 - - movel a2,sp@- - movel a1,sp@- - clrw sp@- - movew #131,sp@- - trap #14 - lea sp@(12),sp - - /* Restore registers space */ -#if defined(__mcoldfire__) - movel #savamt,d0 - addl d0,savptr -#else - addl #savamt,savptr -#endif - - clrw _SDL_MintAudio_mutex -SDL_MintAudio_XbiosEnd: -#if defined(__mcoldfire__) - moveml sp@,d0-d7/a0-a6 - lea sp@(60),sp -#else - moveml sp@+,d0-d7/a0-a6 -#endif - rte - -/*--- DMA 8 bits interrupt vector ---*/ - -_SDL_MintAudio_Dma8Interrupt: -#if defined(__mcoldfire__) - lea sp@(-16),sp - moveml d0-d1/a0-a1,sp@ -#else - moveml d0-d1/a0-a1,sp@- -#endif - - /* Reenable interrupts, so other interrupts can work */ - movew #0x2300,sr - - /* Clear service bit, so other MFP interrupts can work */ -#if defined(__mcoldfire__) - moveql #5,d0 - bclr d0,0xfffffa0f:w -#else - bclr #5,0xfffffa0f:w -#endif - /* Check if we are not already running */ - tstw _SDL_MintAudio_mutex - bne SDL_MintAudio_Dma8End - -#if defined(__mcoldfire__) - movew _SDL_MintAudio_mutex,d0 - notl d0 - movew d0,_SDL_MintAudio_mutex - - movew _SDL_MintAudio_numbuf,d1 - eorl #1,d1 - movew d1,_SDL_MintAudio_numbuf -#else - notw _SDL_MintAudio_mutex - - /* Swap buffers */ - eorw #1,_SDL_MintAudio_numbuf -#endif - - /* Save FPU if needed */ - tstw _SDL_MintAudio_hasfpu - beqs SDL_MintAudio_Dma8_nofpu1 - SAVE_FPU_CONTEXT -SDL_MintAudio_Dma8_nofpu1: - - /* Callback */ - jsr _SDL_MintAudio_Callback - - /* Restore FPU if needed */ - tstw _SDL_MintAudio_hasfpu - beqs SDL_MintAudio_Dma8_nofpu2 - RESTORE_FPU_CONTEXT -SDL_MintAudio_Dma8_nofpu2: - - /* Set new buffer */ - - moveq #0,d0 - - movew _SDL_MintAudio_numbuf,d0 - lsll #2,d0 - lea _SDL_MintAudio_audiobuf,a0 - movel a0@(d0:l),d1 - - /* Modify DMA addresses */ - lea 0xffff8900:w,a0 - - movel d1,d0 - - moveb d0,a0@(0x07) /* Start address */ - lsrl #8,d0 - moveb d0,a0@(0x05) - lsrl #8,d0 - moveb d0,a0@(0x03) - - addl _SDL_MintAudio_audiosize,d1 - - movel d1,d0 - - moveb d0,a0@(0x13) /* End address */ - lsrl #8,d0 - moveb d0,a0@(0x11) - lsrl #8,d0 - moveb d0,a0@(0x0f) - - clrw _SDL_MintAudio_mutex -SDL_MintAudio_Dma8End: -#if defined(__mcoldfire__) - moveml sp@,d0-d1/a0-a1 - lea sp@(16),sp -#else - moveml sp@+,d0-d1/a0-a1 -#endif - rte - -/*--- STFA interrupt vector ---*/ - -STFA_SOUND_START = 6 -STFA_SOUND_END = STFA_SOUND_START+8 - -_SDL_MintAudio_StfaInterrupt: - /* Reenable interrupts, so other interrupts can work */ - movew #0x2300,sr - - /* Check if we are not already running */ - tstw _SDL_MintAudio_mutex - -#if defined(__mcoldfire__) - bne SDL_MintAudio_StfaEnd - - lea sp@(-60),sp - moveml d0-d7/a0-a6,sp@ - - movew _SDL_MintAudio_mutex,d0 - notl d0 - movew d0,_SDL_MintAudio_mutex - - movew _SDL_MintAudio_numbuf,d1 - eorl #1,d1 - movew d1,_SDL_MintAudio_numbuf -#else - bnes SDL_MintAudio_StfaEnd - - moveml d0-d7/a0-a6,sp@- - - notw _SDL_MintAudio_mutex - - /* Swap buffers */ - eorw #1,_SDL_MintAudio_numbuf -#endif - - /* Save FPU if needed */ - tstw _SDL_MintAudio_hasfpu - beqs SDL_MintAudio_Stfa_nofpu1 - SAVE_FPU_CONTEXT -SDL_MintAudio_Stfa_nofpu1: - - /* Callback */ - jsr _SDL_MintAudio_Callback - - /* Restore FPU if needed */ - tstw _SDL_MintAudio_hasfpu - beqs SDL_MintAudio_Stfa_nofpu2 - RESTORE_FPU_CONTEXT -SDL_MintAudio_Stfa_nofpu2: - - /* Set new buffer */ - - moveq #0,d0 - movel _SDL_MintAudio_stfa,a1 - - movew _SDL_MintAudio_numbuf,d0 - lsll #2,d0 - lea _SDL_MintAudio_audiobuf,a0 - movel a0@(d0:l),d1 - - /* Modify STFA replay buffers */ - movel d1,a1@(STFA_SOUND_START) - addl _SDL_MintAudio_audiosize,d1 - movel d1,a1@(STFA_SOUND_END) - -#if defined(__mcoldfire__) - moveml sp@,d0-d7/a0-a6 - lea sp@(60),sp -#else - moveml sp@+,d0-d7/a0-a6 -#endif - clrw _SDL_MintAudio_mutex -SDL_MintAudio_StfaEnd: - rte diff --git a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_mcsn.c b/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_mcsn.c deleted file mode 100644 index 387609b168..0000000000 --- a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_mcsn.c +++ /dev/null @@ -1,405 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* - MiNT audio driver - using XBIOS functions (MacSound compatible driver) - - Patrice Mandin -*/ - -#include - -/* Mint includes */ -#include -#include -#include - -#include "SDL_audio.h" -#include "../SDL_audio_c.h" -#include "../SDL_sysaudio.h" - -#include "../../video/ataricommon/SDL_atarimxalloc_c.h" - -#include "SDL_mintaudio.h" -#include "SDL_mintaudio_mcsn.h" - -/*--- Defines ---*/ - -#define MINT_AUDIO_DRIVER_NAME "mint_mcsn" - -/* Debug print info */ -#define DEBUG_NAME "audio:mcsn: " -#if 0 -#define DEBUG_PRINT(what) \ - { \ - printf what; \ - } -#else -#define DEBUG_PRINT(what) -#endif - -/*--- Static variables ---*/ - -static long cookie_snd, cookie_mch; -static cookie_mcsn_t *cookie_mcsn; - -/*--- Audio driver functions ---*/ - -static void Mint_CloseAudio(_THIS); -static int Mint_OpenAudio(_THIS, SDL_AudioSpec *spec); -static void Mint_LockAudio(_THIS); -static void Mint_UnlockAudio(_THIS); - -/* To check/init hardware audio */ -static int Mint_CheckAudio(_THIS, SDL_AudioSpec *spec); -static void Mint_InitAudio(_THIS, SDL_AudioSpec *spec); - -/*--- Audio driver bootstrap functions ---*/ - -static int Audio_Available(void) -{ - long dummy; - const char *envr = SDL_getenv("SDL_AUDIODRIVER"); - - SDL_MintAudio_mint_present = (Getcookie(C_MiNT, &dummy) == C_FOUND); - - /* We can't use XBIOS in interrupt with Magic, don't know about thread */ - if (Getcookie(C_MagX, &dummy) == C_FOUND) { - return(0); - } - - /* Check if user asked a different audio driver */ - if ((envr) && (SDL_strcmp(envr, MINT_AUDIO_DRIVER_NAME)!=0)) { - DEBUG_PRINT((DEBUG_NAME "user asked a different audio driver\n")); - return(0); - } - - /* Cookie _MCH present ? if not, assume ST machine */ - if (Getcookie(C__MCH, &cookie_mch) == C_NOTFOUND) { - cookie_mch = MCH_ST; - } - - /* Cookie _SND present ? if not, assume ST machine */ - if (Getcookie(C__SND, &cookie_snd) == C_NOTFOUND) { - cookie_snd = SND_PSG; - } - - /* Check if we have 16 bits audio */ - if ((cookie_snd & SND_16BIT)==0) { - DEBUG_PRINT((DEBUG_NAME "no 16 bits sound\n")); - return(0); - } - - /* Cookie MCSN present ? */ - if (Getcookie(C_McSn, &dummy) != C_FOUND) { - DEBUG_PRINT((DEBUG_NAME "no MCSN audio\n")); - return(0); - } - cookie_mcsn = (cookie_mcsn_t *) dummy; - - /* Check if interrupt at end of replay */ - if (cookie_mcsn->pint == 0) { - DEBUG_PRINT((DEBUG_NAME "no interrupt at end of replay\n")); - return(0); - } - - /* Check if audio is lockable */ - if (Locksnd()!=1) { - DEBUG_PRINT((DEBUG_NAME "audio locked by other application\n")); - return(0); - } - - Unlocksnd(); - - DEBUG_PRINT((DEBUG_NAME "MCSN audio available!\n")); - return(1); -} - -static void Audio_DeleteDevice(SDL_AudioDevice *device) -{ - SDL_free(device->hidden); - SDL_free(device); -} - -static SDL_AudioDevice *Audio_CreateDevice(int devindex) -{ - SDL_AudioDevice *this; - - /* Initialize all variables that we clean on shutdown */ - this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice)); - if ( this ) { - SDL_memset(this, 0, (sizeof *this)); - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - } - if ( (this == NULL) || (this->hidden == NULL) ) { - SDL_OutOfMemory(); - if ( this ) { - SDL_free(this); - } - return(0); - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - /* Set the function pointers */ - this->OpenAudio = Mint_OpenAudio; - this->CloseAudio = Mint_CloseAudio; - this->LockAudio = Mint_LockAudio; - this->UnlockAudio = Mint_UnlockAudio; - this->free = Audio_DeleteDevice; - - return this; -} - -AudioBootStrap MINTAUDIO_MCSN_bootstrap = { - MINT_AUDIO_DRIVER_NAME, "MiNT MCSN audio driver", - Audio_Available, Audio_CreateDevice -}; - -static void Mint_LockAudio(_THIS) -{ - /* Stop replay */ - Buffoper(0); -} - -static void Mint_UnlockAudio(_THIS) -{ - /* Restart replay */ - Buffoper(SB_PLA_ENA|SB_PLA_RPT); -} - -static void Mint_CloseAudio(_THIS) -{ - /* Stop replay */ - SDL_MintAudio_WaitThread(); - Buffoper(0); - - if (!SDL_MintAudio_mint_present) { - /* Uninstall interrupt */ - Jdisint(MFP_DMASOUND); - } - - /* Wait if currently playing sound */ - while (SDL_MintAudio_mutex != 0) { - } - - /* Clear buffers */ - if (SDL_MintAudio_audiobuf[0]) { - Mfree(SDL_MintAudio_audiobuf[0]); - SDL_MintAudio_audiobuf[0] = SDL_MintAudio_audiobuf[1] = NULL; - } - - /* Unlock sound system */ - Unlocksnd(); -} - -static int Mint_CheckAudio(_THIS, SDL_AudioSpec *spec) -{ - int i; - unsigned long masterclock, masterprediv; - - DEBUG_PRINT((DEBUG_NAME "asked: %d bits, ",spec->format & 0x00ff)); - DEBUG_PRINT(("signed=%d, ", ((spec->format & 0x8000)!=0))); - DEBUG_PRINT(("big endian=%d, ", ((spec->format & 0x1000)!=0))); - DEBUG_PRINT(("channels=%d, ", spec->channels)); - DEBUG_PRINT(("freq=%d\n", spec->freq)); - - if (spec->channels > 2) { - spec->channels = 2; /* no more than stereo! */ - } - - /* Check formats available */ - MINTAUDIO_freqcount=0; - switch(cookie_mcsn->play) { - case MCSN_ST: - spec->channels=1; - spec->format=8; /* FIXME: is it signed or unsigned ? */ - SDL_MintAudio_AddFrequency(this, 12500, 0, 0, -1); - break; - case MCSN_TT: /* Also STE, Mega STE */ - spec->format=AUDIO_S8; - masterclock=MASTERCLOCK_STE; - masterprediv=MASTERPREDIV_STE; - if ((cookie_mch>>16)==MCH_TT) { - masterclock=MASTERCLOCK_TT; - masterprediv=MASTERPREDIV_TT; - } - for (i=0; i<4; i++) { - SDL_MintAudio_AddFrequency(this, masterclock/(masterprediv*(1<res1 != 0) { - for (i=1; i<4; i++) { - SDL_MintAudio_AddFrequency(this, (cookie_mcsn->res1)/(MASTERPREDIV_FALCON*(1<format |= 0x8000; /* Audio is always signed */ - if ((spec->format & 0x00ff)==16) { - spec->format |= 0x1000; /* Audio is always big endian */ - spec->channels=2; /* 16 bits always stereo */ - } - break; - } - -#if 0 - for (i=0; ifreq); - spec->freq=MINTAUDIO_frequencies[MINTAUDIO_numfreq].frequency; - - DEBUG_PRINT((DEBUG_NAME "obtained: %d bits, ",spec->format & 0x00ff)); - DEBUG_PRINT(("signed=%d, ", ((spec->format & 0x8000)!=0))); - DEBUG_PRINT(("big endian=%d, ", ((spec->format & 0x1000)!=0))); - DEBUG_PRINT(("channels=%d, ", spec->channels)); - DEBUG_PRINT(("freq=%d\n", spec->freq)); - - return 0; -} - -static void Mint_InitAudio(_THIS, SDL_AudioSpec *spec) -{ - int channels_mode, prediv, dmaclock; - void *buffer; - - /* Stop currently playing sound */ - SDL_MintAudio_quit_thread = SDL_FALSE; - SDL_MintAudio_thread_finished = SDL_TRUE; - SDL_MintAudio_WaitThread(); - Buffoper(0); - - /* Set replay tracks */ - Settracks(0,0); - Setmontracks(0); - - /* Select replay format */ - channels_mode=STEREO16; - switch (spec->format & 0xff) { - case 8: - if (spec->channels==2) { - channels_mode=STEREO8; - } else { - channels_mode=MONO8; - } - break; - } - if (Setmode(channels_mode)<0) { - DEBUG_PRINT((DEBUG_NAME "Setmode() failed\n")); - } - - dmaclock = MINTAUDIO_frequencies[MINTAUDIO_numfreq].masterclock; - prediv = MINTAUDIO_frequencies[MINTAUDIO_numfreq].predivisor; - switch(cookie_mcsn->play) { - case MCSN_TT: - Devconnect(DMAPLAY, DAC, CLK25M, CLKOLD, 1); - Soundcmd(SETPRESCALE, prediv); - DEBUG_PRINT((DEBUG_NAME "STE/TT prescaler selected\n")); - break; - case MCSN_FALCON: - Devconnect(DMAPLAY, DAC, dmaclock, prediv, 1); - DEBUG_PRINT((DEBUG_NAME "Falcon prescaler selected\n")); - break; - } - - /* Set buffer */ - buffer = SDL_MintAudio_audiobuf[SDL_MintAudio_numbuf]; - if (Setbuffer(0, buffer, buffer + spec->size)<0) { - DEBUG_PRINT((DEBUG_NAME "Setbuffer() failed\n")); - } - - if (SDL_MintAudio_mint_present) { - SDL_MintAudio_thread_pid = tfork(SDL_MintAudio_Thread, 0); - } else { - /* Install interrupt */ - Jdisint(MFP_DMASOUND); - Xbtimer(XB_TIMERA, 8, 1, SDL_MintAudio_XbiosInterrupt); - Jenabint(MFP_DMASOUND); - - if (Setinterrupt(SI_TIMERA, SI_PLAY)<0) { - DEBUG_PRINT((DEBUG_NAME "Setinterrupt() failed\n")); - } - } - - /* Go */ - Buffoper(SB_PLA_ENA|SB_PLA_RPT); - DEBUG_PRINT((DEBUG_NAME "hardware initialized\n")); -} - -static int Mint_OpenAudio(_THIS, SDL_AudioSpec *spec) -{ - /* Lock sound system */ - if (Locksnd()!=1) { - SDL_SetError("Mint_OpenAudio: Audio system already in use"); - return(-1); - } - - SDL_MintAudio_device = this; - - /* Check audio capabilities */ - if (Mint_CheckAudio(this, spec)==-1) { - return -1; - } - - SDL_CalculateAudioSpec(spec); - - /* Allocate memory for audio buffers in DMA-able RAM */ - DEBUG_PRINT((DEBUG_NAME "buffer size=%d\n", spec->size)); - - SDL_MintAudio_audiobuf[0] = Atari_SysMalloc(spec->size *2, MX_STRAM); - if (SDL_MintAudio_audiobuf[0]==NULL) { - SDL_SetError("MINT_OpenAudio: Not enough memory for audio buffer"); - return (-1); - } - SDL_MintAudio_audiobuf[1] = SDL_MintAudio_audiobuf[0] + spec->size ; - SDL_MintAudio_numbuf=0; - SDL_memset(SDL_MintAudio_audiobuf[0], spec->silence, spec->size *2); - SDL_MintAudio_audiosize = spec->size; - SDL_MintAudio_mutex = 0; - - DEBUG_PRINT((DEBUG_NAME "buffer 0 at 0x%08x\n", SDL_MintAudio_audiobuf[0])); - DEBUG_PRINT((DEBUG_NAME "buffer 1 at 0x%08x\n", SDL_MintAudio_audiobuf[1])); - - SDL_MintAudio_CheckFpu(); - - /* Setup audio hardware */ - Mint_InitAudio(this, spec); - - return(1); /* We don't use SDL threaded audio */ -} diff --git a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_mcsn.h b/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_mcsn.h deleted file mode 100644 index b772fdab03..0000000000 --- a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_mcsn.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* - MCSN control structure - - Patrice Mandin -*/ - -#ifndef _SDL_mintaudio_mcsh_h -#define _SDL_mintaudio_mcsh_h - -typedef struct { - unsigned short version; /* Version */ - unsigned short size; /* Size of structure */ - - unsigned short play; /* Replay capability */ - unsigned short record; /* Record capability */ - unsigned short dsp; /* DSP56K present */ - unsigned short pint; /* Interrupt at end of replay */ - unsigned short rint; /* Interrupt at end of record */ - - unsigned long res1; /* Frequency of external clock */ - unsigned long res2; - unsigned long res3; - unsigned long res4; -} cookie_mcsn_t; - -enum { - MCSN_ST=0, - MCSN_TT, - MCSN_STE=MCSN_TT, - MCSN_FALCON, - MCSN_MAC=MCSN_FALCON -}; - -#define SETSMPFREQ 7 /* Set sample frequency */ - -#endif /* _SDL_mintaudio_mcsh_h */ diff --git a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_stfa.c b/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_stfa.c deleted file mode 100644 index 4a581e0351..0000000000 --- a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_stfa.c +++ /dev/null @@ -1,326 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* - MiNT audio driver - using XBIOS functions (STFA driver) - - Patrice Mandin -*/ - -/* Mint includes */ -#include -#include -#include - -#include "SDL_audio.h" -#include "../SDL_audio_c.h" -#include "../SDL_sysaudio.h" - -#include "../../video/ataricommon/SDL_atarimxalloc_c.h" -#include "../../video/ataricommon/SDL_atarisuper.h" - -#include "SDL_mintaudio.h" -#include "SDL_mintaudio_stfa.h" - -/*--- Defines ---*/ - -#define MINT_AUDIO_DRIVER_NAME "mint_stfa" - -/* Debug print info */ -#define DEBUG_NAME "audio:stfa: " -#if 0 -#define DEBUG_PRINT(what) \ - { \ - printf what; \ - } -#else -#define DEBUG_PRINT(what) -#endif - -/*--- Static variables ---*/ - -static long cookie_snd, cookie_mch; -static cookie_stfa_t *cookie_stfa; - -static const int freqs[16]={ - 4995, 6269, 7493, 8192, - 9830, 10971, 12538, 14985, - 16384, 19819, 21943, 24576, - 30720, 32336, 43885, 49152 -}; - -/*--- Audio driver functions ---*/ - -static void Mint_CloseAudio(_THIS); -static int Mint_OpenAudio(_THIS, SDL_AudioSpec *spec); -static void Mint_LockAudio(_THIS); -static void Mint_UnlockAudio(_THIS); - -/* To check/init hardware audio */ -static int Mint_CheckAudio(_THIS, SDL_AudioSpec *spec); -static void Mint_InitAudio(_THIS, SDL_AudioSpec *spec); - -/*--- Audio driver bootstrap functions ---*/ - -static int Audio_Available(void) -{ - long dummy; - const char *envr = SDL_getenv("SDL_AUDIODRIVER"); - - /* Check if user asked a different audio driver */ - if ((envr) && (SDL_strcmp(envr, MINT_AUDIO_DRIVER_NAME)!=0)) { - DEBUG_PRINT((DEBUG_NAME "user asked a different audio driver\n")); - return(0); - } - - /* Cookie _MCH present ? if not, assume ST machine */ - if (Getcookie(C__MCH, &cookie_mch) == C_NOTFOUND) { - cookie_mch = MCH_ST; - } - - /* Cookie _SND present ? if not, assume ST machine */ - if (Getcookie(C__SND, &cookie_snd) == C_NOTFOUND) { - cookie_snd = SND_PSG; - } - - /* Cookie STFA present ? */ - if (Getcookie(C_STFA, &dummy) != C_FOUND) { - DEBUG_PRINT((DEBUG_NAME "no STFA audio\n")); - return(0); - } - cookie_stfa = (cookie_stfa_t *) dummy; - - SDL_MintAudio_stfa = cookie_stfa; - - DEBUG_PRINT((DEBUG_NAME "STFA audio available!\n")); - return(1); -} - -static void Audio_DeleteDevice(SDL_AudioDevice *device) -{ - SDL_free(device->hidden); - SDL_free(device); -} - -static SDL_AudioDevice *Audio_CreateDevice(int devindex) -{ - SDL_AudioDevice *this; - - /* Initialize all variables that we clean on shutdown */ - this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice)); - if ( this ) { - SDL_memset(this, 0, (sizeof *this)); - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - } - if ( (this == NULL) || (this->hidden == NULL) ) { - SDL_OutOfMemory(); - if ( this ) { - SDL_free(this); - } - return(0); - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - /* Set the function pointers */ - this->OpenAudio = Mint_OpenAudio; - this->CloseAudio = Mint_CloseAudio; - this->LockAudio = Mint_LockAudio; - this->UnlockAudio = Mint_UnlockAudio; - this->free = Audio_DeleteDevice; - - return this; -} - -AudioBootStrap MINTAUDIO_STFA_bootstrap = { - MINT_AUDIO_DRIVER_NAME, "MiNT STFA audio driver", - Audio_Available, Audio_CreateDevice -}; - -static void Mint_LockAudio(_THIS) -{ - void *oldpile; - - /* Stop replay */ - oldpile=(void *)Super(0); - cookie_stfa->sound_enable=STFA_PLAY_DISABLE; - SuperToUser(oldpile); -} - -static void Mint_UnlockAudio(_THIS) -{ - void *oldpile; - - /* Restart replay */ - oldpile=(void *)Super(0); - cookie_stfa->sound_enable=STFA_PLAY_ENABLE|STFA_PLAY_REPEAT; - SuperToUser(oldpile); -} - -static void Mint_CloseAudio(_THIS) -{ - void *oldpile; - - /* Stop replay */ - oldpile=(void *)Super(0); - cookie_stfa->sound_enable=STFA_PLAY_DISABLE; - SuperToUser(oldpile); - - /* Wait if currently playing sound */ - while (SDL_MintAudio_mutex != 0) { - } - - /* Clear buffers */ - if (SDL_MintAudio_audiobuf[0]) { - Mfree(SDL_MintAudio_audiobuf[0]); - SDL_MintAudio_audiobuf[0] = SDL_MintAudio_audiobuf[1] = NULL; - } -} - -static int Mint_CheckAudio(_THIS, SDL_AudioSpec *spec) -{ - int i; - - DEBUG_PRINT((DEBUG_NAME "asked: %d bits, ",spec->format & 0x00ff)); - DEBUG_PRINT(("signed=%d, ", ((spec->format & 0x8000)!=0))); - DEBUG_PRINT(("big endian=%d, ", ((spec->format & 0x1000)!=0))); - DEBUG_PRINT(("channels=%d, ", spec->channels)); - DEBUG_PRINT(("freq=%d\n", spec->freq)); - - if (spec->channels > 2) { - spec->channels = 2; /* no more than stereo! */ - } - - /* Check formats available */ - MINTAUDIO_freqcount=0; - for (i=0;i<16;i++) { - SDL_MintAudio_AddFrequency(this, freqs[i], 0, i, -1); - } - -#if 1 - for (i=0; ifreq); - spec->freq=MINTAUDIO_frequencies[MINTAUDIO_numfreq].frequency; - - DEBUG_PRINT((DEBUG_NAME "obtained: %d bits, ",spec->format & 0x00ff)); - DEBUG_PRINT(("signed=%d, ", ((spec->format & 0x8000)!=0))); - DEBUG_PRINT(("big endian=%d, ", ((spec->format & 0x1000)!=0))); - DEBUG_PRINT(("channels=%d, ", spec->channels)); - DEBUG_PRINT(("freq=%d\n", spec->freq)); - - return 0; -} - -static void Mint_InitAudio(_THIS, SDL_AudioSpec *spec) -{ - void *buffer; - void *oldpile; - - buffer = SDL_MintAudio_audiobuf[SDL_MintAudio_numbuf]; - - oldpile=(void *)Super(0); - - /* Stop replay */ - cookie_stfa->sound_enable=STFA_PLAY_DISABLE; - - /* Select replay format */ - cookie_stfa->sound_control = MINTAUDIO_frequencies[MINTAUDIO_numfreq].predivisor; - if ((spec->format & 0xff)==8) { - cookie_stfa->sound_control |= STFA_FORMAT_8BIT; - } else { - cookie_stfa->sound_control |= STFA_FORMAT_16BIT; - } - if (spec->channels==2) { - cookie_stfa->sound_control |= STFA_FORMAT_STEREO; - } else { - cookie_stfa->sound_control |= STFA_FORMAT_MONO; - } - if ((spec->format & 0x8000)!=0) { - cookie_stfa->sound_control |= STFA_FORMAT_SIGNED; - } else { - cookie_stfa->sound_control |= STFA_FORMAT_UNSIGNED; - } - if ((spec->format & 0x1000)!=0) { - cookie_stfa->sound_control |= STFA_FORMAT_BIGENDIAN; - } else { - cookie_stfa->sound_control |= STFA_FORMAT_LITENDIAN; - } - - /* Set buffer */ - cookie_stfa->sound_start = (unsigned long) buffer; - cookie_stfa->sound_end = (unsigned long) (buffer + spec->size); - - /* Set interrupt */ - cookie_stfa->stfa_it = SDL_MintAudio_StfaInterrupt; - - /* Restart replay */ - cookie_stfa->sound_enable=STFA_PLAY_ENABLE|STFA_PLAY_REPEAT; - - SuperToUser(oldpile); - - DEBUG_PRINT((DEBUG_NAME "hardware initialized\n")); -} - -static int Mint_OpenAudio(_THIS, SDL_AudioSpec *spec) -{ - SDL_MintAudio_device = this; - - /* Check audio capabilities */ - if (Mint_CheckAudio(this, spec)==-1) { - return -1; - } - - SDL_CalculateAudioSpec(spec); - - /* Allocate memory for audio buffers in DMA-able RAM */ - DEBUG_PRINT((DEBUG_NAME "buffer size=%d\n", spec->size)); - - SDL_MintAudio_audiobuf[0] = Atari_SysMalloc(spec->size *2, MX_STRAM); - if (SDL_MintAudio_audiobuf[0]==NULL) { - SDL_SetError("MINT_OpenAudio: Not enough memory for audio buffer"); - return (-1); - } - SDL_MintAudio_audiobuf[1] = SDL_MintAudio_audiobuf[0] + spec->size ; - SDL_MintAudio_numbuf=0; - SDL_memset(SDL_MintAudio_audiobuf[0], spec->silence, spec->size *2); - SDL_MintAudio_audiosize = spec->size; - SDL_MintAudio_mutex = 0; - - DEBUG_PRINT((DEBUG_NAME "buffer 0 at 0x%08x\n", SDL_MintAudio_audiobuf[0])); - DEBUG_PRINT((DEBUG_NAME "buffer 1 at 0x%08x\n", SDL_MintAudio_audiobuf[1])); - - SDL_MintAudio_CheckFpu(); - - /* Setup audio hardware */ - Mint_InitAudio(this, spec); - - return(1); /* We don't use threaded audio */ -} diff --git a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_stfa.h b/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_stfa.h deleted file mode 100644 index 1789b4bb41..0000000000 --- a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_stfa.h +++ /dev/null @@ -1,97 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* - STFA control structure - - Patrice Mandin -*/ - -#ifndef _SDL_mintaudio_stfa_h -#define _SDL_mintaudio_stfa_h - -/*--- Defines ---*/ - -#define STFA_PLAY_ENABLE (1<<0) -#define STFA_PLAY_DISABLE (0<<0) -#define STFA_PLAY_REPEAT (1<<1) -#define STFA_PLAY_SINGLE (0<<1) - -#define STFA_FORMAT_SIGNED (1<<15) -#define STFA_FORMAT_UNSIGNED (0<<15) -#define STFA_FORMAT_STEREO (1<<14) -#define STFA_FORMAT_MONO (0<<14) -#define STFA_FORMAT_16BIT (1<<13) -#define STFA_FORMAT_8BIT (0<<13) -#define STFA_FORMAT_LITENDIAN (1<<9) -#define STFA_FORMAT_BIGENDIAN (0<<9) -#define STFA_FORMAT_FREQ_MASK 0x0f -enum { - STFA_FORMAT_F4995=0, - STFA_FORMAT_F6269, - STFA_FORMAT_F7493, - STFA_FORMAT_F8192, - - STFA_FORMAT_F9830, - STFA_FORMAT_F10971, - STFA_FORMAT_F12538, - STFA_FORMAT_F14985, - - STFA_FORMAT_F16384, - STFA_FORMAT_F19819, - STFA_FORMAT_F21943, - STFA_FORMAT_F24576, - - STFA_FORMAT_F30720, - STFA_FORMAT_F32336, - STFA_FORMAT_F43885, - STFA_FORMAT_F49152 -}; - -/*--- Types ---*/ - -typedef struct { - unsigned short sound_enable; - unsigned short sound_control; - unsigned short sound_output; - unsigned long sound_start; - unsigned long sound_current; - unsigned long sound_end; - unsigned short version; - void *old_vbl; - void *old_timera; - unsigned long old_mfp_status; - void *new_vbl; - void *drivers_list; - void *play_stop; - unsigned short frequency; - void *set_frequency; - unsigned short frequency_threshold; - unsigned short *custom_freq_table; - unsigned short stfa_on_off; - void *new_drivers_list; - unsigned long old_bit_2_of_cookie_snd; - void (*stfa_it)(void); -} cookie_stfa_t; - -#endif /* _SDL_mintaudio_stfa_h */ diff --git a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_xbios.c b/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_xbios.c deleted file mode 100644 index 42a0d4a2f9..0000000000 --- a/apps/plugins/sdl/src/audio/mint/SDL_mintaudio_xbios.c +++ /dev/null @@ -1,490 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* - MiNT audio driver - using XBIOS functions (Falcon) - - Patrice Mandin, Didier Méquignon -*/ - -#include -#include - -/* Mint includes */ -#include -#include -#include - -#include "SDL_audio.h" -#include "../SDL_audio_c.h" -#include "../SDL_sysaudio.h" - -#include "../../video/ataricommon/SDL_atarimxalloc_c.h" -#include "../../video/ataricommon/SDL_atarisuper.h" - -#include "SDL_mintaudio.h" -#include "SDL_mintaudio_dma8.h" - -/*--- Defines ---*/ - -#define MINT_AUDIO_DRIVER_NAME "mint_xbios" - -/* Debug print info */ -#define DEBUG_NAME "audio:xbios: " -#if 0 -#define DEBUG_PRINT(what) \ - { \ - printf what; \ - } -#else -#define DEBUG_PRINT(what) -#endif - -/*--- Static variables ---*/ - -static long cookie_snd; - -/*--- Audio driver functions ---*/ - -static void Mint_CloseAudio(_THIS); -static int Mint_OpenAudio(_THIS, SDL_AudioSpec *spec); -static void Mint_LockAudio(_THIS); -static void Mint_UnlockAudio(_THIS); - -/* To check/init hardware audio */ -static int Mint_CheckAudio(_THIS, SDL_AudioSpec *spec); -static void Mint_InitAudio(_THIS, SDL_AudioSpec *spec); - -/*--- Audio driver bootstrap functions ---*/ - -static int Audio_Available(void) -{ -/* unsigned long dummy;*/ - const char *envr = SDL_getenv("SDL_AUDIODRIVER"); - - /*SDL_MintAudio_mint_present = (Getcookie(C_MiNT, &dummy) == C_FOUND);*/ - SDL_MintAudio_mint_present = SDL_FALSE; - - /* We can't use XBIOS in interrupt with Magic, don't know about thread */ - /*if (Getcookie(C_MagX, &dummy) == C_FOUND) { - return(0); - }*/ - - /* Check if user asked a different audio driver */ - if ((envr) && (SDL_strcmp(envr, MINT_AUDIO_DRIVER_NAME)!=0)) { - DEBUG_PRINT((DEBUG_NAME "user asked a different audio driver\n")); - return(0); - } - - /* Cookie _SND present ? if not, assume ST machine */ - if (Getcookie(C__SND, &cookie_snd) == C_NOTFOUND) { - cookie_snd = SND_PSG; - } - - /* Check if we have 16 bits audio */ - if ((cookie_snd & SND_16BIT)==0) { - DEBUG_PRINT((DEBUG_NAME "no 16 bits sound\n")); - return(0); - } - - /* Check if audio is lockable */ - if (Locksnd()!=1) { - DEBUG_PRINT((DEBUG_NAME "audio locked by other application\n")); - return(0); - } - - Unlocksnd(); - - DEBUG_PRINT((DEBUG_NAME "XBIOS audio available!\n")); - return(1); -} - -static void Audio_DeleteDevice(SDL_AudioDevice *device) -{ - SDL_free(device->hidden); - SDL_free(device); -} - -static SDL_AudioDevice *Audio_CreateDevice(int devindex) -{ - SDL_AudioDevice *this; - - /* Initialize all variables that we clean on shutdown */ - this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice)); - if ( this ) { - SDL_memset(this, 0, (sizeof *this)); - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - } - if ( (this == NULL) || (this->hidden == NULL) ) { - SDL_OutOfMemory(); - if ( this ) { - SDL_free(this); - } - return(0); - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - /* Set the function pointers */ - this->OpenAudio = Mint_OpenAudio; - this->CloseAudio = Mint_CloseAudio; - this->LockAudio = Mint_LockAudio; - this->UnlockAudio = Mint_UnlockAudio; - this->free = Audio_DeleteDevice; - - return this; -} - -AudioBootStrap MINTAUDIO_XBIOS_bootstrap = { - MINT_AUDIO_DRIVER_NAME, "MiNT XBIOS audio driver", - Audio_Available, Audio_CreateDevice -}; - -static void Mint_LockAudio(_THIS) -{ - /* Stop replay */ - Buffoper(0); -} - -static void Mint_UnlockAudio(_THIS) -{ - /* Restart replay */ - Buffoper(SB_PLA_ENA|SB_PLA_RPT); -} - -static void Mint_CloseAudio(_THIS) -{ - /* Stop replay */ - SDL_MintAudio_WaitThread(); - Buffoper(0); - - if (!SDL_MintAudio_mint_present) { - /* Uninstall interrupt */ - Jdisint(MFP_DMASOUND); - } - - /* Wait if currently playing sound */ - while (SDL_MintAudio_mutex != 0) { - } - - /* Clear buffers */ - if (SDL_MintAudio_audiobuf[0]) { - Mfree(SDL_MintAudio_audiobuf[0]); - SDL_MintAudio_audiobuf[0] = SDL_MintAudio_audiobuf[1] = NULL; - } - - /* Unlock sound system */ - Unlocksnd(); -} - -/* Falcon XBIOS implementation of Devconnect() is buggy with external clock */ -static void Devconnect2(int src, int dst, int sclk, int pre) -{ - static const unsigned short MASK1[3] = { 0, 0x6000, 0 }; - static const unsigned short MASK2[4] = { 0xFFF0, 0xFF8F, 0xF0FF, 0x0FFF }; - static const unsigned short INDEX1[4] = { 1, 3, 5, 7 }; - static const unsigned short INDEX2[4] = { 0, 2, 4, 6 }; - unsigned short sync_div,dev_ctrl,dest_ctrl; - void *oldstack; - - if (dst==0) { - return; - } - - oldstack=(void *)Super(0); - - dev_ctrl = DMAAUDIO_IO.dev_ctrl; - dest_ctrl = DMAAUDIO_IO.dest_ctrl; - dev_ctrl &= MASK2[src]; - - if (src==ADC) { - dev_ctrl |= MASK1[sclk]; - } else { - dev_ctrl |= (INDEX1[sclk] << (src<<4)); - } - - if (dst & DMAREC) { - dest_ctrl &= 0xFFF0; - dest_ctrl |= INDEX1[src]; - } - - if (dst & DSPRECV) { - dest_ctrl &= 0xFF8F; - dest_ctrl |= (INDEX1[src]<<4); - } - - if (dst & EXTOUT) { - dest_ctrl &= 0xF0FF; - dest_ctrl |= (INDEX1[src]<<8); - } - - if (dst & DAC) { - dev_ctrl &= 0x0FFF; - dev_ctrl |= MASK1[sclk]; - dest_ctrl &= 0x0FFF; - dest_ctrl |= (INDEX2[src]<<12); - } - - sync_div = DMAAUDIO_IO.sync_div; - if (sclk==CLKEXT) { - pre<<=8; - sync_div &= 0xF0FF; - } else { - sync_div &= 0xFFF0; - } - sync_div |= pre; - - DMAAUDIO_IO.dev_ctrl = dev_ctrl; - DMAAUDIO_IO.dest_ctrl = dest_ctrl; - DMAAUDIO_IO.sync_div = sync_div; - - SuperToUser(oldstack); -} - -static void Mint_CheckExternalClock(_THIS) -{ -#define SIZE_BUF_CLOCK_MEASURE (44100/10) - - char *buffer; - int i, j; - - /* DSP present with its GPIO port ? */ - if ((cookie_snd & SND_DSP)==0) { - return; - } - - buffer = Atari_SysMalloc(SIZE_BUF_CLOCK_MEASURE, MX_STRAM); - if (buffer==NULL) { - DEBUG_PRINT((DEBUG_NAME "Not enough memory for the measure\n")); - return; - } - SDL_memset(buffer, 0, SIZE_BUF_CLOCK_MEASURE); - - Buffoper(0); - Settracks(0,0); - Setmontracks(0); - Setmode(MONO8); - Jdisint(MFP_TIMERA); - - for (i=0; i<2; i++) { - Gpio(GPIO_SET,7); /* DSP port gpio outputs */ - Gpio(GPIO_WRITE,2+i); /* 22.5792/24.576 MHz for 44.1/48KHz */ - Devconnect2(DMAPLAY, DAC, CLKEXT, CLK50K); /* Matrix and clock source */ - Setbuffer(0, buffer, buffer + SIZE_BUF_CLOCK_MEASURE); /* Set buffer */ - Xbtimer(XB_TIMERA, 5, 38, SDL_MintAudio_XbiosInterruptMeasureClock); /* delay mode timer A, prediv /64, 1KHz */ - Jenabint(MFP_TIMERA); - SDL_MintAudio_clocktics = 0; - Buffoper(SB_PLA_ENA); - usleep(110000); - - if((Buffoper(-1) & 1)==0) { - if (SDL_MintAudio_clocktics) { - unsigned long khz; - - khz = ((SIZE_BUF_CLOCK_MEASURE/SDL_MintAudio_clocktics) +1) & 0xFFFFFFFE; - DEBUG_PRINT((DEBUG_NAME "measure %d: freq=%lu KHz\n", i+1, khz)); - - if(khz==44) { - for (j=1; j<4; j++) { - SDL_MintAudio_AddFrequency(this, MASTERCLOCK_44K/(MASTERPREDIV_FALCON*(1<format & 0x00ff)); - DEBUG_PRINT(("signed=%d, ", ((spec->format & 0x8000)!=0))); - DEBUG_PRINT(("big endian=%d, ", ((spec->format & 0x1000)!=0))); - DEBUG_PRINT(("channels=%d, ", spec->channels)); - DEBUG_PRINT(("freq=%d\n", spec->freq)); - - if (spec->channels > 2) { - spec->channels = 2; /* no more than stereo! */ - } - - spec->format |= 0x8000; /* Audio is always signed */ - if ((spec->format & 0x00ff)==16) { - spec->format |= 0x1000; /* Audio is always big endian */ - spec->channels=2; /* 16 bits always stereo */ - } - - MINTAUDIO_freqcount=0; - - /* Add external clocks if present */ - Mint_CheckExternalClock(this); - - /* Standard clocks */ - for (i=1;i<12;i++) { - /* Remove unusable Falcon codec predivisors */ - if ((i==6) || (i==8) || (i==10)) { - continue; - } - SDL_MintAudio_AddFrequency(this, MASTERCLOCK_FALCON1/(MASTERPREDIV_FALCON*(i+1)), MASTERCLOCK_FALCON1, i, -1); - } - -#if 1 - for (i=0; ifreq); - spec->freq=MINTAUDIO_frequencies[MINTAUDIO_numfreq].frequency; - - DEBUG_PRINT((DEBUG_NAME "obtained: %d bits, ",spec->format & 0x00ff)); - DEBUG_PRINT(("signed=%d, ", ((spec->format & 0x8000)!=0))); - DEBUG_PRINT(("big endian=%d, ", ((spec->format & 0x1000)!=0))); - DEBUG_PRINT(("channels=%d, ", spec->channels)); - DEBUG_PRINT(("freq=%d\n", spec->freq)); - - return 0; -} - -static void Mint_InitAudio(_THIS, SDL_AudioSpec *spec) -{ - int channels_mode, prediv; - void *buffer; - - /* Stop currently playing sound */ - SDL_MintAudio_quit_thread = SDL_FALSE; - SDL_MintAudio_thread_finished = SDL_TRUE; - SDL_MintAudio_WaitThread(); - Buffoper(0); - - /* Set replay tracks */ - Settracks(0,0); - Setmontracks(0); - - /* Select replay format */ - channels_mode=STEREO16; - switch (spec->format & 0xff) { - case 8: - if (spec->channels==2) { - channels_mode=STEREO8; - } else { - channels_mode=MONO8; - } - break; - } - if (Setmode(channels_mode)<0) { - DEBUG_PRINT((DEBUG_NAME "Setmode() failed\n")); - } - - prediv = MINTAUDIO_frequencies[MINTAUDIO_numfreq].predivisor; - if (MINTAUDIO_frequencies[MINTAUDIO_numfreq].gpio_bits != -1) { - Gpio(GPIO_SET,7); /* DSP port gpio outputs */ - Gpio(GPIO_WRITE, MINTAUDIO_frequencies[MINTAUDIO_numfreq].gpio_bits); - Devconnect2(DMAPLAY, DAC|EXTOUT, CLKEXT, prediv); - } else { - Devconnect2(DMAPLAY, DAC, CLK25M, prediv); - } - - /* Set buffer */ - buffer = SDL_MintAudio_audiobuf[SDL_MintAudio_numbuf]; - if (Setbuffer(0, buffer, buffer + spec->size)<0) { - DEBUG_PRINT((DEBUG_NAME "Setbuffer() failed\n")); - } - - if (SDL_MintAudio_mint_present) { - SDL_MintAudio_thread_pid = tfork(SDL_MintAudio_Thread, 0); - } else { - /* Install interrupt */ - Jdisint(MFP_DMASOUND); - /*Xbtimer(XB_TIMERA, 8, 1, SDL_MintAudio_XbiosInterrupt);*/ - Xbtimer(XB_TIMERA, 8, 1, SDL_MintAudio_Dma8Interrupt); - Jenabint(MFP_DMASOUND); - - if (Setinterrupt(SI_TIMERA, SI_PLAY)<0) { - DEBUG_PRINT((DEBUG_NAME "Setinterrupt() failed\n")); - } - } - - /* Go */ - Buffoper(SB_PLA_ENA|SB_PLA_RPT); - DEBUG_PRINT((DEBUG_NAME "hardware initialized\n")); -} - -static int Mint_OpenAudio(_THIS, SDL_AudioSpec *spec) -{ - /* Lock sound system */ - if (Locksnd()!=1) { - SDL_SetError("Mint_OpenAudio: Audio system already in use"); - return(-1); - } - - SDL_MintAudio_device = this; - - /* Check audio capabilities */ - if (Mint_CheckAudio(this, spec)==-1) { - return -1; - } - - SDL_CalculateAudioSpec(spec); - - /* Allocate memory for audio buffers in DMA-able RAM */ - DEBUG_PRINT((DEBUG_NAME "buffer size=%d\n", spec->size)); - - SDL_MintAudio_audiobuf[0] = Atari_SysMalloc(spec->size *2, MX_STRAM); - if (SDL_MintAudio_audiobuf[0]==NULL) { - SDL_SetError("MINT_OpenAudio: Not enough memory for audio buffer"); - return (-1); - } - SDL_MintAudio_audiobuf[1] = SDL_MintAudio_audiobuf[0] + spec->size ; - SDL_MintAudio_numbuf=0; - SDL_memset(SDL_MintAudio_audiobuf[0], spec->silence, spec->size *2); - SDL_MintAudio_audiosize = spec->size; - SDL_MintAudio_mutex = 0; - - DEBUG_PRINT((DEBUG_NAME "buffer 0 at 0x%08x\n", SDL_MintAudio_audiobuf[0])); - DEBUG_PRINT((DEBUG_NAME "buffer 1 at 0x%08x\n", SDL_MintAudio_audiobuf[1])); - - SDL_MintAudio_CheckFpu(); - - /* Setup audio hardware */ - Mint_InitAudio(this, spec); - - return(1); /* We don't use SDL threaded audio */ -} diff --git a/apps/plugins/sdl/src/audio/mme/SDL_mmeaudio.c b/apps/plugins/sdl/src/audio/mme/SDL_mmeaudio.c deleted file mode 100644 index 64a0ecc36d..0000000000 --- a/apps/plugins/sdl/src/audio/mme/SDL_mmeaudio.c +++ /dev/null @@ -1,264 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Tru64 UNIX MME support */ -#include - -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "../SDL_audio_c.h" -#include "SDL_mmeaudio.h" - -static BOOL inUse[NUM_BUFFERS]; - -/* Audio driver functions */ -static int MME_OpenAudio(_THIS, SDL_AudioSpec *spec); -static void MME_WaitAudio(_THIS); -static Uint8 *MME_GetAudioBuf(_THIS); -static void MME_PlayAudio(_THIS); -static void MME_WaitDone(_THIS); -static void MME_CloseAudio(_THIS); - -/* Audio driver bootstrap functions */ -static int Audio_Available(void) -{ - return(1); -} - -static void Audio_DeleteDevice(SDL_AudioDevice *device) -{ - if ( device ) { - if ( device->hidden ) { - SDL_free(device->hidden); - device->hidden = NULL; - } - SDL_free(device); - device = NULL; - } -} - -static SDL_AudioDevice *Audio_CreateDevice(int devindex) -{ - SDL_AudioDevice *this; - -/* Initialize all variables that we clean on shutdown */ - this = SDL_malloc(sizeof(SDL_AudioDevice)); - if ( this ) { - SDL_memset(this, 0, (sizeof *this)); - this->hidden = SDL_malloc((sizeof *this->hidden)); - } - if ( (this == NULL) || (this->hidden == NULL) ) { - SDL_OutOfMemory(); - if ( this ) { - SDL_free(this); - } - return(0); - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - /* Set the function pointers */ - this->OpenAudio = MME_OpenAudio; - this->WaitAudio = MME_WaitAudio; - this->PlayAudio = MME_PlayAudio; - this->GetAudioBuf = MME_GetAudioBuf; - this->WaitDone = MME_WaitDone; - this->CloseAudio = MME_CloseAudio; - this->free = Audio_DeleteDevice; - - return this; -} - -AudioBootStrap MMEAUDIO_bootstrap = { - "waveout", "Tru64 MME WaveOut", - Audio_Available, Audio_CreateDevice -}; - -static void SetMMerror(char *function, MMRESULT code) -{ - int len; - char errbuf[MAXERRORLENGTH]; - - SDL_snprintf(errbuf, SDL_arraysize(errbuf), "%s: ", function); - len = SDL_strlen(errbuf); - waveOutGetErrorText(code, errbuf+len, MAXERRORLENGTH-len); - SDL_SetError("%s",errbuf); -} - -static void CALLBACK MME_CALLBACK(HWAVEOUT hwo, - UINT uMsg, - DWORD dwInstance, - LPARAM dwParam1, - LPARAM dwParam2) -{ - WAVEHDR *wp = (WAVEHDR *) dwParam1; - - if ( uMsg == WOM_DONE ) - inUse[wp->dwUser] = FALSE; -} - -static int MME_OpenAudio(_THIS, SDL_AudioSpec *spec) -{ - MMRESULT result; - int i; - - mixbuf = NULL; - - /* Set basic WAVE format parameters */ - shm = mmeAllocMem(sizeof(*shm)); - if ( shm == NULL ) { - SDL_SetError("Out of memory: shm"); - return(-1); - } - shm->sound = 0; - shm->wFmt.wf.wFormatTag = WAVE_FORMAT_PCM; - - /* Determine the audio parameters from the AudioSpec */ - switch ( spec->format & 0xFF ) { - case 8: - /* Unsigned 8 bit audio data */ - spec->format = AUDIO_U8; - shm->wFmt.wBitsPerSample = 8; - break; - case 16: - /* Signed 16 bit audio data */ - spec->format = AUDIO_S16; - shm->wFmt.wBitsPerSample = 16; - break; - default: - SDL_SetError("Unsupported audio format"); - return(-1); - } - - shm->wFmt.wf.nChannels = spec->channels; - shm->wFmt.wf.nSamplesPerSec = spec->freq; - shm->wFmt.wf.nBlockAlign = - shm->wFmt.wf.nChannels * shm->wFmt.wBitsPerSample / 8; - shm->wFmt.wf.nAvgBytesPerSec = - shm->wFmt.wf.nSamplesPerSec * shm->wFmt.wf.nBlockAlign; - - /* Check the buffer size -- minimum of 1/4 second (word aligned) */ - if ( spec->samples < (spec->freq/4) ) - spec->samples = ((spec->freq/4)+3)&~3; - - /* Update the fragment size as size in bytes */ - SDL_CalculateAudioSpec(spec); - - /* Open the audio device */ - result = waveOutOpen(&(shm->sound), - WAVE_MAPPER, - &(shm->wFmt.wf), - MME_CALLBACK, - NULL, - (CALLBACK_FUNCTION|WAVE_OPEN_SHAREABLE)); - if ( result != MMSYSERR_NOERROR ) { - SetMMerror("waveOutOpen()", result); - return(-1); - } - - /* Create the sound buffers */ - mixbuf = (Uint8 *)mmeAllocBuffer(NUM_BUFFERS * (spec->size)); - if ( mixbuf == NULL ) { - SDL_SetError("Out of memory: mixbuf"); - return(-1); - } - - for (i = 0; i < NUM_BUFFERS; i++) { - shm->wHdr[i].lpData = &mixbuf[i * (spec->size)]; - shm->wHdr[i].dwBufferLength = spec->size; - shm->wHdr[i].dwFlags = 0; - shm->wHdr[i].dwUser = i; - shm->wHdr[i].dwLoops = 0; /* loop control counter */ - shm->wHdr[i].lpNext = NULL; /* reserved for driver */ - shm->wHdr[i].reserved = 0; - inUse[i] = FALSE; - } - next_buffer = 0; - return 0; -} - -static void MME_WaitAudio(_THIS) -{ - while ( inUse[next_buffer] ) { - mmeWaitForCallbacks(); - mmeProcessCallbacks(); - } -} - -static Uint8 *MME_GetAudioBuf(_THIS) -{ - Uint8 *retval; - - inUse[next_buffer] = TRUE; - retval = (Uint8 *)(shm->wHdr[next_buffer].lpData); - return retval; -} - -static void MME_PlayAudio(_THIS) -{ - /* Queue it up */ - waveOutWrite(shm->sound, &(shm->wHdr[next_buffer]), sizeof(WAVEHDR)); - next_buffer = (next_buffer+1)%NUM_BUFFERS; -} - -static void MME_WaitDone(_THIS) -{ - MMRESULT result; - int i; - - if ( shm->sound ) { - for (i = 0; i < NUM_BUFFERS; i++) - while ( inUse[i] ) { - mmeWaitForCallbacks(); - mmeProcessCallbacks(); - } - result = waveOutReset(shm->sound); - if ( result != MMSYSERR_NOERROR ) - SetMMerror("waveOutReset()", result); - mmeProcessCallbacks(); - } -} - -static void MME_CloseAudio(_THIS) -{ - MMRESULT result; - - if ( mixbuf ) { - result = mmeFreeBuffer(mixbuf); - if (result != MMSYSERR_NOERROR ) - SetMMerror("mmeFreeBuffer", result); - mixbuf = NULL; - } - - if ( shm ) { - if ( shm->sound ) { - result = waveOutClose(shm->sound); - if (result != MMSYSERR_NOERROR ) - SetMMerror("waveOutClose()", result); - mmeProcessCallbacks(); - } - result = mmeFreeMem(shm); - if (result != MMSYSERR_NOERROR ) - SetMMerror("mmeFreeMem()", result); - shm = NULL; - } -} - diff --git a/apps/plugins/sdl/src/audio/mme/SDL_mmeaudio.h b/apps/plugins/sdl/src/audio/mme/SDL_mmeaudio.h deleted file mode 100644 index 6bfaed32e0..0000000000 --- a/apps/plugins/sdl/src/audio/mme/SDL_mmeaudio.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Allow access to a raw mixing buffer */ - -#ifndef _SDL_lowaudio_h -#define _SDL_lowaudio_h - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the video functions */ -#define _THIS SDL_AudioDevice *this -#define NUM_BUFFERS 2 - -struct SharedMem { - HWAVEOUT sound; - WAVEHDR wHdr[NUM_BUFFERS]; - PCMWAVEFORMAT wFmt; -}; - -struct SDL_PrivateAudioData { - Uint8 *mixbuf; /* The raw allocated mixing buffer */ - struct SharedMem *shm; - int next_buffer; -}; - -#define shm (this->hidden->shm) -#define mixbuf (this->hidden->mixbuf) -#define next_buffer (this->hidden->next_buffer) -/* Old variable names */ -#endif /* _SDL_lowaudio_h */ diff --git a/apps/plugins/sdl/src/audio/nas/SDL_nasaudio.c b/apps/plugins/sdl/src/audio/nas/SDL_nasaudio.c deleted file mode 100644 index a561e62984..0000000000 --- a/apps/plugins/sdl/src/audio/nas/SDL_nasaudio.c +++ /dev/null @@ -1,423 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org - - This driver was written by: - Erik Inge Bolsø - knan@mo.himolde.no -*/ -#include "SDL_config.h" - -/* Allow access to a raw mixing buffer */ - -#include -#include - -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "../SDL_audiomem.h" -#include "../SDL_audio_c.h" -#include "../SDL_audiodev_c.h" -#include "SDL_nasaudio.h" - -#ifdef SDL_AUDIO_DRIVER_NAS_DYNAMIC -#include "SDL_loadso.h" -#endif - -/* The tag name used by artsc audio */ -#define NAS_DRIVER_NAME "nas" - -static struct SDL_PrivateAudioData *this2 = NULL; - -static void (*NAS_AuCloseServer) (AuServer *); -static void (*NAS_AuNextEvent) (AuServer *, AuBool, AuEvent *); -static AuBool(*NAS_AuDispatchEvent) (AuServer *, AuEvent *); -static AuFlowID(*NAS_AuCreateFlow) (AuServer *, AuStatus *); -static void (*NAS_AuStartFlow) (AuServer *, AuFlowID, AuStatus *); -static void (*NAS_AuSetElements) - (AuServer *, AuFlowID, AuBool, int, AuElement *, AuStatus *); -static void (*NAS_AuWriteElement) - (AuServer *, AuFlowID, int, AuUint32, AuPointer, AuBool, AuStatus *); -static AuServer *(*NAS_AuOpenServer) - (_AuConst char *, int, _AuConst char *, int, _AuConst char *, char **); -static AuEventHandlerRec *(*NAS_AuRegisterEventHandler) - (AuServer *, AuMask, int, AuID, AuEventHandlerCallback, AuPointer); - - -#ifdef SDL_AUDIO_DRIVER_NAS_DYNAMIC - -static const char *nas_library = SDL_AUDIO_DRIVER_NAS_DYNAMIC; -static void *nas_handle = NULL; - -static int -load_nas_sym(const char *fn, void **addr) -{ - *addr = SDL_LoadFunction(nas_handle, fn); - if (*addr == NULL) { - return 0; - } - return 1; -} - -/* cast funcs to char* first, to please GCC's strict aliasing rules. */ -#define SDL_NAS_SYM(x) \ - if (!load_nas_sym(#x, (void **) (char *) &NAS_##x)) return -1 -#else -#define SDL_NAS_SYM(x) NAS_##x = x -#endif - -static int -load_nas_syms(void) -{ - SDL_NAS_SYM(AuCloseServer); - SDL_NAS_SYM(AuNextEvent); - SDL_NAS_SYM(AuDispatchEvent); - SDL_NAS_SYM(AuCreateFlow); - SDL_NAS_SYM(AuStartFlow); - SDL_NAS_SYM(AuSetElements); - SDL_NAS_SYM(AuWriteElement); - SDL_NAS_SYM(AuOpenServer); - SDL_NAS_SYM(AuRegisterEventHandler); - return 0; -} - -#undef SDL_NAS_SYM - -#ifdef SDL_AUDIO_DRIVER_NAS_DYNAMIC - -static void -UnloadNASLibrary(void) -{ - if (nas_handle != NULL) { - SDL_UnloadObject(nas_handle); - nas_handle = NULL; - } -} - -static int -LoadNASLibrary(void) -{ - int retval = 0; - if (nas_handle == NULL) { - nas_handle = SDL_LoadObject(nas_library); - if (nas_handle == NULL) { - /* Copy error string so we can use it in a new SDL_SetError(). */ - char *origerr = SDL_GetError(); - size_t len = SDL_strlen(origerr) + 1; - char *err = (char *) alloca(len); - SDL_strlcpy(err, origerr, len); - retval = -1; - SDL_SetError("NAS: SDL_LoadObject('%s') failed: %s\n", - nas_library, err); - } else { - retval = load_nas_syms(); - if (retval < 0) { - UnloadNASLibrary(); - } - } - } - return retval; -} - -#else - -static void -UnloadNASLibrary(void) -{ -} - -static int -LoadNASLibrary(void) -{ - load_nas_syms(); - return 0; -} - -#endif /* SDL_AUDIO_DRIVER_NAS_DYNAMIC */ - - -/* Audio driver functions */ -static int NAS_OpenAudio(_THIS, SDL_AudioSpec *spec); -static void NAS_WaitAudio(_THIS); -static void NAS_PlayAudio(_THIS); -static Uint8 *NAS_GetAudioBuf(_THIS); -static void NAS_CloseAudio(_THIS); - -/* Audio driver bootstrap functions */ - -static int Audio_Available(void) -{ - if (LoadNASLibrary() == 0) { - AuServer *aud = NAS_AuOpenServer("", 0, NULL, 0, NULL, NULL); - if (!aud) { - UnloadNASLibrary(); - return 0; - } - NAS_AuCloseServer(aud); - UnloadNASLibrary(); - return 1; - } - return 0; -} - -static void Audio_DeleteDevice(SDL_AudioDevice *device) -{ - UnloadNASLibrary(); - SDL_free(device->hidden); - SDL_free(device); -} - -static SDL_AudioDevice *Audio_CreateDevice(int devindex) -{ - SDL_AudioDevice *this; - - if (LoadNASLibrary() < 0) { - return NULL; - } - - /* Initialize all variables that we clean on shutdown */ - this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice)); - if ( this ) { - SDL_memset(this, 0, (sizeof *this)); - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - } - if ( (this == NULL) || (this->hidden == NULL) ) { - SDL_OutOfMemory(); - if ( this ) { - SDL_free(this); - } - return NULL; - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - /* Set the function pointers */ - this->OpenAudio = NAS_OpenAudio; - this->WaitAudio = NAS_WaitAudio; - this->PlayAudio = NAS_PlayAudio; - this->GetAudioBuf = NAS_GetAudioBuf; - this->CloseAudio = NAS_CloseAudio; - - this->free = Audio_DeleteDevice; - - return this; -} - -AudioBootStrap NAS_bootstrap = { - NAS_DRIVER_NAME, "Network Audio System", - Audio_Available, Audio_CreateDevice -}; - -/* This function waits until it is possible to write a full sound buffer */ -static void NAS_WaitAudio(_THIS) -{ - while ( this->hidden->buf_free < this->hidden->mixlen ) { - AuEvent ev; - NAS_AuNextEvent(this->hidden->aud, AuTrue, &ev); - NAS_AuDispatchEvent(this->hidden->aud, &ev); - } -} - -static void NAS_PlayAudio(_THIS) -{ - while (this->hidden->mixlen > this->hidden->buf_free) { /* We think the buffer is full? Yikes! Ask the server for events, - in the hope that some of them is LowWater events telling us more - of the buffer is free now than what we think. */ - AuEvent ev; - NAS_AuNextEvent(this->hidden->aud, AuTrue, &ev); - NAS_AuDispatchEvent(this->hidden->aud, &ev); - } - this->hidden->buf_free -= this->hidden->mixlen; - - /* Write the audio data */ - NAS_AuWriteElement(this->hidden->aud, this->hidden->flow, 0, this->hidden->mixlen, this->hidden->mixbuf, AuFalse, NULL); - - this->hidden->written += this->hidden->mixlen; - -#ifdef DEBUG_AUDIO - fprintf(stderr, "Wrote %d bytes of audio data\n", this->hidden->mixlen); -#endif -} - -static Uint8 *NAS_GetAudioBuf(_THIS) -{ - return(this->hidden->mixbuf); -} - -static void NAS_CloseAudio(_THIS) -{ - if ( this->hidden->mixbuf != NULL ) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - } - if ( this->hidden->aud ) { - NAS_AuCloseServer(this->hidden->aud); - this->hidden->aud = 0; - } -} - -static unsigned char sdlformat_to_auformat(unsigned int fmt) -{ - switch (fmt) - { - case AUDIO_U8: - return AuFormatLinearUnsigned8; - case AUDIO_S8: - return AuFormatLinearSigned8; - case AUDIO_U16LSB: - return AuFormatLinearUnsigned16LSB; - case AUDIO_U16MSB: - return AuFormatLinearUnsigned16MSB; - case AUDIO_S16LSB: - return AuFormatLinearSigned16LSB; - case AUDIO_S16MSB: - return AuFormatLinearSigned16MSB; - } - return AuNone; -} - -static AuBool -event_handler(AuServer* aud, AuEvent* ev, AuEventHandlerRec* hnd) -{ - switch (ev->type) { - case AuEventTypeElementNotify: { - AuElementNotifyEvent* event = (AuElementNotifyEvent *)ev; - - switch (event->kind) { - case AuElementNotifyKindLowWater: - if (this2->buf_free >= 0) { - this2->really += event->num_bytes; - gettimeofday(&this2->last_tv, 0); - this2->buf_free += event->num_bytes; - } else { - this2->buf_free = event->num_bytes; - } - break; - case AuElementNotifyKindState: - switch (event->cur_state) { - case AuStatePause: - if (event->reason != AuReasonUser) { - if (this2->buf_free >= 0) { - this2->really += event->num_bytes; - gettimeofday(&this2->last_tv, 0); - this2->buf_free += event->num_bytes; - } else { - this2->buf_free = event->num_bytes; - } - } - break; - } - } - } - } - return AuTrue; -} - -static AuDeviceID -find_device(_THIS, int nch) -{ - /* These "Au" things are all macros, not functions... */ - int i; - for (i = 0; i < AuServerNumDevices(this->hidden->aud); i++) { - if ((AuDeviceKind(AuServerDevice(this->hidden->aud, i)) == - AuComponentKindPhysicalOutput) && - AuDeviceNumTracks(AuServerDevice(this->hidden->aud, i)) == nch) { - return AuDeviceIdentifier(AuServerDevice(this->hidden->aud, i)); - } - } - return AuNone; -} - -static int NAS_OpenAudio(_THIS, SDL_AudioSpec *spec) -{ - AuElement elms[3]; - int buffer_size; - Uint16 test_format, format; - - this->hidden->mixbuf = NULL; - - /* Try for a closest match on audio format */ - format = 0; - for ( test_format = SDL_FirstAudioFormat(spec->format); - ! format && test_format; ) { - format = sdlformat_to_auformat(test_format); - - if (format == AuNone) { - test_format = SDL_NextAudioFormat(); - } - } - if ( format == 0 ) { - SDL_SetError("Couldn't find any hardware audio formats"); - return(-1); - } - spec->format = test_format; - - this->hidden->aud = NAS_AuOpenServer("", 0, NULL, 0, NULL, NULL); - if (this->hidden->aud == 0) - { - SDL_SetError("Couldn't open connection to NAS server"); - return (-1); - } - - this->hidden->dev = find_device(this, spec->channels); - if ((this->hidden->dev == AuNone) || (!(this->hidden->flow = NAS_AuCreateFlow(this->hidden->aud, NULL)))) { - NAS_AuCloseServer(this->hidden->aud); - this->hidden->aud = 0; - SDL_SetError("Couldn't find a fitting playback device on NAS server"); - return (-1); - } - - buffer_size = spec->freq; - if (buffer_size < 4096) - buffer_size = 4096; - - if (buffer_size > 32768) - buffer_size = 32768; /* So that the buffer won't get unmanageably big. */ - - /* Calculate the final parameters for this audio specification */ - SDL_CalculateAudioSpec(spec); - - this2 = this->hidden; - - /* These "Au" things without a NAS_ prefix are macros, not functions... */ - AuMakeElementImportClient(elms, spec->freq, format, spec->channels, AuTrue, - buffer_size, buffer_size / 4, 0, NULL); - AuMakeElementExportDevice(elms+1, 0, this->hidden->dev, spec->freq, - AuUnlimitedSamples, 0, NULL); - NAS_AuSetElements(this->hidden->aud, this->hidden->flow, AuTrue, 2, elms, NULL); - NAS_AuRegisterEventHandler(this->hidden->aud, AuEventHandlerIDMask, 0, this->hidden->flow, - event_handler, (AuPointer) NULL); - - NAS_AuStartFlow(this->hidden->aud, this->hidden->flow, NULL); - - /* Allocate mixing buffer */ - this->hidden->mixlen = spec->size; - this->hidden->mixbuf = (Uint8 *)SDL_AllocAudioMem(this->hidden->mixlen); - if ( this->hidden->mixbuf == NULL ) { - return(-1); - } - SDL_memset(this->hidden->mixbuf, spec->silence, spec->size); - - /* Get the parent process id (we're the parent of the audio thread) */ - this->hidden->parent = getpid(); - - /* We're ready to rock and roll. :-) */ - return(0); -} diff --git a/apps/plugins/sdl/src/audio/nas/SDL_nasaudio.h b/apps/plugins/sdl/src/audio/nas/SDL_nasaudio.h deleted file mode 100644 index 1c09630880..0000000000 --- a/apps/plugins/sdl/src/audio/nas/SDL_nasaudio.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org - - This driver was written by: - Erik Inge Bolsø - knan@mo.himolde.no -*/ -#include "SDL_config.h" - -#ifndef _SDL_nasaudio_h -#define _SDL_nasaudio_h - -#ifdef __sgi -#include -#else -#include