comment out unused stuff for warning fixing

[wxWidgets.git] / src / mac / carbon / sound.cpp

diff --git a/src/mac/carbon/sound.cpp b/src/mac/carbon/sound.cpp
index a4870396eb5839ddef5a789b491958e2e322401f..93e36c103c395acf57c858fd741b28c62aa0e0b0 100644 (file)
--- a/src/mac/carbon/sound.cpp
+++ b/src/mac/carbon/sound.cpp
@@ -9,10 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "sound.h"
 #endif
 
 #pragma implementation "sound.h"
 #endif
 

+#include "wx/wxprec.h"
+

 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/log.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/log.h"


@@ -223,7 +225,7 @@ inline bool wxInitQT ()
         int nError;
         //-2093 no dll
             if ((nError = InitializeQTML(0)) != noErr)
         int nError;
         //-2093 no dll
             if ((nError = InitializeQTML(0)) != noErr)

-                wxLogSysError(wxString::Format("Couldn't Initialize Quicktime-%i", nError));
+                wxLogSysError(wxString::Format(wxT("Couldn't Initialize Quicktime-%i"), nError));

         #endif
         EnterMovies();
         return true;
         #endif
         EnterMovies();
         return true;


@@ -474,8 +476,10 @@ bool wxSound::DoPlay(unsigned flags) const
         wxASSERT_MSG(!(flags & wxSOUND_LOOP), wxT("Can't loop and play syncronously at the same time"));
 
         //Play movie until it ends, then exit
         wxASSERT_MSG(!(flags & wxSOUND_LOOP), wxT("Can't loop and play syncronously at the same time"));
 
         //Play movie until it ends, then exit

+        //Note that due to quicktime caching this may not always 
+        //work 100% correctly

         while (!IsMovieDone(movie))
         while (!IsMovieDone(movie))

-            MoviesTask(movie, 0);
+            MoviesTask(movie, 1);

 
         DisposeMovie(movie);
     }
 
         DisposeMovie(movie);
     }