Simplify and harmonize quality control methods

Eiim · Jan 12, 2025 · c350ee8 · c350ee8
1 parent cf11e7d
commit c350ee8
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 39 deletions.
diff --git a/src/main/java/chokistream/ChirunoModClient.java b/src/main/java/chokistream/ChirunoModClient.java
@@ -142,25 +142,21 @@ public void sendDebug(byte[] debugData) throws IOException {
 		out.write((new Packet((byte)0xFF, (byte)0x00, debugData)).pack);
 	}
 
-	// Increase quality by a certain amount, up to 100
-	public void increaseQuality(int delta) throws IOException {
-		if(quality + delta < 100) {
-			quality = quality + delta;
-			sendQuality(quality);
-		} else if(quality < 100) {
-			quality = 100;
-			sendQuality(100);
+	/**
+	 * Increases or decreases video quality, limited to 1-100.
+	 * 
+	 * @param delta The amount by which to increase or decrease.
+	 */
+	public void incrementQuality(int delta) throws IOException {
+		int newQuality = quality + delta;
+		if (newQuality > 100) {
+			newQuality = 100;
+		} else if (newQuality < 1) {
+			newQuality = 1;
 		}
-	}
-
-	// Decrease quality by a certain amount, down to 1
-	public void decreaseQuality(int delta) throws IOException {
-		if(quality - delta > 1) {
-			quality = quality - delta;
+		if (newQuality != quality) {
+			quality = newQuality;
 			sendQuality(quality);
-		} else if(quality > 1) {
-			quality = 1;
-			sendQuality(1);
 		}
 	}
 

diff --git a/src/main/java/chokistream/HZModClient.java b/src/main/java/chokistream/HZModClient.java
@@ -93,25 +93,21 @@ public void sendQuality(int quality) throws IOException {
 		out.write(qualityPacket);
 	}
 
-	// Increase quality by a certain amount, up to 100
-	public void increaseQuality(int delta) throws IOException {
-		if(quality + delta < 100) {
-			quality = quality + delta;
-			sendQuality(quality);
-		} else if(quality < 100) {
-			quality = 100;
-			sendQuality(100);
+	/**
+	 * Increases or decreases video quality, limited to 0-100.
+	 * 
+	 * @param delta The amount by which to increase or decrease.
+	 */
+	public void incrementQuality(int delta) throws IOException {
+		int newQuality = quality + delta;
+		if (newQuality > 100) {
+			newQuality = 100;
+		} else if (newQuality < 0) {
+			newQuality = 0;
 		}
-	}
-
-	// Decrease quality by a certain amount, down to 0
-	public void decreaseQuality(int delta) throws IOException {
-		if(quality - delta > 0) {
-			quality = quality - delta;
+		if (newQuality != quality) {
+			quality = newQuality;
 			sendQuality(quality);
-		} else if(quality > 0) {
-			quality = 0;
-			sendQuality(0);
 		}
 	}
 

diff --git a/src/main/java/chokistream/KeypressHandler.java b/src/main/java/chokistream/KeypressHandler.java
@@ -33,17 +33,17 @@ public void keyPressed(KeyEvent e) {
 				HZModClient c = (HZModClient) client;
 
 				if(ck.get(Controls.QUALITY_UP).matches(e)) {
-					c.increaseQuality(1);
+					c.incrementQuality(1);
 				} else if(ck.get(Controls.QUALITY_DOWN).matches(e)) {
-					c.decreaseQuality(1);
+					c.incrementQuality(-1);
 				}
 			} else if(client instanceof ChirunoModClient) {
 				ChirunoModClient c = (ChirunoModClient) client;
 
 				if(ck.get(Controls.QUALITY_UP).matches(e)) {
-					c.increaseQuality(1);
+					c.incrementQuality(1);
 				} else if(ck.get(Controls.QUALITY_DOWN).matches(e)) {
-					c.decreaseQuality(1);
+					c.incrementQuality(-1);
 				} else if(ck.get(Controls.CPU_UP).matches(e)) {
 					c.increaseCPU(1);
 				} else if(ck.get(Controls.CPU_DOWN).matches(e)) {

diff --git a/src/main/java/chokistream/NTRClient.java b/src/main/java/chokistream/NTRClient.java
@@ -616,7 +616,7 @@ public static void queueSettingsChange(int quality, DSScreen screen, int priorit
 	 * @param delta The amount by which to increase or decrease.
 	 */
 	public void incrementQuality(int delta) {
-		qualityDeltaQueue = qualityDeltaQueue + delta;
+		qualityDeltaQueue += delta;
 	}
 
 	/**