Commit 8acc6c30 authored by François Cartegnie's avatar François Cartegnie 🤞
Browse files

demux: adaptative: remove split demux_sys_t

parent d8f1184e
......@@ -345,7 +345,6 @@ libdash_plugin_la_SOURCES = \
demux/dash/xml/Node.cpp \
demux/dash/xml/Node.h \
demux/dash/dash.cpp \
demux/dash/dash.hpp \
demux/dash/DASHManager.cpp \
demux/dash/DASHManager.h \
demux/dash/DASHStreamFormat.hpp
......@@ -376,8 +375,7 @@ libhls_plugin_la_SOURCES = \
demux/hls/HLSStreamFormat.hpp \
demux/hls/HLSStreams.hpp \
demux/hls/HLSStreams.cpp \
demux/hls/hls.cpp \
demux/hls/hls.hpp
demux/hls/hls.cpp
libhls_plugin_la_SOURCES += $(adaptative_SOURCES)
libhls_plugin_la_CXXFLAGS = $(AM_CFLAGS) -I$(srcdir)/demux/hls
......
......@@ -39,11 +39,11 @@
#include <errno.h>
#include "dash.hpp"
#include "xml/DOMParser.h"
#include "mpd/MPDFactory.h"
#include "mpd/Period.h"
#include "mpd/ProgramInformation.h"
#include "DASHManager.h"
using namespace adaptative::logic;
using namespace adaptative::playlist;
......@@ -96,6 +96,12 @@ vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
struct demux_sys_t
{
dash::DASHManager *p_dashManager;
dash::mpd::MPD *p_mpd;
mtime_t i_nzpcr;
};
static int Demux( demux_t * );
static int Control (demux_t *p_demux, int i_query, va_list args);
......
/*****************************************************************************
* dash.hpp: DASH module
*****************************************************************************
* Copyright © 2014 - 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
* 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.
*****************************************************************************/
#include "DASHManager.h"
struct demux_sys_t
{
dash::DASHManager *p_dashManager;
dash::mpd::MPD *p_mpd;
mtime_t i_nzpcr;
};
......@@ -41,7 +41,6 @@
#include "playlist/Parser.hpp"
#include "playlist/M3U8.hpp"
#include "hls.hpp"
using namespace adaptative;
using namespace adaptative::logic;
......@@ -94,6 +93,12 @@ vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
struct demux_sys_t
{
adaptative::PlaylistManager *p_manager;
hls::playlist::M3U8 *p_playlist;
mtime_t i_nzpcr;
};
static int Demux( demux_t * );
static int Control (demux_t *p_demux, int i_query, va_list args);
......
/*****************************************************************************
* hls.hpp: HTTP Live Streaming module
*****************************************************************************
* Copyright © 2015 - 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
* 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 HLS_HPP
#define HLS_HPP
struct demux_sys_t
{
adaptative::PlaylistManager *p_manager;
hls::playlist::M3U8 *p_playlist;
mtime_t i_nzpcr;
};
#endif // HLS_HPP
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment