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
4d8438e6
Commit
4d8438e6
authored
Sep 07, 2008
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
audio: don't pass "fd" to printAudioDevices()
Pass the client struct instead.
parent
a6c5928c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
9 deletions
+12
-9
audio.c
src/audio.c
+9
-7
audio.h
src/audio.h
+2
-1
command.c
src/command.c
+1
-1
No files found.
src/audio.c
View file @
4d8438e6
...
...
@@ -20,7 +20,7 @@
#include "audioOutput.h"
#include "log.h"
#include "path.h"
#include "
myfprintf
.h"
#include "
client
.h"
#include "os_compat.h"
#define AUDIO_DEVICE_STATE "audio_device_state:"
...
...
@@ -448,16 +448,18 @@ int disableAudioDevice(unsigned int device)
return
0
;
}
void
printAudioDevices
(
int
fd
)
void
printAudioDevices
(
struct
client
*
client
)
{
unsigned
int
i
;
for
(
i
=
0
;
i
<
audioOutputArraySize
;
i
++
)
{
fdprintf
(
fd
,
"outputid: %i
\n
outputname: %s
\n
outputenabled: %i
\n
"
,
i
,
audioOutputArray
[
i
].
name
,
audioDeviceStates
[
i
]
&
0x01
);
client_printf
(
client
,
"outputid: %i
\n
"
"outputname: %s
\n
"
"outputenabled: %i
\n
"
,
i
,
audioOutputArray
[
i
].
name
,
audioDeviceStates
[
i
]
&
0x01
);
}
}
...
...
src/audio.h
View file @
4d8438e6
...
...
@@ -25,6 +25,7 @@
#define AUDIO_AO_DRIVER_DEFAULT "default"
struct
tag
;
struct
client
;
void
copyAudioFormat
(
AudioFormat
*
dest
,
const
AudioFormat
*
src
);
...
...
@@ -64,7 +65,7 @@ int enableAudioDevice(unsigned int device);
int
disableAudioDevice
(
unsigned
int
device
);
void
printAudioDevices
(
int
fd
);
void
printAudioDevices
(
struct
client
*
client
);
void
readAudioDevicesState
(
FILE
*
fp
);
...
...
src/command.c
View file @
4d8438e6
...
...
@@ -1230,7 +1230,7 @@ static int handleDisableDevice(struct client *client, mpd_unused int *permission
static
int
handleDevices
(
struct
client
*
client
,
mpd_unused
int
*
permission
,
mpd_unused
int
argc
,
mpd_unused
char
*
argv
[])
{
printAudioDevices
(
client
_get_fd
(
client
)
);
printAudioDevices
(
client
);
return
0
;
}
...
...
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