oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

encoder/Interface: convert PreparedEncoder to abstract class

Browse Source
This commit is contained in:
Max Kellermann
2016-05-04 18:29:31 +02:00
parent e7edc02647
commit b376536a3b
15 changed files with 110 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/output/plugins/RecorderOutputPlugin.cxx
View File

@@ -76,8 +76,7 @@ class RecorderOutput {
:base(recorder_output_plugin) {}
~RecorderOutput() {
if (prepared_encoder != nullptr)
prepared_encoder->Dispose();
delete prepared_encoder;
}
bool Initialize(const ConfigBlock &block, Error &error_r) {

2
src/output/plugins/httpd/HttpdInternal.hxx
View File

@@ -45,7 +45,7 @@ class EventLoop;
class ServerSocket;
class HttpdClient;
class Page;
struct PreparedEncoder;
class PreparedEncoder;
class Encoder;
struct Tag;

6
src/output/plugins/httpd/HttpdOutputPlugin.cxx
View File

@@ -63,9 +63,7 @@ HttpdOutput::~HttpdOutput()
if (metadata != nullptr)
metadata->Unref();
if (prepared_encoder != nullptr)
prepared_encoder->Dispose();
delete prepared_encoder;
}
inline bool
@@ -128,7 +126,7 @@ HttpdOutput::Configure(const ConfigBlock &block, Error &error)
return false;
/* determine content type */
content_type = encoder_get_mime_type(prepared_encoder);
content_type = prepared_encoder->GetMimeType();
if (content_type == nullptr)
content_type = "application/octet-stream";