From 4ff4ae049ca108e2da9ee3e7db33b980e9917361 Mon Sep 17 00:00:00 2001
From: Toine-ddt <65868237+Toine-ddt@users.noreply.github.com>
Date: Thu, 12 Aug 2021 09:49:36 +0200
Subject: [PATCH 1/9] some changes for windows : variable definition...

---
 src/lib/score/widgets/QuantificationWidget.cpp      | 13 +++++++++++++
 .../RemoteControl/Http_server.hpp                   |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/src/lib/score/widgets/QuantificationWidget.cpp b/src/lib/score/widgets/QuantificationWidget.cpp
index af4997fe4f..a3f9e5997a 100644
--- a/src/lib/score/widgets/QuantificationWidget.cpp
+++ b/src/lib/score/widgets/QuantificationWidget.cpp
@@ -1,5 +1,18 @@
 #include <score/widgets/QuantificationWidget.hpp>
 
+#include <QAbstractItemModel>
+#include <QAction>
+#include <QIcon>
+#include <QMenu>
+#include <QMouseEvent>
+#include <QString>
+#include <QVariant>
+#include <qnamespace.h>
+
+#include <wobjectimpl.h>
+
+Q_DECLARE_METATYPE(QModelIndex)
+
 W_OBJECT_IMPL(score::QuantificationWidget)
 
 namespace score
diff --git a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.hpp b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.hpp
index a52762cc3d..3407c539df 100644
--- a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.hpp
+++ b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.hpp
@@ -27,6 +27,10 @@
 #include <string>
 #include <thread>
 
+#ifdef _WIN32
+#define SHUT_RDWR 2
+#endif
+
 #include <QDir>
 #include <QHostAddress>
 #include <QNetworkInterface>

From 37b5bc4e9d5b6dcb58d68bb9be5aee9a0a75f0a1 Mon Sep 17 00:00:00 2001
From: Toine-ddt <65868237+Toine-ddt@users.noreply.github.com>
Date: Thu, 12 Aug 2021 15:14:49 +0200
Subject: [PATCH 2/9] modify some variable and path

---
 .../score-plugin-remotecontrol/CMakeLists.txt |  2 +-
 .../RemoteControl/ApplicationPlugin.cpp       |  2 ++
 .../RemoteControl/Http_server.cpp             | 26 ++++++++++++++-----
 .../RemoteControl/Http_server.hpp             | 16 +++++++++---
 4 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/plugins/score-plugin-remotecontrol/CMakeLists.txt b/src/plugins/score-plugin-remotecontrol/CMakeLists.txt
index 5be4da36fc..b7278ea621 100644
--- a/src/plugins/score-plugin-remotecontrol/CMakeLists.txt
+++ b/src/plugins/score-plugin-remotecontrol/CMakeLists.txt
@@ -47,7 +47,7 @@ set(SRCS
 "${CMAKE_CURRENT_SOURCE_DIR}/score_plugin_remotecontrol.cpp"
 )
 
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/RemoteControl/build-wasm/ DESTINATION ${CMAKE_BINARY_DIR}/src/plugins/score-plugin-remotecontrol/CMakeFiles/score_plugin_remotecontrol.dir/RemoteControl/build-wasm/ )
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/RemoteControl/build-wasm/ DESTINATION ${CMAKE_BINARY_DIR}/src/plugins/score-plugin-remotecontrol/CMakeFiles/score_plugin_remotecontrol.dir/RemoteControl/build-wasm/)
 
 add_library(${PROJECT_NAME} ${SRCS} ${HDRS} ${QRCS})
 
diff --git a/src/plugins/score-plugin-remotecontrol/RemoteControl/ApplicationPlugin.cpp b/src/plugins/score-plugin-remotecontrol/RemoteControl/ApplicationPlugin.cpp
index fb6fc6b9c6..7614296562 100644
--- a/src/plugins/score-plugin-remotecontrol/RemoteControl/ApplicationPlugin.cpp
+++ b/src/plugins/score-plugin-remotecontrol/RemoteControl/ApplicationPlugin.cpp
@@ -18,6 +18,8 @@ void ApplicationPlugin::on_createdDocument(score::Document& doc)
 {
   doc.model().addPluginModel(new DocumentPlugin{
       doc.context(), &doc.model()});
+
+    m_server.start_thread();
 }
 
 }
