From 4c4759886518f8c6fed10eefe31043d871b293af Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Wed, 24 Nov 2021 21:33:58 +0100
Subject: [PATCH] Make lockVideoOrientation option name uniform

On the server, the option was named lockedVideoOrientation.
---
 server/src/main/java/com/genymobile/scrcpy/Device.java |  2 +-
 .../src/main/java/com/genymobile/scrcpy/Options.java   | 10 +++++-----
 server/src/main/java/com/genymobile/scrcpy/Server.java |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/server/src/main/java/com/genymobile/scrcpy/Device.java b/server/src/main/java/com/genymobile/scrcpy/Device.java
index 03ae9b22..35f4efd4 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Device.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Device.java
@@ -65,7 +65,7 @@ public final class Device {
 
         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();
 
         SERVICE_MANAGER.getWindowManager().registerRotationWatcher(new IRotationWatcher.Stub() {
diff --git a/server/src/main/java/com/genymobile/scrcpy/Options.java b/server/src/main/java/com/genymobile/scrcpy/Options.java
index f649d776..1ac17176 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Options.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java
@@ -9,7 +9,7 @@ public class Options {
     private int maxSize;
     private int bitRate = 8000000;
     private int maxFps;
-    private int lockedVideoOrientation = -1;
+    private int lockVideoOrientation = -1;
     private boolean tunnelForward;
     private Rect crop;
     private boolean sendFrameMeta = true; // send PTS so that the client may record properly
@@ -54,12 +54,12 @@ public class Options {
         this.maxFps = maxFps;
     }
 
-    public int getLockedVideoOrientation() {
-        return lockedVideoOrientation;
+    public int getLockVideoOrientation() {
+        return lockVideoOrientation;
     }
 
-    public void setLockedVideoOrientation(int lockedVideoOrientation) {
-        this.lockedVideoOrientation = lockedVideoOrientation;
+    public void setLockVideoOrientation(int lockVideoOrientation) {
+        this.lockVideoOrientation = lockVideoOrientation;
     }
 
     public boolean isTunnelForward() {
diff --git a/server/src/main/java/com/genymobile/scrcpy/Server.java b/server/src/main/java/com/genymobile/scrcpy/Server.java
index 71920627..0f0abab0 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -188,8 +188,8 @@ public final class Server {
                     options.setMaxFps(maxFps);
                     break;
                 case "lock_video_orientation":
-                    int lockedVideoOrientation = Integer.parseInt(value);
-                    options.setLockedVideoOrientation(lockedVideoOrientation);
+                    int lockVideoOrientation = Integer.parseInt(value);
+                    options.setLockVideoOrientation(lockVideoOrientation);
                     break;
                 case "tunnel_forward":
                     boolean tunnelForward = Boolean.parseBoolean(value);