[vlc-commits] demux: adaptive: rename ChunksSource
Francois Cartegnie
git at videolan.org
Fri Nov 22 05:20:19 CET 2019
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Aug 1 15:57:26 2019 +0200| [406e3b9d1c59c7d5617b2a3ce23fdeb385a5488d] | committer: Francois Cartegnie
demux: adaptive: rename ChunksSource
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=406e3b9d1c59c7d5617b2a3ce23fdeb385a5488d
---
modules/demux/Makefile.am | 2 +-
.../adaptive/{ChunksSource.hpp => AbstractSource.hpp} | 14 +++++++-------
modules/demux/adaptive/Streams.hpp | 4 ++--
modules/demux/adaptive/plumbing/Demuxer.cpp | 2 +-
modules/demux/adaptive/plumbing/SourceStream.cpp | 8 ++++----
modules/demux/adaptive/plumbing/SourceStream.hpp | 10 +++++-----
6 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am
index b572b0efe5..091834efea 100644
--- a/modules/demux/Makefile.am
+++ b/modules/demux/Makefile.am
@@ -374,7 +374,7 @@ libadaptive_plugin_la_SOURCES = \
demux/adaptive/plumbing/FakeESOutID.hpp \
demux/adaptive/plumbing/SourceStream.cpp \
demux/adaptive/plumbing/SourceStream.hpp \
- demux/adaptive/ChunksSource.hpp \
+ demux/adaptive/AbstractSource.hpp \
demux/adaptive/ID.hpp \
demux/adaptive/ID.cpp \
demux/adaptive/PlaylistManager.cpp \
diff --git a/modules/demux/adaptive/ChunksSource.hpp b/modules/demux/adaptive/AbstractSource.hpp
similarity index 82%
rename from modules/demux/adaptive/ChunksSource.hpp
rename to modules/demux/adaptive/AbstractSource.hpp
index afe84abeba..98a3d9ed7f 100644
--- a/modules/demux/adaptive/ChunksSource.hpp
+++ b/modules/demux/adaptive/AbstractSource.hpp
@@ -1,7 +1,7 @@
/*
- * ChunksSource.hpp
+ * AbstractSource.hpp
*****************************************************************************
- * Copyright © 2015 - VideoLAN and VLC Authors
+ * Copyright © 2015-2019 - VideoLabs, VideoLAN and VLC Authors
*
* 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
@@ -17,21 +17,21 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#ifndef CHUNKSSOURCE_HPP
-#define CHUNKSSOURCE_HPP
+#ifndef ABSTRACTSOURCE_HPP
+#define ABSTRACTSOURCE_HPP
#include <vlc_common.h>
namespace adaptive
{
- class ChunksSource
+ class AbstractSource
{
public:
- virtual ~ChunksSource() {}
+ virtual ~AbstractSource() {}
virtual block_t *readNextBlock() = 0;
virtual std::string getContentType() = 0;
};
}
-#endif // CHUNKSSOURCE_HPP
+#endif // ABSTRACTSOURCE_HPP
diff --git a/modules/demux/adaptive/Streams.hpp b/modules/demux/adaptive/Streams.hpp
index 61b2abe64a..e942f1dcc7 100644
--- a/modules/demux/adaptive/Streams.hpp
+++ b/modules/demux/adaptive/Streams.hpp
@@ -22,7 +22,7 @@
#include <vlc_common.h>
#include "StreamFormat.hpp"
-#include "ChunksSource.hpp"
+#include "AbstractSource.hpp"
#include "SegmentTracker.hpp"
#include "plumbing/CommandsQueue.hpp"
@@ -49,7 +49,7 @@ namespace adaptive
using namespace http;
using namespace playlist;
- class AbstractStream : public ChunksSource,
+ class AbstractStream : public AbstractSource,
public ExtraFMTInfoInterface,
public SegmentTrackerListenerInterface,
public DemuxerFactoryInterface
diff --git a/modules/demux/adaptive/plumbing/Demuxer.cpp b/modules/demux/adaptive/plumbing/Demuxer.cpp
index cbe7439487..85adf4b6d6 100644
--- a/modules/demux/adaptive/plumbing/Demuxer.cpp
+++ b/modules/demux/adaptive/plumbing/Demuxer.cpp
@@ -29,7 +29,7 @@
#include "SourceStream.hpp"
#include "../StreamFormat.hpp"
#include "CommandsQueue.hpp"
-#include "../ChunksSource.hpp"
+#include "../AbstractSource.hpp"
using namespace adaptive;
diff --git a/modules/demux/adaptive/plumbing/SourceStream.cpp b/modules/demux/adaptive/plumbing/SourceStream.cpp
index 3f6a473243..bb383eaef1 100644
--- a/modules/demux/adaptive/plumbing/SourceStream.cpp
+++ b/modules/demux/adaptive/plumbing/SourceStream.cpp
@@ -24,14 +24,14 @@
#include "SourceStream.hpp"
-#include "../ChunksSource.hpp"
+#include "../AbstractSource.hpp"
#include "../http/Chunk.h"
#include <vlc_stream.h>
#include <vlc_demux.h>
using namespace adaptive;
-AbstractChunksSourceStream::AbstractChunksSourceStream(vlc_object_t *p_obj_, ChunksSource *source_)
+AbstractChunksSourceStream::AbstractChunksSourceStream(vlc_object_t *p_obj_, AbstractSource *source_)
: b_eof( false )
, p_obj( p_obj_ )
, source( source_ )
@@ -114,7 +114,7 @@ stream_t * AbstractChunksSourceStream::makeStream()
return p_stream;
}
-ChunksSourceStream::ChunksSourceStream(vlc_object_t *p_obj_, ChunksSource *source_)
+ChunksSourceStream::ChunksSourceStream(vlc_object_t *p_obj_, AbstractSource *source_)
: AbstractChunksSourceStream(p_obj_, source_)
{
p_block = NULL;
@@ -198,7 +198,7 @@ int ChunksSourceStream::Seek(uint64_t)
return VLC_EGENERIC;
}
-BufferedChunksSourceStream::BufferedChunksSourceStream(vlc_object_t *p_obj_, ChunksSource *source_)
+BufferedChunksSourceStream::BufferedChunksSourceStream(vlc_object_t *p_obj_, AbstractSource *source_)
: AbstractChunksSourceStream( p_obj_, source_ )
{
i_global_offset = 0;
diff --git a/modules/demux/adaptive/plumbing/SourceStream.hpp b/modules/demux/adaptive/plumbing/SourceStream.hpp
index da8c3644c5..b9ef1ab09f 100644
--- a/modules/demux/adaptive/plumbing/SourceStream.hpp
+++ b/modules/demux/adaptive/plumbing/SourceStream.hpp
@@ -27,7 +27,7 @@
namespace adaptive
{
- class ChunksSource;
+ class AbstractSource;
class AbstractSourceStream
{
@@ -41,7 +41,7 @@ namespace adaptive
class AbstractChunksSourceStream : public AbstractSourceStream
{
public:
- AbstractChunksSourceStream(vlc_object_t *, ChunksSource *);
+ AbstractChunksSourceStream(vlc_object_t *, AbstractSource *);
virtual ~AbstractChunksSourceStream();
virtual void Reset(); /* impl */
virtual stream_t *makeStream(); /* impl */
@@ -52,7 +52,7 @@ namespace adaptive
virtual std::string getContentType() = 0;
bool b_eof;
vlc_object_t *p_obj;
- ChunksSource *source;
+ AbstractSource *source;
private:
static ssize_t read_Callback(stream_t *, void *, size_t);
@@ -64,7 +64,7 @@ namespace adaptive
class ChunksSourceStream : public AbstractChunksSourceStream
{
public:
- ChunksSourceStream(vlc_object_t *, ChunksSource *);
+ ChunksSourceStream(vlc_object_t *, AbstractSource *);
virtual ~ChunksSourceStream();
virtual void Reset(); /* reimpl */
@@ -81,7 +81,7 @@ namespace adaptive
class BufferedChunksSourceStream : public AbstractChunksSourceStream
{
public:
- BufferedChunksSourceStream(vlc_object_t *, ChunksSource *);
+ BufferedChunksSourceStream(vlc_object_t *, AbstractSource *);
virtual ~BufferedChunksSourceStream();
virtual void Reset(); /* reimpl */
More information about the vlc-commits
mailing list