Commit 4d8438e6 authored by Max Kellermann's avatar Max Kellermann

audio: don't pass "fd" to printAudioDevices()

Pass the client struct instead.
parent a6c5928c
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "audioOutput.h" #include "audioOutput.h"
#include "log.h" #include "log.h"
#include "path.h" #include "path.h"
#include "myfprintf.h" #include "client.h"
#include "os_compat.h" #include "os_compat.h"
#define AUDIO_DEVICE_STATE "audio_device_state:" #define AUDIO_DEVICE_STATE "audio_device_state:"
...@@ -448,13 +448,15 @@ int disableAudioDevice(unsigned int device) ...@@ -448,13 +448,15 @@ int disableAudioDevice(unsigned int device)
return 0; return 0;
} }
void printAudioDevices(int fd) void printAudioDevices(struct client *client)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < audioOutputArraySize; i++) { for (i = 0; i < audioOutputArraySize; i++) {
fdprintf(fd, client_printf(client,
"outputid: %i\noutputname: %s\noutputenabled: %i\n", "outputid: %i\n"
"outputname: %s\n"
"outputenabled: %i\n",
i, i,
audioOutputArray[i].name, audioOutputArray[i].name,
audioDeviceStates[i] & 0x01); audioDeviceStates[i] & 0x01);
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#define AUDIO_AO_DRIVER_DEFAULT "default" #define AUDIO_AO_DRIVER_DEFAULT "default"
struct tag; struct tag;
struct client;
void copyAudioFormat(AudioFormat * dest, const AudioFormat * src); void copyAudioFormat(AudioFormat * dest, const AudioFormat * src);
...@@ -64,7 +65,7 @@ int enableAudioDevice(unsigned int device); ...@@ -64,7 +65,7 @@ int enableAudioDevice(unsigned int device);
int disableAudioDevice(unsigned int device); int disableAudioDevice(unsigned int device);
void printAudioDevices(int fd); void printAudioDevices(struct client *client);
void readAudioDevicesState(FILE *fp); void readAudioDevicesState(FILE *fp);
......
...@@ -1230,7 +1230,7 @@ static int handleDisableDevice(struct client *client, mpd_unused int *permission ...@@ -1230,7 +1230,7 @@ static int handleDisableDevice(struct client *client, mpd_unused int *permission
static int handleDevices(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[]) mpd_unused int argc, mpd_unused char *argv[])
{ {
printAudioDevices(client_get_fd(client)); printAudioDevices(client);
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment