mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Minor fixes for building on Linux.

Browse source 
(Why does wxThread::GetCPUCount like failing?)

Originally committed to SVN as r549.
This commit is contained in:
Niels Martin Hansen 2006-11-08 23:40:40 +00:00
parent b5aa079df8
commit 2251867890
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -3,6 +3,7 @@ AC_INIT(aegisub, 1.10)
AC_CONFIG_AUX_DIR(ac) AC_CONFIG_AUX_DIR(ac)
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AC_CONFIG_HEADER([core/posix/acconf.h]) AC_CONFIG_HEADER([core/posix/acconf.h])
AC_GNU_SOURCE
AC_CANONICAL_HOST AC_CANONICAL_HOST
@ -88,7 +89,7 @@ AC_SEARCH_LIBS([lua_call], [lua lua50],, [AC_MSG_ERROR([lua not found.])])
AC_SEARCH_LIBS([luaopen_base], [lualib lualib50],, [AC_MSG_WARN([lualib not found, assuming lua 5.1])]) AC_SEARCH_LIBS([luaopen_base], [lualib lualib50],, [AC_MSG_WARN([lualib not found, assuming lua 5.1])])
AC_CHECK_LIB([portaudio], [Pa_Initialize],, [AC_MSG_ERROR([portaudio not found.])]) AC_CHECK_LIB([portaudio], [Pa_Initialize],, [AC_MSG_ERROR([portaudio not found.])])
AC_CHECK_LIB([avcodec], [avcodec_init]) AC_CHECK_LIB([avcodec], [avcodec_init])
AC_CHECK_LIB([avformat], [av_frac_init]) AC_CHECK_LIB([avformat], [av_read_frame])
PKG_CHECK_MODULES([ASA], asa >= 0.3.2, [ PKG_CHECK_MODULES([ASA], asa >= 0.3.2, [
CPPFLAGS="$CPPFLAGS $ASA_CFLAGS" CPPFLAGS="$CPPFLAGS $ASA_CFLAGS"

1
core/audio_display.cpp
View file

@ -713,6 +713,7 @@ void AudioDisplay::DrawSpectrum(wxDC &finaldc,bool weak) {
////// START OF PARALLELISED CODE ////// ////// START OF PARALLELISED CODE //////
const int cpu_count = wxThread::GetCPUCount(); const int cpu_count = wxThread::GetCPUCount();
if (cpu_count < 1) cpu_count = 1;
std::vector<SpectrumRendererThread*> threads(cpu_count); std::vector<SpectrumRendererThread*> threads(cpu_count);
for (int i = 0; i < cpu_count; i++) { for (int i = 0; i < cpu_count; i++) {
// Ugh, way too many data to copy in // Ugh, way too many data to copy in