From 8cdbfa29f49e41909d2446f527e4f0cf1f7c62bd Mon Sep 17 00:00:00 2001 From: Mark Lee Date: Tue, 4 Jun 2024 14:30:53 +0100 Subject: [PATCH] Clean up after merge --- .../VideoEngineResizeCallback.java | 34 ---------- .../VideoEngineResizeCallbackHandler.java | 66 ------------------- 2 files changed, 100 deletions(-) delete mode 100644 src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/videoengine/VideoEngineResizeCallback.java delete mode 100644 src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/videoengine/VideoEngineResizeCallbackHandler.java diff --git a/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/videoengine/VideoEngineResizeCallback.java b/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/videoengine/VideoEngineResizeCallback.java deleted file mode 100644 index 6b9233f8c..000000000 --- a/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/videoengine/VideoEngineResizeCallback.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of VLCJ. - * - * VLCJ is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * VLCJ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with VLCJ. If not, see . - * - * Copyright 2009-2022 Caprica Software Limited. - */ - -package uk.co.caprica.vlcj.player.embedded.videosurface.videoengine; - -/** - * Specification for a component that informs the video engine when the size of the hosted video window changes. - */ -public interface VideoEngineResizeCallback { - - /** - * Set the new window size. - * - * @param width new width - * @param height new height - */ - void setSize(int width, int height); -} diff --git a/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/videoengine/VideoEngineResizeCallbackHandler.java b/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/videoengine/VideoEngineResizeCallbackHandler.java deleted file mode 100644 index ed7eb4aa8..000000000 --- a/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/videoengine/VideoEngineResizeCallbackHandler.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * This file is part of VLCJ. - * - * VLCJ is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * VLCJ is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with VLCJ. If not, see . - * - * Copyright 2009-2022 Caprica Software Limited. - */ - -package uk.co.caprica.vlcj.player.embedded.videosurface.videoengine; - -import com.sun.jna.Pointer; -import uk.co.caprica.vlcj.binding.internal.ReportSizeChanged; - -/** - * Handler component that bridges a vlcj application with the native video engine resize callback. - */ -public final class VideoEngineResizeCallbackHandler implements VideoEngineResizeCallback { - - /** - * Opaque pointer associated with the callbacks. - */ - private final Pointer opaque; - - /** - * Opaque pointer for the native report size changed callback. - *

- * This pointer must be passed with the native callback method. - */ - private final Pointer reportOpaque; - - /** - * Native callback. - */ - private final ReportSizeChanged reportSizeChanged; - - /** - * Create a resize callback handler. - * - * @param opaque opaque pointer associated with the callbacks - * @param reportOpaque opaque pointer for the native report size changed callback - * @param reportSizeChanged native callback - */ - public VideoEngineResizeCallbackHandler(Pointer opaque, Pointer reportOpaque, ReportSizeChanged reportSizeChanged) { - this.opaque = opaque; - this.reportOpaque = reportOpaque; - this.reportSizeChanged = reportSizeChanged; - } - - @Override - public void setSize(int width, int height) { - if (reportSizeChanged != null) { - reportSizeChanged.reportSizeChanged(reportOpaque, width, height); - } - } -}