Updated about dialog and options.

Originally committed to SVN as r2420.
This commit is contained in:
Rodrigo Braz Monteiro 2008-10-28 00:08:52 +00:00
parent 213d68ec2e
commit fdc7d2fd93
2 changed files with 9 additions and 3 deletions

View File

@ -79,6 +79,12 @@ AboutScreen::AboutScreen(wxWindow *parent)
libString += _T(" PortAudio - Copyright (c) 1999-2000 Ross Bencina, Phil Burk;\n"); libString += _T(" PortAudio - Copyright (c) 1999-2000 Ross Bencina, Phil Burk;\n");
#endif #endif
#ifdef WITH_FFMPEG #ifdef WITH_FFMPEG
#define _FFMPEG_ANY
#endif
#ifdef WITH_FFMPEGSOURCE
#define _FFMPEG_ANY
#endif
#ifdef _FFMPEG_ANY
libString += _T(" FFmpeg - Copyright (c) 2001 Fabrice Bellard,;\n"); libString += _T(" FFmpeg - Copyright (c) 2001 Fabrice Bellard,;\n");
#endif #endif
#ifdef WITH_AVISYNTH #ifdef WITH_AVISYNTH
@ -121,7 +127,7 @@ AboutScreen::AboutScreen(wxWindow *parent)
aboutString += _("Forum and wiki hosting by:"); aboutString += _("Forum and wiki hosting by:");
aboutString += _T(" Sigurd Tao Lyngse.\n"); aboutString += _T(" Sigurd Tao Lyngse.\n");
aboutString += _("SVN hosting by:"); aboutString += _("SVN hosting by:");
aboutString += _T(" David Lamparter, BerliOS, Mentar.\n"); aboutString += _T(" DeathWolf, David Lamparter, BerliOS, Mentar.\n");
aboutString += _("Bug tracker hosting by:"); aboutString += _("Bug tracker hosting by:");
aboutString += _T(" Niels Martin Hansen.\n"); aboutString += _T(" Niels Martin Hansen.\n");
aboutString += translatorCredit; aboutString += translatorCredit;

View File

@ -161,7 +161,7 @@ void OptionsManager::LoadDefaults(bool onlyDefaults,bool doOverride) {
SetInt(_T("Avisynth MemoryMax"),64,1700); SetInt(_T("Avisynth MemoryMax"),64,1700);
SetBool(_T("Threaded Video"),false,1700); SetBool(_T("Threaded Video"),false,1700);
#ifdef __WINDOWS__ #ifdef __WINDOWS__
SetText(_T("Video Provider"),_T("Avisynth"),1700); SetText(_T("Video Provider"),_T("ffmpegsource"),2416);
#else #else
SetText(_T("Video Provider"),_T("FFMPEG"),1945); SetText(_T("Video Provider"),_T("FFMPEG"),1945);
#endif #endif
@ -198,7 +198,7 @@ void OptionsManager::LoadDefaults(bool onlyDefaults,bool doOverride) {
SetInt(_T("Audio Cache"),1,1700); SetInt(_T("Audio Cache"),1,1700);
#if defined(__WINDOWS__) #if defined(__WINDOWS__)
SetText(_T("Audio Player"),_T("DirectSound"),1945); SetText(_T("Audio Player"),_T("DirectSound"),1945);
SetText(_T("Audio Provider"),_T("avisynth"),1700); SetText(_T("Audio Provider"),_T("ffmpegsource"),2416);
#elif defined(__APPLE__) #elif defined(__APPLE__)
SetText(_T("Audio Player"), _T("openal")); SetText(_T("Audio Player"), _T("openal"));
SetText(_T("Audio Provider"),_T("FFMPEG"),1945); SetText(_T("Audio Provider"),_T("FFMPEG"),1945);