Update of /cvsroot/audacity/audacity-src/src/prefs
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv17786/src/prefs
Modified Files:
FileFormatPrefs.cpp
Log Message:
Disable <Download> and <Find library> buttons when FFMpeg support is not
compiled in
Index: FileFormatPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/FileFormatPrefs.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- FileFormatPrefs.cpp 25 Jun 2008 13:33:15 -0000 1.65
+++ FileFormatPrefs.cpp 27 Jun 2008 14:54:26 -0000 1.66
@@ -103,27 +103,32 @@
S.EndTwoColumn();
}
S.EndStatic();
-
S.StartStatic( _("FFmpeg Import/Export Library"),1);
{
S.StartTwoColumn();
S.AddVariableText( _("FFmpeg Library Version:"),
- true,
- wxALL | wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL );
+ true, wxALL | wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL );
+#if defined(USE_FFMPEG)
mFFmpegVersion = S.AddVariableText( wxT("FFmpeg library not found"),
- true,
- wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL );
+ true, wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL );
+#else
+ mFFmpegVersion = S.AddVariableText( wxT("FFmpeg support is not compiled
in"),
+ true, wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL );
+#endif
S.AddVariableText( _("FFmpeg Library:"),
- true,
- wxALL | wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL );
- S.Id( ID_FFMPEG_FIND_BUTTON ).AddButton( _("&Find Library"),
+ true, wxALL | wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL );
+ wxButton *bfnd = S.Id( ID_FFMPEG_FIND_BUTTON ).AddButton( _("&Find
Library"),
wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL );
S.AddVariableText( _("FFmpeg Library:"),
true,
wxALL | wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL );
- S.Id( ID_FFMPEG_DOWN_BUTTON ).AddButton( _("&Download"),
+ wxButton *bdwn = S.Id( ID_FFMPEG_DOWN_BUTTON ).AddButton(
_("&Download"),
wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL );
S.EndTwoColumn();
+#if !defined(USE_FFMPEG)
+ bdwn->Enable(FALSE);
+ bfnd->Enable(FALSE);
+#endif
}
S.EndStatic();
S.EndHorizontalLay();
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
