X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03e11df5470fd64d9d9a669d0b50b84c2d714736..202848fe9e424cd3a9fa9a23ff7e6fdd78dbe4cf:/src/mac/wave.cpp

diff --git a/src/mac/wave.cpp b/src/mac/wave.cpp
index ac2dcac7e0..01c7b9b035 100644
--- a/src/mac/wave.cpp
+++ b/src/mac/wave.cpp
@@ -17,6 +17,13 @@
 #include "wx/string.h"
 #include "wx/wave.h"
 
+#ifdef __WXMAC__
+#include "wx/mac/private.h"
+#ifndef __DARWIN__
+#include <Sound.h>
+#endif
+#endif
+
 wxWave::wxWave()
   : m_sndChan(0), m_hSnd(NULL), m_waveLength(0), m_isResource(true)
 {
@@ -31,9 +38,14 @@ wxWave::wxWave(const wxString& sFileName, bool isResource)
 
 wxWave::~wxWave()
 {
-    Free();
+    FreeData();
 }
 
+wxWave::wxWave(int size, const wxByte* data)
+  : m_sndChan(0), m_hSnd(NULL), m_waveLength(0), m_isResource(false)
+{
+    //TODO convert data
+}
 
 bool wxWave::Create(const wxString& fileName, bool isResource)
 {
@@ -126,21 +138,25 @@ bool wxWave::Play(bool async, bool looped) const
 	
 	if (m_isResource) 
 	{
-		strcpy(lpSnd, m_sndname); 
-		c2pstr((char *) lpSnd);
-		SndListHandle hSnd;
-		
-		hSnd = (SndListHandle) GetNamedResource('snd ',(const unsigned char *) lpSnd);
+#if TARGET_CARBON
+	  c2pstrcpy((unsigned char *)lpSnd, m_sndname);
+#else
+	  strcpy(lpSnd, m_sndname);
+	  c2pstr((char *) lpSnd);
+#endif
+	  SndListHandle hSnd;
+	  
+	  hSnd = (SndListHandle) GetNamedResource('snd ',(const unsigned char *) lpSnd);
 
-		if ((hSnd != NULL) && (SndPlay(m_sndChan, hSnd, async) == noErr))
-			ret = true;
+	  if ((hSnd != NULL) && (SndPlay((SndChannelPtr)m_sndChan, (SndListHandle) hSnd, async) == noErr))
+	    ret = true;
 	} 
 	
 	return ret;
 }
 
 
-bool wxWave::Free()
+bool wxWave::FreeData()
 {
 	bool ret = false;