X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwscript;h=338027859b79ffe7dbb2215d10bfb67de7d4248a;hb=faffe89bd9c720ebc7884be7c775638d3ff5bf23;hp=d6444aee507b049b853884de2a9ebd313b0d8b8b;hpb=695506b51231548d76d9c8b5848671faab4a27b4;p=libdcp.git

diff --git a/src/wscript b/src/wscript
index d6444aee..33802785 100644
--- a/src/wscript
+++ b/src/wscript
@@ -2,125 +2,124 @@ from waflib import TaskGen
 
 def build(bld):
     source = """
-             argb_frame.cc
              asset.cc
              certificate_chain.cc
-             certificates.cc
+             certificate.cc
              colour_conversion.cc
              colour_matrix.cc
-             content.cc
              cpl.cc
-             dcp.cc        
+             data.cc
+             dcp.cc
              dcp_time.cc
              decrypted_kdm.cc
              decrypted_kdm_key.cc
              encrypted_kdm.cc
              exceptions.cc
              file.cc
-             font.cc
+             font_asset.cc
+             font_node.cc
              gamma_transfer_function.cc
-             image.cc
-             interop_load_font.cc
-             interop_subtitle_content.cc
+             interop_load_font_node.cc
+             interop_subtitle_asset.cc
+             j2k.cc
              key.cc
              local_time.cc
              metadata.cc
              modified_gamma_transfer_function.cc
-             mono_picture_mxf.cc
-             mono_picture_mxf_writer.cc
+             mono_picture_asset.cc
+             mono_picture_asset_writer.cc
              mono_picture_frame.cc
              mxf.cc
-             mxf_writer.cc
+             asset_writer.cc
              object.cc
-             picture_mxf.cc
-             picture_mxf_writer.cc
+             openjpeg_image.cc
+             picture_asset.cc
+             picture_asset_writer.cc
              reel.cc
              reel_asset.cc
              reel_mono_picture_asset.cc
-             reel_mxf_asset.cc
+             reel_mxf.cc
              reel_picture_asset.cc
              reel_sound_asset.cc
              reel_stereo_picture_asset.cc
              reel_subtitle_asset.cc
              rgb_xyz.cc
-             signer.cc
-             smpte_load_font.cc
-             smpte_subtitle_content.cc
-             sound_mxf.cc
-             sound_mxf_writer.cc
+             smpte_load_font_node.cc
+             smpte_subtitle_asset.cc
+             sound_asset.cc
+             sound_asset_writer.cc
              sound_frame.cc
-             stereo_picture_mxf.cc
-             stereo_picture_mxf_writer.cc
+             stereo_picture_asset.cc
+             stereo_picture_asset_writer.cc
              stereo_picture_frame.cc
-             subtitle.cc
-             subtitle_content.cc
+             subtitle_node.cc
+             subtitle_asset.cc
              subtitle_string.cc
-             text.cc
+             text_node.cc
              transfer_function.cc
              types.cc
              util.cc
              version.cc
-             xyz_frame.cc
              """
 
     headers = """
               asset.h
               certificate_chain.h
-              certificates.h
+              certificate.h
+              chromaticity.h
               colour_conversion.h
               colour_matrix.h
               cpl.h
-              content.h
               dcp.h
               dcp_time.h
+              data.h
               decrypted_kdm.h
               decrypted_kdm_key.h
               encrypted_kdm.h
               exceptions.h
+              font_asset.h
               gamma_transfer_function.h
-              image.h
-              interop_load_font.h
-              interop_subtitle_content.h
+              interop_load_font_node.h
+              interop_subtitle_asset.h
+              j2k.h
               key.h
-              load_font.h
+              load_font_node.h
               local_time.h
               metadata.h
-              mono_picture_mxf.h
+              mono_picture_asset.h
               mono_picture_frame.h
               modified_gamma_transfer_function.h
               mxf.h
-              mxf_writer.h
+              asset_writer.h
               object.h
-              picture_mxf.h
-              picture_mxf_writer.h
+              openjpeg_image.h
+              picture_asset.h
+              picture_asset_writer.h
               raw_convert.h
               rgb_xyz.h
               reel.h
               reel_asset.h
               reel_mono_picture_asset.h
-              reel_mxf_asset.h
+              reel_mxf.h
               reel_picture_asset.h
               reel_sound_asset.h
               reel_stereo_picture_asset.h
               reel_subtitle_asset.h
               ref.h
-              argb_frame.h
-              signer.h
-              smpte_load_font.h
-              smpte_subtitle_content.h
+              smpte_load_font_node.h
+              smpte_subtitle_asset.h
               sound_frame.h
-              sound_mxf.h
-              sound_mxf_writer.h
-              stereo_picture_mxf.h
+              sound_asset.h
+              sound_asset_writer.h
+              stereo_picture_asset.h
               stereo_picture_frame.h
-              subtitle.h
-              subtitle_content.h
+              subtitle_node.h
+              subtitle_asset.h
               subtitle_string.h
               transfer_function.h
               types.h
               util.h
               version.h
-              xyz_frame.h
               """
 
     # Main library