From ae62ff5070128445dee12051b1a670dc0c3181c0 Mon Sep 17 00:00:00 2001
From: Besmir Beqiri <bb@sandec.de>
Date: Fri, 12 Jan 2024 12:58:42 +0100
Subject: [PATCH] Expose media recorder native and web implementations

---
 .../src/main/java/one/jpro/platform/media/MediaView.java  | 8 ++++----
 .../main/java/one/jpro/platform/media/WebMediaView.java   | 2 +-
 .../media/recorder/{impl => }/BaseMediaRecorder.java      | 4 +---
 .../one/jpro/platform/media/recorder/MediaRecorder.java   | 2 --
 .../media/recorder/{impl => }/MediaRecorderOptions.java   | 2 +-
 .../media/recorder/{impl => }/NativeMediaRecorder.java    | 6 ++----
 .../recorder/{impl => }/NativeMediaRecorderView.java      | 3 +--
 .../media/recorder/{impl => }/WebMediaRecorder.java       | 4 +---
 .../media/recorder/{impl => }/WebMediaRecorderView.java   | 3 +--
 9 files changed, 12 insertions(+), 22 deletions(-)
 rename jpro-media/src/main/java/one/jpro/platform/media/recorder/{impl => }/BaseMediaRecorder.java (98%)
 rename jpro-media/src/main/java/one/jpro/platform/media/recorder/{impl => }/MediaRecorderOptions.java (98%)
 rename jpro-media/src/main/java/one/jpro/platform/media/recorder/{impl => }/NativeMediaRecorder.java (98%)
 rename jpro-media/src/main/java/one/jpro/platform/media/recorder/{impl => }/NativeMediaRecorderView.java (97%)
 rename jpro-media/src/main/java/one/jpro/platform/media/recorder/{impl => }/WebMediaRecorder.java (98%)
 rename jpro-media/src/main/java/one/jpro/platform/media/recorder/{impl => }/WebMediaRecorderView.java (83%)

diff --git a/jpro-media/src/main/java/one/jpro/platform/media/MediaView.java b/jpro-media/src/main/java/one/jpro/platform/media/MediaView.java
index 14cfe682..448d5018 100644
--- a/jpro-media/src/main/java/one/jpro/platform/media/MediaView.java
+++ b/jpro-media/src/main/java/one/jpro/platform/media/MediaView.java
@@ -15,10 +15,10 @@
 import one.jpro.platform.media.player.impl.WebMediaPlayer;
 import one.jpro.platform.media.player.impl.WebMediaPlayerView;
 import one.jpro.platform.media.recorder.MediaRecorder;
