diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2011-04-27 09:00:22 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2011-04-27 09:00:22 +0200 |
| commit | c1b6c87c62f544fa6353bdb45bd9a21139eb1fa9 (patch) | |
| tree | eec71dc5dc39c57e132db637f8a616a1588b16b1 /src/cameras/dummy.c | |
| parent | 45cd588f12f485d4b3a44b425dcbbcdec5f833db (diff) | |
| download | uca-c1b6c87c62f544fa6353bdb45bd9a21139eb1fa9.tar.gz uca-c1b6c87c62f544fa6353bdb45bd9a21139eb1fa9.tar.bz2 uca-c1b6c87c62f544fa6353bdb45bd9a21139eb1fa9.tar.xz uca-c1b6c87c62f544fa6353bdb45bd9a21139eb1fa9.zip | |
Do state handling only once in uca.c instead of all camera implementations
Diffstat (limited to 'src/cameras/dummy.c')
| -rw-r--r-- | src/cameras/dummy.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/cameras/dummy.c b/src/cameras/dummy.c index 0283989..f0e8545 100644 --- a/src/cameras/dummy.c +++ b/src/cameras/dummy.c @@ -159,8 +159,6 @@ static void *uca_dummy_grab_thread(void *arg) static uint32_t uca_dummy_set_property(struct uca_camera_priv *cam, enum uca_property_ids property, void *data) { uint32_t err = UCA_ERR_CAMERA | UCA_ERR_PROP; - if (cam->state == UCA_CAM_RECORDING) - return err | UCA_ERR_IS_RECORDING; switch (property) { case UCA_PROP_WIDTH: @@ -235,7 +233,6 @@ static uint32_t uca_dummy_start_recording(struct uca_camera_priv *cam) #endif } cam->current_frame = 0; - cam->state = UCA_CAM_RECORDING; return UCA_NO_ERROR; } @@ -247,7 +244,6 @@ static uint32_t uca_dummy_stop_recording(struct uca_camera_priv *cam) free(dc->buffer); dc->buffer = NULL; } - cam->state = UCA_CAM_ARMED; return UCA_NO_ERROR; } |