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
46aa4d2f
Commit
46aa4d2f
authored
Feb 20, 2017
by
François Revol
Committed by
Max Kellermann
Feb 20, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
haiku: fix build
Some missing bits when converted to C++ exceptions...
parent
d0b4bd08
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
10 deletions
+11
-10
HaikuMixerPlugin.cxx
src/mixer/plugins/HaikuMixerPlugin.cxx
+10
-10
HaikuOutputPlugin.cxx
src/output/plugins/HaikuOutputPlugin.cxx
+1
-0
No files found.
src/mixer/plugins/HaikuMixerPlugin.cxx
View file @
46aa4d2f
...
...
@@ -25,6 +25,8 @@
#include "output/plugins/HaikuOutputPlugin.hxx"
#include "Compiler.h"
#include "util/RuntimeError.hxx"
class
HaikuMixer
final
:
public
Mixer
{
/** the base mixer class */
HaikuOutput
&
self
;
...
...
@@ -35,36 +37,34 @@ public:
self
(
_output
)
{}
/* virtual methods from class Mixer */
virtual
bool
Open
(
gcc_unused
Error
&
error
)
override
{
return
true
;
virtual
void
Open
()
override
{
}
virtual
void
Close
()
override
{
}
virtual
int
GetVolume
(
Error
&
error
)
override
;
virtual
bool
SetVolume
(
unsigned
volume
,
Error
&
error
)
override
;
virtual
int
GetVolume
()
override
;
virtual
void
SetVolume
(
unsigned
volume
)
override
;
};
static
Mixer
*
haiku_mixer_init
(
gcc_unused
EventLoop
&
event_loop
,
AudioOutput
&
ao
,
MixerListener
&
listener
,
gcc_unused
const
ConfigBlock
&
block
,
gcc_unused
Error
&
error
)
gcc_unused
const
ConfigBlock
&
block
)
{
return
new
HaikuMixer
((
HaikuOutput
&
)
ao
,
listener
);
}
int
HaikuMixer
::
GetVolume
(
gcc_unused
Error
&
error
)
HaikuMixer
::
GetVolume
()
{
return
haiku_output_get_volume
(
self
);
}
bool
HaikuMixer
::
SetVolume
(
unsigned
volume
,
gcc_unused
Error
&
error
)
void
HaikuMixer
::
SetVolume
(
unsigned
volume
)
{
return
haiku_output_set_volume
(
self
,
volume
);
haiku_output_set_volume
(
self
,
volume
);
}
const
MixerPlugin
haiku_mixer_plugin
=
{
...
...
src/output/plugins/HaikuOutputPlugin.cxx
View file @
46aa4d2f
...
...
@@ -24,6 +24,7 @@
#include "../Wrapper.hxx"
#include "mixer/MixerList.hxx"
#include "util/Domain.hxx"
#include "system/Error.hxx"
#include "Log.hxx"
#include <AppFileInfo.h>
...
...
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