hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'stable-1.0' into stable-1.1

Browse Source 
Conflicts:
	CMakeLists.txt
	README
	lmms.rc.in
This commit is contained in:
Tobias Doerffel
2014-07-06 13:56:44 +02:00
parent ddae5a8446 8122041d65
commit 97bb80b9b1
5 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -480,6 +480,7 @@ IF(LMMS_BUILD_WIN32)
"${MINGW_PREFIX}/bin/libglib-2.0-0.dll"
"${MINGW_PREFIX}/bin/libgthread-2.0-0.dll"
"${MINGW_PREFIX}/bin/zlib1.dll"
"${MINGW_PREFIX}/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32/bin/libwinpthread-1.dll"
DESTINATION .)
ELSE(LMMS_BUILD_WIN32)

2
plugins/LadspaEffect/swh/bode_shifter_cv_1432.c
View File

@@ -247,7 +247,7 @@ static void runBodeShifterCV(LADSPA_Handle instance, unsigned long sample_count)
/* Perform the Hilbert FIR convolution
* (probably FFT would be faster) */
hilb = 0.0f;
for (i = 0; i <= NZEROS/2; i++) {
for (i = 0; i < NZEROS/2; i++) {
hilb += (xcoeffs[i] * delay[(dptr - i*2) & (D_SIZE - 1)]);
}

4
plugins/vst_base/RemoteVstPlugin.cpp
View File

@@ -1860,10 +1860,12 @@ int main( int _argc, char * * _argv )
}
#ifdef LMMS_BUILD_WIN32
#ifndef __WINPTHREADS_VERSION
// (non-portable) initialization of statically linked pthread library
pthread_win32_process_attach_np();
pthread_win32_thread_attach_np();
#endif
#endif
#ifdef LMMS_BUILD_LINUX
#ifdef LMMS_HAVE_SCHED_H
@@ -1897,8 +1899,10 @@ int main( int _argc, char * * _argv )
#ifdef LMMS_BUILD_WIN32
#ifndef __WINPTHREADS_VERSION
pthread_win32_thread_detach_np();
pthread_win32_process_detach_np();
#endif
#endif
return 0;

3
plugins/zynaddsubfx/LocalZynAddSubFx.cpp
View File

@@ -26,6 +26,7 @@
#include "zynaddsubfx/src/Misc/Util.h"
#include <unistd.h>
#include <ctime>
#include "LocalZynAddSubFx.h"
@@ -52,9 +53,11 @@ LocalZynAddSubFx::LocalZynAddSubFx() :
if( s_instanceCount == 0 )
{
#ifdef LMMS_BUILD_WIN32
#ifndef __WINPTHREADS_VERSION
// (non-portable) initialization of statically linked pthread library
pthread_win32_process_attach_np();
pthread_win32_thread_attach_np();
#endif
#endif
initConfig();

4
plugins/zynaddsubfx/RemoteZynAddSubFx.cpp
View File

@@ -268,10 +268,12 @@ int main( int _argc, char * * _argv )
}
#ifdef LMMS_BUILD_WIN32
#ifndef __WINPTHREADS_VERSION
// (non-portable) initialization of statically linked pthread library
pthread_win32_process_attach_np();
pthread_win32_thread_attach_np();
#endif
#endif
RemoteZynAddSubFx * remoteZASF =
@@ -283,8 +285,10 @@ int main( int _argc, char * * _argv )
#ifdef LMMS_BUILD_WIN32
#ifndef __WINPTHREADS_VERSION
pthread_win32_thread_detach_np();
pthread_win32_process_detach_np();
#endif
#endif
return 0;