temporary: add the name argument at pepper_compositor_create_fd

This patch is a temporary one. This patch will be reverted later.

Change-Id: I50ae1145465ffbdf8b5a347531811651076d0dcf

diff --git a/samples/drm-backend.c b/samples/drm-backend.c
index 848410321342b911321c9950dd1d2bcbcbb41497..7b232a296e4be9db15dd6291bd63396621c9540f 100644 (file)
--- a/samples/drm-backend.c
+++ b/samples/drm-backend.c
@@ -94,7 +94,7 @@ main(int argc, char **argv)
        if (!pepper_virtual_terminal_setup(tty))
                goto cleanup;
 
-       compositor = pepper_compositor_create("wayland-0");
+       compositor = pepper_compositor_create("wayland-0", NULL);
        if (!compositor)
                goto cleanup;
 

diff --git a/samples/fbdev-backend.c b/samples/fbdev-backend.c
index 63a6930447caaa83340aa1466d07bcdb9f153fd9..db534c69c954647ff253bc7b4169402e5976449b 100644 (file)
--- a/samples/fbdev-backend.c
+++ b/samples/fbdev-backend.c
@@ -103,7 +103,7 @@ main(int argc, char **argv)
        if (!pepper_virtual_terminal_setup(tty))
                goto cleanup;
 
-       compositor = pepper_compositor_create("wayland-0");
+       compositor = pepper_compositor_create("wayland-0", NULL);
        if (!compositor)
                goto cleanup;
 

diff --git a/samples/sample-server.c b/samples/sample-server.c
index 4dde94ed9d05a2bda584586426febd6cb12c9d3f..4836b41821406a60c9c307a1e1a8f1f97c80c255 100644 (file)
--- a/samples/sample-server.c
+++ b/samples/sample-server.c
@@ -203,7 +203,7 @@ main(int argc, char **argv)
        if (!socket_name)
                socket_name = "wayland-0";
 
-       compositor = pepper_compositor_create(socket_name);
+       compositor = pepper_compositor_create(socket_name, NULL);
 
        if (!compositor)
                return -1;

diff --git a/samples/tdm-backend.c b/samples/tdm-backend.c
index 32ec8cda82ef534b128f0f5a177e4c84423996a2..45010f6548d8b2b1e6f2803ce579e77d02e21861 100644 (file)
--- a/samples/tdm-backend.c
+++ b/samples/tdm-backend.c
@@ -81,7 +81,7 @@ main(int argc, char **argv)
 
        init_signals();
 
-       compositor = pepper_compositor_create("wayland-0");
+       compositor = pepper_compositor_create("wayland-0", NULL);
        if (!compositor)
                goto cleanup;
 

diff --git a/samples/wayland-backend.c b/samples/wayland-backend.c
index 86df9338ad641b559e5c94c48e6ecf642b6c78be..59e459cc89389a0fb60cefa0876f106545491fae 100644 (file)
--- a/samples/wayland-backend.c
+++ b/samples/wayland-backend.c
@@ -37,7 +37,7 @@ main(int argc, char **argv)
        pepper_output_t     *output;
        struct wl_display   *display;
 
-       compositor = pepper_compositor_create("wayland-1");
+       compositor = pepper_compositor_create("wayland-1", NULL);
        PEPPER_ASSERT(compositor);
 
        conn = pepper_wayland_connect(compositor, "wayland-0");

diff --git a/samples/x11-backend.c b/samples/x11-backend.c
index 8698c5b8c071a665ffa32faad6196aeb5693866e..cf796d7936dd8b0706b684b766df80096cc002bd 100644 (file)
--- a/samples/x11-backend.c
+++ b/samples/x11-backend.c
@@ -59,7 +59,7 @@ main(int argc, char **argv)
        if (argc > 2)
                renderer = argv[2];
 
-       compositor = pepper_compositor_create(socket);
+       compositor = pepper_compositor_create(socket, NULL);
        PEPPER_ASSERT(compositor);
 
        conn = pepper_x11_connect(compositor, NULL);

diff --git a/src/bin/doctor/doctor.c b/src/bin/doctor/doctor.c
index bcf029ee4fc1e9baa60f79df53c8af8a347e7a24..e949af3778d113bec04b3e6241965f4548a54c38 100644 (file)
--- a/src/bin/doctor/doctor.c
+++ b/src/bin/doctor/doctor.c
@@ -270,7 +270,7 @@ int main(int argc, char *argv[])
                setenv("XDG_RUNTIME_DIR", "/run", 1);
 
        /* create pepper compositor */
-       compositor = pepper_compositor_create(socket_name);
+       compositor = pepper_compositor_create(socket_name, NULL);
        PEPPER_CHECK(compositor, return EXIT_FAILURE, "Failed to create compositor !\n");
 
        /* init tbm buffer manager */

diff --git a/src/lib/pepper/compositor.c b/src/lib/pepper/compositor.c
index 9d92826f45cfa461a35aef3487866c97f2aa0e6c..b573a0fb981adec8b9e718616c2338abc3f29150 100644 (file)
--- a/src/lib/pepper/compositor.c
+++ b/src/lib/pepper/compositor.c
@@ -207,7 +207,7 @@ pepper_compositor_schedule_repaint(pepper_compositor_t *compositor)
  * @see pepper_compositor_create()
  */
 PEPPER_API pepper_compositor_t *
-pepper_compositor_create_fd(const char *socket_name, int fd)
+pepper_compositor_create_fd(const char *socket_name, int fd, char *name)
 {
        int                  ret;
        pepper_compositor_t *compositor;
@@ -294,9 +294,9 @@ error:
  * @see pepper_compositor_destroy()
  */
 PEPPER_API pepper_compositor_t *
-pepper_compositor_create(const char *socket_name)
+pepper_compositor_create(const char *socket_name, char *name)
 {
-       return pepper_compositor_create_fd(socket_name, -1);
+       return pepper_compositor_create_fd(socket_name, -1, name);
 }
 
 /**

diff --git a/src/lib/pepper/pepper.h b/src/lib/pepper/pepper.h
index b293386f963ab8ed495b7e0d73fd0b52978118b6..b23af8488e63eecdcc23d9b69e74fb751cfc7ad7 100644 (file)
--- a/src/lib/pepper/pepper.h
+++ b/src/lib/pepper/pepper.h
@@ -838,10 +838,10 @@ PEPPER_API pepper_object_t *
 pepper_object_from_id(uint32_t id);
 
 PEPPER_API pepper_compositor_t *
-pepper_compositor_create(const char *socket_name);
+pepper_compositor_create(const char *socket_name, char *name);
 
 PEPPER_API pepper_compositor_t *
-pepper_compositor_create_fd(const char *socket_name, int fd);
+pepper_compositor_create_fd(const char *socket_name, int fd, char *name);
 
 PEPPER_API void
 pepper_compositor_destroy(pepper_compositor_t *compositor);