MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-27 06:33:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

[player] Rename struct spk_info to player_speaker_info

Browse Source
This commit is contained in:
chme 2019-01-22 17:47:15 +01:00
parent f91df003fe
commit 116c315a84
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/httpd_dacp.c
View File

@ -512,7 +512,7 @@ playqueuecontents_add_queue_item(struct evbuffer *songlist, struct db_queue_item
} }
static void static void
speaker_enum_cb(struct spk_info *spk, void *arg) speaker_enum_cb(struct player_speaker_info *spk, void *arg)
{ {
struct evbuffer *evbuf; struct evbuffer *evbuf;
int len; int len;

8
src/httpd_jsonapi.c
View File

@ -1071,7 +1071,7 @@ struct outputs_param
}; };
static json_object * static json_object *
speaker_to_json(struct spk_info *spk) speaker_to_json(struct player_speaker_info *spk)
{ {
json_object *output; json_object *output;
char output_id[21]; char output_id[21];
@ -1092,7 +1092,7 @@ speaker_to_json(struct spk_info *spk)
} }
static void static void
speaker_enum_cb(struct spk_info *spk, void *arg) speaker_enum_cb(struct player_speaker_info *spk, void *arg)
{ {
json_object *outputs; json_object *outputs;
json_object *output; json_object *output;
@ -1109,7 +1109,7 @@ speaker_enum_cb(struct spk_info *spk, void *arg)
static int static int
jsonapi_reply_outputs_get_byid(struct httpd_request *hreq) jsonapi_reply_outputs_get_byid(struct httpd_request *hreq)
{ {
struct spk_info speaker_info; struct player_speaker_info speaker_info;
uint64_t output_id; uint64_t output_id;
json_object *jreply; json_object *jreply;
int ret; int ret;
@ -2220,7 +2220,7 @@ static int
output_volume_set(int volume, int step, uint64_t output_id) output_volume_set(int volume, int step, uint64_t output_id)
{ {
int new_volume; int new_volume;
struct spk_info speaker_info; struct player_speaker_info speaker_info;
int ret; int ret;
new_volume = volume; new_volume = volume;

4
src/mpd.c
View File

@ -3548,7 +3548,7 @@ mpd_command_password(struct evbuffer *evbuf, int argc, char **argv, char **errms
* the shortid of output_get_param matches the given speaker/output spk. * the shortid of output_get_param matches the given speaker/output spk.
*/ */
static void static void
output_get_cb(struct spk_info *spk, void *arg) output_get_cb(struct player_speaker_info *spk, void *arg)
{ {
struct output_get_param *param = arg; struct output_get_param *param = arg;
@ -3696,7 +3696,7 @@ mpd_command_toggleoutput(struct evbuffer *evbuf, int argc, char **argv, char **e
* outputvolume: 50 * outputvolume: 50
*/ */
static void static void
speaker_enum_cb(struct spk_info *spk, void *arg) speaker_enum_cb(struct player_speaker_info *spk, void *arg)
{ {
struct evbuffer *evbuf; struct evbuffer *evbuf;

10
src/player.c
View File

@ -149,7 +149,7 @@ struct speaker_set_param
struct speaker_get_param struct speaker_get_param
{ {
uint64_t spk_id; uint64_t spk_id;
struct spk_info *spk_info; struct player_speaker_info *spk_info;
}; };
struct metadata_param struct metadata_param
@ -2414,9 +2414,9 @@ player_speaker_status_trigger(void)
} }
static void static void
device_to_speaker_info(struct spk_info *spk, struct output_device *device) device_to_speaker_info(struct player_speaker_info *spk, struct output_device *device)
{ {
memset(spk, 0, sizeof(struct spk_info)); memset(spk, 0, sizeof(struct player_speaker_info));
spk->id = device->id; spk->id = device->id;
strncpy(spk->name, device->name, sizeof(spk->name)); strncpy(spk->name, device->name, sizeof(spk->name));
spk->name[sizeof(spk->name) - 1] = '\0'; spk->name[sizeof(spk->name) - 1] = '\0';
@ -2437,7 +2437,7 @@ speaker_enumerate(void *arg, int *retval)
{ {
struct spk_enum *spk_enum = arg; struct spk_enum *spk_enum = arg;
struct output_device *device; struct output_device *device;
struct spk_info spk; struct player_speaker_info spk;
for (device = dev_list; device; device = device->next) for (device = dev_list; device; device = device->next)
{ {
@ -3160,7 +3160,7 @@ player_speaker_set(uint64_t *ids)
} }
int int
player_speaker_get_byid(uint64_t id, struct spk_info *spk) player_speaker_get_byid(uint64_t id, struct player_speaker_info *spk)
{ {
struct speaker_get_param param; struct speaker_get_param param;
int ret; int ret;

6
src/player.h
View File

@ -29,7 +29,7 @@ enum repeat_mode {
REPEAT_ALL = 2, REPEAT_ALL = 2,
}; };
struct spk_info { struct player_speaker_info {
uint64_t id; uint64_t id;
char name[255]; char name[255];
char output_type[50]; char output_type[50];
@ -64,7 +64,7 @@ struct player_status {
uint32_t len_ms; uint32_t len_ms;
}; };
typedef void (*spk_enum_cb)(struct spk_info *spk, void *arg); typedef void (*spk_enum_cb)(struct player_speaker_info *spk, void *arg);
struct player_history struct player_history
{ {
@ -96,7 +96,7 @@ int
player_speaker_set(uint64_t *ids); player_speaker_set(uint64_t *ids);
int int
player_speaker_get_byid(uint64_t id, struct spk_info *spk); player_speaker_get_byid(uint64_t id, struct player_speaker_info *spk);
int int
player_speaker_enable(uint64_t id); player_speaker_enable(uint64_t id);