Improved size handling.

[wxWidgets.git] / include / wx / unix / sound.h

diff --git a/include/wx/unix/sound.h b/include/wx/unix/sound.h
index c038dfcde15a1aee327199a2cac3c3e39d32ea60..41fc0582a467b2be9f02c51ce787d15eaa796e7f 100644 (file)
--- a/include/wx/unix/sound.h
+++ b/include/wx/unix/sound.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wave.h
+// Name:        sound.h

 // Purpose:     wxSound class
 // Author:      Julian Smart, Vaclav Slavik
 // Modified by:
 // Purpose:     wxSound class
 // Author:      Julian Smart, Vaclav Slavik
 // Modified by:


@@ -14,11 +14,7 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if wxUSE_WAVE
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "sound.h"
-#endif
+#if wxUSE_SOUND

 
 #include "wx/object.h"
 
 
 #include "wx/object.h"
 


@@ -26,12 +22,12 @@
 // wxSound: simple audio playback class
 // ----------------------------------------------------------------------------
 
 // wxSound: simple audio playback class
 // ----------------------------------------------------------------------------
 

-class wxSoundBackend;
-class wxSound;
-class wxDynamicLibrary;
+class WXDLLIMPEXP_ADV wxSoundBackend;
+class WXDLLIMPEXP_ADV wxSound;
+class WXDLLIMPEXP_BASE wxDynamicLibrary;

 
 /// Sound data, as loaded from .wav file:
 
 /// Sound data, as loaded from .wav file:

-class wxSoundData
+class WXDLLIMPEXP_ADV wxSoundData

 {
 public:
     wxSoundData() : m_refCnt(1) {}
 {
 public:
     wxSoundData() : m_refCnt(1) {}


@@ -59,7 +55,7 @@ private:
 
 
 /// Simple sound class:
 
 
 /// Simple sound class:

-class wxSound : public wxSoundBase
+class WXDLLIMPEXP_ADV wxSound : public wxSoundBase

 {
 public:
     wxSound();
 {
 public:
     wxSound();


@@ -84,7 +80,7 @@ public:
     static void UnloadBackend();
     
 protected:
     static void UnloadBackend();
     
 protected:

-    bool DoPlay(unsigned flags);
+    bool DoPlay(unsigned flags) const;

 
     static void EnsureBackend();
     void Free();
 
     static void EnsureBackend();
     void Free();


@@ -106,10 +102,10 @@ private:
 // ----------------------------------------------------------------------------
 
 // This is interface to sound playing implementation. There are multiple
 // ----------------------------------------------------------------------------
 
 // This is interface to sound playing implementation. There are multiple

-// sound architectures in use on Unix platforms and wxWindows can use several
+// sound architectures in use on Unix platforms and wxWidgets can use several

 // of them for playback, depending on their availability at runtime; hence
 // of them for playback, depending on their availability at runtime; hence

-// the need for backends. This class is for use by wxWindows and people writing
-// additional backends only, it is _not_ for use by applications! 
+// the need for backends. This class is for use by wxWidgets and people writing
+// additional backends only, it is _not_ for use by applications!

 
 // Structure that holds playback status information
 struct wxSoundPlaybackStatus
 
 // Structure that holds playback status information
 struct wxSoundPlaybackStatus


@@ -121,7 +117,7 @@ struct wxSoundPlaybackStatus
 };
 
 // Audio backend interface
 };
 
 // Audio backend interface

-class wxSoundBackend
+class WXDLLIMPEXP_ADV wxSoundBackend

 {
 public:
     virtual ~wxSoundBackend() {}
 {
 public:
     virtual ~wxSoundBackend() {}


@@ -137,7 +133,7 @@ public:
     virtual bool IsAvailable() const = 0;
 
     // Returns true if the backend is capable of playing sound asynchronously.
     virtual bool IsAvailable() const = 0;
 
     // Returns true if the backend is capable of playing sound asynchronously.

-    // If false, then wxWindows creates a playback thread and handles async
+    // If false, then wxWidgets creates a playback thread and handles async

     // playback, otherwise it is left up to the backend (will usually be more
     // effective).
     virtual bool HasNativeAsyncPlayback() const = 0;
     // playback, otherwise it is left up to the backend (will usually be more
     // effective).
     virtual bool HasNativeAsyncPlayback() const = 0;


@@ -159,6 +155,6 @@ public:
 };
 
 
 };
 
 

-#endif // wxUSE_WAVE
+#endif // wxUSE_SOUND

 
 #endif
 
 #endif