Skip to content

Commit 30f0909

Browse files
committed
Use logging path to store video
1 parent 79b36fd commit 30f0909

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

MAVGCL/src/com/comino/flight/ui/widgets/camera/CameraWidget.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ public class CameraWidget extends WidgetPane {
7575
private boolean isConnected = false;
7676

7777
private MSPLogger logger = null;
78+
private Preferences userPrefs;
7879

7980
public CameraWidget() {
8081
FXMLLoadHelper.load(this, "CameraWidget.fxml");
81-
recorder = new MP4Recorder(X,Y);
8282
}
8383

8484

@@ -162,8 +162,10 @@ private void resize(boolean big, int maxX, int maxY) {
162162
}
163163

164164
public void setup(IMAVController control) {
165-
mp4Enabled = MAVPreferences.getInstance().getBoolean(MAVPreferences.VIDREC, false);
165+
userPrefs = MAVPreferences.getInstance();
166166
logger = MSPLogger.getInstance();
167+
mp4Enabled = userPrefs.getBoolean(MAVPreferences.VIDREC, false);
168+
recorder = new MP4Recorder(userPrefs.get(MAVPreferences.PREFS_DIR, System.getProperty("user.home")),X,Y);
167169
}
168170

169171

@@ -172,7 +174,6 @@ private boolean connect() {
172174
return true;
173175

174176
logger.writeLocalMsg("[mgc] Videosource connected",MAV_SEVERITY.MAV_SEVERITY_DEBUG);
175-
Preferences userPrefs = MAVPreferences.getInstance();
176177
String url_string = userPrefs.get(MAVPreferences.PREFS_VIDEO,"none");
177178
if(url_string.isEmpty())
178179
url_string = "http://camera1.mairie-brest.fr/mjpg/video.mjpg?resolution=320x240";

MAVGCL/src/com/comino/video/src/mp4/MP4Recorder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ public class MP4Recorder implements IMWStreamVideoProcessListener {
5353

5454
private BufferedImage bimg = null;
5555

56-
public MP4Recorder(int width, int height) {
56+
public MP4Recorder(String path, int width, int height) {
5757

5858
recording.addListener((c,o,n) -> {
5959
try {
6060
if(n.booleanValue()) {
6161
System.out.println("MP4 recording started");
62-
encoder = new MSPSequenceEncoder(new File(System.getProperty("user.home")+"/video.mp4"));
62+
encoder = new MSPSequenceEncoder(new File(path+"/video.mp4"));
6363
}
6464
else {
6565
System.out.println("MP4 recording stopped");

0 commit comments

Comments
 (0)