Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28243
Modified Files:
AudacityApp.cpp FFmpeg.cpp FFmpeg.h
Log Message:
Tidy up a Mac build error with ffmpeg headers (probably doesn't show with
precompiled headers on?). This both simplifies the FFmpeg.h/cpp files slightly
by making the load function only exist if ffmpeg is enabled, and re-arranges
the includes so that FFmpeg.h should actually compile when included from
AudacityApp.cpp on platforms with a system-wide stdint.h
Index: FFmpeg.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/FFmpeg.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- FFmpeg.cpp 23 Oct 2008 03:08:45 -0000 1.29
+++ FFmpeg.cpp 14 Nov 2008 22:21:45 -0000 1.30
@@ -36,10 +36,6 @@
return wxString(wxT("FFmpeg support not compiled in"));
}
-void FFmpegStartup()
-{
-}
-
#else
/** This pointer to the shared object has global scope and is used to track the
@@ -94,6 +90,7 @@
}
}
+/** Called during Audacity start-up to try and load the ffmpeg libraries */
void FFmpegStartup()
{
bool enabled = false;
Index: FFmpeg.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/FFmpeg.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- FFmpeg.h 10 Nov 2008 21:58:03 -0000 1.29
+++ FFmpeg.h 14 Nov 2008 22:21:45 -0000 1.30
@@ -74,14 +74,14 @@
//----------------------------------------------------------------------------
wxString GetFFmpegVersion(wxWindow *parent);
+/* from here on in, this stuff only applies when ffmpeg is available */
+#if defined(USE_FFMPEG)
+
//----------------------------------------------------------------------------
// Attempt to load and enable/disable FFmpeg at startup
//----------------------------------------------------------------------------
void FFmpegStartup();
-/* from here on in, this stuff only applies when ffmpeg is available */
-#if defined(USE_FFMPEG)
-
bool LoadFFmpeg(bool showerror);
/// If Audacity failed to load libav*, this dialog
Index: AudacityApp.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AudacityApp.cpp,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -d -r1.210 -r1.211
--- AudacityApp.cpp 14 Oct 2008 15:41:16 -0000 1.210
+++ AudacityApp.cpp 14 Nov 2008 22:21:45 -0000 1.211
@@ -23,6 +23,9 @@
#include "Audacity.h" // This should always be included first
+#include "FFmpeg.h" // this has to come before wx includes otherwise it breaks
+// Linux and OS X builds with a subtle stdint.h issue
+
#include <wx/defs.h>
#include <wx/app.h>
#include <wx/docview.h>
@@ -89,8 +92,6 @@
#include "import/ImportQT.h"
#endif
-#include "FFmpeg.h"
-
#ifdef _DEBUG
#ifdef _MSC_VER
#undef THIS_FILE
@@ -860,7 +861,9 @@
mLogger->EnableLogging(true);
mLogger->SetLogLevel(wxLOG_Max);
+ #ifdef USE_FFMPEG
FFmpegStartup();
+ #endif
//
// Auto-recovery
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
