From: Good Guy <good1.2guy@gmail.com>
Date: Thu, 25 Jan 2024 18:35:59 +0000 (-0700)
Subject: Credit Andrew - update libsndfile to 1.2.2; allow Maxchannels to be greater than... 
X-Git-Tag: 2024-01~1
X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=fc1574427d8253b4a8f2d3d5e26933b26cd0153a;p=goodguy%2Fcinelerra.git

Credit Andrew - update libsndfile to 1.2.2; allow Maxchannels to be greater than 6 while in some cases limited to 32
---

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 7124395e..1291b992 100644
--- 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 1f5fde5b..4b72a861 100644
--- 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 8b779f04..ba1ce051 100644
--- 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
index 00000000..8ce5a73c
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/libsndfile-1.2.2.tar.xz differ