diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-06-14 12:45:04 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-06-14 12:45:04 +0200 |
| commit | 4d07f8c3e9a99242bfbd373722731025235d1968 (patch) | |
| tree | bed4d26ec4a726f5e566d131c41819799443a9e3 | |
| parent | 4ac809d49d7ad0e4b50e16cbdca1951f935c3681 (diff) | |
| download | libuca-4d07f8c3e9a99242bfbd373722731025235d1968.tar.gz libuca-4d07f8c3e9a99242bfbd373722731025235d1968.tar.bz2 libuca-4d07f8c3e9a99242bfbd373722731025235d1968.tar.xz libuca-4d07f8c3e9a99242bfbd373722731025235d1968.zip | |
Remove pixel rate from per-camera structure
We read the pixel rate directly from the camera and take the very first pixel
rate as the default pixel rate.
| -rw-r--r-- | src/cameras/uca-pco-camera.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/cameras/uca-pco-camera.c b/src/cameras/uca-pco-camera.c index 53bc1ab..871be73 100644 --- a/src/cameras/uca-pco-camera.c +++ b/src/cameras/uca-pco-camera.c @@ -145,7 +145,6 @@ typedef struct { int cl_format; gfloat max_frame_rate; gboolean has_camram; - guint default_pixel_rate; } pco_cl_map_entry; struct _UcaPcoCameraPrivate { @@ -180,10 +179,10 @@ struct _UcaPcoCameraPrivate { }; static pco_cl_map_entry pco_cl_map[] = { - { CAMERATYPE_PCO_EDGE, "libFullAreaGray8.so", FG_CL_8BIT_FULL_10, FG_GRAY, 30.0f, FALSE, 1 }, - { CAMERATYPE_PCO4000, "libDualAreaGray16.so", FG_CL_SINGLETAP_16_BIT, FG_GRAY16, 5.0f, TRUE, 8000000 }, - { CAMERATYPE_PCO_DIMAX_STD, "libFullAreaGray16.so", FG_CL_SINGLETAP_8_BIT, FG_GRAY16, 1279.0f, TRUE, 1 }, - { 0, NULL, 0, 0, 0.0f, FALSE, 1 } + { CAMERATYPE_PCO_EDGE, "libFullAreaGray8.so", FG_CL_8BIT_FULL_10, FG_GRAY, 30.0f, FALSE }, + { CAMERATYPE_PCO4000, "libDualAreaGray16.so", FG_CL_SINGLETAP_16_BIT, FG_GRAY16, 5.0f, TRUE }, + { CAMERATYPE_PCO_DIMAX_STD, "libFullAreaGray16.so", FG_CL_SINGLETAP_8_BIT, FG_GRAY16, 1279.0f, TRUE }, + { 0, NULL, 0, 0, 0.0f, FALSE } }; static pco_cl_map_entry *get_pco_cl_map_entry(int camera_type) |