Credit Andrew - update libsndfile to 1.2.2; allow Maxchannels to be greater than...

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 7124395ebf7311e7c1dfbc9de026e4578068c224..1291b99213fce9781c2fe883d733e9bb65cd6189 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -5304,7 +5304,7 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
                int channels = 0;
                for( uint64_t mask=channel_mask; mask!=0; mask>>=1 ) channels += mask & 1;
                if( channels < 1 ) channels = 1;
-               if( channels > 6 ) channels = 6;
+               if( channels > MAXCHANNELS ) channels = MAXCHANNELS;
                session->audio_tracks = session->audio_channels = channels;
 
                int *achannel_positions = preferences->channel_positions[session->audio_channels-1];

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 1f5fde5bbea949989904b42e130e81e5dafca5ab..4b72a8617e7e3d986784a67f79283b7e09da6ed4 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -324,7 +324,7 @@ PKG_3RD([libogg],[auto],
   [ include ])
 
 PKG_3RD([libsndfile],[auto],
-  [libsndfile-1.0.28],
+  [libsndfile-1.2.2],
   [ src/.libs/libsndfile.a \
     src/.libs/libcommon.a \
     src/G72x/.libs/libg72x.a \

diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 8b779f046d394ff4556a2560b55812a72cc9f18a..ba1ce051d23e5c7505ec5daed6bf802c21fa1663 100644 (file)
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -277,6 +277,7 @@ x265.cfg_vars?=$(call cmake_config,source)
 x265.cfg_params?= -DENABLE_SHARED=no -DENABLE_CLI=no
 libvpx.cfg_params?= --enable-pic --disable-avx512 --enable-vp9-highbitdepth --disable-examples --disable-unit_tests
 libdpx.cfg_vars?= libtoolize; aclocal; autoconf; automake -a;
+libsndfile.cfg_params+= --disable-shared --enable-static --disable-sqlite --disable-mpeg
 
 DS:=$$$$$$$$
 pkg_cfg=$(call bld_path,$(1),usr/local/lib/pkgconfig):

diff --git a/cinelerra-5.1/thirdparty/src/libsndfile-1.2.2.tar.xz b/cinelerra-5.1/thirdparty/src/libsndfile-1.2.2.tar.xz
new file mode 100644 (file)
index 0000000..8ce5a73
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/libsndfile-1.2.2.tar.xz differ