Various fixes to push audio vaguely in the right direction.

[dcpomatic.git] / src / lib / wscript

diff --git a/src/lib/wscript b/src/lib/wscript
index 4c5ed04db998ad2859604d4f688e8f9e6eb8849b..efcb2bc1efef6fe30bb178778169715a30be74a2 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -1,19 +1,20 @@
 #
 #    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 #
-#    This program is free software; you can redistribute it and/or modify
+#    This file is part of DCP-o-matic.
+#
+#    DCP-o-matic is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
-#    This program is distributed in the hope that it will be useful,
+#    DCP-o-matic is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 import os
@@ -26,11 +27,11 @@ sources = """
           audio_buffers.cc
           audio_content.cc
           audio_decoder.cc
-          audio_decoder_stream.cc
           audio_delay.cc
           audio_filter.cc
           audio_filter_graph.cc
           audio_mapping.cc
+          audio_merger.cc
           audio_point.cc
           audio_processor.cc
           audio_stream.cc
@@ -44,6 +45,7 @@ sources = """
           content_factory.cc
           cross.cc
           curl_uploader.cc
+          dcp.cc
           dcp_content.cc
           dcp_content_type.cc
           dcp_decoder.cc
@@ -54,6 +56,10 @@ sources = """
           dcp_video.cc
           dcpomatic_socket.cc
           dcpomatic_time.cc
+          decoder.cc
+          decoder_factory.cc
+          decoder_part.cc
+          digester.cc
           dolby_cp750.cc
           emailer.cc
           encoder.cc
@@ -78,6 +84,7 @@ sources = """
           font.cc
           font_files.cc
           frame_rate_change.cc
+          hints.cc
           internet.cc
           image.cc
           image_content.cc
@@ -93,7 +100,6 @@ sources = """
           log.cc
           log_entry.cc
           magick_image_proxy.cc
-          md5_digester.cc
           mid_side_decoder.cc
           overlaps.cc
           player.cc
@@ -107,7 +113,6 @@ sources = """
           render_subtitles.cc
           resampler.cc
           rgba.cc
-          safe_stringstream.cc
           scoped_temporary.cc
           scp_uploader.cc
           screen.cc
@@ -116,7 +121,6 @@ sources = """
           send_problem_report_job.cc
           server.cc
           string_log_entry.cc
-          raw_convert.cc
           subtitle_content.cc
           subtitle_decoder.cc
           text_subtitle.cc
@@ -137,6 +141,7 @@ sources = """
           video_content_scale.cc
           video_decoder.cc
           video_filter_graph.cc
+          video_frame.cc
           video_mxf_content.cc
           video_mxf_decoder.cc
           video_mxf_examiner.cc
@@ -155,7 +160,7 @@ def build(bld):
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX
                  SAMPLERATE POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
-                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU
+                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE
                  """
 
     if bld.env.TARGET_OSX: