[SegTemplate] Fix compilation with GCC 15

xbmc · Jan 6, 2025 · 8034d28 · 8034d28
1 parent 8ddc249
commit 8034d28
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/common/SegTemplate.cpp b/src/common/SegTemplate.cpp
@@ -19,12 +19,6 @@ using namespace PLAYLIST;
 using namespace UTILS;
 using namespace kodi::tools;
 
-PLAYLIST::CSegmentTemplate::CSegmentTemplate(const std::optional<CSegmentTemplate>& other)
-{
-  if (other.has_value())
-    *this = *other;
-}
-
 std::string PLAYLIST::CSegmentTemplate::GetInitialization() const
 {
   if (!m_initialization.empty())

diff --git a/src/common/SegTemplate.h b/src/common/SegTemplate.h
@@ -29,7 +29,6 @@ class ATTR_DLL_LOCAL CSegmentTemplate
 {
 public:
   CSegmentTemplate() = default;
-  CSegmentTemplate(const std::optional<CSegmentTemplate>& other);
   ~CSegmentTemplate() = default;
 
   std::string GetInitialization() const;

diff --git a/src/parser/DASHTree.cpp b/src/parser/DASHTree.cpp
@@ -583,7 +583,10 @@ void adaptive::CDashTree::ParseTagAdaptationSet(pugi::xml_node nodeAdp, PLAYLIST
   xml_node nodeSegTpl = nodeAdp.child("SegmentTemplate");
   if (nodeSegTpl || period->HasSegmentTemplate())
   {
-    CSegmentTemplate segTemplate{period->GetSegmentTemplate()};
+    CSegmentTemplate segTemplate;
+    auto optSegTemplate = period->GetSegmentTemplate();
+    if (optSegTemplate)
+      segTemplate = std::move(*optSegTemplate);
 
     if (nodeSegTpl)
       ParseSegmentTemplate(nodeSegTpl, segTemplate);
@@ -824,7 +827,10 @@ void adaptive::CDashTree::ParseTagRepresentation(pugi::xml_node nodeRepr,
   xml_node nodeSegTpl = nodeRepr.child("SegmentTemplate");
   if (nodeSegTpl || adpSet->HasSegmentTemplate())
   {
-    CSegmentTemplate segTemplate{adpSet->GetSegmentTemplate()};
+    CSegmentTemplate segTemplate;
+    auto optSegTemplate = adpSet->GetSegmentTemplate();
+    if (optSegTemplate)
+      segTemplate = std::move(*optSegTemplate);
 
     if (nodeSegTpl)
       ParseSegmentTemplate(nodeSegTpl, segTemplate);