[vlc-commits] demux: adaptative: merge and simplify the http stuff

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon May 11 17:10:37 2015 +0200| [0e86ff50c8281bfa86f02109cfd6417d2860dd35] | committer: Francois Cartegnie

demux: adaptative: merge and simplify the http stuff

Allows using tls transport and does
non persistent connection fallback.

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

 modules/demux/Makefile.am                          |    6 +-
 modules/demux/adaptative/PlaylistManager.cpp       |    2 +-
 modules/demux/adaptative/Streams.cpp               |   27 +--
 modules/demux/adaptative/http/Chunk.cpp            |   17 +-
 modules/demux/adaptative/http/Chunk.h              |    2 +
 modules/demux/adaptative/http/HTTPConnection.cpp   |  219 +++++++++++++++++---
 .../http/{IHTTPConnection.h => HTTPConnection.hpp} |   47 +++--
 .../adaptative/http/HTTPConnectionManager.cpp      |   25 ++-
 .../demux/adaptative/http/HTTPConnectionManager.h  |   10 +-
 modules/demux/adaptative/http/IHTTPConnection.cpp  |  165 ---------------
 .../demux/adaptative/http/PersistentConnection.cpp |  122 -----------
 .../demux/adaptative/http/PersistentConnection.h   |   59 ------
 modules/demux/adaptative/http/Sockets.cpp          |   98 +++++++++
 .../http/{HTTPConnection.h => Sockets.hpp}         |   44 ++--
 14 files changed, 398 insertions(+), 445 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=0e86ff50c8281bfa86f02109cfd6417d2860dd35