[vlc-commits] demux: adaptive: rename query to request

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Feb 25 15:20:48 2016 +0100| [e038068ab229226f9d260c2383c222935ed6ea87] | committer: Francois Cartegnie

demux: adaptive: rename query to request

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

 modules/demux/adaptive/http/Chunk.cpp          |    2 +-
 modules/demux/adaptive/http/HTTPConnection.cpp |    6 +++---
 modules/demux/adaptive/http/HTTPConnection.hpp |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/demux/adaptive/http/Chunk.cpp b/modules/demux/adaptive/http/Chunk.cpp
index 7411ff0..21eeec7 100644
--- a/modules/demux/adaptive/http/Chunk.cpp
+++ b/modules/demux/adaptive/http/Chunk.cpp
@@ -208,7 +208,7 @@ bool HTTPChunkSource::prepare()
             return false;
     }
 
-    if( connection->query(params.getPath(), bytesRange) != VLC_SUCCESS )
+    if( connection->request(params.getPath(), bytesRange) != VLC_SUCCESS )
         return false;
     /* Because we don't know Chunk size at start, we need to get size
            from content length */
diff --git a/modules/demux/adaptive/http/HTTPConnection.cpp b/modules/demux/adaptive/http/HTTPConnection.cpp
index 5f95c9a..8342ea4 100644
--- a/modules/demux/adaptive/http/HTTPConnection.cpp
+++ b/modules/demux/adaptive/http/HTTPConnection.cpp
@@ -99,7 +99,7 @@ void HTTPConnection::disconnect()
     socket->disconnect();
 }
 
-int HTTPConnection::query(const std::string &path, const BytesRange &range)
+int HTTPConnection::request(const std::string &path, const BytesRange &range)
 {
     queryOk = false;
 
@@ -128,7 +128,7 @@ int HTTPConnection::query(const std::string &path, const BytesRange &range)
         {
             /* server closed connection pipeline after last req. need new */
             connectionClose = true;
-            return query(path, range);
+            return request(path, range);
         }
         return VLC_EGENERIC;
     }
@@ -144,7 +144,7 @@ int HTTPConnection::query(const std::string &path, const BytesRange &range)
         if(!connectionClose)
         {
             connectionClose = true;
-            return query(path, range);
+            return request(path, range);
         }
     }
 
diff --git a/modules/demux/adaptive/http/HTTPConnection.hpp b/modules/demux/adaptive/http/HTTPConnection.hpp
index 633e5cb..8ae3fa8 100644
--- a/modules/demux/adaptive/http/HTTPConnection.hpp
+++ b/modules/demux/adaptive/http/HTTPConnection.hpp
@@ -49,7 +49,7 @@ namespace adaptive
                 virtual bool    prepare     (const ConnectionParams &);
                 virtual bool    canReuse     (const ConnectionParams &) const = 0;
 
-                virtual int     query       (const std::string& path, const BytesRange & = BytesRange()) = 0;
+                virtual int     request     (const std::string& path, const BytesRange & = BytesRange()) = 0;
                 virtual ssize_t read        (void *p_buffer, size_t len) = 0;
 
                 virtual size_t  getContentLength() const;
@@ -71,7 +71,7 @@ namespace adaptive
                 virtual ~HTTPConnection();
 
                 virtual bool    canReuse     (const ConnectionParams &) const;
-                virtual int     query       (const std::string& path, const BytesRange & = BytesRange());
+                virtual int     request     (const std::string& path, const BytesRange & = BytesRange());
                 virtual ssize_t read        (void *p_buffer, size_t len);
 
                 void setUsed( bool );