diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-25 11:58:12 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-25 13:36:17 +0100 |
| commit | 89ee4cc6019036fa4fc0a6e07e052ffdc3b136ac (patch) | |
| tree | 5a1d1b3e1e6fc4d280f1ff0f1598a37e0fea3257 /src/tools/server_test.cc | |
| parent | e08c1d30bb5e2d77339541eb7dbe7d1ca95485ab (diff) | |
Make player decide whether subtitles should be burnt based on
content settings rather than using the film's settings. Remove
film property of burn-subtitles.
Diffstat (limited to 'src/tools/server_test.cc')
| -rw-r--r-- | src/tools/server_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc index 02f4e6673..b7e48a333 100644 --- a/src/tools/server_test.cc +++ b/src/tools/server_test.cc @@ -49,8 +49,8 @@ static int frame_count = 0; void process_video (shared_ptr<PlayerVideo> pvf) { - shared_ptr<DCPVideo> local (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, true, log_)); - shared_ptr<DCPVideo> remote (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, true, log_)); + shared_ptr<DCPVideo> local (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)); + shared_ptr<DCPVideo> remote (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)); cout << "Frame " << frame_count << ": "; cout.flush (); |