Update of /cvsroot/audacity/audacity-src/src/export
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv24230/src/export
Modified Files:
ExportFFmpeg.cpp
Log Message:
FindItem() -> FindWindowById()
Index: ExportFFmpeg.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/export/ExportFFmpeg.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ExportFFmpeg.cpp 9 Jul 2008 16:04:25 -0000 1.13
+++ ExportFFmpeg.cpp 10 Jul 2008 15:39:22 -0000 1.14
@@ -473,11 +473,6 @@
mFormatName = S.Id(FEFormatNameID).AddVariableText(wxT(""));
S.Id(FECodecLabelID).AddVariableText(wxT("Codec:"));
mCodecName = S.Id(FECodecNameID).AddVariableText(wxT(""));
- // mFormatChoice = S.Id(FEFormatID).TieChoice(wxT("Format:"),
wxT("/FileFormats/FFmpegFormat"), mFormatLongNames[0], mFormatLongNames,
mFormatNames);
- // mFormatChoice->SetToolTip(wxT("File format (AAC, AC3, FLAC,
etc) or container (MP4, MKV, AVI, OGG, etc)"));
- // mCodecChoice = S.Id(FECodecID).TieChoice(wxT("Codec:"),
wxT("/FileFormats/FFmpegCodec"), mCodecLongNames[0], mCodecLongNames,
mCodecNames);
- // mCodecChoice->SetToolTip(wxT("Audio codec"));
-
}
S.EndMultiColumn();
S.AddVariableText(wxT("Not all formats and codecs are compatible. Some
parameters (such as bitrate and samplerate) combinations are not compatible
with some codecs too."),false);
@@ -780,7 +775,7 @@
if (codec && format)
{
handled = apptable[i].control;
- wxWindow *item = FindItem(apptable[i].control);
+ wxWindow *item = FindWindowById(apptable[i].control,this);
if (item != NULL) item->Enable(apptable[i].enable);
}
}
@@ -1927,6 +1922,8 @@
mEncAudioCodecCtx->bit_rate =
gPrefs->Read(wxT("/FileFormats/WMABitRate"), 198000);
break;
case FMT_OTHER:
+ mSampleRate = gPrefs->Read(wxT("/FileFormats/FFmpegSampleRate"),44100);
+ mEncAudioCodecCtx->bit_rate =
gPrefs->Read(wxT("/FileFormats/FFmpegBitRate"), 198000);
break;
default:
return false;
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
