[ 1176516 ] argv datatype has changed (char in docs but really wxChar)

[wxWidgets.git] / contrib / include / wx / mmedia / sndbase.h

diff --git a/contrib/include/wx/mmedia/sndbase.h b/contrib/include/wx/mmedia/sndbase.h
index a19cf399179ff0ab13345452093f13510af79238..627464f4cf198da21aae2641082cc88e2810ed0a 100644 (file)
--- 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$
 // 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
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDBASE_H
 #define _WX_SNDBASE_H


@@ -13,6 +14,7 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+#include "wx/mmedia/defs.h"

 
 // ------------------------------------------------------------------------
 // DEFINITIONS
 
 // ------------------------------------------------------------------------
 // DEFINITIONS


@@ -76,7 +78,7 @@ typedef enum {
   wxSOUND_NOTSTARTED
 } wxSoundError;
 
   wxSOUND_NOTSTARTED
 } wxSoundError;
 

-class WXDLLEXPORT wxSoundStream;
+class WXDLLIMPEXP_MMEDIA wxSoundStream;

 
 // ---------------------
 // wxSoundCallback(stream, evt, cdata): C callback for sound event.
 
 // ---------------------
 // wxSoundCallback(stream, evt, cdata): C callback for sound event.


@@ -92,7 +94,7 @@ typedef void (*wxSoundCallback)(wxSoundStream *stream, int evt,
 // Base class for sound format specification
 //
 
 // Base class for sound format specification
 //
 

-class WXDLLEXPORT wxSoundFormatBase {
+class WXDLLIMPEXP_MMEDIA wxSoundFormatBase {

  public:
   wxSoundFormatBase();
   virtual ~wxSoundFormatBase();
  public:
   wxSoundFormatBase();
   virtual ~wxSoundFormatBase();


@@ -112,7 +114,7 @@ class WXDLLEXPORT wxSoundFormatBase {
 // Base class for sound streams
 //
 
 // Base class for sound streams
 //
 

-class WXDLLEXPORT wxSoundStream {
+class WXDLLIMPEXP_MMEDIA wxSoundStream {

  public:
   wxSoundStream();
   virtual ~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; }
 
   // 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.
   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).
   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
 
  protected:
   // Current sound format