Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg

[dcpomatic.git] / src / lib / wscript

diff --git a/src/lib/wscript b/src/lib/wscript
index 9e2d07d7c97da0204d47fecdda28182ed5f4c9f9..75e122e289c6ed1e09e7ba551f3f750de04fb825 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -21,7 +21,7 @@ import os
 import i18n
 
 sources = """
-          active_subtitles.cc
+          active_text.cc
           analyse_audio_job.cc
           atmos_mxf_content.cc
           audio_analysis.cc
@@ -38,7 +38,10 @@ sources = """
           audio_ring_buffers.cc
           audio_stream.cc
           butler.cc
+          text_content.cc
+          text_decoder.cc
           case_insensitive_sorter.cc
+          check_content_change_job.cc
           cinema.cc
           cinema_kdms.cc
           cinema_sound_processor.cc
@@ -55,8 +58,9 @@ sources = """
           dcp_encoder.cc
           dcp_examiner.cc
           dcp_subtitle.cc
-          dcp_text_content.cc
-          dcp_text_decoder.cc
+          dcp_subtitle_content.cc
+          dcp_subtitle_decoder.cc
+          dcp_text_track.cc
           dcp_video.cc
           dcpomatic_socket.cc
           dcpomatic_time.cc
@@ -66,6 +70,7 @@ sources = """
           digester.cc
           dkdm_wrapper.cc
           dolby_cp750.cc
+          edid.cc
           emailer.cc
           empty.cc
           encoder.cc
@@ -84,11 +89,13 @@ sources = """
           ffmpeg_content.cc
           ffmpeg_decoder.cc
           ffmpeg_encoder.cc
+          ffmpeg_file_encoder.cc
           ffmpeg_examiner.cc
           ffmpeg_stream.cc
           ffmpeg_subtitle_stream.cc
           film.cc
           filter.cc
+          ffmpeg_image_proxy.cc
           font.cc
           font_files.cc
           frame_rate_change.cc
@@ -108,11 +115,11 @@ sources = """
           json_server.cc
           log.cc
           log_entry.cc
-          magick_image_proxy.cc
           mid_side_decoder.cc
+          monitor_checker.cc
           overlaps.cc
           player.cc
-          player_subtitles.cc
+          player_text.cc
           player_video.cc
           playlist.cc
           position_image.cc
@@ -131,12 +138,12 @@ sources = """
           send_problem_report_job.cc
           server.cc
           shuffler.cc
+          spl.cc
           string_log_entry.cc
-          text_content.cc
-          text_decoder.cc
-          plain_text_file.cc
-          plain_text_file_content.cc
-          plain_text_file_decoder.cc
+          string_text_file.cc
+          string_text_file_content.cc
+          string_text_file_decoder.cc
+          text_ring_buffers.cc
           timer.cc
           transcode_job.cc
           types.cc
@@ -170,7 +177,7 @@ def build(bld):
     obj.uselib = """
                  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++
+                 SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB LZMA XML++
                  CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE
                  """