[SegmentList] Fix compilation with GCC 15

xbmc · Jan 6, 2025 · 64426fc · 64426fc
1 parent 8034d28
commit 64426fc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/common/SegmentList.cpp b/src/common/SegmentList.cpp
@@ -12,12 +12,6 @@
 
 using namespace PLAYLIST;
 
-PLAYLIST::CSegmentList::CSegmentList(const std::optional<CSegmentList>& other)
-{
-  if (other.has_value())
-    *this = *other;
-}
-
 void PLAYLIST::CSegmentList::SetInitRange(std::string_view range)
 {
   if (!ParseRangeRFC(range, m_initRangeBegin, m_initRangeEnd))

diff --git a/src/common/SegmentList.h b/src/common/SegmentList.h
@@ -29,7 +29,6 @@ class ATTR_DLL_LOCAL CSegmentList
 {
 public:
   CSegmentList() = default;
-  CSegmentList(const std::optional<CSegmentList>& other);
   ~CSegmentList() = default;
 
   uint64_t GetStartNumber() const { return m_startNumber; }

diff --git a/src/parser/DASHTree.cpp b/src/parser/DASHTree.cpp
@@ -598,7 +598,10 @@ void adaptive::CDashTree::ParseTagAdaptationSet(pugi::xml_node nodeAdp, PLAYLIST
   xml_node nodeSeglist = nodeAdp.child("SegmentList");
   if (nodeSeglist)
   {
-    CSegmentList segList{adpSet->GetSegmentList()};
+    CSegmentList segList;
+    auto optSegList = adpSet->GetSegmentList();
+    if (optSegList)
+      segList = std::move(*optSegList);
 
     uint64_t duration;
     if (XML::QueryAttrib(nodeSeglist, "duration", duration))
@@ -847,7 +850,10 @@ void adaptive::CDashTree::ParseTagRepresentation(pugi::xml_node nodeRepr,
   xml_node nodeSeglist = nodeRepr.child("SegmentList");
   if (nodeSeglist)
   {
-    CSegmentList segList{adpSet->GetSegmentList()};
+    CSegmentList segList;
+    auto optSegList = adpSet->GetSegmentList();
+    if (optSegList)
+      segList = std::move(*optSegList);
 
     uint64_t duration;
     if (XML::QueryAttrib(nodeSeglist, "duration", duration))