-import one.jpro.platform.media.recorder.impl.NativeMediaRecorder;
-import one.jpro.platform.media.recorder.impl.NativeMediaRecorderView;
-import one.jpro.platform.media.recorder.impl.WebMediaRecorder;
-import one.jpro.platform.media.recorder.impl.WebMediaRecorderView;
+import one.jpro.platform.media.recorder.NativeMediaRecorder;
+import one.jpro.platform.media.recorder.NativeMediaRecorderView;
+import one.jpro.platform.media.recorder.WebMediaRecorder;
+import one.jpro.platform.media.recorder.WebMediaRecorderView;
 
 /**
  * Provides a view of {@link MediaSource} being played by a {@link MediaPlayer}
diff --git a/jpro-media/src/main/java/one/jpro/platform/media/WebMediaView.java b/jpro-media/src/main/java/one/jpro/platform/media/WebMediaView.java
index fc437c18..385a6d57 100644
--- a/jpro-media/src/main/java/one/jpro/platform/media/WebMediaView.java
+++ b/jpro-media/src/main/java/one/jpro/platform/media/WebMediaView.java
@@ -9,7 +9,7 @@
 import javafx.geometry.HPos;
 import javafx.geometry.VPos;
 import javafx.scene.Node;
-import one.jpro.platform.media.recorder.impl.WebMediaRecorder;
+import one.jpro.platform.media.recorder.WebMediaRecorder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jpro-media/src/main/java/one/jpro/platform/media/recorder/impl/BaseMediaRecorder.java b/jpro-media/src/main/java/one/jpro/platform/media/recorder/BaseMediaRecorder.java
similarity index 98%
rename from jpro-media/src/main/java/one/jpro/platform/media/recorder/impl/BaseMediaRecorder.java
rename to jpro-media/src/main/java/one/jpro/platform/media/recorder/BaseMediaRecorder.java
index c20319df..b2629705 100644
--- a/jpro-media/src/main/java/one/jpro/platform/media/recorder/impl/BaseMediaRecorder.java
+++ b/jpro-media/src/main/java/one/jpro/platform/media/recorder/BaseMediaRecorder.java
@@ -1,4 +1,4 @@
-package one.jpro.platform.media.recorder.impl;
+package one.jpro.platform.media.recorder;
 
 import com.sun.javafx.event.EventHandlerManager;
 import javafx.application.Platform;
@@ -12,8 +12,6 @@
 import javafx.util.Duration;
 import one.jpro.platform.media.MediaSource;
 import one.jpro.platform.media.event.MediaRecorderEvent;
-import one.jpro.platform.media.recorder.MediaRecorder;
-import one.jpro.platform.media.recorder.MediaRecorderException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jpro-media/src/main/java/one/jpro/platform/media/recorder/MediaRecorder.java b/jpro-media/src/main/java/one/jpro/platform/media/recorder/MediaRecorder.java
index a4f50019..daae7ea8 100644
--- a/jpro-media/src/main/java/one/jpro/platform/media/recorder/MediaRecorder.java
+++ b/jpro-media/src/main/java/one/jpro/platform/media/recorder/MediaRecorder.java
@@ -11,8 +11,6 @@
 import one.jpro.platform.media.MediaSource;
 import one.jpro.platform.media.MediaView;
 import one.jpro.platform.media.event.MediaRecorderEvent;
-import one.jpro.platform.media.recorder.impl.NativeMediaRecorder;
-import one.jpro.platform.media.recorder.impl.WebMediaRecorder;
 
 import java.util.Optional;
 
diff --git a/jpro-media/src/main/java/one/jpro/platform/media/recorder/impl/MediaRecorderOptions.java b/jpro-media/src/main/java/one/jpro/platform/media/recorder/MediaRecorderOptions.java
similarity index 98%
rename from jpro-media/src/main/java/one/jpro/platform/media/recorder/impl/MediaRecorderOptions.java
rename to jpro-media/src/main/java/one/jpro/platform/media/recorder/MediaRecorderOptions.java
index 5b2c0d5d..f91279f4 100644
--- a/jpro-media/src/main/java/one/jpro/platform/media/recorder/impl/MediaRecorderOptions.java
+++ b/jpro-media/src/main/java/one/jpro/platform/media/recorder/MediaRecorderOptions.java
@@ -1,4 +1,4 @@
-package one.jpro.platform.media.recorder.impl;
+package one.jpro.platform.media.recorder;
 
 import org.json.JSONObject;
 
diff --git a/jpro-media/src/main/java/one/jpro/platform/media/recorder/impl/NativeMediaRecorder.java b/jpro-media/src/main/java/one/jpro/platform/media/recorder/NativeMediaRecorder.java
similarity index 98%
rename from jpro-media/src/main/java/one/jpro/platform/media/recorder/impl/NativeMediaRecorder.java
rename to jpro-media/src/main/java/one/jpro/platform/media/recorder/NativeMediaRecorder.java
index 4960dbb3..f211e93b 100644
--- a/jpro-media/src/main/java/one/jpro/platform/media/recorder/impl/NativeMediaRecorder.java
+++ b/jpro-media/src/main/java/one/jpro/platform/media/recorder/NativeMediaRecorder.java
@@ -1,4 +1,4 @@
-package one.jpro.platform.media.recorder.impl;
+package one.jpro.platform.media.recorder;
 
 import javafx.application.Platform;
 import javafx.event.Event;
@@ -6,8 +6,6 @@
 import javafx.scene.image.ImageView;
 import one.jpro.platform.media.MediaSource;
 import one.jpro.platform.media.event.MediaRecorderEvent;
-import one.jpro.platform.media.recorder.MediaRecorder;
-import one.jpro.platform.media.recorder.MediaRecorderException;
 import org.bytedeco.ffmpeg.global.avcodec;
 import org.bytedeco.ffmpeg.global.avutil;
 import org.bytedeco.javacv.*;
@@ -30,7 +28,7 @@
  *
  * @author Besmir Beqiri
  */
