From ff12ccdde76c54d3b9e69799a63750db9edf0023 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 23 Apr 2024 00:38:14 +0200 Subject: Revert "Tweak how lzma is linked." This reverts commit 604a5f9343eebfa0108a19bb6b8ec60bc81f4819. I don't know why I did this, and it breaks the mac-old (10.8) target as the lzma.5.dylib is not present on those machines. --- src/lib/wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/lib/wscript b/src/lib/wscript index 7dd3bfe35..87a1ca787 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -228,7 +228,7 @@ def build(bld): obj.uselib = """ AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX - SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB XML++ + SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB LZMA XML++ CURL ZIP BZ2 FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG JPEG LEQM_NRT LIBZ """ -- cgit v1.2.3 From 1542a9512ba7bd0c99105839741f4e0b41bd8e67 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 24 Apr 2024 02:11:29 +0200 Subject: Supporters update. --- src/wx/supporters.cc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/wx/supporters.cc b/src/wx/supporters.cc index 514b53d7b..89551cf9d 100644 --- a/src/wx/supporters.cc +++ b/src/wx/supporters.cc @@ -102,6 +102,7 @@ supported_by.Add (wxT ("Kenneth Biswabic")); supported_by.Add (wxT ("Mike Blakesley")); supported_by.Add (wxT ("Cyrille Blanc")); supported_by.Add (wxT ("Stijn De Blieck")); +supported_by.Add (wxT ("Nathan Block")); supported_by.Add (wxT ("Félix Blume")); supported_by.Add (wxT ("Theodor Boder")); supported_by.Add (wxT ("Thorsten Boehnke")); @@ -655,6 +656,7 @@ supported_by.Add (wxT ("Dieter Kovacic")); supported_by.Add (wxT ("Filip Kovcin")); supported_by.Add (wxT ("Alan Kraemer")); supported_by.Add (wxT ("Joel Krantz")); +supported_by.Add (wxT ("Oliver Krause")); supported_by.Add (wxT ("Ralph-Raimund Krause")); supported_by.Add (wxT ("Christian Kreil")); supported_by.Add (wxT ("Sebastian Kreis")); @@ -683,6 +685,7 @@ supported_by.Add (wxT ("Angela En-yu Lao")); supported_by.Add (wxT ("Daniel Martinez Lara")); supported_by.Add (wxT ("Gabriel Montagné Láscaris-Comneno")); supported_by.Add (wxT ("Marga Laube")); +supported_by.Add (wxT ("James Lauchlan")); supported_by.Add (wxT ("Nicholas Lavigne")); supported_by.Add (wxT ("Philip Lawrence")); supported_by.Add (wxT ("David Lawrence")); -- cgit v1.2.3 From 4401895dfbb25834d4385621824e72ae19c8962c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 29 Apr 2024 22:34:51 +0200 Subject: Fix silent stereo mixdown exports when the project audio channel count is > 6. This became much more of a problem when we started defaulting to 8 channels in projects. --- src/lib/ffmpeg_encoder.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc index 60241b233..c1170f098 100644 --- a/src/lib/ffmpeg_encoder.cc +++ b/src/lib/ffmpeg_encoder.cc @@ -102,7 +102,7 @@ FFmpegEncoder::stereo_map() const map.set(dcp::Channel::CENTRE, 1, overall_gain * minus_3dB); map.set(dcp::Channel::LS, 0, overall_gain); break; - case 6: + default: map.set(dcp::Channel::LEFT, 0, overall_gain); map.set(dcp::Channel::RIGHT, 1, overall_gain); map.set(dcp::Channel::CENTRE, 0, overall_gain * minus_3dB); @@ -111,7 +111,6 @@ FFmpegEncoder::stereo_map() const map.set(dcp::Channel::RS, 1, overall_gain); break; } - /* XXX: maybe we should do something better for >6 channel DCPs */ return map; } -- cgit v1.2.3 From b3563f2bea0b853864dcc34acb97c2cff2a7a4d8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 30 Apr 2024 11:20:53 +0200 Subject: Supporters update. --- src/wx/supporters.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/wx/supporters.cc b/src/wx/supporters.cc index 89551cf9d..b39dbd5dc 100644 --- a/src/wx/supporters.cc +++ b/src/wx/supporters.cc @@ -319,6 +319,7 @@ supported_by.Add (wxT ("Guy Edmonds")); supported_by.Add (wxT ("Simon Edwards")); supported_by.Add (wxT ("Arthur Edwards")); supported_by.Add (wxT ("Si Edwards")); +supported_by.Add (wxT ("NEU-Deli Einbeck")); supported_by.Add (wxT ("Thomas Eingartner")); supported_by.Add (wxT ("Gabriel Eiriz")); supported_by.Add (wxT ("Chris Eller")); @@ -864,6 +865,7 @@ supported_by.Add (wxT ("Rigoberto Mora")); supported_by.Add (wxT ("Pierre-Jean Moreau")); supported_by.Add (wxT ("Stanislas Moreau")); supported_by.Add (wxT ("Ted Morée")); +supported_by.Add (wxT ("Daniel Morez")); supported_by.Add (wxT ("Paolo Morini")); supported_by.Add (wxT ("Lars Moritz")); supported_by.Add (wxT ("Lindsay Morris")); -- cgit v1.2.3