From e4b56b75cb31dd538dea10d0a4647886dc7ab3d3 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Tue, 9 Sep 2025 19:44:11 +0200 Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20l=C3=A9g=C3=A8re=20du=20CSS?= =?UTF-8?q?=20pour=20les=20logs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pmoapp/web/src/App.css | 264 ++++++++++++------ pmoupnp/debug_index.go | 2 +- pmoupnp/dev_set.go | 4 +- pmoupnp/device.go | 2 +- pmoupnp/deviceinstance.go | 2 +- .../mediarenderer/AVTransport/ac_Play.go | 2 +- .../AVTransport/ac_SetAVTransportURI.go | 2 +- .../mediarenderer/AVTransport/ac_Stop.go | 2 +- .../AVTransport/sv_AVTransportURI.go | 2 +- .../AVTransport/sv_AVTransportURIMetaData.go | 2 +- .../AVTransport/sv_A_ARG_TYPE_InstanceID.go | 2 +- .../AVTransport/sv_A_ARG_TYPE_PlaySpeed.go | 2 +- .../AVTransport/sv_CurrentTrackDuration.go | 2 +- .../mediarenderer/AVTransport/sv_SeekMode.go | 2 +- .../AVTransport/sv_TransportPlaySpeed.go | 2 +- .../AVTransport/sv_TransportState.go | 2 +- .../AVTransport/sv_TransportStatus.go | 2 +- .../AVTransport/svc_avtransport.go | 6 +- .../ac_GetCurrentConnectionIDs.go | 2 +- .../ac_GetCurrentConnectionInfo.go | 2 +- .../ConnectionManager/ac_GetProtocolInfo.go | 2 +- .../ConnectionManager/sv_AVTransportID.go | 2 +- .../sv_A_ARG_TYPE_AVTransportID.go | 2 +- .../sv_A_ARG_TYPE_ConnectionID.go | 2 +- .../sv_A_ARG_TYPE_ConnectionManager.go | 2 +- .../sv_A_ARG_TYPE_ConnectionStatus.go | 2 +- .../sv_A_ARG_TYPE_Direction.go | 2 +- .../sv_A_ARG_TYPE_ProtocolInfo.go | 2 +- .../ConnectionManager/sv_A_ARG_TYPE_RcsID.go | 2 +- .../ConnectionManager/sv_ConnectionID.go | 2 +- .../sv_CurrentConnectionIDs.go | 2 +- .../ConnectionManager/sv_Direction.go | 2 +- .../ConnectionManager/sv_PeerConnectionID.go | 2 +- .../sv_PeerConnectionManager.go | 2 +- .../ConnectionManager/sv_RcsID.go | 2 +- .../ConnectionManager/sv_SinkProtocolInfo.go | 2 +- .../sv_SourceProtocolInfo.go | 2 +- .../ConnectionManager/sv_Status.go | 2 +- .../svc_connectionmanager.go | 6 +- .../RenderingControl/sv_Channel.go | 2 +- .../RenderingControl/sv_InstanceID.go | 2 +- .../mediarenderer/RenderingControl/sv_Mute.go | 2 +- .../RenderingControl/sv_Volume.go | 2 +- .../RenderingControl/svc_renderingcontrol.go | 6 +- .../devices/mediarenderer/mr_fake_renderer.go | 12 +- .../services/actions/actioninstanceset.go | 2 +- pmoupnp/devices/services/actions/actionset.go | 2 +- pmoupnp/devices/services/actions/argument.go | 2 +- .../devices/services/actions/argumentset.go | 2 +- .../statevariables/statevalueinstanceset.go | 2 +- .../statevariables/statevariableset.go | 2 +- pmoupnp/events.go | 2 +- pmoupnp/interface.go | 2 +- pmoupnp/server.go | 2 +- pmoupnp/service.go | 6 +- pmoupnp/serviceinstance.go | 6 +- pmoupnp/serviceinstanceset.go | 4 +- pmoupnp/serviceset.go | 4 +- pmoupnp/srv_reg_devices.go | 2 +- 59 files changed, 250 insertions(+), 166 deletions(-) diff --git a/pmoapp/web/src/App.css b/pmoapp/web/src/App.css index 4f597aed..2b1071b2 100644 --- a/pmoapp/web/src/App.css +++ b/pmoapp/web/src/App.css @@ -1,123 +1,207 @@ /* App.css ou index.css */ @import "tailwindcss"; -/* @tailwind base; -@tailwind components; -@tailwind utilities; */ +/* Styles de base améliorés */ +:root { + font-family: 'SF Pro Display', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, sans-serif; + line-height: 1.6; + font-weight: 400; + color-scheme: light dark; + font-synthesis: none; + text-rendering: optimizeLegibility; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} -/* Styles custom */ +/* Styles pour le conteneur principal */ .log-container { - @apply p-4 space-y-2 min-h-screen; + @apply p-4 space-y-3 min-h-screen; + max-width: 100%; + overflow-x: hidden; } +/* Styles généraux pour les entrées de log améliorées */ .log-entry { - @apply rounded-lg p-2 font-mono shadow-md; -} - -.log-entry.info { @apply bg-gray-800 text-green-400; } -.log-entry.warning { @apply bg-gray-800 text-yellow-400; } -.log-entry.error { @apply bg-gray-800 text-red-400; } -.log-entry.debug { @apply bg-gray-800 text-purple-400; } - - -/* Styles pour le thème sombre */ -.dark .log-entry { - background: linear-gradient(90deg, rgba(30, 30, 30, 0.5), transparent); + @apply rounded-xl p-4 font-mono shadow-lg transition-all duration-300 ease-out; border-left: 4px solid; + backdrop-filter: blur(10px); + transform-origin: center top; } -.dark .log-entry.error { - border-color: #f87171; - background: linear-gradient(90deg, rgba(248, 113, 113, 0.1), transparent); -} - -.dark .log-entry.warning { - border-color: #fbbf24; - background: linear-gradient(90deg, rgba(251, 191, 36, 0.1), transparent); -} - -.dark .log-entry.info { - border-color: #60a5fa; - background: linear-gradient(90deg, rgba(96, 165, 250, 0.1), transparent); -} - -.dark .log-entry.debug { - border-color: #a78bfa; - background: linear-gradient(90deg, rgba(167, 139, 250, 0.1), transparent); -} - -/* Styles pour le thème clair */ -.light .log-entry { - background: linear-gradient(90deg, rgba(240, 240, 240, 0.5), transparent); - border-left: 4px solid; -} - -.light .log-entry.error { - border-color: #dc2626; - background: linear-gradient(90deg, rgba(220, 38, 38, 0.1), transparent); -} - -.light .log-entry.warning { - border-color: #d97706; - background: linear-gradient(90deg, rgba(217, 119, 6, 0.1), transparent); -} - -.light .log-entry.info { - border-color: #2563eb; - background: linear-gradient(90deg, rgba(37, 99, 235, 0.1), transparent); -} - -.light .log-entry.debug { - border-color: #7c3aed; - background: linear-gradient(90deg, rgba(124, 58, 237, 0.1), transparent); -} - -/* Animation pour les nouveaux logs */ -@keyframes highlight { - 0% { opacity: 0.5; } - 100% { opacity: 1; } +/* Animation d'entrée pour les nouveaux logs */ +@keyframes slideIn { + 0% { + opacity: 0; + transform: translateY(-10px); + } + 100% { + opacity: 1; + transform: translateY(0); + } } .log-entry:first-child { - animation: highlight 0.5s ease; + animation: slideIn 0.4s ease-out; } -/* Styles pour la barre de défilement */ -.log-container::-webkit-scrollbar { - width: 8px; +/* Styles pour le thème sombre - améliorés */ +.dark .log-entry { + background: linear-gradient(90deg, rgba(30, 30, 30, 0.7), rgba(30, 30, 30, 0.4)); + border-top: 1px solid rgba(255, 255, 255, 0.05); } -.log-container::-webkit-scrollbar-track { - background: transparent; +.dark .log-entry.info { + border-color: #3b82f6; + box-shadow: 0 4px 12px rgba(59, 130, 246, 0.15); } -.log-container::-webkit-scrollbar-thumb { - background: rgba(156, 163, 175, 0.5); - border-radius: 4px; +.dark .log-entry.warning { + border-color: #f59e0b; + box-shadow: 0 4px 12px rgba(245, 158, 11, 0.15); } -.log-container::-webkit-scrollbar-thumb:hover { - background: rgba(156, 163, 175, 0.7); +.dark .log-entry.error { + border-color: #ef4444; + box-shadow: 0 4px 12px rgba(239, 68, 68, 0.15); } -.dark .log-container::-webkit-scrollbar-thumb { - background: rgba(75, 85, 99, 0.5); +.dark .log-entry.debug { + border-color: #8b5cf6; + box-shadow: 0 4px 12px rgba(139, 92, 246, 0.15); } -.dark .log-container::-webkit-scrollbar-thumb:hover { - background: rgba(75, 85, 99, 0.7); +.dark .log-entry:hover { + transform: translateY(-2px); + box-shadow: 0 6px 16px rgba(0, 0, 0, 0.3); } -/* Amélioration de l'apparence des détails */ -details summary::-webkit-details-marker { - display: none; +/* Styles pour les éléments de détail et code */ +.dark details { + @apply mt-3 rounded-lg overflow-hidden; + background: rgba(20, 20, 20, 0.6); } -details summary { - list-style: none; - transition: color 0.2s ease; +.dark summary { + @apply p-2 cursor-pointer font-semibold flex items-center; + background: rgba(0, 0, 0, 0.2); + user-select: none; } -details[open] summary { - margin-bottom: 0.5rem; +.dark summary::before { + content: "►"; + @apply mr-2 text-xs transition-transform; +} + +.dark details[open] summary::before { + transform: rotate(90deg); +} + +.dark pre { + @apply p-4 overflow-x-auto; + background: rgba(10, 10, 10, 0.8) !important; + border-left: 3px solid rgba(255, 255, 255, 0.1); +} + +.dark code { + @apply text-sm; + font-family: 'Fira Code', 'Monaco', 'Cascadia Code', monospace; +} + +/* Styles pour les éléments spécifiques dans les logs */ +.dark .bg-black { + background: rgba(0, 0, 0, 0.3) !important; +} + +.dark ul { + @apply mt-2 space-y-1; +} + +.dark li { + @apply flex; +} + +.dark li strong { + @apply min-w-[100px] text-neutral-300; +} + +.dark img { + @apply rounded-lg mt-2 max-h-24 border border-neutral-700; +} + +/* Amélioration du header */ +.dark header { + @apply sticky top-0 z-10 shadow-md border-b border-neutral-700; + background: rgba(23, 23, 23, 0.95); + backdrop-filter: blur(10px); +} + +.dark button { + @apply transition-all duration-200; +} + +.dark button:hover { + transform: translateY(-1px); + box-shadow: 0 4px 8px rgba(0, 0, 0, 0.3); +} + +/* Barre de défilement personnalisée */ +.dark ::-webkit-scrollbar { + width: 10px; +} + +.dark ::-webkit-scrollbar-track { + background: rgba(30, 30, 30, 0.5); + border-radius: 5px; +} + +.dark ::-webkit-scrollbar-thumb { + background: rgba(90, 90, 90, 0.5); + border-radius: 5px; +} + +.dark ::-webkit-scrollbar-thumb:hover { + background: rgba(120, 120, 120, 0.6); +} + +/* Styles pour les messages spécifiques */ +.log-entry .emoji { + @apply mr-2; +} + +.log-entry .ip-address { + @apply font-bold text-amber-400; +} + +.log-entry .success { + @apply text-green-400; +} + +/* Responsive design */ +@media (max-width: 768px) { + .log-entry { + @apply p-3; + } + + .dark header { + @apply flex-col space-y-2 items-start; + } + + .dark header h1 { + @apply text-lg; + } + + .dark pre { + @apply text-xs; + } +} + +/* Animation de pulse pour les logs actifs */ +@keyframes pulseSubtle { + 0% { opacity: 0.9; } + 50% { opacity: 1; } + 100% { opacity: 0.9; } +} + +.log-entry:first-child { + animation: slideIn 0.4s ease-out, pulseSubtle 3s infinite; } \ No newline at end of file diff --git a/pmoupnp/debug_index.go b/pmoupnp/debug_index.go index a2959a16..8e7e0337 100644 --- a/pmoupnp/debug_index.go +++ b/pmoupnp/debug_index.go @@ -1,4 +1,4 @@ -package upnp +package pmoupnp import ( "fmt" diff --git a/pmoupnp/dev_set.go b/pmoupnp/dev_set.go index b878a739..98fd875c 100644 --- a/pmoupnp/dev_set.go +++ b/pmoupnp/dev_set.go @@ -1,9 +1,9 @@ -package upnp +package pmoupnp import ( "iter" - "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/objectstore" + "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/objectstore" "github.com/beevik/etree" ) diff --git a/pmoupnp/device.go b/pmoupnp/device.go index 54fd577c..89f93ada 100644 --- a/pmoupnp/device.go +++ b/pmoupnp/device.go @@ -1,4 +1,4 @@ -package upnp +package pmoupnp import ( "fmt" diff --git a/pmoupnp/deviceinstance.go b/pmoupnp/deviceinstance.go index a9399d61..e936ae62 100644 --- a/pmoupnp/deviceinstance.go +++ b/pmoupnp/deviceinstance.go @@ -1,4 +1,4 @@ -package upnp +package pmoupnp import ( "fmt" diff --git a/pmoupnp/devices/mediarenderer/AVTransport/ac_Play.go b/pmoupnp/devices/mediarenderer/AVTransport/ac_Play.go index c60e0d8f..f21ed3f2 100644 --- a/pmoupnp/devices/mediarenderer/AVTransport/ac_Play.go +++ b/pmoupnp/devices/mediarenderer/AVTransport/ac_Play.go @@ -1,6 +1,6 @@ package avtransport -import "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/actions" +import "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/actions" var Play = func() *actions.Action { diff --git a/pmoupnp/devices/mediarenderer/AVTransport/ac_SetAVTransportURI.go b/pmoupnp/devices/mediarenderer/AVTransport/ac_SetAVTransportURI.go index e3d8bded..9095ad46 100644 --- a/pmoupnp/devices/mediarenderer/AVTransport/ac_SetAVTransportURI.go +++ b/pmoupnp/devices/mediarenderer/AVTransport/ac_SetAVTransportURI.go @@ -1,6 +1,6 @@ package avtransport -import "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/actions" +import "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/actions" var SetAVTransportURI = func() *actions.Action { diff --git a/pmoupnp/devices/mediarenderer/AVTransport/ac_Stop.go b/pmoupnp/devices/mediarenderer/AVTransport/ac_Stop.go index e7180a6e..9543a9d0 100644 --- a/pmoupnp/devices/mediarenderer/AVTransport/ac_Stop.go +++ b/pmoupnp/devices/mediarenderer/AVTransport/ac_Stop.go @@ -1,6 +1,6 @@ package avtransport -import "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/actions" +import "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/actions" var Stop = func() *actions.Action { diff --git a/pmoupnp/devices/mediarenderer/AVTransport/sv_AVTransportURI.go b/pmoupnp/devices/mediarenderer/AVTransport/sv_AVTransportURI.go index 1bf59aee..d92c3b02 100644 --- a/pmoupnp/devices/mediarenderer/AVTransport/sv_AVTransportURI.go +++ b/pmoupnp/devices/mediarenderer/AVTransport/sv_AVTransportURI.go @@ -1,6 +1,6 @@ package avtransport -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var AVTransportURI = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/AVTransport/sv_AVTransportURIMetaData.go b/pmoupnp/devices/mediarenderer/AVTransport/sv_AVTransportURIMetaData.go index 8b24fa4a..28f16b7f 100644 --- a/pmoupnp/devices/mediarenderer/AVTransport/sv_AVTransportURIMetaData.go +++ b/pmoupnp/devices/mediarenderer/AVTransport/sv_AVTransportURIMetaData.go @@ -2,7 +2,7 @@ package avtransport import ( "gargoton.petite-maison-orange.fr/eric/pmomusic/didl" - sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" + sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" log "github.com/sirupsen/logrus" ) diff --git a/pmoupnp/devices/mediarenderer/AVTransport/sv_A_ARG_TYPE_InstanceID.go b/pmoupnp/devices/mediarenderer/AVTransport/sv_A_ARG_TYPE_InstanceID.go index 735aa11d..12351e4f 100644 --- a/pmoupnp/devices/mediarenderer/AVTransport/sv_A_ARG_TYPE_InstanceID.go +++ b/pmoupnp/devices/mediarenderer/AVTransport/sv_A_ARG_TYPE_InstanceID.go @@ -1,6 +1,6 @@ package avtransport -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var A_ARG_TYPE_InstanceID = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/AVTransport/sv_A_ARG_TYPE_PlaySpeed.go b/pmoupnp/devices/mediarenderer/AVTransport/sv_A_ARG_TYPE_PlaySpeed.go index c593b314..c78bfa14 100644 --- a/pmoupnp/devices/mediarenderer/AVTransport/sv_A_ARG_TYPE_PlaySpeed.go +++ b/pmoupnp/devices/mediarenderer/AVTransport/sv_A_ARG_TYPE_PlaySpeed.go @@ -1,6 +1,6 @@ package avtransport -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var A_ARG_TYPE_PlaySpeed = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/AVTransport/sv_CurrentTrackDuration.go b/pmoupnp/devices/mediarenderer/AVTransport/sv_CurrentTrackDuration.go index 52450b69..4f7be8e8 100644 --- a/pmoupnp/devices/mediarenderer/AVTransport/sv_CurrentTrackDuration.go +++ b/pmoupnp/devices/mediarenderer/AVTransport/sv_CurrentTrackDuration.go @@ -1,6 +1,6 @@ package avtransport -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var CurrentTrackDuration = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/AVTransport/sv_SeekMode.go b/pmoupnp/devices/mediarenderer/AVTransport/sv_SeekMode.go index a5582ef9..c3587d0c 100644 --- a/pmoupnp/devices/mediarenderer/AVTransport/sv_SeekMode.go +++ b/pmoupnp/devices/mediarenderer/AVTransport/sv_SeekMode.go @@ -1,6 +1,6 @@ package avtransport -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var SeekMode = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/AVTransport/sv_TransportPlaySpeed.go b/pmoupnp/devices/mediarenderer/AVTransport/sv_TransportPlaySpeed.go index 91acf03f..4d92d0ba 100644 --- a/pmoupnp/devices/mediarenderer/AVTransport/sv_TransportPlaySpeed.go +++ b/pmoupnp/devices/mediarenderer/AVTransport/sv_TransportPlaySpeed.go @@ -1,6 +1,6 @@ package avtransport -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var TransportPlaySpeed = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/AVTransport/sv_TransportState.go b/pmoupnp/devices/mediarenderer/AVTransport/sv_TransportState.go index 14949987..a546bdf9 100644 --- a/pmoupnp/devices/mediarenderer/AVTransport/sv_TransportState.go +++ b/pmoupnp/devices/mediarenderer/AVTransport/sv_TransportState.go @@ -1,6 +1,6 @@ package avtransport -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var TransportState = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/AVTransport/sv_TransportStatus.go b/pmoupnp/devices/mediarenderer/AVTransport/sv_TransportStatus.go index 4eae52e8..fe87fb04 100644 --- a/pmoupnp/devices/mediarenderer/AVTransport/sv_TransportStatus.go +++ b/pmoupnp/devices/mediarenderer/AVTransport/sv_TransportStatus.go @@ -1,6 +1,6 @@ package avtransport -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var TransportStatus = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/AVTransport/svc_avtransport.go b/pmoupnp/devices/mediarenderer/AVTransport/svc_avtransport.go index b235845a..27ec7547 100644 --- a/pmoupnp/devices/mediarenderer/AVTransport/svc_avtransport.go +++ b/pmoupnp/devices/mediarenderer/AVTransport/svc_avtransport.go @@ -1,9 +1,9 @@ package avtransport -import "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp" +import "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp" -var AVTransport = func() *upnp.Service { - svc := upnp.NewService("AVTransport") +var AVTransport = func() *pmoupnp.Service { + svc := pmoupnp.NewService("AVTransport") svc.AddAction(SetAVTransportURI) svc.AddAction(Play) diff --git a/pmoupnp/devices/mediarenderer/ConnectionManager/ac_GetCurrentConnectionIDs.go b/pmoupnp/devices/mediarenderer/ConnectionManager/ac_GetCurrentConnectionIDs.go index 92e302ec..2b11f56d 100644 --- a/pmoupnp/devices/mediarenderer/ConnectionManager/ac_GetCurrentConnectionIDs.go +++ b/pmoupnp/devices/mediarenderer/ConnectionManager/ac_GetCurrentConnectionIDs.go @@ -1,6 +1,6 @@ package connectionmanager -import "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/actions" +import "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/actions" var GetCurrentConnectionIDs = func() *actions.Action { diff --git a/pmoupnp/devices/mediarenderer/ConnectionManager/ac_GetCurrentConnectionInfo.go b/pmoupnp/devices/mediarenderer/ConnectionManager/ac_GetCurrentConnectionInfo.go index 7caabd98..5a1057ea 100644 --- a/pmoupnp/devices/mediarenderer/ConnectionManager/ac_GetCurrentConnectionInfo.go +++ b/pmoupnp/devices/mediarenderer/ConnectionManager/ac_GetCurrentConnectionInfo.go @@ -1,6 +1,6 @@ package connectionmanager -import "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/actions" +import "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/actions" var GetCurrentConnectionInfo = func() *actions.Action { diff --git a/pmoupnp/devices/mediarenderer/ConnectionManager/ac_GetProtocolInfo.go b/pmoupnp/devices/mediarenderer/ConnectionManager/ac_GetProtocolInfo.go index 36ca9aeb..d1f63531 100644 --- a/pmoupnp/devices/mediarenderer/ConnectionManager/ac_GetProtocolInfo.go +++ b/pmoupnp/devices/mediarenderer/ConnectionManager/ac_GetProtocolInfo.go @@ -1,6 +1,6 @@ package connectionmanager -import "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/actions" +import "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/actions" var GetProtocolInfo = func() *actions.Action { diff --git a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_AVTransportID.go b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_AVTransportID.go index 9cc2619b..0894aed5 100644 --- a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_AVTransportID.go +++ b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_AVTransportID.go @@ -1,6 +1,6 @@ package connectionmanager -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var AVTransportID = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_AVTransportID.go b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_AVTransportID.go index ef4e4b06..375d8c5e 100644 --- a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_AVTransportID.go +++ b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_AVTransportID.go @@ -1,6 +1,6 @@ package connectionmanager -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var A_ARG_TYPE_AVTransportID = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_ConnectionID.go b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_ConnectionID.go index 57cdbb57..dc289754 100644 --- a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_ConnectionID.go +++ b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_ConnectionID.go @@ -1,6 +1,6 @@ package connectionmanager -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var A_ARG_TYPE_ConnectionID = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_ConnectionManager.go b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_ConnectionManager.go index d5877b32..73a30f33 100644 --- a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_ConnectionManager.go +++ b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_ConnectionManager.go @@ -1,6 +1,6 @@ package connectionmanager -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var A_ARG_TYPE_ConnectionManager = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_ConnectionStatus.go b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_ConnectionStatus.go index de06cd36..973761ff 100644 --- a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_ConnectionStatus.go +++ b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_ConnectionStatus.go @@ -1,6 +1,6 @@ package connectionmanager -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var A_ARG_TYPE_ConnectionStatus = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_Direction.go b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_Direction.go index f6aa01eb..ed912541 100644 --- a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_Direction.go +++ b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_Direction.go @@ -1,6 +1,6 @@ package connectionmanager -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var A_ARG_TYPE_Direction = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_ProtocolInfo.go b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_ProtocolInfo.go index f3e6fc67..228b4824 100644 --- a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_ProtocolInfo.go +++ b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_ProtocolInfo.go @@ -1,6 +1,6 @@ package connectionmanager -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var A_ARG_TYPE_ProtocolInfo = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_RcsID.go b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_RcsID.go index 7a762df7..bb5f1642 100644 --- a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_RcsID.go +++ b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_A_ARG_TYPE_RcsID.go @@ -1,6 +1,6 @@ package connectionmanager -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var A_ARG_TYPE_RcsID = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_ConnectionID.go b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_ConnectionID.go index 793ca4cb..bd6e6d4b 100644 --- a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_ConnectionID.go +++ b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_ConnectionID.go @@ -1,6 +1,6 @@ package connectionmanager -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var ConnectionID = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_CurrentConnectionIDs.go b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_CurrentConnectionIDs.go index 12024ca5..aa4b60be 100644 --- a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_CurrentConnectionIDs.go +++ b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_CurrentConnectionIDs.go @@ -1,6 +1,6 @@ package connectionmanager -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var CurrentConnectionIDs = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_Direction.go b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_Direction.go index 7fbdb023..9766fe63 100644 --- a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_Direction.go +++ b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_Direction.go @@ -1,6 +1,6 @@ package connectionmanager -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var Direction = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_PeerConnectionID.go b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_PeerConnectionID.go index d11519ec..44bfd94f 100644 --- a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_PeerConnectionID.go +++ b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_PeerConnectionID.go @@ -1,6 +1,6 @@ package connectionmanager -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var PeerConnectionID = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_PeerConnectionManager.go b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_PeerConnectionManager.go index 9729597f..69ac0d39 100644 --- a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_PeerConnectionManager.go +++ b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_PeerConnectionManager.go @@ -1,6 +1,6 @@ package connectionmanager -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var PeerConnectionManager = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_RcsID.go b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_RcsID.go index 9beab284..a28e177c 100644 --- a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_RcsID.go +++ b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_RcsID.go @@ -1,6 +1,6 @@ package connectionmanager -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var RcsID = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_SinkProtocolInfo.go b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_SinkProtocolInfo.go index 8cbd2023..8283af8f 100644 --- a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_SinkProtocolInfo.go +++ b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_SinkProtocolInfo.go @@ -1,6 +1,6 @@ package connectionmanager -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var SinkProtocolInfo = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_SourceProtocolInfo.go b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_SourceProtocolInfo.go index 5e7f3eea..8df32697 100644 --- a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_SourceProtocolInfo.go +++ b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_SourceProtocolInfo.go @@ -1,6 +1,6 @@ package connectionmanager -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var SourceProtocolInfo = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_Status.go b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_Status.go index 22100057..7c92d3ec 100644 --- a/pmoupnp/devices/mediarenderer/ConnectionManager/sv_Status.go +++ b/pmoupnp/devices/mediarenderer/ConnectionManager/sv_Status.go @@ -1,6 +1,6 @@ package connectionmanager -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var Status = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/ConnectionManager/svc_connectionmanager.go b/pmoupnp/devices/mediarenderer/ConnectionManager/svc_connectionmanager.go index 25e03656..c9e1b03b 100644 --- a/pmoupnp/devices/mediarenderer/ConnectionManager/svc_connectionmanager.go +++ b/pmoupnp/devices/mediarenderer/ConnectionManager/svc_connectionmanager.go @@ -1,9 +1,9 @@ package connectionmanager -import "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp" +import "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp" -var ConnectionManager = func() *upnp.Service { - svc := upnp.NewService("ConnectionManager") +var ConnectionManager = func() *pmoupnp.Service { + svc := pmoupnp.NewService("ConnectionManager") svc.AddVariable(AVTransportID) svc.AddVariable(ConnectionID) diff --git a/pmoupnp/devices/mediarenderer/RenderingControl/sv_Channel.go b/pmoupnp/devices/mediarenderer/RenderingControl/sv_Channel.go index eed43b96..ac17719a 100644 --- a/pmoupnp/devices/mediarenderer/RenderingControl/sv_Channel.go +++ b/pmoupnp/devices/mediarenderer/RenderingControl/sv_Channel.go @@ -1,6 +1,6 @@ package renderingcontrol -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var Channel = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/RenderingControl/sv_InstanceID.go b/pmoupnp/devices/mediarenderer/RenderingControl/sv_InstanceID.go index 8491ed33..ce964a5d 100644 --- a/pmoupnp/devices/mediarenderer/RenderingControl/sv_InstanceID.go +++ b/pmoupnp/devices/mediarenderer/RenderingControl/sv_InstanceID.go @@ -1,6 +1,6 @@ package renderingcontrol -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var InstanceID = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/RenderingControl/sv_Mute.go b/pmoupnp/devices/mediarenderer/RenderingControl/sv_Mute.go index a5074d46..e441095f 100644 --- a/pmoupnp/devices/mediarenderer/RenderingControl/sv_Mute.go +++ b/pmoupnp/devices/mediarenderer/RenderingControl/sv_Mute.go @@ -1,6 +1,6 @@ package renderingcontrol -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var Mute = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/RenderingControl/sv_Volume.go b/pmoupnp/devices/mediarenderer/RenderingControl/sv_Volume.go index d2f355ac..487c3133 100644 --- a/pmoupnp/devices/mediarenderer/RenderingControl/sv_Volume.go +++ b/pmoupnp/devices/mediarenderer/RenderingControl/sv_Volume.go @@ -1,6 +1,6 @@ package renderingcontrol -import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" +import sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" var Volume = func() *sv.StateVariable { diff --git a/pmoupnp/devices/mediarenderer/RenderingControl/svc_renderingcontrol.go b/pmoupnp/devices/mediarenderer/RenderingControl/svc_renderingcontrol.go index 3a90be3e..1fe6e123 100644 --- a/pmoupnp/devices/mediarenderer/RenderingControl/svc_renderingcontrol.go +++ b/pmoupnp/devices/mediarenderer/RenderingControl/svc_renderingcontrol.go @@ -1,9 +1,9 @@ package renderingcontrol -import "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp" +import "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp" -var RenderingControl = func() *upnp.Service { - svc := upnp.NewService("RenderingControl") +var RenderingControl = func() *pmoupnp.Service { + svc := pmoupnp.NewService("RenderingControl") svc.AddVariable(InstanceID) svc.AddVariable(Channel) diff --git a/pmoupnp/devices/mediarenderer/mr_fake_renderer.go b/pmoupnp/devices/mediarenderer/mr_fake_renderer.go index 98404116..b61c8f52 100644 --- a/pmoupnp/devices/mediarenderer/mr_fake_renderer.go +++ b/pmoupnp/devices/mediarenderer/mr_fake_renderer.go @@ -1,15 +1,15 @@ package mediarenderer import ( - "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp" - avtransport "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/mediarenderer/AVTransport" - connectionmanager "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/mediarenderer/ConnectionManager" - renderingcontrol "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/mediarenderer/RenderingControl" + "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp" + avtransport "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/mediarenderer/AVTransport" + connectionmanager "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/mediarenderer/ConnectionManager" + renderingcontrol "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/mediarenderer/RenderingControl" ) -var FakeRenderer = func() *upnp.Device { +var FakeRenderer = func() *pmoupnp.Device { - renderer := upnp.NewDevice("FakeRenderer", "MediaRenderer") + renderer := pmoupnp.NewDevice("FakeRenderer", "MediaRenderer") renderer.AddService(avtransport.AVTransport) renderer.AddService(connectionmanager.ConnectionManager) diff --git a/pmoupnp/devices/services/actions/actioninstanceset.go b/pmoupnp/devices/services/actions/actioninstanceset.go index b204d7c6..bada65a3 100644 --- a/pmoupnp/devices/services/actions/actioninstanceset.go +++ b/pmoupnp/devices/services/actions/actioninstanceset.go @@ -3,7 +3,7 @@ package actions import ( "iter" - "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/objectstore" + "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/objectstore" "github.com/beevik/etree" ) diff --git a/pmoupnp/devices/services/actions/actionset.go b/pmoupnp/devices/services/actions/actionset.go index 46c08c82..f076e271 100644 --- a/pmoupnp/devices/services/actions/actionset.go +++ b/pmoupnp/devices/services/actions/actionset.go @@ -3,7 +3,7 @@ package actions import ( "iter" - "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/objectstore" + "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/objectstore" ) type ActionSet objectstore.ObjectSet[*Action] diff --git a/pmoupnp/devices/services/actions/argument.go b/pmoupnp/devices/services/actions/argument.go index 4aaaa8c3..5827047c 100644 --- a/pmoupnp/devices/services/actions/argument.go +++ b/pmoupnp/devices/services/actions/argument.go @@ -1,7 +1,7 @@ package actions import ( - "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" + "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" "github.com/beevik/etree" ) diff --git a/pmoupnp/devices/services/actions/argumentset.go b/pmoupnp/devices/services/actions/argumentset.go index 967037c0..45efed73 100644 --- a/pmoupnp/devices/services/actions/argumentset.go +++ b/pmoupnp/devices/services/actions/argumentset.go @@ -3,7 +3,7 @@ package actions import ( "iter" - "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/objectstore" + "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/objectstore" "github.com/beevik/etree" ) diff --git a/pmoupnp/devices/services/statevariables/statevalueinstanceset.go b/pmoupnp/devices/services/statevariables/statevalueinstanceset.go index a1ca407a..765c9a59 100644 --- a/pmoupnp/devices/services/statevariables/statevalueinstanceset.go +++ b/pmoupnp/devices/services/statevariables/statevalueinstanceset.go @@ -3,7 +3,7 @@ package statevariables import ( "iter" - "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/objectstore" + "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/objectstore" "github.com/beevik/etree" ) diff --git a/pmoupnp/devices/services/statevariables/statevariableset.go b/pmoupnp/devices/services/statevariables/statevariableset.go index 5530ae51..4bd213a8 100644 --- a/pmoupnp/devices/services/statevariables/statevariableset.go +++ b/pmoupnp/devices/services/statevariables/statevariableset.go @@ -3,7 +3,7 @@ package statevariables import ( "iter" - "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/objectstore" + "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/objectstore" ) type StateVariableSet objectstore.ObjectSet[*StateVariable] diff --git a/pmoupnp/events.go b/pmoupnp/events.go index ee8d0b4c..377fbfd1 100644 --- a/pmoupnp/events.go +++ b/pmoupnp/events.go @@ -1,4 +1,4 @@ -package upnp +package pmoupnp import "github.com/beevik/etree" diff --git a/pmoupnp/interface.go b/pmoupnp/interface.go index aac55023..6aaac7a1 100644 --- a/pmoupnp/interface.go +++ b/pmoupnp/interface.go @@ -1,4 +1,4 @@ -package upnp +package pmoupnp type Markdownable interface { ToMarkdown() string diff --git a/pmoupnp/server.go b/pmoupnp/server.go index 81e7873c..014e0cc2 100644 --- a/pmoupnp/server.go +++ b/pmoupnp/server.go @@ -1,4 +1,4 @@ -package upnp +package pmoupnp import ( "bytes" diff --git a/pmoupnp/service.go b/pmoupnp/service.go index 21dcb5cb..9b67c148 100644 --- a/pmoupnp/service.go +++ b/pmoupnp/service.go @@ -1,11 +1,11 @@ -package upnp +package pmoupnp import ( "fmt" "iter" - "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/actions" - sv "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" + "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/actions" + sv "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" ) type Service struct { diff --git a/pmoupnp/serviceinstance.go b/pmoupnp/serviceinstance.go index 410e384f..1d230d38 100644 --- a/pmoupnp/serviceinstance.go +++ b/pmoupnp/serviceinstance.go @@ -1,4 +1,4 @@ -package upnp +package pmoupnp import ( "context" @@ -11,9 +11,9 @@ import ( "time" "gargoton.petite-maison-orange.fr/eric/pmomusic/pmolog" + "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/actions" + "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/devices/services/statevariables" "gargoton.petite-maison-orange.fr/eric/pmomusic/soap" - "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/actions" - "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/devices/services/statevariables" "github.com/beevik/etree" "github.com/google/uuid" log "github.com/sirupsen/logrus" diff --git a/pmoupnp/serviceinstanceset.go b/pmoupnp/serviceinstanceset.go index ec72bb27..0086d4d4 100644 --- a/pmoupnp/serviceinstanceset.go +++ b/pmoupnp/serviceinstanceset.go @@ -1,9 +1,9 @@ -package upnp +package pmoupnp import ( "iter" - "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/objectstore" + "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/objectstore" "github.com/beevik/etree" ) diff --git a/pmoupnp/serviceset.go b/pmoupnp/serviceset.go index c2359e6e..c70a4d59 100644 --- a/pmoupnp/serviceset.go +++ b/pmoupnp/serviceset.go @@ -1,9 +1,9 @@ -package upnp +package pmoupnp import ( "iter" - "gargoton.petite-maison-orange.fr/eric/pmomusic/upnp/objectstore" + "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoupnp/objectstore" ) type ServiceSet objectstore.ObjectSet[*Service] diff --git a/pmoupnp/srv_reg_devices.go b/pmoupnp/srv_reg_devices.go index 39929f9c..20661835 100644 --- a/pmoupnp/srv_reg_devices.go +++ b/pmoupnp/srv_reg_devices.go @@ -1,4 +1,4 @@ -package upnp +package pmoupnp import ( "gargoton.petite-maison-orange.fr/eric/pmomusic/pmoconfig"