diff --git a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp
index 75ce90112a..39f75b0278 100644
--- a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp
+++ b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp
@@ -22,8 +22,7 @@ namespace RemoteControl
 
 Http_server::Http_server()
 {
-  m_docRoot = "/tmp";
-  m_serverThread = std::thread{[this] { open_server(); }};
+  // m_docRoot = "/tmp";
 }
 
 Http_server::~Http_server()
@@ -122,6 +121,8 @@ Http_server::handle_request(
         return res;
     };
 
+    QDir::currentPath();
+
     // Returns a not found response
     auto const not_found =
     [&req](beast::string_view target)
@@ -130,7 +131,7 @@ Http_server::handle_request(
         res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
         res.set(http::field::content_type, "text/html");
         res.keep_alive(req.keep_alive());
-        res.body() = "The resource '" + std::string(target) + "' was not found.<br> Go to the following address : http://ip_address:port/remote.html.";
+        res.body() = "The resource '" + std::string(target) + "' was not found.<br> Current repository :" + QDir::currentPath().toUtf8().constData() +".<br> Go to the following address : http://ip_address:port/remote.html.";
         res.prepare_payload();
         return res;
     };
@@ -215,7 +216,8 @@ Http_server::fail(beast::error_code ec, char const* what)
 // Handles an HTTP server connection
 void
 Http_server::do_session(
-    tcp::socket& socket)
+    tcp::socket& socket,
+    std::shared_ptr<std::string const> const& doc_root)
 {
     bool close = false;
     beast::error_code ec;
@@ -237,7 +239,7 @@ Http_server::do_session(
             return Http_server::fail(ec, "read");
 
         // Send the response
-        Http_server::handle_request(m_docRoot, std::move(req), lambda);
+        Http_server::handle_request(*doc_root, std::move(req), lambda);
         if(ec)
             return Http_server::fail(ec, "write");
         if(close)
@@ -279,13 +281,23 @@ Http_server::get_ip_address()
 
 //------------------------------------------------------------------------------
 
+void
+Http_server::start_thread()
+{
+    m_serverThread = std::thread{[this] { open_server(); }};
+}
+
+//------------------------------------------------------------------------------
+
 int
 Http_server::open_server()
 {
     try
     {
-        auto const address = net::ip::make_address("0.0.0.0");
+        // auto const address = net::ip::make_address("0.0.0.0");
+        auto const address = net::ip::make_address("127.0.0.1");
         auto const port = static_cast<unsigned short>(std::atoi("8080"));
+        auto const m_docRoot = std::make_shared<std::string>("./src/plugins/score-plugin-remotecontrol/CMakeFiles/score_plugin_remotecontrol.dir/RemoteControl/build-wasm/");
 
         // The acceptor receives incoming connections
         tcp::acceptor acceptor{ioc, {address, port}};
@@ -299,7 +311,7 @@ Http_server::open_server()
             acceptor.accept(socket);
 
             // Launch the session, transferring ownership of the socket
-            do_session(socket);
+            do_session(socket, m_docRoot);
         }
     }
     catch (const std::exception& e)
diff --git a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.hpp b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.hpp
index 3407c539df..f689728b3b 100644
--- a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.hpp
+++ b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.hpp
@@ -125,7 +125,8 @@ class Http_server
     // Handles an HTTP server connection
     void
     do_session(
-        tcp::socket& socket);
+        tcp::socket& socket,
+        std::shared_ptr<std::string const> const& doc_root);
 
     //------------------------------------------------------------------------------
 
@@ -133,11 +134,20 @@ class Http_server
 
     //------------------------------------------------------------------------------
 
-    int open_server();
+    void
+    start_thread();
+
+    //------------------------------------------------------------------------------
+
+    int
+    open_server();
+
+    //------------------------------------------------------------------------------
 
     //void open_server_thread();
     std::thread m_serverThread;
-    std::string m_docRoot;
+    //std::string m_docRoot;
+    //auto const m_docRoot = std::make_shared<std::string>("./build-wasm/");
 
     int m_listenSocket{};
 };

