fix: docker build + add joypad capabilities when forcing a type

games-on-whales · Jun 25, 2024 · 8c5ac3c · 8c5ac3c
1 parent b9be85f
commit 8c5ac3c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/docker/wolf.Dockerfile b/docker/wolf.Dockerfile
@@ -39,7 +39,7 @@ RUN <<_GST_WAYLAND_DISPLAY
     cd gst-wayland-display
     git checkout 6c7d8cb
     cargo install cargo-c
-    cargo cinstall -p c-bindings --prefix=/usr/local
+    cargo cinstall -p c-bindings --prefix=/usr/local --libdir=/usr/local/lib/x86_64-linux-gnu
 _GST_WAYLAND_DISPLAY
 
 COPY . /wolf/

diff --git a/src/moonlight-server/control/input_handler.cpp b/src/moonlight-server/control/input_handler.cpp
@@ -114,8 +114,9 @@ std::shared_ptr<state::JoypadTypes> create_new_joypad(const state::StreamSession
     break;
   }
 
-  if (capabilities & ACCELEROMETER && type == PS) {
+  if (capabilities & ACCELEROMETER && final_type == PS) {
     // Request acceleromenter events from the client at 100 Hz
+    logs::log(logs::info, "Requesting accelerometer events for controller {}", controller_number);
     auto accelerometer_pkt = ControlMotionEventPacket{
         .header{.type = MOTION_EVENT, .length = sizeof(ControlMotionEventPacket) - sizeof(ControlPacket)},
         .controller_number = static_cast<uint16_t>(controller_number),
@@ -125,8 +126,9 @@ std::shared_ptr<state::JoypadTypes> create_new_joypad(const state::StreamSession
     encrypt_and_send(plaintext, session.aes_key, connected_clients, session.session_id);
   }
 
-  if (capabilities & GYRO && type == PS) {
+  if (capabilities & GYRO && final_type == PS) {
     // Request gyroscope events from the client at 100 Hz
+    logs::log(logs::info, "Requesting gyroscope events for controller {}", controller_number);
     auto gyro_pkt = ControlMotionEventPacket{
         .header{.type = MOTION_EVENT, .length = sizeof(ControlMotionEventPacket) - sizeof(ControlPacket)},
         .controller_number = static_cast<uint16_t>(controller_number),