-public final class NativeMediaRecorder extends BaseMediaRecorder {
+public class NativeMediaRecorder extends BaseMediaRecorder {
 
     private static final Logger logger = LoggerFactory.getLogger(NativeMediaRecorder.class);
 
diff --git a/jpro-media/src/main/java/one/jpro/platform/media/recorder/impl/NativeMediaRecorderView.java b/jpro-media/src/main/java/one/jpro/platform/media/recorder/NativeMediaRecorderView.java
similarity index 97%
rename from jpro-media/src/main/java/one/jpro/platform/media/recorder/impl/NativeMediaRecorderView.java
rename to jpro-media/src/main/java/one/jpro/platform/media/recorder/NativeMediaRecorderView.java
index e2a237ad..d76a3097 100644
--- a/jpro-media/src/main/java/one/jpro/platform/media/recorder/impl/NativeMediaRecorderView.java
+++ b/jpro-media/src/main/java/one/jpro/platform/media/recorder/NativeMediaRecorderView.java
@@ -1,4 +1,4 @@
-package one.jpro.platform.media.recorder.impl;
+package one.jpro.platform.media.recorder;
 
 import javafx.beans.InvalidationListener;
 import javafx.beans.WeakInvalidationListener;
@@ -6,7 +6,6 @@
 import javafx.scene.image.ImageView;
 import one.jpro.platform.media.MediaEngine;
 import one.jpro.platform.media.MediaView;
-import one.jpro.platform.media.recorder.MediaRecorder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jpro-media/src/main/java/one/jpro/platform/media/recorder/impl/WebMediaRecorder.java b/jpro-media/src/main/java/one/jpro/platform/media/recorder/WebMediaRecorder.java
similarity index 98%
rename from jpro-media/src/main/java/one/jpro/platform/media/recorder/impl/WebMediaRecorder.java
rename to jpro-media/src/main/java/one/jpro/platform/media/recorder/WebMediaRecorder.java
index 7ba794e6..0076a598 100644
--- a/jpro-media/src/main/java/one/jpro/platform/media/recorder/impl/WebMediaRecorder.java
+++ b/jpro-media/src/main/java/one/jpro/platform/media/recorder/WebMediaRecorder.java
@@ -1,4 +1,4 @@
-package one.jpro.platform.media.recorder.impl;
+package one.jpro.platform.media.recorder;
 
 import com.jpro.webapi.JSVariable;
 import com.jpro.webapi.WebAPI;
@@ -8,8 +8,6 @@
 import one.jpro.platform.media.MediaSource;
 import one.jpro.platform.media.WebMediaEngine;
 import one.jpro.platform.media.event.MediaRecorderEvent;
-import one.jpro.platform.media.recorder.MediaRecorder;
-import one.jpro.platform.media.recorder.MediaRecorderException;
 import org.json.JSONObject;
 
 import java.util.Objects;
diff --git a/jpro-media/src/main/java/one/jpro/platform/media/recorder/impl/WebMediaRecorderView.java b/jpro-media/src/main/java/one/jpro/platform/media/recorder/WebMediaRecorderView.java
similarity index 83%
rename from jpro-media/src/main/java/one/jpro/platform/media/recorder/impl/WebMediaRecorderView.java
rename to jpro-media/src/main/java/one/jpro/platform/media/recorder/WebMediaRecorderView.java
index d2c9ae5f..21886bc6 100644
--- a/jpro-media/src/main/java/one/jpro/platform/media/recorder/impl/WebMediaRecorderView.java
+++ b/jpro-media/src/main/java/one/jpro/platform/media/recorder/WebMediaRecorderView.java
@@ -1,9 +1,8 @@
-package one.jpro.platform.media.recorder.impl;
+package one.jpro.platform.media.recorder;
 
 import com.jpro.webapi.WebAPI;
 import one.jpro.platform.media.MediaView;
 import one.jpro.platform.media.WebMediaView;
-import one.jpro.platform.media.recorder.MediaRecorder;
 
 /**
  * {@link MediaView} implementation for a web {@link MediaRecorder}.