summaryrefslogtreecommitdiff
path: root/src/camera.cc
diff options
context:
space:
mode:
authordeva <deva>2005-09-25 20:59:02 +0000
committerdeva <deva>2005-09-25 20:59:02 +0000
commit9640339f2e9dc126406f6b6f8a091b924898b4f5 (patch)
treedad14d120f0fc4401552714b5efffe20b5c78a4d /src/camera.cc
parent36326a9c1bab28c5eccea6cc2c56c9a8b83dac0d (diff)
*** empty log message ***
Diffstat (limited to 'src/camera.cc')
-rw-r--r--src/camera.cc19
1 files changed, 12 insertions, 7 deletions
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 */