demux: dash: remove SegmentInfo

modules/demux/Makefile.am

@@ -289,8 +289,6 @@ libdash_plugin_la_SOURCES = \
     demux/dash/mpd/Segment.h \
     demux/dash/mpd/SegmentBase.cpp \
     demux/dash/mpd/SegmentBase.h \
-    demux/dash/mpd/SegmentInfo.cpp \
-    demux/dash/mpd/SegmentInfo.h \
     demux/dash/mpd/SegmentInfoCommon.cpp \
     demux/dash/mpd/SegmentInfoCommon.h \
     demux/dash/mpd/SegmentInformation.cpp \

modules/demux/dash/mpd/Representation.h

@@ -28,7 +28,6 @@
 #include <string>
 
 #include "mpd/CommonAttributesElements.h"
-#include "mpd/SegmentInfo.h"
 #include "mpd/TrickModeType.h"
 #include "mpd/SegmentBase.h"
 #include "mpd/SegmentList.h"

modules/demux/dash/mpd/SegmentInfo.cpp

-/*
- * SegmentInfo.cpp
- *****************************************************************************
- * Copyright (C) 2010 - 2011 Klagenfurt University
- *
- * Created on: Aug 10, 2010
- * Authors: Christopher Mueller <christopher.mueller@itec.uni-klu.ac.at>
- *          Christian Timmerer  <christian.timmerer@itec.uni-klu.ac.at>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "SegmentInfo.h"
-
-using namespace dash::mpd;
-
-SegmentInfo::SegmentInfo( ICanonicalUrl *parent ) :
-    SegmentInfoCommon( parent ),
-    initSeg( NULL )
-{
-}
-
-SegmentInfo::~SegmentInfo   ()
-{
-    for(size_t i = 0; i < this->segments.size(); i++)
-        delete(this->segments.at(i));
-
-    delete(this->initSeg);
-}
-
-const std::vector<Segment*>&   SegmentInfo::getSegments        () const
-{
-    return this->segments;
-}
-
-void                    SegmentInfo::addSegment         (Segment *seg)
-{
-    this->segments.push_back(seg);
-}
-

modules/demux/dash/mpd/SegmentInfo.h

-/*
- * SegmentInfo.h
- *****************************************************************************
- * Copyright (C) 2010 - 2011 Klagenfurt University
- *
- * Created on: Aug 10, 2010
- * Authors: Christopher Mueller <christopher.mueller@itec.uni-klu.ac.at>
- *          Christian Timmerer  <christian.timmerer@itec.uni-klu.ac.at>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifndef SEGMENTINFO_H_
-#define SEGMENTINFO_H_
-
-#include <vector>
-#include <string>
-#include <map>
-
-#include "mpd/Segment.h"
-#include "mpd/SegmentInfoCommon.h"
-#include "ICanonicalUrl.hpp"
-
-namespace dash
-{
-    namespace mpd
-    {
-        class SegmentInfo : public SegmentInfoCommon
-        {
-            public:
-                SegmentInfo             ( ICanonicalUrl * = NULL );
-                virtual ~SegmentInfo    ();
-
-                const std::vector<Segment *>&   getSegments() const;
-                void                    addSegment(Segment *seg);
-
-            private:
-                Segment                             *initSeg;
-                std::vector<Segment *>              segments;
-        };
-    }
-}
-
-#endif /* SEGMENTINFO_H_ */

modules/demux/dash/mpd/SegmentList.cpp

@@ -27,14 +27,28 @@
 #endif
 
 #include "SegmentList.h"
+#include "Segment.h"
 
 using namespace dash::mpd;
 
-SegmentList::SegmentList    ( ICanonicalUrl *parent ):
-    SegmentInfo( parent )
+SegmentList::SegmentList( ICanonicalUrl *parent ):
+    SegmentInfoCommon( parent )
 {
 
 }
-SegmentList::~SegmentList   ()
+SegmentList::~SegmentList()
 {
+    std::vector<Segment *>::iterator it;
+    for(it = segments.begin(); it != segments.end(); it++)
+        delete(*it);
+}
+
+const std::vector<Segment*>& SegmentList::getSegments() const
+{
+    return segments;
+}
+
+void SegmentList::addSegment(Segment *seg)
+{
+    segments.push_back(seg);
 }

modules/demux/dash/mpd/SegmentList.h

@@ -25,18 +25,24 @@
 #ifndef SEGMENTLIST_H_
 #define SEGMENTLIST_H_
 
-#include "mpd/SegmentInfo.h"
+#include "mpd/SegmentInfoCommon.h"
 #include "mpd/ICanonicalUrl.hpp"
 
 namespace dash
 {
     namespace mpd
     {
-        class SegmentList : public SegmentInfo
+        class SegmentList : public SegmentInfoCommon
         {
             public:
                 SegmentList             ( ICanonicalUrl * = NULL );
                 virtual ~SegmentList    ();
+
+                const std::vector<Segment *>&   getSegments() const;
+                void                    addSegment(Segment *seg);
+
+            private:
+                std::vector<Segment *>  segments;
         };
     }
 }