[vlc-commits] demux: dash: remove SegmentInfo
Francois Cartegnie
git at videolan.org
Fri Jan 2 15:39:50 CET 2015
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Jan 1 17:04:52 2015 +0100| [ecfe1e5390474747dfe669bd9c79868e24268a89] | committer: Francois Cartegnie
demux: dash: remove SegmentInfo
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ecfe1e5390474747dfe669bd9c79868e24268a89
---
modules/demux/Makefile.am | 2 --
modules/demux/dash/mpd/Representation.h | 1 -
modules/demux/dash/mpd/SegmentInfo.cpp | 55 ------------------------------
modules/demux/dash/mpd/SegmentInfo.h | 56 -------------------------------
modules/demux/dash/mpd/SegmentList.cpp | 20 +++++++++--
modules/demux/dash/mpd/SegmentList.h | 10 ++++--
6 files changed, 25 insertions(+), 119 deletions(-)
diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am
index bdba1fc..27dd536 100644
--- a/modules/demux/Makefile.am
+++ b/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 \
diff --git a/modules/demux/dash/mpd/Representation.h b/modules/demux/dash/mpd/Representation.h
index 67da99a..0fadfc8 100644
--- a/modules/demux/dash/mpd/Representation.h
+++ b/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"
diff --git a/modules/demux/dash/mpd/SegmentInfo.cpp b/modules/demux/dash/mpd/SegmentInfo.cpp
deleted file mode 100644
index aa3da57..0000000
--- a/modules/demux/dash/mpd/SegmentInfo.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * SegmentInfo.cpp
- *****************************************************************************
- * Copyright (C) 2010 - 2011 Klagenfurt University
- *
- * Created on: Aug 10, 2010
- * Authors: Christopher Mueller <christopher.mueller at itec.uni-klu.ac.at>
- * Christian Timmerer <christian.timmerer at 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);
-}
-
diff --git a/modules/demux/dash/mpd/SegmentInfo.h b/modules/demux/dash/mpd/SegmentInfo.h
deleted file mode 100644
index a7896cf..0000000
--- a/modules/demux/dash/mpd/SegmentInfo.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * SegmentInfo.h
- *****************************************************************************
- * Copyright (C) 2010 - 2011 Klagenfurt University
- *
- * Created on: Aug 10, 2010
- * Authors: Christopher Mueller <christopher.mueller at itec.uni-klu.ac.at>
- * Christian Timmerer <christian.timmerer at 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_ */
diff --git a/modules/demux/dash/mpd/SegmentList.cpp b/modules/demux/dash/mpd/SegmentList.cpp
index 6395fff..9af77d7 100644
--- a/modules/demux/dash/mpd/SegmentList.cpp
+++ b/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);
}
diff --git a/modules/demux/dash/mpd/SegmentList.h b/modules/demux/dash/mpd/SegmentList.h
index 20c35ed..b081bbc 100644
--- a/modules/demux/dash/mpd/SegmentList.h
+++ b/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;
};
}
}
More information about the vlc-commits
mailing list