Make lockVideoOrientation option name uniform

On the server, the option was named lockedVideoOrientation.
tcpip
Romain Vimont 3 years ago
parent 7b29f5fd2d
commit 4c47598865

@ -65,7 +65,7 @@ public final class Device {
int displayInfoFlags = displayInfo.getFlags(); int displayInfoFlags = displayInfo.getFlags();
screenInfo = ScreenInfo.computeScreenInfo(displayInfo, options.getCrop(), options.getMaxSize(), options.getLockedVideoOrientation()); screenInfo = ScreenInfo.computeScreenInfo(displayInfo, options.getCrop(), options.getMaxSize(), options.getLockVideoOrientation());
layerStack = displayInfo.getLayerStack(); layerStack = displayInfo.getLayerStack();
SERVICE_MANAGER.getWindowManager().registerRotationWatcher(new IRotationWatcher.Stub() { SERVICE_MANAGER.getWindowManager().registerRotationWatcher(new IRotationWatcher.Stub() {

@ -9,7 +9,7 @@ public class Options {
private int maxSize; private int maxSize;
private int bitRate = 8000000; private int bitRate = 8000000;
private int maxFps; private int maxFps;
private int lockedVideoOrientation = -1; private int lockVideoOrientation = -1;
private boolean tunnelForward; private boolean tunnelForward;
private Rect crop; private Rect crop;
private boolean sendFrameMeta = true; // send PTS so that the client may record properly private boolean sendFrameMeta = true; // send PTS so that the client may record properly
@ -54,12 +54,12 @@ public class Options {
this.maxFps = maxFps; this.maxFps = maxFps;
} }
public int getLockedVideoOrientation() { public int getLockVideoOrientation() {
return lockedVideoOrientation; return lockVideoOrientation;
} }
public void setLockedVideoOrientation(int lockedVideoOrientation) { public void setLockVideoOrientation(int lockVideoOrientation) {
this.lockedVideoOrientation = lockedVideoOrientation; this.lockVideoOrientation = lockVideoOrientation;
} }
public boolean isTunnelForward() { public boolean isTunnelForward() {

@ -188,8 +188,8 @@ public final class Server {
options.setMaxFps(maxFps); options.setMaxFps(maxFps);
break; break;
case "lock_video_orientation": case "lock_video_orientation":
int lockedVideoOrientation = Integer.parseInt(value); int lockVideoOrientation = Integer.parseInt(value);
options.setLockedVideoOrientation(lockedVideoOrientation); options.setLockVideoOrientation(lockVideoOrientation);
break; break;
case "tunnel_forward": case "tunnel_forward":
boolean tunnelForward = Boolean.parseBoolean(value); boolean tunnelForward = Boolean.parseBoolean(value);

Loading…
Cancel
Save