Merge master.

[dcpomatic.git] / src / lib / wscript

diff --git a/src/lib/wscript b/src/lib/wscript
index 5d27cfe45317d68df9c8e27dda6ea07bb2a0d173..8f26c53c6e9f6c4456ee4d3123c38b2491d89e0c 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -8,18 +8,17 @@ sources = """
           audio_content.cc
           audio_decoder.cc
           audio_mapping.cc
-          audio_merger.cc
           cinema.cc
           colour_conversion.cc
           config.cc
           content.cc
           content_factory.cc
+          content_subtitle.cc
           cross.cc
           dci_metadata.cc
           dcp_content_type.cc
           dcp_video_frame.cc
           dcpomatic_time.cc
-          decoder.cc
           dolby_cp750.cc
           encoder.cc
           examine_content_job.cc
@@ -33,16 +32,19 @@ sources = """
           film.cc
           filter.cc
           frame_rate_change.cc
+          internet.cc
           image.cc
           image_content.cc
           image_decoder.cc
           image_examiner.cc
+          image_proxy.cc
           job.cc
           job_manager.cc
           kdm.cc
           json_server.cc
           log.cc
           player.cc
+          player_video_frame.cc
           playlist.cc
           ratio.cc
           render_subtitles.cc