diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2014-07-29 20:08:52 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2014-07-29 20:08:52 +0200 |
| commit | a89b2093e293deb2368086c4f014a667b7d118dd (patch) | |
| tree | 2dea0697dcbb463024f58692af41293146505451 /test | |
| parent | 3aa569acc828050133e20a93308fdb8904f0bf7f (diff) | |
| parent | 1d49c3e05cf3228c44186ee60541de7b8c7536ea (diff) | |
| download | libuca-a89b2093e293deb2368086c4f014a667b7d118dd.tar.gz libuca-a89b2093e293deb2368086c4f014a667b7d118dd.tar.bz2 libuca-a89b2093e293deb2368086c4f014a667b7d118dd.tar.xz libuca-a89b2093e293deb2368086c4f014a667b7d118dd.zip | |
Merge pull request #40 from ufo-kit/MockFramerate
Remove mock framerate property
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-mock.c | 8 |
1 files changed, 4 insertions, 4 deletions
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); } |