diff options
38 files changed, 76 insertions, 45 deletions
diff --git a/plugins/aac/aac.c b/plugins/aac/aac.c index 6dfecdfd..c8a6abc4 100644 --- a/plugins/aac/aac.c +++ b/plugins/aac/aac.c @@ -1314,7 +1314,8 @@ static const char * exts[] = { "aac", "mp4", "m4a", NULL }; // define plugin interface static DB_decoder_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_DECODER, diff --git a/plugins/adplug/plugin.c b/plugins/adplug/plugin.c index a89365f3..3c800b22 100644 --- a/plugins/adplug/plugin.c +++ b/plugins/adplug/plugin.c @@ -45,7 +45,8 @@ adplug_stop (void); // define plugin interface DB_decoder_t adplug_plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_DECODER, diff --git a/plugins/alsa/alsa.c b/plugins/alsa/alsa.c index c789e9cb..4ae6386c 100644 --- a/plugins/alsa/alsa.c +++ b/plugins/alsa/alsa.c @@ -763,7 +763,8 @@ static const char settings_dlg[] = // define plugin interface static DB_output_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_OUTPUT, diff --git a/plugins/ao/plugin.c b/plugins/ao/plugin.c index 6d7c1b1d..ebef512e 100644 --- a/plugins/ao/plugin.c +++ b/plugins/ao/plugin.c @@ -344,7 +344,8 @@ aoplug_stop (void) { } static DB_decoder_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_DECODER, diff --git a/plugins/artwork/artwork.c b/plugins/artwork/artwork.c index 9357f160..3b2663d1 100644 --- a/plugins/artwork/artwork.c +++ b/plugins/artwork/artwork.c @@ -1278,8 +1278,8 @@ static const char settings_dlg[] = // define plugin interface static DB_artwork_plugin_t plugin = { - .plugin.plugin.api_vmajor = DB_API_VERSION_MAJOR, - .plugin.plugin.api_vminor = DB_API_VERSION_MINOR, + .plugin.plugin.api_vmajor = 1, + .plugin.plugin.api_vminor = 0, .plugin.plugin.version_major = 1, .plugin.plugin.version_minor = 0, .plugin.plugin.type = DB_PLUGIN_MISC, diff --git a/plugins/cdda/cdda.c b/plugins/cdda/cdda.c index 79f11323..aef9f65c 100644 --- a/plugins/cdda/cdda.c +++ b/plugins/cdda/cdda.c @@ -624,7 +624,8 @@ static const char settings_dlg[] = // define plugin interface static DB_decoder_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_DECODER, diff --git a/plugins/converter/converter.c b/plugins/converter/converter.c index 9ac52d20..a00de67a 100644 --- a/plugins/converter/converter.c +++ b/plugins/converter/converter.c @@ -1040,8 +1040,8 @@ converter_stop (void) { // define plugin interface static ddb_converter_t plugin = { - .misc.plugin.api_vmajor = DB_API_VERSION_MAJOR, - .misc.plugin.api_vminor = DB_API_VERSION_MINOR, + .misc.plugin.api_vmajor = 1, + .misc.plugin.api_vminor = 0, .misc.plugin.version_major = 1, .misc.plugin.version_minor = 1, .misc.plugin.type = DB_PLUGIN_MISC, diff --git a/plugins/converter/convgui.c b/plugins/converter/convgui.c index b94e0aef..07db172a 100644 --- a/plugins/converter/convgui.c +++ b/plugins/converter/convgui.c @@ -1274,7 +1274,8 @@ convgui_connect (void) { } DB_misc_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 1, .plugin.type = DB_PLUGIN_MISC, diff --git a/plugins/dca/dcaplug.c b/plugins/dca/dcaplug.c index 63a8e2fd..af19290b 100644 --- a/plugins/dca/dcaplug.c +++ b/plugins/dca/dcaplug.c @@ -721,7 +721,8 @@ dts_stop (void) { // define plugin interface static DB_decoder_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_DECODER, diff --git a/plugins/dumb/cdumb.c b/plugins/dumb/cdumb.c index 59eec4ef..405878ad 100644 --- a/plugins/dumb/cdumb.c +++ b/plugins/dumb/cdumb.c @@ -877,7 +877,8 @@ static const char settings_dlg[] = // define plugin interface static DB_decoder_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_DECODER, diff --git a/plugins/ffap/ffap.c b/plugins/ffap/ffap.c index d2fe5d2d..0b1e61d9 100644 --- a/plugins/ffap/ffap.c +++ b/plugins/ffap/ffap.c @@ -1959,7 +1959,8 @@ static const char *exts[] = { "ape", NULL }; // define plugin interface static DB_decoder_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_DECODER, diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c index 5955c785..cd7edf4a 100644 --- a/plugins/ffmpeg/ffmpeg.c +++ b/plugins/ffmpeg/ffmpeg.c @@ -777,7 +777,8 @@ static const char settings_dlg[] = // define plugin interface static DB_decoder_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 2, .plugin.type = DB_PLUGIN_DECODER, diff --git a/plugins/flac/flac.c b/plugins/flac/flac.c index bd323efa..440759e1 100644 --- a/plugins/flac/flac.c +++ b/plugins/flac/flac.c @@ -933,7 +933,8 @@ static const char *exts[] = { "flac", "oga", NULL }; // define plugin interface static DB_decoder_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_DECODER, diff --git a/plugins/gme/cgme.c b/plugins/gme/cgme.c index 01f81e10..41915e20 100644 --- a/plugins/gme/cgme.c +++ b/plugins/gme/cgme.c @@ -408,7 +408,8 @@ static const char settings_dlg[] = // define plugin interface static DB_decoder_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_DECODER, diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c index 2bd84351..4dd222b1 100644 --- a/plugins/gtkui/gtkui.c +++ b/plugins/gtkui/gtkui.c @@ -1338,8 +1338,8 @@ static const char settings_dlg[] = // define plugin interface static ddb_gtkui_t plugin = { - .gui.plugin.api_vmajor = DB_API_VERSION_MAJOR, - .gui.plugin.api_vminor = DB_API_VERSION_MINOR, + .gui.plugin.api_vmajor = 1, + .gui.plugin.api_vminor = 0, .gui.plugin.version_major = 1, .gui.plugin.version_minor = 0, .gui.plugin.type = DB_PLUGIN_MISC, diff --git a/plugins/hotkeys/hotkeys.c b/plugins/hotkeys/hotkeys.c index 1166f57e..15c93712 100644 --- a/plugins/hotkeys/hotkeys.c +++ b/plugins/hotkeys/hotkeys.c @@ -614,8 +614,8 @@ hotkeys_get_actions (DB_playItem_t *it) // define plugin interface static DB_hotkeys_plugin_t plugin = { - .misc.plugin.api_vmajor = DB_API_VERSION_MAJOR, - .misc.plugin.api_vminor = DB_API_VERSION_MINOR, + .misc.plugin.api_vmajor = 1, + .misc.plugin.api_vminor = 0, .misc.plugin.version_major = 1, .misc.plugin.version_minor = 0, .misc.plugin.type = DB_PLUGIN_MISC, diff --git a/plugins/lastfm/lastfm.c b/plugins/lastfm/lastfm.c index 3ea5622a..14361445 100644 --- a/plugins/lastfm/lastfm.c +++ b/plugins/lastfm/lastfm.c @@ -926,7 +926,8 @@ static const char settings_dlg[] = // define plugin interface static DB_misc_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_MISC, diff --git a/plugins/m3u/m3u.c b/plugins/m3u/m3u.c index ef4c6ba9..bcf6a13c 100644 --- a/plugins/m3u/m3u.c +++ b/plugins/m3u/m3u.c @@ -443,7 +443,8 @@ m3uplug_save (ddb_playlist_t *plt, const char *fname, DB_playItem_t *first, DB_p static const char * exts[] = { "m3u", "m3u8", "pls", NULL }; DB_playlist_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_PLAYLIST, diff --git a/plugins/mms/mmsplug.c b/plugins/mms/mmsplug.c index 787af70d..324efdc5 100644 --- a/plugins/mms/mmsplug.c +++ b/plugins/mms/mmsplug.c @@ -119,7 +119,8 @@ mms_is_streaming (void) { } static DB_vfs_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_VFS, diff --git a/plugins/mpgmad/mpgmad.c b/plugins/mpgmad/mpgmad.c index adda106c..5c712050 100644 --- a/plugins/mpgmad/mpgmad.c +++ b/plugins/mpgmad/mpgmad.c @@ -1443,7 +1443,8 @@ static const char *exts[] = { // define plugin interface static DB_decoder_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_DECODER, diff --git a/plugins/musepack/musepack.c b/plugins/musepack/musepack.c index 2a5d9766..e00f3d18 100644 --- a/plugins/musepack/musepack.c +++ b/plugins/musepack/musepack.c @@ -524,7 +524,8 @@ static const char * exts[] = { "mpc", "mpp", "mp+", NULL }; // define plugin interface static DB_decoder_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_DECODER, diff --git a/plugins/notify/notify.c b/plugins/notify/notify.c index 4f184c52..50157921 100644 --- a/plugins/notify/notify.c +++ b/plugins/notify/notify.c @@ -324,7 +324,8 @@ static const char settings_dlg[] = ; DB_misc_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.type = DB_PLUGIN_MISC, .plugin.version_major = 1, .plugin.version_minor = 0, diff --git a/plugins/nullout/nullout.c b/plugins/nullout/nullout.c index c568f5d2..48fcb5af 100644 --- a/plugins/nullout/nullout.c +++ b/plugins/nullout/nullout.c @@ -190,7 +190,8 @@ nullout_load (DB_functions_t *api) { // define plugin interface static DB_output_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_OUTPUT, diff --git a/plugins/oss/oss.c b/plugins/oss/oss.c index ca0a4312..b263aa17 100644 --- a/plugins/oss/oss.c +++ b/plugins/oss/oss.c @@ -373,7 +373,8 @@ static const char settings_dlg[] = // define plugin interface static DB_output_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_OUTPUT, diff --git a/plugins/pulse/pulse.c b/plugins/pulse/pulse.c index cf71eae5..98f446ca 100644 --- a/plugins/pulse/pulse.c +++ b/plugins/pulse/pulse.c @@ -357,7 +357,8 @@ static const char settings_dlg[] = static DB_output_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 0, .plugin.version_minor = 1, .plugin.type = DB_PLUGIN_OUTPUT, diff --git a/plugins/shellexec/shellexec.c b/plugins/shellexec/shellexec.c index 9485c28b..8ecf223e 100644 --- a/plugins/shellexec/shellexec.c +++ b/plugins/shellexec/shellexec.c @@ -202,8 +202,8 @@ shx_start () // define plugin interface static DB_misc_t plugin = { - .plugin.api_vmajor = DB_API_VERSION_MAJOR, - .plugin.api_vminor = DB_API_VERSION_MINOR, + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_MISC, diff --git a/plugins/shn/shn.c b/plugins/shn/shn.c index c7f20149..881cf3b7 100644 --- a/plugins/shn/shn.c +++ b/plugins/shn/shn.c @@ -1795,7 +1795,8 @@ static const char settings_dlg[] = // define plugin interface static DB_decoder_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_DECODER, diff --git a/plugins/sid/plugin.c b/plugins/sid/plugin.c index 1892d598..772b37a9 100644 --- a/plugins/sid/plugin.c +++ b/plugins/sid/plugin.c @@ -29,7 +29,8 @@ static const char settings_dlg[] = // define plugin interface DB_decoder_t sid_plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.type = DB_PLUGIN_DECODER, .plugin.version_major = 1, .plugin.version_minor = 0, diff --git a/plugins/sndfile/sndfile.c b/plugins/sndfile/sndfile.c index 57d157ea..269cdd51 100644 --- a/plugins/sndfile/sndfile.c +++ b/plugins/sndfile/sndfile.c @@ -528,7 +528,8 @@ static const char settings_dlg[] = // define plugin interface static DB_decoder_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_DECODER, diff --git a/plugins/soundtouch/plugin.c b/plugins/soundtouch/plugin.c index 42b633ac..770f1c0a 100644 --- a/plugins/soundtouch/plugin.c +++ b/plugins/soundtouch/plugin.c @@ -262,8 +262,8 @@ static const char settings_dlg[] = ; static DB_dsp_t plugin = { - .plugin.api_vmajor = DB_API_VERSION_MAJOR, - .plugin.api_vminor = DB_API_VERSION_MINOR, + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .open = st_open, .close = st_close, .process = st_process, diff --git a/plugins/supereq/supereq.c b/plugins/supereq/supereq.c index a773b4ef..ac18285c 100644 --- a/plugins/supereq/supereq.c +++ b/plugins/supereq/supereq.c @@ -273,8 +273,8 @@ static const char settings_dlg[] = ; static DB_dsp_t plugin = { - .plugin.api_vmajor = DB_API_VERSION_MAJOR, - .plugin.api_vminor = DB_API_VERSION_MINOR, + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_DSP, diff --git a/plugins/tta/ttaplug.c b/plugins/tta/ttaplug.c index 3e6ffc59..48d38110 100644 --- a/plugins/tta/ttaplug.c +++ b/plugins/tta/ttaplug.c @@ -315,7 +315,8 @@ static const char * exts[] = { "tta", NULL }; // define plugin interface static DB_decoder_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_DECODER, diff --git a/plugins/vfs_curl/vfs_curl.c b/plugins/vfs_curl/vfs_curl.c index cddb335c..805f04f1 100644 --- a/plugins/vfs_curl/vfs_curl.c +++ b/plugins/vfs_curl/vfs_curl.c @@ -1064,7 +1064,8 @@ http_is_streaming (void) { // standard stdio vfs static DB_vfs_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_VFS, diff --git a/plugins/vfs_zip/vfs_zip.c b/plugins/vfs_zip/vfs_zip.c index 5e77b740..d6b1b32b 100644 --- a/plugins/vfs_zip/vfs_zip.c +++ b/plugins/vfs_zip/vfs_zip.c @@ -210,7 +210,8 @@ vfs_zip_is_container (const char *fname) { } static DB_vfs_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_VFS, diff --git a/plugins/vorbis/vorbis.c b/plugins/vorbis/vorbis.c index 6441a8bf..c85a0c63 100644 --- a/plugins/vorbis/vorbis.c +++ b/plugins/vorbis/vorbis.c @@ -768,7 +768,8 @@ static const char * exts[] = { "ogg", "ogx", NULL }; // define plugin interface static DB_decoder_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_DECODER, diff --git a/plugins/vtx/vtx.c b/plugins/vtx/vtx.c index c42715db..53511b7c 100644 --- a/plugins/vtx/vtx.c +++ b/plugins/vtx/vtx.c @@ -298,7 +298,8 @@ static const char settings_dlg[] = // define plugin interface static DB_decoder_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_DECODER, diff --git a/plugins/wavpack/wavpack.c b/plugins/wavpack/wavpack.c index 75f1d47b..73f3c9f7 100644 --- a/plugins/wavpack/wavpack.c +++ b/plugins/wavpack/wavpack.c @@ -411,7 +411,8 @@ wv_write_metadata (DB_playItem_t *it) { static const char *exts[] = { "wv", NULL }; // define plugin interface static DB_decoder_t plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.version_major = 1, .plugin.version_minor = 0, .plugin.type = DB_PLUGIN_DECODER, diff --git a/plugins/wildmidi/wildmidiplug.c b/plugins/wildmidi/wildmidiplug.c index d989c695..fc07754b 100644 --- a/plugins/wildmidi/wildmidiplug.c +++ b/plugins/wildmidi/wildmidiplug.c @@ -183,7 +183,8 @@ static const char settings_dlg[] = ; // define plugin interface DB_decoder_t wmidi_plugin = { - DB_PLUGIN_SET_API_VERSION + .plugin.api_vmajor = 1, + .plugin.api_vminor = 0, .plugin.type = DB_PLUGIN_DECODER, .plugin.version_major = 1, .plugin.version_minor = 0, |