Merge master.
[dcpomatic.git] / src / lib / wscript
index 5d27cfe45317d68df9c8e27dda6ea07bb2a0d173..433f50b3fdca4565902baf3b4b7e7246a59514d4 100644 (file)
@@ -8,18 +8,18 @@ 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.cc
           dcp_video_frame.cc
           dcpomatic_time.cc
-          decoder.cc
           dolby_cp750.cc
           encoder.cc
           examine_content_job.cc
@@ -33,6 +33,7 @@ sources = """
           film.cc
           filter.cc
           frame_rate_change.cc
+          internet.cc
           image.cc
           image_content.cc
           image_decoder.cc