diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-28 20:32:23 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-28 23:29:43 +0100 |
| commit | dcf55c7e328578d435eb14277cb6ba9e072f7e9c (patch) | |
| tree | 0488d2de5ecfd090cce2e00cfbc4cdcd342c8194 /src/input/SoupInputPlugin.cxx | |
| parent | e565cd440497d3b693e281046af485c667491441 (diff) | |
InputStream: add constructor/destructor
Eliminate input_stream_init() and input_stream_deinit().
Diffstat (limited to 'src/input/SoupInputPlugin.cxx')
| -rw-r--r-- | src/input/SoupInputPlugin.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/input/SoupInputPlugin.cxx b/src/input/SoupInputPlugin.cxx index b781cd44..6615a3c7 100644 --- a/src/input/SoupInputPlugin.cxx +++ b/src/input/SoupInputPlugin.cxx @@ -278,14 +278,12 @@ input_soup_queue(gpointer data) SoupInputStream::SoupInputStream(const char *uri, Mutex &mutex, Cond &cond) - :buffers(g_queue_new()), + :base(input_plugin_soup, uri, mutex, cond), + buffers(g_queue_new()), current_consumed(0), total_buffered(0), alive(false), pause(false), eof(false), completed(false), postponed_error(nullptr) { - input_stream_init(&base, &input_plugin_soup, uri, - mutex, cond); - #if GCC_CHECK_VERSION(4,6) #pragma GCC diagnostic push /* the libsoup macro SOUP_METHOD_GET discards the "const" @@ -365,8 +363,6 @@ SoupInputStream::~SoupInputStream() if (postponed_error != NULL) g_error_free(postponed_error); - - input_stream_deinit(&base); } static void |