Added missing #if wxUSE_WAVE

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

diff --git a/include/wx/mac/wave.h b/include/wx/mac/wave.h
index c203db629f69dcd7b9df10b07b3ac3debda64237..6fdbf6519bf581c63b5b4723f4d3f38c6b64999b 100644 (file)
--- a/include/wx/mac/wave.h
+++ b/include/wx/mac/wave.h
@@ -17,6 +17,8 @@
 #pragma interface "wave.h"
 #endif
 
 #pragma interface "wave.h"
 #endif
 

+#if wxUSE_WAVE
+

 #include "wx/object.h"
 
 class WXDLLEXPORT wxWave : public wxObject
 #include "wx/object.h"
 
 class WXDLLEXPORT wxWave : public wxObject


@@ -38,12 +40,13 @@ protected:
 
 private:
   void* m_sndChan;
 
 private:
   void* m_sndChan;

-       
+

   wxString m_sndname;
   void* m_hSnd;
   int   m_waveLength;
   bool  m_isResource;
 };
 
   wxString m_sndname;
   void* m_hSnd;
   int   m_waveLength;
   bool  m_isResource;
 };
 

+#endif

 #endif
     // _WX_WAVE_H_
 #endif
     // _WX_WAVE_H_

diff --git a/src/mac/carbon/wave.cpp b/src/mac/carbon/wave.cpp
index 01c7b9b035e4da0bd4c16a3738dc420816f41f11..499d5ab28bea9b5bf5f917dc5eececafb6641824 100644 (file)
--- a/src/mac/carbon/wave.cpp
+++ b/src/mac/carbon/wave.cpp
@@ -17,6 +17,8 @@
 #include "wx/string.h"
 #include "wx/wave.h"
 
 #include "wx/string.h"
 #include "wx/wave.h"
 

+#if wxUSE_WAVE
+

 #ifdef __WXMAC__
 #include "wx/mac/private.h"
 #ifndef __DARWIN__
 #ifdef __WXMAC__
 #include "wx/mac/private.h"
 #ifndef __DARWIN__


@@ -57,7 +59,7 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
                ret = true;
        else
        { /*
                ret = true;
        else
        { /*

-               if (sndChan) 
+               if (sndChan)

                {                                                                                                                                       // we're playing
                        FSClose(SndRefNum);
                        SndRefNum = 0;
                {                                                                                                                                       // we're playing
                        FSClose(SndRefNum);
                        SndRefNum = 0;


@@ -66,7 +68,7 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
                        sndChan = 0;
                        KillTimer(0,timerID);
                }
                        sndChan = 0;
                        KillTimer(0,timerID);
                }

-               
+

                if (!lpSnd)
                        return true;
 
                if (!lpSnd)
                        return true;
 


@@ -81,14 +83,14 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
 
                sndChan->qLength = 128;
 
 
                sndChan->qLength = 128;
 

-               if (noErr != SndNewChannel (&sndChan, sampledSynth, initMono | initNoInterp, 0)) 
+               if (noErr != SndNewChannel (&sndChan, sampledSynth, initMono | initNoInterp, 0))

                {
                        free(sndChan);
                        sndChan = 0;
                        return false;
                }
 
                {
                        free(sndChan);
                        sndChan = 0;
                        return false;
                }
 

-               if (!(SndRefNum = MacOpenSndFile ((char *)lpSnd))) 
+               if (!(SndRefNum = MacOpenSndFile ((char *)lpSnd)))

                {
                        SndDisposeChannel(sndChan, TRUE);
                        free(sndChan);
                {
                        SndDisposeChannel(sndChan, TRUE);
                        free(sndChan);


@@ -102,7 +104,7 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
                if (fdwSound & SND_ASYNC)
                        async = true;
 
                if (fdwSound & SND_ASYNC)
                        async = true;
 

-               if (SndStartFilePlay(sndChan, SndRefNum, 0, 81920, 0, 0, 0, async) != noErr) 
+               if (SndStartFilePlay(sndChan, SndRefNum, 0, 81920, 0, 0, 0, async) != noErr)

                {
                        FSClose (SndRefNum);
                        SndRefNum = 0;
                {
                        FSClose (SndRefNum);
                        SndRefNum = 0;


@@ -112,11 +114,11 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
                        return false;
                }
 
                        return false;
                }
 

-               if (async) 
+               if (async)

                {  // haven't finish yet
                        timerID = SetTimer(0, 0, 250, TimerCallBack);
                {  // haven't finish yet
                        timerID = SetTimer(0, 0, 250, TimerCallBack);

-               } 
-               else 
+               }
+               else

                {
                        FSClose (SndRefNum);
                        SndRefNum = 0;
                {
                        FSClose (SndRefNum);
                        SndRefNum = 0;


@@ -125,7 +127,7 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
                        sndChan = 0;
                }*/
        }
                        sndChan = 0;
                }*/
        }

-       
+

        return ret;
 }
 
        return ret;
 }
 


