X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c42b1de68a5d4b48c00092d9996574bfb8d8a542..2edd85f22b0526efe6ca598cad1f0fbed849b7e1:/contrib/include/wx/mmedia/sndbase.h diff --git a/contrib/include/wx/mmedia/sndbase.h b/contrib/include/wx/mmedia/sndbase.h index a19cf39917..f999848f2b 100644 --- a/contrib/include/wx/mmedia/sndbase.h +++ b/contrib/include/wx/mmedia/sndbase.h @@ -4,6 +4,7 @@ // Date: 08/11/1999 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999 // CVSID: $Id$ +// License: wxWindows license // -------------------------------------------------------------------------- #ifndef _WX_SNDBASE_H #define _WX_SNDBASE_H @@ -13,6 +14,7 @@ #endif #include "wx/defs.h" +#include "wx/mmedia/defs.h" // ------------------------------------------------------------------------ // DEFINITIONS @@ -43,8 +45,8 @@ typedef enum { // --------------------- // wxSoundError: -// - wxSOUND_NOERR: No error occured -// - wxSOUND_IOERR: an input/output error occured, it may concern either +// - wxSOUND_NOERR: No error occurred +// - wxSOUND_IOERR: an input/output error occurred, it may concern either // a driver or a file // - wxSOUND_INVFRMT: the sound format passed to the function is invalid. // Generally, it means that you passed out of range values @@ -76,12 +78,12 @@ typedef enum { wxSOUND_NOTSTARTED } wxSoundError; -class WXDLLEXPORT wxSoundStream; +class WXDLLIMPEXP_MMEDIA wxSoundStream; // --------------------- // wxSoundCallback(stream, evt, cdata): C callback for sound event. // - stream: current wxSoundStream -// - evt: the sound event which has occured, it may be wxSOUND_INPUT, +// - evt: the sound event which has occurred, it may be wxSOUND_INPUT, // wxSOUND_OUTPUT or wxSOUND_DUPLEX // - cdata: User callback data // --------------------- @@ -92,7 +94,7 @@ typedef void (*wxSoundCallback)(wxSoundStream *stream, int evt, // Base class for sound format specification // -class WXDLLEXPORT wxSoundFormatBase { +class WXDLLIMPEXP_MMEDIA wxSoundFormatBase { public: wxSoundFormatBase(); virtual ~wxSoundFormatBase(); @@ -112,7 +114,7 @@ class WXDLLEXPORT wxSoundFormatBase { // Base class for sound streams // -class WXDLLEXPORT wxSoundStream { +class WXDLLIMPEXP_MMEDIA wxSoundStream { public: wxSoundStream(); virtual ~wxSoundStream(); @@ -124,7 +126,7 @@ class WXDLLEXPORT wxSoundStream { // Returns the best size for IO calls virtual wxUint32 GetBestSize() const { return 1024; } - // SetSoundFormat returns TRUE when the format can be handled. + // SetSoundFormat returns true when the format can be handled. virtual bool SetSoundFormat(const wxSoundFormatBase& format); // GetSoundFormat returns the current sound format. @@ -145,7 +147,7 @@ class WXDLLEXPORT wxSoundStream { wxUint32 GetLastAccess() const { return m_lastcount; } // This is only useful for device (I think). - virtual bool QueueFilled() const { return TRUE; } + virtual bool QueueFilled() const { return true; } protected: // Current sound format