Update of /cvsroot/audacity/audacity-src/src/prefs
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv14053/prefs
Modified Files:
FileFormatPrefs.cpp
Log Message:
Restore Blade API usage under Windows and update it to support VBR and channel
mode.
Change search sequence for lame library.
Simplify "find the library" dialog.
Index: FileFormatPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/FileFormatPrefs.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- FileFormatPrefs.cpp 17 Mar 2007 20:28:49 -0000 1.45
+++ FileFormatPrefs.cpp 22 Mar 2007 05:17:53 -0000 1.46
@@ -261,11 +261,11 @@
void FileFormatPrefs::SetMP3VersionText()
{
wxString versionString = _("MP3 exporting plugin not found");
- bool doMP3 = GetMP3Exporter()->LoadLibrary();
+ bool doMP3 = GetMP3Exporter()->LoadLibrary(this, false);
if (doMP3)
doMP3 = GetMP3Exporter()->ValidLibraryLoaded();
- if(doMP3)
+ if (doMP3)
versionString = GetMP3Exporter()->GetLibraryVersion();
mMP3Version->SetLabel(versionString);
@@ -302,25 +302,16 @@
/// tell us where the MP3 library is.
void FileFormatPrefs::OnMP3FindButton(wxCommandEvent& evt)
{
- // We go round the houses here, because GetMP3Exporter
- // takes its path from gPrefs rather than as a parameter.
- wxString oldPath = gPrefs->Read(wxT("/MP3/MP3LibPath"), wxT(""));
- gPrefs->Write(wxT("/MP3/MP3LibPath"), wxString(wxT("")));
-
- if (GetMP3Exporter()->FindLibrary(this))
+ if (GetMP3Exporter()->FindLibrary(this, false)) {
SetMP3VersionText();
- else {
- gPrefs->Write(wxT("/MP3/MP3LibPath"), oldPath);
}
- if(GetMP3Exporter()->GetConfigurationCaps() & MP3CONFIG_BITRATE) {
- bool valid = GetMP3Exporter()->ValidLibraryLoaded();
- mMP3Bitrate->Enable(valid);
- mMP3Stereo->Enable(valid);
- mMP3Joint->Enable(valid);
- mMP3VBR->Enable(valid);
- mMP3CBR->Enable(valid);
- }
+ bool valid = GetMP3Exporter()->ValidLibraryLoaded();
+ mMP3Bitrate->Enable(valid);
+ mMP3Stereo->Enable(valid);
+ mMP3Joint->Enable(valid);
+ mMP3VBR->Enable(valid);
+ mMP3CBR->Enable(valid);
}
///
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
