summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Dritschler <timo.dritschler@kit.edu>2014-07-29 19:09:23 +0200
committerTimo Dritschler <timo.dritschler@kit.edu>2014-07-29 19:09:23 +0200
commit1d49c3e05cf3228c44186ee60541de7b8c7536ea (patch)
tree2dea0697dcbb463024f58692af41293146505451
parentf17ab98df02426106864684967ad76055fab348b (diff)
downloaduca-1d49c3e05cf3228c44186ee60541de7b8c7536ea.tar.gz
uca-1d49c3e05cf3228c44186ee60541de7b8c7536ea.tar.bz2
uca-1d49c3e05cf3228c44186ee60541de7b8c7536ea.tar.xz
uca-1d49c3e05cf3228c44186ee60541de7b8c7536ea.zip
Fixed a bug in mock plugin
Fixed test-mock still using obsolete 'frame-rate' property
-rw-r--r--plugins/mock/uca-mock-camera.c2
-rw-r--r--test/test-mock.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/mock/uca-mock-camera.c b/plugins/mock/uca-mock-camera.c
index c97344e..4ae4077 100644
--- a/plugins/mock/uca-mock-camera.c
+++ b/plugins/mock/uca-mock-camera.c
@@ -202,7 +202,7 @@ mock_grab_func(gpointer data)
UcaMockCameraPrivate *priv = UCA_MOCK_CAMERA_GET_PRIVATE(mock_camera);
UcaCamera *camera = UCA_CAMERA(mock_camera);
- gfloat fps = 0;
+ gdouble fps = 0;
g_object_get (G_OBJECT (data), "frames-per-second", &fps, NULL);
const gulong sleep_time = (gulong) G_USEC_PER_SEC / fps;
diff --git a/test/test-mock.c b/test/test-mock.c
index e66ef8f..10c0a36 100644
--- a/test/test-mock.c
+++ b/test/test-mock.c
@@ -110,7 +110,7 @@ test_recording_async (Fixture *fixture, gconstpointer data)
uca_camera_set_grab_func (camera, grab_func, &count);
g_object_set (G_OBJECT (camera),
- "frame-rate", 10.0,
+ "frames-per-second", 10.0,
"transfer-asynchronously", TRUE,
NULL);
@@ -191,7 +191,7 @@ test_property_units (Fixture *fixture, gconstpointer data)
g_assert (uca_camera_get_unit (fixture->camera, "name") == UCA_UNIT_NA);
/* Mock-specific properties */
- g_assert (uca_camera_get_unit (fixture->camera, "frame-rate") == UCA_UNIT_COUNT);
+ g_assert (uca_camera_get_unit (fixture->camera, "frames-per-second") == UCA_UNIT_COUNT);
}
static void
@@ -214,9 +214,9 @@ test_signal (Fixture *fixture, gconstpointer data)
{
UcaCamera *camera = UCA_CAMERA (fixture->camera);
gboolean success = FALSE;
- g_signal_connect (camera, "notify::frame-rate", (GCallback) on_property_change, &success);
+ g_signal_connect (camera, "notify::frames-per-second", (GCallback) on_property_change, &success);
g_object_set (G_OBJECT (camera),
- "frame-rate", 30.0,
+ "frames-per-second", 30.0,
NULL);
g_assert (success == TRUE);
}