[vlc-commits] demux: dash: rename startIndex -> startNumber

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Jan  7 15:49:29 2015 +0100| [d44c8a1eb584d5fcc2a875f209dc7a9a54ff118d] | committer: Francois Cartegnie

demux: dash: rename startIndex -> startNumber

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d44c8a1eb584d5fcc2a875f209dc7a9a54ff118d
---

 modules/demux/dash/mpd/IsoffMainParser.cpp |    2 +-
 modules/demux/dash/mpd/SegmentTemplate.cpp |    2 +-
 modules/demux/dash/mpd/SegmentTemplate.h   |    2 +-
 modules/demux/dash/mpd/Url.cpp             |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/demux/dash/mpd/IsoffMainParser.cpp b/modules/demux/dash/mpd/IsoffMainParser.cpp
index f781369..55bb8e3 100644
--- a/modules/demux/dash/mpd/IsoffMainParser.cpp
+++ b/modules/demux/dash/mpd/IsoffMainParser.cpp
@@ -117,7 +117,7 @@ size_t IsoffMainParser::parseSegmentTemplate(Node *templateNode, SegmentInformat
     mediaTemplate->setSourceUrl(mediaurl);
 
     if(templateNode->hasAttribute("startNumber"))
-        mediaTemplate->startIndex.Set(Integer<uint64_t>(templateNode->getAttributeValue("startNumber")));
+        mediaTemplate->startNumber.Set(Integer<uint64_t>(templateNode->getAttributeValue("startNumber")));
 
     if(templateNode->hasAttribute("duration"))
         mediaTemplate->duration.Set(Integer<mtime_t>(templateNode->getAttributeValue("duration")));
diff --git a/modules/demux/dash/mpd/SegmentTemplate.cpp b/modules/demux/dash/mpd/SegmentTemplate.cpp
index 74cddae..b9e8c3f 100644
--- a/modules/demux/dash/mpd/SegmentTemplate.cpp
+++ b/modules/demux/dash/mpd/SegmentTemplate.cpp
@@ -55,7 +55,7 @@ MediaSegmentTemplate::MediaSegmentTemplate( ICanonicalUrl *parent ) :
     debugName = "SegmentTemplate";
     classId = Segment::CLASSID_SEGMENT;
     timescale.Set( 0 );
-    startIndex.Set( 0 );
+    startNumber.Set( 0 );
     initialisationSegment.Set( NULL );
 }
 
diff --git a/modules/demux/dash/mpd/SegmentTemplate.h b/modules/demux/dash/mpd/SegmentTemplate.h
index f3aefdf..df827f2 100644
--- a/modules/demux/dash/mpd/SegmentTemplate.h
+++ b/modules/demux/dash/mpd/SegmentTemplate.h
@@ -48,7 +48,7 @@ namespace dash
         {
             public:
                 MediaSegmentTemplate( ICanonicalUrl * = NULL );
-                Property<size_t>        startIndex;
+                Property<size_t>        startNumber;
                 Property<uint64_t>      timescale;
         };
 
diff --git a/modules/demux/dash/mpd/Url.cpp b/modules/demux/dash/mpd/Url.cpp
index 70ed85c..5015185 100644
--- a/modules/demux/dash/mpd/Url.cpp
+++ b/modules/demux/dash/mpd/Url.cpp
@@ -87,7 +87,7 @@ Url::Component::Component(const std::string & str, const MediaSegmentTemplate *t
 
 size_t Url::Component::getSegmentNumber(size_t index, const Representation *rep) const
 {
-    index += templ->startIndex.Get();
+    index += templ->startNumber.Get();
     /* live streams / templated */
     if(rep->getMPD()->isLive() && templ->duration.Get())
     {