diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-14 11:27:17 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-14 11:27:17 +0100 |
| commit | 5c09a82e483593fb37da0cad20679be735887613 (patch) | |
| tree | 9fb0540536514aa1dc7d4fd4c056c24ca52f59d3 /src/tools | |
| parent | 8f7d0cf115980cb357bc3da410842503930e66b8 (diff) | |
Move Eyes and ColourConversion into PlayerVideoFrame.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/server_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc index 48d817cfe..6a1e2fa41 100644 --- a/src/tools/server_test.cc +++ b/src/tools/server_test.cc @@ -48,10 +48,10 @@ static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log")); static int frame = 0; void -process_video (shared_ptr<PlayerVideoFrame> image, Eyes eyes, ColourConversion conversion, Time) +process_video (shared_ptr<PlayerVideoFrame> pvf) { - shared_ptr<DCPVideoFrame> local (new DCPVideoFrame (image->image(), frame, eyes, conversion, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)); - shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (image->image(), frame, eyes, conversion, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)); + shared_ptr<DCPVideoFrame> local (new DCPVideoFrame (pvf->image(), frame, pvf->eyes(), pvf->colour_conversion(), film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)); + shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (pvf->image(), frame, pvf->eyes(), pvf->colour_conversion(), film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)); cout << "Frame " << frame << ": "; cout.flush (); @@ -146,7 +146,7 @@ main (int argc, char* argv[]) shared_ptr<Player> player = film->make_player (); player->disable_audio (); - player->Video.connect (boost::bind (process_video, _1, _2, _3, _5)); + player->Video.connect (boost::bind (process_video, _1)); bool done = false; while (!done) { done = player->pass (); |