From 11d72fca7cbfaa052a59150a492d1342a2a436b9 Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Sat, 12 Aug 2006 15:08:42 +0000
Subject: *** empty log message ***
---
server/libfame_wrapper.cc | 2 +-
server/server.cc | 19 ++++++++++++++++---
2 files changed, 17 insertions(+), 4 deletions(-)
(limited to 'server')
diff --git a/server/libfame_wrapper.cc b/server/libfame_wrapper.cc
index c5df05c..1b0694a 100644
--- a/server/libfame_wrapper.cc
+++ b/server/libfame_wrapper.cc
@@ -228,7 +228,7 @@ Frame *LibFAMEWrapper::encode(Frame *dvframe)
Frame *output = new Frame(NULL, FAME_BUFFER_SIZE);
// Init frame params
- dv_get_timestamp(dvdecoder, output->timecode); // Set timecode
+ dv_get_timestamp(dvdecoder, output->timestamp); // Set timecode
output->size = 0; // Init size (incremented as we read)
unsigned char* pt = output->data; // Set pointer to start of data buffer
diff --git a/server/server.cc b/server/server.cc
index 27e5eef..0688a3e 100644
--- a/server/server.cc
+++ b/server/server.cc
@@ -3,7 +3,7 @@
* server.cc
*
* Mon Nov 8 11:35:01 CET 2004
- * Copyright 2004 Bent Bisballe
+ * Copyright 2004 Bent Bisballe Nyeng
* deva@aasimon.org
****************************************************************************/
@@ -26,6 +26,10 @@
*/
#include "server.h"
+//#ifdef USE_DEBUG
+//#include "efencepp.h"
+//#endif /*USE_DEBUG*/
+
#include "network.h"
#include <stdio.h>
@@ -55,6 +59,7 @@
#include "server_status.h"
#include "dv.h"
+#include "util.h"
void newConnection(Socket *socket)
{
@@ -65,8 +70,16 @@ void newConnection(Socket *socket)
Frame *frame;
while((frame = network.recvFrame())) {
-
- sleep(1);
+
+ MIaV::info->info("TC: %d %d %d %d - shoot %d freeze %d",
+ frame->timecode.hour,
+ frame->timecode.min,
+ frame->timecode.sec,
+ frame->timecode.frame,
+ frame->snapshot,
+ frame->freeze);
+
+ // sleep_1_frame();
if(frame->vframe) delete frame->vframe;
if(frame->aframe) delete frame->aframe;
--
cgit v1.2.3