Skip to content

Commit

Permalink
JF/52.0
Browse files Browse the repository at this point in the history
  • Loading branch information
pquiring committed Feb 17, 2024
1 parent fdeab74 commit 5e1ad32
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 16 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>io.github.pquiring</groupId>
<artifactId>javaforce</artifactId>
<version>51.0</version>
<version>52.0</version>

<scm>
<url>https://github.com/pquiring/javaforce</url>
Expand Down
2 changes: 1 addition & 1 deletion projects/jfdvr/src/viewer/SelectView.form
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="split" pref="670" max="32767" attributes="0"/>
<Component id="split" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/>
Expand Down
23 changes: 12 additions & 11 deletions projects/jfdvr/src/viewer/SelectView.java
Original file line number Diff line number Diff line change
Expand Up @@ -280,20 +280,21 @@ public void onTeardown(RTSPClient client) {
}

public void onGetParameter(RTSPClient client, String[] params) {
String list = HTTP.getParameter(params, "list");
if (list == null) {
JFLog.log("list==null");
return;
}
cameras.clear();
groups.clear();
String[] cams = HTTP.getParameter(params, "cameras").split(",");
for(String cam : cams) {
cameras.add(cam);
String camsstr = HTTP.getParameter(params, "cameras");
if (camsstr != null) {
String[] cams = camsstr.split(",");
for(String cam : cams) {
cameras.add(cam);
}
}
String[] grps = HTTP.getParameter(params, "groups").split(",");
for(String grp : grps) {
groups.add(grp);
String grpsstr = HTTP.getParameter(params, "groups");
if (grpsstr != null) {
String[] grps = grpsstr.split(",");
for(String grp : grps) {
groups.add(grp);
}
}
updateLists();
rtsp.uninit();
Expand Down
2 changes: 1 addition & 1 deletion readme.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
JavaForce SDK
=============

Version 51.0
Version 52.0

Description
===========
Expand Down
2 changes: 1 addition & 1 deletion src/javaforce/JF.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
public class JF {

public static String getVersion() {
return "51.0";
return "52.0";
}

public static void main(String[] args) {
Expand Down
2 changes: 1 addition & 1 deletion versions.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<project xmlns:if="ant:if" xmlns:unless="ant:unless">
<!-- Note : any changes should be reflected in lib/package.sh -->
<!-- JavaForce version -->
<property name="javaforce-version" value="51.0"/>
<property name="javaforce-version" value="52.0"/>
<!-- native dependancies versions -->
<property name="glfw-version" value="3.3.1"/>
<property name="ffmpeg-version" value="5.1.2"/>
Expand Down
9 changes: 9 additions & 0 deletions whatsnew.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
What's new...

Feb 17/2024 : JF/52.0
- jfDVR/0.14
- fix config issues
- fix service shutdown
- fix viewer/decoder
- jfMedia/0.18
- add fullscreen function
- cleanup native loader

Feb 2/2024 : JF/51.0
- implement H.265 codec
- implement RTSPServer
Expand Down

0 comments on commit 5e1ad32

Please sign in to comment.