Rename rtpmidi_server to rtpmidi_peer.

It is used now only by multi listener, but it really encapsulates only a peer and could be used in more contexts.

docs/Architecture.md

@@ -36,13 +36,13 @@ Just redirects MIDI to/from an ALSA port. Used by `network_rtpmidi_multi_listene
 Stores an `rtpclient_t` RTP client that connects to a remote peer and redirecs all
 MIDI data as needed.
 
-It's used by `local_alsa_waiter_t` and is ver similar to `network_rtpmidi_server_t`, but this
+It's used by `local_alsa_waiter_t` and is ver similar to `network_rtpmidi_peer_t`, but this
 is for a `rtpmidiclient_t`.
 
 ## `network:rtpmidi:multi:listener`
 
 Creates a RTP server port on which whenever an RTP peer connects creates
-both a `local_alsa_worker_t` and a `network_rtpmidi_server_t` and connects them.
+both a `local_alsa_worker_t` and a `network_rtpmidi_peer_t` and connects them.
 
 It does not send nor receive MIDI data.
 

src/CMakeLists.txt

@@ -19,7 +19,7 @@ add_executable(
   network_rtpmidi_client.cpp
   network_rtpmidi_listener.cpp
   network_rtpmidi_multi_listener.cpp
-  network_rtpmidi_server.cpp
+  network_rtpmidi_peer.cpp
 )
 
 target_link_libraries(rtpmidid2-daemon ${AVAHI_LIBRARIES})

src/factory.cpp

@@ -24,7 +24,7 @@
 #include "network_rtpmidi_client.hpp"
 #include "network_rtpmidi_listener.hpp"
 #include "network_rtpmidi_multi_listener.hpp"
-#include "network_rtpmidi_server.hpp"
+#include "network_rtpmidi_peer.hpp"
 #include <memory>
 
 namespace rtpmididns {
@@ -71,8 +71,8 @@ make_network_rtpmidi_multi_listener(const std::string &name,
 }
 
 std::shared_ptr<midipeer_t>
-make_network_rtpmidi_server(std::shared_ptr<rtpmidid::rtppeer_t> peer) {
-  return std::make_shared<network_rtpmidi_server_t>(peer);
+make_network_rtpmidi_peer(std::shared_ptr<rtpmidid::rtppeer_t> peer) {
+  return std::make_shared<network_rtpmidi_peer_t>(peer);
 }
 
 std::shared_ptr<midipeer_t>

src/factory.hpp

@@ -41,7 +41,7 @@ make_network_rtpmidi_multi_listener(const std::string &name,
                                     std::shared_ptr<aseq_t> aseq);
 //
 std::shared_ptr<midipeer_t>
-make_network_rtpmidi_server(std::shared_ptr<rtpmidid::rtppeer_t> peer);
+make_network_rtpmidi_peer(std::shared_ptr<rtpmidid::rtppeer_t> peer);
 //
 std::shared_ptr<midipeer_t> make_local_alsa_worker(const std::string &name,
                                                    std::shared_ptr<aseq_t>);

src/local_alsa_multi_listener.cpp

@@ -25,7 +25,7 @@
 #include "midipeer.hpp"
 #include "midirouter.hpp"
 #include "network_rtpmidi_listener.hpp"
-#include "network_rtpmidi_server.hpp"
+#include "network_rtpmidi_peer.hpp"
 #include "rtpmidid/iobytes.hpp"
 #include "rtpmidid/logger.hpp"
 #include <alsa/seqmid.h>

src/network_rtpmidi_multi_listener.cpp

@@ -39,7 +39,7 @@ network_rtpmidi_multi_listener_t::network_rtpmidi_multi_listener_t(
         DEBUG("Got connection from {}", peer->remote_name);
         auto alsa_id =
             router->add_peer(make_local_alsa_worker(peer->remote_name, aseq));
-        auto peer_id = router->add_peer(make_network_rtpmidi_server(peer));
+        auto peer_id = router->add_peer(make_network_rtpmidi_peer(peer));
         router->connect(alsa_id, peer_id);
         router->connect(peer_id, alsa_id);
       });

src/network_rtpmidi_server.cpp → src/network_rtpmidi_peer.cpp

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "network_rtpmidi_server.hpp"
+#include "network_rtpmidi_peer.hpp"
 #include "json.hpp"
 #include "mididata.hpp"
 #include "midirouter.hpp"
@@ -27,7 +27,7 @@
 #include <memory>
 
 namespace rtpmididns {
-network_rtpmidi_server_t::network_rtpmidi_server_t(
+network_rtpmidi_peer_t::network_rtpmidi_peer_t(
     std::shared_ptr<rtpmidid::rtppeer_t> peer_)
     : peer(peer_) {
 
@@ -49,18 +49,18 @@ network_rtpmidi_server_t::network_rtpmidi_server_t(
       });
 }
 
-network_rtpmidi_server_t::~network_rtpmidi_server_t() {}
+network_rtpmidi_peer_t::~network_rtpmidi_peer_t() {}
 
-void network_rtpmidi_server_t::send_midi(midipeer_id_t from,
-                                         const mididata_t &data) {
+void network_rtpmidi_peer_t::send_midi(midipeer_id_t from,
+                                       const mididata_t &data) {
   DEBUG("Send midi: {}", data.size());
   peer->send_midi(data);
 };
 
-json_t network_rtpmidi_server_t::status() {
+json_t network_rtpmidi_peer_t::status() {
   return json_t{
-      {"name", peer->remote_name},        //
-      {"type", "network:rtpmidi:server"}, //
+      {"name", peer->remote_name},      //
+      {"type", "network:rtpmidi:peer"}, //
       {"peer", peer_status(*peer)},
   };
 };

src/network_rtpmidi_server.hpp → src/network_rtpmidi_peer.hpp

@@ -35,15 +35,15 @@ namespace rtpmididns {
  * Data from network to the peer is managed somewhere else, normally
  * a rtpmidid::rtpclient_t or rtpmidid::rtpserver_t object.
  */
-class network_rtpmidi_server_t : public midipeer_t {
+class network_rtpmidi_peer_t : public midipeer_t {
 public:
   std::shared_ptr<rtpmidid::rtppeer_t> peer;
   rtpmidid::connection_t<const rtpmidid::io_bytes_reader &> midi_connection;
   rtpmidid::connection_t<rtpmidid::rtppeer_t::disconnect_reason_e>
       disconnect_connection;
 
-  network_rtpmidi_server_t(std::shared_ptr<rtpmidid::rtppeer_t> peer);
-  ~network_rtpmidi_server_t();
+  network_rtpmidi_peer_t(std::shared_ptr<rtpmidid::rtppeer_t> peer);
+  ~network_rtpmidi_peer_t();
 
   void send_midi(midipeer_id_t from, const mididata_t &) override;
   json_t status() override;

tests/CMakeLists.txt

@@ -78,7 +78,7 @@ add_executable(test_midirouter2
     ../src/network_rtpmidi_client.cpp
     ../src/network_rtpmidi_listener.cpp
     ../src/network_rtpmidi_multi_listener.cpp
-    ../src/network_rtpmidi_server.cpp
+    ../src/network_rtpmidi_peer.cpp
   )
 target_link_libraries(test_midirouter2 -lfmt -pthread rtpmidid-shared)
 add_test(NAME test_midirouter2 COMMAND test_midirouter2)