dlna/common

pschatzmann · pschatzmann · commit f2fd6747a9df · 2025-11-18T11:13:25.000+01:00
diff --git a/src/dlna/clients/DLNAControlPoint.h b/src/dlna/clients/DLNAControlPoint.h
@@ -5,9 +5,9 @@
 #include "Client.h"
 #include "DLNAControlPointRequestParser.h"
 #include "basic/Url.h"
-#include "dlna/DLNADeviceInfo.h"
-#include "dlna/Schedule.h"
-#include "dlna/Scheduler.h"
+#include "dlna/common/DLNADeviceInfo.h"
+#include "dlna/common/Schedule.h"
+#include "dlna/common/Scheduler.h"
 #include "dlna/clients/IControlPoint.h"
 #include "dlna/clients/SubscriptionMgrControlPoint.h"
 #include "dlna/devices/DLNADevice.h"
diff --git a/src/dlna/clients/DLNAControlPointMediaRenderer.h b/src/dlna/clients/DLNAControlPointMediaRenderer.h
@@ -3,7 +3,7 @@
 
 #include <functional>
 
-#include "dlna/Action.h"
+#include "dlna/common/Action.h"
 #include "dlna/clients/DLNAControlPoint.h"
 #include "dlna/xml/XMLProtocolInfoParser.h"
 #include "http/Server/HttpChunkWriter.h"
diff --git a/src/dlna/clients/DLNAControlPointMediaServer.h b/src/dlna/clients/DLNAControlPointMediaServer.h
@@ -1,7 +1,7 @@
 // Header-only control point helper for MediaServer devices
 #pragma once
 
