stream_filter: dash: simplify next chunk condition

[vlc] / modules / stream_filter / dash / dash.cpp

diff --git a/modules/stream_filter/dash/dash.cpp b/modules/stream_filter/dash/dash.cpp
index 88251c3baf9c86a122cf5f9757a865da574d62a3..2c54a0013cead96f2c6e925db343974b3420015b 100644 (file)
--- a/modules/stream_filter/dash/dash.cpp
+++ b/modules/stream_filter/dash/dash.cpp
@@ -38,10 +38,8 @@
 
 #include <errno.h>
 
-#include "DASHManager.h"
+#include "dash.hpp"
 #include "xml/DOMParser.h"
-#include "http/HTTPConnectionManager.h"
-#include "adaptationlogic/IAdaptationLogic.h"
 #include "mpd/MPDFactory.h"
 
 #define SEEK 0
@@ -76,12 +74,6 @@ vlc_module_end ()
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-struct stream_sys_t
-{
-        dash::DASHManager   *p_dashManager;
-        dash::mpd::MPD      *p_mpd;
-        uint64_t                            position;
-};
 
 static int  Read            (stream_t *p_stream, void *p_ptr, unsigned int i_len);
 static int  Peek            (stream_t *p_stream, const uint8_t **pp_peek, unsigned int i_peek);
@@ -115,6 +107,8 @@ static int Open(vlc_object_t *p_obj)
     if (unlikely(p_sys == NULL))
         return VLC_ENOMEM;
 
+    p_sys->psz_useragent = var_InheritString(p_stream, "http-user-agent");
+
     p_sys->p_mpd = mpd;
     dash::DASHManager*p_dashManager = new dash::DASHManager(p_sys->p_mpd,
                                           dash::logic::IAdaptationLogic::RateBased,
@@ -124,6 +118,7 @@ static int Open(vlc_object_t *p_obj)
     {
         delete p_dashManager;
         free( p_sys );
+        free( p_sys->psz_useragent );
         return VLC_EGENERIC;
     }
     p_sys->p_dashManager    = p_dashManager;
@@ -147,6 +142,7 @@ static void Close(vlc_object_t *p_obj)
     dash::DASHManager                   *p_dashManager  = p_sys->p_dashManager;
 
     delete(p_dashManager);
+    free(p_sys->psz_useragent);
     free(p_sys);
 }
 /*****************************************************************************