Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
fa90047e
Commit
fa90047e
authored
Nov 09, 2016
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
output/haiku: migrate from class Error to C++ exceptions
Beware, this commit was not tested. I don't have Haiku, but I want to prepare an API change.
parent
b9f64fe1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
42 deletions
+9
-42
HaikuOutputPlugin.cxx
src/output/plugins/HaikuOutputPlugin.cxx
+9
-42
No files found.
src/output/plugins/HaikuOutputPlugin.cxx
View file @
fa90047e
...
...
@@ -23,7 +23,6 @@
#include "../OutputAPI.hxx"
#include "../Wrapper.hxx"
#include "mixer/MixerList.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
#include "Log.hxx"
...
...
@@ -65,13 +64,12 @@ class HaikuOutput {
unsigned
buffer_delay
;
public
:
HaikuOutput
()
:
base
(
haiku_output_plugin
)
{}
~
HaikuOutput
();
HaikuOutput
(
const
ConfigBlock
&
block
)
:
base
(
haiku_output_plugin
,
block
),
/* 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
)
{
return
base
.
Configure
(
block
,
error
);
}
~
HaikuOutput
();
static
HaikuOutput
*
Create
(
const
ConfigBlock
&
block
,
Error
&
error
);
...
...
@@ -84,8 +82,6 @@ public:
size_t
Play
(
const
void
*
chunk
,
size_t
size
,
Error
&
error
);
void
Cancel
();
bool
Configure
(
const
ConfigBlock
&
block
,
Error
&
error
);
size_t
Delay
();
void
FillBuffer
(
void
*
_buffer
,
size_t
size
,
...
...
@@ -101,13 +97,6 @@ private:
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
initialize_application
()
{
// required to send the notification with a bitmap
...
...
@@ -128,15 +117,6 @@ finalize_application()
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
haiku_test_default_device
(
void
)
{
...
...
@@ -146,23 +126,11 @@ haiku_test_default_device(void)
}
inline
HaikuOutput
*
HaikuOutput
::
Create
(
const
ConfigBlock
&
block
,
Error
&
error
)
HaikuOutput
::
Create
(
const
ConfigBlock
&
block
,
Error
&
)
{
initialize_application
();
HaikuOutput
*
ad
=
new
HaikuOutput
();
if
(
!
ad
->
Initialize
(
block
,
error
))
{
delete
ad
;
return
nullptr
;
}
if
(
!
ad
->
Configure
(
block
,
error
))
{
delete
ad
;
return
nullptr
;
}
return
ad
;
return
new
HaikuOutput
(
block
);
}
void
...
...
@@ -224,7 +192,7 @@ HaikuOutput::FillBuffer(void* _buffer, size_t size,
}
inline
bool
HaikuOutput
::
Open
(
AudioFormat
&
audio_format
,
Error
&
error
)
HaikuOutput
::
Open
(
AudioFormat
&
audio_format
,
Error
&
)
{
status_t
err
;
format
=
media_multi_audio_format
::
wildcard
;
...
...
@@ -280,8 +248,7 @@ HaikuOutput::Open(AudioFormat &audio_format, Error &error)
if
(
err
!=
B_OK
)
{
delete
sound_player
;
sound_player
=
NULL
;
haiku_output_error
(
error
,
err
);
return
false
;
throw
MakeErrno
(
err
,
"BSoundPlayer::InitCheck() failed"
);
}
// calculate the allowable delay for the buffer (ms)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment