summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorFilippo Argiolas <filippo.argiolas@gmail.com>2010-02-03 10:41:04 +0100
committerFilippo Argiolas <filippo.argiolas@gmail.com>2010-02-03 11:12:10 +0100
commit506f3716d02dbdcfef633fd34a93fd818108d10a (patch)
tree2bc84edaefe36b7fd041e1d8f7592dc93d124363 /tests
parent6670758f27f48a008937268ee3f7cabb2f36dc18 (diff)
downloadcheese-506f3716d02dbdcfef633fd34a93fd818108d10a.tar.gz
Don't initialize device objects in device monitor
This way the monitor becomes just a tiny udev interface that doesn't use gstreamer for caps retrieval so that multiple monitors can be instanciated. The device creation has been moved into the "added" signal handler in cheese-camera.c
Diffstat (limited to 'tests')
-rw-r--r--tests/cheese-test-monitor.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/cheese-test-monitor.c b/tests/cheese-test-monitor.c
index 7db0e281..aed85e93 100644
--- a/tests/cheese-test-monitor.c
+++ b/tests/cheese-test-monitor.c
@@ -5,13 +5,12 @@
static void
added_cb (CheeseCameraDeviceMonitor *monitor,
- CheeseCameraDevice *device)
+ const char *id,
+ const char *device_file,
+ const char *product_name,
+ gint api_version)
{
- gchar *id;
-
- g_object_get (device, "device-id", &id, NULL);
g_message ("Added new device with ID '%s'", id);
- g_free (id);
}
static void