renamed wxWave to wxSound

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/sound.h b/include/wx/mac/sound.h
new file mode 100644 (file)
index 0000000..18a84d1
--- /dev/null
+++ b/include/wx/mac/sound.h
@@ -0,0 +1,53 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        sound.h
+// Purpose:     wxSound class (loads and plays short Windows .wav files).
+//              Optional on non-Windows platforms.
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01
+// RCS-ID:      $Id$
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_SOUND_H_
+#define _WX_SOUND_H_
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "sound.h"
+#endif
+
+#if wxUSE_SOUND
+
+#include "wx/object.h"
+
+class WXDLLEXPORT wxSound : public wxSoundBase
+{
+public:
+  wxSound();
+  wxSound(const wxString& fileName, bool isResource = FALSE);
+  wxSound(int size, const wxByte* data);
+  ~wxSound();
+
+public:
+  bool  Create(const wxString& fileName, bool isResource = FALSE);
+  bool  IsOk() const { return !m_sndname.IsEmpty(); }
+
+protected:
+  // prevent collision with some BSD definitions of macro Free()
+  bool  FreeData();
+  
+  bool  DoPlay(unsigned flags) const;
+
+private:
+  void* m_sndChan;
+
+  wxString m_sndname;
+  void* m_hSnd;
+  int   m_waveLength;
+  bool  m_isResource;
+};
+
+#endif
+#endif
+    // _WX_SOUND_H_

diff --git a/include/wx/mac/wave.h b/include/wx/mac/wave.h
deleted file mode 100644 (file)
index dcd8095..0000000
--- a/include/wx/mac/wave.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wave.h
-// Purpose:     wxWave class (loads and plays short Windows .wav files).
-//              Optional on non-Windows platforms.
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// RCS-ID:      $Id$
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_WAVE_H_
-#define _WX_WAVE_H_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "wave.h"
-#endif
-
-#if wxUSE_WAVE
-
-#include "wx/object.h"
-
-class WXDLLEXPORT wxWave : public wxObject
-{
-public:
-  wxWave();
-  wxWave(const wxString& fileName, bool isResource = FALSE);
-  wxWave(int size, const wxByte* data);
-  ~wxWave();
-
-public:
-  bool  Create(const wxString& fileName, bool isResource = FALSE);
-  bool  IsOk() const { return !m_sndname.IsEmpty(); }
-  bool  Play(bool async = TRUE, bool looped = FALSE) const;
-
-protected:
-  // prevent collision with some BSD definitions of macro Free()
-  bool  FreeData();
-
-private:
-  void* m_sndChan;
-
-  wxString m_sndname;
-  void* m_hSnd;
-  int   m_waveLength;
-  bool  m_isResource;
-};
-
-#endif
-#endif
-    // _WX_WAVE_H_

diff --git a/include/wx/msw/sound.h b/include/wx/msw/sound.h
new file mode 100644 (file)
index 0000000..cdfa05d
--- /dev/null
+++ b/include/wx/msw/sound.h
@@ -0,0 +1,55 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        sound.h
+// Purpose:     wxSound class
+// Author:      Julian Smart
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_SOUND_H_
+#define _WX_SOUND_H_
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "sound.h"
+#endif
+
+#if wxUSE_SOUND
+
+#include "wx/object.h"
+
+class WXDLLIMPEXP_ADV wxSound : public wxSoundBase
+{
+public:
+  wxSound();
+  wxSound(const wxString& fileName, bool isResource = false);
+  wxSound(int size, const wxByte* data);
+  ~wxSound();
+
+public:
+  // Create from resource or file
+  bool  Create(const wxString& fileName, bool isResource = false);
+  // Create from data
+  bool Create(int size, const wxByte* data);
+
+  bool  IsOk() const { return (m_waveData ? true : false); };
+    
+  static void Stop();
+
+protected:
+  bool  Free();
+    
+  bool DoPlay(unsigned flags) const;
+
+private:
+  wxByte* m_waveData;
+  int   m_waveLength;
+  bool  m_isResource;
+
+    DECLARE_NO_COPY_CLASS(wxSound)
+};
+#endif
+#endif
+