From 58d08ab7b608db453aae95b2f36fb5bf0f26d3c6 Mon Sep 17 00:00:00 2001
From: Toine-ddt <65868237+Toine-ddt@users.noreply.github.com>
Date: Thu, 12 Aug 2021 16:18:45 +0200
Subject: [PATCH 3/9] clean code

---
 .../RemoteControl/Http_server.cpp                      | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp
index 39f75b0278..ece25170a7 100644
--- a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp
+++ b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp
@@ -121,8 +121,6 @@ Http_server::handle_request(
         return res;
     };
 
-    QDir::currentPath();
-
     // Returns a not found response
     auto const not_found =
     [&req](beast::string_view target)
@@ -131,7 +129,7 @@ Http_server::handle_request(
         res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
         res.set(http::field::content_type, "text/html");
         res.keep_alive(req.keep_alive());
-        res.body() = "The resource '" + std::string(target) + "' was not found.<br> Current repository :" + QDir::currentPath().toUtf8().constData() +".<br> Go to the following address : http://ip_address:port/remote.html.";
+        res.body() = "The resource '" + std::string(target) + "' was not found.<br> Go to the following address : http://ip_address:port/remote.html.";
         res.prepare_payload();
         return res;
     };
@@ -270,12 +268,10 @@ Http_server::get_ip_address()
       if(!list[nIter].isLoopback())
       {
           if (list[nIter].protocol() == QAbstractSocket::IPv4Protocol ){
-              qDebug() << list[nIter].toString();
               ip_address = list[nIter].toString().toUtf8().constData();
           }
       }
     }
-
     return ip_address;
 }
 
