From 9640339f2e9dc126406f6b6f8a091b924898b4f5 Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Sun, 25 Sep 2005 20:59:02 +0000
Subject: *** empty log message ***

---
 src/camera.cc | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'src/camera.cc')

diff --git a/src/camera.cc b/src/camera.cc
index 4cb9ad9..d24f9af 100644
--- a/src/camera.cc
+++ b/src/camera.cc
@@ -100,18 +100,22 @@ Camera::~Camera()
 	delete encode_queue;
 }
 
-void Camera::setCpr(char *newcpr)
+void Camera::setCpr(char *newcpr, char* name)
 {
   
-  if(initialized) encoder->setCpr(newcpr);
-  else info->error("Camera not initialized.");
-
+  if(initialized) {
+    encoder->setCpr(newcpr);
+    player->setCpr(newcpr, name); // For the text overlay
+  } else {
+    info->error("Camera not initialized.");
+  }
 }
 
 
 void Camera::start()
 {
-  if(initialized) {
+  if(initialized) { 
+    player->startrecord(); // For the text overlay
     encoder->start();
     decoder->start();
   } else {
@@ -122,6 +126,7 @@ void Camera::start()
 void Camera::stop(n_savestate save)
 {
   if(initialized) {
+    player->stoprecord(); // For the textoverlay
     decoder->stop(save);
     encoder->stop(save);
   } else {
@@ -164,9 +169,9 @@ int Camera::getQueueLength()
   return encode_queue->length();
 }
 
-void Camera::resize(int w, int h)
+void Camera::resize(int w, int h, bool s)
 {
-  player->resize(w,h);
+  player->resize(w,h,s);
 }
 
 #endif/* USE_GUI */
-- 
cgit v1.2.3