X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwscript;h=88cec75ec940868d829a04e4dc0bf1e9d22e6322;hb=264583479e79b481251f1772b228f82cd77552d3;hp=a841e5b552522d7c8425243f537fab561317b26c;hpb=27b83475435dda4e84a90cf59a52f150905c4ab1;p=dcpomatic.git

diff --git a/src/lib/wscript b/src/lib/wscript
index a841e5b55..88cec75ec 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -21,7 +21,7 @@ import os
 import i18n
 
 sources = """
-          active_captions.cc
+          active_text.cc
           analyse_audio_job.cc
           atmos_mxf_content.cc
           audio_analysis.cc
@@ -38,9 +38,11 @@ sources = """
           audio_ring_buffers.cc
           audio_stream.cc
           butler.cc
-          caption_content.cc
-          caption_decoder.cc
+          text_content.cc
+          text_decoder.cc
           case_insensitive_sorter.cc
+          checker.cc
+          check_content_change_job.cc
           cinema.cc
           cinema_kdms.cc
           cinema_sound_processor.cc
@@ -59,6 +61,7 @@ sources = """
           dcp_subtitle.cc
           dcp_subtitle_content.cc
           dcp_subtitle_decoder.cc
+          dcp_text_track.cc
           dcp_video.cc
           dcpomatic_socket.cc
           dcpomatic_time.cc
@@ -68,6 +71,7 @@ sources = """
           digester.cc
           dkdm_wrapper.cc
           dolby_cp750.cc
+          edid.cc
           emailer.cc
           empty.cc
           encoder.cc
@@ -86,11 +90,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,13 +114,14 @@ sources = """
           job_manager.cc
           j2k_encoder.cc
           json_server.cc
+          lock_file_checker.cc
           log.cc
           log_entry.cc
-          magick_image_proxy.cc
           mid_side_decoder.cc
+          monitor_checker.cc
           overlaps.cc
           player.cc
-          player_caption.cc
+          player_text.cc
           player_video.cc
           playlist.cc
           position_image.cc
@@ -134,9 +141,10 @@ sources = """
           server.cc
           shuffler.cc
           string_log_entry.cc
-          text_caption_file.cc
-          text_caption_file_content.cc
-          text_caption_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,8 +178,8 @@ 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++
-                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE
+                 SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB LZMA XML++
+                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG
                  """
 
     if bld.env.TARGET_OSX:
@@ -189,7 +197,7 @@ def build(bld):
     i18n.po_to_mo(os.path.join('src', 'lib'), 'libdcpomatic2', bld)
 
 def pot(bld):
-    i18n.pot(os.path.join('src', 'lib'), sources, 'libdcpomatic')
+    i18n.pot(os.path.join('src', 'lib'), sources + " util.h", 'libdcpomatic')
 
 def pot_merge(bld):
     i18n.pot_merge(os.path.join('src', 'lib'), 'libdcpomatic')