Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29784
Modified Files:
FFmpeg.h
Log Message:
Provide three separate sections for OS X, Windows and the rest of the Unixen so
that we get the different dynamic library names right (assuming that the OS X
names I'm seeing on the -devel list are correct)
Index: FFmpeg.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/FFmpeg.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- FFmpeg.h 14 Nov 2008 22:21:45 -0000 1.30
+++ FFmpeg.h 18 Nov 2008 22:13:41 -0000 1.31
@@ -242,10 +242,9 @@
return
wxString::Format(wxT("F(%s),C(%s),U(%s)"),mAVFormatVersion.c_str(),mAVCodecVersion.c_str(),mAVUtilVersion.c_str());
}
- /* note these values are for Windows only - Mac and Unix have their own
- * sections elsewhere */
- //\todo { Section for Mac and *nix }
#if defined(__WXMSW__)
+ /* Library names and file filters for Windows only */
+
wxString GetLibraryTypeString()
{
return _("Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries
(*.dll)|*.dll|All Files (*.*)|*");
@@ -260,7 +259,26 @@
{
return (wxT("avformat-") wxT(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR))
wxT(".dll"));
}
-#else //__WXMSW__
+#elif defined(__WXMAC__)
+ /* Library names and file filters for Mac OS only */
+ wxString GetLibraryTypeString()
+ {
+ return _("Only libavformat.*.dylib|libavformat.*.dylib|Dynamically
Linked Libraries (*.dylib)|*.dylib|All Files (*)|*");
+ }
+
+ wxString GetLibAVFormatPath()
+ {
+ return wxT("");
+ }
+
+ wxString GetLibAVFormatName()
+ {
+ return (wxT("libavformat.") wxT(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR))
+ wxT(".dylib"));
+ }
+#else
+ /* Library names and file filters for other platforms, basically Linux and
+ * other *nix platforms */
wxString GetLibraryTypeString()
{
return _("Only libavformat.so|libavformat.so*|Dynamically Linked
Libraries (*.so*)|*.so*|All Files (*)|*");
@@ -275,7 +293,8 @@
{
return (wxT("libavformat.so.")
wxT(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR)));
}
-#endif //__WXMSW__
+
+#endif // (__WXMAC__) || (__WXMSW__)
/// Ugly reference counting. I thought of using wxStuff for that,
/// but decided that wx reference counting is not useful, since
-------------------------------------------------------------------------
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
