summaryrefslogtreecommitdiff
path: root/src/lib/server.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-07-01 14:28:04 +0100
committerCarl Hetherington <cth@carlh.net>2014-07-01 14:28:04 +0100
commit15f23b356b757a9697bf1a9ec30c243ab8070404 (patch)
tree5b86b032ea47f606bbadb0c32801e16064d341a9 /src/lib/server.cc
parent45e6a6df959188bfdb8dfc4906c35d1a3c234b0a (diff)
DCPVideoFrame -> DCPVideo and PlayerVideoFrame -> PlayerVideo.
Diffstat (limited to 'src/lib/server.cc')
-rw-r--r--src/lib/server.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/server.cc b/src/lib/server.cc
index 9d1925de1..2469d4151 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -34,10 +34,10 @@
#include "util.h"
#include "scaler.h"
#include "image.h"
-#include "dcp_video_frame.h"
+#include "dcp_video.h"
#include "config.h"
#include "cross.h"
-#include "player_video_frame.h"
+#include "player_video.h"
#include "i18n.h"
@@ -112,9 +112,9 @@ Server::process (shared_ptr<Socket> socket, struct timeval& after_read, struct t
return -1;
}
- shared_ptr<PlayerVideoFrame> pvf (new PlayerVideoFrame (xml, socket, _log));
+ shared_ptr<PlayerVideo> pvf (new PlayerVideo (xml, socket, _log));
- DCPVideoFrame dcp_video_frame (pvf, xml, _log);
+ DCPVideo dcp_video_frame (pvf, xml, _log);
gettimeofday (&after_read, 0);