@@ -294,8 +290,8 @@ Http_server::open_server()
 {
     try
     {
-        // auto const address = net::ip::make_address("0.0.0.0");
-        auto const address = net::ip::make_address("127.0.0.1");
+        auto const address = net::ip::make_address("0.0.0.0");
+        // auto const address = net::ip::make_address("127.0.0.1");
         auto const port = static_cast<unsigned short>(std::atoi("8080"));
         auto const m_docRoot = std::make_shared<std::string>("./src/plugins/score-plugin-remotecontrol/CMakeFiles/score_plugin_remotecontrol.dir/RemoteControl/build-wasm/");
 

From 551b2101120da0fdf2f5b7fd9cf2d71e81f35612 Mon Sep 17 00:00:00 2001
From: Toine-ddt <65868237+Toine-ddt@users.noreply.github.com>
Date: Mon, 16 Aug 2021 10:30:41 +0200
Subject: [PATCH 4/9] get ip address and set in remote.html

---
 .../RemoteControl/Http_server.cpp             | 54 ++++++++++++++-----
 .../RemoteControl/Http_server.hpp             |  7 +++
 2 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp
index ece25170a7..21c688b64a 100644
--- a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp
+++ b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp
@@ -129,7 +129,7 @@ Http_server::handle_request(
         res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
         res.set(http::field::content_type, "text/html");
         res.keep_alive(req.keep_alive());
-        res.body() = "The resource '" + std::string(target) + "' was not found.<br> Go to the following address : http://ip_address:port/remote.html.";
+        res.body() = "The resource '" + std::string(target) + "' was not found.y<br> Go to the following address : http://ip_address:port/remote.html.";
         res.prepare_payload();
         return res;
     };
@@ -259,20 +259,42 @@ Http_server::do_session(
 std::string
 Http_server::get_ip_address()
 {
-    std::string ip_address;
+    std::string ip_address = "127.0.0.1";
+    std::string tmp_ip_address;
+    const QHostAddress &localhost = QHostAddress(QHostAddress::LocalHost);
+    for (const QHostAddress &address: QNetworkInterface::allAddresses()) {
+        if (address.protocol() == QAbstractSocket::IPv4Protocol && address != localhost) {
+            tmp_ip_address = address.toString().toUtf8().constData();
+            qDebug() << "Address : " << address.toString();
+            if((tmp_ip_address.find("192.168")) == 0 || (tmp_ip_address.find("172.16")) == 0 ) {
+                ip_address = tmp_ip_address;
+                qDebug() << "Address : " << address.toString();
+            }
+        }
+    }
 
-    QList<QHostAddress> list = QNetworkInterface::allAddresses();
+    return ip_address;
+}
 
-    for(int nIter=0; nIter<list.count(); nIter++)
-    {
-      if(!list[nIter].isLoopback())
-      {
-          if (list[nIter].protocol() == QAbstractSocket::IPv4Protocol ){
-              ip_address = list[nIter].toString().toUtf8().constData();
-          }
-      }
+//------------------------------------------------------------------------------
+
+void
+Http_server::set_ip_address(std::string address)
+{
+    std::rename("./src/plugins/score-plugin-remotecontrol/CMakeFiles/score_plugin_remotecontrol.dir/RemoteControl/build-wasm/remote.html",
+                "./src/plugins/score-plugin-remotecontrol/CMakeFiles/score_plugin_remotecontrol.dir/RemoteControl/build-wasm/remote.html~");
+
+    std::ifstream old_file("./src/plugins/score-plugin-remotecontrol/CMakeFiles/score_plugin_remotecontrol.dir/RemoteControl/build-wasm/remote.html~");
+    std::ofstream new_file("./src/plugins/score-plugin-remotecontrol/CMakeFiles/score_plugin_remotecontrol.dir/RemoteControl/build-wasm/remote.html");
+
+    std::string addr = "\"" + address + "\"";
+
+    for( std::string contents_of_file; std::getline(old_file, contents_of_file); ) {
+      std::string::size_type position = contents_of_file.find("%SCORE_IP_ADDRESS%");
+      if( position != std::string::npos )
+        contents_of_file = contents_of_file.replace(position, 18, addr);
+      new_file << contents_of_file << '\n';
     }
-    return ip_address;
 }
 
 //------------------------------------------------------------------------------
@@ -290,11 +312,15 @@ Http_server::open_server()
 {
     try
     {
-        auto const address = net::ip::make_address("0.0.0.0");
-        // auto const address = net::ip::make_address("127.0.0.1");
+        std::string string_address = get_ip_address();
+        auto const address = net::ip::make_address(string_address);
+        //auto const address = net::ip::make_address("192.168.0.40");
+        //auto const address = net::ip::make_address("127.0.0.1");
         auto const port = static_cast<unsigned short>(std::atoi("8080"));
         auto const m_docRoot = std::make_shared<std::string>("./src/plugins/score-plugin-remotecontrol/CMakeFiles/score_plugin_remotecontrol.dir/RemoteControl/build-wasm/");
 
+        set_ip_address(string_address);
+
         // The acceptor receives incoming connections
         tcp::acceptor acceptor{ioc, {address, port}};
         m_listenSocket = acceptor.native_handle();
diff --git a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.hpp b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.hpp
index f689728b3b..aa81f7adfd 100644
--- a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.hpp
+++ b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.hpp
@@ -26,6 +26,7 @@
 #include <memory>
 #include <string>
 #include <thread>
+#include <fstream>
 
 #ifdef _WIN32
 #define SHUT_RDWR 2
@@ -34,6 +35,7 @@
 #include <QDir>
 #include <QHostAddress>
 #include <QNetworkInterface>
+#include <QtDebug>
 
 namespace beast = boost::beast;         // from <boost/beast.hpp>
 namespace http = beast::http;           // from <boost/beast/http.hpp>
@@ -144,6 +146,11 @@ class Http_server
 
     //------------------------------------------------------------------------------
 
+    void
+    set_ip_address(std::string address);
+
+    //------------------------------------------------------------------------------
+
     //void open_server_thread();
     std::thread m_serverThread;
     //std::string m_docRoot;

From ee81ac3ab4fe1aba2ae4d8f9002c3aae16f5851d Mon Sep 17 00:00:00 2001
From: Toine-ddt <65868237+Toine-ddt@users.noreply.github.com>
Date: Mon, 16 Aug 2021 11:13:44 +0200
Subject: [PATCH 5/9] add comments and clean code

---
 .../RemoteControl/Http_server.cpp             | 14 ++++-------
 .../RemoteControl/Http_server.hpp             | 24 ++++++++-----------
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp
index 21c688b64a..6840917cc3 100644
--- a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp
+++ b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp
@@ -7,16 +7,10 @@
 // Official repository: https://github.com/boostorg/beast
 //
 
-//------------------------------------------------------------------------------
-//
-// Example: HTTP server, synchronous
-//
-//------------------------------------------------------------------------------
-
 #include <RemoteControl/Http_server.hpp>
 
 //------------------------------------------------------------------------------
-#include <QApplication>
+
 namespace RemoteControl
 {
 
@@ -256,6 +250,7 @@ Http_server::do_session(
 
 //------------------------------------------------------------------------------
 
+// Get the IP address. It is an heuristic function
 std::string
 Http_server::get_ip_address()
 {
@@ -278,6 +273,7 @@ Http_server::get_ip_address()
 
 //------------------------------------------------------------------------------
 
+// Set the IP address in the remote.html file
 void
 Http_server::set_ip_address(std::string address)
 {
@@ -299,6 +295,7 @@ Http_server::set_ip_address(std::string address)
 
 //------------------------------------------------------------------------------
 
+// Launch the open_server function in a thread
 void
 Http_server::start_thread()
 {
@@ -307,6 +304,7 @@ Http_server::start_thread()
 
 //------------------------------------------------------------------------------
 
+// Open a server using sockets
 int
 Http_server::open_server()
 {
@@ -314,8 +312,6 @@ Http_server::open_server()
     {
         std::string string_address = get_ip_address();
         auto const address = net::ip::make_address(string_address);
-        //auto const address = net::ip::make_address("192.168.0.40");
-        //auto const address = net::ip::make_address("127.0.0.1");
         auto const port = static_cast<unsigned short>(std::atoi("8080"));
         auto const m_docRoot = std::make_shared<std::string>("./src/plugins/score-plugin-remotecontrol/CMakeFiles/score_plugin_remotecontrol.dir/RemoteControl/build-wasm/");
 
diff --git a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.hpp b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.hpp
index aa81f7adfd..317b4a8f56 100644
--- a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.hpp
+++ b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.hpp
@@ -7,11 +7,6 @@
 // Official repository: https://github.com/boostorg/beast
 //
 
-//------------------------------------------------------------------------------
-//
-// Example: HTTP server, synchronous
-//
-//------------------------------------------------------------------------------
 #pragma once
 
 #define BOOST_DATE_TIME_NO_LIB 1
@@ -36,6 +31,7 @@
 #include <QHostAddress>
 #include <QNetworkInterface>
 #include <QtDebug>
+#include <QApplication>
 
 namespace beast = boost::beast;         // from <boost/beast.hpp>
 namespace http = beast::http;           // from <boost/beast/http.hpp>
@@ -132,30 +128,30 @@ class Http_server
 
     //------------------------------------------------------------------------------
 
+    // Get the IP address. It is an heuristic function
     std::string get_ip_address();
 
     //------------------------------------------------------------------------------
 
+    // Set the IP address in the remote.html file
     void
-    start_thread();
+    set_ip_address(std::string address);
 
     //------------------------------------------------------------------------------
 
-    int
-    open_server();
+    // Launch the open_server function in a thread
+    void
+    start_thread();
 
     //------------------------------------------------------------------------------
 
-    void
-    set_ip_address(std::string address);
+    // Open a server using sockets
+    int
+    open_server();
 
     //------------------------------------------------------------------------------
 
-    //void open_server_thread();
     std::thread m_serverThread;
-    //std::string m_docRoot;
-    //auto const m_docRoot = std::make_shared<std::string>("./build-wasm/");
-
     int m_listenSocket{};
 };
 }

From 816931c305298dfe871e1b9d5fe3cd0b7054294e Mon Sep 17 00:00:00 2001
From: Toine-ddt <65868237+Toine-ddt@users.noreply.github.com>
Date: Mon, 16 Aug 2021 11:22:07 +0200
Subject: [PATCH 6/9] detect ip address which start with 172.

---
 .../score-plugin-remotecontrol/RemoteControl/Http_server.cpp    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp
index 6840917cc3..603214aad5 100644
--- a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp
+++ b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp
@@ -261,7 +261,7 @@ Http_server::get_ip_address()
         if (address.protocol() == QAbstractSocket::IPv4Protocol && address != localhost) {
             tmp_ip_address = address.toString().toUtf8().constData();
             qDebug() << "Address : " << address.toString();
-            if((tmp_ip_address.find("192.168")) == 0 || (tmp_ip_address.find("172.16")) == 0 ) {
+            if((tmp_ip_address.find("192.168")) == 0 || (tmp_ip_address.find("172.")) == 0 ) {
                 ip_address = tmp_ip_address;
                 qDebug() << "Address : " << address.toString();
             }

From 5a00450f7355b252b6600457cb857c11e0e06f95 Mon Sep 17 00:00:00 2001
From: Toine-ddt <65868237+Toine-ddt@users.noreply.github.com>
Date: Wed, 18 Aug 2021 12:35:34 +0200
Subject: [PATCH 7/9] detect ip address with socket / set keep_alive = false

---
 .../RemoteControl/Http_server.cpp             | 43 ++++++-------------
 .../RemoteControl/Http_server.hpp             |  5 ---
 2 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp
index 603214aad5..dd4d053728 100644
--- a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp
+++ b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp
@@ -180,7 +180,8 @@ Http_server::handle_request(
         res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
         res.set(http::field::content_type, mime_type(path));
         res.content_length(size);
-        res.keep_alive(req.keep_alive());
+        //res.keep_alive(req.keep_alive());
+        res.keep_alive(false);
         return send(std::move(res));
     }
 
@@ -192,7 +193,8 @@ Http_server::handle_request(
     res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
     res.set(http::field::content_type, mime_type(path));
     res.content_length(size);
-    res.keep_alive(req.keep_alive());
+    //res.keep_alive(req.keep_alive());
+    res.keep_alive(false);
     return send(std::move(res));
 }
 
@@ -250,29 +252,6 @@ Http_server::do_session(
 
 //------------------------------------------------------------------------------
 
-// Get the IP address. It is an heuristic function
-std::string
-Http_server::get_ip_address()
-{
-    std::string ip_address = "127.0.0.1";
-    std::string tmp_ip_address;
-    const QHostAddress &localhost = QHostAddress(QHostAddress::LocalHost);
-    for (const QHostAddress &address: QNetworkInterface::allAddresses()) {
-        if (address.protocol() == QAbstractSocket::IPv4Protocol && address != localhost) {
-            tmp_ip_address = address.toString().toUtf8().constData();
-            qDebug() << "Address : " << address.toString();
-            if((tmp_ip_address.find("192.168")) == 0 || (tmp_ip_address.find("172.")) == 0 ) {
-                ip_address = tmp_ip_address;
-                qDebug() << "Address : " << address.toString();
-            }
-        }
-    }
-
-    return ip_address;
-}
-
-//------------------------------------------------------------------------------
-
 // Set the IP address in the remote.html file
 void
 Http_server::set_ip_address(std::string address)
@@ -310,15 +289,14 @@ Http_server::open_server()
 {
     try
     {
-        std::string string_address = get_ip_address();
-        auto const address = net::ip::make_address(string_address);
+        auto const address2 = net::ip::make_address("0.0.0.0");
         auto const port = static_cast<unsigned short>(std::atoi("8080"));
         auto const m_docRoot = std::make_shared<std::string>("./src/plugins/score-plugin-remotecontrol/CMakeFiles/score_plugin_remotecontrol.dir/RemoteControl/build-wasm/");
 
-        set_ip_address(string_address);
+        bool is_ip_address_set = false;
 
         // The acceptor receives incoming connections
-        tcp::acceptor acceptor{ioc, {address, port}};
+        tcp::acceptor acceptor{ioc, {address2, port}};
         m_listenSocket = acceptor.native_handle();
         for(;;)
         {
@@ -328,6 +306,13 @@ Http_server::open_server()
             // Block until we get a connection
             acceptor.accept(socket);
 
+            // Set ip address
+            if(!is_ip_address_set)
+            {
+                set_ip_address(socket.local_endpoint().address().to_string());
+                is_ip_address_set = true;
+            }
+
             // Launch the session, transferring ownership of the socket
             do_session(socket, m_docRoot);
         }
diff --git a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.hpp b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.hpp
index 317b4a8f56..adee0e6a66 100644
--- a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.hpp
+++ b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.hpp
@@ -128,11 +128,6 @@ class Http_server
 
     //------------------------------------------------------------------------------
 
-    // Get the IP address. It is an heuristic function
-    std::string get_ip_address();
-
-    //------------------------------------------------------------------------------
-
     // Set the IP address in the remote.html file
     void
     set_ip_address(std::string address);

From d63252489833e622efa495597a97df66c3e6e390 Mon Sep 17 00:00:00 2001
From: Toine-ddt <65868237+Toine-ddt@users.noreply.github.com>
Date: Wed, 18 Aug 2021 14:21:57 +0200
Subject: [PATCH 8/9] clean code

---
 .../score-plugin-remotecontrol/RemoteControl/Http_server.cpp    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp
index dd4d053728..a24838cf3f 100644
--- a/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp
+++ b/src/plugins/score-plugin-remotecontrol/RemoteControl/Http_server.cpp
@@ -180,7 +180,6 @@ Http_server::handle_request(
         res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
         res.set(http::field::content_type, mime_type(path));
         res.content_length(size);
-        //res.keep_alive(req.keep_alive());
         res.keep_alive(false);
         return send(std::move(res));
     }
@@ -193,7 +192,6 @@ Http_server::handle_request(
     res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
     res.set(http::field::content_type, mime_type(path));
     res.content_length(size);
-    //res.keep_alive(req.keep_alive());
     res.keep_alive(false);
     return send(std::move(res));
 }

From 81eab9c153a64ea00f0fc7764144d0b4e3065720 Mon Sep 17 00:00:00 2001
From: thibaudk <thibaud.keller@aquilenet.fr>
Date: Mon, 9 Aug 2021 10:21:05 +0200
Subject: [PATCH 9/9] add qml-remote submodule

---
 .gitmodules         | 3 +++
 3rdparty/qml-remote | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 3rdparty/qml-remote

diff --git a/.gitmodules b/.gitmodules
index fa90567081..36acbcc1ab 100755
--- a/.gitmodules
+++ b/.gitmodules
@@ -44,3 +44,6 @@
 [submodule "3rdparty/hap"]
 	path = 3rdparty/hap
 	url = https://github.com/Vidvox/hap
+[submodule "3rdparty/qml-remote"]
+	path = 3rdparty/qml-remote
+	url = https://github.com/ossia/qml-remote.git
diff --git a/3rdparty/qml-remote b/3rdparty/qml-remote
new file mode 160000
index 0000000000..e4427ba798
--- /dev/null
+++ b/3rdparty/qml-remote
@@ -0,0 +1 @@
+Subproject commit e4427ba7989a8a63273e173d9a1f6f2ee368899d