vlc | branch: master | Francois Cartegnie <[email protected]> | Wed Dec 31 16:46:23 2014 +0100| [fa2603dc30e723f3e66ea88d105012c1fb095504] | committer: Francois Cartegnie
demux: dash: remove unused SegmentInfoDefault > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fa2603dc30e723f3e66ea88d105012c1fb095504 --- modules/demux/Makefile.am | 2 - modules/demux/dash/mpd/AdaptationSet.cpp | 14 ------- modules/demux/dash/mpd/AdaptationSet.h | 4 -- modules/demux/dash/mpd/IsoffMainParser.cpp | 1 - modules/demux/dash/mpd/SegmentInfoDefault.cpp | 55 ------------------------- modules/demux/dash/mpd/SegmentInfoDefault.h | 52 ----------------------- modules/demux/dash/mpd/SegmentTemplate.cpp | 1 - 7 files changed, 129 deletions(-) diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am index 2533305..bdba1fc 100644 --- a/modules/demux/Makefile.am +++ b/modules/demux/Makefile.am @@ -293,8 +293,6 @@ libdash_plugin_la_SOURCES = \ demux/dash/mpd/SegmentInfo.h \ demux/dash/mpd/SegmentInfoCommon.cpp \ demux/dash/mpd/SegmentInfoCommon.h \ - demux/dash/mpd/SegmentInfoDefault.cpp \ - demux/dash/mpd/SegmentInfoDefault.h \ demux/dash/mpd/SegmentInformation.cpp \ demux/dash/mpd/SegmentInformation.hpp \ demux/dash/mpd/SegmentList.cpp \ diff --git a/modules/demux/dash/mpd/AdaptationSet.cpp b/modules/demux/dash/mpd/AdaptationSet.cpp index 306d73c..5aa8135 100644 --- a/modules/demux/dash/mpd/AdaptationSet.cpp +++ b/modules/demux/dash/mpd/AdaptationSet.cpp @@ -32,7 +32,6 @@ #include <vlc_arrays.h> #include "SegmentTemplate.h" -#include "SegmentInfoDefault.h" #include "Period.h" using namespace dash::mpd; @@ -40,14 +39,12 @@ using namespace dash::mpd; AdaptationSet::AdaptationSet(Period *period) : SegmentInformation( period ), subsegmentAlignmentFlag( false ), - segmentInfoDefault( NULL ), isBitstreamSwitching( false ) { } AdaptationSet::~AdaptationSet () { - delete this->segmentInfoDefault; vlc_delete_all( this->representations ); } @@ -88,17 +85,6 @@ const Representation *AdaptationSet::getRepresentationById(const std::string &id return NULL; } -const SegmentInfoDefault *AdaptationSet::getSegmentInfoDefault() const -{ - return this->segmentInfoDefault; -} - -void AdaptationSet::setSegmentInfoDefault(const SegmentInfoDefault *seg) -{ - if ( seg != NULL ) - this->segmentInfoDefault = seg; -} - void AdaptationSet::addRepresentation (Representation *rep) { this->representations.push_back(rep); diff --git a/modules/demux/dash/mpd/AdaptationSet.h b/modules/demux/dash/mpd/AdaptationSet.h index e47ecda..9840341 100644 --- a/modules/demux/dash/mpd/AdaptationSet.h +++ b/modules/demux/dash/mpd/AdaptationSet.h @@ -37,7 +37,6 @@ namespace dash { namespace mpd { - class SegmentInfoDefault; class Period; class SegmentTemplate; @@ -53,8 +52,6 @@ namespace dash void setSubsegmentAlignmentFlag( bool alignment ); std::vector<Representation *>& getRepresentations (); const Representation* getRepresentationById ( const std::string &id ) const; - const SegmentInfoDefault* getSegmentInfoDefault() const; - void setSegmentInfoDefault( const SegmentInfoDefault* seg ); void setBitstreamSwitching(bool value); bool getBitstreamSwitching() const; void addRepresentation( Representation *rep ); @@ -64,7 +61,6 @@ namespace dash private: bool subsegmentAlignmentFlag; std::vector<Representation *> representations; - const SegmentInfoDefault* segmentInfoDefault; bool isBitstreamSwitching; }; } diff --git a/modules/demux/dash/mpd/IsoffMainParser.cpp b/modules/demux/dash/mpd/IsoffMainParser.cpp index 7e9ba65..75b3cce 100644 --- a/modules/demux/dash/mpd/IsoffMainParser.cpp +++ b/modules/demux/dash/mpd/IsoffMainParser.cpp @@ -28,7 +28,6 @@ #include "IsoffMainParser.h" #include "SegmentTemplate.h" -#include "SegmentInfoDefault.h" #include "ProgramInformation.h" #include "xml/DOMHelper.h" #include <vlc_strings.h> diff --git a/modules/demux/dash/mpd/SegmentInfoDefault.cpp b/modules/demux/dash/mpd/SegmentInfoDefault.cpp deleted file mode 100644 index f9a3159..0000000 --- a/modules/demux/dash/mpd/SegmentInfoDefault.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/***************************************************************************** - * SegmentInfoDefault.cpp: Implement the SegmentInfoDefault element. - ***************************************************************************** - * Copyright (C) 1998-2007 VLC authors and VideoLAN - * $Id$ - * - * Authors: Hugo Beauzée-Luyssen <[email protected]> - * - * 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 "SegmentInfoDefault.h" - -using namespace dash::mpd; - -SegmentInfoDefault::SegmentInfoDefault() -{ -} - -const std::string& SegmentInfoDefault::getSourceURLTemplatePeriod() const -{ - return this->sourceURLTemplatePeriod; -} - -void SegmentInfoDefault::setSourceURLTemplatePediod( const std::string &url ) -{ - if ( url.empty() == false ) - this->sourceURLTemplatePeriod = url; -} - -int SegmentInfoDefault::getIndexTemplate() const -{ - return this->indexTemplate; -} - -void SegmentInfoDefault::setIndexTemplate( int indexTpl ) -{ - if ( indexTpl >= 0 ) - this->indexTemplate = indexTpl; -} diff --git a/modules/demux/dash/mpd/SegmentInfoDefault.h b/modules/demux/dash/mpd/SegmentInfoDefault.h deleted file mode 100644 index a15ab77..0000000 --- a/modules/demux/dash/mpd/SegmentInfoDefault.h +++ /dev/null @@ -1,52 +0,0 @@ -/***************************************************************************** - * SegmentInfoDefault.cpp: Implement the SegmentInfoDefault element. - ***************************************************************************** - * Copyright (C) 1998-2007 VLC authors and VideoLAN - * $Id$ - * - * Authors: Hugo Beauzée-Luyssen <[email protected]> - * - * 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 SEGMENTINFODEFAULT_H -#define SEGMENTINFODEFAULT_H - -#include "mpd/SegmentInfoCommon.h" - -#include <string> - -namespace dash -{ - namespace mpd - { - class SegmentInfoDefault : public SegmentInfoCommon - { - public: - SegmentInfoDefault(); - const std::string& getSourceURLTemplatePeriod() const; - void setSourceURLTemplatePediod( const std::string &url ); - int getIndexTemplate() const; - void setIndexTemplate( int indexTpl ); - - private: - std::string sourceURLTemplatePeriod; - int indexTemplate; - }; - } -} - - -#endif // SEGMENTINFODEFAULT_H diff --git a/modules/demux/dash/mpd/SegmentTemplate.cpp b/modules/demux/dash/mpd/SegmentTemplate.cpp index b681ddd..1943ae7 100644 --- a/modules/demux/dash/mpd/SegmentTemplate.cpp +++ b/modules/demux/dash/mpd/SegmentTemplate.cpp @@ -28,7 +28,6 @@ #include "SegmentTimeline.h" #include "Representation.h" #include "AdaptationSet.h" -#include "SegmentInfoDefault.h" using namespace dash::mpd; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
