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

output/haiku: migrate from class Error to C++ exceptions

Browse Source 
Beware, this commit was not tested.  I don't have Haiku, but I want to
prepare an API change.
This commit is contained in:
Max Kellermann 2016-11-09 11:30:17 +01:00
parent b9f64fe19b
commit fa90047e52
1 changed files with 9 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/output/plugins/HaikuOutputPlugin.cxx
View File

@ -23,7 +23,6 @@
#include "../OutputAPI.hxx" #include "../OutputAPI.hxx"
#include "../Wrapper.hxx" #include "../Wrapper.hxx"
#include "mixer/MixerList.hxx" #include "mixer/MixerList.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "Log.hxx" #include "Log.hxx"
@ -65,13 +64,12 @@ class HaikuOutput {
unsigned buffer_delay; unsigned buffer_delay;
public: public:
HaikuOutput() HaikuOutput(const ConfigBlock &block)
:base(haiku_output_plugin) {} :base(haiku_output_plugin, block),
~HaikuOutput(); /* XXX: by default we should let the MediaKit propose the buffer size */
write_size(block.GetBlockValue("write_size", 4096u)) {}
bool Initialize(const ConfigBlock &block, Error &error) { ~HaikuOutput();
return base.Configure(block, error);
}
static HaikuOutput *Create(const ConfigBlock &block, Error &error); static HaikuOutput *Create(const ConfigBlock &block, Error &error);
@ -84,8 +82,6 @@ public:
size_t Play(const void *chunk, size_t size, Error &error); size_t Play(const void *chunk, size_t size, Error &error);
void Cancel(); void Cancel();
bool Configure(const ConfigBlock &block, Error &error);
size_t Delay(); size_t Delay();
void FillBuffer(void* _buffer, size_t size, void FillBuffer(void* _buffer, size_t size,
@ -100,13 +96,6 @@ private:
static constexpr Domain haiku_output_domain("haiku_output"); static constexpr Domain haiku_output_domain("haiku_output");
static void
haiku_output_error(Error &error_r, status_t err)
{
const char *error = strerror(err);
error_r.Set(haiku_output_domain, err, error);
}
static void static void
initialize_application() initialize_application()
{ {
@ -128,15 +117,6 @@ finalize_application()
FormatDebug(haiku_output_domain, "deleting be_app\n"); FormatDebug(haiku_output_domain, "deleting be_app\n");
} }
inline bool
HaikuOutput::Configure(const ConfigBlock &block, Error &)
{
/* XXX: by default we should let the MediaKit propose the buffer size */
write_size = block.GetBlockValue("write_size", 4096u);
return true;
}
static bool static bool
haiku_test_default_device(void) haiku_test_default_device(void)
{ {
@ -146,23 +126,11 @@ haiku_test_default_device(void)
} }
inline HaikuOutput * inline HaikuOutput *
HaikuOutput::Create(const ConfigBlock &block, Error &error) HaikuOutput::Create(const ConfigBlock &block, Error &)
{ {
initialize_application(); initialize_application();
HaikuOutput *ad = new HaikuOutput(); return new HaikuOutput(block);
if (!ad->Initialize(block, error)) {
delete ad;
return nullptr;
}
if (!ad->Configure(block, error)) {
delete ad;
return nullptr;
}
return ad;
} }
void void
@ -224,7 +192,7 @@ HaikuOutput::FillBuffer(void* _buffer, size_t size,
} }
inline bool inline bool
HaikuOutput::Open(AudioFormat &audio_format, Error &error) HaikuOutput::Open(AudioFormat &audio_format, Error &)
{ {
status_t err; status_t err;
format = media_multi_audio_format::wildcard; format = media_multi_audio_format::wildcard;
@ -280,8 +248,7 @@ HaikuOutput::Open(AudioFormat &audio_format, Error &error)
if (err != B_OK) { if (err != B_OK) {
delete sound_player; delete sound_player;
sound_player = NULL; sound_player = NULL;
haiku_output_error(error, err); throw MakeErrno(err, "BSoundPlayer::InitCheck() failed");
return false;
} }
// calculate the allowable delay for the buffer (ms) // calculate the allowable delay for the buffer (ms)