STL compilation fix

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

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

-// Name:        sound.h
+// Name:        wx/unix/sound.h

 // Purpose:     wxSound class
 // Author:      Julian Smart, Vaclav Slavik
 // Modified by:
 // Created:     25/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Vaclav Slavik
 // Purpose:     wxSound class
 // Author:      Julian Smart, Vaclav Slavik
 // Modified by:
 // Created:     25/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Vaclav Slavik

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SOUND_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SOUND_H_


@@ -33,7 +33,7 @@ public:
     wxSoundData() : m_refCnt(1) {}
     void IncRef();
     void DecRef();
     wxSoundData() : m_refCnt(1) {}
     void IncRef();
     void DecRef();

-    
+

     // .wav header information:
     unsigned m_channels;       // num of channels (mono:1, stereo:2)
     unsigned m_samplingRate;
     // .wav header information:
     unsigned m_channels;       // num of channels (mono:1, stereo:2)
     unsigned m_samplingRate;


@@ -41,7 +41,7 @@ public:
                                // samples (wxUint8), if 16 then signed 16bit
                                // (wxInt16)
     unsigned m_samples;        // length in samples:
                                // samples (wxUint8), if 16 then signed 16bit
                                // (wxInt16)
     unsigned m_samples;        // length in samples:

-    
+

     // wave data:
     size_t   m_dataBytes;
     wxUint8 *m_data;           // m_dataBytes bytes of data
     // wave data:
     size_t   m_dataBytes;
     wxUint8 *m_data;           // m_dataBytes bytes of data


@@ -61,7 +61,7 @@ public:
     wxSound();
     wxSound(const wxString& fileName, bool isResource = false);
     wxSound(int size, const wxByte* data);
     wxSound();
     wxSound(const wxString& fileName, bool isResource = false);
     wxSound(int size, const wxByte* data);

-    ~wxSound();
+    virtual ~wxSound();

 
     // Create from resource or file
     bool Create(const wxString& fileName, bool isResource = false);
 
     // Create from resource or file
     bool Create(const wxString& fileName, bool isResource = false);


@@ -69,23 +69,23 @@ public:
     bool Create(int size, const wxByte* data);
 
     bool IsOk() const { return m_data != NULL; }
     bool Create(int size, const wxByte* data);
 
     bool IsOk() const { return m_data != NULL; }

-   
+

     // Stop playing any sound
     static void Stop();
 
     // Returns true if a sound is being played
     static bool IsPlaying();
     // Stop playing any sound
     static void Stop();
 
     // Returns true if a sound is being played
     static bool IsPlaying();

-    
+

     // for internal use
     static void UnloadBackend();
     // for internal use
     static void UnloadBackend();

-    
+

 protected:
     bool DoPlay(unsigned flags) const;
 
     static void EnsureBackend();
     void Free();
     bool LoadWAV(const wxUint8 *data, size_t length, bool copyData);
 protected:
     bool DoPlay(unsigned flags) const;
 
     static void EnsureBackend();
     void Free();
     bool LoadWAV(const wxUint8 *data, size_t length, bool copyData);

-    
+

     static wxSoundBackend *ms_backend;
 #if wxUSE_LIBSDL && wxUSE_PLUGINS
     // FIXME - temporary, until we have plugins architecture
     static wxSoundBackend *ms_backend;
 #if wxUSE_LIBSDL && wxUSE_PLUGINS
     // FIXME - temporary, until we have plugins architecture


@@ -98,7 +98,7 @@ private:
 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------

-// wxSoundBackend: 
+// wxSoundBackend:

 // ----------------------------------------------------------------------------
 
 // This is interface to sound playing implementation. There are multiple
 // ----------------------------------------------------------------------------
 
 // This is interface to sound playing implementation. There are multiple


@@ -121,7 +121,7 @@ class WXDLLIMPEXP_ADV wxSoundBackend
 {
 public:
     virtual ~wxSoundBackend() {}
 {
 public:
     virtual ~wxSoundBackend() {}

-    
+

     // Returns the name of the backend (e.g. "Open Sound System")
     virtual wxString GetName() const = 0;
 
     // Returns the name of the backend (e.g. "Open Sound System")
     virtual wxString GetName() const = 0;
 


@@ -137,7 +137,7 @@ public:
     // 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;

-    
+

     // Plays the sound. flags are same flags as those passed to wxSound::Play.
     // The function should periodically check the value of
     // status->m_stopRequested and terminate if it is set to true (it may
     // Plays the sound. flags are same flags as those passed to wxSound::Play.
     // The function should periodically check the value of
     // status->m_stopRequested and terminate if it is set to true (it may


@@ -157,4 +157,5 @@ public:
 
 #endif // wxUSE_SOUND
 
 
 #endif // wxUSE_SOUND
 

-#endif
+#endif // _WX_SOUND_H_
+