Update of /cvsroot/audacity/audacity-src/src/export
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26565
Modified Files:
ExportFFmpeg.cpp
Log Message:
Change references to former "Import / Export" Preferences to "Libraries".
Don't query AAC exports with M4R extension.
Index: ExportFFmpeg.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/export/ExportFFmpeg.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- ExportFFmpeg.cpp 23 Mar 2009 22:20:24 -0000 1.58
+++ ExportFFmpeg.cpp 15 May 2009 22:11:56 -0000 1.59
@@ -4,7 +4,7 @@
ExportFFmpeg.cpp
- Audacity(R) is copyright (c) 1999-2008 Audacity Team.
+ Audacity(R) is copyright (c) 1999-2009 Audacity Team.
License: GPL v2. See License.txt.
LRN
@@ -58,7 +58,7 @@
PickFFmpegLibs();
if (!FFmpegLibsInst->ValidLibsLoaded())
{
- wxMessageBox(_("Properly configured FFmpeg is required to proceed.\nYou
can configure it in Preferences->Import/Export."));
+ wxMessageBox(_("Properly configured FFmpeg is required to proceed.\nYou
can configure it at Preferences > Libraries."));
result = false;
}
DropFFmpegLibs();
@@ -200,6 +200,7 @@
{
case FMT_M4A:
AddExtension(wxString(wxT("3gp")),fmtindex);
+ AddExtension(wxString(wxT("m4r")),fmtindex);
AddExtension(wxString(wxT("mp4")),fmtindex);
break;
case FMT_WMA2:
@@ -228,7 +229,7 @@
int subFormat = AdjustFormatIndex(format);
if (format == FMT_AMRNB || format == FMT_AMRWB)
{
- wxMessageBox(_("Properly configured FFmpeg is required to proceed. You
can configure it in Preferences->Import/Export.\nHowever AMR support is not
available with our FFmpeg installer, but requires you compile FFmpeg
yourself."), _("AMR support is unlikely"));
+ wxMessageBox(_("Properly configured FFmpeg is required to proceed.\nYou
can configure it at Preferences > Libraries.\n\nNote that AMR support is not
available with our FFmpeg\ninstaller, but requires you compile FFmpeg
yourself."), _("AMR support not distributable"));
result = false;
}
else if (!CheckFFmpegPresence())
@@ -348,7 +349,7 @@
mSampleRate = (int)project->GetRate();
mEncAudioCodecCtx->global_quality = -99999; //quality mode is off by
default;
- // Each export type has it's own settings
+ // Each export type has its own settings
switch (mSubFormat)
{
case FMT_M4A:
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables
unlimited royalty-free distribution of the report engine
for externally facing server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
