feat(EAV-323): allow Take from Shuttle connected to Prompter View

Author: ianshade

packages/webui/src/client/ui/Prompter/PrompterView.tsx

@@ -33,6 +33,8 @@ import { StudioScreenSaver } from '../StudioScreenSaver/StudioScreenSaver'
 import { PrompterControlManager } from './controller/manager'
 import { OverUnderTimer } from './OverUnderTimer'
 import { PrompterAPI, PrompterData, PrompterDataPart } from './prompter'
+import { doUserAction, UserAction } from '../../lib/clientUserAction'
+import { MeteorCall } from '../../lib/meteorApi'
 
 const DEFAULT_UPDATE_THROTTLE = 250 //ms
 const PIECE_MISSING_UPDATE_THROTTLE = 2000 //ms
@@ -384,6 +386,17 @@ export class PrompterViewContent extends React.Component<Translated<IProps & ITr
 	findAnchorPosition(startY: number, endY: number, sortDirection = 1): number | null {
 		return (this.listAnchorPositions(startY, endY, sortDirection)[0] || [])[0] || null
 	}
+	take(e: Event | string): void {
+		const { t } = this.props
+		if (!this.props.rundownPlaylist) {
+			logger.error('No active Rundown Playlist to perform a Take in')
+			return
+		}
+		const playlist = this.props.rundownPlaylist
+		doUserAction(t, e, UserAction.TAKE, (e, ts) =>
+			MeteorCall.userAction.take(e, ts, playlist._id, playlist.currentPartInfo?.partInstanceId ?? null)
+		)
+	}
 	private onWindowScroll = () => {
 		this.triggerCheckCurrentTakeMarkers()
 	}

packages/webui/src/client/ui/Prompter/controller/shuttle-webhid-device.ts

@@ -11,20 +11,15 @@ export class ShuttleWebHidController extends ControllerAbstract {
 	private prompterView: PrompterViewInner
 
 	private speedMap = [0, 1, 2, 3, 5, 7, 9, 30]
-	private jogMultiplierMap = this.speedMap.slice(1)
 
-	private readonly MIN_JOG_MULTIPLIER = 0
-	private readonly MAX_JOG_MULTIPLIER = this.jogMultiplierMap.length - 1
-	private readonly JOG_BASE_MOVEMENT_PX = 20
+	private readonly JOG_BASE_MOVEMENT_PX = 100
 
 	private updateSpeedHandle: number | null = null
 	private lastSpeed = 0
 	private currentPosition = 0
 
 	private connectedShuttle: Shuttle | undefined
 
-	private jogMultiplierIndex = 3
-
 	private accessRequestCallback: AccessRequestCallback = {
 		callback: this.requestAccess.bind(this),
 		deviceName: 'Contour Shuttle',
@@ -127,7 +122,7 @@ export class ShuttleWebHidController extends ControllerAbstract {
 	protected onButtonPressed(keyIndex: number): void {
 		switch (keyIndex) {
 			case 0:
-				this.onJogMultipierDelta(-1)
+				// no-op
 				break
 			case 1:
 				this.resetSpeed()
@@ -142,23 +137,16 @@ export class ShuttleWebHidController extends ControllerAbstract {
 				this.prompterView.scrollToFollowing()
 				break
 			case 4:
-				this.onJogMultipierDelta(1)
+				this.prompterView.take('Shuttle button 4 press')
 				break
 		}
 	}
 
-	protected onJogMultipierDelta(delta: number): void {
-		this.jogMultiplierIndex = Math.min(
-			Math.max(this.jogMultiplierIndex + delta, this.MIN_JOG_MULTIPLIER),
-			this.MAX_JOG_MULTIPLIER
-		)
-	}
-
 	protected onJog(delta: number): void {
 		if (Math.abs(delta) > 1) return // this is a hack because sometimes, right after connecting to the device, the delta would be larger than 1 or -1
 
 		this.resetSpeed()
-		window.scrollBy(0, this.JOG_BASE_MOVEMENT_PX * delta * this.jogMultiplierMap[this.jogMultiplierIndex])
+		window.scrollBy(0, this.JOG_BASE_MOVEMENT_PX * delta)
 	}
 
 	protected onShuttle(value: number): void {