From 8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 25 Nov 2017 18:00:06 +0000 Subject: copy 1.2 branch to trunk git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Output/CMakeLists.txt | 4 +- src/plugins/Output/Output.pro | 2 +- src/plugins/Output/alsa/CMakeLists.txt | 19 +-- src/plugins/Output/alsa/outputalsafactory.cpp | 7 +- src/plugins/Output/alsa/outputalsafactory.h | 2 +- .../Output/alsa/translations/alsa_plugin_bg.ts | 8 +- .../Output/alsa/translations/alsa_plugin_cs.ts | 8 +- .../Output/alsa/translations/alsa_plugin_de.ts | 8 +- .../Output/alsa/translations/alsa_plugin_el.ts | 8 +- .../Output/alsa/translations/alsa_plugin_en.ts | 8 +- .../Output/alsa/translations/alsa_plugin_es.ts | 8 +- .../Output/alsa/translations/alsa_plugin_fi.ts | 8 +- .../Output/alsa/translations/alsa_plugin_fr.ts | 8 +- .../Output/alsa/translations/alsa_plugin_gl_ES.ts | 8 +- .../Output/alsa/translations/alsa_plugin_he.ts | 8 +- .../Output/alsa/translations/alsa_plugin_hu.ts | 8 +- .../Output/alsa/translations/alsa_plugin_id.ts | 8 +- .../Output/alsa/translations/alsa_plugin_it.ts | 8 +- .../Output/alsa/translations/alsa_plugin_ja.ts | 8 +- .../Output/alsa/translations/alsa_plugin_kk.ts | 8 +- .../Output/alsa/translations/alsa_plugin_lt.ts | 8 +- .../Output/alsa/translations/alsa_plugin_nl.ts | 8 +- .../Output/alsa/translations/alsa_plugin_pl_PL.ts | 8 +- .../Output/alsa/translations/alsa_plugin_pt.ts | 8 +- .../Output/alsa/translations/alsa_plugin_pt_BR.ts | 8 +- .../Output/alsa/translations/alsa_plugin_ru.ts | 8 +- .../Output/alsa/translations/alsa_plugin_sk.ts | 8 +- .../Output/alsa/translations/alsa_plugin_sr_BA.ts | 8 +- .../Output/alsa/translations/alsa_plugin_sr_RS.ts | 8 +- .../Output/alsa/translations/alsa_plugin_tr.ts | 8 +- .../Output/alsa/translations/alsa_plugin_uk_UA.ts | 8 +- .../Output/alsa/translations/alsa_plugin_zh_CN.ts | 8 +- .../Output/alsa/translations/alsa_plugin_zh_TW.ts | 8 +- src/plugins/Output/directsound/CMakeLists.txt | 17 +- .../directsound/outputdirectsoundfactory.cpp | 6 +- .../Output/directsound/outputdirectsoundfactory.h | 1 + .../translations/directsound_plugin_bg.ts | 8 +- .../translations/directsound_plugin_cs.ts | 8 +- .../translations/directsound_plugin_de.ts | 8 +- .../translations/directsound_plugin_el.ts | 8 +- .../translations/directsound_plugin_en.ts | 8 +- .../translations/directsound_plugin_es.ts | 8 +- .../translations/directsound_plugin_fi.ts | 8 +- .../translations/directsound_plugin_fr.ts | 8 +- .../translations/directsound_plugin_gl_ES.ts | 8 +- .../translations/directsound_plugin_he.ts | 8 +- .../translations/directsound_plugin_hu.ts | 8 +- .../translations/directsound_plugin_id.ts | 8 +- .../translations/directsound_plugin_it.ts | 8 +- .../translations/directsound_plugin_ja.ts | 8 +- .../translations/directsound_plugin_kk.ts | 8 +- .../translations/directsound_plugin_lt.ts | 8 +- .../translations/directsound_plugin_nl.ts | 8 +- .../translations/directsound_plugin_pl_PL.ts | 8 +- .../translations/directsound_plugin_pt.ts | 8 +- .../translations/directsound_plugin_pt_BR.ts | 8 +- .../translations/directsound_plugin_ru.ts | 8 +- .../translations/directsound_plugin_sk.ts | 8 +- .../translations/directsound_plugin_sr_BA.ts | 8 +- .../translations/directsound_plugin_sr_RS.ts | 8 +- .../translations/directsound_plugin_tr.ts | 8 +- .../translations/directsound_plugin_uk_UA.ts | 8 +- .../translations/directsound_plugin_zh_CN.ts | 8 +- .../translations/directsound_plugin_zh_TW.ts | 8 +- src/plugins/Output/jack/CMakeLists.txt | 43 +---- src/plugins/Output/jack/bio2jack.c | 18 +- src/plugins/Output/jack/jack.pro | 4 - src/plugins/Output/jack/outputjackfactory.cpp | 6 +- src/plugins/Output/jack/outputjackfactory.h | 1 + .../Output/jack/translations/jack_plugin_bg.ts | 8 +- .../Output/jack/translations/jack_plugin_cs.ts | 8 +- .../Output/jack/translations/jack_plugin_de.ts | 8 +- .../Output/jack/translations/jack_plugin_el.ts | 8 +- .../Output/jack/translations/jack_plugin_en.ts | 8 +- .../Output/jack/translations/jack_plugin_es.ts | 8 +- .../Output/jack/translations/jack_plugin_fi.ts | 8 +- .../Output/jack/translations/jack_plugin_fr.ts | 8 +- .../Output/jack/translations/jack_plugin_gl_ES.ts | 8 +- .../Output/jack/translations/jack_plugin_he.ts | 8 +- .../Output/jack/translations/jack_plugin_hu.ts | 8 +- .../Output/jack/translations/jack_plugin_id.ts | 8 +- .../Output/jack/translations/jack_plugin_it.ts | 8 +- .../Output/jack/translations/jack_plugin_ja.ts | 8 +- .../Output/jack/translations/jack_plugin_kk.ts | 8 +- .../Output/jack/translations/jack_plugin_lt.ts | 8 +- .../Output/jack/translations/jack_plugin_nl.ts | 8 +- .../Output/jack/translations/jack_plugin_pl_PL.ts | 8 +- .../Output/jack/translations/jack_plugin_pt.ts | 8 +- .../Output/jack/translations/jack_plugin_pt_BR.ts | 8 +- .../Output/jack/translations/jack_plugin_ru.ts | 8 +- .../Output/jack/translations/jack_plugin_sk.ts | 8 +- .../Output/jack/translations/jack_plugin_sr_BA.ts | 8 +- .../Output/jack/translations/jack_plugin_sr_RS.ts | 8 +- .../Output/jack/translations/jack_plugin_tr.ts | 8 +- .../Output/jack/translations/jack_plugin_uk_UA.ts | 8 +- .../Output/jack/translations/jack_plugin_zh_CN.ts | 8 +- .../Output/jack/translations/jack_plugin_zh_TW.ts | 8 +- src/plugins/Output/null/CMakeLists.txt | 17 +- src/plugins/Output/null/outputnullfactory.cpp | 7 +- src/plugins/Output/null/outputnullfactory.h | 1 + .../Output/null/translations/null_plugin_bg.ts | 8 +- .../Output/null/translations/null_plugin_cs.ts | 8 +- .../Output/null/translations/null_plugin_de.ts | 8 +- .../Output/null/translations/null_plugin_el.ts | 8 +- .../Output/null/translations/null_plugin_en.ts | 8 +- .../Output/null/translations/null_plugin_es.ts | 8 +- .../Output/null/translations/null_plugin_fi.ts | 8 +- .../Output/null/translations/null_plugin_fr.ts | 8 +- .../Output/null/translations/null_plugin_gl_ES.ts | 8 +- .../Output/null/translations/null_plugin_he.ts | 8 +- .../Output/null/translations/null_plugin_hu.ts | 8 +- .../Output/null/translations/null_plugin_id.ts | 8 +- .../Output/null/translations/null_plugin_it.ts | 8 +- .../Output/null/translations/null_plugin_ja.ts | 8 +- .../Output/null/translations/null_plugin_kk.ts | 8 +- .../Output/null/translations/null_plugin_lt.ts | 8 +- .../Output/null/translations/null_plugin_nl.ts | 8 +- .../Output/null/translations/null_plugin_pl_PL.ts | 8 +- .../Output/null/translations/null_plugin_pt.ts | 8 +- .../Output/null/translations/null_plugin_pt_BR.ts | 8 +- .../Output/null/translations/null_plugin_ru.ts | 8 +- .../Output/null/translations/null_plugin_sk.ts | 8 +- .../Output/null/translations/null_plugin_sr_BA.ts | 8 +- .../Output/null/translations/null_plugin_sr_RS.ts | 8 +- .../Output/null/translations/null_plugin_tr.ts | 8 +- .../Output/null/translations/null_plugin_uk_UA.ts | 8 +- .../Output/null/translations/null_plugin_zh_CN.ts | 8 +- .../Output/null/translations/null_plugin_zh_TW.ts | 8 +- src/plugins/Output/oss/CMakeLists.txt | 19 +-- src/plugins/Output/oss/outputossfactory.cpp | 5 +- src/plugins/Output/oss/outputossfactory.h | 1 + .../Output/oss/translations/oss_plugin_bg.ts | 10 +- .../Output/oss/translations/oss_plugin_cs.ts | 10 +- .../Output/oss/translations/oss_plugin_de.ts | 10 +- .../Output/oss/translations/oss_plugin_el.ts | 10 +- .../Output/oss/translations/oss_plugin_en.ts | 10 +- .../Output/oss/translations/oss_plugin_es.ts | 10 +- .../Output/oss/translations/oss_plugin_fi.ts | 10 +- .../Output/oss/translations/oss_plugin_fr.ts | 10 +- .../Output/oss/translations/oss_plugin_gl_ES.ts | 10 +- .../Output/oss/translations/oss_plugin_he.ts | 10 +- .../Output/oss/translations/oss_plugin_hu.ts | 10 +- .../Output/oss/translations/oss_plugin_id.ts | 10 +- .../Output/oss/translations/oss_plugin_it.ts | 10 +- .../Output/oss/translations/oss_plugin_ja.ts | 10 +- .../Output/oss/translations/oss_plugin_kk.ts | 10 +- .../Output/oss/translations/oss_plugin_lt.ts | 10 +- .../Output/oss/translations/oss_plugin_nl.ts | 10 +- .../Output/oss/translations/oss_plugin_pl_PL.ts | 10 +- .../Output/oss/translations/oss_plugin_pt.ts | 10 +- .../Output/oss/translations/oss_plugin_pt_BR.ts | 10 +- .../Output/oss/translations/oss_plugin_ru.ts | 10 +- .../Output/oss/translations/oss_plugin_sk.ts | 10 +- .../Output/oss/translations/oss_plugin_sr_BA.ts | 10 +- .../Output/oss/translations/oss_plugin_sr_RS.ts | 10 +- .../Output/oss/translations/oss_plugin_tr.ts | 10 +- .../Output/oss/translations/oss_plugin_uk_UA.ts | 10 +- .../Output/oss/translations/oss_plugin_zh_CN.ts | 10 +- .../Output/oss/translations/oss_plugin_zh_TW.ts | 10 +- src/plugins/Output/oss4/CMakeLists.txt | 18 +- src/plugins/Output/oss4/outputoss4.cpp | 2 +- src/plugins/Output/oss4/outputoss4factory.cpp | 5 +- src/plugins/Output/oss4/outputoss4factory.h | 1 + .../Output/oss4/translations/oss4_plugin_bg.ts | 8 +- .../Output/oss4/translations/oss4_plugin_cs.ts | 8 +- .../Output/oss4/translations/oss4_plugin_de.ts | 8 +- .../Output/oss4/translations/oss4_plugin_el.ts | 8 +- .../Output/oss4/translations/oss4_plugin_en.ts | 8 +- .../Output/oss4/translations/oss4_plugin_es.ts | 8 +- .../Output/oss4/translations/oss4_plugin_fi.ts | 8 +- .../Output/oss4/translations/oss4_plugin_fr.ts | 8 +- .../Output/oss4/translations/oss4_plugin_gl_ES.ts | 8 +- .../Output/oss4/translations/oss4_plugin_he.ts | 8 +- .../Output/oss4/translations/oss4_plugin_hu.ts | 8 +- .../Output/oss4/translations/oss4_plugin_id.ts | 8 +- .../Output/oss4/translations/oss4_plugin_it.ts | 8 +- .../Output/oss4/translations/oss4_plugin_ja.ts | 8 +- .../Output/oss4/translations/oss4_plugin_kk.ts | 8 +- .../Output/oss4/translations/oss4_plugin_lt.ts | 8 +- .../Output/oss4/translations/oss4_plugin_nl.ts | 8 +- .../Output/oss4/translations/oss4_plugin_pl_PL.ts | 8 +- .../Output/oss4/translations/oss4_plugin_pt.ts | 8 +- .../Output/oss4/translations/oss4_plugin_pt_BR.ts | 8 +- .../Output/oss4/translations/oss4_plugin_ru.ts | 8 +- .../Output/oss4/translations/oss4_plugin_sk.ts | 8 +- .../Output/oss4/translations/oss4_plugin_sr_BA.ts | 8 +- .../Output/oss4/translations/oss4_plugin_sr_RS.ts | 8 +- .../Output/oss4/translations/oss4_plugin_tr.ts | 8 +- .../Output/oss4/translations/oss4_plugin_uk_UA.ts | 8 +- .../Output/oss4/translations/oss4_plugin_zh_CN.ts | 8 +- .../Output/oss4/translations/oss4_plugin_zh_TW.ts | 8 +- src/plugins/Output/pulseaudio/CMakeLists.txt | 17 +- .../Output/pulseaudio/outputpulseaudiofactory.cpp | 7 +- .../Output/pulseaudio/outputpulseaudiofactory.h | 1 + .../translations/pulseaudio_plugin_bg.ts | 8 +- .../translations/pulseaudio_plugin_cs.ts | 8 +- .../translations/pulseaudio_plugin_de.ts | 8 +- .../translations/pulseaudio_plugin_el.ts | 8 +- .../translations/pulseaudio_plugin_en.ts | 8 +- .../translations/pulseaudio_plugin_es.ts | 8 +- .../translations/pulseaudio_plugin_fi.ts | 8 +- .../translations/pulseaudio_plugin_fr.ts | 8 +- .../translations/pulseaudio_plugin_gl_ES.ts | 8 +- .../translations/pulseaudio_plugin_he.ts | 8 +- .../translations/pulseaudio_plugin_hu.ts | 8 +- .../translations/pulseaudio_plugin_id.ts | 8 +- .../translations/pulseaudio_plugin_it.ts | 8 +- .../translations/pulseaudio_plugin_ja.ts | 8 +- .../translations/pulseaudio_plugin_kk.ts | 8 +- .../translations/pulseaudio_plugin_lt.ts | 8 +- .../translations/pulseaudio_plugin_nl.ts | 8 +- .../translations/pulseaudio_plugin_pl_PL.ts | 8 +- .../translations/pulseaudio_plugin_pt.ts | 8 +- .../translations/pulseaudio_plugin_pt_BR.ts | 8 +- .../translations/pulseaudio_plugin_ru.ts | 8 +- .../translations/pulseaudio_plugin_sk.ts | 8 +- .../translations/pulseaudio_plugin_sr_BA.ts | 8 +- .../translations/pulseaudio_plugin_sr_RS.ts | 8 +- .../translations/pulseaudio_plugin_tr.ts | 8 +- .../translations/pulseaudio_plugin_uk_UA.ts | 8 +- .../translations/pulseaudio_plugin_zh_CN.ts | 8 +- .../translations/pulseaudio_plugin_zh_TW.ts | 8 +- src/plugins/Output/qtmultimedia/CMakeLists.txt | 35 +--- .../Output/qtmultimedia/outputqtmultimedia.cpp | 184 +++++++++++---------- .../Output/qtmultimedia/outputqtmultimedia.h | 19 +++ .../qtmultimedia/outputqtmultimediafactory.cpp | 5 +- .../qtmultimedia/outputqtmultimediafactory.h | 1 + .../translations/qtmultimedia_plugin_bg.ts | 8 +- .../translations/qtmultimedia_plugin_cs.ts | 8 +- .../translations/qtmultimedia_plugin_de.ts | 8 +- .../translations/qtmultimedia_plugin_el.ts | 8 +- .../translations/qtmultimedia_plugin_en.ts | 8 +- .../translations/qtmultimedia_plugin_es.ts | 8 +- .../translations/qtmultimedia_plugin_fi.ts | 8 +- .../translations/qtmultimedia_plugin_fr.ts | 8 +- .../translations/qtmultimedia_plugin_gl_ES.ts | 8 +- .../translations/qtmultimedia_plugin_he.ts | 8 +- .../translations/qtmultimedia_plugin_hu.ts | 8 +- .../translations/qtmultimedia_plugin_id.ts | 8 +- .../translations/qtmultimedia_plugin_it.ts | 8 +- .../translations/qtmultimedia_plugin_ja.ts | 8 +- .../translations/qtmultimedia_plugin_kk.ts | 8 +- .../translations/qtmultimedia_plugin_lt.ts | 8 +- .../translations/qtmultimedia_plugin_nl.ts | 8 +- .../translations/qtmultimedia_plugin_pl_PL.ts | 8 +- .../translations/qtmultimedia_plugin_pt.ts | 8 +- .../translations/qtmultimedia_plugin_pt_BR.ts | 8 +- .../translations/qtmultimedia_plugin_ru.ts | 8 +- .../translations/qtmultimedia_plugin_sk.ts | 8 +- .../translations/qtmultimedia_plugin_sr_BA.ts | 8 +- .../translations/qtmultimedia_plugin_sr_RS.ts | 8 +- .../translations/qtmultimedia_plugin_tr.ts | 8 +- .../translations/qtmultimedia_plugin_uk_UA.ts | 8 +- .../translations/qtmultimedia_plugin_zh_CN.ts | 8 +- .../translations/qtmultimedia_plugin_zh_TW.ts | 8 +- src/plugins/Output/shout/CMakeLists.txt | 19 +-- src/plugins/Output/shout/outputshoutfactory.cpp | 3 - src/plugins/Output/shout/outputshoutfactory.h | 1 + .../Output/shout/translations/shout_plugin_bg.ts | 10 +- .../Output/shout/translations/shout_plugin_cs.ts | 10 +- .../Output/shout/translations/shout_plugin_de.ts | 10 +- .../Output/shout/translations/shout_plugin_el.ts | 10 +- .../Output/shout/translations/shout_plugin_en.ts | 10 +- .../Output/shout/translations/shout_plugin_es.ts | 10 +- .../Output/shout/translations/shout_plugin_fi.ts | 10 +- .../Output/shout/translations/shout_plugin_fr.ts | 10 +- .../shout/translations/shout_plugin_gl_ES.ts | 10 +- .../Output/shout/translations/shout_plugin_he.ts | 10 +- .../Output/shout/translations/shout_plugin_hu.ts | 10 +- .../Output/shout/translations/shout_plugin_id.ts | 10 +- .../Output/shout/translations/shout_plugin_it.ts | 10 +- .../Output/shout/translations/shout_plugin_ja.ts | 10 +- .../Output/shout/translations/shout_plugin_kk.ts | 10 +- .../Output/shout/translations/shout_plugin_lt.ts | 10 +- .../Output/shout/translations/shout_plugin_nl.ts | 10 +- .../shout/translations/shout_plugin_pl_PL.ts | 10 +- .../Output/shout/translations/shout_plugin_pt.ts | 10 +- .../shout/translations/shout_plugin_pt_BR.ts | 10 +- .../Output/shout/translations/shout_plugin_ru.ts | 10 +- .../Output/shout/translations/shout_plugin_sk.ts | 10 +- .../shout/translations/shout_plugin_sr_BA.ts | 10 +- .../shout/translations/shout_plugin_sr_RS.ts | 10 +- .../Output/shout/translations/shout_plugin_tr.ts | 10 +- .../shout/translations/shout_plugin_uk_UA.ts | 10 +- .../shout/translations/shout_plugin_zh_CN.ts | 10 +- .../shout/translations/shout_plugin_zh_TW.ts | 10 +- src/plugins/Output/wasapi/CMakeLists.txt | 18 +- src/plugins/Output/wasapi/outputwasapifactory.cpp | 3 - src/plugins/Output/wasapi/outputwasapifactory.h | 1 + .../Output/wasapi/translations/wasapi_plugin_bg.ts | 8 +- .../Output/wasapi/translations/wasapi_plugin_cs.ts | 8 +- .../Output/wasapi/translations/wasapi_plugin_de.ts | 8 +- .../Output/wasapi/translations/wasapi_plugin_el.ts | 8 +- .../Output/wasapi/translations/wasapi_plugin_en.ts | 8 +- .../Output/wasapi/translations/wasapi_plugin_es.ts | 8 +- .../Output/wasapi/translations/wasapi_plugin_fi.ts | 8 +- .../Output/wasapi/translations/wasapi_plugin_fr.ts | 8 +- .../wasapi/translations/wasapi_plugin_gl_ES.ts | 8 +- .../Output/wasapi/translations/wasapi_plugin_he.ts | 8 +- .../Output/wasapi/translations/wasapi_plugin_hu.ts | 8 +- .../Output/wasapi/translations/wasapi_plugin_id.ts | 8 +- .../Output/wasapi/translations/wasapi_plugin_it.ts | 8 +- .../Output/wasapi/translations/wasapi_plugin_ja.ts | 8 +- .../Output/wasapi/translations/wasapi_plugin_kk.ts | 8 +- .../Output/wasapi/translations/wasapi_plugin_lt.ts | 8 +- .../Output/wasapi/translations/wasapi_plugin_nl.ts | 8 +- .../wasapi/translations/wasapi_plugin_pl_PL.ts | 8 +- .../Output/wasapi/translations/wasapi_plugin_pt.ts | 8 +- .../wasapi/translations/wasapi_plugin_pt_BR.ts | 8 +- .../Output/wasapi/translations/wasapi_plugin_ru.ts | 8 +- .../Output/wasapi/translations/wasapi_plugin_sk.ts | 8 +- .../wasapi/translations/wasapi_plugin_sr_BA.ts | 8 +- .../wasapi/translations/wasapi_plugin_sr_RS.ts | 8 +- .../Output/wasapi/translations/wasapi_plugin_tr.ts | 8 +- .../wasapi/translations/wasapi_plugin_uk_UA.ts | 8 +- .../wasapi/translations/wasapi_plugin_zh_CN.ts | 8 +- .../wasapi/translations/wasapi_plugin_zh_TW.ts | 8 +- src/plugins/Output/waveout/CMakeLists.txt | 17 +- .../Output/waveout/outputwaveoutfactory.cpp | 6 +- src/plugins/Output/waveout/outputwaveoutfactory.h | 1 + .../waveout/translations/waveout_plugin_bg.ts | 10 +- .../waveout/translations/waveout_plugin_cs.ts | 10 +- .../waveout/translations/waveout_plugin_de.ts | 10 +- .../waveout/translations/waveout_plugin_el.ts | 10 +- .../waveout/translations/waveout_plugin_en.ts | 10 +- .../waveout/translations/waveout_plugin_es.ts | 10 +- .../waveout/translations/waveout_plugin_fi.ts | 10 +- .../waveout/translations/waveout_plugin_fr.ts | 10 +- .../waveout/translations/waveout_plugin_gl_ES.ts | 10 +- .../waveout/translations/waveout_plugin_he.ts | 10 +- .../waveout/translations/waveout_plugin_hu.ts | 10 +- .../waveout/translations/waveout_plugin_id.ts | 10 +- .../waveout/translations/waveout_plugin_it.ts | 10 +- .../waveout/translations/waveout_plugin_ja.ts | 10 +- .../waveout/translations/waveout_plugin_kk.ts | 10 +- .../waveout/translations/waveout_plugin_lt.ts | 10 +- .../waveout/translations/waveout_plugin_nl.ts | 10 +- .../waveout/translations/waveout_plugin_pl_PL.ts | 10 +- .../waveout/translations/waveout_plugin_pt.ts | 10 +- .../waveout/translations/waveout_plugin_pt_BR.ts | 10 +- .../waveout/translations/waveout_plugin_ru.ts | 10 +- .../waveout/translations/waveout_plugin_sk.ts | 10 +- .../waveout/translations/waveout_plugin_sr_BA.ts | 10 +- .../waveout/translations/waveout_plugin_sr_RS.ts | 10 +- .../waveout/translations/waveout_plugin_tr.ts | 10 +- .../waveout/translations/waveout_plugin_uk_UA.ts | 10 +- .../waveout/translations/waveout_plugin_zh_CN.ts | 10 +- .../waveout/translations/waveout_plugin_zh_TW.ts | 10 +- 348 files changed, 1499 insertions(+), 1677 deletions(-) (limited to 'src/plugins/Output') diff --git a/src/plugins/Output/CMakeLists.txt b/src/plugins/Output/CMakeLists.txt index 3793044e4..60c206692 100644 --- a/src/plugins/Output/CMakeLists.txt +++ b/src/plugins/Output/CMakeLists.txt @@ -42,9 +42,9 @@ IF(USE_DSOUND) add_subdirectory(directsound) ENDIF(USE_DSOUND) -IF(USE_QTMULTIMEDIA) +IF(USE_QTMULTIMEDIA AND Qt5Multimedia_FOUND) add_subdirectory(qtmultimedia) -ENDIF(USE_QTMULTIMEDIA) +ENDIF(USE_QTMULTIMEDIA AND Qt5Multimedia_FOUND) IF(USE_WASAPI) add_subdirectory(wasapi) diff --git a/src/plugins/Output/Output.pro b/src/plugins/Output/Output.pro index 3e9d8d3c0..1d745e442 100644 --- a/src/plugins/Output/Output.pro +++ b/src/plugins/Output/Output.pro @@ -35,7 +35,7 @@ contains(CONFIG, SHOUT_PLUGIN){ } #all platforms -contains(QT_CONFIG, multimedia){ +qtHaveModule(multimedia){ contains(CONFIG, QTMULTIMEDIA_PLUGIN){ SUBDIRS += qtmultimedia } diff --git a/src/plugins/Output/alsa/CMakeLists.txt b/src/plugins/Output/alsa/CMakeLists.txt index 761f5ca05..0076f9499 100644 --- a/src/plugins/Output/alsa/CMakeLists.txt +++ b/src/plugins/Output/alsa/CMakeLists.txt @@ -1,20 +1,7 @@ project(libalsa) -# qt plugin -ADD_DEFINITIONS( -Wall ) -ADD_DEFINITIONS(${QT_DEFINITIONS}) -ADD_DEFINITIONS(-DQT_PLUGIN) -ADD_DEFINITIONS(-DQT_NO_DEBUG) -ADD_DEFINITIONS(-DQT_SHARED) -ADD_DEFINITIONS(-DQT_THREAD) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - # libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) @@ -33,7 +20,7 @@ SET(libalsa_SRCS SET(libalsa_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libalsa_RCC_SRCS ${libalsa_RCCS}) +QT5_ADD_RESOURCES(libalsa_RCC_SRCS ${libalsa_RCCS}) # user interface @@ -41,7 +28,7 @@ SET(libalsa_UIS settingsdialog.ui ) -QT4_WRAP_UI(libalsa_UIS_H ${libalsa_UIS}) +QT5_WRAP_UI(libalsa_UIS_H ${libalsa_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -49,7 +36,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(ALSA_FOUND) ADD_LIBRARY(alsa MODULE ${libalsa_SRCS} ${libalsa_UIS_H} ${libalsa_RCC_SRCS}) add_dependencies(alsa qmmp) -target_link_libraries(alsa ${QT_LIBRARIES} libqmmp ${ALSA_LDFLAGS}) +target_link_libraries(alsa Qt5::Widgets -lqmmp ${ALSA_LDFLAGS}) install(TARGETS alsa DESTINATION ${LIB_DIR}/qmmp/Output) ENDIF(ALSA_FOUND) diff --git a/src/plugins/Output/alsa/outputalsafactory.cpp b/src/plugins/Output/alsa/outputalsafactory.cpp index 508ca6299..784139055 100644 --- a/src/plugins/Output/alsa/outputalsafactory.cpp +++ b/src/plugins/Output/alsa/outputalsafactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2016 by Ilya Kotov * + * Copyright (C) 2007-2015 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include #include -#include +#include #include #include "settingsdialog.h" #include "outputalsa.h" @@ -67,5 +66,3 @@ QTranslator *OutputALSAFactory::createTranslator(QObject *parent) translator->load(QString(":/alsa_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(alsa,OutputALSAFactory) diff --git a/src/plugins/Output/alsa/outputalsafactory.h b/src/plugins/Output/alsa/outputalsafactory.h index 464894650..86fecd91a 100644 --- a/src/plugins/Output/alsa/outputalsafactory.h +++ b/src/plugins/Output/alsa/outputalsafactory.h @@ -20,7 +20,6 @@ #ifndef OUTPUTALSAFACTORY_H #define OUTPUTALSAFACTORY_H - #include #include #include @@ -34,6 +33,7 @@ class OutputALSAFactory : public QObject, OutputFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_bg.ts b/src/plugins/Output/alsa/translations/alsa_plugin_bg.ts index 2d8346a4f..08dc58e98 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_bg.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_bg.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin - + About ALSA Output Plugin - + Qmmp ALSA Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_cs.ts b/src/plugins/Output/alsa/translations/alsa_plugin_cs.ts index 2c808f2c9..b2b85e06c 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_cs.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_cs.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin Modul ALSA - + About ALSA Output Plugin O modulu ALSA - + Qmmp ALSA Output Plugin Výstupní modul Qmmp ALSA - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_de.ts b/src/plugins/Output/alsa/translations/alsa_plugin_de.ts index a356109ae..0edcbe343 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_de.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_de.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin ALSA-Modul - + About ALSA Output Plugin Über ALSA-Ausgabemodul - + Qmmp ALSA Output Plugin Qmmp ALSA-Ausgabemodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_el.ts b/src/plugins/Output/alsa/translations/alsa_plugin_el.ts index 1bd86f47d..755238a4d 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_el.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_el.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin Πρόσθετο ALSA - + About ALSA Output Plugin Σχετικά με το πρόσθετο εξόδου ALSA - + Qmmp ALSA Output Plugin Πρόσθετο εξόδου ALSA Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_en.ts b/src/plugins/Output/alsa/translations/alsa_plugin_en.ts index db05cce98..0ca0909ea 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_en.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_en.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin - + About ALSA Output Plugin - + Qmmp ALSA Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_es.ts b/src/plugins/Output/alsa/translations/alsa_plugin_es.ts index 84717ef77..490b13303 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_es.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_es.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin Módulo ALSA - + About ALSA Output Plugin Acerca del módulo de salida ALSA - + Qmmp ALSA Output Plugin Módulo de salida ALSA para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_fi.ts b/src/plugins/Output/alsa/translations/alsa_plugin_fi.ts index c3acb6d1b..8f41ffb79 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_fi.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_fi.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin ALSA-liitännäinen - + About ALSA Output Plugin Tietoja - ALSA-ulostuloliitännäinen - + Qmmp ALSA Output Plugin Qmmp:n ALSA-ulostuloliitännäinen - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_fr.ts b/src/plugins/Output/alsa/translations/alsa_plugin_fr.ts index b1fbdadd3..ef4034b44 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_fr.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_fr.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin Greffon ALSA - + About ALSA Output Plugin À propos du greffon de sortie ALSA - + Qmmp ALSA Output Plugin Greffon de sortie ALSA pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_gl_ES.ts b/src/plugins/Output/alsa/translations/alsa_plugin_gl_ES.ts index b62c65ab3..b4dfacb06 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_gl_ES.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_gl_ES.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin Engadido ALSA - + About ALSA Output Plugin Sobre o engadido Alsa - + Qmmp ALSA Output Plugin Engadido ALSA de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_he.ts b/src/plugins/Output/alsa/translations/alsa_plugin_he.ts index 54e8bde24..1c5fda113 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_he.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_he.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin תוסף ALSA - + About ALSA Output Plugin אודות תוסף פלט ALSA - + Qmmp ALSA Output Plugin תוסף פלט ALSA של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_hu.ts b/src/plugins/Output/alsa/translations/alsa_plugin_hu.ts index 4fde217ce..043fa2f99 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_hu.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_hu.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin - + About ALSA Output Plugin - + Qmmp ALSA Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_id.ts b/src/plugins/Output/alsa/translations/alsa_plugin_id.ts index 6552c0efd..51e44fab0 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_id.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_id.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin Plugin ALSA - + About ALSA Output Plugin Tentang Plugin Keluaran ALSA - + Qmmp ALSA Output Plugin Plugin Keluaran ALSA Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_it.ts b/src/plugins/Output/alsa/translations/alsa_plugin_it.ts index 47baca1f0..fe6b8e25d 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_it.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_it.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin Modulo ALSA - + About ALSA Output Plugin Informazioni sul modulo d'uscita ALSA - + Qmmp ALSA Output Plugin Modulo d'uscita ALSA per Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_ja.ts b/src/plugins/Output/alsa/translations/alsa_plugin_ja.ts index e5a64c63c..7c07a0e5f 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_ja.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_ja.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin ALSA プラグイン - + About ALSA Output Plugin ALSA 出力プラグインについて - + Qmmp ALSA Output Plugin QMMP ALSA 出力プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_kk.ts b/src/plugins/Output/alsa/translations/alsa_plugin_kk.ts index 2a377f5a2..576058d0b 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_kk.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_kk.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin - + About ALSA Output Plugin - + Qmmp ALSA Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_lt.ts b/src/plugins/Output/alsa/translations/alsa_plugin_lt.ts index 4fa3aabfc..843db56bd 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_lt.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_lt.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin ALSA įskiepis - + About ALSA Output Plugin Apie ALSA įskiepį - + Qmmp ALSA Output Plugin Apie ALSA Qmmp įskiepį - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_nl.ts b/src/plugins/Output/alsa/translations/alsa_plugin_nl.ts index 8a1d0618f..f84553d87 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_nl.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_nl.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin ALSA Module - + About ALSA Output Plugin Over de ALSA Uitvoer Module - + Qmmp ALSA Output Plugin ALSA Uitvoer Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_pl_PL.ts b/src/plugins/Output/alsa/translations/alsa_plugin_pl_PL.ts index 242abfed8..3776f945f 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_pl_PL.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_pl_PL.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin Wtyczka ALSA - + About ALSA Output Plugin O wtyczce dźwiękowej ALSA - + Qmmp ALSA Output Plugin Wtyczka ALSA dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_pt.ts b/src/plugins/Output/alsa/translations/alsa_plugin_pt.ts index 41fa01a96..2e03ce9b4 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_pt.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_pt.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin Suplemento ALSA - + About ALSA Output Plugin Sobre o suplemento ALSA - + Qmmp ALSA Output Plugin Suplemento Qmmp ALSA - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_pt_BR.ts b/src/plugins/Output/alsa/translations/alsa_plugin_pt_BR.ts index ff5576244..8eba26bf7 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_pt_BR.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_pt_BR.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin Plugin ALSA - + About ALSA Output Plugin Sobre o puglin de saída ALSA - + Qmmp ALSA Output Plugin Plugin de saída Qmmp ALSA - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_ru.ts b/src/plugins/Output/alsa/translations/alsa_plugin_ru.ts index 6192c6d44..7c61d6626 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_ru.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_ru.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin Модуль ALSA - + About ALSA Output Plugin О модуле вывода ALSA - + Qmmp ALSA Output Plugin Модуль вывода ALSA для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_sk.ts b/src/plugins/Output/alsa/translations/alsa_plugin_sk.ts index 3608e0480..371f59def 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_sk.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_sk.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin - + About ALSA Output Plugin - + Qmmp ALSA Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_sr_BA.ts b/src/plugins/Output/alsa/translations/alsa_plugin_sr_BA.ts index 8a252f1e0..cc199a53a 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_sr_BA.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_sr_BA.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin Алса прикључак - + About ALSA Output Plugin О Алса прикључку излаза - + Qmmp ALSA Output Plugin Кумп Алса прикључак излаза - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_sr_RS.ts b/src/plugins/Output/alsa/translations/alsa_plugin_sr_RS.ts index d56049ecc..911812069 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_sr_RS.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_sr_RS.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin Алса прикључак - + About ALSA Output Plugin О Алса прикључку излаза - + Qmmp ALSA Output Plugin Кумп Алса прикључак излаза - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_tr.ts b/src/plugins/Output/alsa/translations/alsa_plugin_tr.ts index fa2d612f9..91d61af6a 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_tr.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_tr.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin ALSA Eklentisi - + About ALSA Output Plugin ALSA Çıktı Eklentisi Hakkında - + Qmmp ALSA Output Plugin Qmmp ALSA Çıktı Eklentisi - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_uk_UA.ts b/src/plugins/Output/alsa/translations/alsa_plugin_uk_UA.ts index 3262eeda7..657c8a0e4 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_uk_UA.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_uk_UA.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin Модуль ALSA - + About ALSA Output Plugin Про модуль виводу ALSA - + Qmmp ALSA Output Plugin Модуль виводу ALSA для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_zh_CN.ts b/src/plugins/Output/alsa/translations/alsa_plugin_zh_CN.ts index 86b0ad2c6..56925dd4b 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_zh_CN.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_zh_CN.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin ALSA 插件 - + About ALSA Output Plugin 关于 ALSA 输出插件 - + Qmmp ALSA Output Plugin Qmmp ALSA 输出插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_zh_TW.ts b/src/plugins/Output/alsa/translations/alsa_plugin_zh_TW.ts index 53502ab7d..36a77d6da 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_zh_TW.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_zh_TW.ts @@ -4,22 +4,22 @@ OutputALSAFactory - + ALSA Plugin ALSA 外掛 - + About ALSA Output Plugin 關於 ALSA 匯出插件 - + Qmmp ALSA Output Plugin Qmmp ALSA 匯出插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/CMakeLists.txt b/src/plugins/Output/directsound/CMakeLists.txt index 5de46e9eb..639393332 100644 --- a/src/plugins/Output/directsound/CMakeLists.txt +++ b/src/plugins/Output/directsound/CMakeLists.txt @@ -2,21 +2,8 @@ project(libdirectsound) INCLUDE(CheckIncludeFile) -# qt plugin -ADD_DEFINITIONS( -Wall ) -ADD_DEFINITIONS(${QT_DEFINITIONS}) -ADD_DEFINITIONS(-DQT_PLUGIN) -ADD_DEFINITIONS(-DQT_NO_DEBUG) -ADD_DEFINITIONS(-DQT_SHARED) -ADD_DEFINITIONS(-DQT_THREAD) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - # libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) @@ -35,13 +22,13 @@ SET(libdirectsound_HDRS SET(libdirectsound_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libdirectsound_RCC_SRCS ${libdirectsound_RCCS}) +QT5_ADD_RESOURCES(libdirectsound_RCC_SRCS ${libdirectsound_RCCS}) IF(DSOUND_H_FOUND) ADD_LIBRARY(directsound MODULE ${libdirectsound_SRCS} ${libdirectsound_RCC_SRCS} ${libdirectsound_HDRS}) add_dependencies(directsound qmmp) -target_link_libraries(directsound ${QT_LIBRARIES} libqmmp -ldxguid -lstrmiids -ldmoguids -lmsdmo -lole32 -loleaut32 -luuid -lgdi32 -ldsound) +target_link_libraries(directsound Qt5::Widgets -lqmmp -ldxguid -lstrmiids -ldmoguids -lmsdmo -lole32 -loleaut32 -luuid -lgdi32 -ldsound) install(TARGETS directsound DESTINATION ${LIB_DIR}/qmmp/Output) ENDIF(DSOUND_H_FOUND) diff --git a/src/plugins/Output/directsound/outputdirectsoundfactory.cpp b/src/plugins/Output/directsound/outputdirectsoundfactory.cpp index 1eaaa8025..99f294cc7 100644 --- a/src/plugins/Output/directsound/outputdirectsoundfactory.cpp +++ b/src/plugins/Output/directsound/outputdirectsoundfactory.cpp @@ -18,9 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include -#include -#include + #include "outputdirectsound.h" #include "outputdirectsoundfactory.h" @@ -64,4 +62,4 @@ QTranslator *OutputDirectSoundFactory::createTranslator(QObject *parent) return translator; } -Q_EXPORT_PLUGIN2(directsound,OutputDirectSoundFactory) + diff --git a/src/plugins/Output/directsound/outputdirectsoundfactory.h b/src/plugins/Output/directsound/outputdirectsoundfactory.h index 7cf47434c..4e34d191c 100644 --- a/src/plugins/Output/directsound/outputdirectsoundfactory.h +++ b/src/plugins/Output/directsound/outputdirectsoundfactory.h @@ -30,6 +30,7 @@ class OutputDirectSoundFactory : public QObject, OutputFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_bg.ts b/src/plugins/Output/directsound/translations/directsound_plugin_bg.ts index 4a1d3170a..7c76c02a7 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_bg.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_bg.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin - + About DirectSound Output Plugin - + Qmmp DirectSound Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_cs.ts b/src/plugins/Output/directsound/translations/directsound_plugin_cs.ts index 2b1c098d8..d3c94fea0 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_cs.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_cs.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin Modul DirectSound - + About DirectSound Output Plugin - + Qmmp DirectSound Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_de.ts b/src/plugins/Output/directsound/translations/directsound_plugin_de.ts index f79e11b83..e86fbc7d2 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_de.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_de.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin DirectSound-Modul - + About DirectSound Output Plugin Über DirectSound-Ausgabemodul - + Qmmp DirectSound Output Plugin Qmmp DirectSound-Ausgabemodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_el.ts b/src/plugins/Output/directsound/translations/directsound_plugin_el.ts index 8c6424f97..3d4e69fd3 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_el.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_el.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin Πρόσθετο DirectSound - + About DirectSound Output Plugin Σχετικά με το πρόσθετο DirectSound - + Qmmp DirectSound Output Plugin Qmmp πρόσθετο εξόδου DirectSound - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_en.ts b/src/plugins/Output/directsound/translations/directsound_plugin_en.ts index f54c72d93..7eccdd625 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_en.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_en.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin - + About DirectSound Output Plugin - + Qmmp DirectSound Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_es.ts b/src/plugins/Output/directsound/translations/directsound_plugin_es.ts index 4abaa3b1d..bc5607254 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_es.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_es.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin Módulo DirectSound - + About DirectSound Output Plugin Acerca del Plugin de Salida DirectSound - + Qmmp DirectSound Output Plugin Plugin de Salida DirectSound de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_fi.ts b/src/plugins/Output/directsound/translations/directsound_plugin_fi.ts index 1d968b39a..40770b4a6 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_fi.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_fi.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin DirectSound-liitännäinen - + About DirectSound Output Plugin Tietoja - DirectSound-ulostuloliitännäinen - + Qmmp DirectSound Output Plugin Qmmp:n DirectSound-ulostuloliitännäinen - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_fr.ts b/src/plugins/Output/directsound/translations/directsound_plugin_fr.ts index dddf39879..7095a5607 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_fr.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_fr.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin Greffon DirectSound - + About DirectSound Output Plugin À propos du greffon de sortie DirectSound - + Qmmp DirectSound Output Plugin Greffon de sortie DirectSound pour Qmm - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_gl_ES.ts b/src/plugins/Output/directsound/translations/directsound_plugin_gl_ES.ts index e92665ace..0cddfd65b 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_gl_ES.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_gl_ES.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin Engadido DirectSound - + About DirectSound Output Plugin Acerca do engadido de saida DirectSound - + Qmmp DirectSound Output Plugin Engadido de saida DirectSound Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_he.ts b/src/plugins/Output/directsound/translations/directsound_plugin_he.ts index 8a46064da..cf8722de3 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_he.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_he.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin תוסף DirectSound - + About DirectSound Output Plugin אודות תוסף פלט DirectSound - + Qmmp DirectSound Output Plugin אודות תוסף פלט DirectSound של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_hu.ts b/src/plugins/Output/directsound/translations/directsound_plugin_hu.ts index 9cead9997..c86f72f00 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_hu.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_hu.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin - + About DirectSound Output Plugin - + Qmmp DirectSound Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_id.ts b/src/plugins/Output/directsound/translations/directsound_plugin_id.ts index 85407c589..64b95362b 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_id.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_id.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin Plugin DirectSound - + About DirectSound Output Plugin Tentang Plugin Keluaran DirectSound - + Qmmp DirectSound Output Plugin Plugin Keluaran DirectSound Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_it.ts b/src/plugins/Output/directsound/translations/directsound_plugin_it.ts index 64abfe9a8..96569bdfb 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_it.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_it.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin - + About DirectSound Output Plugin - + Qmmp DirectSound Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_ja.ts b/src/plugins/Output/directsound/translations/directsound_plugin_ja.ts index 947dd32f7..8222a56e1 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_ja.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_ja.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin DirectSound プラグイン - + About DirectSound Output Plugin DirectSound 出力プラグインについて - + Qmmp DirectSound Output Plugin QMMP DirectSound 出力プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_kk.ts b/src/plugins/Output/directsound/translations/directsound_plugin_kk.ts index 6352bbd4d..db983d408 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_kk.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_kk.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin - + About DirectSound Output Plugin - + Qmmp DirectSound Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_lt.ts b/src/plugins/Output/directsound/translations/directsound_plugin_lt.ts index c3be847e1..ed2ac0f4a 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_lt.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_lt.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin DirectSound Įskiepis - + About DirectSound Output Plugin Apie DirectSound išvesties įskiepį - + Qmmp DirectSound Output Plugin Qmmp DirectSound Išvesties Įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_nl.ts b/src/plugins/Output/directsound/translations/directsound_plugin_nl.ts index 1246b90af..01f99ed2c 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_nl.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_nl.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin - + About DirectSound Output Plugin - + Qmmp DirectSound Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_pl_PL.ts b/src/plugins/Output/directsound/translations/directsound_plugin_pl_PL.ts index cff37d745..26d837d45 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_pl_PL.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_pl_PL.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin Wtyczka DirectSound - + About DirectSound Output Plugin O wtyczce DirectSound - + Qmmp DirectSound Output Plugin Wtyczka DirectSound dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_pt.ts b/src/plugins/Output/directsound/translations/directsound_plugin_pt.ts index d9ec4d0e1..10b6e61e1 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_pt.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_pt.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin Suplemento DirectSound - + About DirectSound Output Plugin Sobre o suplemento DirectSound - + Qmmp DirectSound Output Plugin Suplemento Qmmp DirectSound - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_pt_BR.ts b/src/plugins/Output/directsound/translations/directsound_plugin_pt_BR.ts index 65a4ab16d..25fa873d6 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_pt_BR.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_pt_BR.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin Plugin DirectSound - + About DirectSound Output Plugin Sobre o plugin DirectSound - + Qmmp DirectSound Output Plugin Plugin Qmmp DirectSound - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_ru.ts b/src/plugins/Output/directsound/translations/directsound_plugin_ru.ts index 6b5f0d59c..7f3dc3445 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_ru.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_ru.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin Модуль DirectSound - + About DirectSound Output Plugin О модуле вывода DirectSound - + Qmmp DirectSound Output Plugin Модуль вывода DirectSound для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_sk.ts b/src/plugins/Output/directsound/translations/directsound_plugin_sk.ts index b8ecc67ba..b6f97118b 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_sk.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_sk.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin - + About DirectSound Output Plugin - + Qmmp DirectSound Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_sr_BA.ts b/src/plugins/Output/directsound/translations/directsound_plugin_sr_BA.ts index 3a69729ae..ef0fdc084 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_sr_BA.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_sr_BA.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin ДиректСаунд прикључак - + About DirectSound Output Plugin О ДиректСаунд прикључку излаза - + Qmmp DirectSound Output Plugin Кумп ДиректСаунд прикључак излаза - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_sr_RS.ts b/src/plugins/Output/directsound/translations/directsound_plugin_sr_RS.ts index 58dff934f..355fe7d03 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_sr_RS.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_sr_RS.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin ДиректСаунд прикључак - + About DirectSound Output Plugin О ДиректСаунд прикључку излаза - + Qmmp DirectSound Output Plugin Кумп ДиректСаунд прикључак излаза - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_tr.ts b/src/plugins/Output/directsound/translations/directsound_plugin_tr.ts index 5cdf3aac4..d2609bec8 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_tr.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_tr.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin - + About DirectSound Output Plugin - + Qmmp DirectSound Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_uk_UA.ts b/src/plugins/Output/directsound/translations/directsound_plugin_uk_UA.ts index bd4e49ffa..965d47e32 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_uk_UA.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_uk_UA.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin Модуль DirectSound - + About DirectSound Output Plugin Про модуль виводу DirectSound - + Qmmp DirectSound Output Plugin Модуль виводу DirectSound для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_zh_CN.ts b/src/plugins/Output/directsound/translations/directsound_plugin_zh_CN.ts index c257e361f..9ae1618e7 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_zh_CN.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_zh_CN.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin DirectSound插件 - + About DirectSound Output Plugin 关于DirectSound输出插件 - + Qmmp DirectSound Output Plugin Qmmp DirectSound输出插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/directsound/translations/directsound_plugin_zh_TW.ts b/src/plugins/Output/directsound/translations/directsound_plugin_zh_TW.ts index 60cf7a6a9..b59da2c66 100644 --- a/src/plugins/Output/directsound/translations/directsound_plugin_zh_TW.ts +++ b/src/plugins/Output/directsound/translations/directsound_plugin_zh_TW.ts @@ -4,22 +4,22 @@ OutputDirectSoundFactory - + DirectSound Plugin - + About DirectSound Output Plugin - + Qmmp DirectSound Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/jack/CMakeLists.txt b/src/plugins/Output/jack/CMakeLists.txt index 9bcdf310d..94927e638 100644 --- a/src/plugins/Output/jack/CMakeLists.txt +++ b/src/plugins/Output/jack/CMakeLists.txt @@ -2,53 +2,24 @@ project(libjack) INCLUDE (CheckCXXSourceCompiles) -# qt plugin -ADD_DEFINITIONS( -Wall ) -ADD_DEFINITIONS(${QT_DEFINITIONS}) -ADD_DEFINITIONS(-DQT_PLUGIN) -ADD_DEFINITIONS(-DQT_NO_DEBUG) -ADD_DEFINITIONS(-DQT_SHARED) -ADD_DEFINITIONS(-DQT_THREAD) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - # libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) # libjack and libsoxr -pkg_check_modules(JACK jack soxr) +pkg_check_modules(JACK jack>=1.9.8 soxr) + +IF(NOT JACK_FOUND) +pkg_check_modules(JACK jack>=0.122.0 soxr) +ENDIF(NOT JACK_FOUND) include_directories(${JACK_INCLUDE_DIRS}) link_directories(${JACK_LIBRARY_DIRS}) ADD_DEFINITIONS(${JACK_CFLAGS}) -IF(JACK_FOUND) -CHECK_CXX_SOURCE_COMPILES(" -#include -#include -#include -#include - -int main (int argc, char **argv) -{ - jack_latency_range_t range; - exit(0); -}" JACK_NEW_API) - -ENDIF(JACK_FOUND) - -IF(JACK_NEW_API) -ADD_DEFINITIONS(-DJACK_NEW_API) -ENDIF(JACK_NEW_API) - - SET(libjack_SRCS outputjackfactory.cpp outputjack.cpp @@ -62,7 +33,7 @@ SET(libjack_HDRS SET(libjack_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libjack_RCC_SRCS ${libjack_RCCS}) +QT5_ADD_RESOURCES(libjack_RCC_SRCS ${libjack_RCCS}) IF(JACK_FOUND) @@ -72,7 +43,7 @@ set_target_properties(jack PROPERTIES COMPILE_FLAGS -pthread LINK_FLAGS -pthread ) -target_link_libraries(jack ${QT_LIBRARIES} libqmmp ${JACK_LDFLAGS}) +target_link_libraries(jack Qt5::Widgets -lqmmp ${JACK_LDFLAGS}) install(TARGETS jack DESTINATION ${LIB_DIR}/qmmp/Output) ENDIF(JACK_FOUND) diff --git a/src/plugins/Output/jack/bio2jack.c b/src/plugins/Output/jack/bio2jack.c index a4b47d84a..4f88d0267 100644 --- a/src/plugins/Output/jack/bio2jack.c +++ b/src/plugins/Output/jack/bio2jack.c @@ -1662,13 +1662,9 @@ JACK_OpenEx(int *deviceID, unsigned int bits_per_channel, /* FIXME: maybe we should keep different latency values for input vs output? */ if(drv->num_output_channels > 0) { -#ifdef JACK_NEW_API jack_latency_range_t range; jack_port_get_latency_range(drv->output_port[0], JackPlaybackLatency, &range); periods = range.max / periodSize; -#else - periods = jack_port_get_total_latency(drv->client, drv->output_port[0]) / periodSize; -#endif drv->latencyMS = periodSize * periods * 1000 / (drv->jack_sample_rate * (drv->bits_per_channel / 8 * @@ -1676,13 +1672,10 @@ JACK_OpenEx(int *deviceID, unsigned int bits_per_channel, } else if(drv->num_input_channels > 0) { -#ifdef JACK_NEW_API jack_latency_range_t range; jack_port_get_latency_range(drv->output_port[0], JackPlaybackLatency, &range); periods = range.max / periodSize; -#else - periods = jack_port_get_total_latency(drv->client, drv->output_port[0]) / periodSize; -#endif + drv->latencyMS = periodSize * periods * 1000 / (drv->jack_sample_rate * (drv->bits_per_channel / 8 * @@ -2576,13 +2569,9 @@ JACK_GetJackOutputLatency(int deviceID) if(drv->client && drv->num_input_channels) { -#ifdef JACK_NEW_API jack_latency_range_t range; jack_port_get_latency_range(drv->output_port[0], JackCaptureLatency, &range); return_val = range.max; -#else - return_val = jack_port_get_total_latency(drv->client, drv->output_port[0]); -#endif } TRACE("got latency of %ld frames\n", return_val); @@ -2600,14 +2589,9 @@ JACK_GetJackInputLatency(int deviceID) if(drv->client && drv->num_input_channels) { -#ifdef JACK_NEW_API jack_latency_range_t range; jack_port_get_latency_range(drv->output_port[0], JackPlaybackLatency, &range); return_val = range.max; -#else - return_val = jack_port_get_total_latency(drv->client, drv->output_port[0]); -#endif - } TRACE("got latency of %ld frames\n", return_val); diff --git a/src/plugins/Output/jack/jack.pro b/src/plugins/Output/jack/jack.pro index 235b052b7..b5f5369e8 100644 --- a/src/plugins/Output/jack/jack.pro +++ b/src/plugins/Output/jack/jack.pro @@ -12,10 +12,6 @@ SOURCES += outputjackfactory.cpp \ RESOURCES = translations/translations.qrc -contains(CONFIG, WITH_NEW_JACK){ - DEFINES += JACK_NEW_API -} - PKGCONFIG += jack soxr target.path = $$LIB_DIR/qmmp/Output diff --git a/src/plugins/Output/jack/outputjackfactory.cpp b/src/plugins/Output/jack/outputjackfactory.cpp index e4d1b53b2..2f9e1c68f 100644 --- a/src/plugins/Output/jack/outputjackfactory.cpp +++ b/src/plugins/Output/jack/outputjackfactory.cpp @@ -18,10 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include #include -#include -#include +#include #include #include "outputjack.h" #include "outputjackfactory.h" @@ -65,5 +63,3 @@ QTranslator *OutputJACKFactory::createTranslator(QObject *parent) translator->load(QString(":/jack_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(jack,OutputJACKFactory) diff --git a/src/plugins/Output/jack/outputjackfactory.h b/src/plugins/Output/jack/outputjackfactory.h index 912bb90a2..3edc54ba2 100644 --- a/src/plugins/Output/jack/outputjackfactory.h +++ b/src/plugins/Output/jack/outputjackfactory.h @@ -33,6 +33,7 @@ class OutputJACKFactory : public QObject, OutputFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: diff --git a/src/plugins/Output/jack/translations/jack_plugin_bg.ts b/src/plugins/Output/jack/translations/jack_plugin_bg.ts index 8651da81c..41f03ae9c 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_bg.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_bg.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin - + About Jack Output Plugin - + Qmmp Jack Output Plugin - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_cs.ts b/src/plugins/Output/jack/translations/jack_plugin_cs.ts index 67b175866..ac3548443 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_cs.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_cs.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin Modul JACK - + About Jack Output Plugin O modulu JACK - + Qmmp Jack Output Plugin Výstupní modul Qmmp JACK - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Autor: Jurij Žuravljov <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_de.ts b/src/plugins/Output/jack/translations/jack_plugin_de.ts index 5b06ad8ca..1f8feefff 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_de.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_de.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin JACK-Modul - + About Jack Output Plugin Über JACK-Ausgabemodul - + Qmmp Jack Output Plugin Qmmp JACK-Ausgabemodul - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Geschrieben von: Yuriy Zhuravlev <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_el.ts b/src/plugins/Output/jack/translations/jack_plugin_el.ts index b342115d3..8a870d1c9 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_el.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_el.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin Πρόσθετο JACK - + About Jack Output Plugin Σχετικά με το πρόσθετο εξόδου Jack - + Qmmp Jack Output Plugin Qmmp πρόσθετο εξόδου Jack - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Γράφτηκε από τον: Yuriy Zhuravlev <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_en.ts b/src/plugins/Output/jack/translations/jack_plugin_en.ts index 95b01c025..1a05c42c7 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_en.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_en.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin - + About Jack Output Plugin - + Qmmp Jack Output Plugin - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_es.ts b/src/plugins/Output/jack/translations/jack_plugin_es.ts index c77d0667e..f524b41aa 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_es.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_es.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin Módulo JACK - + About Jack Output Plugin Acerca del módulo de salida Jack - + Qmmp Jack Output Plugin Módulo de salida Jack para Qmmp - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Escrito por: Yuriy Zhuravlev <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_fi.ts b/src/plugins/Output/jack/translations/jack_plugin_fi.ts index aebfc0902..d9b2b7253 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_fi.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_fi.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin JACK-liitännäinen - + About Jack Output Plugin Tietoja - JACK-ulostuloliitännäinen - + Qmmp Jack Output Plugin Qmmp:n JACK-ulostuloliitännäinen - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Toteutus: Yuriy Zhuravlev <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_fr.ts b/src/plugins/Output/jack/translations/jack_plugin_fr.ts index 4edcd2ca6..847915d86 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_fr.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_fr.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin Greffon JACK - + About Jack Output Plugin À propos du greffon de sortie JACK - + Qmmp Jack Output Plugin Greffon de sortie JACK pour Qmmp - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Écrit par : Yuriy Zhuravlev <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_gl_ES.ts b/src/plugins/Output/jack/translations/jack_plugin_gl_ES.ts index f6449fc1e..9458f65ce 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_gl_ES.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_gl_ES.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin Engadido JACK - + About Jack Output Plugin Sobre o engadido Jack - + Qmmp Jack Output Plugin Engadido Jack de Qmmp - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Escrito por: Yuriy Zhuravlev <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_he.ts b/src/plugins/Output/jack/translations/jack_plugin_he.ts index 1b6daf8c9..c8b7e30bf 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_he.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_he.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin תוסף JACK - + About Jack Output Plugin אודות תוסף פלט Jack - + Qmmp Jack Output Plugin תוסף פלט Jack של Qmmp - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> חובר על ידי: Yuriy Zhuravlev <slalkerg@gmail.com>‎ diff --git a/src/plugins/Output/jack/translations/jack_plugin_hu.ts b/src/plugins/Output/jack/translations/jack_plugin_hu.ts index 49a37f35f..f4aac4511 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_hu.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_hu.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin - + About Jack Output Plugin - + Qmmp Jack Output Plugin - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_id.ts b/src/plugins/Output/jack/translations/jack_plugin_id.ts index c2b3f6af3..fdf844963 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_id.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_id.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin Plugin JACK - + About Jack Output Plugin Tentang Plugin Keluaran Jack - + Qmmp Jack Output Plugin Plugin Keluaran Jack Qmmp - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Ditulis oleh: Yuriy Zhuravlev <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_it.ts b/src/plugins/Output/jack/translations/jack_plugin_it.ts index 68a054920..fdca1dfb8 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_it.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_it.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin Modulo JACK - + About Jack Output Plugin Informazioni sul modulo JACK in nuscita - + Qmmp Jack Output Plugin Modulo JACK d'uscita Qmmp - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Autore: Yuriy Zhuravlev <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_ja.ts b/src/plugins/Output/jack/translations/jack_plugin_ja.ts index ab1a0cb6f..f90bc458a 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_ja.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_ja.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin JACK プラグイン - + About Jack Output Plugin JACK 出力プラグインについて - + Qmmp Jack Output Plugin QMMP JACK 出力プラグイン - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> 制作: Юрий Журавлёв (Yuriy Zhuravlev) <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_kk.ts b/src/plugins/Output/jack/translations/jack_plugin_kk.ts index 637b23576..2fa179b38 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_kk.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_kk.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin - + About Jack Output Plugin - + Qmmp Jack Output Plugin - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_lt.ts b/src/plugins/Output/jack/translations/jack_plugin_lt.ts index 95013dcae..ae4ab9e7b 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_lt.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_lt.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin JACK Įskiepis - + About Jack Output Plugin Apie JACK išvesties įskiepį - + Qmmp Jack Output Plugin Qmmp Jack išvesties įskiepis - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Sukūrė: Yuriy Zhuravlev <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_nl.ts b/src/plugins/Output/jack/translations/jack_plugin_nl.ts index b8d674708..0e5031dab 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_nl.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_nl.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin JACK Module - + About Jack Output Plugin Over de Jack Output Module - + Qmmp Jack Output Plugin JACK Output Module voor Qmmp - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Auteur: Yuriy Žuravljov <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_pl_PL.ts b/src/plugins/Output/jack/translations/jack_plugin_pl_PL.ts index 37d8d03b9..f5d5ba934 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_pl_PL.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_pl_PL.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin Wtyczka JACK - + About Jack Output Plugin O wtyczce dźwiękowej Jack - + Qmmp Jack Output Plugin Wtyczka Jack dla Qmmp - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Autor: Jurij Žuravljov <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_pt.ts b/src/plugins/Output/jack/translations/jack_plugin_pt.ts index e97888d91..a3639533f 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_pt.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_pt.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin Suplemento JACK - + About Jack Output Plugin Sobre o suplemento Jack Output - + Qmmp Jack Output Plugin Suplemento Qmmp Jack Output - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Desenvolvido por: Yuriy Zhuravlev <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_pt_BR.ts b/src/plugins/Output/jack/translations/jack_plugin_pt_BR.ts index 21649422a..23e653a7d 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_pt_BR.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_pt_BR.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin Plugin JACK - + About Jack Output Plugin Sobre o plugin Jack Output - + Qmmp Jack Output Plugin Plugin Qmmp Jack Output - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Desenvolvido por: Yuriy Zhuravlev <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_ru.ts b/src/plugins/Output/jack/translations/jack_plugin_ru.ts index e264ca531..ec549a989 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_ru.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_ru.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin Модуль JACK - + About Jack Output Plugin О модуле вывода Jack - + Qmmp Jack Output Plugin Модуль вывода Jack для Qmmp - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Разработчик: Юрий Журавлёв <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_sk.ts b/src/plugins/Output/jack/translations/jack_plugin_sk.ts index bc4817f2b..33e8d0d9d 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_sk.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_sk.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin - + About Jack Output Plugin - + Qmmp Jack Output Plugin - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_sr_BA.ts b/src/plugins/Output/jack/translations/jack_plugin_sr_BA.ts index 65ca891e1..4befd7858 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_sr_BA.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_sr_BA.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin Џек прикључак - + About Jack Output Plugin О Џек прикључку излаза - + Qmmp Jack Output Plugin Кумп Џек прикључак излаза - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Аутор: Yuriy Zhuravlev <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_sr_RS.ts b/src/plugins/Output/jack/translations/jack_plugin_sr_RS.ts index 398f1bd1d..873cd220b 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_sr_RS.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_sr_RS.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin Џек прикључак - + About Jack Output Plugin О Џек прикључку излаза - + Qmmp Jack Output Plugin Кумп Џек прикључак излаза - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Аутор: Yuriy Zhuravlev <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_tr.ts b/src/plugins/Output/jack/translations/jack_plugin_tr.ts index 6e2fff8c6..dd748db98 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_tr.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_tr.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin JACK Eklentisi - + About Jack Output Plugin Jack Çıkışı Eklentisi Hakkında - + Qmmp Jack Output Plugin Qmmp Jack Çıkışı Eklentisi - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Yazan: Yuriy Zhuravlev <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_uk_UA.ts b/src/plugins/Output/jack/translations/jack_plugin_uk_UA.ts index 6f99aca9a..0c03d073a 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_uk_UA.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_uk_UA.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin Модуль JACK - + About Jack Output Plugin Про модуль виводу Jack - + Qmmp Jack Output Plugin Модуль виводу Jack для Qmmp - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Розробник: Юрій Журавльов <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_zh_CN.ts b/src/plugins/Output/jack/translations/jack_plugin_zh_CN.ts index 4f3837299..06892c03f 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_zh_CN.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_zh_CN.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin JACK 插件 - + About Jack Output Plugin 关于 Jack 输出插件 - + Qmmp Jack Output Plugin Qmmp Jack 输出插件 - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> 作者：Yuriy Zhuravlev <slalkerg@gmail.com> diff --git a/src/plugins/Output/jack/translations/jack_plugin_zh_TW.ts b/src/plugins/Output/jack/translations/jack_plugin_zh_TW.ts index 07aa55088..6a73d3ef4 100644 --- a/src/plugins/Output/jack/translations/jack_plugin_zh_TW.ts +++ b/src/plugins/Output/jack/translations/jack_plugin_zh_TW.ts @@ -4,22 +4,22 @@ OutputJACKFactory - + JACK Plugin JACK 外掛 - + About Jack Output Plugin 關於 Jack 匯出插件 - + Qmmp Jack Output Plugin Qmmp Jack 匯出插件 - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> 作者：Yuriy Zhuravlev <slalkerg@gmail.com> diff --git a/src/plugins/Output/null/CMakeLists.txt b/src/plugins/Output/null/CMakeLists.txt index ec4a48e31..85cb8f2ca 100644 --- a/src/plugins/Output/null/CMakeLists.txt +++ b/src/plugins/Output/null/CMakeLists.txt @@ -1,20 +1,7 @@ project(libnull) -# qt plugin -ADD_DEFINITIONS( -Wall ) -ADD_DEFINITIONS(${QT_DEFINITIONS}) -ADD_DEFINITIONS(-DQT_PLUGIN) -ADD_DEFINITIONS(-DQT_NO_DEBUG) -ADD_DEFINITIONS(-DQT_SHARED) -ADD_DEFINITIONS(-DQT_THREAD) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - # libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) @@ -30,7 +17,7 @@ SET(libnull_HDRS SET(libnull_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libnull_RCC_SRCS ${libnull_RCCS}) +QT5_ADD_RESOURCES(libnull_RCC_SRCS ${libnull_RCCS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! @@ -39,5 +26,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(null MODULE ${libnull_SRCS} ${libnull_UIS_H} ${libnull_RCC_SRCS} ${libnull_HDRS}) add_dependencies(null qmmp) -target_link_libraries(null ${QT_LIBRARIES} libqmmp) +target_link_libraries(null Qt5::Widgets -lqmmp) install(TARGETS null DESTINATION ${LIB_DIR}/qmmp/Output) diff --git a/src/plugins/Output/null/outputnullfactory.cpp b/src/plugins/Output/null/outputnullfactory.cpp index a4ff961c7..2a7249165 100644 --- a/src/plugins/Output/null/outputnullfactory.cpp +++ b/src/plugins/Output/null/outputnullfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2016 by Ilya Kotov * + * Copyright (C) 2010-2015 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include #include -#include +#include #include #include "outputnull.h" #include "outputnullfactory.h" @@ -65,5 +64,3 @@ QTranslator *OutputNullFactory::createTranslator(QObject *parent) translator->load(QString(":/null_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(null, OutputNullFactory) diff --git a/src/plugins/Output/null/outputnullfactory.h b/src/plugins/Output/null/outputnullfactory.h index 4142ee7e9..645d37815 100644 --- a/src/plugins/Output/null/outputnullfactory.h +++ b/src/plugins/Output/null/outputnullfactory.h @@ -33,6 +33,7 @@ class OutputNullFactory : public QObject, OutputFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: diff --git a/src/plugins/Output/null/translations/null_plugin_bg.ts b/src/plugins/Output/null/translations/null_plugin_bg.ts index d3ec3e805..2f36d88ad 100644 --- a/src/plugins/Output/null/translations/null_plugin_bg.ts +++ b/src/plugins/Output/null/translations/null_plugin_bg.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin - + About Null Output Plugin - + Qmmp Null Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_cs.ts b/src/plugins/Output/null/translations/null_plugin_cs.ts index 9dc9c1eef..f725e004e 100644 --- a/src/plugins/Output/null/translations/null_plugin_cs.ts +++ b/src/plugins/Output/null/translations/null_plugin_cs.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin Nulový modul - + About Null Output Plugin O modulu pro nulový výstup - + Qmmp Null Output Plugin Modul Qmmp pro nulový výstup - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_de.ts b/src/plugins/Output/null/translations/null_plugin_de.ts index c1e42a166..2cad52126 100644 --- a/src/plugins/Output/null/translations/null_plugin_de.ts +++ b/src/plugins/Output/null/translations/null_plugin_de.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin Null-Modul - + About Null Output Plugin Über Null-Ausgabemodul - + Qmmp Null Output Plugin Qmmp Null-Ausgabemodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_el.ts b/src/plugins/Output/null/translations/null_plugin_el.ts index 82416fcb2..e3df4f590 100644 --- a/src/plugins/Output/null/translations/null_plugin_el.ts +++ b/src/plugins/Output/null/translations/null_plugin_el.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin Πρόσθετο Null - + About Null Output Plugin Σχετικά με το πρόσθετο Null - + Qmmp Null Output Plugin Qmmp σχετικά με το πρόσθετο Null - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_en.ts b/src/plugins/Output/null/translations/null_plugin_en.ts index 876d530af..0f6577ef7 100644 --- a/src/plugins/Output/null/translations/null_plugin_en.ts +++ b/src/plugins/Output/null/translations/null_plugin_en.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin - + About Null Output Plugin - + Qmmp Null Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_es.ts b/src/plugins/Output/null/translations/null_plugin_es.ts index 912798a9f..5cd13e61e 100644 --- a/src/plugins/Output/null/translations/null_plugin_es.ts +++ b/src/plugins/Output/null/translations/null_plugin_es.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin Módulo de salida nula - + About Null Output Plugin Acerca del módulo de salida nula - + Qmmp Null Output Plugin Módulo de salida nula para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_fi.ts b/src/plugins/Output/null/translations/null_plugin_fi.ts index a93e06ac0..f10d40b56 100644 --- a/src/plugins/Output/null/translations/null_plugin_fi.ts +++ b/src/plugins/Output/null/translations/null_plugin_fi.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin Null-liitännäinen - + About Null Output Plugin Tietoja - Null-ulostulosliitännäinen - + Qmmp Null Output Plugin Qmmp:n Null-ulostuloliitännäinen - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_fr.ts b/src/plugins/Output/null/translations/null_plugin_fr.ts index c106286ad..a381ba20e 100644 --- a/src/plugins/Output/null/translations/null_plugin_fr.ts +++ b/src/plugins/Output/null/translations/null_plugin_fr.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin Greffon Null - + About Null Output Plugin À propos du greffon de sortie Null - + Qmmp Null Output Plugin Greffon de sortie Null pour Qmm - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_gl_ES.ts b/src/plugins/Output/null/translations/null_plugin_gl_ES.ts index fdb1c314a..44290d04a 100644 --- a/src/plugins/Output/null/translations/null_plugin_gl_ES.ts +++ b/src/plugins/Output/null/translations/null_plugin_gl_ES.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin Engadido Null - + About Null Output Plugin Sobre o engadido Null - + Qmmp Null Output Plugin Engadido Null de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_he.ts b/src/plugins/Output/null/translations/null_plugin_he.ts index 26342af29..1b329d31a 100644 --- a/src/plugins/Output/null/translations/null_plugin_he.ts +++ b/src/plugins/Output/null/translations/null_plugin_he.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin תוסף אפסי - + About Null Output Plugin אודות תוסף אפסי - + Qmmp Null Output Plugin תוסף אפסי של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_hu.ts b/src/plugins/Output/null/translations/null_plugin_hu.ts index 95b4cda4e..212c1055e 100644 --- a/src/plugins/Output/null/translations/null_plugin_hu.ts +++ b/src/plugins/Output/null/translations/null_plugin_hu.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin - + About Null Output Plugin - + Qmmp Null Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_id.ts b/src/plugins/Output/null/translations/null_plugin_id.ts index c087079b0..266e54386 100644 --- a/src/plugins/Output/null/translations/null_plugin_id.ts +++ b/src/plugins/Output/null/translations/null_plugin_id.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin Plugin Null - + About Null Output Plugin Tentang Plugin Keluaran Null - + Qmmp Null Output Plugin Plugin Keluaran Null Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_it.ts b/src/plugins/Output/null/translations/null_plugin_it.ts index 86d331eb2..a47362dc5 100644 --- a/src/plugins/Output/null/translations/null_plugin_it.ts +++ b/src/plugins/Output/null/translations/null_plugin_it.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin Modulo di uscita nullo - + About Null Output Plugin Informazioni sul modulo di uscita nullo - + Qmmp Null Output Plugin Modulo di uscita nullo per Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_ja.ts b/src/plugins/Output/null/translations/null_plugin_ja.ts index ff3196b7b..cd7a37542 100644 --- a/src/plugins/Output/null/translations/null_plugin_ja.ts +++ b/src/plugins/Output/null/translations/null_plugin_ja.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin NULL プラグイン - + About Null Output Plugin NULL 出力プラグインについて - + Qmmp Null Output Plugin QMMP NULL 出力プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_kk.ts b/src/plugins/Output/null/translations/null_plugin_kk.ts index 33bafef69..42b842cb0 100644 --- a/src/plugins/Output/null/translations/null_plugin_kk.ts +++ b/src/plugins/Output/null/translations/null_plugin_kk.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin - + About Null Output Plugin - + Qmmp Null Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_lt.ts b/src/plugins/Output/null/translations/null_plugin_lt.ts index 8bbf20ec9..4085c97e7 100644 --- a/src/plugins/Output/null/translations/null_plugin_lt.ts +++ b/src/plugins/Output/null/translations/null_plugin_lt.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin Null Įskiepis - + About Null Output Plugin Apie Null išvesties įskiepį - + Qmmp Null Output Plugin Qmmp Null išvesties įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_nl.ts b/src/plugins/Output/null/translations/null_plugin_nl.ts index a422d6c7f..1904e702c 100644 --- a/src/plugins/Output/null/translations/null_plugin_nl.ts +++ b/src/plugins/Output/null/translations/null_plugin_nl.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin Null Module - + About Null Output Plugin Over de Null Output Module - + Qmmp Null Output Plugin Null Output Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_pl_PL.ts b/src/plugins/Output/null/translations/null_plugin_pl_PL.ts index 8102584e0..9a247aa5d 100644 --- a/src/plugins/Output/null/translations/null_plugin_pl_PL.ts +++ b/src/plugins/Output/null/translations/null_plugin_pl_PL.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin Wtyczka Null - + About Null Output Plugin O wtyczce wyjściowej Null - + Qmmp Null Output Plugin Wtyczka wyjściowa Null dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_pt.ts b/src/plugins/Output/null/translations/null_plugin_pt.ts index d28b5ca9d..7dfc249ad 100644 --- a/src/plugins/Output/null/translations/null_plugin_pt.ts +++ b/src/plugins/Output/null/translations/null_plugin_pt.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin Suplemento Null - + About Null Output Plugin Sobre o suplemento Null Output - + Qmmp Null Output Plugin Suplemento Qmmp Null Output - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_pt_BR.ts b/src/plugins/Output/null/translations/null_plugin_pt_BR.ts index 1b93a354b..d243b664b 100644 --- a/src/plugins/Output/null/translations/null_plugin_pt_BR.ts +++ b/src/plugins/Output/null/translations/null_plugin_pt_BR.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin Plugin Null - + About Null Output Plugin Sobre o plugin Null Output - + Qmmp Null Output Plugin Plugin Qmmp Null Output - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_ru.ts b/src/plugins/Output/null/translations/null_plugin_ru.ts index 1cc18a0aa..d51abddfd 100644 --- a/src/plugins/Output/null/translations/null_plugin_ru.ts +++ b/src/plugins/Output/null/translations/null_plugin_ru.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin Модуль нулевого вывода - + About Null Output Plugin О модуле нулевого вывода - + Qmmp Null Output Plugin Модуль нулевого вывода для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_sk.ts b/src/plugins/Output/null/translations/null_plugin_sk.ts index d2bfff437..6c3bf4d8a 100644 --- a/src/plugins/Output/null/translations/null_plugin_sk.ts +++ b/src/plugins/Output/null/translations/null_plugin_sk.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin - + About Null Output Plugin - + Qmmp Null Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_sr_BA.ts b/src/plugins/Output/null/translations/null_plugin_sr_BA.ts index 0581c050b..b1bf2ff08 100644 --- a/src/plugins/Output/null/translations/null_plugin_sr_BA.ts +++ b/src/plugins/Output/null/translations/null_plugin_sr_BA.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin Нул прикључак - + About Null Output Plugin О Нул прикључку излаза - + Qmmp Null Output Plugin Кумп Нул прикључак излаза - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_sr_RS.ts b/src/plugins/Output/null/translations/null_plugin_sr_RS.ts index 1a34fc0b8..7fde253b8 100644 --- a/src/plugins/Output/null/translations/null_plugin_sr_RS.ts +++ b/src/plugins/Output/null/translations/null_plugin_sr_RS.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin Нул прикључак - + About Null Output Plugin О Нул прикључку излаза - + Qmmp Null Output Plugin Кумп Нул прикључак излаза - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_tr.ts b/src/plugins/Output/null/translations/null_plugin_tr.ts index 7b696dec5..6451da7e3 100644 --- a/src/plugins/Output/null/translations/null_plugin_tr.ts +++ b/src/plugins/Output/null/translations/null_plugin_tr.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin - + About Null Output Plugin - + Qmmp Null Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_uk_UA.ts b/src/plugins/Output/null/translations/null_plugin_uk_UA.ts index 38a01e7db..5b82ce535 100644 --- a/src/plugins/Output/null/translations/null_plugin_uk_UA.ts +++ b/src/plugins/Output/null/translations/null_plugin_uk_UA.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin Модуль нульового виведення - + About Null Output Plugin Про модуль нульового виведення - + Qmmp Null Output Plugin Модуль нульового виведення для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_zh_CN.ts b/src/plugins/Output/null/translations/null_plugin_zh_CN.ts index 3a18b2ed3..0a81e7f5c 100644 --- a/src/plugins/Output/null/translations/null_plugin_zh_CN.ts +++ b/src/plugins/Output/null/translations/null_plugin_zh_CN.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin 无输出插件 - + About Null Output Plugin 关于无输出插件 - + Qmmp Null Output Plugin Qmmp 无输出插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/null/translations/null_plugin_zh_TW.ts b/src/plugins/Output/null/translations/null_plugin_zh_TW.ts index 889aeab2b..7f67a9f46 100644 --- a/src/plugins/Output/null/translations/null_plugin_zh_TW.ts +++ b/src/plugins/Output/null/translations/null_plugin_zh_TW.ts @@ -4,22 +4,22 @@ OutputNullFactory - + Null Plugin - + About Null Output Plugin - + Qmmp Null Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss/CMakeLists.txt b/src/plugins/Output/oss/CMakeLists.txt index 48e48f4bf..8a74d65d1 100644 --- a/src/plugins/Output/oss/CMakeLists.txt +++ b/src/plugins/Output/oss/CMakeLists.txt @@ -2,20 +2,8 @@ project(liboss) INCLUDE(CheckIncludeFile) -# qt plugin -ADD_DEFINITIONS( -Wall ) -ADD_DEFINITIONS(${QT_DEFINITIONS}) -ADD_DEFINITIONS(-DQT_PLUGIN) -ADD_DEFINITIONS(-DQT_NO_DEBUG) -ADD_DEFINITIONS(-DQT_SHARED) -ADD_DEFINITIONS(-DQT_THREAD) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) #OSS CHECK_INCLUDE_FILE(sys/soundcard.h SYS_SOUNDCARD_H_FOUND) IF(SYS_SOUNDCARD_H_FOUND) @@ -39,17 +27,16 @@ SET(liboss_HDRS SET(liboss_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(liboss_RCC_SRCS ${liboss_RCCS}) +QT5_ADD_RESOURCES(liboss_RCC_SRCS ${liboss_RCCS}) SET(liboss_UIS settingsdialog.ui ) -QT4_WRAP_UI(liboss_UIS_H ${liboss_UIS}) +QT5_WRAP_UI(liboss_UIS_H ${liboss_UIS}) ADD_LIBRARY(oss MODULE ${liboss_SRCS} ${liboss_UIS_H} ${liboss_RCC_SRCS} ${liboss_HDRS}) add_dependencies(oss qmmp) -target_link_libraries(oss ${QT_LIBRARIES} libqmmp) +target_link_libraries(oss Qt5::Widgets -lqmmp) install(TARGETS oss DESTINATION ${LIB_DIR}/qmmp/Output) - diff --git a/src/plugins/Output/oss/outputossfactory.cpp b/src/plugins/Output/oss/outputossfactory.cpp index cc3cf3dde..f4ed82d9f 100644 --- a/src/plugins/Output/oss/outputossfactory.cpp +++ b/src/plugins/Output/oss/outputossfactory.cpp @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include #include -#include +#include #include #include "settingsdialog.h" #include "outputoss.h" @@ -68,5 +67,3 @@ QTranslator *OutputOSSFactory::createTranslator(QObject *parent) translator->load(QString(":/oss_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(oss,OutputOSSFactory) diff --git a/src/plugins/Output/oss/outputossfactory.h b/src/plugins/Output/oss/outputossfactory.h index fc6982f09..23f0b1b49 100644 --- a/src/plugins/Output/oss/outputossfactory.h +++ b/src/plugins/Output/oss/outputossfactory.h @@ -33,6 +33,7 @@ class OutputOSSFactory : public QObject, OutputFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: diff --git a/src/plugins/Output/oss/translations/oss_plugin_bg.ts b/src/plugins/Output/oss/translations/oss_plugin_bg.ts index 91584449d..82aa9a1ac 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_bg.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_bg.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin - + About OSS Output Plugin - + Qmmp OSS Output Plugin - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_cs.ts b/src/plugins/Output/oss/translations/oss_plugin_cs.ts index 234738e0b..58473573b 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_cs.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_cs.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin Modul OSS - + About OSS Output Plugin O modulu OSS - + Qmmp OSS Output Plugin Výstupní modul Qmmp OSS - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Autor: Jurij Žuravljov <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> Založeno na kódu Brada Hughese <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_de.ts b/src/plugins/Output/oss/translations/oss_plugin_de.ts index 8cb9b6ec4..022704a3c 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_de.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_de.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin OSS-Modul - + About OSS Output Plugin Über OSS-Ausgabemodul - + Qmmp OSS Output Plugin Qmmp OSS-Ausgabemodul - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Geschrieben von: Yuriy Zhuravlev <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> Basiert auf Code von: Brad Hughes <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_el.ts b/src/plugins/Output/oss/translations/oss_plugin_el.ts index 3bb1c4ca9..55e3fa49d 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_el.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_el.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin Πρόσθετο OSS - + About OSS Output Plugin Σχετικά με το πρόσθετο OSS - + Qmmp OSS Output Plugin Qmmp σχετικά με το πρόσθετο OSS - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Γράφτηκε από τον: Yuriy Zhuravlev <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> Βασισμένο στον κώδικα του: Brad Hughes <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_en.ts b/src/plugins/Output/oss/translations/oss_plugin_en.ts index ed278e8f8..fe2798828 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_en.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_en.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin - + About OSS Output Plugin - + Qmmp OSS Output Plugin - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_es.ts b/src/plugins/Output/oss/translations/oss_plugin_es.ts index 0df9a1d00..dd0e75e51 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_es.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_es.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin Módulo OSS - + About OSS Output Plugin Acerca del módulo de salida OSS - + Qmmp OSS Output Plugin Módulo de salida OSS para Qmmp - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Escrito por: Yuriy Zhuravlev <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> Basado en el código de: Brad Hughes <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_fi.ts b/src/plugins/Output/oss/translations/oss_plugin_fi.ts index 821585e4a..a68f5bb65 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_fi.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_fi.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin OSS-liitännäinen - + About OSS Output Plugin Tietoja - OSS-ulostuloliitännäinen - + Qmmp OSS Output Plugin Qmmp:n OSS-ulostuloliitännäinen - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Toteutus: Yuriy Zhuravlev <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> Pohjautuu koodiin, jonka tuotti: Brad Hughes <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_fr.ts b/src/plugins/Output/oss/translations/oss_plugin_fr.ts index f7071bc28..de413dfbd 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_fr.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_fr.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin Greffon OSS - + About OSS Output Plugin À propos du greffon de sortie OSS - + Qmmp OSS Output Plugin Greffon de sortie OSS pour Qmmp - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Écrit par : Yuriy Zhuravlev <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> Basé sur du code par Brad Hughes <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_gl_ES.ts b/src/plugins/Output/oss/translations/oss_plugin_gl_ES.ts index 15538be4f..e6ae20fb2 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_gl_ES.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_gl_ES.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin Engadido OSS - + About OSS Output Plugin Sobre o engadido OSS - + Qmmp OSS Output Plugin Engadido OSS de Qmmp - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Escrito por: Yuriy Zhuravlev <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> Baseado no código por: Brad Hughes <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_he.ts b/src/plugins/Output/oss/translations/oss_plugin_he.ts index 6f83c5b7b..07bf9cb71 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_he.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_he.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin תוסף OSS - + About OSS Output Plugin אודות תוסף פלט OSS - + Qmmp OSS Output Plugin תוסף פלט OSS של Qmmp - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> חובר על ידי: Yuriy Zhuravlev <slalkerg@gmail.com>‎ - + Based on code by: Brad Hughes <bhughes@trolltech.com> מבוססת על קוד מאת: Brad Hughes <bhughes@trolltech.com>‎ diff --git a/src/plugins/Output/oss/translations/oss_plugin_hu.ts b/src/plugins/Output/oss/translations/oss_plugin_hu.ts index 55cc8b9c9..a6353c493 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_hu.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_hu.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin - + About OSS Output Plugin - + Qmmp OSS Output Plugin - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_id.ts b/src/plugins/Output/oss/translations/oss_plugin_id.ts index 898eded78..fa5d83ad3 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_id.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_id.ts @@ -4,28 +4,28 @@ OutputOSSFactory - + OSS Plugin Plugin OSS - + About OSS Output Plugin Tentang Plugin Keluaran OSS - + Qmmp OSS Output Plugin Plugin Keluaran OSS Qmmp - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Ditulis oleh: Yuriy Zhuravlev <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> Berdasarkan pada kode oleh: Brad Hughes <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_it.ts b/src/plugins/Output/oss/translations/oss_plugin_it.ts index c139f0ff8..abf4ef261 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_it.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_it.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin Modulo OSS - + About OSS Output Plugin Informazioni sul modulo d'uscita OSS - + Qmmp OSS Output Plugin Modulo d'uscita OSS per Qmmp - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Autore: Yuriy Zhuravlev <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> Basato sul codice scritto da: Brad Hughes <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_ja.ts b/src/plugins/Output/oss/translations/oss_plugin_ja.ts index 4853b50e1..8a169ccf3 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_ja.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_ja.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin OSS プラグイン - + About OSS Output Plugin OSS 出力プラグインについて - + Qmmp OSS Output Plugin QMMP OSS 出力プラグイン - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> 制作: Юрий Журавлёв (Yuriy Zhuravlev) <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> Brad Hughes <bhughes@trolltech.com> 氏のコードを基に作成 diff --git a/src/plugins/Output/oss/translations/oss_plugin_kk.ts b/src/plugins/Output/oss/translations/oss_plugin_kk.ts index 24f7ff6d6..e788ceb97 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_kk.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_kk.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin - + About OSS Output Plugin - + Qmmp OSS Output Plugin - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_lt.ts b/src/plugins/Output/oss/translations/oss_plugin_lt.ts index 4bf28d6ea..c7b9a5e0d 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_lt.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_lt.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin OSS įskiepis - + About OSS Output Plugin Apie OSS išvesties įrenginį - + Qmmp OSS Output Plugin Apie Qmmp OSS išvesties įrenginį - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Sukūrė: Yuriy Zhuravlev <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> Sukurta Brad Hughes <bhughes@trolltech.com> kodo pagrindu diff --git a/src/plugins/Output/oss/translations/oss_plugin_nl.ts b/src/plugins/Output/oss/translations/oss_plugin_nl.ts index 97db43ecb..3db598a84 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_nl.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_nl.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin OSS Module - + About OSS Output Plugin Over de OSS Uitvoer Module - + Qmmp OSS Output Plugin OSS Uitvoer Module voor Qmmp - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Auteur: Yuriy Žuravljov <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> Gebasseerd op code van: Brada Hughese <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_pl_PL.ts b/src/plugins/Output/oss/translations/oss_plugin_pl_PL.ts index 102e6c079..e7ee524d3 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_pl_PL.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_pl_PL.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin Wtyczka OSS - + About OSS Output Plugin O wtyczce dźwiękowej OSS - + Qmmp OSS Output Plugin Wtyczka OSS dla Qmmp - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Autor: Jurij Žuravljov <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> Oparty na kodzie stworzonym przez Brad Hughes <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_pt.ts b/src/plugins/Output/oss/translations/oss_plugin_pt.ts index 448704601..c58a28452 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_pt.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_pt.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin Suplemento OSS - + About OSS Output Plugin Sobre o suplemento OSS - + Qmmp OSS Output Plugin Suplemento Qmmp OSS - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Desenvolvido por: Yuriy Zhuravlev <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> Baseado no código de: Brad Hughes <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_pt_BR.ts b/src/plugins/Output/oss/translations/oss_plugin_pt_BR.ts index d4c24daf7..96690e159 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_pt_BR.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_pt_BR.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin Plugin OSS - + About OSS Output Plugin Sobre o plugin OSS - + Qmmp OSS Output Plugin Plugin Qmmp OSS - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Desenvolvido por: Yuriy Zhuravlev <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> Baseado no código de: Brad Hughes <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_ru.ts b/src/plugins/Output/oss/translations/oss_plugin_ru.ts index b6ca5ac91..b5c88980f 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_ru.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_ru.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin Модуль OSS - + About OSS Output Plugin О модуле вывода OSS - + Qmmp OSS Output Plugin Модуль вывода OSS для Qmmp - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Разработчик: Юрий Журавлёв <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> Основано на коде Brad Hughes <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_sk.ts b/src/plugins/Output/oss/translations/oss_plugin_sk.ts index b717c99d9..8d0bd3b1e 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_sk.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_sk.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin - + About OSS Output Plugin - + Qmmp OSS Output Plugin - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_sr_BA.ts b/src/plugins/Output/oss/translations/oss_plugin_sr_BA.ts index 4cd997ba7..14989a1a0 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_sr_BA.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_sr_BA.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin ОСС прикључак - + About OSS Output Plugin О ОСС прикључку излаза - + Qmmp OSS Output Plugin Кумп ОСС прикључак излаза - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Аутор: Yuriy Zhuravlev <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> Заснован на кôду Brad-а Hughes-а <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_sr_RS.ts b/src/plugins/Output/oss/translations/oss_plugin_sr_RS.ts index afd287e2d..5a69d5748 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_sr_RS.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_sr_RS.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin ОСС прикључак - + About OSS Output Plugin О ОСС прикључку излаза - + Qmmp OSS Output Plugin Кумп ОСС прикључак излаза - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Аутор: Yuriy Zhuravlev <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> Заснован на кôду Brad-а Hughes-а <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_tr.ts b/src/plugins/Output/oss/translations/oss_plugin_tr.ts index 1e26d3194..7e78108a6 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_tr.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_tr.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin OSS Eklentisi - + About OSS Output Plugin OSS Çıktı Eklentisi Hakkında - + Qmmp OSS Output Plugin Qmmp OSS Çıktı Eklentisi - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Yazan: Yuriy Zhuravlev <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> Brad Hughes <bhughes@trolltech.com> tarafından yazılan kod temellidir diff --git a/src/plugins/Output/oss/translations/oss_plugin_uk_UA.ts b/src/plugins/Output/oss/translations/oss_plugin_uk_UA.ts index 710a905b1..6cdb8628f 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_uk_UA.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_uk_UA.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin Модуль OSS - + About OSS Output Plugin Про модуль виведення OSS - + Qmmp OSS Output Plugin Модуль виведення OSS для Qmmp - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> Розробник: Юрій Журавльов <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> На базі коду: Brad Hughes <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_zh_CN.ts b/src/plugins/Output/oss/translations/oss_plugin_zh_CN.ts index 0a92797af..bbdb1a09f 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_zh_CN.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_zh_CN.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin OSS 插件 - + About OSS Output Plugin 关于 OSS 输出插件 - + Qmmp OSS Output Plugin Qmmp OSS 输出插件 - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> 作者：Yuriy Zhuravlev <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> 源代码基于：Brad Hughes <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss/translations/oss_plugin_zh_TW.ts b/src/plugins/Output/oss/translations/oss_plugin_zh_TW.ts index e33c86b56..910277c3e 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_zh_TW.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_zh_TW.ts @@ -4,27 +4,27 @@ OutputOSSFactory - + OSS Plugin OSS 外掛 - + About OSS Output Plugin 關於 OSS 匯出插件 - + Qmmp OSS Output Plugin Qmmp OSS 匯出插件 - + Written by: Yuriy Zhuravlev <slalkerg@gmail.com> 作者：Yuriy Zhuravlev <slalkerg@gmail.com> - + Based on code by: Brad Hughes <bhughes@trolltech.com> 源碼基於：Brad Hughes <bhughes@trolltech.com> diff --git a/src/plugins/Output/oss4/CMakeLists.txt b/src/plugins/Output/oss4/CMakeLists.txt index 7c0d6391b..60b6f7208 100644 --- a/src/plugins/Output/oss4/CMakeLists.txt +++ b/src/plugins/Output/oss4/CMakeLists.txt @@ -3,20 +3,8 @@ project(liboss4) INCLUDE(CheckIncludeFile) INCLUDE(CheckCXXSourceCompiles) -# qt plugin -ADD_DEFINITIONS( -Wall ) -ADD_DEFINITIONS(${QT_DEFINITIONS}) -ADD_DEFINITIONS(-DQT_PLUGIN) -ADD_DEFINITIONS(-DQT_NO_DEBUG) -ADD_DEFINITIONS(-DQT_SHARED) -ADD_DEFINITIONS(-DQT_THREAD) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) #oss4 include_directories(/usr/lib/oss/include /usr/local/lib/oss/include) CHECK_INCLUDE_FILE(sys/soundcard.h SYS_SOUNDCARD_H_FOUND) @@ -73,17 +61,17 @@ SET(liboss4_HDRS SET(liboss4_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(liboss4_RCC_SRCS ${liboss4_RCCS}) +QT5_ADD_RESOURCES(liboss4_RCC_SRCS ${liboss4_RCCS}) SET(liboss4_UIS settingsdialog.ui ) IF(OSS4_FOUND) -QT4_WRAP_UI(liboss4_UIS_H ${liboss4_UIS}) +QT5_WRAP_UI(liboss4_UIS_H ${liboss4_UIS}) ADD_LIBRARY(oss4 MODULE ${liboss4_SRCS} ${liboss4_UIS_H} ${liboss4_RCC_SRCS} ${liboss4_HDRS}) add_dependencies(oss4 qmmp) -target_link_libraries(oss4 ${QT_LIBRARIES} libqmmp) +target_link_libraries(oss4 Qt5::Widgets -lqmmp) install(TARGETS oss4 DESTINATION ${LIB_DIR}/qmmp/Output) ENDIF(OSS4_FOUND) diff --git a/src/plugins/Output/oss4/outputoss4.cpp b/src/plugins/Output/oss4/outputoss4.cpp index d63f31f4b..b353e16b5 100644 --- a/src/plugins/Output/oss4/outputoss4.cpp +++ b/src/plugins/Output/oss4/outputoss4.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2014 by Ilya Kotov * + * Copyright (C) 2010-2015 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Output/oss4/outputoss4factory.cpp b/src/plugins/Output/oss4/outputoss4factory.cpp index 13894a697..76787e1aa 100644 --- a/src/plugins/Output/oss4/outputoss4factory.cpp +++ b/src/plugins/Output/oss4/outputoss4factory.cpp @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include #include -#include +#include #include #include "settingsdialog.h" #include "outputoss4.h" @@ -67,5 +66,3 @@ QTranslator *OutputOSS4Factory::createTranslator(QObject *parent) translator->load(QString(":/oss4_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(oss4,OutputOSS4Factory) diff --git a/src/plugins/Output/oss4/outputoss4factory.h b/src/plugins/Output/oss4/outputoss4factory.h index bddb44202..e8d8574f7 100644 --- a/src/plugins/Output/oss4/outputoss4factory.h +++ b/src/plugins/Output/oss4/outputoss4factory.h @@ -32,6 +32,7 @@ class OutputOSS4Factory : public QObject, OutputFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_bg.ts b/src/plugins/Output/oss4/translations/oss4_plugin_bg.ts index 4189eb305..f39f52839 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_bg.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_bg.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin - + About OSS4 Output Plugin - + Qmmp OSS4 Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_cs.ts b/src/plugins/Output/oss4/translations/oss4_plugin_cs.ts index 42bd17e96..b30c0464d 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_cs.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_cs.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin Modul OSS4 - + About OSS4 Output Plugin O modulu OSS4 - + Qmmp OSS4 Output Plugin Výstupní modul Qmmp pro OSS4 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_de.ts b/src/plugins/Output/oss4/translations/oss4_plugin_de.ts index 2768a6895..40ca42a52 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_de.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_de.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin OSS4-Modul - + About OSS4 Output Plugin Über OSS4-Ausgabemodul - + Qmmp OSS4 Output Plugin Qmmp OSS4-Ausgabemodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_el.ts b/src/plugins/Output/oss4/translations/oss4_plugin_el.ts index 6d20bfb93..7fdb25a55 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_el.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_el.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin Πρόσθετο OSS4 - + About OSS4 Output Plugin Σχετικά με το πρόσθετο OSS4 - + Qmmp OSS4 Output Plugin Qmmp σχετικά με το πρόσθετο OSS4 - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_en.ts b/src/plugins/Output/oss4/translations/oss4_plugin_en.ts index 0929e337c..9bce1c815 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_en.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_en.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin - + About OSS4 Output Plugin - + Qmmp OSS4 Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_es.ts b/src/plugins/Output/oss4/translations/oss4_plugin_es.ts index e74f6e8a0..0922c7072 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_es.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_es.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin Módulo OSS4 - + About OSS4 Output Plugin Acerca del módulo de salida OSS4 - + Qmmp OSS4 Output Plugin Módulo de salida OSS4 para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_fi.ts b/src/plugins/Output/oss4/translations/oss4_plugin_fi.ts index 8fa9306c3..4325406ed 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_fi.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_fi.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin OSS4-liitännäinen - + About OSS4 Output Plugin Tietoja - OSS4-ulostuloliitännäinen - + Qmmp OSS4 Output Plugin Qmmp:n OSS4-ulostuloliitännäinen - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_fr.ts b/src/plugins/Output/oss4/translations/oss4_plugin_fr.ts index 53f4d9fb8..73794dff7 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_fr.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_fr.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin Greffon OSS4 - + About OSS4 Output Plugin À propos du greffon de sortie OSS4 - + Qmmp OSS4 Output Plugin Greffon de sortie OSS4 pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_gl_ES.ts b/src/plugins/Output/oss4/translations/oss4_plugin_gl_ES.ts index d95f01669..30b17e3c2 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_gl_ES.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_gl_ES.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin Engadido OSS4 - + About OSS4 Output Plugin Sobre o engadido OSS4 - + Qmmp OSS4 Output Plugin Engadido OSS4 de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_he.ts b/src/plugins/Output/oss4/translations/oss4_plugin_he.ts index ea2b0115d..dbe7a6e1d 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_he.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_he.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin תוסף OSS4 - + About OSS4 Output Plugin אודות תוסף פלט OSS4 - + Qmmp OSS4 Output Plugin תוסף פלט OSS4 של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_hu.ts b/src/plugins/Output/oss4/translations/oss4_plugin_hu.ts index 621876a57..7e1c72332 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_hu.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_hu.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin - + About OSS4 Output Plugin - + Qmmp OSS4 Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_id.ts b/src/plugins/Output/oss4/translations/oss4_plugin_id.ts index dfcfdc6c9..e630f32b3 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_id.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_id.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin Plugin OSS4 - + About OSS4 Output Plugin Tentang Plugin Keluaran OSS4 - + Qmmp OSS4 Output Plugin Plugin Keluaran OSS4 Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_it.ts b/src/plugins/Output/oss4/translations/oss4_plugin_it.ts index 84c91da0c..6c9dad59b 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_it.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_it.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin - + About OSS4 Output Plugin - + Qmmp OSS4 Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_ja.ts b/src/plugins/Output/oss4/translations/oss4_plugin_ja.ts index 5846f90af..1a81b1c49 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_ja.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_ja.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin OSS4 プラグイン - + About OSS4 Output Plugin OSS4 プラグインについて - + Qmmp OSS4 Output Plugin QMMP OSS4 プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_kk.ts b/src/plugins/Output/oss4/translations/oss4_plugin_kk.ts index bfbef0879..bd1dd8444 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_kk.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_kk.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin - + About OSS4 Output Plugin - + Qmmp OSS4 Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_lt.ts b/src/plugins/Output/oss4/translations/oss4_plugin_lt.ts index 01f0d45c1..24ebe2f08 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_lt.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_lt.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin OSS4 Įskiepis - + About OSS4 Output Plugin Apie OSS4 išvesties įskiepį - + Qmmp OSS4 Output Plugin Qmmp OSS4 išvesties įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_nl.ts b/src/plugins/Output/oss4/translations/oss4_plugin_nl.ts index 627ad8597..a6bafffe0 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_nl.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_nl.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin OSS4 Module - + About OSS4 Output Plugin Over de OSS4 Uitvoer Module - + Qmmp OSS4 Output Plugin OSS4 Uitvoer Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_pl_PL.ts b/src/plugins/Output/oss4/translations/oss4_plugin_pl_PL.ts index ed34a01db..2f8c0e628 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_pl_PL.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_pl_PL.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin Wtyczka OSS4 - + About OSS4 Output Plugin O wtyczce wyjściowej OSS4 - + Qmmp OSS4 Output Plugin Wtyczka OSS4 dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_pt.ts b/src/plugins/Output/oss4/translations/oss4_plugin_pt.ts index 312704593..d3b8f919f 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_pt.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_pt.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin Suplemento OSS4 - + About OSS4 Output Plugin Sobre o suplemento OSS4 - + Qmmp OSS4 Output Plugin Suplemento Qmmp OSS4 - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_pt_BR.ts b/src/plugins/Output/oss4/translations/oss4_plugin_pt_BR.ts index e35978675..6e23be8c8 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_pt_BR.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_pt_BR.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin Plugin OSS4 - + About OSS4 Output Plugin Sobre o plugin OSS4 - + Qmmp OSS4 Output Plugin Plugin Qmmp OSS4 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_ru.ts b/src/plugins/Output/oss4/translations/oss4_plugin_ru.ts index 5f83da321..1d9c04e00 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_ru.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_ru.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin Модуль OSS4 - + About OSS4 Output Plugin Модуль поддержки OSS4 для Qmmp - + Qmmp OSS4 Output Plugin Модуль OSS4 для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_sk.ts b/src/plugins/Output/oss4/translations/oss4_plugin_sk.ts index addef2fb7..d82b6645d 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_sk.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_sk.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin - + About OSS4 Output Plugin - + Qmmp OSS4 Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_sr_BA.ts b/src/plugins/Output/oss4/translations/oss4_plugin_sr_BA.ts index 934b01fb4..e7286ef96 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_sr_BA.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_sr_BA.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin ОСС4 прикључак - + About OSS4 Output Plugin О ОСС4 прикључку излаза - + Qmmp OSS4 Output Plugin Кумп ОСС4 прикључак излаза - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_sr_RS.ts b/src/plugins/Output/oss4/translations/oss4_plugin_sr_RS.ts index ae01e87e5..593ccb285 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_sr_RS.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_sr_RS.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin ОСС4 прикључак - + About OSS4 Output Plugin О ОСС4 прикључку излаза - + Qmmp OSS4 Output Plugin Кумп ОСС4 прикључак излаза - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_tr.ts b/src/plugins/Output/oss4/translations/oss4_plugin_tr.ts index 1552659ba..8e3d7b468 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_tr.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_tr.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin - + About OSS4 Output Plugin - + Qmmp OSS4 Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_uk_UA.ts b/src/plugins/Output/oss4/translations/oss4_plugin_uk_UA.ts index 8e21ea2d4..7a2017f58 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_uk_UA.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_uk_UA.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin Модуль OSS4 - + About OSS4 Output Plugin Модуль підтримки OSS4 для Qmmp - + Qmmp OSS4 Output Plugin Модуль OSS4 для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_zh_CN.ts b/src/plugins/Output/oss4/translations/oss4_plugin_zh_CN.ts index 84c5f0316..70eb0db4d 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_zh_CN.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_zh_CN.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin OSS4 插件 - + About OSS4 Output Plugin 关于 OSS4 输出插件 - + Qmmp OSS4 Output Plugin Qmmp OSS4 输出插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/oss4/translations/oss4_plugin_zh_TW.ts b/src/plugins/Output/oss4/translations/oss4_plugin_zh_TW.ts index bf2fc86a1..38194632d 100644 --- a/src/plugins/Output/oss4/translations/oss4_plugin_zh_TW.ts +++ b/src/plugins/Output/oss4/translations/oss4_plugin_zh_TW.ts @@ -4,22 +4,22 @@ OutputOSS4Factory - + OSS4 Plugin OSS4 外掛 - + About OSS4 Output Plugin 關於 OSS4 輸出插件 - + Qmmp OSS4 Output Plugin Qmmp OSS4 輸出插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/CMakeLists.txt b/src/plugins/Output/pulseaudio/CMakeLists.txt index d482a3b8f..38ab57143 100644 --- a/src/plugins/Output/pulseaudio/CMakeLists.txt +++ b/src/plugins/Output/pulseaudio/CMakeLists.txt @@ -1,20 +1,7 @@ project(libpulseaudio) -# qt plugin -ADD_DEFINITIONS( -Wall ) -ADD_DEFINITIONS(${QT_DEFINITIONS}) -ADD_DEFINITIONS(-DQT_PLUGIN) -ADD_DEFINITIONS(-DQT_NO_DEBUG) -ADD_DEFINITIONS(-DQT_SHARED) -ADD_DEFINITIONS(-DQT_THREAD) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - # libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) @@ -37,7 +24,7 @@ SET(libpulseaudio_HDRS SET(libpulseaudio_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libpulseaudio_RCC_SRCS ${libpulseaudio_RCCS}) +QT5_ADD_RESOURCES(libpulseaudio_RCC_SRCS ${libpulseaudio_RCCS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! @@ -47,7 +34,7 @@ IF(PULSE_FOUND) ADD_LIBRARY(pulseaudio MODULE ${libpulseaudio_SRCS} ${libpulseaudio_UIS_H} ${libpulseaudio_RCC_SRCS} ${libpulseaudio_HDRS}) add_dependencies(pulseaudio qmmp) -target_link_libraries(pulseaudio ${QT_LIBRARIES} libqmmp ${PULSE_LDFLAGS}) +target_link_libraries(pulseaudio Qt5::Widgets -lqmmp ${PULSE_LDFLAGS}) install(TARGETS pulseaudio DESTINATION ${LIB_DIR}/qmmp/Output) ENDIF(PULSE_FOUND) diff --git a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp index 1b669c9a5..20e7af32c 100644 --- a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp +++ b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2016 by Ilya Kotov * + * Copyright (C) 2007-2015 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include #include -#include +#include #include #include "outputpulseaudio.h" #include "outputpulseaudiofactory.h" @@ -65,5 +64,3 @@ QTranslator *OutputPulseAudioFactory::createTranslator(QObject *parent) translator->load(QString(":/pulseaudio_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(pulseaudio, OutputPulseAudioFactory) diff --git a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h index 3a2232b8d..64eda4ae7 100644 --- a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h +++ b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h @@ -34,6 +34,7 @@ class OutputPulseAudioFactory : public QObject, OutputFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_bg.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_bg.ts index 8121f20a0..3fae42e24 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_bg.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_bg.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin - + About PulseAudio Output Plugin - + Qmmp PulseAudio Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_cs.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_cs.ts index 3fddc246b..86ec28f3d 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_cs.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_cs.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin Modul PulseAudio - + About PulseAudio Output Plugin O modulu PulseAudio - + Qmmp PulseAudio Output Plugin Výstupní modul Qmmp PulseAudio - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_de.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_de.ts index 19690502f..bcbea5f1a 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_de.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_de.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin PulseAudio-Modul - + About PulseAudio Output Plugin Über PulseAudio-Ausgabemodul - + Qmmp PulseAudio Output Plugin Qmmp PulseAudio-Ausgabemodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_el.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_el.ts index 067b18288..013900996 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_el.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_el.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin Πρόσθετο PulseAudio - + About PulseAudio Output Plugin Σχετικά με το πρόσθετο εξόδου PulseAudio - + Qmmp PulseAudio Output Plugin Qmmp πρόσθετο εξόδου PulseAudio - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_en.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_en.ts index c6da8ccfa..04d79dd3e 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_en.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_en.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin - + About PulseAudio Output Plugin - + Qmmp PulseAudio Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_es.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_es.ts index 4d8c46391..c757f6725 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_es.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_es.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin Módulo PulseAudio - + About PulseAudio Output Plugin Acerca del módulo de salida PulseAudio - + Qmmp PulseAudio Output Plugin Módulo de salida PulseAudio para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_fi.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_fi.ts index 23e8df911..0fad87183 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_fi.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_fi.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin PulseAudio-liitännäinen - + About PulseAudio Output Plugin Tietoja - PulseAudio-ulostuloliitännäinen - + Qmmp PulseAudio Output Plugin Qmmp:n PulseAudio-ulostuloliitännäinen - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_fr.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_fr.ts index f5a7cc9b7..fcf843b36 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_fr.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_fr.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin Greffon PulseAudio - + About PulseAudio Output Plugin À propos du greffon de sortie PulseAudio - + Qmmp PulseAudio Output Plugin Greffon de sortie PulseAudio pour Qmm - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_gl_ES.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_gl_ES.ts index d970e88b7..c40bac8ab 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_gl_ES.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_gl_ES.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin Engadido PulseAudio - + About PulseAudio Output Plugin Sobre o engadido PulseAudio - + Qmmp PulseAudio Output Plugin Engadido para PulseAudio de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_he.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_he.ts index 6895b0808..b23bdfe4f 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_he.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_he.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin תוסף PulseAudio - + About PulseAudio Output Plugin אודות תוסף פלט PulseAudio - + Qmmp PulseAudio Output Plugin תוסף פלט PulseAudio של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_hu.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_hu.ts index 2a9d0b881..096410ee0 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_hu.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_hu.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin - + About PulseAudio Output Plugin - + Qmmp PulseAudio Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_id.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_id.ts index c1a1993ee..5c54b40fd 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_id.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_id.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin Plugin PulseAudio - + About PulseAudio Output Plugin Tentang Plugin Keluaran PulseAudio - + Qmmp PulseAudio Output Plugin Plugin Keluaran PulseAudio Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_it.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_it.ts index e4d4db8db..fe184ccb5 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_it.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_it.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin MOdulo PulseAudio - + About PulseAudio Output Plugin Informazioni sul Modulo d'uscita PulseAudio - + Qmmp PulseAudio Output Plugin Modulo d'uscita PulseAudio per Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_ja.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_ja.ts index f1f51a82d..ab47bdd01 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_ja.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_ja.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin PulseAudio プラグイン - + About PulseAudio Output Plugin PulseAudio 出力プラグインについて - + Qmmp PulseAudio Output Plugin QMMP PulseAudio 出力プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_kk.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_kk.ts index 4c86f24c1..97d10f409 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_kk.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_kk.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin - + About PulseAudio Output Plugin - + Qmmp PulseAudio Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_lt.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_lt.ts index a3d7467db..66120e01c 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_lt.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_lt.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin PulseAudio įskiepis - + About PulseAudio Output Plugin Apie PulseAudio įskiepį - + Qmmp PulseAudio Output Plugin PulseAudio Qmmp įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_nl.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_nl.ts index 47f984c6b..9bce5ac4d 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_nl.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_nl.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin PulseAudio Module - + About PulseAudio Output Plugin Over de PulseAudio Uitvoer Module - + Qmmp PulseAudio Output Plugin PulseAudio Audio Uitvoer Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_pl_PL.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_pl_PL.ts index e3454ea6c..d7060ee80 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_pl_PL.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_pl_PL.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin Wtyczka PulseAudio - + About PulseAudio Output Plugin O wtyczce PulseAudio - + Qmmp PulseAudio Output Plugin Wtyczka PulseAudio dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_pt.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_pt.ts index 092b7bf0f..b7f3836f2 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_pt.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_pt.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin Suplemento PulseAudio - + About PulseAudio Output Plugin Sobre o suplemento PulseAudio - + Qmmp PulseAudio Output Plugin Suplemento Qmmp PulseAudio - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_pt_BR.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_pt_BR.ts index 409d77155..e2467c073 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_pt_BR.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_pt_BR.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin Plugin PulseAudio - + About PulseAudio Output Plugin Sobre o plugin PulseAudio - + Qmmp PulseAudio Output Plugin Plugin Qmmp PulseAudio - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_ru.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_ru.ts index aa34e5760..bd3bfafa4 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_ru.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_ru.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin Модуль PulseAudio - + About PulseAudio Output Plugin О модуле вывода PulseAudio - + Qmmp PulseAudio Output Plugin Модуль вывода PulseAudio для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_sk.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_sk.ts index 97ce52883..84e6d7a6b 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_sk.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_sk.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin - + About PulseAudio Output Plugin - + Qmmp PulseAudio Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_sr_BA.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_sr_BA.ts index 76c13edb7..e1fa3f7c6 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_sr_BA.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_sr_BA.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin ПулсАудио прикључак - + About PulseAudio Output Plugin О ПулсАудио прикључку излаза - + Qmmp PulseAudio Output Plugin Кумп ПулсАудио прикључак излаза - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_sr_RS.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_sr_RS.ts index a3f40f879..ac61b5df9 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_sr_RS.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_sr_RS.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin ПулсАудио прикључак - + About PulseAudio Output Plugin О ПулсАудио прикључку излаза - + Qmmp PulseAudio Output Plugin Кумп ПулсАудио прикључак излаза - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_tr.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_tr.ts index 71fc15429..9f5799234 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_tr.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_tr.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin PulseAudio Eklentisi - + About PulseAudio Output Plugin PulseAudio Çıkışı Eklentisi Hakkında - + Qmmp PulseAudio Output Plugin Qmmp PulseAudio Çıkışı Eklentisi - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_uk_UA.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_uk_UA.ts index 9b6d4546f..e9497994b 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_uk_UA.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_uk_UA.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin Модуль PulseAudio - + About PulseAudio Output Plugin Про модуль виведення PulseAudio - + Qmmp PulseAudio Output Plugin Модуль виведення PulseAudio для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_zh_CN.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_zh_CN.ts index c617b1870..a452577e6 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_zh_CN.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_zh_CN.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin PulseAudio 插件 - + About PulseAudio Output Plugin 关于 PulseAudio 输出插件 - + Qmmp PulseAudio Output Plugin Qmmp PulseAudio 输出插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_zh_TW.ts b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_zh_TW.ts index 2e883e413..9cad8bac2 100644 --- a/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_zh_TW.ts +++ b/src/plugins/Output/pulseaudio/translations/pulseaudio_plugin_zh_TW.ts @@ -4,22 +4,22 @@ OutputPulseAudioFactory - + PulseAudio Plugin PulseAudio 外掛 - + About PulseAudio Output Plugin 關於 PulseAudio 匯出插件 - + Qmmp PulseAudio Output Plugin Qmmp PulseAudio 匯出插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/qtmultimedia/CMakeLists.txt b/src/plugins/Output/qtmultimedia/CMakeLists.txt index e5bb96915..0096f65e2 100644 --- a/src/plugins/Output/qtmultimedia/CMakeLists.txt +++ b/src/plugins/Output/qtmultimedia/CMakeLists.txt @@ -1,24 +1,7 @@ project(libqtmultimedia) -SET(QT_USE_QTMULTIMEDIA TRUE) -INCLUDE(FindQt4) -INCLUDE(${QT_USE_FILE}) - -# qt plugin -ADD_DEFINITIONS( -Wall ) -ADD_DEFINITIONS(${QT_DEFINITIONS}) -ADD_DEFINITIONS(-DQT_PLUGIN) -ADD_DEFINITIONS(-DQT_NO_DEBUG) -ADD_DEFINITIONS(-DQT_SHARED) -ADD_DEFINITIONS(-DQT_THREAD) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - # libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) @@ -29,26 +12,20 @@ SET(libqtmultimedia_SRCS settingsdialog.cpp ) -SET(libqtmultimedia_HDRS - outputqtmultimedia.h -) - SET(libqtmultimedia_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libqtmultimedia_RCC_SRCS ${libqtmultimedia_RCCS}) +QT5_ADD_RESOURCES(libqtmultimedia_RCC_SRCS ${libqtmultimedia_RCCS}) SET(libqtmultimedia_UIS settingsdialog.ui ) -QT4_WRAP_UI(libqtmultimedia_UIS_H ${libqtmultimedia_UIS}) +QT5_WRAP_UI(libqtmultimedia_UIS_H ${libqtmultimedia_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) -IF(${QT_QTMULTIMEDIA_FOUND}) - ADD_LIBRARY(qtmultimedia MODULE ${libqtmultimedia_SRCS} ${libqtmultimedia_UIS_H} ${libqtmultimedia_RCC_SRCS} ${libqtmultimedia_HDRS}) - add_dependencies(qtmultimedia qmmp) - target_link_libraries(qtmultimedia ${QT_LIBRARIES} libqmmp) - install(TARGETS qtmultimedia DESTINATION ${LIB_DIR}/qmmp/Output) -ENDIF(${QT_QTMULTIMEDIA_FOUND}) +ADD_LIBRARY(qtmultimedia MODULE ${libqtmultimedia_SRCS} ${libqtmultimedia_UIS_H} ${libqtmultimedia_RCC_SRCS}) +add_dependencies(qtmultimedia qmmp) +target_link_libraries(qtmultimedia Qt5::Widgets Qt5::Multimedia -lqmmp) +install(TARGETS qtmultimedia DESTINATION ${LIB_DIR}/qmmp/Output) diff --git a/src/plugins/Output/qtmultimedia/outputqtmultimedia.cpp b/src/plugins/Output/qtmultimedia/outputqtmultimedia.cpp index 1f39ecc60..7de68b081 100644 --- a/src/plugins/Output/qtmultimedia/outputqtmultimedia.cpp +++ b/src/plugins/Output/qtmultimedia/outputqtmultimedia.cpp @@ -19,7 +19,8 @@ ***************************************************************************/ #include "outputqtmultimedia.h" - +#include +#include #include #include #include @@ -38,114 +39,125 @@ OutputQtMultimedia::~OutputQtMultimedia() bool OutputQtMultimedia::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat format) { - QAudioFormat qformat; - qformat.setCodec("audio/pcm"); - qformat.setFrequency(freq); - qformat.setByteOrder(QAudioFormat::LittleEndian); - qformat.setChannels(map.size()); - qformat.setSampleType(QAudioFormat::SignedInt); - - //Size of sample representation in input data. For 24-bit is 4, high byte is ignored. - qint64 bytes_per_sample = 0; - - switch (format) - { - case Qmmp::PCM_S8: - qformat.setSampleSize(8); - bytes_per_sample = 1; - break; - case Qmmp::PCM_S16LE: - qformat.setSampleSize(16); - bytes_per_sample = 2; - break; - case Qmmp::PCM_S24LE: - qformat.setSampleSize(24); - bytes_per_sample = 4; - break; - case Qmmp::PCM_S32LE: - qformat.setSampleSize(32); - bytes_per_sample = 4; - break; - default: - break; - } - - if (!qformat.isValid()) - return false; - - m_bytes_per_second = bytes_per_sample * freq * qformat.channels(); - - const QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - const QString saved_device_name = settings.value("QTMULTIMEDIA/device").toString(); - - QAudioDeviceInfo device_info; - if (!saved_device_name.isEmpty()) - { - const QList devices = QAudioDeviceInfo::availableDevices(QAudio::AudioOutput); - foreach (const QAudioDeviceInfo &info, devices) - { - if (info.deviceName()==saved_device_name) - { - if (info.isFormatSupported(qformat)) - { - device_info = info; - break; - } - else - qDebug() << "OutputQtMultimedia: Output device: " << saved_device_name << " is not supported"; - } - } - } - - if (device_info.isNull()) - { - device_info = QAudioDeviceInfo::defaultOutputDevice(); - if (!device_info.isFormatSupported(qformat)) - return false; - } - - qDebug() << "OutputQtMultimedia: Using output device: " << device_info.deviceName(); - - m_output.reset(new QAudioOutput(device_info, qformat)); - m_buffer = m_output->start(); - - configure(freq, map, format); - return true; + QAudioFormat qformat; + qformat.setCodec("audio/pcm"); + qformat.setSampleRate(freq); + qformat.setByteOrder(QAudioFormat::LittleEndian); + qformat.setChannelCount(map.size()); + qformat.setSampleType(QAudioFormat::SignedInt); + + //Size of sample representation in input data. For 24-bit is 4, high byte is ignored. + qint64 bytes_per_sample = AudioParameters::sampleSize(format); + + switch (format) + { + case Qmmp::PCM_S8: + qformat.setSampleSize(8); + break; + case Qmmp::PCM_S16LE: + qformat.setSampleSize(16); + break; + case Qmmp::PCM_S24LE: + qformat.setSampleSize(24); + break; + case Qmmp::PCM_S32LE: + qformat.setSampleSize(32); + break; + default: + break; + } + + if (!qformat.isValid()) + return false; + + const QSettings settings(Qmmp::configFile(), QSettings::IniFormat); + const QString saved_device_name = settings.value("QTMULTIMEDIA/device").toString(); + + m_bytes_per_second = bytes_per_sample * freq * qformat.channelCount(); + + QAudioDeviceInfo device_info; + if (!saved_device_name.isEmpty()) + { + const QList devices = QAudioDeviceInfo::availableDevices(QAudio::AudioOutput); + foreach (const QAudioDeviceInfo &info, devices) + { + if (info.deviceName()==saved_device_name) + { + if (info.isFormatSupported(qformat)) + { + device_info = info; + break; + } + else + qDebug() << "OutputQtMultimedia: Output device: " << saved_device_name << " is not supported"; + } + } + } + + if (device_info.isNull()) + { + device_info = QAudioDeviceInfo::defaultOutputDevice(); + if (!device_info.isFormatSupported(qformat)) + return false; + } + + qDebug() << "OutputQtMultimedia: Using output device: " << device_info.deviceName(); + + m_output.reset(new QAudioOutput(device_info, qformat)); + m_buffer = m_output->start(); + m_control.reset(new OutputControl(m_output.data())); + + configure(freq, map, format); + return true; } qint64 OutputQtMultimedia::latency() { - return 0; + return 0; } qint64 OutputQtMultimedia::writeAudio(unsigned char *data, qint64 maxSize) { - if (!m_output->bytesFree()) { - //If the buffer is full, waiting for some bytes to be played: - //trying to play maxSize bytes, but not more than half of buffer. - usleep(qMin(maxSize, static_cast(m_output->bufferSize() / 2)) * 1000000 / m_bytes_per_second); - } - return m_buffer->write((const char*)data, maxSize); + if (!m_output->bytesFree()) { + //If the buffer is full, waiting for some bytes to be played: + //trying to play maxSize bytes, but not more than half of buffer. + usleep(qMin(maxSize, static_cast(m_output->bufferSize() / 2)) * 1000000 / m_bytes_per_second); + } + return m_buffer->write((const char*)data, maxSize); } void OutputQtMultimedia::drain() { - m_buffer->waitForBytesWritten(-1); + m_buffer->waitForBytesWritten(-1); } void OutputQtMultimedia::reset() { - m_buffer->reset(); - m_buffer = m_output->start(); + m_buffer->reset(); } void OutputQtMultimedia::suspend() { - m_output->suspend(); + QMetaObject::invokeMethod(m_control.data(), "suspend", Qt::QueuedConnection); } void OutputQtMultimedia::resume() { - m_output->resume(); + QMetaObject::invokeMethod(m_control.data(), "resume", Qt::QueuedConnection); +} + +OutputControl::OutputControl(QAudioOutput *o) +{ + m_output = o; +} + +void OutputControl::suspend() +{ + m_output->suspend(); +} + +void OutputControl::resume() +{ + m_output->resume(); } diff --git a/src/plugins/Output/qtmultimedia/outputqtmultimedia.h b/src/plugins/Output/qtmultimedia/outputqtmultimedia.h index ea69b9b3f..f09a4307b 100644 --- a/src/plugins/Output/qtmultimedia/outputqtmultimedia.h +++ b/src/plugins/Output/qtmultimedia/outputqtmultimedia.h @@ -23,12 +23,14 @@ #include #include +#include /** @author Ivan Ponomarev ivantrue@gmail.com */ class QAudioOutput; class QIODevice; +class OutputControl; class OutputQtMultimedia : public Output { @@ -46,9 +48,26 @@ public: private: QScopedPointer m_output; + QScopedPointer m_control; QIODevice *m_buffer; qint64 m_bytes_per_second; }; +class OutputControl : public QObject +{ + Q_OBJECT + +public: + OutputControl(QAudioOutput *o); + +public slots: + void suspend(); + void resume(); + +private: + QAudioOutput *m_output; + +}; + #endif // OUTPUTQTMULTIMEDIA_H diff --git a/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp b/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp index 3a2570f8c..402617f96 100644 --- a/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp +++ b/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp @@ -18,12 +18,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ - #include "outputqtmultimediafactory.h" #include "settingsdialog.h" + #include #include -#include #include #include "outputqtmultimedia.h" @@ -68,5 +67,3 @@ QTranslator *OutputQtMultimediaFactory::createTranslator(QObject *parent) translator->load(QString(":/qtmultimedia_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(qtmultimedia, OutputQtMultimediaFactory) diff --git a/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.h b/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.h index d8ccbf97c..6a0a86ea4 100644 --- a/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.h +++ b/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.h @@ -33,6 +33,7 @@ class OutputQtMultimediaFactory : public QObject, OutputFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_bg.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_bg.ts index 4a1bf6cec..7cb7bf8df 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_bg.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_bg.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin - + About Qt Multimedia Output Plugin - + Qmmp Qt Multimedia Output Plugin - + Written by: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_cs.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_cs.ts index 8185c96db..89e13d218 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_cs.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_cs.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin - + About Qt Multimedia Output Plugin - + Qmmp Qt Multimedia Output Plugin - + Written by: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_de.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_de.ts index 17ab44710..81af2c2b3 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_de.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_de.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin Qt-Multimedia-Modul - + About Qt Multimedia Output Plugin Über Qt-Multimedia-Ausgabemodul - + Qmmp Qt Multimedia Output Plugin Qmmp Qt-Multimedia-Ausgabemodul - + Written by: Ivan Ponomarev <ivantrue@gmail.com> Geschrieben von: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_el.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_el.ts index b5dc898eb..a22bc7f1b 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_el.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_el.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin Πρόσθετο πολυμέσων Qt - + About Qt Multimedia Output Plugin Περί του πρόσθετου πολυμέσων Qt - + Qmmp Qt Multimedia Output Plugin Πρόσθετο εξόδου πολυμέσων Qt Qmmp - + Written by: Ivan Ponomarev <ivantrue@gmail.com> Γράφτηκε από τον: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_en.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_en.ts index 2f0efbaad..ef56cc519 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_en.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_en.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin - + About Qt Multimedia Output Plugin - + Qmmp Qt Multimedia Output Plugin - + Written by: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_es.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_es.ts index 392e609b2..12e595bd8 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_es.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_es.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin Módulo multimedios Qt - + About Qt Multimedia Output Plugin Acerca del Módulo de Salida de Multimedios Qt - + Qmmp Qt Multimedia Output Plugin Módulo de Salida de Multimedios Qt de Qmmp - + Written by: Ivan Ponomarev <ivantrue@gmail.com> Escrito por: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_fi.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_fi.ts index 0c2b57556..7bd6b708c 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_fi.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_fi.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin Qt Multimedia -liitännäinen - + About Qt Multimedia Output Plugin Tietoja - Qt Multimedia -ulostuloliitännäinen - + Qmmp Qt Multimedia Output Plugin Qmmp:n Qt Multimedia -ulostuloliitännäinen - + Written by: Ivan Ponomarev <ivantrue@gmail.com> Toteutus: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_fr.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_fr.ts index efdd46268..8dad7ba3f 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_fr.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_fr.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin Plugin Multimédia Qt - + About Qt Multimedia Output Plugin A propos du Plugin de sortie Multimédia Qt - + Qmmp Qt Multimedia Output Plugin Plugin de sortie Multimédia Qt de Qmmp - + Written by: Ivan Ponomarev <ivantrue@gmail.com> Ecrit par: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_gl_ES.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_gl_ES.ts index e2c4f7282..70d6bf94e 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_gl_ES.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_gl_ES.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin Plugin Qt Multimedia - + About Qt Multimedia Output Plugin Acerca da saida do plugin Qt Multimedia - + Qmmp Qt Multimedia Output Plugin Qmmp Qt Multimedia plugin de saida - + Written by: Ivan Ponomarev <ivantrue@gmail.com> Escrito por: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_he.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_he.ts index 0295c5691..2c3d9d35e 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_he.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_he.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin תוסף מולטימדיה Qt - + About Qt Multimedia Output Plugin אודות תוסף פלט מולטימדיה Qt - + Qmmp Qt Multimedia Output Plugin - + Written by: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_hu.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_hu.ts index fb07093bb..4424592cb 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_hu.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_hu.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin - + About Qt Multimedia Output Plugin - + Qmmp Qt Multimedia Output Plugin - + Written by: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_id.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_id.ts index c569d2a63..43a7b1886 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_id.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_id.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin Plugin Multimedia Qt - + About Qt Multimedia Output Plugin Tentang Plugin Keluaran Multimedia Qt - + Qmmp Qt Multimedia Output Plugin Plugin Keluaran Multimedia Qt Qmmp - + Written by: Ivan Ponomarev <ivantrue@gmail.com> Ditulis oleh: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_it.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_it.ts index 785a99222..51edb8123 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_it.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_it.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin - + About Qt Multimedia Output Plugin - + Qmmp Qt Multimedia Output Plugin - + Written by: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_ja.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_ja.ts index aa6b09b04..5d790ed7e 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_ja.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_ja.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin Qt Multimedia プラグイン - + About Qt Multimedia Output Plugin Qt Multimedia 出力プラグインについて - + Qmmp Qt Multimedia Output Plugin QMMP Qt Multimedia 出力プラグイン - + Written by: Ivan Ponomarev <ivantrue@gmail.com> 制作: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_kk.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_kk.ts index 1d0681bf9..2c6e6b23c 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_kk.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_kk.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin - + About Qt Multimedia Output Plugin - + Qmmp Qt Multimedia Output Plugin - + Written by: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_lt.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_lt.ts index 0d62627e0..45caac7bb 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_lt.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_lt.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin - + About Qt Multimedia Output Plugin - + Qmmp Qt Multimedia Output Plugin - + Written by: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_nl.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_nl.ts index 85cf4b421..06ef013f3 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_nl.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_nl.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin - + About Qt Multimedia Output Plugin - + Qmmp Qt Multimedia Output Plugin - + Written by: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_pl_PL.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_pl_PL.ts index ee672a3d3..f95364eac 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_pl_PL.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_pl_PL.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin - + About Qt Multimedia Output Plugin - + Qmmp Qt Multimedia Output Plugin - + Written by: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_pt.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_pt.ts index 784ae4ebf..10ee7993f 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_pt.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_pt.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin Suplemento Qt Multimedia - + About Qt Multimedia Output Plugin Sobre o suplemento Qt Multimedia - + Qmmp Qt Multimedia Output Plugin Suplemento Qmmp Qt Multimedia - + Written by: Ivan Ponomarev <ivantrue@gmail.com> Desenvolvido por: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_pt_BR.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_pt_BR.ts index 63bc515dc..a843266f0 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_pt_BR.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_pt_BR.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin Plugin Qt Multimedia - + About Qt Multimedia Output Plugin Sobre o plugin Qt Multimedia - + Qmmp Qt Multimedia Output Plugin Plugin Qmmp Qt Multimedia - + Written by: Ivan Ponomarev <ivantrue@gmail.com> Desenvolvido por: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_ru.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_ru.ts index e1fb2bd19..fd46c0943 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_ru.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_ru.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin Модуль Qt Multimedia - + About Qt Multimedia Output Plugin О модуле вывода Qt Multimedia - + Qmmp Qt Multimedia Output Plugin Модуль вывода Qt Multimedia для Qmmp - + Written by: Ivan Ponomarev <ivantrue@gmail.com> Разработчик: Иван Пономарев <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_sk.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_sk.ts index ecab2652b..8414f8317 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_sk.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_sk.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin - + About Qt Multimedia Output Plugin - + Qmmp Qt Multimedia Output Plugin - + Written by: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_sr_BA.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_sr_BA.ts index de31d0ab9..3b3f03713 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_sr_BA.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_sr_BA.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin - + About Qt Multimedia Output Plugin - + Qmmp Qt Multimedia Output Plugin - + Written by: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_sr_RS.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_sr_RS.ts index 00225c32b..8da85bc41 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_sr_RS.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_sr_RS.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin - + About Qt Multimedia Output Plugin - + Qmmp Qt Multimedia Output Plugin - + Written by: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_tr.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_tr.ts index a80534efc..68d893525 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_tr.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_tr.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin - + About Qt Multimedia Output Plugin - + Qmmp Qt Multimedia Output Plugin - + Written by: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_uk_UA.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_uk_UA.ts index 7603c68d2..bcc4097ef 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_uk_UA.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_uk_UA.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin Модуль Qt Multimedia - + About Qt Multimedia Output Plugin Про модуль виведення Qt Multimedia - + Qmmp Qt Multimedia Output Plugin Модуль виведення Qt Multimedia для Qmmp - + Written by: Ivan Ponomarev <ivantrue@gmail.com> Розробник: Іван Пономарьов <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_zh_CN.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_zh_CN.ts index 383a44408..b28e87ae1 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_zh_CN.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_zh_CN.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin Qt 多媒体插件 - + About Qt Multimedia Output Plugin 关于 Qt 多媒体输出插件 - + Qmmp Qt Multimedia Output Plugin Qmmp Qt 多媒体输出插件 - + Written by: Ivan Ponomarev <ivantrue@gmail.com> 作者：Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_zh_TW.ts b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_zh_TW.ts index 0be9adddc..bcbee312b 100644 --- a/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_zh_TW.ts +++ b/src/plugins/Output/qtmultimedia/translations/qtmultimedia_plugin_zh_TW.ts @@ -4,22 +4,22 @@ OutputQtMultimediaFactory - + Qt Multimedia Plugin - + About Qt Multimedia Output Plugin - + Qmmp Qt Multimedia Output Plugin - + Written by: Ivan Ponomarev <ivantrue@gmail.com> diff --git a/src/plugins/Output/shout/CMakeLists.txt b/src/plugins/Output/shout/CMakeLists.txt index a53b267f1..f245ed1c4 100644 --- a/src/plugins/Output/shout/CMakeLists.txt +++ b/src/plugins/Output/shout/CMakeLists.txt @@ -1,20 +1,7 @@ project(libshout) -# qt plugin -ADD_DEFINITIONS(-Wall) -ADD_DEFINITIONS(${QT_DEFINITIONS}) -ADD_DEFINITIONS(-DQT_PLUGIN) -ADD_DEFINITIONS(-DQT_NO_DEBUG) -ADD_DEFINITIONS(-DQT_SHARED) -ADD_DEFINITIONS(-DQT_THREAD) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - # libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) @@ -34,14 +21,14 @@ SET(libshout_SRCS SET(libshout_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libshout_RCC_SRCS ${libshout_RCCS}) +QT5_ADD_RESOURCES(libshout_RCC_SRCS ${libshout_RCCS}) # user interface SET(libshout_UIS settingsdialog.ui ) -QT4_WRAP_UI(libshout_UIS_H ${libshout_UIS}) +QT5_WRAP_UI(libshout_UIS_H ${libshout_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -49,6 +36,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(SHOUT_FOUND) ADD_LIBRARY(shout MODULE ${libshout_SRCS} ${libshout_UIS_H} ${libshout_RCC_SRCS}) add_dependencies(shout qmmp) -target_link_libraries(shout ${QT_LIBRARIES} libqmmp ${SHOUT_LDFLAGS}) +target_link_libraries(shout Qt5::Widgets -lqmmp ${SHOUT_LDFLAGS}) install(TARGETS shout DESTINATION ${LIB_DIR}/qmmp/Output) ENDIF(SHOUT_FOUND) diff --git a/src/plugins/Output/shout/outputshoutfactory.cpp b/src/plugins/Output/shout/outputshoutfactory.cpp index d42289156..c186e99cf 100644 --- a/src/plugins/Output/shout/outputshoutfactory.cpp +++ b/src/plugins/Output/shout/outputshoutfactory.cpp @@ -29,7 +29,6 @@ #include "settingsdialog.h" #include "outputshoutfactory.h" - OutputShoutFactory::OutputShoutFactory() { m_connection = new ShoutClient(qApp); @@ -76,5 +75,3 @@ QTranslator *OutputShoutFactory::createTranslator(QObject *parent) translator->load(QString(":/shout_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(shout, OutputShoutFactory) diff --git a/src/plugins/Output/shout/outputshoutfactory.h b/src/plugins/Output/shout/outputshoutfactory.h index eec7d3aaf..bd3683d02 100644 --- a/src/plugins/Output/shout/outputshoutfactory.h +++ b/src/plugins/Output/shout/outputshoutfactory.h @@ -32,6 +32,7 @@ class ShoutClient; class OutputShoutFactory : public QObject, OutputFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: diff --git a/src/plugins/Output/shout/translations/shout_plugin_bg.ts b/src/plugins/Output/shout/translations/shout_plugin_bg.ts index f509eecfe..7ff77759f 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_bg.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_bg.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin - + About Icecast Output Plugin - + Qmmp Icecast Output Plugin - + Compiled against libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_cs.ts b/src/plugins/Output/shout/translations/shout_plugin_cs.ts index ae42c68b3..08b39b6c8 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_cs.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_cs.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin - + About Icecast Output Plugin - + Qmmp Icecast Output Plugin - + Compiled against libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_de.ts b/src/plugins/Output/shout/translations/shout_plugin_de.ts index 6fffc5f05..2b251ee10 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_de.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_de.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin Icecast-Modul - + About Icecast Output Plugin Über Icecast-Ausgabemodul - + Qmmp Icecast Output Plugin Qmmp Icecast-Ausgabemodul - + Compiled against libshout-%1 Kompiliert gegen libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_el.ts b/src/plugins/Output/shout/translations/shout_plugin_el.ts index bf56b7f7a..fa8c41946 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_el.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_el.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin Πρόσθετο Icecast - + About Icecast Output Plugin Σχετικά με το πρόσθετο εξόδου Icecast - + Qmmp Icecast Output Plugin Πρόσθετο εξόδου Icecast Qmmp - + Compiled against libshout-%1 Μεταγλωττίστηκε χρησιμοποιώντας libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_en.ts b/src/plugins/Output/shout/translations/shout_plugin_en.ts index 637d5f40b..c8e7f4e4e 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_en.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_en.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin - + About Icecast Output Plugin - + Qmmp Icecast Output Plugin - + Compiled against libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_es.ts b/src/plugins/Output/shout/translations/shout_plugin_es.ts index cc33c5f06..379d6d1f7 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_es.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_es.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin Módulo Icecast - + About Icecast Output Plugin Acerca del Módulo de Salida Icecast - + Qmmp Icecast Output Plugin Módulo de Salida Icecast de Qmmp - + Compiled against libshout-%1 Compilado contra libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_fi.ts b/src/plugins/Output/shout/translations/shout_plugin_fi.ts index dd8fbaacb..332a2f333 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_fi.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_fi.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin Icecast-liitännäinen - + About Icecast Output Plugin Tietoja - Icecast-ulostuloliitännäinen - + Qmmp Icecast Output Plugin Qmmp:n Icecast-ulostuloliitännäinen - + Compiled against libshout-%1 Käännetty vasten libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_fr.ts b/src/plugins/Output/shout/translations/shout_plugin_fr.ts index 7b1fe7919..5bb8dae9c 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_fr.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_fr.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin Plugin Icecast - + About Icecast Output Plugin A propos de la sortie du plugin Icecast - + Qmmp Icecast Output Plugin Sortie du plugin Qmmp Icecast - + Compiled against libshout-%1 Compilé avec la mauvaise version de libshout -%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_gl_ES.ts b/src/plugins/Output/shout/translations/shout_plugin_gl_ES.ts index bd9f7ee0e..ccf08378b 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_gl_ES.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_gl_ES.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin Plugin Icecast - + About Icecast Output Plugin Acerca do plugin de saida Icecast - + Qmmp Icecast Output Plugin Plugin de saida Qmmp Icecast - + Compiled against libshout-%1 Compilando con libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_he.ts b/src/plugins/Output/shout/translations/shout_plugin_he.ts index 0691bdccc..0b867f723 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_he.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_he.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin - + About Icecast Output Plugin - + Qmmp Icecast Output Plugin - + Compiled against libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_hu.ts b/src/plugins/Output/shout/translations/shout_plugin_hu.ts index 71c3eaf9e..5fd6bd917 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_hu.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_hu.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin - + About Icecast Output Plugin - + Qmmp Icecast Output Plugin - + Compiled against libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_id.ts b/src/plugins/Output/shout/translations/shout_plugin_id.ts index 2dbf59dbb..d67d6c8c1 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_id.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_id.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin Plugin Icecast - + About Icecast Output Plugin Tentang Plugin Keluaran Icecast - + Qmmp Icecast Output Plugin Plugin Keluaran Icecast Qmmp - + Compiled against libshout-%1 Dikompilasi terhadap libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_it.ts b/src/plugins/Output/shout/translations/shout_plugin_it.ts index 969287647..d8a84b558 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_it.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_it.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin - + About Icecast Output Plugin - + Qmmp Icecast Output Plugin - + Compiled against libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_ja.ts b/src/plugins/Output/shout/translations/shout_plugin_ja.ts index ea71ef70d..4f45cf047 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_ja.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_ja.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin Icecast プラグイン - + About Icecast Output Plugin Icecast 出力プラグインについて - + Qmmp Icecast Output Plugin QMMP Icecast 出力プラグイン - + Compiled against libshout-%1 libshout-%1 を使用してコンパイル - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_kk.ts b/src/plugins/Output/shout/translations/shout_plugin_kk.ts index 19c2f3289..06b38c57a 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_kk.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_kk.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin - + About Icecast Output Plugin - + Qmmp Icecast Output Plugin - + Compiled against libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_lt.ts b/src/plugins/Output/shout/translations/shout_plugin_lt.ts index 29bb99bf3..afb53ec37 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_lt.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_lt.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin - + About Icecast Output Plugin - + Qmmp Icecast Output Plugin - + Compiled against libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_nl.ts b/src/plugins/Output/shout/translations/shout_plugin_nl.ts index c87f38efd..89eafc1ac 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_nl.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_nl.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin - + About Icecast Output Plugin - + Qmmp Icecast Output Plugin - + Compiled against libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_pl_PL.ts b/src/plugins/Output/shout/translations/shout_plugin_pl_PL.ts index e93ddf74d..68e5d2901 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_pl_PL.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_pl_PL.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin - + About Icecast Output Plugin - + Qmmp Icecast Output Plugin - + Compiled against libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_pt.ts b/src/plugins/Output/shout/translations/shout_plugin_pt.ts index 0cc894b58..d8d1f4d91 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_pt.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_pt.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin Suplemento Icecast - + About Icecast Output Plugin Sobre o suplemento Icecast - + Qmmp Icecast Output Plugin Suplemento Qmmp Icecast - + Compiled against libshout-%1 Compilado com libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_pt_BR.ts b/src/plugins/Output/shout/translations/shout_plugin_pt_BR.ts index 644004f46..196a262a3 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_pt_BR.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_pt_BR.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin Plugin Icecast - + About Icecast Output Plugin Sobre o plugin de saída Icecast - + Qmmp Icecast Output Plugin Plugin de saída Icecast - + Compiled against libshout-%1 Compilado com libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_ru.ts b/src/plugins/Output/shout/translations/shout_plugin_ru.ts index 05a9adb48..b5e7d2a2e 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_ru.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_ru.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin Модуль Icecast - + About Icecast Output Plugin О модуле вывода Icecast - + Qmmp Icecast Output Plugin Модуль вывода Icecast для Qmmp - + Compiled against libshout-%1 Собран с libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_sk.ts b/src/plugins/Output/shout/translations/shout_plugin_sk.ts index ef16cd513..9d93ae60b 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_sk.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_sk.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin - + About Icecast Output Plugin - + Qmmp Icecast Output Plugin - + Compiled against libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_sr_BA.ts b/src/plugins/Output/shout/translations/shout_plugin_sr_BA.ts index 42e8ca2bc..221ee41af 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_sr_BA.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_sr_BA.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin - + About Icecast Output Plugin - + Qmmp Icecast Output Plugin - + Compiled against libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_sr_RS.ts b/src/plugins/Output/shout/translations/shout_plugin_sr_RS.ts index 0ed75eb90..bd38ced60 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_sr_RS.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_sr_RS.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin - + About Icecast Output Plugin - + Qmmp Icecast Output Plugin - + Compiled against libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_tr.ts b/src/plugins/Output/shout/translations/shout_plugin_tr.ts index 187e3ffb2..392c33399 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_tr.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_tr.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin - + About Icecast Output Plugin - + Qmmp Icecast Output Plugin - + Compiled against libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_uk_UA.ts b/src/plugins/Output/shout/translations/shout_plugin_uk_UA.ts index 28108771f..ab0af6fd3 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_uk_UA.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_uk_UA.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin Модуль Icecast - + About Icecast Output Plugin Про модуль виведення Icecast - + Qmmp Icecast Output Plugin Модуль виведення Icecast для Qmmp - + Compiled against libshout-%1 Зібрано з libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_zh_CN.ts b/src/plugins/Output/shout/translations/shout_plugin_zh_CN.ts index 11992562e..028fdd890 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_zh_CN.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_zh_CN.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin Icecast 插件 - + About Icecast Output Plugin 关于 Icecast 输出插件 - + Qmmp Icecast Output Plugin Qmmp Icecast 输出插件 - + Compiled against libshout-%1 编译依赖 libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/shout/translations/shout_plugin_zh_TW.ts b/src/plugins/Output/shout/translations/shout_plugin_zh_TW.ts index 4fce321cf..5f004a046 100644 --- a/src/plugins/Output/shout/translations/shout_plugin_zh_TW.ts +++ b/src/plugins/Output/shout/translations/shout_plugin_zh_TW.ts @@ -4,27 +4,27 @@ OutputShoutFactory - + Icecast Plugin - + About Icecast Output Plugin - + Qmmp Icecast Output Plugin - + Compiled against libshout-%1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/CMakeLists.txt b/src/plugins/Output/wasapi/CMakeLists.txt index 56be4fc4a..6e76c3740 100644 --- a/src/plugins/Output/wasapi/CMakeLists.txt +++ b/src/plugins/Output/wasapi/CMakeLists.txt @@ -2,14 +2,6 @@ project(libwasapi) INCLUDE(CheckIncludeFile) -# qt plugin -ADD_DEFINITIONS( -Wall ) -ADD_DEFINITIONS(${QT_DEFINITIONS}) -ADD_DEFINITIONS(-DQT_PLUGIN) -ADD_DEFINITIONS(-DQT_NO_DEBUG) -ADD_DEFINITIONS(-DQT_SHARED) -ADD_DEFINITIONS(-DQT_THREAD) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) SET(QT_INCLUDES @@ -30,13 +22,9 @@ SET(libwasapi_SRCS settingsdialog.cpp ) -SET(libwasapi_HDRS - outputwasapi.h -) - SET(libwasapi_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libwasapi_RCC_SRCS ${libwasapi_RCCS}) +QT5_ADD_RESOURCES(libwasapi_RCC_SRCS ${libwasapi_RCCS}) # user interface @@ -44,7 +32,7 @@ SET(libwasapi_UIS settingsdialog.ui ) -QT4_WRAP_UI(libwasapi_UIS_H ${libwasapi_UIS}) +QT5_WRAP_UI(libwasapi_UIS_H ${libwasapi_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -52,6 +40,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(WASAPI_FOUND) ADD_LIBRARY(wasapi MODULE ${libwasapi_SRCS} ${libwasapi_RCC_SRCS} ${libwasapi_HDRS} ${libwasapi_UIS_H}) add_dependencies(wasapi qmmp) -target_link_libraries(wasapi ${QT_LIBRARIES} libqmmp -lstrmiids -ldmoguids -lmsdmo -lole32 -loleaut32 -luuid -lgdi32 -lksuser) +target_link_libraries(wasapi Qt5::Widgets libqmmp -lstrmiids -ldmoguids -lmsdmo -lole32 -loleaut32 -luuid -lgdi32 -lksuser) install(TARGETS wasapi DESTINATION ${LIB_DIR}/qmmp/Output) ENDIF(WASAPI_FOUND) diff --git a/src/plugins/Output/wasapi/outputwasapifactory.cpp b/src/plugins/Output/wasapi/outputwasapifactory.cpp index ede9f4f0b..196a8c2be 100644 --- a/src/plugins/Output/wasapi/outputwasapifactory.cpp +++ b/src/plugins/Output/wasapi/outputwasapifactory.cpp @@ -20,7 +20,6 @@ #include #include -#include #include "settingsdialog.h" #include "outputwasapi.h" #include "outputwasapifactory.h" @@ -65,5 +64,3 @@ QTranslator *OutputWASAPIFactory::createTranslator(QObject *parent) translator->load(QString(":/wasapi_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(wasapi,OutputWASAPIFactory) diff --git a/src/plugins/Output/wasapi/outputwasapifactory.h b/src/plugins/Output/wasapi/outputwasapifactory.h index 2d359e995..23a77eb50 100644 --- a/src/plugins/Output/wasapi/outputwasapifactory.h +++ b/src/plugins/Output/wasapi/outputwasapifactory.h @@ -30,6 +30,7 @@ class OutputWASAPIFactory : public QObject, OutputFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_bg.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_bg.ts index b9fdc87e3..bf072d50f 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_bg.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_bg.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin - + About WASAPI Output Plugin - + Qmmp WASAPI Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_cs.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_cs.ts index e1758a368..6665623a5 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_cs.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_cs.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin - + About WASAPI Output Plugin - + Qmmp WASAPI Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_de.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_de.ts index fab406e68..da909ea72 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_de.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_de.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin WASAPI-Modul - + About WASAPI Output Plugin Über WASAPI-Ausgabemodul - + Qmmp WASAPI Output Plugin Qmmp WASAPI-Ausgabemodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_el.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_el.ts index ed94af444..f94abef9f 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_el.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_el.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin Πρόσθετο WASAPI - + About WASAPI Output Plugin Περί του πρόσθετου εξόδου WASAPI - + Qmmp WASAPI Output Plugin Qmmp πρόσθετο εξόδου WASAPI - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_en.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_en.ts index 7918a12ba..fe0f270bd 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_en.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_en.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin - + About WASAPI Output Plugin - + Qmmp WASAPI Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_es.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_es.ts index 0440ffe5a..6ea986ab1 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_es.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_es.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin Módulo WASAPI - + About WASAPI Output Plugin Acerca del Módulo de Salida WASAPI - + Qmmp WASAPI Output Plugin Módulo de Salida WASAPI de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_fi.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_fi.ts index de5525077..5bbd10adf 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_fi.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_fi.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin WASAPI-liitännäinen - + About WASAPI Output Plugin Tietoja - WASAPI-ulostuloliitännäinen - + Qmmp WASAPI Output Plugin Qmmp:n WASAPI-ulostuloliitännäinen - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_fr.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_fr.ts index 6cc913141..039d9f9cb 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_fr.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_fr.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin Greffon WASAPI - + About WASAPI Output Plugin À propos du greffon de sortie WASAPI - + Qmmp WASAPI Output Plugin Greffon de sortie WASAPI pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_gl_ES.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_gl_ES.ts index 83a557c1c..90f1b618e 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_gl_ES.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_gl_ES.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin Plugin WASAPI - + About WASAPI Output Plugin Acerca da saida do plugin WASAPI - + Qmmp WASAPI Output Plugin Saida do plugin Qmmp WASAPI - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_he.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_he.ts index 976274c5f..4a4a3a03e 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_he.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_he.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin תוסף WASAPI - + About WASAPI Output Plugin אודות תוסף פלט WASAPI - + Qmmp WASAPI Output Plugin תוסף פלט WASAPI של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_hu.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_hu.ts index 51ffca11a..0d1fa11b6 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_hu.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_hu.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin - + About WASAPI Output Plugin - + Qmmp WASAPI Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_id.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_id.ts index 0dcbc280f..d6292a80f 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_id.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_id.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin Plugin WASAPI - + About WASAPI Output Plugin Tentang Plugin Keluaran WASAPI - + Qmmp WASAPI Output Plugin Plugin Keluaran WASAPI Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_it.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_it.ts index 864299bad..574473d33 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_it.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_it.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin - + About WASAPI Output Plugin - + Qmmp WASAPI Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_ja.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_ja.ts index 78ba4717f..2b0ef7b85 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_ja.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_ja.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin WASAPI プラグイン - + About WASAPI Output Plugin WASAPI プラグインについて - + Qmmp WASAPI Output Plugin QMMP WASAPI 出力プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_kk.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_kk.ts index fa0fc73fb..0299d32ba 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_kk.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_kk.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin - + About WASAPI Output Plugin - + Qmmp WASAPI Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_lt.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_lt.ts index 041ad36b4..5f2663c67 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_lt.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_lt.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin - + About WASAPI Output Plugin - + Qmmp WASAPI Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_nl.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_nl.ts index 3c2902892..fc2b8bd86 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_nl.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_nl.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin - + About WASAPI Output Plugin - + Qmmp WASAPI Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_pl_PL.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_pl_PL.ts index 50c3d4e36..1e05373ec 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_pl_PL.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_pl_PL.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin - + About WASAPI Output Plugin - + Qmmp WASAPI Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_pt.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_pt.ts index 85d5fa4f5..a4fdbbdf2 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_pt.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_pt.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin Suplemento Wasabi - + About WASAPI Output Plugin Sobre o suplemento Wasabi - + Qmmp WASAPI Output Plugin Suplemento Qmmp Wasabi - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_pt_BR.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_pt_BR.ts index e3de362e8..3fc2abd90 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_pt_BR.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_pt_BR.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin Plugin WASAPI - + About WASAPI Output Plugin Sobre o plugin WASAPI - + Qmmp WASAPI Output Plugin Plugin Qmmp WASAPI - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_ru.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_ru.ts index 4fbb50784..cf7327515 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_ru.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_ru.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin Модуль WASAPI - + About WASAPI Output Plugin О модуле вывода WASAPI - + Qmmp WASAPI Output Plugin Модуль вывода WASAPI для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_sk.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_sk.ts index 5c0e6c65e..0898e960a 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_sk.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_sk.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin - + About WASAPI Output Plugin - + Qmmp WASAPI Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_sr_BA.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_sr_BA.ts index 545474707..cfacc60f9 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_sr_BA.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_sr_BA.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin - + About WASAPI Output Plugin - + Qmmp WASAPI Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_sr_RS.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_sr_RS.ts index 8822e7471..12d8f90ca 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_sr_RS.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_sr_RS.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin - + About WASAPI Output Plugin - + Qmmp WASAPI Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_tr.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_tr.ts index dde1f8780..c6058f36c 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_tr.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_tr.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin - + About WASAPI Output Plugin - + Qmmp WASAPI Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_uk_UA.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_uk_UA.ts index ba545a299..144ff9803 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_uk_UA.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_uk_UA.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin Модуль WASAPI - + About WASAPI Output Plugin Про модуль виведення WASAPI - + Qmmp WASAPI Output Plugin Модуль виведення WASAPI для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_zh_CN.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_zh_CN.ts index 57742ac8b..f72903899 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_zh_CN.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_zh_CN.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin WASAP　I插件 - + About WASAPI Output Plugin 关于WASAPI输出插件 - + Qmmp WASAPI Output Plugin Qmmp WASAPI输出插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/wasapi/translations/wasapi_plugin_zh_TW.ts b/src/plugins/Output/wasapi/translations/wasapi_plugin_zh_TW.ts index c90122c40..d82de651f 100644 --- a/src/plugins/Output/wasapi/translations/wasapi_plugin_zh_TW.ts +++ b/src/plugins/Output/wasapi/translations/wasapi_plugin_zh_TW.ts @@ -4,22 +4,22 @@ OutputWASAPIFactory - + WASAPI Plugin - + About WASAPI Output Plugin - + Qmmp WASAPI Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Output/waveout/CMakeLists.txt b/src/plugins/Output/waveout/CMakeLists.txt index dee810a58..169eaed0a 100644 --- a/src/plugins/Output/waveout/CMakeLists.txt +++ b/src/plugins/Output/waveout/CMakeLists.txt @@ -2,21 +2,8 @@ project(libwaveout) INCLUDE(CheckIncludeFile) -# qt plugin -ADD_DEFINITIONS( -Wall ) -ADD_DEFINITIONS(${QT_DEFINITIONS}) -ADD_DEFINITIONS(-DQT_PLUGIN) -ADD_DEFINITIONS(-DQT_NO_DEBUG) -ADD_DEFINITIONS(-DQT_SHARED) -ADD_DEFINITIONS(-DQT_THREAD) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - # libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) @@ -35,13 +22,13 @@ SET(libwaveout_HDRS SET(libwaveout_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libwaveout_RCC_SRCS ${libwaveout_RCCS}) +QT5_ADD_RESOURCES(libwaveout_RCC_SRCS ${libwaveout_RCCS}) IF(WINDOWS_H_FOUND) ADD_LIBRARY(waveout MODULE ${libwaveout_SRCS} ${libwaveout_RCC_SRCS} ${libwaveout_HDRS}) add_dependencies(waveout qmmp) -target_link_libraries(waveout ${QT_LIBRARIES} libqmmp -lwinmm) +target_link_libraries(waveout Qt5::Widgets -lqmmp -lwinmm) install(TARGETS waveout DESTINATION ${LIB_DIR}/qmmp/Output) ENDIF(WINDOWS_H_FOUND) diff --git a/src/plugins/Output/waveout/outputwaveoutfactory.cpp b/src/plugins/Output/waveout/outputwaveoutfactory.cpp index f6bf47321..f9eb0f684 100644 --- a/src/plugins/Output/waveout/outputwaveoutfactory.cpp +++ b/src/plugins/Output/waveout/outputwaveoutfactory.cpp @@ -18,9 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include -#include -#include + #include "outputwaveout.h" #include "outputwaveoutfactory.h" @@ -73,4 +71,4 @@ QTranslator *OutputWaveOutFactory::createTranslator(QObject *parent) return translator; } -Q_EXPORT_PLUGIN2(waveout,OutputWaveOutFactory) + diff --git a/src/plugins/Output/waveout/outputwaveoutfactory.h b/src/plugins/Output/waveout/outputwaveoutfactory.h index 6a92e9f0c..c8b992408 100644 --- a/src/plugins/Output/waveout/outputwaveoutfactory.h +++ b/src/plugins/Output/waveout/outputwaveoutfactory.h @@ -31,6 +31,7 @@ class OutputWaveOutFactory : public QObject, OutputFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_bg.ts b/src/plugins/Output/waveout/translations/waveout_plugin_bg.ts index c351363ad..eb83518eb 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_bg.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_bg.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin - + About WaveOut Output Plugin - + Qmmp WaveOut Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_cs.ts b/src/plugins/Output/waveout/translations/waveout_plugin_cs.ts index 52d9224b6..355c75de4 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_cs.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_cs.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin Modul WaveOut - + About WaveOut Output Plugin O výstupním modulu WaveOut - + Qmmp WaveOut Output Plugin Výstupní modul Qmmp WaveOut - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player Založeno na přehrávači aacDECdrop diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_de.ts b/src/plugins/Output/waveout/translations/waveout_plugin_de.ts index df7497a7b..f72ca0e92 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_de.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_de.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin WaveOut-Modul - + About WaveOut Output Plugin Über WaveOut-Ausgabemodul - + Qmmp WaveOut Output Plugin Qmmp WaveOut-Ausgabemodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player Basiert auf dem aacDECdrop-Abspieler diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_el.ts b/src/plugins/Output/waveout/translations/waveout_plugin_el.ts index 1c6f35526..19418b0ee 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_el.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_el.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin Πρόσθετο WaveOut - + About WaveOut Output Plugin Σχετικά με το πρόσθετο εξόδου WaveOut - + Qmmp WaveOut Output Plugin Qmmp πρόσθετο εξόδου WaveOut - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> - + Based on aacDECdrop player Βασισμένο στον αναπαραγωγέα aacDECdrop diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_en.ts b/src/plugins/Output/waveout/translations/waveout_plugin_en.ts index 08d6dffe3..5bfb4e66a 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_en.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_en.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin - + About WaveOut Output Plugin - + Qmmp WaveOut Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_es.ts b/src/plugins/Output/waveout/translations/waveout_plugin_es.ts index a836cc924..9fca80fab 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_es.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_es.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin Módulo WaveOut - + About WaveOut Output Plugin Acerca del módulo de salida WaveOut - + Qmmp WaveOut Output Plugin Módulo de salida WaveOut para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player Basado en el reproductor aacDECdrop diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_fi.ts b/src/plugins/Output/waveout/translations/waveout_plugin_fi.ts index b97d48277..5d8e8ad18 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_fi.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_fi.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin - + About WaveOut Output Plugin - + Qmmp WaveOut Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_fr.ts b/src/plugins/Output/waveout/translations/waveout_plugin_fr.ts index e01029d16..a0fc67d8a 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_fr.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_fr.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin Greffon WaveOut - + About WaveOut Output Plugin À propos du greffon de sortie WaveOut - + Qmmp WaveOut Output Plugin Greffon de sortie WaveOut pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player Basé sur le lecteur aacDECdrop diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_gl_ES.ts b/src/plugins/Output/waveout/translations/waveout_plugin_gl_ES.ts index 25fbe5390..f933353cb 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_gl_ES.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_gl_ES.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin Engadido WaveOut - + About WaveOut Output Plugin Sobre o engadido WaveOut - + Qmmp WaveOut Output Plugin Engadido WaveOut de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player Baseado no reprodutor aacDECdrop diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_he.ts b/src/plugins/Output/waveout/translations/waveout_plugin_he.ts index 9bace0344..d7c14c5ea 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_he.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_he.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin תוסף WaveOut - + About WaveOut Output Plugin אודות תוסף WaveOut - + Qmmp WaveOut Output Plugin תוסף פלט WaveOut של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player מבוססת על נגן aacDECdrop diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_hu.ts b/src/plugins/Output/waveout/translations/waveout_plugin_hu.ts index e3d210463..e52f81927 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_hu.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_hu.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin - + About WaveOut Output Plugin - + Qmmp WaveOut Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_id.ts b/src/plugins/Output/waveout/translations/waveout_plugin_id.ts index e6109dbaf..94a61c5da 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_id.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_id.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin Plugin WaveOut - + About WaveOut Output Plugin Tentang Plugin Keluaran WaveOut - + Qmmp WaveOut Output Plugin Plugin Keluaran WaveOut Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player Berdasarkan pada player aacDECdrop diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_it.ts b/src/plugins/Output/waveout/translations/waveout_plugin_it.ts index d64fc081c..fa8f4e16b 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_it.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_it.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin Modulo WaveOut - + About WaveOut Output Plugin Informazioni sul modulo d'uscita WaveOut - + Qmmp WaveOut Output Plugin Modulo d'uscita WaveOut per Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player Basato sul riproduttore audio aacDECdrop diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_ja.ts b/src/plugins/Output/waveout/translations/waveout_plugin_ja.ts index 771f93277..4a859d9c2 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_ja.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_ja.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin WaveOut プラグイン - + About WaveOut Output Plugin WaveOut 出力プラグインについて - + Qmmp WaveOut Output Plugin QMMP WaveOut 出力プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> - + Based on aacDECdrop player aacDECdrop プレイヤーを基に作成 diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_kk.ts b/src/plugins/Output/waveout/translations/waveout_plugin_kk.ts index 490a7c37f..a2e56b9cf 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_kk.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_kk.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin - + About WaveOut Output Plugin - + Qmmp WaveOut Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_lt.ts b/src/plugins/Output/waveout/translations/waveout_plugin_lt.ts index 24c08772e..704b22adb 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_lt.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_lt.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin WaveOut įskiepis - + About WaveOut Output Plugin Apie WaveOut įskiepį - + Qmmp WaveOut Output Plugin Qmmp WaveOut įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player Sukurtas aacDECdrop grotuvo pagrindu diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_nl.ts b/src/plugins/Output/waveout/translations/waveout_plugin_nl.ts index d649d45ed..d27edf189 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_nl.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_nl.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin WaveOut Module - + About WaveOut Output Plugin Over de WaveOut Output Module - + Qmmp WaveOut Output Plugin WaveOut Output Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player Gebasseerd op de aacDECdrop speler diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_pl_PL.ts b/src/plugins/Output/waveout/translations/waveout_plugin_pl_PL.ts index d98e8c5c8..a496d64f6 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_pl_PL.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_pl_PL.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin Wtyczka WaveOut - + About WaveOut Output Plugin O wtyczce WaveOut - + Qmmp WaveOut Output Plugin Wtyczka WaveOut dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player Oparta na kodzie odtwarzacza aacDECdrop diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_pt.ts b/src/plugins/Output/waveout/translations/waveout_plugin_pt.ts index 9ca85a561..1dfe4d18b 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_pt.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_pt.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin Suplemento WaveOut - + About WaveOut Output Plugin Sobre o suplemento WaveOut - + Qmmp WaveOut Output Plugin Suplemento Qmmp WaveOut - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player Baseado no reprodutor aacDECdrop diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_pt_BR.ts b/src/plugins/Output/waveout/translations/waveout_plugin_pt_BR.ts index 61360fdbe..38fee938e 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_pt_BR.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_pt_BR.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin Plugin WaveOut - + About WaveOut Output Plugin Sobre o plugin WaveOut - + Qmmp WaveOut Output Plugin Plugin Qmmp WaveOut - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player Baseado no reprodutor aacDECdrop diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_ru.ts b/src/plugins/Output/waveout/translations/waveout_plugin_ru.ts index 62c66e39a..3f35418c9 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_ru.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_ru.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin Модуль WaveOut - + About WaveOut Output Plugin О модуле вывода WaveOut - + Qmmp WaveOut Output Plugin Модуль вывода WaveOut для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> - + Based on aacDECdrop player Основан на базе проигрывателя aacDECdrop diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_sk.ts b/src/plugins/Output/waveout/translations/waveout_plugin_sk.ts index fd708ae33..9e568828c 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_sk.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_sk.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin - + About WaveOut Output Plugin - + Qmmp WaveOut Output Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_sr_BA.ts b/src/plugins/Output/waveout/translations/waveout_plugin_sr_BA.ts index 3ab8214b8..3790be675 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_sr_BA.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_sr_BA.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin ВејвАут прикључак - + About WaveOut Output Plugin О ВејвАут прикључку излаза - + Qmmp WaveOut Output Plugin Кумп ВејвАут прикључак излаза - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player Заснован на aacDECdrop плејеру diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_sr_RS.ts b/src/plugins/Output/waveout/translations/waveout_plugin_sr_RS.ts index bd76aa786..9bb328206 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_sr_RS.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_sr_RS.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin ВејвАут прикључак - + About WaveOut Output Plugin О ВејвАут прикључку излаза - + Qmmp WaveOut Output Plugin Кумп ВејвАут прикључак излаза - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player Заснован на aacDECdrop плејеру diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_tr.ts b/src/plugins/Output/waveout/translations/waveout_plugin_tr.ts index 251a12f7c..6aa5d6179 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_tr.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_tr.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin WaveOut Eklentisi - + About WaveOut Output Plugin WaveOut Çıktı Eklentisi - + Qmmp WaveOut Output Plugin Qmmp WaveOut Çıktı Eklentisi - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player aacDECdrop oynatıcısı temellidir diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_uk_UA.ts b/src/plugins/Output/waveout/translations/waveout_plugin_uk_UA.ts index f0fb7a11a..65dca5a7d 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_uk_UA.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_uk_UA.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin Модуль WaveOut - + About WaveOut Output Plugin Про модуль виведення WaveOut - + Qmmp WaveOut Output Plugin Модуль виведення WaveOut для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> - + Based on aacDECdrop player Базується на програвачі aacDECdrop diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_zh_CN.ts b/src/plugins/Output/waveout/translations/waveout_plugin_zh_CN.ts index 25efa192e..4bba0e4f3 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_zh_CN.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_zh_CN.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin WaveOut 插件 - + About WaveOut Output Plugin 关于 WaveOut 输出插件 - + Qmmp WaveOut Output Plugin Qmmp WaveOut 输出插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player 基于 aacDECdrop 播放器 diff --git a/src/plugins/Output/waveout/translations/waveout_plugin_zh_TW.ts b/src/plugins/Output/waveout/translations/waveout_plugin_zh_TW.ts index 40c3f6efb..23f9cf351 100644 --- a/src/plugins/Output/waveout/translations/waveout_plugin_zh_TW.ts +++ b/src/plugins/Output/waveout/translations/waveout_plugin_zh_TW.ts @@ -4,27 +4,27 @@ OutputWaveOutFactory - + WaveOut Plugin WaveOut 外掛 - + About WaveOut Output Plugin 關於 WaveOut 匯出插件 - + Qmmp WaveOut Output Plugin Qmmp WaveOut 匯出插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> - + Based on aacDECdrop player 基於 aacDECdrop 播放器 -- cgit v1.2.3-13-gbd6f