]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
Revert "wip! renderer: add disown method"
authorRay Strode <rstrode@redhat.com>
Thu, 31 May 2018 14:51:17 +0000 (10:51 -0400)
committerRay Strode <rstrode@redhat.com>
Thu, 31 May 2018 14:52:34 +0000 (10:52 -0400)
This reverts commit 0c006993a4d1f345b80130fe40f378981744b432.

src/libply-splash-core/ply-renderer-plugin.h
src/libply-splash-core/ply-renderer.c
src/libply-splash-core/ply-renderer.h
src/plugins/renderers/drm/plugin.c

index 8f05004bad60aa692eb0d916749dc226fb51b838..f1455d30adda4b471946999780f02513ef44bcbb 100644 (file)
@@ -68,8 +68,6 @@ typedef struct
                                    ply_renderer_input_source_t *input_source);
 
         const char * (*get_device_name)(ply_renderer_backend_t *backend);
-
-        void (*disown) (ply_renderer_backend_t *backend);
 } ply_renderer_plugin_interface_t;
 
 #endif /* PLY_RENDERER_PLUGIN_H */
index f79b4e6a92937c6d56887ea97dd3bc4d983f91cf..b9059ef3d4ef6a6eccc1574e432324b0ac881228 100644 (file)
@@ -317,17 +317,6 @@ ply_renderer_deactivate (ply_renderer_t *renderer)
         return renderer->plugin_interface->deactivate (renderer->backend);
 }
 
-void
-ply_renderer_disown (ply_renderer_t *renderer)
-{
-        assert (renderer->plugin_interface != NULL);
-
-        if (renderer->plugin_interface->disown == NULL)
-                return;
-
-        return renderer->plugin_interface->disown (renderer->backend);
-}
-
 bool
 ply_renderer_is_active (ply_renderer_t *renderer)
 {
index 5fee2074d3f353ba5629681fe7d8b883096417c9..59391e170ef462b4b93d85fa9100ff408dc35fa8 100644 (file)
@@ -57,7 +57,6 @@ bool ply_renderer_open (ply_renderer_t *renderer);
 void ply_renderer_close (ply_renderer_t *renderer);
 void ply_renderer_activate (ply_renderer_t *renderer);
 void ply_renderer_deactivate (ply_renderer_t *renderer);
-void ply_renderer_disown (ply_renderer_t *renderer);
 bool ply_renderer_is_active (ply_renderer_t *renderer);
 const char *ply_renderer_get_device_name (ply_renderer_t *renderer);
 ply_list_t *ply_renderer_get_heads (ply_renderer_t *renderer);
index 22f1e21f0d46cef4fdc2dcef6fd6fddf0bbee35d..fb79aa6dcc8dd58af2f2361d86678d3e1a19c31a 100644 (file)
@@ -1406,11 +1406,6 @@ close_input_source (ply_renderer_backend_t      *backend,
         input_source->backend = NULL;
 }
 
-static void
-disown (ply_renderer_backend_t *backend)
-{
-}
-
 ply_renderer_plugin_interface_t *
 ply_renderer_backend_get_interface (void)
 {
@@ -1432,8 +1427,7 @@ ply_renderer_backend_get_interface (void)
                 .open_input_source            = open_input_source,
                 .set_handler_for_input_source = set_handler_for_input_source,
                 .close_input_source           = close_input_source,
-                .get_device_name              = get_device_name,
-                .disown                       = disown,
+                .get_device_name              = get_device_name
         };
 
         return &plugin_interface;