diff options
author | Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de> | 2011-03-10 10:25:12 +0100 |
---|---|---|
committer | Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de> | 2011-03-10 10:25:12 +0100 |
commit | f0cb3317a0cf8333c03b0a45e3bb25c7490f85ef (patch) | |
tree | 58ebebc3f22375fe5d1e40e851f0907476f701c9 /src/uca.c | |
parent | c3b3cfd97b51bf6e6970156c92506cb6fa037b65 (diff) | |
download | uca-f0cb3317a0cf8333c03b0a45e3bb25c7490f85ef.tar.gz uca-f0cb3317a0cf8333c03b0a45e3bb25c7490f85ef.tar.bz2 uca-f0cb3317a0cf8333c03b0a45e3bb25c7490f85ef.tar.xz uca-f0cb3317a0cf8333c03b0a45e3bb25c7490f85ef.zip |
Add IPE infrastructure and make sure that cameras check grabber existence
Diffstat (limited to 'src/uca.c')
-rw-r--r-- | src/uca.c | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -114,12 +114,14 @@ struct uca_t *uca_init(void) i++; } - if (grabber == NULL) { - free(uca); - return NULL; - } + /* XXX: We could have no grabber (aka NULL) which is good anyway, since + * some cameras don't need a grabber device (such as the IPE camera), + * therefore we also probe each camera against the NULL grabber. However, + * each camera must make sure to check for such a situation. */ + uca->grabbers = grabber; - grabber->next = NULL; + if (grabber != NULL) + grabber->next = NULL; /* Probe each camera that is configured */ i = 0; |