Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions jpro-media/src/main/java/one/jpro/platform/media/MediaView.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.FXMediaRecorder;
import one.jpro.platform.media.recorder.impl.FXMediaRecorderView;
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}
Expand Down Expand Up @@ -136,8 +136,8 @@ public static MediaView create(MediaPlayer mediaPlayer) {
* @return a {@link MediaView} object.
*/
public static MediaView create(MediaRecorder mediaRecorder) {
if (mediaRecorder instanceof FXMediaRecorder fxMediaRecorder) {
return new FXMediaRecorderView(fxMediaRecorder);
if (mediaRecorder instanceof NativeMediaRecorder fxMediaRecorder) {
return new NativeMediaRecorderView(fxMediaRecorder);
} else if (mediaRecorder instanceof WebMediaRecorder webMediaRecorder) {
return new WebMediaRecorderView(webMediaRecorder);
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand All @@ -28,14 +26,14 @@
*/
abstract class BaseMediaRecorder implements MediaRecorder {

private static final Logger logger = LoggerFactory.getLogger(BaseMediaRecorder.class);

private RecorderTimerTask recorderTimerTask;
volatile boolean recorderReady;
volatile boolean isUpdateDurationEnabled;
long startRecordingTime = 0;
private double pauseDurationTime = 0;

private final Logger log = LoggerFactory.getLogger(BaseMediaRecorder.class);

// media source property (read-only)
ReadOnlyObjectWrapper<MediaSource> mediaSource;

Expand Down Expand Up @@ -119,12 +117,12 @@ public Duration getDuration() {
return (duration == null) ? Duration.ZERO : duration.get();
}

void setDuration(Duration value) {
final void setDuration(Duration value) {
durationPropertyImpl().set(value);
}

@Override
public ReadOnlyObjectProperty<Duration> durationProperty() {
public final ReadOnlyObjectProperty<Duration> durationProperty() {
return durationPropertyImpl().getReadOnlyProperty();
}

Expand All @@ -134,7 +132,7 @@ private ReadOnlyObjectWrapper<Duration> durationPropertyImpl() {

@Override
protected void invalidated() {
log.trace("Recording duration: {} s", get().toSeconds());
logger.trace("Recording duration: {} s", get().toSeconds());
}
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.FXMediaRecorder;
import one.jpro.platform.media.recorder.impl.WebMediaRecorder;

import java.util.Optional;

Expand Down Expand Up @@ -60,7 +58,7 @@ static MediaRecorder create(Stage stage) {
final WebAPI webAPI = WebAPI.getWebAPI(stage);
return new WebMediaRecorder(webAPI);
}
return new FXMediaRecorder();
return new NativeMediaRecorder();
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package one.jpro.platform.media.recorder.impl;
package one.jpro.platform.media.recorder;

import org.json.JSONObject;

Expand Down
Loading