projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy and fix logging.
[dcpomatic.git]
/
src
/
lib
/
wscript
diff --git
a/src/lib/wscript
b/src/lib/wscript
index b6784dbaae47eaefaf3a46b5f5290bb00ffd89e9..7c332e88df1d4843a74bf1598fa4786e3bf12518 100644
(file)
--- a/
src/lib/wscript
+++ b/
src/lib/wscript
@@
-21,7
+21,7
@@
import os
import i18n
sources = """
import i18n
sources = """
- active_
subtitles
.cc
+ active_
text
.cc
analyse_audio_job.cc
atmos_mxf_content.cc
audio_analysis.cc
analyse_audio_job.cc
atmos_mxf_content.cc
audio_analysis.cc
@@
-38,7
+38,11
@@
sources = """
audio_ring_buffers.cc
audio_stream.cc
butler.cc
audio_ring_buffers.cc
audio_stream.cc
butler.cc
+ text_content.cc
+ text_decoder.cc
case_insensitive_sorter.cc
case_insensitive_sorter.cc
+ checker.cc
+ check_content_change_job.cc
cinema.cc
cinema_kdms.cc
cinema_sound_processor.cc
cinema.cc
cinema_kdms.cc
cinema_sound_processor.cc
@@
-57,7
+61,9
@@
sources = """
dcp_subtitle.cc
dcp_subtitle_content.cc
dcp_subtitle_decoder.cc
dcp_subtitle.cc
dcp_subtitle_content.cc
dcp_subtitle_decoder.cc
+ dcp_text_track.cc
dcp_video.cc
dcp_video.cc
+ dcpomatic_log.cc
dcpomatic_socket.cc
dcpomatic_time.cc
decoder.cc
dcpomatic_socket.cc
dcpomatic_time.cc
decoder.cc
@@
-66,6
+72,7
@@
sources = """
digester.cc
dkdm_wrapper.cc
dolby_cp750.cc
digester.cc
dkdm_wrapper.cc
dolby_cp750.cc
+ edid.cc
emailer.cc
empty.cc
encoder.cc
emailer.cc
empty.cc
encoder.cc
@@
-84,11
+91,13
@@
sources = """
ffmpeg_content.cc
ffmpeg_decoder.cc
ffmpeg_encoder.cc
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_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
font.cc
font_files.cc
frame_rate_change.cc
@@
-106,20
+115,21
@@
sources = """
job_manager.cc
j2k_encoder.cc
json_server.cc
job_manager.cc
j2k_encoder.cc
json_server.cc
+ lock_file_checker.cc
log.cc
log_entry.cc
log.cc
log_entry.cc
- magick_image_proxy.cc
mid_side_decoder.cc
mid_side_decoder.cc
+ monitor_checker.cc
overlaps.cc
player.cc
overlaps.cc
player.cc
- player_
subtitles
.cc
+ player_
text
.cc
player_video.cc
playlist.cc
position_image.cc
ratio.cc
raw_image_proxy.cc
reel_writer.cc
player_video.cc
playlist.cc
position_image.cc
ratio.cc
raw_image_proxy.cc
reel_writer.cc
- render_
subtitles
.cc
+ render_
text
.cc
resampler.cc
rgba.cc
scoped_temporary.cc
resampler.cc
rgba.cc
scoped_temporary.cc
@@
-132,11
+142,10
@@
sources = """
server.cc
shuffler.cc
string_log_entry.cc
server.cc
shuffler.cc
string_log_entry.cc
- subtitle_content.cc
- subtitle_decoder.cc
- text_subtitle.cc
- text_subtitle_content.cc
- text_subtitle_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
timer.cc
transcode_job.cc
types.cc
@@
-170,8
+179,8
@@
def build(bld):
obj.uselib = """
AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE
BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX
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:
"""
if bld.env.TARGET_OSX:
@@
-189,7
+198,7
@@
def build(bld):
i18n.po_to_mo(os.path.join('src', 'lib'), 'libdcpomatic2', bld)
def pot(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')
def pot_merge(bld):
i18n.pot_merge(os.path.join('src', 'lib'), 'libdcpomatic')