src/audio/SDL_sysaudio.h
branchSDL-ryan-multiple-audio-device
changeset 3796 b19680c84cdf
parent 3795 589bc3d060cd
child 3798 c8b3d3d13ed1
     1.1 --- a/src/audio/SDL_sysaudio.h	Wed Oct 04 06:00:10 2006 +0000
     1.2 +++ b/src/audio/SDL_sysaudio.h	Wed Oct 04 19:54:23 2006 +0000
     1.3 @@ -45,6 +45,13 @@
     1.4      void (*LockDevice) (_THIS);
     1.5      void (*UnlockDevice) (_THIS);
     1.6      void (*Deinitialize) (void);
     1.7 +
     1.8 +    /* Some flags to push duplicate code into the core and reduce #ifdefs. */
     1.9 +    int ProvidesOwnCallbackThread:1;
    1.10 +    int SkipMixerLock:1;
    1.11 +    int HasCaptureSupport:1;
    1.12 +    int OnlyHasDefaultOutputDevice:1;
    1.13 +    int OnlyHasDefaultInputDevice:1;
    1.14  } SDL_AudioDriverImpl;
    1.15  
    1.16  
    1.17 @@ -66,10 +73,6 @@
    1.18  struct SDL_AudioDevice
    1.19  {
    1.20      /* * * */
    1.21 -    /* Lowlevel audio implementation */
    1.22 -    const SDL_AudioDriver *driver;
    1.23 -
    1.24 -    /* * * */
    1.25      /* Data common to all devices */
    1.26  
    1.27      /* The current audio specification (shared with audio thread) */
    1.28 @@ -79,6 +82,7 @@
    1.29      SDL_AudioCVT convert;
    1.30  
    1.31      /* Current state flags */
    1.32 +    int iscapture;
    1.33      int enabled;
    1.34      int paused;
    1.35      int opened;
    1.36 @@ -96,10 +100,6 @@
    1.37      /* * * */
    1.38      /* Data private to this driver */
    1.39      struct SDL_PrivateAudioData *hidden;
    1.40 -
    1.41 -    /* * * */
    1.42 -    /* The function used to dispose of this structure */
    1.43 -    void (*free) (_THIS);
    1.44  };
    1.45  #undef _THIS
    1.46  
    1.47 @@ -111,77 +111,5 @@
    1.48      int (*init) (SDL_AudioDriverImpl *impl);
    1.49  } AudioBootStrap;
    1.50  
    1.51 -#if SDL_AUDIO_DRIVER_BSD
    1.52 -extern AudioBootStrap BSD_AUDIO_bootstrap;
    1.53 -#endif
    1.54 -#if SDL_AUDIO_DRIVER_OSS
    1.55 -extern AudioBootStrap DSP_bootstrap;
    1.56 -extern AudioBootStrap DMA_bootstrap;
    1.57 -#endif
    1.58 -#if SDL_AUDIO_DRIVER_ALSA
    1.59 -extern AudioBootStrap ALSA_bootstrap;
    1.60 -#endif
    1.61 -#if SDL_AUDIO_DRIVER_QNXNTO
    1.62 -extern AudioBootStrap QNXNTOAUDIO_bootstrap;
    1.63 -#endif
    1.64 -#if SDL_AUDIO_DRIVER_SUNAUDIO
    1.65 -extern AudioBootStrap SUNAUDIO_bootstrap;
    1.66 -#endif
    1.67 -#if SDL_AUDIO_DRIVER_DMEDIA
    1.68 -extern AudioBootStrap DMEDIA_bootstrap;
    1.69 -#endif
    1.70 -#if SDL_AUDIO_DRIVER_ARTS
    1.71 -extern AudioBootStrap ARTS_bootstrap;
    1.72 -#endif
    1.73 -#if SDL_AUDIO_DRIVER_ESD
    1.74 -extern AudioBootStrap ESD_bootstrap;
    1.75 -#endif
    1.76 -#if SDL_AUDIO_DRIVER_NAS
    1.77 -extern AudioBootStrap NAS_bootstrap;
    1.78 -#endif
    1.79 -#if SDL_AUDIO_DRIVER_DSOUND
    1.80 -extern AudioBootStrap DSOUND_bootstrap;
    1.81 -#endif
    1.82 -#if SDL_AUDIO_DRIVER_WAVEOUT
    1.83 -extern AudioBootStrap WAVEOUT_bootstrap;
    1.84 -#endif
    1.85 -#if SDL_AUDIO_DRIVER_PAUD
    1.86 -extern AudioBootStrap Paud_bootstrap;
    1.87 -#endif
    1.88 -#if SDL_AUDIO_DRIVER_BAUDIO
    1.89 -extern AudioBootStrap BAUDIO_bootstrap;
    1.90 -#endif
    1.91 -#if SDL_AUDIO_DRIVER_COREAUDIO
    1.92 -extern AudioBootStrap COREAUDIO_bootstrap;
    1.93 -#endif
    1.94 -#if SDL_AUDIO_DRIVER_SNDMGR
    1.95 -extern AudioBootStrap SNDMGR_bootstrap;
    1.96 -#endif
    1.97 -#if SDL_AUDIO_DRIVER_AHI
    1.98 -extern AudioBootStrap AHI_bootstrap;
    1.99 -#endif
   1.100 -#if SDL_AUDIO_DRIVER_MINT
   1.101 -extern AudioBootStrap MINTAUDIO_GSXB_bootstrap;
   1.102 -extern AudioBootStrap MINTAUDIO_MCSN_bootstrap;
   1.103 -extern AudioBootStrap MINTAUDIO_STFA_bootstrap;
   1.104 -extern AudioBootStrap MINTAUDIO_XBIOS_bootstrap;
   1.105 -extern AudioBootStrap MINTAUDIO_DMA8_bootstrap;
   1.106 -#endif
   1.107 -#if SDL_AUDIO_DRIVER_DISK
   1.108 -extern AudioBootStrap DISKAUD_bootstrap;
   1.109 -#endif
   1.110 -#if SDL_AUDIO_DRIVER_DUMMY
   1.111 -extern AudioBootStrap DUMMYAUD_bootstrap;
   1.112 -#endif
   1.113 -#if SDL_AUDIO_DRIVER_DC
   1.114 -extern AudioBootStrap DCAUD_bootstrap;
   1.115 -#endif
   1.116 -#if SDL_AUDIO_DRIVER_MMEAUDIO
   1.117 -extern AudioBootStrap MMEAUDIO_bootstrap;
   1.118 -#endif
   1.119 -#if SDL_AUDIO_DRIVER_DART
   1.120 -extern AudioBootStrap DART_bootstrap;
   1.121 -#endif
   1.122 -
   1.123  #endif /* _SDL_sysaudio_h */
   1.124  /* vi: set ts=4 sw=4 expandtab: */