diff --git a/include/wx/msw/wave.h b/include/wx/msw/wave.h
deleted file mode 100644 (file)
index af07fc4..0000000
--- a/include/wx/msw/wave.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wave.h
-// Purpose:     wxWave class
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_WAVE_H_
-#define _WX_WAVE_H_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "wave.h"
-#endif
-
-#if wxUSE_WAVE
-
-#include "wx/object.h"
-
-class WXDLLIMPEXP_ADV wxWave : public wxObject
-{
-public:
-  wxWave();
-  wxWave(const wxString& fileName, bool isResource = FALSE);
-  wxWave(int size, const wxByte* data);
-  ~wxWave();
-
-public:
-  // Create from resource or file
-  bool  Create(const wxString& fileName, bool isResource = FALSE);
-  // Create from data
-  bool Create(int size, const wxByte* data);
-
-  bool  IsOk() const { return (m_waveData ? TRUE : FALSE); };
-  bool  Play(bool async = TRUE, bool looped = FALSE) const;
-
-protected:
-  bool  Free();
-
-private:
-  wxByte* m_waveData;
-  int   m_waveLength;
-  bool  m_isResource;
-
-    DECLARE_NO_COPY_CLASS(wxWave)
-};
-#endif
-#endif
-

diff --git a/include/wx/os2/sound.h b/include/wx/os2/sound.h
new file mode 100644 (file)
index 0000000..c5b3944
--- /dev/null
+++ b/include/wx/os2/sound.h
@@ -0,0 +1,46 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        sound.h
+// Purpose:     wxSound class (loads and plays short Windows .wav files).
+//              Optional on non-Windows platforms.
+// Author:      David Webster
+// Modified by:
+// Created:     10/17/99
+// RCS-ID:      $Id$
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_SOUND_H_
+#define _WX_SOUND_H_
+
+#include "wx/object.h"
+
+class wxSound : public wxSoundBase
+{
+public:
+  wxSound();
+  wxSound(const wxString& fileName, bool isResource = FALSE);
+  wxSound(int size, const wxByte* data);
+  ~wxSound();
+
+public:
+  // Create from resource or file
+  bool  Create(const wxString& fileName, bool isResource = FALSE);
+  // Create from data
+  bool Create(int size, const wxByte* data);
+
+  bool  IsOk() const { return (m_waveData ? TRUE : FALSE); };
+
+protected:
+  bool  Free();
+  
+  bool  DoPlay(unsigned flags) const;
+
+private:
+  wxByte* m_waveData;
+  int   m_waveLength;
+  bool  m_isResource;
+};
+
+#endif
+    // _WX_SOUND_H_

diff --git a/include/wx/os2/wave.h b/include/wx/os2/wave.h
deleted file mode 100644 (file)
index fdfce64..0000000
--- a/include/wx/os2/wave.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wave.h
-// Purpose:     wxWave class (loads and plays short Windows .wav files).
-//              Optional on non-Windows platforms.
-// Author:      David Webster
-// Modified by:
-// Created:     10/17/99
-// RCS-ID:      $Id$
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_WAVE_H_
-#define _WX_WAVE_H_
-
-#include "wx/object.h"
-
-class wxWave : public wxObject
-{
-public:
-  wxWave();
-  wxWave(const wxString& fileName, bool isResource = FALSE);
-  wxWave(int size, const wxByte* data);
-  ~wxWave();
-
-public:
-  // Create from resource or file
-  bool  Create(const wxString& fileName, bool isResource = FALSE);
-  // Create from data
-  bool Create(int size, const wxByte* data);
-
-  bool  IsOk() const { return (m_waveData ? TRUE : FALSE); };
-  bool  Play(bool async = TRUE, bool looped = FALSE) const;
-
-protected:
-  bool  Free();
-
-private:
-  wxByte* m_waveData;
-  int   m_waveLength;
-  bool  m_isResource;
-};
-
-#endif
-    // _WX_WAVE_H_