@@ -135,8 +137,8 @@ bool wxWave::Play(bool async, bool looped) const
 {
        char lpSnd[32];
        bool ret = false;
 {
        char lpSnd[32];
        bool ret = false;

-       
-       if (m_isResource) 
+
+       if (m_isResource)

        {
 #if TARGET_CARBON
          c2pstrcpy((unsigned char *)lpSnd, m_sndname);
        {
 #if TARGET_CARBON
          c2pstrcpy((unsigned char *)lpSnd, m_sndname);


@@ -145,13 +147,13 @@ bool wxWave::Play(bool async, bool looped) const
          c2pstr((char *) lpSnd);
 #endif
          SndListHandle hSnd;
          c2pstr((char *) lpSnd);
 #endif
          SndListHandle hSnd;

-         
+

          hSnd = (SndListHandle) GetNamedResource('snd ',(const unsigned char *) lpSnd);
 
          if ((hSnd != NULL) && (SndPlay((SndChannelPtr)m_sndChan, (SndListHandle) hSnd, async) == noErr))
            ret = true;
          hSnd = (SndListHandle) GetNamedResource('snd ',(const unsigned char *) lpSnd);
 
          if ((hSnd != NULL) && (SndPlay((SndChannelPtr)m_sndChan, (SndListHandle) hSnd, async) == noErr))
            ret = true;

-       } 
-       
+       }
+

        return ret;
 }
 
        return ret;
 }
 


@@ -159,7 +161,7 @@ bool wxWave::Play(bool async, bool looped) const
 bool wxWave::FreeData()
 {
        bool ret = false;
 bool wxWave::FreeData()
 {
        bool ret = false;

-       
+

        if (m_isResource)
        {
                m_sndname.Empty();
        if (m_isResource)
        {
                m_sndname.Empty();


@@ -167,9 +169,9 @@ bool wxWave::FreeData()
        }
        else
        {
        }
        else
        {

-               //TODO, 
+               //TODO,

        }
        }

-       
+

        return ret;
 }
 
        return ret;
 }
 


@@ -188,7 +190,7 @@ bool wxWave::FreeData()
        // first, get the volume reference number for the file.  Start by
        // making a Pstring with just the volume name
        strcpy ((char *) name, path);
        // first, get the volume reference number for the file.  Start by
        // making a Pstring with just the volume name
        strcpy ((char *) name, path);

-       if (c = strchr ((char *) name, ':')) 
+       if (c = strchr ((char *) name, ':'))

        {
                c++;
                *c = '\0';
        {
                c++;
                *c = '\0';


@@ -220,7 +222,7 @@ bool wxWave::FreeData()
 
 void TimerCallBack(HWND hwnd,UINT uMsg,UINT idEvent,DWORD dwTime)
 {
 
 void TimerCallBack(HWND hwnd,UINT uMsg,UINT idEvent,DWORD dwTime)
 {

-       if(!sndChan) 
+       if(!sndChan)

        {
                KillTimer(0,timerID);
                return;
        {
                KillTimer(0,timerID);
                return;


@@ -243,3 +245,4 @@ void TimerCallBack(HWND hwnd,UINT uMsg,UINT idEvent,DWORD dwTime)
 }*/
 
 
 }*/
 
 

+#endif

diff --git a/src/mac/wave.cpp b/src/mac/wave.cpp
index 01c7b9b035e4da0bd4c16a3738dc420816f41f11..499d5ab28bea9b5bf5f917dc5eececafb6641824 100644 (file)
--- a/src/mac/wave.cpp
+++ b/src/mac/wave.cpp
@@ -17,6 +17,8 @@
 #include "wx/string.h"
 #include "wx/wave.h"
 
 #include "wx/string.h"
 #include "wx/wave.h"
 

+#if wxUSE_WAVE
+

 #ifdef __WXMAC__
 #include "wx/mac/private.h"
 #ifndef __DARWIN__
 #ifdef __WXMAC__
 #include "wx/mac/private.h"
 #ifndef __DARWIN__


@@ -57,7 +59,7 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
                ret = true;
        else
        { /*
                ret = true;
        else
        { /*

-               if (sndChan) 
+               if (sndChan)

                {                                                                                                                                       // we're playing
                        FSClose(SndRefNum);
                        SndRefNum = 0;
                {                                                                                                                                       // we're playing
                        FSClose(SndRefNum);
                        SndRefNum = 0;


@@ -66,7 +68,7 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
                        sndChan = 0;
                        KillTimer(0,timerID);
                }
                        sndChan = 0;
                        KillTimer(0,timerID);
                }

-               
+

                if (!lpSnd)
                        return true;
 
                if (!lpSnd)
                        return true;
 


@@ -81,14 +83,14 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
 
                sndChan->qLength = 128;
 
 
                sndChan->qLength = 128;
 

-               if (noErr != SndNewChannel (&sndChan, sampledSynth, initMono | initNoInterp, 0)) 
+               if (noErr != SndNewChannel (&sndChan, sampledSynth, initMono | initNoInterp, 0))

                {
                        free(sndChan);
                        sndChan = 0;
                        return false;
                }
 
                {
                        free(sndChan);
                        sndChan = 0;
                        return false;
                }
 

-               if (!(SndRefNum = MacOpenSndFile ((char *)lpSnd))) 
+               if (!(SndRefNum = MacOpenSndFile ((char *)lpSnd)))

                {
                        SndDisposeChannel(sndChan, TRUE);
                        free(sndChan);
                {
                        SndDisposeChannel(sndChan, TRUE);
                        free(sndChan);


@@ -102,7 +104,7 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
                if (fdwSound & SND_ASYNC)
                        async = true;
 
                if (fdwSound & SND_ASYNC)
                        async = true;
 

-               if (SndStartFilePlay(sndChan, SndRefNum, 0, 81920, 0, 0, 0, async) != noErr) 
+               if (SndStartFilePlay(sndChan, SndRefNum, 0, 81920, 0, 0, 0, async) != noErr)

                {
                        FSClose (SndRefNum);
                        SndRefNum = 0;
                {
                        FSClose (SndRefNum);
                        SndRefNum = 0;


@@ -112,11 +114,11 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
                        return false;
                }
 
                        return false;
                }
 

-               if (async) 
+               if (async)

                {  // haven't finish yet
                        timerID = SetTimer(0, 0, 250, TimerCallBack);
                {  // haven't finish yet
                        timerID = SetTimer(0, 0, 250, TimerCallBack);

-               } 
-               else 
+               }
+               else

                {
                        FSClose (SndRefNum);
                        SndRefNum = 0;
                {
                        FSClose (SndRefNum);
                        SndRefNum = 0;


@@ -125,7 +127,7 @@ bool wxWave::Create(const wxString& fileName, bool isResource)
                        sndChan = 0;
                }*/
        }
                        sndChan = 0;
                }*/
        }

-       
+

        return ret;
 }
 
        return ret;
 }
 


