summaryrefslogtreecommitdiff
path: root/src/camera.cc
diff options
context:
space:
mode:
authordeva <deva>2005-05-02 14:06:55 +0000
committerdeva <deva>2005-05-02 14:06:55 +0000
commite26eaf90b16dd94586e3d8699796a3a0df259574 (patch)
tree879448b611ed701ae08d10f2d2ac4da4478f9846 /src/camera.cc
parent7090b75a89eff8444a02e394832beaa2c2479bdf (diff)
Added unfreeze to decoder (called from camera).
Diffstat (limited to 'src/camera.cc')
-rw-r--r--src/camera.cc11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/camera.cc b/src/camera.cc
index c1720b9..03aa87f 100644
--- a/src/camera.cc
+++ b/src/camera.cc
@@ -27,6 +27,9 @@
*/
/*
* $Log$
+ * Revision 1.13 2005/05/02 14:06:55 deva
+ * Added unfreeze to decoder (called from camera).
+ *
* Revision 1.12 2005/05/02 10:35:23 deva
* Fixed wrongly showed snapshot thumbnails.
*
@@ -190,8 +193,12 @@ void Camera::freeze()
void Camera::unfreeze()
{
- if(initialized) player->start();
- else errorstatus->pushError("Camera not initialized.");
+ if(initialized) {
+ player->start();
+ decoder->unfreeze();
+ } else {
+ errorstatus->pushError("Camera not initialized.");
+ }
}
void Camera::snapshot(unsigned char *rgb)