diff options
Diffstat (limited to 'spa/plugins/v4l2/v4l2-monitor.c')
| -rw-r--r-- | spa/plugins/v4l2/v4l2-monitor.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/spa/plugins/v4l2/v4l2-monitor.c b/spa/plugins/v4l2/v4l2-monitor.c index 30aa6846..06a7eeb0 100644 --- a/spa/plugins/v4l2/v4l2-monitor.c +++ b/spa/plugins/v4l2/v4l2-monitor.c @@ -218,10 +218,10 @@ spa_v4l2_monitor_set_event_callback (SpaMonitor *monitor, SpaResult res; SpaV4l2Monitor *this; - if (monitor == NULL || monitor->handle == NULL) + if (monitor == NULL) return SPA_RESULT_INVALID_ARGUMENTS; - this = (SpaV4l2Monitor *) monitor->handle; + this = SPA_CONTAINER_OF (monitor, SpaV4l2Monitor, monitor); this->event_cb = callback; this->user_data = user_data; @@ -271,10 +271,10 @@ spa_v4l2_monitor_enum_items (SpaMonitor *monitor, struct udev_list_entry *devices; struct udev_device *dev; - if (monitor == NULL || monitor->handle == NULL || item == NULL || state == NULL) + if (monitor == NULL || item == NULL || state == NULL) return SPA_RESULT_INVALID_ARGUMENTS; - this = (SpaV4l2Monitor *) monitor->handle; + this = SPA_CONTAINER_OF (monitor, SpaV4l2Monitor, monitor); if ((res = v4l2_udev_open (this)) < 0) return res; @@ -316,7 +316,6 @@ spa_v4l2_monitor_enum_items (SpaMonitor *monitor, static const SpaMonitor v4l2monitor = { NULL, - NULL, sizeof (SpaMonitor), spa_v4l2_monitor_set_event_callback, spa_v4l2_monitor_enum_items, @@ -385,7 +384,6 @@ v4l2_monitor_init (const SpaHandleFactory *factory, this->uri.monitor = spa_id_map_get_id (this->map, SPA_MONITOR_URI); this->monitor = v4l2monitor; - this->monitor.handle = handle; return SPA_RESULT_OK; } |