Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv22346/src
Modified Files:
FFmpeg.cpp
Log Message:
Fixed Audacity not compiling without precompiled headers (moved debug new
definition).
Worked around a bug with C99-incompatible vprintf function on Windows (shows up
when importing OGG file). There may be more of them.
Index: FFmpeg.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/FFmpeg.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- FFmpeg.cpp 1 Jul 2008 14:03:29 -0000 1.19
+++ FFmpeg.cpp 2 Aug 2008 11:38:40 -0000 1.20
@@ -15,6 +15,10 @@
*//*******************************************************************/
+
+#include "Audacity.h" // for config*.h
+#include "FFmpeg.h"
+
#ifdef _DEBUG
#ifdef _MSC_VER
#undef THIS_FILE
@@ -23,8 +27,6 @@
#endif
#endif
-#include "Audacity.h" // for config*.h
-#include "FFmpeg.h"
#if !defined(USE_FFMPEG)
wxString GetFFmpegVersion(wxWindow *parent, bool prompt)
@@ -84,8 +86,6 @@
return versionString;
}
-
-
void av_log_wx_callback(void* ptr, int level, const char* fmt, va_list vl)
{
int av_log_level = AV_LOG_WARNING;
@@ -99,8 +99,10 @@
}
wxString frm(fmt,wxConvLibc);
+#if defined(wxMSW)
+ frm.Replace(wxT("%t"),wxT("%i"),true); //TODO: on Windows vprintf won't
handle %t, and probably some others. Investigate.
+#endif
printstring.Append(wxString::FormatV(frm,vl));
-
wxString cpt;
switch (level)
{
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
