[vlc-commits] demux: adaptative: remove split demux_sys_t

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Jul 23 13:19:11 2015 +0200| [8acc6c3018608213d224c011bc5a7e2fd728f54a] | committer: Francois Cartegnie

demux: adaptative: remove split demux_sys_t

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

 modules/demux/Makefile.am   |    4 +---
 modules/demux/dash/dash.cpp |    8 +++++++-
 modules/demux/dash/dash.hpp |   27 ---------------------------
 modules/demux/hls/hls.cpp   |    7 ++++++-
 modules/demux/hls/hls.hpp   |   32 --------------------------------
 5 files changed, 14 insertions(+), 64 deletions(-)

diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am
index 7f3b93a..a8d4a04 100644
--- a/modules/demux/Makefile.am
+++ b/modules/demux/Makefile.am
@@ -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
diff --git a/modules/demux/dash/dash.cpp b/modules/demux/dash/dash.cpp
index 82d6298..a752eaa 100644
--- a/modules/demux/dash/dash.cpp
+++ b/modules/demux/dash/dash.cpp
@@ -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);
diff --git a/modules/demux/dash/dash.hpp b/modules/demux/dash/dash.hpp
deleted file mode 100644
index eb2df75..0000000
--- a/modules/demux/dash/dash.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/*****************************************************************************
- * 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;
-};
diff --git a/modules/demux/hls/hls.cpp b/modules/demux/hls/hls.cpp
index 2e85ca3..6e4b746 100644
--- a/modules/demux/hls/hls.cpp
+++ b/modules/demux/hls/hls.cpp
@@ -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);
diff --git a/modules/demux/hls/hls.hpp b/modules/demux/hls/hls.hpp
deleted file mode 100644
index 1923fe6..0000000
--- a/modules/demux/hls/hls.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*****************************************************************************
- * 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
-