X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..27a97d02eb2f3dcf031c5cbcd3c1321c6d35fce8:/src/msw/wave.cpp?ds=sidebyside

diff --git a/src/msw/wave.cpp b/src/msw/wave.cpp
index 8f54200b7b..675d15c9ae 100644
--- a/src/msw/wave.cpp
+++ b/src/msw/wave.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -21,37 +21,40 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include <wx/wx.h>
+#include "wx/wx.h"
 #endif
 
-#include <wx/file.h>
-#include <wx/msw/wave.h>
-#include <wx/msw/private.h>
+#include "wx/file.h"
+#include "wx/msw/wave.h"
+#include "wx/msw/private.h"
 
 #include <windows.h>
 #include <windowsx.h>
 
-#ifndef __GNUWIN32__
-#include <mmsystem.h>
-#endif
-
-#ifdef __GNUWIN32__
-#include <wx/msw/gnuwin32/extra.h>
+#ifdef __GNUWIN32_OLD__
+    #include "wx/msw/gnuwin32/extra.h"
+#else
+    #include <mmsystem.h>
 #endif
 
-wxWave::wxWave(void)
-  : m_waveLength(0), m_isResource(FALSE), m_waveData(NULL)
+wxWave::wxWave()
+  : m_waveData(NULL), m_waveLength(0), m_isResource(FALSE)
 {
 }
 
 wxWave::wxWave(const wxString& sFileName, bool isResource)
-  : m_waveLength(0), m_isResource(isResource), m_waveData(NULL)
+  : m_waveData(NULL), m_waveLength(0), m_isResource(isResource)
 {
   Create(sFileName, isResource);
 }
 
+wxWave::wxWave(int size, const wxByte* data)
+  : m_waveData(NULL), m_waveLength(0), m_isResource(FALSE)
+{
+  Create(size, data);
+}
 
-wxWave::~wxWave(void)
+wxWave::~wxWave()
 {
   Free();
 }
@@ -65,10 +68,14 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
     m_isResource = TRUE;
 
     HRSRC hresInfo;
-#ifdef __WIN32__
-    hresInfo = ::FindResourceA((HMODULE) wxhInstance, fileName, "WAVE");
+#if defined(__WIN32__) && !defined(__TWIN32__)
+#ifdef _UNICODE
+    hresInfo = ::FindResourceW((HMODULE) wxhInstance, fileName, wxT("WAVE"));
 #else
-    hresInfo = ::FindResource((HMODULE) wxhInstance, fileName, "WAVE");
+    hresInfo = ::FindResourceA((HMODULE) wxhInstance, fileName, wxT("WAVE"));
+#endif
+#else
+    hresInfo = ::FindResource((HMODULE) wxhInstance, fileName, wxT("WAVE"));
 #endif
     if (!hresInfo)
         return FALSE;
@@ -77,7 +84,7 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
 
     if (waveData)
     {
-      m_waveData= (byte*)::LockResource(waveData);
+      m_waveData= (wxByte*)::LockResource(waveData);
       m_waveLength = (int) ::SizeofResource((HMODULE) wxhInstance, hresInfo);
     }
 
@@ -93,7 +100,7 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
 
     m_waveLength = (int) fileWave.Length();
 
-    m_waveData = (byte*)::GlobalLock(::GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, m_waveLength));
+    m_waveData = (wxByte*)::GlobalLock(::GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, m_waveLength));
     if (!m_waveData)
         return FALSE;
 
@@ -103,13 +110,26 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
   }
 }
 
+bool wxWave::Create(int size, const wxByte* data)
+{
+  Free();
+  m_isResource = FALSE;
+  m_waveLength=size;
+  m_waveData = (wxByte*)::GlobalLock(::GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, m_waveLength));
+  if (!m_waveData)
+     return FALSE;
+
+  for (int i=0; i<size; i++) m_waveData[i] = data[i];
+  return TRUE;
+}
+
 bool wxWave::Play(bool async, bool looped) const
 {
   if (!IsOk())
     return FALSE;
 
 #ifdef __WIN32__
-  return ( ::PlaySound((LPCSTR)m_waveData, NULL, SND_MEMORY |
+  return ( ::PlaySound((LPCTSTR)m_waveData, NULL, SND_MEMORY |
     SND_NODEFAULT | (async ? SND_ASYNC : SND_SYNC) | (looped ? (SND_LOOP | SND_ASYNC) : 0)) != 0 );
 #else
   return ( ::sndPlaySound((LPCSTR)m_waveData, SND_MEMORY |
@@ -117,8 +137,7 @@ bool wxWave::Play(bool async, bool looped) const
 #endif
 }
 
-bool
-wxWave::Free(void)
+bool wxWave::Free()
 {
   if (m_waveData)
   {