audacia
/
audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix the build of on-demand ffmpeg, disable the preference if FFmpeg support is not compiled in. Patch by Michael Chinen. This feature is currently off in experimental.h.

This commit is contained in:
RichardAsh1981@gmail.com 2013-05-25 15:36:04 +00:00
parent 8a1b3f38cc
commit fc0cb41356
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ondemand/ODDecodeFFmpegTask.cpp
View File

@ -9,20 +9,23 @@
******************************************************************/
#include <wx/wxprec.h>
#include "../Experimental.h"
// For compilers that support precompilation, includes "wx/wx.h".
#ifdef EXPERIMENTAL_OD_FFMPEG
#include "../Audacity.h" // needed before FFmpeg.h
#include "../FFmpeg.h" // which brings in avcodec.h, avformat.h
#include "../import/ImportFFmpeg.h"
#include <wx/wxprec.h>
// For compilers that support precompilation, includes "wx/wx.h".
#ifndef WX_PRECOMP
// Include your minimal set of headers here, or wx.h
#include <wx/window.h>
#endif
#include "../Experimental.h"
#ifdef USE_FFMPEG
#ifdef EXPERIMENTAL_OD_FFMPEG
#include "../FFmpeg.h" // which brings in avcodec.h, avformat.h
#include "../import/ImportFFmpeg.h"
extern FFmpegLibs *FFmpegLibsInst;
#include "ODDecodeFFmpegTask.h"
@ -656,6 +659,6 @@ void ODFFmpegDecoder::InsertCache(FFMpegDecodeCache* cache) {
mDecodeCache.erase(mDecodeCache.begin()+dropindex);
}
}
#endif
#endif //EXPERIMENTAL_OD_FFMPEG
#endif //USE_FFMPEG

5
src/prefs/LibraryPrefs.cpp
View File

@ -140,9 +140,12 @@ void LibraryPrefs::PopulateOrExchange(ShuttleGui & S)
}
S.EndTwoColumn();
#ifdef EXPERIMENTAL_OD_FFMPEG
S.TieCheckBox(_("Allow &background on-demand loading"),
wxCheckBox* checkbox = S.TieCheckBox(_("Allow &background on-demand loading"),
wxT("/Library/FFmpegOnDemand"),
false);
#if !defined(USE_FFMPEG)
checkbox->Enable(FALSE);
#endif
#endif
}
S.EndStatic();