Merge branch 'sadguitarius-local_alsa_multi_listener-fix'

davidmoreno · Sep 29, 2024 · 6e245e3 · 6e245e3
2 parents 0840fef + f2d0113
commit 6e245e3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/include/rtpmidid/poller.hpp b/include/rtpmidid/poller.hpp
@@ -29,7 +29,7 @@
 #define DEBUG0(...)
 
 namespace rtpmidid {
-class poller_private_data_t;
+struct poller_private_data_t;
 /**
  * Simplified fd poller
  *

diff --git a/lib/rtpclient.cpp b/lib/rtpclient.cpp
@@ -275,7 +275,7 @@ void rtpclient_t::state_send_ck_short() {
     } else {
       handle_event(LatencyMeasured);
     }
-    ck_connection = peer.ck_event.connect([this](float ms) {
+    ck_connection = peer.ck_event.connect([](float ms) {
       WARNING("OUT OF ORDER CK0 received, latency: {} ms", ms);
     });
   });
@@ -296,7 +296,7 @@ void rtpclient_t::state_send_ck_long() {
   ck_connection = peer.ck_event.connect([this](float ms) {
     timer.disable();
     handle_event(WaitSendCK);
-    ck_connection = peer.ck_event.connect([this](float ms) {
+    ck_connection = peer.ck_event.connect([](float ms) {
       WARNING("OUT OF ORDER CK0 received, latency: {} ms", ms);
     });
   });

diff --git a/src/local_alsa_multi_listener.cpp b/src/local_alsa_multi_listener.cpp
@@ -134,10 +134,10 @@ void local_alsa_multi_listener_t::alsaseq_event(snd_seq_event_t *event) {
     return;
   }
   rtpmidid::io_bytes_writer_static<1024> writer;
-  alsatrans_decoder.ev_to_mididata_f(event, writer,
-                                     [this](const mididata_t &mididata) {
-                                       router->send_midi(peer_id, mididata);
-                                     });
+  alsatrans_decoder.ev_to_mididata_f(
+      event, writer, [&](const mididata_t &mididata) {
+        router->send_midi(peer_id, peerI->second, mididata);
+      });
 }
 
 void local_alsa_multi_listener_t::send_midi(midipeer_id_t from,

diff --git a/tests/test_rtpclient.cpp b/tests/test_rtpclient.cpp
@@ -65,7 +65,7 @@ void test_network_address_list() {
 
   // Move first
   localhost_resolutions =
-      std::move(rtpmidid::network_address_list_t("::", "13001"));
+      rtpmidid::network_address_list_t("::", "13001");
   first = localhost_resolutions.get_first();
   DEBUG("First: {}", first.to_string());
   ASSERT_EQUAL(first.hostname(), "::");
@@ -400,14 +400,14 @@ void test_client_try_several_connections() {
         DEBUG("Got control packet: {}", packet);
         control_packet.copy_from(packet);
         control_packet_received = true;
-        control_remote_address = std::move(from.dup());
+        control_remote_address = from.dup();
       });
   auto peerA_midi_on_read_connection =
       peerA_midi.on_read.connect([&](const rtpmidid::packet_t &packet,
                                      const rtpmidid::network_address_t &from) {
         midi_packet.copy_from(packet);
         midi_packet_received = true;
-        midi_remote_address = std::move(from.dup());
+        midi_remote_address = from.dup();
       });
 
   // all in one list. Connects in reverse order (uses back() its more efficient.