@@ -135,8 +137,8 @@ bool wxWave::Play(bool async, bool looped) const
 {
        char lpSnd[32];
        bool ret = false;
 {
        char lpSnd[32];
        bool ret = false;

-       
-       if (m_isResource) 
+
+       if (m_isResource)

        {
 #if TARGET_CARBON
          c2pstrcpy((unsigned char *)lpSnd, m_sndname);
        {
 #if TARGET_CARBON
          c2pstrcpy((unsigned char *)lpSnd, m_sndname);


@@ -145,13 +147,13 @@ bool wxWave::Play(bool async, bool looped) const
          c2pstr((char *) lpSnd);
 #endif
          SndListHandle hSnd;
          c2pstr((char *) lpSnd);
 #endif
          SndListHandle hSnd;

-         
+

          hSnd = (SndListHandle) GetNamedResource('snd ',(const unsigned char *) lpSnd);
 
          if ((hSnd != NULL) && (SndPlay((SndChannelPtr)m_sndChan, (SndListHandle) hSnd, async) == noErr))
            ret = true;
          hSnd = (SndListHandle) GetNamedResource('snd ',(const unsigned char *) lpSnd);
 
          if ((hSnd != NULL) && (SndPlay((SndChannelPtr)m_sndChan, (SndListHandle) hSnd, async) == noErr))
            ret = true;

-       } 
-       
+       }
+

        return ret;
 }
 
        return ret;
 }
 


@@ -159,7 +161,7 @@ bool wxWave::Play(bool async, bool looped) const
 bool wxWave::FreeData()
 {
        bool ret = false;
 bool wxWave::FreeData()
 {
        bool ret = false;

-       
+

        if (m_isResource)
        {
                m_sndname.Empty();
        if (m_isResource)
        {
                m_sndname.Empty();


@@ -167,9 +169,9 @@ bool wxWave::FreeData()
        }
        else
        {
        }
        else
        {

-               //TODO, 
+               //TODO,

        }
        }

-       
+

        return ret;
 }
 
        return ret;
 }
 


@@ -188,7 +190,7 @@ bool wxWave::FreeData()
        // first, get the volume reference number for the file.  Start by
        // making a Pstring with just the volume name
        strcpy ((char *) name, path);
        // first, get the volume reference number for the file.  Start by
        // making a Pstring with just the volume name
        strcpy ((char *) name, path);

-       if (c = strchr ((char *) name, ':')) 
+       if (c = strchr ((char *) name, ':'))

        {
                c++;
                *c = '\0';
        {
                c++;
                *c = '\0';


@@ -220,7 +222,7 @@ bool wxWave::FreeData()
 
 void TimerCallBack(HWND hwnd,UINT uMsg,UINT idEvent,DWORD dwTime)
 {
 
 void TimerCallBack(HWND hwnd,UINT uMsg,UINT idEvent,DWORD dwTime)
 {

-       if(!sndChan) 
+       if(!sndChan)

        {
                KillTimer(0,timerID);
                return;
        {
                KillTimer(0,timerID);
                return;


@@ -243,3 +245,4 @@ void TimerCallBack(HWND hwnd,UINT uMsg,UINT idEvent,DWORD dwTime)
 }*/
 
 
 }*/
 
 

+#endif