(blind) compilation fixes after latest changes

[wxWidgets.git] / include / wx / mac / carbon / sound.h

diff --git a/include/wx/mac/carbon/sound.h b/include/wx/mac/carbon/sound.h
index 18a84d101b0077e0bd78bcd4b5a19795e2ac00a3..ab2555f5e9da9f57a80141666ad97dd4c67f78a3 100644 (file)
--- a/include/wx/mac/carbon/sound.h
+++ b/include/wx/mac/carbon/sound.h
@@ -2,21 +2,17 @@
 // Name:        sound.h
 // Purpose:     wxSound class (loads and plays short Windows .wav files).
 //              Optional on non-Windows platforms.
 // Name:        sound.h
 // Purpose:     wxSound class (loads and plays short Windows .wav files).
 //              Optional on non-Windows platforms.

-// Author:      Stefan Csomor
+// Author:      Ryan Norton, Stefan Csomor

 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$

-// Copyright:   (c) Stefan Csomor
+// Copyright:   (c) Ryan Norton, Stefan Csomor

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SOUND_H_
 #define _WX_SOUND_H_
 
 // 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"
 #if wxUSE_SOUND
 
 #include "wx/object.h"


@@ -27,25 +23,31 @@ 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();

 
 public:
   bool  Create(const wxString& fileName, bool isResource = FALSE);
   bool  IsOk() const { return !m_sndname.IsEmpty(); }
 
 public:
   bool  Create(const wxString& fileName, bool isResource = FALSE);
   bool  IsOk() const { return !m_sndname.IsEmpty(); }

+  static void  Stop();
+  static bool IsPlaying();

 
 

-protected:
-  // prevent collision with some BSD definitions of macro Free()
-  bool  FreeData();
-  
+  void* GetHandle();
+protected:  

   bool  DoPlay(unsigned flags) const;
 
 private:
   bool  DoPlay(unsigned flags) const;
 
 private:

-  void* m_sndChan;
-
-  wxString m_sndname;
-  void* m_hSnd;
-  int   m_waveLength;
-  bool  m_isResource;
+    wxString m_sndname; //file path
+    char* m_hSnd; //pointer to resource or memory location
+    int m_waveLength; //size of file in memory mode
+    void* m_pTimer; //timer
+
+    enum wxSoundType
+    {
+        wxSound_MEMORY,
+        wxSound_FILE,
+        wxSound_RESOURCE,
+        wxSound_NONE
+    } m_type; //mode

 };
 
 #endif
 };
 
 #endif