-#include "dlna/Action.h"
+#include "dlna/common/Action.h"
 #include "dlna/clients/DLNAControlPoint.h"
 
 namespace tiny_dlna {
diff --git a/src/dlna/clients/DLNAControlPointRequestParser.h b/src/dlna/clients/DLNAControlPointRequestParser.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "dlna/udp/IUDPService.h"
-#include "dlna/Schedule.h"
-#include "dlna/Scheduler.h"
+#include "dlna/common/Schedule.h"
+#include "dlna/common/Scheduler.h"
 
 namespace tiny_dlna {
 
diff --git a/src/dlna/clients/IControlPoint.h b/src/dlna/clients/IControlPoint.h
@@ -6,7 +6,7 @@
 
 #include "Client.h"
 #include "basic/Url.h"
-#include "dlna/Action.h"
+#include "dlna/common/Action.h"
 #include "dlna/udp/IUDPService.h"
 #include "http/Server/IHttpRequest.h"
 #include "http/Server/IHttpServer.h"
diff --git a/src/dlna/clients/SubscriptionMgrControlPoint.h b/src/dlna/clients/SubscriptionMgrControlPoint.h
@@ -5,7 +5,7 @@
 
 #include "basic/Url.h"
 #include "basic/Vector.h"
-#include "dlna/DLNADeviceInfo.h"
+#include "dlna/common/DLNADeviceInfo.h"
 #include "dlna/devices/SubscriptionMgrDevice.h"
 #include "dlna/udp/IUDPService.h"
 #include "dlna/xml/XMLParserPrint.h"
diff --git a/src/dlna/common/Action.h b/src/dlna/common/Action.h
@@ -1,7 +1,7 @@
 
 #pragma once
-// #include "dlna/DLNAServiceInfo.h"
-#include "dlna/DLNACommon.h"
+// #include "dlnaServiceInfo.h"
+#include "dlna/common/DLNACommon.h"
 #include "dlna/xml/XMLPrinter.h"
 #include "basic/Logger.h"  // ensure DlnaLogger and DlnaLogLevel declarations
 
diff --git a/src/dlna/common/DLNACommon.h b/src/dlna/common/DLNACommon.h
diff --git a/src/dlna/common/DLNADescr.h b/src/dlna/common/DLNADescr.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "dlna/DLNACommon.h"
+#include "dlna/common/DLNACommon.h"
 
 namespace tiny_dlna {
 /**
diff --git a/src/dlna/common/DLNADeviceInfo.h b/src/dlna/common/DLNADeviceInfo.h
@@ -3,8 +3,8 @@
 
 #include "basic/Icon.h"
 #include "basic/Vector.h"
-#include "dlna/Action.h"
-#include "dlna/DLNAServiceInfo.h"
+#include "dlna/common/Action.h"
+#include "dlna/common/DLNAServiceInfo.h"
 #include "dlna/udp/IUDPService.h"  // Ensure IUDPService is declared
 #include "dlna/xml/XMLPrinter.h"
 #include "http/Server/IHttpServer.h"
diff --git a/src/dlna/common/DLNAServiceInfo.h b/src/dlna/common/DLNAServiceInfo.h
@@ -2,7 +2,7 @@
 
 #include "http/Http.h"
 #include "http/Server/IHttpServer.h"
-#include "dlna/Action.h"
+#include "dlna/common/Action.h"
 #include "basic/Str.h"
 #include "basic/StrView.h"
 
diff --git a/src/dlna/common/Schedule.h b/src/dlna/common/Schedule.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "basic/IPAddressAndPort.h"
-#include "dlna/DLNADeviceInfo.h"
+#include "dlna/common/DLNADeviceInfo.h"
 #include "dlna/udp/IUDPService.h"
 
 #define MAX_TMP_SIZE 300
diff --git a/src/dlna/common/Scheduler.h b/src/dlna/common/Scheduler.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "Arduino.h"  // for millis
-#include "dlna/DLNADeviceInfo.h"
+#include "dlna/common/DLNADeviceInfo.h"
 #include "dlna/udp/IUDPService.h"
-#include "dlna/Schedule.h"
+#include "dlna/common/Schedule.h"
 
 namespace tiny_dlna {
 
diff --git a/src/dlna/devices/DLNADevice.h b/src/dlna/devices/DLNADevice.h
@@ -4,8 +4,8 @@
 
 #include "basic/Printf.h"
 #include "basic/Url.h"
-#include "dlna/DLNADeviceInfo.h"
-#include "dlna/Schedule.h"
+#include "dlna/common/DLNADeviceInfo.h"
+#include "dlna/common/Schedule.h"
 #include "dlna/devices/DLNADeviceRequestParser.h"
 #include "dlna/devices/IDevice.h"
 #include "dlna/devices/SubscriptionMgrDevice.h"
diff --git a/src/dlna/devices/DLNADeviceRequestParser.h b/src/dlna/devices/DLNADeviceRequestParser.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "dlna/Scheduler.h"
+#include "dlna/common/Scheduler.h"
 #include "dlna/clients/DLNAControlPoint.h"
 #include "dlna/udp/IUDPService.h"
 
diff --git a/src/dlna/devices/MediaRenderer/DLNAMediaRendererDescr.h b/src/dlna/devices/MediaRenderer/DLNAMediaRendererDescr.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "dlna/DLNADescr.h"
+#include "dlna/common/DLNADescr.h"
 #include "dlna/xml/XMLPrinter.h"
 
 namespace tiny_dlna {
diff --git a/src/dlna/devices/MediaServer/DLNAMediaServer.h b/src/dlna/devices/MediaServer/DLNAMediaServer.h
@@ -6,7 +6,7 @@
 #include "basic/EscapingPrint.h"
 #include "basic/Printf.h"
 #include "basic/Str.h"
-#include "dlna/Action.h"
+#include "dlna/common/Action.h"
 #include "dlna/devices/DLNADevice.h"
 #include "dlna/devices/MediaServer/MediaItem.h"
 #include "dlna/udp/IUDPService.h"
diff --git a/src/dlna/xml/XMLDeviceParser.h b/src/dlna/xml/XMLDeviceParser.h
@@ -6,7 +6,7 @@
 #include "basic/Icon.h"
 #include "basic/Logger.h"
 #include "basic/StrView.h"
-#include "dlna/DLNADeviceInfo.h"
+#include "dlna/common/DLNADeviceInfo.h"
 
 namespace tiny_dlna {
 
diff --git a/src/dlna/xml/XMLProtocolInfoParser.h b/src/dlna/xml/XMLProtocolInfoParser.h
@@ -4,7 +4,7 @@
 #include <functional>
 
 #include "basic/Str.h"
-#include "dlna/Action.h"
+#include "dlna/common/Action.h"
 #include "http/Server/HttpRequest.h"
 // Client from Arduino core
 #include <Client.h>
