diff options
Diffstat (limited to '')
| -rw-r--r-- | src/dbUtils.c | 5 | ||||
| -rw-r--r-- | src/inputPlugins/wavpack_plugin.c | 28 |
2 files changed, 18 insertions, 15 deletions
diff --git a/src/dbUtils.c b/src/dbUtils.c index adcb7e0da..bd990e96d 100644 --- a/src/dbUtils.c +++ b/src/dbUtils.c @@ -203,9 +203,8 @@ int addAllIn(const char *name) int addAllInToStoredPlaylist(const char *name, const char *utf8file) { - struct add_data data = { - .path = utf8file, - }; + struct add_data data; + data.path = utf8file; return traverseAllIn(name, directoryAddSongToStoredPlaylist, NULL, &data); diff --git a/src/inputPlugins/wavpack_plugin.c b/src/inputPlugins/wavpack_plugin.c index b6da51e5e..b112ee168 100644 --- a/src/inputPlugins/wavpack_plugin.c +++ b/src/inputPlugins/wavpack_plugin.c @@ -382,17 +382,21 @@ static int can_seek(void *id) return ((InputStreamPlus *)id)->is->seekable; } -/* FIXME: remove C99 initializers */ -static WavpackStreamReader mpd_is_reader = { - .read_bytes = read_bytes, - .get_pos = get_pos, - .set_pos_abs = set_pos_abs, - .set_pos_rel = set_pos_rel, - .push_back_byte = push_back_byte, - .get_length = get_length, - .can_seek = can_seek, - .write_bytes = NULL /* no need to write edited tags */ -}; +static WavpackStreamReader mpd_is_reader; + +static int wavpack_init(void) +{ + mpd_is_reader.read_bytes = read_bytes; + mpd_is_reader.get_pos = get_pos; + mpd_is_reader.set_pos_abs = set_pos_abs; + mpd_is_reader.set_pos_rel = set_pos_rel; + mpd_is_reader.push_back_byte = push_back_byte; + mpd_is_reader.get_length = get_length; + mpd_is_reader.can_seek = can_seek; + /* mpd_is_reader.write_bytes = NULL; no need to write edited tags */ + + return 0; +} static void initInputStreamPlus(InputStreamPlus *isp, InputStream *is) @@ -551,7 +555,7 @@ static char const *wavpackMimeTypes[] = { "audio/x-wavpack", NULL }; InputPlugin wavpackPlugin = { "wavpack", - NULL, + wavpack_init, NULL, wavpack_trydecode, wavpack_streamdecode, |