From: Jonas Ådahl <jadahl@gmail.com>
Date: Wed, 12 Mar 2014 21:08:40 +0000 (+0100)
Subject: udev-seat: Make udev_seat_get_named take struct udev_input pointer
X-Git-Tag: upstream/0.1.8~361
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=58e158658f9049508c6b5c26a44bc28ad3460cab;p=profile%2Fivi%2Fweston-ivi-shell.git

udev-seat: Make udev_seat_get_named take struct udev_input pointer

No functional changes; API generalization in preparation for multiple
input backends.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
---

diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index 3f584a6..cbfa786 100644
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
@@ -1843,7 +1843,7 @@ setup_output_seat_constraint(struct drm_compositor *ec,
 	if (strcmp(s, "") != 0) {
 		struct udev_seat *seat;
 
-		seat = udev_seat_get_named(&ec->base, s);
+		seat = udev_seat_get_named(&ec->input, s);
 		if (seat)
 			seat->base.output = output;
 
diff --git a/src/udev-seat.c b/src/udev-seat.c
index f5c2fa8..51eefcd 100644
--- a/src/udev-seat.c
+++ b/src/udev-seat.c
@@ -35,8 +35,6 @@
 static const char default_seat[] = "seat0";
 static const char default_seat_name[] = "default";
 
-static struct udev_seat *
-udev_seat_create(struct weston_compositor *c, const char *seat_name);
 static void
 udev_seat_destroy(struct udev_seat *seat);
 
@@ -67,7 +65,7 @@ device_added(struct udev_device *udev_device, struct udev_input *input)
 	if (!seat_name)
 		seat_name = default_seat_name;
 
-	seat = udev_seat_get_named(c, seat_name);
+	seat = udev_seat_get_named(input, seat_name);
 
 	if (seat == NULL)
 		return -1;
@@ -365,8 +363,9 @@ notify_output_create(struct wl_listener *listener, void *data)
 }
 
 static struct udev_seat *
-udev_seat_create(struct weston_compositor *c, const char *seat_name)
+udev_seat_create(struct udev_input *input, const char *seat_name)
 {
+	struct weston_compositor *c = input->compositor;
 	struct udev_seat *seat;
 
 	seat = zalloc(sizeof *seat);
@@ -393,8 +392,9 @@ udev_seat_destroy(struct udev_seat *seat)
 }
 
 struct udev_seat *
-udev_seat_get_named(struct weston_compositor *c, const char *seat_name)
+udev_seat_get_named(struct udev_input *input, const char *seat_name)
 {
+	struct weston_compositor *c = input->compositor;
 	struct udev_seat *seat;
 
 	wl_list_for_each(seat, &c->seat_list, base.link) {
@@ -402,7 +402,7 @@ udev_seat_get_named(struct weston_compositor *c, const char *seat_name)
 			return seat;
 	}
 
-	seat = udev_seat_create(c, seat_name);
+	seat = udev_seat_create(input, seat_name);
 
 	if (!seat)
 		return NULL;
diff --git a/src/udev-seat.h b/src/udev-seat.h
index e0d491a..dda8a16 100644
--- a/src/udev-seat.h
+++ b/src/udev-seat.h
@@ -51,6 +51,6 @@ int udev_input_init(struct udev_input *input,
 		    const char *seat_id);
 void udev_input_destroy(struct udev_input *input);
 
-struct udev_seat *udev_seat_get_named(struct weston_compositor *c,
+struct udev_seat *udev_seat_get_named(struct udev_input *input,
 				      const char *seat_name);
 #endif