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/CMakeLists.txt | 3 +- .../IncDecVolumeOption/CMakeLists.txt | 17 +- .../IncDecVolumeOption/incdecvolumeoption.cpp | 2 - .../IncDecVolumeOption/incdecvolumeoption.h | 1 + .../PlayListOption/CMakeLists.txt | 17 +- .../PlayListOption/playlistoption.cpp | 2 - .../PlayListOption/playlistoption.h | 1 + .../CommandLineOptions/SeekOption/CMakeLists.txt | 17 +- .../CommandLineOptions/SeekOption/seekoption.cpp | 2 - .../CommandLineOptions/SeekOption/seekoption.h | 1 + .../CommandLineOptions/StatusOption/CMakeLists.txt | 17 +- .../StatusOption/statusoption.cpp | 2 - .../CommandLineOptions/StatusOption/statusoption.h | 1 + .../UninstallOption/uninstalloption.cpp | 2 - .../UninstallOption/uninstalloption.h | 1 + src/plugins/Effect/bs2b/CMakeLists.txt | 19 +- src/plugins/Effect/bs2b/effectbs2bfactory.cpp | 7 +- src/plugins/Effect/bs2b/effectbs2bfactory.h | 3 +- .../Effect/bs2b/translations/bs2b_plugin_bg.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_cs.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_de.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_el.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_en.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_es.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_fi.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_fr.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_gl_ES.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_he.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_hu.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_id.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_it.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_ja.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_kk.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_lt.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_nl.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_pl_PL.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_pt.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_pt_BR.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_ru.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_sk.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_sr_BA.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_sr_RS.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_tr.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_uk_UA.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_zh_CN.ts | 16 +- .../Effect/bs2b/translations/bs2b_plugin_zh_TW.ts | 16 +- src/plugins/Effect/crossfade/CMakeLists.txt | 19 +- .../Effect/crossfade/effectcrossfadefactory.cpp | 7 +- .../Effect/crossfade/effectcrossfadefactory.h | 3 +- .../crossfade/translations/crossfade_plugin_bg.ts | 8 +- .../crossfade/translations/crossfade_plugin_cs.ts | 8 +- .../crossfade/translations/crossfade_plugin_de.ts | 8 +- .../crossfade/translations/crossfade_plugin_el.ts | 8 +- .../crossfade/translations/crossfade_plugin_en.ts | 8 +- .../crossfade/translations/crossfade_plugin_es.ts | 8 +- .../crossfade/translations/crossfade_plugin_fi.ts | 8 +- .../crossfade/translations/crossfade_plugin_fr.ts | 8 +- .../translations/crossfade_plugin_gl_ES.ts | 8 +- .../crossfade/translations/crossfade_plugin_he.ts | 8 +- .../crossfade/translations/crossfade_plugin_hu.ts | 8 +- .../crossfade/translations/crossfade_plugin_id.ts | 8 +- .../crossfade/translations/crossfade_plugin_it.ts | 8 +- .../crossfade/translations/crossfade_plugin_ja.ts | 8 +- .../crossfade/translations/crossfade_plugin_kk.ts | 8 +- .../crossfade/translations/crossfade_plugin_lt.ts | 8 +- .../crossfade/translations/crossfade_plugin_nl.ts | 8 +- .../translations/crossfade_plugin_pl_PL.ts | 8 +- .../crossfade/translations/crossfade_plugin_pt.ts | 8 +- .../translations/crossfade_plugin_pt_BR.ts | 8 +- .../crossfade/translations/crossfade_plugin_ru.ts | 8 +- .../crossfade/translations/crossfade_plugin_sk.ts | 8 +- .../translations/crossfade_plugin_sr_BA.ts | 8 +- .../translations/crossfade_plugin_sr_RS.ts | 8 +- .../crossfade/translations/crossfade_plugin_tr.ts | 8 +- .../translations/crossfade_plugin_uk_UA.ts | 8 +- .../translations/crossfade_plugin_zh_CN.ts | 8 +- .../translations/crossfade_plugin_zh_TW.ts | 8 +- src/plugins/Effect/filewriter/CMakeLists.txt | 19 +- .../Effect/filewriter/effectfilewriterfactory.cpp | 3 - .../Effect/filewriter/effectfilewriterfactory.h | 1 + src/plugins/Effect/filewriter/filewriterplugin.cpp | 4 +- src/plugins/Effect/filewriter/settingsdialog.cpp | 4 +- .../translations/filewriter_plugin_bg.ts | 8 +- .../translations/filewriter_plugin_cs.ts | 8 +- .../translations/filewriter_plugin_de.ts | 8 +- .../translations/filewriter_plugin_el.ts | 8 +- .../translations/filewriter_plugin_en.ts | 8 +- .../translations/filewriter_plugin_es.ts | 8 +- .../translations/filewriter_plugin_fi.ts | 8 +- .../translations/filewriter_plugin_fr.ts | 8 +- .../translations/filewriter_plugin_gl_ES.ts | 8 +- .../translations/filewriter_plugin_he.ts | 8 +- .../translations/filewriter_plugin_hu.ts | 8 +- .../translations/filewriter_plugin_id.ts | 8 +- .../translations/filewriter_plugin_it.ts | 8 +- .../translations/filewriter_plugin_ja.ts | 8 +- .../translations/filewriter_plugin_kk.ts | 8 +- .../translations/filewriter_plugin_lt.ts | 8 +- .../translations/filewriter_plugin_nl.ts | 8 +- .../translations/filewriter_plugin_pl_PL.ts | 8 +- .../translations/filewriter_plugin_pt.ts | 8 +- .../translations/filewriter_plugin_pt_BR.ts | 8 +- .../translations/filewriter_plugin_ru.ts | 8 +- .../translations/filewriter_plugin_sk.ts | 8 +- .../translations/filewriter_plugin_sr_BA.ts | 8 +- .../translations/filewriter_plugin_sr_RS.ts | 8 +- .../translations/filewriter_plugin_tr.ts | 8 +- .../translations/filewriter_plugin_uk_UA.ts | 8 +- .../translations/filewriter_plugin_zh_CN.ts | 8 +- .../translations/filewriter_plugin_zh_TW.ts | 8 +- src/plugins/Effect/ladspa/CMakeLists.txt | 19 +- src/plugins/Effect/ladspa/effectladspafactory.cpp | 7 +- src/plugins/Effect/ladspa/effectladspafactory.h | 3 +- .../Effect/ladspa/translations/ladspa_plugin_bg.ts | 16 +- .../Effect/ladspa/translations/ladspa_plugin_cs.ts | 16 +- .../Effect/ladspa/translations/ladspa_plugin_de.ts | 16 +- .../Effect/ladspa/translations/ladspa_plugin_el.ts | 16 +- .../Effect/ladspa/translations/ladspa_plugin_en.ts | 16 +- .../Effect/ladspa/translations/ladspa_plugin_es.ts | 16 +- .../Effect/ladspa/translations/ladspa_plugin_fi.ts | 16 +- .../Effect/ladspa/translations/ladspa_plugin_fr.ts | 16 +- .../ladspa/translations/ladspa_plugin_gl_ES.ts | 16 +- .../Effect/ladspa/translations/ladspa_plugin_he.ts | 16 +- .../Effect/ladspa/translations/ladspa_plugin_hu.ts | 16 +- .../Effect/ladspa/translations/ladspa_plugin_id.ts | 16 +- .../Effect/ladspa/translations/ladspa_plugin_it.ts | 16 +- .../Effect/ladspa/translations/ladspa_plugin_ja.ts | 16 +- .../Effect/ladspa/translations/ladspa_plugin_kk.ts | 16 +- .../Effect/ladspa/translations/ladspa_plugin_lt.ts | 16 +- .../Effect/ladspa/translations/ladspa_plugin_nl.ts | 16 +- .../ladspa/translations/ladspa_plugin_pl_PL.ts | 16 +- .../Effect/ladspa/translations/ladspa_plugin_pt.ts | 16 +- .../ladspa/translations/ladspa_plugin_pt_BR.ts | 16 +- .../Effect/ladspa/translations/ladspa_plugin_ru.ts | 16 +- .../Effect/ladspa/translations/ladspa_plugin_sk.ts | 16 +- .../ladspa/translations/ladspa_plugin_sr_BA.ts | 16 +- .../ladspa/translations/ladspa_plugin_sr_RS.ts | 16 +- .../Effect/ladspa/translations/ladspa_plugin_tr.ts | 16 +- .../ladspa/translations/ladspa_plugin_uk_UA.ts | 16 +- .../ladspa/translations/ladspa_plugin_zh_CN.ts | 16 +- .../ladspa/translations/ladspa_plugin_zh_TW.ts | 16 +- src/plugins/Effect/soxr/CMakeLists.txt | 14 +- src/plugins/Effect/soxr/effectsoxrfactory.cpp | 3 - src/plugins/Effect/soxr/effectsoxrfactory.h | 3 +- src/plugins/Effect/soxr/settingsdialog.ui | 13 +- .../Effect/soxr/translations/soxr_plugin_bg.ts | 14 +- .../Effect/soxr/translations/soxr_plugin_cs.ts | 14 +- .../Effect/soxr/translations/soxr_plugin_de.ts | 16 +- .../Effect/soxr/translations/soxr_plugin_el.ts | 16 +- .../Effect/soxr/translations/soxr_plugin_en.ts | 14 +- .../Effect/soxr/translations/soxr_plugin_es.ts | 16 +- .../Effect/soxr/translations/soxr_plugin_fi.ts | 14 +- .../Effect/soxr/translations/soxr_plugin_fr.ts | 16 +- .../Effect/soxr/translations/soxr_plugin_gl_ES.ts | 16 +- .../Effect/soxr/translations/soxr_plugin_he.ts | 16 +- .../Effect/soxr/translations/soxr_plugin_hu.ts | 14 +- .../Effect/soxr/translations/soxr_plugin_id.ts | 16 +- .../Effect/soxr/translations/soxr_plugin_it.ts | 14 +- .../Effect/soxr/translations/soxr_plugin_ja.ts | 16 +- .../Effect/soxr/translations/soxr_plugin_kk.ts | 14 +- .../Effect/soxr/translations/soxr_plugin_lt.ts | 14 +- .../Effect/soxr/translations/soxr_plugin_nl.ts | 14 +- .../Effect/soxr/translations/soxr_plugin_pl_PL.ts | 14 +- .../Effect/soxr/translations/soxr_plugin_pt.ts | 16 +- .../Effect/soxr/translations/soxr_plugin_pt_BR.ts | 16 +- .../Effect/soxr/translations/soxr_plugin_ru.ts | 16 +- .../Effect/soxr/translations/soxr_plugin_sk.ts | 14 +- .../Effect/soxr/translations/soxr_plugin_sr_BA.ts | 14 +- .../Effect/soxr/translations/soxr_plugin_sr_RS.ts | 14 +- .../Effect/soxr/translations/soxr_plugin_tr.ts | 14 +- .../Effect/soxr/translations/soxr_plugin_uk_UA.ts | 16 +- .../Effect/soxr/translations/soxr_plugin_zh_CN.ts | 16 +- .../Effect/soxr/translations/soxr_plugin_zh_TW.ts | 14 +- src/plugins/Effect/stereo/CMakeLists.txt | 19 +- src/plugins/Effect/stereo/effectstereofactory.cpp | 7 +- src/plugins/Effect/stereo/effectstereofactory.h | 5 +- .../Effect/stereo/translations/stereo_plugin_bg.ts | 10 +- .../Effect/stereo/translations/stereo_plugin_cs.ts | 10 +- .../Effect/stereo/translations/stereo_plugin_de.ts | 10 +- .../Effect/stereo/translations/stereo_plugin_el.ts | 10 +- .../Effect/stereo/translations/stereo_plugin_en.ts | 10 +- .../Effect/stereo/translations/stereo_plugin_es.ts | 10 +- .../Effect/stereo/translations/stereo_plugin_fi.ts | 10 +- .../Effect/stereo/translations/stereo_plugin_fr.ts | 10 +- .../stereo/translations/stereo_plugin_gl_ES.ts | 10 +- .../Effect/stereo/translations/stereo_plugin_he.ts | 10 +- .../Effect/stereo/translations/stereo_plugin_hu.ts | 10 +- .../Effect/stereo/translations/stereo_plugin_id.ts | 10 +- .../Effect/stereo/translations/stereo_plugin_it.ts | 10 +- .../Effect/stereo/translations/stereo_plugin_ja.ts | 10 +- .../Effect/stereo/translations/stereo_plugin_kk.ts | 10 +- .../Effect/stereo/translations/stereo_plugin_lt.ts | 10 +- .../Effect/stereo/translations/stereo_plugin_nl.ts | 10 +- .../stereo/translations/stereo_plugin_pl_PL.ts | 10 +- .../Effect/stereo/translations/stereo_plugin_pt.ts | 10 +- .../stereo/translations/stereo_plugin_pt_BR.ts | 10 +- .../Effect/stereo/translations/stereo_plugin_ru.ts | 10 +- .../Effect/stereo/translations/stereo_plugin_sk.ts | 10 +- .../stereo/translations/stereo_plugin_sr_BA.ts | 10 +- .../stereo/translations/stereo_plugin_sr_RS.ts | 10 +- .../Effect/stereo/translations/stereo_plugin_tr.ts | 10 +- .../stereo/translations/stereo_plugin_uk_UA.ts | 10 +- .../stereo/translations/stereo_plugin_zh_CN.ts | 10 +- .../stereo/translations/stereo_plugin_zh_TW.ts | 10 +- src/plugins/Engines/mplayer/CMakeLists.txt | 19 +- src/plugins/Engines/mplayer/mplayerengine.cpp | 6 +- .../Engines/mplayer/mplayerenginefactory.cpp | 5 +- src/plugins/Engines/mplayer/mplayerenginefactory.h | 1 + .../Engines/mplayer/mplayermetadatamodel.cpp | 2 +- .../mplayer/translations/mplayer_plugin_bg.ts | 12 +- .../mplayer/translations/mplayer_plugin_cs.ts | 12 +- .../mplayer/translations/mplayer_plugin_de.ts | 12 +- .../mplayer/translations/mplayer_plugin_el.ts | 12 +- .../mplayer/translations/mplayer_plugin_en.ts | 12 +- .../mplayer/translations/mplayer_plugin_es.ts | 12 +- .../mplayer/translations/mplayer_plugin_fi.ts | 12 +- .../mplayer/translations/mplayer_plugin_fr.ts | 12 +- .../mplayer/translations/mplayer_plugin_gl_ES.ts | 12 +- .../mplayer/translations/mplayer_plugin_he.ts | 12 +- .../mplayer/translations/mplayer_plugin_hu.ts | 12 +- .../mplayer/translations/mplayer_plugin_id.ts | 12 +- .../mplayer/translations/mplayer_plugin_it.ts | 12 +- .../mplayer/translations/mplayer_plugin_ja.ts | 12 +- .../mplayer/translations/mplayer_plugin_kk.ts | 12 +- .../mplayer/translations/mplayer_plugin_lt.ts | 12 +- .../mplayer/translations/mplayer_plugin_nl.ts | 12 +- .../mplayer/translations/mplayer_plugin_pl_PL.ts | 12 +- .../mplayer/translations/mplayer_plugin_pt.ts | 12 +- .../mplayer/translations/mplayer_plugin_pt_BR.ts | 12 +- .../mplayer/translations/mplayer_plugin_ru.ts | 12 +- .../mplayer/translations/mplayer_plugin_sk.ts | 12 +- .../mplayer/translations/mplayer_plugin_sr_BA.ts | 12 +- .../mplayer/translations/mplayer_plugin_sr_RS.ts | 12 +- .../mplayer/translations/mplayer_plugin_tr.ts | 12 +- .../mplayer/translations/mplayer_plugin_uk_UA.ts | 12 +- .../mplayer/translations/mplayer_plugin_zh_CN.ts | 12 +- .../mplayer/translations/mplayer_plugin_zh_TW.ts | 12 +- .../FileDialogs/QmmpFileDialog/CMakeLists.txt | 19 +- .../FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp | 3 +- .../FileDialogs/QmmpFileDialog/qmmpfiledialog.h | 5 +- .../FileDialogs/QmmpFileDialog/qmmpfiledialog.ui | 260 ++++++------- .../QmmpFileDialog/qmmpfiledialogimpl.cpp | 32 +- .../QmmpFileDialog/qmmpfiledialogimpl.h | 2 + .../translations/qmmp_file_dialog_plugin_bg.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_cs.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_de.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_el.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_en.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_es.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_fi.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_fr.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_gl_ES.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_he.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_hu.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_id.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_it.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_ja.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_kk.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_lt.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_nl.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_pl_PL.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_pt.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_pt_BR.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_ru.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_sk.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_sr_BA.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_sr_RS.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_tr.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_uk_UA.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_zh_CN.ts | 42 +-- .../translations/qmmp_file_dialog_plugin_zh_TW.ts | 42 +-- .../FileDialogs/TwoPanelFileDialog/CMakeLists.txt | 19 +- .../two_panel_file_dialog_plugin_bg.ts | 10 +- .../two_panel_file_dialog_plugin_cs.ts | 10 +- .../two_panel_file_dialog_plugin_de.ts | 10 +- .../two_panel_file_dialog_plugin_el.ts | 10 +- .../two_panel_file_dialog_plugin_en.ts | 10 +- .../two_panel_file_dialog_plugin_es.ts | 10 +- .../two_panel_file_dialog_plugin_fi.ts | 10 +- .../two_panel_file_dialog_plugin_fr.ts | 10 +- .../two_panel_file_dialog_plugin_gl_ES.ts | 10 +- .../two_panel_file_dialog_plugin_he.ts | 10 +- .../two_panel_file_dialog_plugin_hu.ts | 10 +- .../two_panel_file_dialog_plugin_id.ts | 10 +- .../two_panel_file_dialog_plugin_it.ts | 10 +- .../two_panel_file_dialog_plugin_ja.ts | 10 +- .../two_panel_file_dialog_plugin_kk.ts | 10 +- .../two_panel_file_dialog_plugin_lt.ts | 10 +- .../two_panel_file_dialog_plugin_nl.ts | 10 +- .../two_panel_file_dialog_plugin_pl_PL.ts | 10 +- .../two_panel_file_dialog_plugin_pt.ts | 10 +- .../two_panel_file_dialog_plugin_pt_BR.ts | 10 +- .../two_panel_file_dialog_plugin_ru.ts | 10 +- .../two_panel_file_dialog_plugin_sk.ts | 10 +- .../two_panel_file_dialog_plugin_sr_BA.ts | 10 +- .../two_panel_file_dialog_plugin_sr_RS.ts | 10 +- .../two_panel_file_dialog_plugin_tr.ts | 10 +- .../two_panel_file_dialog_plugin_uk_UA.ts | 10 +- .../two_panel_file_dialog_plugin_zh_CN.ts | 10 +- .../two_panel_file_dialog_plugin_zh_TW.ts | 10 +- .../TwoPanelFileDialog/twopanelfiledialog.cpp | 2 - .../TwoPanelFileDialog/twopanelfiledialog.h | 1 + .../TwoPanelFileDialog/twopanelfiledialogimpl.cpp | 4 - src/plugins/General/CMakeLists.txt | 29 +- src/plugins/General/General.pro | 4 - src/plugins/General/converter/CMakeLists.txt | 21 +- src/plugins/General/converter/converter.cpp | 16 +- src/plugins/General/converter/converterdialog.cpp | 8 +- src/plugins/General/converter/converterfactory.cpp | 5 +- src/plugins/General/converter/converterfactory.h | 1 + .../converter/translations/converter_plugin_bg.ts | 24 +- .../converter/translations/converter_plugin_cs.ts | 24 +- .../converter/translations/converter_plugin_de.ts | 24 +- .../converter/translations/converter_plugin_el.ts | 24 +- .../converter/translations/converter_plugin_en.ts | 24 +- .../converter/translations/converter_plugin_es.ts | 24 +- .../converter/translations/converter_plugin_fi.ts | 24 +- .../converter/translations/converter_plugin_fr.ts | 24 +- .../translations/converter_plugin_gl_ES.ts | 24 +- .../converter/translations/converter_plugin_he.ts | 24 +- .../converter/translations/converter_plugin_hu.ts | 24 +- .../converter/translations/converter_plugin_id.ts | 24 +- .../converter/translations/converter_plugin_it.ts | 24 +- .../converter/translations/converter_plugin_ja.ts | 24 +- .../converter/translations/converter_plugin_kk.ts | 24 +- .../converter/translations/converter_plugin_lt.ts | 24 +- .../converter/translations/converter_plugin_nl.ts | 24 +- .../translations/converter_plugin_pl_PL.ts | 24 +- .../converter/translations/converter_plugin_pt.ts | 24 +- .../translations/converter_plugin_pt_BR.ts | 24 +- .../converter/translations/converter_plugin_ru.ts | 24 +- .../converter/translations/converter_plugin_sk.ts | 24 +- .../translations/converter_plugin_sr_BA.ts | 24 +- .../translations/converter_plugin_sr_RS.ts | 24 +- .../converter/translations/converter_plugin_tr.ts | 24 +- .../translations/converter_plugin_uk_UA.ts | 24 +- .../translations/converter_plugin_zh_CN.ts | 24 +- .../translations/converter_plugin_zh_TW.ts | 24 +- src/plugins/General/copypaste/CMakeLists.txt | 19 +- src/plugins/General/copypaste/copypastefactory.cpp | 7 +- src/plugins/General/copypaste/copypastefactory.h | 1 + .../copypaste/translations/copypaste_plugin_bg.ts | 10 +- .../copypaste/translations/copypaste_plugin_cs.ts | 10 +- .../copypaste/translations/copypaste_plugin_de.ts | 10 +- .../copypaste/translations/copypaste_plugin_el.ts | 10 +- .../copypaste/translations/copypaste_plugin_en.ts | 10 +- .../copypaste/translations/copypaste_plugin_es.ts | 10 +- .../copypaste/translations/copypaste_plugin_fi.ts | 10 +- .../copypaste/translations/copypaste_plugin_fr.ts | 10 +- .../translations/copypaste_plugin_gl_ES.ts | 10 +- .../copypaste/translations/copypaste_plugin_he.ts | 10 +- .../copypaste/translations/copypaste_plugin_hu.ts | 10 +- .../copypaste/translations/copypaste_plugin_id.ts | 10 +- .../copypaste/translations/copypaste_plugin_it.ts | 10 +- .../copypaste/translations/copypaste_plugin_ja.ts | 10 +- .../copypaste/translations/copypaste_plugin_kk.ts | 10 +- .../copypaste/translations/copypaste_plugin_lt.ts | 10 +- .../copypaste/translations/copypaste_plugin_nl.ts | 10 +- .../translations/copypaste_plugin_pl_PL.ts | 10 +- .../copypaste/translations/copypaste_plugin_pt.ts | 10 +- .../translations/copypaste_plugin_pt_BR.ts | 10 +- .../copypaste/translations/copypaste_plugin_ru.ts | 10 +- .../copypaste/translations/copypaste_plugin_sk.ts | 10 +- .../translations/copypaste_plugin_sr_BA.ts | 10 +- .../translations/copypaste_plugin_sr_RS.ts | 10 +- .../copypaste/translations/copypaste_plugin_tr.ts | 10 +- .../translations/copypaste_plugin_uk_UA.ts | 10 +- .../translations/copypaste_plugin_zh_CN.ts | 10 +- .../translations/copypaste_plugin_zh_TW.ts | 10 +- src/plugins/General/covermanager/CMakeLists.txt | 19 +- .../General/covermanager/covermanagerfactory.cpp | 7 +- .../General/covermanager/covermanagerfactory.h | 1 + .../translations/covermanager_plugin_bg.ts | 8 +- .../translations/covermanager_plugin_cs.ts | 8 +- .../translations/covermanager_plugin_de.ts | 8 +- .../translations/covermanager_plugin_el.ts | 8 +- .../translations/covermanager_plugin_en.ts | 8 +- .../translations/covermanager_plugin_es.ts | 8 +- .../translations/covermanager_plugin_fi.ts | 8 +- .../translations/covermanager_plugin_fr.ts | 8 +- .../translations/covermanager_plugin_gl_ES.ts | 8 +- .../translations/covermanager_plugin_he.ts | 8 +- .../translations/covermanager_plugin_hu.ts | 8 +- .../translations/covermanager_plugin_id.ts | 8 +- .../translations/covermanager_plugin_it.ts | 8 +- .../translations/covermanager_plugin_ja.ts | 8 +- .../translations/covermanager_plugin_kk.ts | 8 +- .../translations/covermanager_plugin_lt.ts | 8 +- .../translations/covermanager_plugin_nl.ts | 8 +- .../translations/covermanager_plugin_pl_PL.ts | 8 +- .../translations/covermanager_plugin_pt.ts | 8 +- .../translations/covermanager_plugin_pt_BR.ts | 8 +- .../translations/covermanager_plugin_ru.ts | 8 +- .../translations/covermanager_plugin_sk.ts | 8 +- .../translations/covermanager_plugin_sr_BA.ts | 8 +- .../translations/covermanager_plugin_sr_RS.ts | 8 +- .../translations/covermanager_plugin_tr.ts | 8 +- .../translations/covermanager_plugin_uk_UA.ts | 8 +- .../translations/covermanager_plugin_zh_CN.ts | 8 +- .../translations/covermanager_plugin_zh_TW.ts | 8 +- src/plugins/General/fileops/CMakeLists.txt | 21 +- src/plugins/General/fileops/fileopsfactory.cpp | 7 +- src/plugins/General/fileops/fileopsfactory.h | 1 + src/plugins/General/fileops/settingsdialog.cpp | 8 +- .../fileops/translations/fileops_plugin_bg.ts | 8 +- .../fileops/translations/fileops_plugin_cs.ts | 8 +- .../fileops/translations/fileops_plugin_de.ts | 8 +- .../fileops/translations/fileops_plugin_el.ts | 8 +- .../fileops/translations/fileops_plugin_en.ts | 8 +- .../fileops/translations/fileops_plugin_es.ts | 8 +- .../fileops/translations/fileops_plugin_fi.ts | 8 +- .../fileops/translations/fileops_plugin_fr.ts | 8 +- .../fileops/translations/fileops_plugin_gl_ES.ts | 8 +- .../fileops/translations/fileops_plugin_he.ts | 8 +- .../fileops/translations/fileops_plugin_hu.ts | 8 +- .../fileops/translations/fileops_plugin_id.ts | 8 +- .../fileops/translations/fileops_plugin_it.ts | 8 +- .../fileops/translations/fileops_plugin_ja.ts | 8 +- .../fileops/translations/fileops_plugin_kk.ts | 8 +- .../fileops/translations/fileops_plugin_lt.ts | 8 +- .../fileops/translations/fileops_plugin_nl.ts | 8 +- .../fileops/translations/fileops_plugin_pl_PL.ts | 8 +- .../fileops/translations/fileops_plugin_pt.ts | 8 +- .../fileops/translations/fileops_plugin_pt_BR.ts | 8 +- .../fileops/translations/fileops_plugin_ru.ts | 8 +- .../fileops/translations/fileops_plugin_sk.ts | 8 +- .../fileops/translations/fileops_plugin_sr_BA.ts | 8 +- .../fileops/translations/fileops_plugin_sr_RS.ts | 8 +- .../fileops/translations/fileops_plugin_tr.ts | 8 +- .../fileops/translations/fileops_plugin_uk_UA.ts | 8 +- .../fileops/translations/fileops_plugin_zh_CN.ts | 8 +- .../fileops/translations/fileops_plugin_zh_TW.ts | 8 +- src/plugins/General/gnomehotkey/CMakeLists.txt | 19 +- .../General/gnomehotkey/gnomehotkeyfactory.cpp | 5 +- .../General/gnomehotkey/gnomehotkeyfactory.h | 1 + .../translations/gnomehotkey_plugin_bg.ts | 10 +- .../translations/gnomehotkey_plugin_cs.ts | 10 +- .../translations/gnomehotkey_plugin_de.ts | 10 +- .../translations/gnomehotkey_plugin_el.ts | 10 +- .../translations/gnomehotkey_plugin_en.ts | 10 +- .../translations/gnomehotkey_plugin_es.ts | 10 +- .../translations/gnomehotkey_plugin_fi.ts | 10 +- .../translations/gnomehotkey_plugin_fr.ts | 10 +- .../translations/gnomehotkey_plugin_gl_ES.ts | 10 +- .../translations/gnomehotkey_plugin_he.ts | 10 +- .../translations/gnomehotkey_plugin_hu.ts | 10 +- .../translations/gnomehotkey_plugin_id.ts | 10 +- .../translations/gnomehotkey_plugin_it.ts | 10 +- .../translations/gnomehotkey_plugin_ja.ts | 10 +- .../translations/gnomehotkey_plugin_kk.ts | 10 +- .../translations/gnomehotkey_plugin_lt.ts | 10 +- .../translations/gnomehotkey_plugin_nl.ts | 10 +- .../translations/gnomehotkey_plugin_pl_PL.ts | 10 +- .../translations/gnomehotkey_plugin_pt.ts | 10 +- .../translations/gnomehotkey_plugin_pt_BR.ts | 10 +- .../translations/gnomehotkey_plugin_ru.ts | 10 +- .../translations/gnomehotkey_plugin_sk.ts | 10 +- .../translations/gnomehotkey_plugin_sr_BA.ts | 10 +- .../translations/gnomehotkey_plugin_sr_RS.ts | 10 +- .../translations/gnomehotkey_plugin_tr.ts | 10 +- .../translations/gnomehotkey_plugin_uk_UA.ts | 10 +- .../translations/gnomehotkey_plugin_zh_CN.ts | 10 +- .../translations/gnomehotkey_plugin_zh_TW.ts | 10 +- src/plugins/General/hal/CMakeLists.txt | 21 +- src/plugins/General/hal/halfactory.cpp | 7 +- src/plugins/General/hal/halfactory.h | 1 + .../General/hal/translations/hal_plugin_bg.ts | 12 +- .../General/hal/translations/hal_plugin_cs.ts | 12 +- .../General/hal/translations/hal_plugin_de.ts | 12 +- .../General/hal/translations/hal_plugin_el.ts | 12 +- .../General/hal/translations/hal_plugin_en.ts | 12 +- .../General/hal/translations/hal_plugin_es.ts | 12 +- .../General/hal/translations/hal_plugin_fi.ts | 12 +- .../General/hal/translations/hal_plugin_fr.ts | 12 +- .../General/hal/translations/hal_plugin_gl_ES.ts | 12 +- .../General/hal/translations/hal_plugin_he.ts | 12 +- .../General/hal/translations/hal_plugin_hu.ts | 12 +- .../General/hal/translations/hal_plugin_id.ts | 12 +- .../General/hal/translations/hal_plugin_it.ts | 12 +- .../General/hal/translations/hal_plugin_ja.ts | 12 +- .../General/hal/translations/hal_plugin_kk.ts | 12 +- .../General/hal/translations/hal_plugin_lt.ts | 12 +- .../General/hal/translations/hal_plugin_nl.ts | 12 +- .../General/hal/translations/hal_plugin_pl_PL.ts | 12 +- .../General/hal/translations/hal_plugin_pt.ts | 12 +- .../General/hal/translations/hal_plugin_pt_BR.ts | 12 +- .../General/hal/translations/hal_plugin_ru.ts | 12 +- .../General/hal/translations/hal_plugin_sk.ts | 12 +- .../General/hal/translations/hal_plugin_sr_BA.ts | 12 +- .../General/hal/translations/hal_plugin_sr_RS.ts | 12 +- .../General/hal/translations/hal_plugin_tr.ts | 12 +- .../General/hal/translations/hal_plugin_uk_UA.ts | 12 +- .../General/hal/translations/hal_plugin_zh_CN.ts | 12 +- .../General/hal/translations/hal_plugin_zh_TW.ts | 12 +- src/plugins/General/hotkey/CMakeLists.txt | 20 +- src/plugins/General/hotkey/hotkey.pro | 1 + src/plugins/General/hotkey/hotkeyfactory.cpp | 7 +- src/plugins/General/hotkey/hotkeyfactory.h | 1 + src/plugins/General/hotkey/hotkeymanager.h | 5 +- src/plugins/General/hotkey/hotkeymanager_x11.cpp | 13 +- src/plugins/General/hotkey/settingsdialog.cpp | 4 +- .../hotkey/translations/hotkey_plugin_bg.ts | 10 +- .../hotkey/translations/hotkey_plugin_cs.ts | 10 +- .../hotkey/translations/hotkey_plugin_de.ts | 10 +- .../hotkey/translations/hotkey_plugin_el.ts | 10 +- .../hotkey/translations/hotkey_plugin_en.ts | 10 +- .../hotkey/translations/hotkey_plugin_es.ts | 10 +- .../hotkey/translations/hotkey_plugin_fi.ts | 10 +- .../hotkey/translations/hotkey_plugin_fr.ts | 10 +- .../hotkey/translations/hotkey_plugin_gl_ES.ts | 10 +- .../hotkey/translations/hotkey_plugin_he.ts | 10 +- .../hotkey/translations/hotkey_plugin_hu.ts | 10 +- .../hotkey/translations/hotkey_plugin_id.ts | 10 +- .../hotkey/translations/hotkey_plugin_it.ts | 10 +- .../hotkey/translations/hotkey_plugin_ja.ts | 10 +- .../hotkey/translations/hotkey_plugin_kk.ts | 10 +- .../hotkey/translations/hotkey_plugin_lt.ts | 10 +- .../hotkey/translations/hotkey_plugin_nl.ts | 10 +- .../hotkey/translations/hotkey_plugin_pl_PL.ts | 10 +- .../hotkey/translations/hotkey_plugin_pt.ts | 10 +- .../hotkey/translations/hotkey_plugin_pt_BR.ts | 10 +- .../hotkey/translations/hotkey_plugin_ru.ts | 10 +- .../hotkey/translations/hotkey_plugin_sk.ts | 10 +- .../hotkey/translations/hotkey_plugin_sr_BA.ts | 10 +- .../hotkey/translations/hotkey_plugin_sr_RS.ts | 10 +- .../hotkey/translations/hotkey_plugin_tr.ts | 10 +- .../hotkey/translations/hotkey_plugin_uk_UA.ts | 10 +- .../hotkey/translations/hotkey_plugin_zh_CN.ts | 10 +- .../hotkey/translations/hotkey_plugin_zh_TW.ts | 10 +- src/plugins/General/kdenotify/CMakeLists.txt | 31 +- src/plugins/General/kdenotify/kdenotifyfactory.cpp | 5 +- src/plugins/General/kdenotify/kdenotifyfactory.h | 5 +- .../kdenotify/translations/kdenotify_plugin_bg.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_cs.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_de.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_el.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_en.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_es.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_fi.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_fr.ts | 6 +- .../translations/kdenotify_plugin_gl_ES.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_he.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_hu.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_id.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_it.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_ja.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_kk.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_lt.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_nl.ts | 6 +- .../translations/kdenotify_plugin_pl_PL.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_pt.ts | 6 +- .../translations/kdenotify_plugin_pt_BR.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_ru.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_sk.ts | 6 +- .../translations/kdenotify_plugin_sr_BA.ts | 6 +- .../translations/kdenotify_plugin_sr_RS.ts | 6 +- .../kdenotify/translations/kdenotify_plugin_tr.ts | 6 +- .../translations/kdenotify_plugin_uk_UA.ts | 6 +- .../translations/kdenotify_plugin_zh_CN.ts | 6 +- .../translations/kdenotify_plugin_zh_TW.ts | 6 +- src/plugins/General/lyrics/CMakeLists.txt | 25 +- src/plugins/General/lyrics/lyricsfactory.cpp | 7 +- src/plugins/General/lyrics/lyricsfactory.h | 1 + src/plugins/General/lyrics/lyricswindow.cpp | 4 +- .../lyrics/translations/lyrics_plugin_bg.ts | 10 +- .../lyrics/translations/lyrics_plugin_cs.ts | 10 +- .../lyrics/translations/lyrics_plugin_de.ts | 10 +- .../lyrics/translations/lyrics_plugin_el.ts | 10 +- .../lyrics/translations/lyrics_plugin_en.ts | 10 +- .../lyrics/translations/lyrics_plugin_es.ts | 10 +- .../lyrics/translations/lyrics_plugin_fi.ts | 10 +- .../lyrics/translations/lyrics_plugin_fr.ts | 10 +- .../lyrics/translations/lyrics_plugin_gl_ES.ts | 10 +- .../lyrics/translations/lyrics_plugin_he.ts | 10 +- .../lyrics/translations/lyrics_plugin_hu.ts | 10 +- .../lyrics/translations/lyrics_plugin_id.ts | 10 +- .../lyrics/translations/lyrics_plugin_it.ts | 10 +- .../lyrics/translations/lyrics_plugin_ja.ts | 10 +- .../lyrics/translations/lyrics_plugin_kk.ts | 10 +- .../lyrics/translations/lyrics_plugin_lt.ts | 10 +- .../lyrics/translations/lyrics_plugin_nl.ts | 10 +- .../lyrics/translations/lyrics_plugin_pl_PL.ts | 10 +- .../lyrics/translations/lyrics_plugin_pt.ts | 10 +- .../lyrics/translations/lyrics_plugin_pt_BR.ts | 10 +- .../lyrics/translations/lyrics_plugin_ru.ts | 10 +- .../lyrics/translations/lyrics_plugin_sk.ts | 10 +- .../lyrics/translations/lyrics_plugin_sr_BA.ts | 10 +- .../lyrics/translations/lyrics_plugin_sr_RS.ts | 10 +- .../lyrics/translations/lyrics_plugin_tr.ts | 10 +- .../lyrics/translations/lyrics_plugin_uk_UA.ts | 10 +- .../lyrics/translations/lyrics_plugin_zh_CN.ts | 10 +- .../lyrics/translations/lyrics_plugin_zh_TW.ts | 10 +- src/plugins/General/mpris/CMakeLists.txt | 23 +- src/plugins/General/mpris/mprisfactory.cpp | 7 +- src/plugins/General/mpris/mprisfactory.h | 1 + .../General/mpris/translations/mpris_plugin_bg.ts | 8 +- .../General/mpris/translations/mpris_plugin_cs.ts | 8 +- .../General/mpris/translations/mpris_plugin_de.ts | 8 +- .../General/mpris/translations/mpris_plugin_el.ts | 8 +- .../General/mpris/translations/mpris_plugin_en.ts | 8 +- .../General/mpris/translations/mpris_plugin_es.ts | 8 +- .../General/mpris/translations/mpris_plugin_fi.ts | 8 +- .../General/mpris/translations/mpris_plugin_fr.ts | 8 +- .../mpris/translations/mpris_plugin_gl_ES.ts | 8 +- .../General/mpris/translations/mpris_plugin_he.ts | 8 +- .../General/mpris/translations/mpris_plugin_hu.ts | 8 +- .../General/mpris/translations/mpris_plugin_id.ts | 8 +- .../General/mpris/translations/mpris_plugin_it.ts | 8 +- .../General/mpris/translations/mpris_plugin_ja.ts | 8 +- .../General/mpris/translations/mpris_plugin_kk.ts | 8 +- .../General/mpris/translations/mpris_plugin_lt.ts | 8 +- .../General/mpris/translations/mpris_plugin_nl.ts | 8 +- .../mpris/translations/mpris_plugin_pl_PL.ts | 8 +- .../General/mpris/translations/mpris_plugin_pt.ts | 8 +- .../mpris/translations/mpris_plugin_pt_BR.ts | 8 +- .../General/mpris/translations/mpris_plugin_ru.ts | 8 +- .../General/mpris/translations/mpris_plugin_sk.ts | 8 +- .../mpris/translations/mpris_plugin_sr_BA.ts | 8 +- .../mpris/translations/mpris_plugin_sr_RS.ts | 8 +- .../General/mpris/translations/mpris_plugin_tr.ts | 8 +- .../mpris/translations/mpris_plugin_uk_UA.ts | 8 +- .../mpris/translations/mpris_plugin_zh_CN.ts | 8 +- .../mpris/translations/mpris_plugin_zh_TW.ts | 8 +- src/plugins/General/notifier/CMakeLists.txt | 29 +- src/plugins/General/notifier/notifier.cpp | 2 +- src/plugins/General/notifier/notifier.pro | 5 +- src/plugins/General/notifier/notifierfactory.cpp | 7 +- src/plugins/General/notifier/notifierfactory.h | 1 + .../notifier/translations/notifier_plugin_bg.ts | 8 +- .../notifier/translations/notifier_plugin_cs.ts | 8 +- .../notifier/translations/notifier_plugin_de.ts | 8 +- .../notifier/translations/notifier_plugin_el.ts | 8 +- .../notifier/translations/notifier_plugin_en.ts | 8 +- .../notifier/translations/notifier_plugin_es.ts | 8 +- .../notifier/translations/notifier_plugin_fi.ts | 8 +- .../notifier/translations/notifier_plugin_fr.ts | 8 +- .../notifier/translations/notifier_plugin_gl_ES.ts | 8 +- .../notifier/translations/notifier_plugin_he.ts | 8 +- .../notifier/translations/notifier_plugin_hu.ts | 8 +- .../notifier/translations/notifier_plugin_id.ts | 8 +- .../notifier/translations/notifier_plugin_it.ts | 8 +- .../notifier/translations/notifier_plugin_ja.ts | 8 +- .../notifier/translations/notifier_plugin_kk.ts | 8 +- .../notifier/translations/notifier_plugin_lt.ts | 8 +- .../notifier/translations/notifier_plugin_nl.ts | 8 +- .../notifier/translations/notifier_plugin_pl_PL.ts | 8 +- .../notifier/translations/notifier_plugin_pt.ts | 8 +- .../notifier/translations/notifier_plugin_pt_BR.ts | 8 +- .../notifier/translations/notifier_plugin_ru.ts | 8 +- .../notifier/translations/notifier_plugin_sk.ts | 8 +- .../notifier/translations/notifier_plugin_sr_BA.ts | 8 +- .../notifier/translations/notifier_plugin_sr_RS.ts | 8 +- .../notifier/translations/notifier_plugin_tr.ts | 8 +- .../notifier/translations/notifier_plugin_uk_UA.ts | 8 +- .../notifier/translations/notifier_plugin_zh_CN.ts | 8 +- .../notifier/translations/notifier_plugin_zh_TW.ts | 8 +- src/plugins/General/rgscan/CMakeLists.txt | 21 +- src/plugins/General/rgscan/rgscandialog.cpp | 23 +- src/plugins/General/rgscan/rgscandialog.h | 5 - src/plugins/General/rgscan/rgscanfactory.cpp | 7 +- src/plugins/General/rgscan/rgscanfactory.h | 1 + .../rgscan/translations/rgscan_plugin_bg.ts | 30 +- .../rgscan/translations/rgscan_plugin_cs.ts | 30 +- .../rgscan/translations/rgscan_plugin_de.ts | 30 +- .../rgscan/translations/rgscan_plugin_el.ts | 30 +- .../rgscan/translations/rgscan_plugin_en.ts | 30 +- .../rgscan/translations/rgscan_plugin_es.ts | 30 +- .../rgscan/translations/rgscan_plugin_fi.ts | 30 +- .../rgscan/translations/rgscan_plugin_fr.ts | 30 +- .../rgscan/translations/rgscan_plugin_gl_ES.ts | 30 +- .../rgscan/translations/rgscan_plugin_he.ts | 30 +- .../rgscan/translations/rgscan_plugin_hu.ts | 30 +- .../rgscan/translations/rgscan_plugin_id.ts | 30 +- .../rgscan/translations/rgscan_plugin_it.ts | 30 +- .../rgscan/translations/rgscan_plugin_ja.ts | 30 +- .../rgscan/translations/rgscan_plugin_kk.ts | 30 +- .../rgscan/translations/rgscan_plugin_lt.ts | 30 +- .../rgscan/translations/rgscan_plugin_nl.ts | 30 +- .../rgscan/translations/rgscan_plugin_pl_PL.ts | 30 +- .../rgscan/translations/rgscan_plugin_pt.ts | 30 +- .../rgscan/translations/rgscan_plugin_pt_BR.ts | 30 +- .../rgscan/translations/rgscan_plugin_ru.ts | 30 +- .../rgscan/translations/rgscan_plugin_sk.ts | 30 +- .../rgscan/translations/rgscan_plugin_sr_BA.ts | 30 +- .../rgscan/translations/rgscan_plugin_sr_RS.ts | 30 +- .../rgscan/translations/rgscan_plugin_tr.ts | 30 +- .../rgscan/translations/rgscan_plugin_uk_UA.ts | 30 +- .../rgscan/translations/rgscan_plugin_zh_CN.ts | 30 +- .../rgscan/translations/rgscan_plugin_zh_TW.ts | 30 +- src/plugins/General/scrobbler/CMakeLists.txt | 21 +- src/plugins/General/scrobbler/scrobbler.cpp | 31 +- src/plugins/General/scrobbler/scrobblercache.cpp | 2 +- src/plugins/General/scrobbler/scrobblerfactory.cpp | 7 +- src/plugins/General/scrobbler/scrobblerfactory.h | 1 + .../scrobbler/translations/scrobbler_plugin_bg.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_cs.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_de.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_el.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_en.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_es.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_fi.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_fr.ts | 8 +- .../translations/scrobbler_plugin_gl_ES.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_he.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_hu.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_id.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_it.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_ja.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_kk.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_lt.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_nl.ts | 8 +- .../translations/scrobbler_plugin_pl_PL.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_pt.ts | 8 +- .../translations/scrobbler_plugin_pt_BR.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_ru.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_sk.ts | 8 +- .../translations/scrobbler_plugin_sr_BA.ts | 8 +- .../translations/scrobbler_plugin_sr_RS.ts | 8 +- .../scrobbler/translations/scrobbler_plugin_tr.ts | 8 +- .../translations/scrobbler_plugin_uk_UA.ts | 8 +- .../translations/scrobbler_plugin_zh_CN.ts | 8 +- .../translations/scrobbler_plugin_zh_TW.ts | 8 +- src/plugins/General/statusicon/CMakeLists.txt | 19 +- src/plugins/General/statusicon/qmmptrayicon.cpp | 34 +- src/plugins/General/statusicon/qmmptrayicon.h | 6 +- src/plugins/General/statusicon/settingsdialog.cpp | 4 +- src/plugins/General/statusicon/statusicon.cpp | 2 +- .../General/statusicon/statusiconfactory.cpp | 7 +- src/plugins/General/statusicon/statusiconfactory.h | 1 + .../General/statusicon/statusiconpopupwidget.cpp | 3 +- .../General/statusicon/statusiconpopupwidget.h | 4 +- .../translations/statusicon_plugin_bg.ts | 12 +- .../translations/statusicon_plugin_cs.ts | 12 +- .../translations/statusicon_plugin_de.ts | 12 +- .../translations/statusicon_plugin_el.ts | 12 +- .../translations/statusicon_plugin_en.ts | 12 +- .../translations/statusicon_plugin_es.ts | 12 +- .../translations/statusicon_plugin_fi.ts | 12 +- .../translations/statusicon_plugin_fr.ts | 12 +- .../translations/statusicon_plugin_gl_ES.ts | 12 +- .../translations/statusicon_plugin_he.ts | 12 +- .../translations/statusicon_plugin_hu.ts | 12 +- .../translations/statusicon_plugin_id.ts | 12 +- .../translations/statusicon_plugin_it.ts | 12 +- .../translations/statusicon_plugin_ja.ts | 12 +- .../translations/statusicon_plugin_kk.ts | 12 +- .../translations/statusicon_plugin_lt.ts | 12 +- .../translations/statusicon_plugin_nl.ts | 12 +- .../translations/statusicon_plugin_pl_PL.ts | 12 +- .../translations/statusicon_plugin_pt.ts | 12 +- .../translations/statusicon_plugin_pt_BR.ts | 12 +- .../translations/statusicon_plugin_ru.ts | 12 +- .../translations/statusicon_plugin_sk.ts | 12 +- .../translations/statusicon_plugin_sr_BA.ts | 12 +- .../translations/statusicon_plugin_sr_RS.ts | 12 +- .../translations/statusicon_plugin_tr.ts | 12 +- .../translations/statusicon_plugin_uk_UA.ts | 12 +- .../translations/statusicon_plugin_zh_CN.ts | 12 +- .../translations/statusicon_plugin_zh_TW.ts | 12 +- src/plugins/General/streambrowser/CMakeLists.txt | 25 +- .../General/streambrowser/streambrowserfactory.cpp | 7 +- .../General/streambrowser/streambrowserfactory.h | 1 + src/plugins/General/streambrowser/streamwindow.cpp | 7 +- .../translations/streambrowser_plugin_bg.ts | 38 +- .../translations/streambrowser_plugin_cs.ts | 38 +- .../translations/streambrowser_plugin_de.ts | 38 +- .../translations/streambrowser_plugin_el.ts | 38 +- .../translations/streambrowser_plugin_en.ts | 38 +- .../translations/streambrowser_plugin_es.ts | 38 +- .../translations/streambrowser_plugin_fi.ts | 38 +- .../translations/streambrowser_plugin_fr.ts | 38 +- .../translations/streambrowser_plugin_gl_ES.ts | 38 +- .../translations/streambrowser_plugin_he.ts | 38 +- .../translations/streambrowser_plugin_hu.ts | 38 +- .../translations/streambrowser_plugin_id.ts | 38 +- .../translations/streambrowser_plugin_it.ts | 38 +- .../translations/streambrowser_plugin_ja.ts | 38 +- .../translations/streambrowser_plugin_kk.ts | 38 +- .../translations/streambrowser_plugin_lt.ts | 38 +- .../translations/streambrowser_plugin_nl.ts | 38 +- .../translations/streambrowser_plugin_pl_PL.ts | 38 +- .../translations/streambrowser_plugin_pt.ts | 38 +- .../translations/streambrowser_plugin_pt_BR.ts | 38 +- .../translations/streambrowser_plugin_ru.ts | 38 +- .../translations/streambrowser_plugin_sk.ts | 38 +- .../translations/streambrowser_plugin_sr_BA.ts | 38 +- .../translations/streambrowser_plugin_sr_RS.ts | 38 +- .../translations/streambrowser_plugin_tr.ts | 38 +- .../translations/streambrowser_plugin_uk_UA.ts | 38 +- .../translations/streambrowser_plugin_zh_CN.ts | 38 +- .../translations/streambrowser_plugin_zh_TW.ts | 38 +- src/plugins/General/trackchange/CMakeLists.txt | 21 +- src/plugins/General/trackchange/trackchange.pro | 27 +- .../General/trackchange/trackchangefactory.cpp | 7 +- .../General/trackchange/trackchangefactory.h | 1 + .../translations/trackchange_plugin_bg.ts | 10 +- .../translations/trackchange_plugin_cs.ts | 10 +- .../translations/trackchange_plugin_de.ts | 10 +- .../translations/trackchange_plugin_el.ts | 10 +- .../translations/trackchange_plugin_en.ts | 10 +- .../translations/trackchange_plugin_es.ts | 10 +- .../translations/trackchange_plugin_fi.ts | 10 +- .../translations/trackchange_plugin_fr.ts | 10 +- .../translations/trackchange_plugin_gl_ES.ts | 10 +- .../translations/trackchange_plugin_he.ts | 10 +- .../translations/trackchange_plugin_hu.ts | 10 +- .../translations/trackchange_plugin_id.ts | 10 +- .../translations/trackchange_plugin_it.ts | 10 +- .../translations/trackchange_plugin_ja.ts | 10 +- .../translations/trackchange_plugin_kk.ts | 10 +- .../translations/trackchange_plugin_lt.ts | 10 +- .../translations/trackchange_plugin_nl.ts | 10 +- .../translations/trackchange_plugin_pl_PL.ts | 10 +- .../translations/trackchange_plugin_pt.ts | 10 +- .../translations/trackchange_plugin_pt_BR.ts | 10 +- .../translations/trackchange_plugin_ru.ts | 10 +- .../translations/trackchange_plugin_sk.ts | 10 +- .../translations/trackchange_plugin_sr_BA.ts | 10 +- .../translations/trackchange_plugin_sr_RS.ts | 10 +- .../translations/trackchange_plugin_tr.ts | 10 +- .../translations/trackchange_plugin_uk_UA.ts | 10 +- .../translations/trackchange_plugin_zh_CN.ts | 10 +- .../translations/trackchange_plugin_zh_TW.ts | 10 +- src/plugins/General/udisks/CMakeLists.txt | 51 --- src/plugins/General/udisks/settingsdialog.cpp | 58 --- src/plugins/General/udisks/settingsdialog.h | 46 --- src/plugins/General/udisks/settingsdialog.ui | 122 ------- .../General/udisks/translations/translations.qrc | 32 -- .../udisks/translations/udisks_plugin_bg.ts | 83 ----- .../udisks/translations/udisks_plugin_cs.ts | 83 ----- .../udisks/translations/udisks_plugin_de.ts | 83 ----- .../udisks/translations/udisks_plugin_el.ts | 83 ----- .../udisks/translations/udisks_plugin_en.ts | 83 ----- .../udisks/translations/udisks_plugin_es.ts | 83 ----- .../udisks/translations/udisks_plugin_fi.ts | 83 ----- .../udisks/translations/udisks_plugin_fr.ts | 83 ----- .../udisks/translations/udisks_plugin_gl_ES.ts | 83 ----- .../udisks/translations/udisks_plugin_he.ts | 83 ----- .../udisks/translations/udisks_plugin_hu.ts | 83 ----- .../udisks/translations/udisks_plugin_id.ts | 83 ----- .../udisks/translations/udisks_plugin_it.ts | 83 ----- .../udisks/translations/udisks_plugin_ja.ts | 83 ----- .../udisks/translations/udisks_plugin_kk.ts | 83 ----- .../udisks/translations/udisks_plugin_lt.ts | 83 ----- .../udisks/translations/udisks_plugin_nl.ts | 83 ----- .../udisks/translations/udisks_plugin_pl_PL.ts | 83 ----- .../udisks/translations/udisks_plugin_pt.ts | 83 ----- .../udisks/translations/udisks_plugin_pt_BR.ts | 83 ----- .../udisks/translations/udisks_plugin_ru.ts | 83 ----- .../udisks/translations/udisks_plugin_sk.ts | 83 ----- .../udisks/translations/udisks_plugin_sr_BA.ts | 83 ----- .../udisks/translations/udisks_plugin_sr_RS.ts | 83 ----- .../udisks/translations/udisks_plugin_tr.ts | 83 ----- .../udisks/translations/udisks_plugin_uk_UA.ts | 83 ----- .../udisks/translations/udisks_plugin_zh_CN.ts | 83 ----- .../udisks/translations/udisks_plugin_zh_TW.ts | 83 ----- src/plugins/General/udisks/udisks.pro | 26 -- src/plugins/General/udisks/udisksdevice.cpp | 50 --- src/plugins/General/udisks/udisksdevice.h | 54 --- src/plugins/General/udisks/udisksfactory.cpp | 66 ---- src/plugins/General/udisks/udisksfactory.h | 45 --- src/plugins/General/udisks/udisksmanager.cpp | 61 ---- src/plugins/General/udisks/udisksmanager.h | 52 --- src/plugins/General/udisks/udisksplugin.cpp | 269 -------------- src/plugins/General/udisks/udisksplugin.h | 65 ---- src/plugins/General/udisks2/CMakeLists.txt | 20 +- .../udisks2/translations/udisks2_plugin_bg.ts | 10 +- .../udisks2/translations/udisks2_plugin_cs.ts | 10 +- .../udisks2/translations/udisks2_plugin_de.ts | 10 +- .../udisks2/translations/udisks2_plugin_el.ts | 10 +- .../udisks2/translations/udisks2_plugin_en.ts | 10 +- .../udisks2/translations/udisks2_plugin_es.ts | 10 +- .../udisks2/translations/udisks2_plugin_fi.ts | 10 +- .../udisks2/translations/udisks2_plugin_fr.ts | 10 +- .../udisks2/translations/udisks2_plugin_gl_ES.ts | 10 +- .../udisks2/translations/udisks2_plugin_he.ts | 10 +- .../udisks2/translations/udisks2_plugin_hu.ts | 10 +- .../udisks2/translations/udisks2_plugin_id.ts | 10 +- .../udisks2/translations/udisks2_plugin_it.ts | 10 +- .../udisks2/translations/udisks2_plugin_ja.ts | 10 +- .../udisks2/translations/udisks2_plugin_kk.ts | 10 +- .../udisks2/translations/udisks2_plugin_lt.ts | 10 +- .../udisks2/translations/udisks2_plugin_nl.ts | 10 +- .../udisks2/translations/udisks2_plugin_pl_PL.ts | 10 +- .../udisks2/translations/udisks2_plugin_pt.ts | 10 +- .../udisks2/translations/udisks2_plugin_pt_BR.ts | 10 +- .../udisks2/translations/udisks2_plugin_ru.ts | 10 +- .../udisks2/translations/udisks2_plugin_sk.ts | 10 +- .../udisks2/translations/udisks2_plugin_sr_BA.ts | 10 +- .../udisks2/translations/udisks2_plugin_sr_RS.ts | 10 +- .../udisks2/translations/udisks2_plugin_tr.ts | 10 +- .../udisks2/translations/udisks2_plugin_uk_UA.ts | 10 +- .../udisks2/translations/udisks2_plugin_zh_CN.ts | 10 +- .../udisks2/translations/udisks2_plugin_zh_TW.ts | 10 +- src/plugins/General/udisks2/udisks2device.cpp | 9 +- src/plugins/General/udisks2/udisks2factory.cpp | 5 +- src/plugins/General/udisks2/udisks2factory.h | 1 + src/plugins/Input/CMakeLists.txt | 5 - src/plugins/Input/Input.pro | 18 +- src/plugins/Input/aac/CMakeLists.txt | 17 +- src/plugins/Input/aac/decoderaacfactory.cpp | 7 +- src/plugins/Input/aac/decoderaacfactory.h | 1 + .../Input/aac/translations/aac_plugin_bg.ts | 10 +- .../Input/aac/translations/aac_plugin_cs.ts | 10 +- .../Input/aac/translations/aac_plugin_de.ts | 10 +- .../Input/aac/translations/aac_plugin_el.ts | 10 +- .../Input/aac/translations/aac_plugin_en.ts | 10 +- .../Input/aac/translations/aac_plugin_es.ts | 10 +- .../Input/aac/translations/aac_plugin_fi.ts | 10 +- .../Input/aac/translations/aac_plugin_fr.ts | 10 +- .../Input/aac/translations/aac_plugin_gl_ES.ts | 10 +- .../Input/aac/translations/aac_plugin_he.ts | 10 +- .../Input/aac/translations/aac_plugin_hu.ts | 10 +- .../Input/aac/translations/aac_plugin_id.ts | 10 +- .../Input/aac/translations/aac_plugin_it.ts | 10 +- .../Input/aac/translations/aac_plugin_ja.ts | 10 +- .../Input/aac/translations/aac_plugin_kk.ts | 10 +- .../Input/aac/translations/aac_plugin_lt.ts | 10 +- .../Input/aac/translations/aac_plugin_nl.ts | 10 +- .../Input/aac/translations/aac_plugin_pl_PL.ts | 10 +- .../Input/aac/translations/aac_plugin_pt.ts | 10 +- .../Input/aac/translations/aac_plugin_pt_BR.ts | 10 +- .../Input/aac/translations/aac_plugin_ru.ts | 10 +- .../Input/aac/translations/aac_plugin_sk.ts | 10 +- .../Input/aac/translations/aac_plugin_sr_BA.ts | 10 +- .../Input/aac/translations/aac_plugin_sr_RS.ts | 10 +- .../Input/aac/translations/aac_plugin_tr.ts | 10 +- .../Input/aac/translations/aac_plugin_uk_UA.ts | 10 +- .../Input/aac/translations/aac_plugin_zh_CN.ts | 10 +- .../Input/aac/translations/aac_plugin_zh_TW.ts | 10 +- src/plugins/Input/archive/CMakeLists.txt | 17 +- .../Input/archive/decoderarchivefactory.cpp | 3 - src/plugins/Input/archive/decoderarchivefactory.h | 1 + .../archive/translations/archive_plugin_bg.ts | 12 +- .../archive/translations/archive_plugin_cs.ts | 12 +- .../archive/translations/archive_plugin_de.ts | 12 +- .../archive/translations/archive_plugin_el.ts | 12 +- .../archive/translations/archive_plugin_en.ts | 12 +- .../archive/translations/archive_plugin_es.ts | 12 +- .../archive/translations/archive_plugin_fi.ts | 12 +- .../archive/translations/archive_plugin_fr.ts | 12 +- .../archive/translations/archive_plugin_gl_ES.ts | 12 +- .../archive/translations/archive_plugin_he.ts | 12 +- .../archive/translations/archive_plugin_hu.ts | 12 +- .../archive/translations/archive_plugin_id.ts | 12 +- .../archive/translations/archive_plugin_it.ts | 12 +- .../archive/translations/archive_plugin_ja.ts | 12 +- .../archive/translations/archive_plugin_kk.ts | 12 +- .../archive/translations/archive_plugin_lt.ts | 12 +- .../archive/translations/archive_plugin_nl.ts | 12 +- .../archive/translations/archive_plugin_pl_PL.ts | 12 +- .../archive/translations/archive_plugin_pt.ts | 12 +- .../archive/translations/archive_plugin_pt_BR.ts | 12 +- .../archive/translations/archive_plugin_ru.ts | 12 +- .../archive/translations/archive_plugin_sk.ts | 12 +- .../archive/translations/archive_plugin_sr_BA.ts | 12 +- .../archive/translations/archive_plugin_sr_RS.ts | 12 +- .../archive/translations/archive_plugin_tr.ts | 12 +- .../archive/translations/archive_plugin_uk_UA.ts | 12 +- .../archive/translations/archive_plugin_zh_CN.ts | 12 +- .../archive/translations/archive_plugin_zh_TW.ts | 12 +- src/plugins/Input/cdaudio/CMakeLists.txt | 14 +- .../Input/cdaudio/decodercdaudiofactory.cpp | 7 +- src/plugins/Input/cdaudio/decodercdaudiofactory.h | 1 + .../cdaudio/translations/cdaudio_plugin_bg.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_cs.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_de.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_el.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_en.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_es.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_fi.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_fr.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_gl_ES.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_he.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_hu.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_id.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_it.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_ja.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_kk.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_lt.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_nl.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_pl_PL.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_pt.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_pt_BR.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_ru.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_sk.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_sr_BA.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_sr_RS.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_tr.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_uk_UA.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_zh_CN.ts | 12 +- .../cdaudio/translations/cdaudio_plugin_zh_TW.ts | 12 +- src/plugins/Input/cue/CMakeLists.txt | 21 +- src/plugins/Input/cue/decodercuefactory.cpp | 4 - src/plugins/Input/cue/decodercuefactory.h | 1 + .../Input/cue/translations/cue_plugin_bg.ts | 10 +- .../Input/cue/translations/cue_plugin_cs.ts | 10 +- .../Input/cue/translations/cue_plugin_de.ts | 10 +- .../Input/cue/translations/cue_plugin_el.ts | 10 +- .../Input/cue/translations/cue_plugin_en.ts | 10 +- .../Input/cue/translations/cue_plugin_es.ts | 10 +- .../Input/cue/translations/cue_plugin_fi.ts | 10 +- .../Input/cue/translations/cue_plugin_fr.ts | 10 +- .../Input/cue/translations/cue_plugin_gl_ES.ts | 10 +- .../Input/cue/translations/cue_plugin_he.ts | 10 +- .../Input/cue/translations/cue_plugin_hu.ts | 10 +- .../Input/cue/translations/cue_plugin_id.ts | 10 +- .../Input/cue/translations/cue_plugin_it.ts | 10 +- .../Input/cue/translations/cue_plugin_ja.ts | 10 +- .../Input/cue/translations/cue_plugin_kk.ts | 10 +- .../Input/cue/translations/cue_plugin_lt.ts | 10 +- .../Input/cue/translations/cue_plugin_nl.ts | 10 +- .../Input/cue/translations/cue_plugin_pl_PL.ts | 10 +- .../Input/cue/translations/cue_plugin_pt.ts | 10 +- .../Input/cue/translations/cue_plugin_pt_BR.ts | 10 +- .../Input/cue/translations/cue_plugin_ru.ts | 10 +- .../Input/cue/translations/cue_plugin_sk.ts | 10 +- .../Input/cue/translations/cue_plugin_sr_BA.ts | 10 +- .../Input/cue/translations/cue_plugin_sr_RS.ts | 10 +- .../Input/cue/translations/cue_plugin_tr.ts | 10 +- .../Input/cue/translations/cue_plugin_uk_UA.ts | 10 +- .../Input/cue/translations/cue_plugin_zh_CN.ts | 10 +- .../Input/cue/translations/cue_plugin_zh_TW.ts | 10 +- src/plugins/Input/ffmpeg/CMakeLists.txt | 25 +- src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp | 19 +- src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp | 35 +- src/plugins/Input/ffmpeg/decoderffmpegfactory.h | 1 + src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp | 5 - .../Input/ffmpeg/translations/ffmpeg_plugin_bg.ts | 12 +- .../Input/ffmpeg/translations/ffmpeg_plugin_cs.ts | 12 +- .../Input/ffmpeg/translations/ffmpeg_plugin_de.ts | 12 +- .../Input/ffmpeg/translations/ffmpeg_plugin_el.ts | 12 +- .../Input/ffmpeg/translations/ffmpeg_plugin_en.ts | 12 +- .../Input/ffmpeg/translations/ffmpeg_plugin_es.ts | 12 +- .../Input/ffmpeg/translations/ffmpeg_plugin_fi.ts | 12 +- .../Input/ffmpeg/translations/ffmpeg_plugin_fr.ts | 12 +- .../ffmpeg/translations/ffmpeg_plugin_gl_ES.ts | 12 +- .../Input/ffmpeg/translations/ffmpeg_plugin_he.ts | 12 +- .../Input/ffmpeg/translations/ffmpeg_plugin_hu.ts | 12 +- .../Input/ffmpeg/translations/ffmpeg_plugin_id.ts | 12 +- .../Input/ffmpeg/translations/ffmpeg_plugin_it.ts | 12 +- .../Input/ffmpeg/translations/ffmpeg_plugin_ja.ts | 12 +- .../Input/ffmpeg/translations/ffmpeg_plugin_kk.ts | 12 +- .../Input/ffmpeg/translations/ffmpeg_plugin_lt.ts | 12 +- .../Input/ffmpeg/translations/ffmpeg_plugin_nl.ts | 12 +- .../ffmpeg/translations/ffmpeg_plugin_pl_PL.ts | 12 +- .../Input/ffmpeg/translations/ffmpeg_plugin_pt.ts | 12 +- .../ffmpeg/translations/ffmpeg_plugin_pt_BR.ts | 12 +- .../Input/ffmpeg/translations/ffmpeg_plugin_ru.ts | 12 +- .../Input/ffmpeg/translations/ffmpeg_plugin_sk.ts | 12 +- .../ffmpeg/translations/ffmpeg_plugin_sr_BA.ts | 12 +- .../ffmpeg/translations/ffmpeg_plugin_sr_RS.ts | 12 +- .../Input/ffmpeg/translations/ffmpeg_plugin_tr.ts | 12 +- .../ffmpeg/translations/ffmpeg_plugin_uk_UA.ts | 12 +- .../ffmpeg/translations/ffmpeg_plugin_zh_CN.ts | 12 +- .../ffmpeg/translations/ffmpeg_plugin_zh_TW.ts | 12 +- src/plugins/Input/ffmpeg_legacy/CMakeLists.txt | 72 ---- src/plugins/Input/ffmpeg_legacy/decoder_ffmpeg.cpp | 404 --------------------- src/plugins/Input/ffmpeg_legacy/decoder_ffmpeg.h | 84 ----- .../Input/ffmpeg_legacy/decoderffmpegfactory.cpp | 224 ------------ .../Input/ffmpeg_legacy/decoderffmpegfactory.h | 50 --- src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro | 29 -- .../Input/ffmpeg_legacy/ffmpegmetadatamodel.cpp | 70 ---- .../Input/ffmpeg_legacy/ffmpegmetadatamodel.h | 46 --- src/plugins/Input/ffmpeg_legacy/settingsdialog.cpp | 112 ------ src/plugins/Input/ffmpeg_legacy/settingsdialog.h | 46 --- src/plugins/Input/ffmpeg_legacy/settingsdialog.ui | 182 ---------- .../translations/ffmpeg_legacy_plugin_bg.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_cs.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_de.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_el.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_en.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_es.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_fi.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_fr.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_gl_ES.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_he.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_hu.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_id.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_it.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_ja.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_kk.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_lt.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_nl.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_pl_PL.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_pt.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_pt_BR.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_ru.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_sk.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_sr_BA.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_sr_RS.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_tr.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_uk_UA.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_zh_CN.ts | 153 -------- .../translations/ffmpeg_legacy_plugin_zh_TW.ts | 153 -------- .../ffmpeg_legacy/translations/translations.qrc | 32 -- src/plugins/Input/flac/CMakeLists.txt | 17 +- src/plugins/Input/flac/decoderflacfactory.cpp | 17 +- src/plugins/Input/flac/decoderflacfactory.h | 1 + src/plugins/Input/flac/flacmetadatamodel.cpp | 21 +- src/plugins/Input/flac/replaygainreader.cpp | 12 - .../Input/flac/translations/flac_plugin_bg.ts | 26 +- .../Input/flac/translations/flac_plugin_cs.ts | 26 +- .../Input/flac/translations/flac_plugin_de.ts | 26 +- .../Input/flac/translations/flac_plugin_el.ts | 26 +- .../Input/flac/translations/flac_plugin_en.ts | 26 +- .../Input/flac/translations/flac_plugin_es.ts | 26 +- .../Input/flac/translations/flac_plugin_fi.ts | 26 +- .../Input/flac/translations/flac_plugin_fr.ts | 26 +- .../Input/flac/translations/flac_plugin_gl_ES.ts | 26 +- .../Input/flac/translations/flac_plugin_he.ts | 26 +- .../Input/flac/translations/flac_plugin_hu.ts | 26 +- .../Input/flac/translations/flac_plugin_id.ts | 26 +- .../Input/flac/translations/flac_plugin_it.ts | 26 +- .../Input/flac/translations/flac_plugin_ja.ts | 26 +- .../Input/flac/translations/flac_plugin_kk.ts | 26 +- .../Input/flac/translations/flac_plugin_lt.ts | 26 +- .../Input/flac/translations/flac_plugin_nl.ts | 26 +- .../Input/flac/translations/flac_plugin_pl_PL.ts | 26 +- .../Input/flac/translations/flac_plugin_pt.ts | 26 +- .../Input/flac/translations/flac_plugin_pt_BR.ts | 26 +- .../Input/flac/translations/flac_plugin_ru.ts | 26 +- .../Input/flac/translations/flac_plugin_sk.ts | 26 +- .../Input/flac/translations/flac_plugin_sr_BA.ts | 26 +- .../Input/flac/translations/flac_plugin_sr_RS.ts | 26 +- .../Input/flac/translations/flac_plugin_tr.ts | 26 +- .../Input/flac/translations/flac_plugin_uk_UA.ts | 26 +- .../Input/flac/translations/flac_plugin_zh_CN.ts | 26 +- .../Input/flac/translations/flac_plugin_zh_TW.ts | 26 +- src/plugins/Input/gme/CMakeLists.txt | 20 +- src/plugins/Input/gme/decodergmefactory.cpp | 6 +- src/plugins/Input/gme/decodergmefactory.h | 1 + .../Input/gme/translations/gme_plugin_bg.ts | 12 +- .../Input/gme/translations/gme_plugin_cs.ts | 12 +- .../Input/gme/translations/gme_plugin_de.ts | 12 +- .../Input/gme/translations/gme_plugin_el.ts | 12 +- .../Input/gme/translations/gme_plugin_en.ts | 12 +- .../Input/gme/translations/gme_plugin_es.ts | 12 +- .../Input/gme/translations/gme_plugin_fi.ts | 12 +- .../Input/gme/translations/gme_plugin_fr.ts | 12 +- .../Input/gme/translations/gme_plugin_gl_ES.ts | 12 +- .../Input/gme/translations/gme_plugin_he.ts | 12 +- .../Input/gme/translations/gme_plugin_hu.ts | 12 +- .../Input/gme/translations/gme_plugin_id.ts | 12 +- .../Input/gme/translations/gme_plugin_it.ts | 12 +- .../Input/gme/translations/gme_plugin_ja.ts | 12 +- .../Input/gme/translations/gme_plugin_kk.ts | 12 +- .../Input/gme/translations/gme_plugin_lt.ts | 12 +- .../Input/gme/translations/gme_plugin_nl.ts | 12 +- .../Input/gme/translations/gme_plugin_pl_PL.ts | 12 +- .../Input/gme/translations/gme_plugin_pt.ts | 12 +- .../Input/gme/translations/gme_plugin_pt_BR.ts | 12 +- .../Input/gme/translations/gme_plugin_ru.ts | 12 +- .../Input/gme/translations/gme_plugin_sk.ts | 12 +- .../Input/gme/translations/gme_plugin_sr_BA.ts | 12 +- .../Input/gme/translations/gme_plugin_sr_RS.ts | 12 +- .../Input/gme/translations/gme_plugin_tr.ts | 12 +- .../Input/gme/translations/gme_plugin_uk_UA.ts | 12 +- .../Input/gme/translations/gme_plugin_zh_CN.ts | 12 +- .../Input/gme/translations/gme_plugin_zh_TW.ts | 12 +- src/plugins/Input/mad/CMakeLists.txt | 19 +- src/plugins/Input/mad/decodermadfactory.cpp | 13 +- src/plugins/Input/mad/decodermadfactory.h | 1 + src/plugins/Input/mad/replaygainreader.cpp | 6 - .../Input/mad/translations/mad_plugin_bg.ts | 14 +- .../Input/mad/translations/mad_plugin_cs.ts | 14 +- .../Input/mad/translations/mad_plugin_de.ts | 14 +- .../Input/mad/translations/mad_plugin_el.ts | 14 +- .../Input/mad/translations/mad_plugin_en.ts | 14 +- .../Input/mad/translations/mad_plugin_es.ts | 14 +- .../Input/mad/translations/mad_plugin_fi.ts | 14 +- .../Input/mad/translations/mad_plugin_fr.ts | 14 +- .../Input/mad/translations/mad_plugin_gl_ES.ts | 14 +- .../Input/mad/translations/mad_plugin_he.ts | 14 +- .../Input/mad/translations/mad_plugin_hu.ts | 14 +- .../Input/mad/translations/mad_plugin_id.ts | 14 +- .../Input/mad/translations/mad_plugin_it.ts | 14 +- .../Input/mad/translations/mad_plugin_ja.ts | 14 +- .../Input/mad/translations/mad_plugin_kk.ts | 14 +- .../Input/mad/translations/mad_plugin_lt.ts | 14 +- .../Input/mad/translations/mad_plugin_nl.ts | 14 +- .../Input/mad/translations/mad_plugin_pl_PL.ts | 14 +- .../Input/mad/translations/mad_plugin_pt.ts | 14 +- .../Input/mad/translations/mad_plugin_pt_BR.ts | 14 +- .../Input/mad/translations/mad_plugin_ru.ts | 14 +- .../Input/mad/translations/mad_plugin_sk.ts | 14 +- .../Input/mad/translations/mad_plugin_sr_BA.ts | 14 +- .../Input/mad/translations/mad_plugin_sr_RS.ts | 14 +- .../Input/mad/translations/mad_plugin_tr.ts | 14 +- .../Input/mad/translations/mad_plugin_uk_UA.ts | 14 +- .../Input/mad/translations/mad_plugin_zh_CN.ts | 14 +- .../Input/mad/translations/mad_plugin_zh_TW.ts | 14 +- src/plugins/Input/modplug/CMakeLists.txt | 19 +- .../Input/modplug/decodermodplugfactory.cpp | 13 +- src/plugins/Input/modplug/decodermodplugfactory.h | 1 + .../modplug/translations/modplug_plugin_bg.ts | 20 +- .../modplug/translations/modplug_plugin_cs.ts | 20 +- .../modplug/translations/modplug_plugin_de.ts | 20 +- .../modplug/translations/modplug_plugin_el.ts | 20 +- .../modplug/translations/modplug_plugin_en.ts | 20 +- .../modplug/translations/modplug_plugin_es.ts | 20 +- .../modplug/translations/modplug_plugin_fi.ts | 20 +- .../modplug/translations/modplug_plugin_fr.ts | 20 +- .../modplug/translations/modplug_plugin_gl_ES.ts | 20 +- .../modplug/translations/modplug_plugin_he.ts | 20 +- .../modplug/translations/modplug_plugin_hu.ts | 20 +- .../modplug/translations/modplug_plugin_id.ts | 20 +- .../modplug/translations/modplug_plugin_it.ts | 20 +- .../modplug/translations/modplug_plugin_ja.ts | 20 +- .../modplug/translations/modplug_plugin_kk.ts | 20 +- .../modplug/translations/modplug_plugin_lt.ts | 20 +- .../modplug/translations/modplug_plugin_nl.ts | 20 +- .../modplug/translations/modplug_plugin_pl_PL.ts | 20 +- .../modplug/translations/modplug_plugin_pt.ts | 20 +- .../modplug/translations/modplug_plugin_pt_BR.ts | 20 +- .../modplug/translations/modplug_plugin_ru.ts | 20 +- .../modplug/translations/modplug_plugin_sk.ts | 20 +- .../modplug/translations/modplug_plugin_sr_BA.ts | 20 +- .../modplug/translations/modplug_plugin_sr_RS.ts | 20 +- .../modplug/translations/modplug_plugin_tr.ts | 20 +- .../modplug/translations/modplug_plugin_uk_UA.ts | 20 +- .../modplug/translations/modplug_plugin_zh_CN.ts | 20 +- .../modplug/translations/modplug_plugin_zh_TW.ts | 20 +- src/plugins/Input/mpc/CMakeLists.txt | 17 +- src/plugins/Input/mpc/decodermpcfactory.cpp | 12 +- src/plugins/Input/mpc/decodermpcfactory.h | 1 + .../Input/mpc/translations/mpc_plugin_bg.ts | 10 +- .../Input/mpc/translations/mpc_plugin_cs.ts | 10 +- .../Input/mpc/translations/mpc_plugin_de.ts | 10 +- .../Input/mpc/translations/mpc_plugin_el.ts | 10 +- .../Input/mpc/translations/mpc_plugin_en.ts | 10 +- .../Input/mpc/translations/mpc_plugin_es.ts | 10 +- .../Input/mpc/translations/mpc_plugin_fi.ts | 10 +- .../Input/mpc/translations/mpc_plugin_fr.ts | 10 +- .../Input/mpc/translations/mpc_plugin_gl_ES.ts | 10 +- .../Input/mpc/translations/mpc_plugin_he.ts | 10 +- .../Input/mpc/translations/mpc_plugin_hu.ts | 10 +- .../Input/mpc/translations/mpc_plugin_id.ts | 10 +- .../Input/mpc/translations/mpc_plugin_it.ts | 10 +- .../Input/mpc/translations/mpc_plugin_ja.ts | 10 +- .../Input/mpc/translations/mpc_plugin_kk.ts | 10 +- .../Input/mpc/translations/mpc_plugin_lt.ts | 10 +- .../Input/mpc/translations/mpc_plugin_nl.ts | 10 +- .../Input/mpc/translations/mpc_plugin_pl_PL.ts | 10 +- .../Input/mpc/translations/mpc_plugin_pt.ts | 10 +- .../Input/mpc/translations/mpc_plugin_pt_BR.ts | 10 +- .../Input/mpc/translations/mpc_plugin_ru.ts | 10 +- .../Input/mpc/translations/mpc_plugin_sk.ts | 10 +- .../Input/mpc/translations/mpc_plugin_sr_BA.ts | 10 +- .../Input/mpc/translations/mpc_plugin_sr_RS.ts | 10 +- .../Input/mpc/translations/mpc_plugin_tr.ts | 10 +- .../Input/mpc/translations/mpc_plugin_uk_UA.ts | 10 +- .../Input/mpc/translations/mpc_plugin_zh_CN.ts | 10 +- .../Input/mpc/translations/mpc_plugin_zh_TW.ts | 10 +- src/plugins/Input/opus/CMakeLists.txt | 25 +- src/plugins/Input/opus/decoderopusfactory.cpp | 8 +- src/plugins/Input/opus/decoderopusfactory.h | 1 + src/plugins/Input/opus/opus.pro | 11 +- src/plugins/Input/opus/opusfile.cpp | 126 ------- src/plugins/Input/opus/opusfile.h | 106 ------ src/plugins/Input/opus/opusmetadatamodel.cpp | 27 +- src/plugins/Input/opus/opusmetadatamodel.h | 2 +- src/plugins/Input/opus/opusproperties.cpp | 161 -------- src/plugins/Input/opus/opusproperties.h | 96 ----- src/plugins/Input/opus/replaygainreader.cpp | 6 +- src/plugins/Input/opus/tdebug.cpp | 55 --- src/plugins/Input/opus/tdebug.h | 71 ---- .../Input/opus/translations/opus_plugin_bg.ts | 31 +- .../Input/opus/translations/opus_plugin_cs.ts | 31 +- .../Input/opus/translations/opus_plugin_de.ts | 31 +- .../Input/opus/translations/opus_plugin_el.ts | 31 +- .../Input/opus/translations/opus_plugin_en.ts | 31 +- .../Input/opus/translations/opus_plugin_es.ts | 31 +- .../Input/opus/translations/opus_plugin_fi.ts | 31 +- .../Input/opus/translations/opus_plugin_fr.ts | 31 +- .../Input/opus/translations/opus_plugin_gl_ES.ts | 31 +- .../Input/opus/translations/opus_plugin_he.ts | 31 +- .../Input/opus/translations/opus_plugin_hu.ts | 31 +- .../Input/opus/translations/opus_plugin_id.ts | 31 +- .../Input/opus/translations/opus_plugin_it.ts | 31 +- .../Input/opus/translations/opus_plugin_ja.ts | 31 +- .../Input/opus/translations/opus_plugin_kk.ts | 31 +- .../Input/opus/translations/opus_plugin_lt.ts | 31 +- .../Input/opus/translations/opus_plugin_nl.ts | 31 +- .../Input/opus/translations/opus_plugin_pl_PL.ts | 31 +- .../Input/opus/translations/opus_plugin_pt.ts | 31 +- .../Input/opus/translations/opus_plugin_pt_BR.ts | 31 +- .../Input/opus/translations/opus_plugin_ru.ts | 31 +- .../Input/opus/translations/opus_plugin_sk.ts | 31 +- .../Input/opus/translations/opus_plugin_sr_BA.ts | 31 +- .../Input/opus/translations/opus_plugin_sr_RS.ts | 31 +- .../Input/opus/translations/opus_plugin_tr.ts | 31 +- .../Input/opus/translations/opus_plugin_uk_UA.ts | 31 +- .../Input/opus/translations/opus_plugin_zh_CN.ts | 31 +- .../Input/opus/translations/opus_plugin_zh_TW.ts | 31 +- src/plugins/Input/sid/CMakeLists.txt | 19 +- src/plugins/Input/sid/decodersidfactory.cpp | 6 +- src/plugins/Input/sid/decodersidfactory.h | 1 + .../Input/sid/translations/sid_plugin_bg.ts | 12 +- .../Input/sid/translations/sid_plugin_cs.ts | 12 +- .../Input/sid/translations/sid_plugin_de.ts | 12 +- .../Input/sid/translations/sid_plugin_el.ts | 12 +- .../Input/sid/translations/sid_plugin_en.ts | 12 +- .../Input/sid/translations/sid_plugin_es.ts | 12 +- .../Input/sid/translations/sid_plugin_fi.ts | 12 +- .../Input/sid/translations/sid_plugin_fr.ts | 12 +- .../Input/sid/translations/sid_plugin_gl_ES.ts | 12 +- .../Input/sid/translations/sid_plugin_he.ts | 12 +- .../Input/sid/translations/sid_plugin_hu.ts | 12 +- .../Input/sid/translations/sid_plugin_id.ts | 12 +- .../Input/sid/translations/sid_plugin_it.ts | 12 +- .../Input/sid/translations/sid_plugin_ja.ts | 12 +- .../Input/sid/translations/sid_plugin_kk.ts | 12 +- .../Input/sid/translations/sid_plugin_lt.ts | 12 +- .../Input/sid/translations/sid_plugin_nl.ts | 12 +- .../Input/sid/translations/sid_plugin_pl_PL.ts | 12 +- .../Input/sid/translations/sid_plugin_pt.ts | 12 +- .../Input/sid/translations/sid_plugin_pt_BR.ts | 12 +- .../Input/sid/translations/sid_plugin_ru.ts | 12 +- .../Input/sid/translations/sid_plugin_sk.ts | 12 +- .../Input/sid/translations/sid_plugin_sr_BA.ts | 12 +- .../Input/sid/translations/sid_plugin_sr_RS.ts | 12 +- .../Input/sid/translations/sid_plugin_tr.ts | 12 +- .../Input/sid/translations/sid_plugin_uk_UA.ts | 12 +- .../Input/sid/translations/sid_plugin_zh_CN.ts | 12 +- .../Input/sid/translations/sid_plugin_zh_TW.ts | 12 +- src/plugins/Input/sndfile/CMakeLists.txt | 19 +- .../Input/sndfile/decodersndfilefactory.cpp | 8 +- src/plugins/Input/sndfile/decodersndfilefactory.h | 1 + src/plugins/Input/vorbis/CMakeLists.txt | 19 +- src/plugins/Input/vorbis/decodervorbisfactory.cpp | 9 - src/plugins/Input/vorbis/decodervorbisfactory.h | 1 + src/plugins/Input/vorbis/replaygainreader.cpp | 6 - .../Input/vorbis/translations/vorbis_plugin_bg.ts | 28 +- .../Input/vorbis/translations/vorbis_plugin_cs.ts | 28 +- .../Input/vorbis/translations/vorbis_plugin_de.ts | 28 +- .../Input/vorbis/translations/vorbis_plugin_el.ts | 28 +- .../Input/vorbis/translations/vorbis_plugin_en.ts | 28 +- .../Input/vorbis/translations/vorbis_plugin_es.ts | 28 +- .../Input/vorbis/translations/vorbis_plugin_fi.ts | 28 +- .../Input/vorbis/translations/vorbis_plugin_fr.ts | 28 +- .../vorbis/translations/vorbis_plugin_gl_ES.ts | 28 +- .../Input/vorbis/translations/vorbis_plugin_he.ts | 28 +- .../Input/vorbis/translations/vorbis_plugin_hu.ts | 28 +- .../Input/vorbis/translations/vorbis_plugin_id.ts | 28 +- .../Input/vorbis/translations/vorbis_plugin_it.ts | 28 +- .../Input/vorbis/translations/vorbis_plugin_ja.ts | 28 +- .../Input/vorbis/translations/vorbis_plugin_kk.ts | 28 +- .../Input/vorbis/translations/vorbis_plugin_lt.ts | 28 +- .../Input/vorbis/translations/vorbis_plugin_nl.ts | 28 +- .../vorbis/translations/vorbis_plugin_pl_PL.ts | 28 +- .../Input/vorbis/translations/vorbis_plugin_pt.ts | 28 +- .../vorbis/translations/vorbis_plugin_pt_BR.ts | 28 +- .../Input/vorbis/translations/vorbis_plugin_ru.ts | 28 +- .../Input/vorbis/translations/vorbis_plugin_sk.ts | 28 +- .../vorbis/translations/vorbis_plugin_sr_BA.ts | 28 +- .../vorbis/translations/vorbis_plugin_sr_RS.ts | 28 +- .../Input/vorbis/translations/vorbis_plugin_tr.ts | 28 +- .../vorbis/translations/vorbis_plugin_uk_UA.ts | 28 +- .../vorbis/translations/vorbis_plugin_zh_CN.ts | 28 +- .../vorbis/translations/vorbis_plugin_zh_TW.ts | 28 +- src/plugins/Input/vorbis/vorbismetadatamodel.cpp | 24 +- src/plugins/Input/vorbis/vorbismetadatamodel.h | 2 +- src/plugins/Input/wavpack/CMakeLists.txt | 17 +- .../Input/wavpack/decoderwavpackfactory.cpp | 5 +- src/plugins/Input/wavpack/decoderwavpackfactory.h | 1 + .../wavpack/translations/wavpack_plugin_bg.ts | 12 +- .../wavpack/translations/wavpack_plugin_cs.ts | 12 +- .../wavpack/translations/wavpack_plugin_de.ts | 12 +- .../wavpack/translations/wavpack_plugin_el.ts | 12 +- .../wavpack/translations/wavpack_plugin_en.ts | 12 +- .../wavpack/translations/wavpack_plugin_es.ts | 12 +- .../wavpack/translations/wavpack_plugin_fi.ts | 12 +- .../wavpack/translations/wavpack_plugin_fr.ts | 12 +- .../wavpack/translations/wavpack_plugin_gl_ES.ts | 12 +- .../wavpack/translations/wavpack_plugin_he.ts | 12 +- .../wavpack/translations/wavpack_plugin_hu.ts | 12 +- .../wavpack/translations/wavpack_plugin_id.ts | 12 +- .../wavpack/translations/wavpack_plugin_it.ts | 12 +- .../wavpack/translations/wavpack_plugin_ja.ts | 12 +- .../wavpack/translations/wavpack_plugin_kk.ts | 12 +- .../wavpack/translations/wavpack_plugin_lt.ts | 12 +- .../wavpack/translations/wavpack_plugin_nl.ts | 12 +- .../wavpack/translations/wavpack_plugin_pl_PL.ts | 12 +- .../wavpack/translations/wavpack_plugin_pt.ts | 12 +- .../wavpack/translations/wavpack_plugin_pt_BR.ts | 12 +- .../wavpack/translations/wavpack_plugin_ru.ts | 12 +- .../wavpack/translations/wavpack_plugin_sk.ts | 12 +- .../wavpack/translations/wavpack_plugin_sr_BA.ts | 12 +- .../wavpack/translations/wavpack_plugin_sr_RS.ts | 12 +- .../wavpack/translations/wavpack_plugin_tr.ts | 12 +- .../wavpack/translations/wavpack_plugin_uk_UA.ts | 12 +- .../wavpack/translations/wavpack_plugin_zh_CN.ts | 12 +- .../wavpack/translations/wavpack_plugin_zh_TW.ts | 12 +- src/plugins/Input/wildmidi/CMakeLists.txt | 21 +- .../Input/wildmidi/decoderwildmidifactory.cpp | 6 +- .../Input/wildmidi/decoderwildmidifactory.h | 1 + .../wildmidi/translations/wildmidi_plugin_bg.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_cs.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_de.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_el.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_en.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_es.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_fi.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_fr.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_gl_ES.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_he.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_hu.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_id.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_it.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_ja.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_kk.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_lt.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_nl.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_pl_PL.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_pt.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_pt_BR.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_ru.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_sk.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_sr_BA.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_sr_RS.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_tr.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_uk_UA.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_zh_CN.ts | 12 +- .../wildmidi/translations/wildmidi_plugin_zh_TW.ts | 12 +- 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 +- src/plugins/PlayListFormats/m3u/CMakeLists.txt | 17 +- .../PlayListFormats/m3u/m3uplaylistformat.cpp | 4 +- .../PlayListFormats/m3u/m3uplaylistformat.h | 1 + src/plugins/PlayListFormats/pls/CMakeLists.txt | 17 +- .../PlayListFormats/pls/plsplaylistformat.cpp | 4 +- .../PlayListFormats/pls/plsplaylistformat.h | 1 + src/plugins/PlayListFormats/xspf/CMakeLists.txt | 17 +- .../PlayListFormats/xspf/xspfplaylistformat.cpp | 4 +- .../PlayListFormats/xspf/xspfplaylistformat.h | 1 + src/plugins/Transports/http/CMakeLists.txt | 21 +- src/plugins/Transports/http/httpinputfactory.cpp | 1 - src/plugins/Transports/http/httpinputfactory.h | 1 + src/plugins/Transports/http/httpstreamreader.cpp | 2 +- src/plugins/Transports/mms/CMakeLists.txt | 19 +- src/plugins/Transports/mms/mmsinputfactory.cpp | 1 - src/plugins/Transports/mms/mmsinputfactory.h | 1 + src/plugins/Ui/CMakeLists.txt | 4 +- src/plugins/Ui/qsui/CMakeLists.txt | 18 +- src/plugins/Ui/qsui/filesystembrowser.cpp | 4 - src/plugins/Ui/qsui/listwidget.cpp | 3 +- src/plugins/Ui/qsui/logo.cpp | 2 +- src/plugins/Ui/qsui/mainwindow.cpp | 1 + src/plugins/Ui/qsui/qsuifactory.cpp | 2 - src/plugins/Ui/qsui/qsuifactory.h | 3 +- src/plugins/Ui/qsui/qsuiquicksearch.cpp | 15 +- src/plugins/Ui/qsui/qsuiquicksearch.h | 5 - src/plugins/Ui/qsui/shortcutitem.cpp | 4 +- src/plugins/Ui/qsui/translations/qsui_plugin_bg.ts | 104 +++--- src/plugins/Ui/qsui/translations/qsui_plugin_cs.ts | 104 +++--- src/plugins/Ui/qsui/translations/qsui_plugin_de.ts | 104 +++--- src/plugins/Ui/qsui/translations/qsui_plugin_el.ts | 104 +++--- src/plugins/Ui/qsui/translations/qsui_plugin_en.ts | 104 +++--- src/plugins/Ui/qsui/translations/qsui_plugin_es.ts | 104 +++--- src/plugins/Ui/qsui/translations/qsui_plugin_fi.ts | 104 +++--- src/plugins/Ui/qsui/translations/qsui_plugin_fr.ts | 104 +++--- .../Ui/qsui/translations/qsui_plugin_gl_ES.ts | 104 +++--- src/plugins/Ui/qsui/translations/qsui_plugin_he.ts | 104 +++--- src/plugins/Ui/qsui/translations/qsui_plugin_hu.ts | 104 +++--- src/plugins/Ui/qsui/translations/qsui_plugin_id.ts | 104 +++--- src/plugins/Ui/qsui/translations/qsui_plugin_it.ts | 104 +++--- src/plugins/Ui/qsui/translations/qsui_plugin_ja.ts | 104 +++--- src/plugins/Ui/qsui/translations/qsui_plugin_kk.ts | 104 +++--- src/plugins/Ui/qsui/translations/qsui_plugin_lt.ts | 104 +++--- src/plugins/Ui/qsui/translations/qsui_plugin_nl.ts | 104 +++--- .../Ui/qsui/translations/qsui_plugin_pl_PL.ts | 104 +++--- src/plugins/Ui/qsui/translations/qsui_plugin_pt.ts | 104 +++--- .../Ui/qsui/translations/qsui_plugin_pt_BR.ts | 104 +++--- src/plugins/Ui/qsui/translations/qsui_plugin_ru.ts | 104 +++--- src/plugins/Ui/qsui/translations/qsui_plugin_sk.ts | 104 +++--- .../Ui/qsui/translations/qsui_plugin_sr_BA.ts | 104 +++--- .../Ui/qsui/translations/qsui_plugin_sr_RS.ts | 104 +++--- src/plugins/Ui/qsui/translations/qsui_plugin_tr.ts | 104 +++--- .../Ui/qsui/translations/qsui_plugin_uk_UA.ts | 104 +++--- .../Ui/qsui/translations/qsui_plugin_zh_CN.ts | 104 +++--- .../Ui/qsui/translations/qsui_plugin_zh_TW.ts | 104 +++--- src/plugins/Ui/skinned/CMakeLists.txt | 22 +- src/plugins/Ui/skinned/eqwidget.cpp | 13 +- src/plugins/Ui/skinned/eqwidget.h | 2 +- src/plugins/Ui/skinned/listwidget.cpp | 3 +- src/plugins/Ui/skinned/mainwindow.cpp | 39 +- src/plugins/Ui/skinned/playlist.cpp | 44 +-- src/plugins/Ui/skinned/playlist.h | 6 +- src/plugins/Ui/skinned/playlisttitlebar.cpp | 6 +- src/plugins/Ui/skinned/popupsettings.cpp | 1 + src/plugins/Ui/skinned/shortcutitem.cpp | 2 +- src/plugins/Ui/skinned/skin.cpp | 2 +- src/plugins/Ui/skinned/skinned.pro | 8 +- src/plugins/Ui/skinned/skinnedfactory.cpp | 2 - src/plugins/Ui/skinned/skinnedfactory.h | 1 + .../Ui/skinned/translations/skinned_plugin_bg.ts | 20 +- .../Ui/skinned/translations/skinned_plugin_cs.ts | 20 +- .../Ui/skinned/translations/skinned_plugin_de.ts | 20 +- .../Ui/skinned/translations/skinned_plugin_el.ts | 20 +- .../Ui/skinned/translations/skinned_plugin_en.ts | 20 +- .../Ui/skinned/translations/skinned_plugin_es.ts | 20 +- .../Ui/skinned/translations/skinned_plugin_fi.ts | 20 +- .../Ui/skinned/translations/skinned_plugin_fr.ts | 20 +- .../skinned/translations/skinned_plugin_gl_ES.ts | 20 +- .../Ui/skinned/translations/skinned_plugin_he.ts | 20 +- .../Ui/skinned/translations/skinned_plugin_hu.ts | 20 +- .../Ui/skinned/translations/skinned_plugin_id.ts | 20 +- .../Ui/skinned/translations/skinned_plugin_it.ts | 20 +- .../Ui/skinned/translations/skinned_plugin_ja.ts | 20 +- .../Ui/skinned/translations/skinned_plugin_kk.ts | 20 +- .../Ui/skinned/translations/skinned_plugin_lt.ts | 20 +- .../Ui/skinned/translations/skinned_plugin_nl.ts | 20 +- .../skinned/translations/skinned_plugin_pl_PL.ts | 20 +- .../Ui/skinned/translations/skinned_plugin_pt.ts | 20 +- .../skinned/translations/skinned_plugin_pt_BR.ts | 20 +- .../Ui/skinned/translations/skinned_plugin_ru.ts | 20 +- .../Ui/skinned/translations/skinned_plugin_sk.ts | 20 +- .../skinned/translations/skinned_plugin_sr_BA.ts | 20 +- .../skinned/translations/skinned_plugin_sr_RS.ts | 20 +- .../Ui/skinned/translations/skinned_plugin_tr.ts | 20 +- .../skinned/translations/skinned_plugin_uk_UA.ts | 20 +- .../skinned/translations/skinned_plugin_zh_CN.ts | 20 +- .../skinned/translations/skinned_plugin_zh_TW.ts | 20 +- src/plugins/Ui/skinned/windowsystem.cpp | 4 +- src/plugins/Ui/skinned/windowsystem.h | 2 +- src/plugins/Visual/analyzer/CMakeLists.txt | 19 +- .../analyzer/translations/analyzer_plugin_bg.ts | 8 +- .../analyzer/translations/analyzer_plugin_cs.ts | 8 +- .../analyzer/translations/analyzer_plugin_de.ts | 8 +- .../analyzer/translations/analyzer_plugin_el.ts | 8 +- .../analyzer/translations/analyzer_plugin_en.ts | 8 +- .../analyzer/translations/analyzer_plugin_es.ts | 8 +- .../analyzer/translations/analyzer_plugin_fi.ts | 8 +- .../analyzer/translations/analyzer_plugin_fr.ts | 8 +- .../analyzer/translations/analyzer_plugin_gl_ES.ts | 8 +- .../analyzer/translations/analyzer_plugin_he.ts | 8 +- .../analyzer/translations/analyzer_plugin_hu.ts | 8 +- .../analyzer/translations/analyzer_plugin_id.ts | 8 +- .../analyzer/translations/analyzer_plugin_it.ts | 8 +- .../analyzer/translations/analyzer_plugin_ja.ts | 8 +- .../analyzer/translations/analyzer_plugin_kk.ts | 8 +- .../analyzer/translations/analyzer_plugin_lt.ts | 8 +- .../analyzer/translations/analyzer_plugin_nl.ts | 8 +- .../analyzer/translations/analyzer_plugin_pl_PL.ts | 8 +- .../analyzer/translations/analyzer_plugin_pt.ts | 8 +- .../analyzer/translations/analyzer_plugin_pt_BR.ts | 8 +- .../analyzer/translations/analyzer_plugin_ru.ts | 8 +- .../analyzer/translations/analyzer_plugin_sk.ts | 8 +- .../analyzer/translations/analyzer_plugin_sr_BA.ts | 8 +- .../analyzer/translations/analyzer_plugin_sr_RS.ts | 8 +- .../analyzer/translations/analyzer_plugin_tr.ts | 8 +- .../analyzer/translations/analyzer_plugin_uk_UA.ts | 8 +- .../analyzer/translations/analyzer_plugin_zh_CN.ts | 8 +- .../analyzer/translations/analyzer_plugin_zh_TW.ts | 8 +- .../Visual/analyzer/visualanalyzerfactory.cpp | 7 +- .../Visual/analyzer/visualanalyzerfactory.h | 3 +- src/plugins/Visual/projectm/CMakeLists.txt | 37 +- src/plugins/Visual/projectm/projectm.pro | 6 - src/plugins/Visual/projectm/projectmplugin.cpp | 2 +- src/plugins/Visual/projectm/projectmwidget.cpp | 16 +- src/plugins/Visual/projectm/projectmwidget.h | 4 +- .../projectm/translations/projectm_plugin_bg.ts | 48 +-- .../projectm/translations/projectm_plugin_cs.ts | 48 +-- .../projectm/translations/projectm_plugin_de.ts | 48 +-- .../projectm/translations/projectm_plugin_el.ts | 48 +-- .../projectm/translations/projectm_plugin_en.ts | 48 +-- .../projectm/translations/projectm_plugin_es.ts | 48 +-- .../projectm/translations/projectm_plugin_fi.ts | 48 +-- .../projectm/translations/projectm_plugin_fr.ts | 48 +-- .../projectm/translations/projectm_plugin_gl_ES.ts | 48 +-- .../projectm/translations/projectm_plugin_he.ts | 48 +-- .../projectm/translations/projectm_plugin_hu.ts | 48 +-- .../projectm/translations/projectm_plugin_id.ts | 48 +-- .../projectm/translations/projectm_plugin_it.ts | 48 +-- .../projectm/translations/projectm_plugin_ja.ts | 48 +-- .../projectm/translations/projectm_plugin_kk.ts | 48 +-- .../projectm/translations/projectm_plugin_lt.ts | 48 +-- .../projectm/translations/projectm_plugin_nl.ts | 48 +-- .../projectm/translations/projectm_plugin_pl_PL.ts | 48 +-- .../projectm/translations/projectm_plugin_pt.ts | 48 +-- .../projectm/translations/projectm_plugin_pt_BR.ts | 48 +-- .../projectm/translations/projectm_plugin_ru.ts | 48 +-- .../projectm/translations/projectm_plugin_sk.ts | 48 +-- .../projectm/translations/projectm_plugin_sr_BA.ts | 48 +-- .../projectm/translations/projectm_plugin_sr_RS.ts | 48 +-- .../projectm/translations/projectm_plugin_tr.ts | 48 +-- .../projectm/translations/projectm_plugin_uk_UA.ts | 48 +-- .../projectm/translations/projectm_plugin_zh_CN.ts | 48 +-- .../projectm/translations/projectm_plugin_zh_TW.ts | 48 +-- .../Visual/projectm/visualprojectmfactory.cpp | 7 +- .../Visual/projectm/visualprojectmfactory.h | 3 +- src/plugins/plugins.pri | 1 + 1939 files changed, 13001 insertions(+), 23851 deletions(-) delete mode 100644 src/plugins/General/udisks/CMakeLists.txt delete mode 100644 src/plugins/General/udisks/settingsdialog.cpp delete mode 100644 src/plugins/General/udisks/settingsdialog.h delete mode 100644 src/plugins/General/udisks/settingsdialog.ui delete mode 100644 src/plugins/General/udisks/translations/translations.qrc delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_bg.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_cs.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_de.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_el.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_en.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_es.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_fi.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_fr.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_gl_ES.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_he.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_hu.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_id.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_it.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_ja.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_kk.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_lt.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_nl.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_pl_PL.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_pt.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_pt_BR.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_ru.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_sk.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_sr_BA.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_sr_RS.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_tr.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_uk_UA.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_zh_CN.ts delete mode 100644 src/plugins/General/udisks/translations/udisks_plugin_zh_TW.ts delete mode 100644 src/plugins/General/udisks/udisks.pro delete mode 100644 src/plugins/General/udisks/udisksdevice.cpp delete mode 100644 src/plugins/General/udisks/udisksdevice.h delete mode 100644 src/plugins/General/udisks/udisksfactory.cpp delete mode 100644 src/plugins/General/udisks/udisksfactory.h delete mode 100644 src/plugins/General/udisks/udisksmanager.cpp delete mode 100644 src/plugins/General/udisks/udisksmanager.h delete mode 100644 src/plugins/General/udisks/udisksplugin.cpp delete mode 100644 src/plugins/General/udisks/udisksplugin.h delete mode 100644 src/plugins/Input/ffmpeg_legacy/CMakeLists.txt delete mode 100644 src/plugins/Input/ffmpeg_legacy/decoder_ffmpeg.cpp delete mode 100644 src/plugins/Input/ffmpeg_legacy/decoder_ffmpeg.h delete mode 100644 src/plugins/Input/ffmpeg_legacy/decoderffmpegfactory.cpp delete mode 100644 src/plugins/Input/ffmpeg_legacy/decoderffmpegfactory.h delete mode 100644 src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro delete mode 100644 src/plugins/Input/ffmpeg_legacy/ffmpegmetadatamodel.cpp delete mode 100644 src/plugins/Input/ffmpeg_legacy/ffmpegmetadatamodel.h delete mode 100644 src/plugins/Input/ffmpeg_legacy/settingsdialog.cpp delete mode 100644 src/plugins/Input/ffmpeg_legacy/settingsdialog.h delete mode 100644 src/plugins/Input/ffmpeg_legacy/settingsdialog.ui delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_bg.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_cs.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_de.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_el.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_en.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_es.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_fi.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_fr.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_gl_ES.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_he.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_hu.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_id.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_it.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_ja.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_kk.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_lt.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_nl.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_pl_PL.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_pt.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_pt_BR.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_ru.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_sk.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_sr_BA.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_sr_RS.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_tr.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_uk_UA.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_zh_CN.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_zh_TW.ts delete mode 100644 src/plugins/Input/ffmpeg_legacy/translations/translations.qrc delete mode 100644 src/plugins/Input/opus/opusfile.cpp delete mode 100644 src/plugins/Input/opus/opusfile.h delete mode 100644 src/plugins/Input/opus/opusproperties.cpp delete mode 100644 src/plugins/Input/opus/opusproperties.h delete mode 100644 src/plugins/Input/opus/tdebug.cpp delete mode 100644 src/plugins/Input/opus/tdebug.h (limited to 'src/plugins') diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 0817582d5..0383f53b5 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -1,7 +1,8 @@ SET(USE_ENCA TRUE CACHE BOOL "enable/disable libenca support") include(FindPkgConfig) +set(CMAKE_CXX_VISIBILITY_PRESET hidden) pkg_search_module(ENCA enca>=1.9) -pkg_search_module(TAGLIB taglib>=1.6) +pkg_search_module(TAGLIB taglib>=1.10) add_subdirectory(Input) add_subdirectory(Output) add_subdirectory(Visual) diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt b/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt index 07f86eab6..59ac695a1 100644 --- a/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt +++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt @@ -1,20 +1,7 @@ project(libincdecvolumeoption) -# 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}/../../../ -) - # libqmmpui include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -26,7 +13,7 @@ SET(libincdecvolumeoption_SRCS SET(libincdecvolumeoption_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libincdecvolumeoption_RCC_SRCS ${libincdecvolumeoption_RCCS}) +QT5_ADD_RESOURCES(libincdecvolumeoption_RCC_SRCS ${libincdecvolumeoption_RCCS}) # Don't forget to include output directory, otherwise @@ -36,5 +23,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(incdecvolumeoption MODULE ${libincdecvolumeoption_SRCS} ${libincdecvolumeoption_RCC_SRCS}) add_dependencies(incdecvolumeoption qmmpui) -target_link_libraries(incdecvolumeoption ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(incdecvolumeoption Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS incdecvolumeoption DESTINATION ${LIB_DIR}/qmmp/CommandLineOptions) diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp index d5171e20c..3153fd6f6 100644 --- a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp +++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp @@ -70,5 +70,3 @@ QTranslator *IncDecVolumeCommandLineOption::createTranslator(QObject *parent) translator->load(QString(":/incdecvolume_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(incdecvolumeoption, IncDecVolumeCommandLineOption) diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h index 28008c8a1..ad734880d 100644 --- a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h +++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.h @@ -31,6 +31,7 @@ class IncDecVolumeCommandLineOption : public QObject, public CommandLineOption { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.CommandLineOptionInterface.1.0") Q_INTERFACES(CommandLineOption) public: virtual bool identify(const QString& opt_str) const; diff --git a/src/plugins/CommandLineOptions/PlayListOption/CMakeLists.txt b/src/plugins/CommandLineOptions/PlayListOption/CMakeLists.txt index dfbf50cf9..4a673e24d 100644 --- a/src/plugins/CommandLineOptions/PlayListOption/CMakeLists.txt +++ b/src/plugins/CommandLineOptions/PlayListOption/CMakeLists.txt @@ -1,20 +1,7 @@ project(libplaylistoption) -# 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}/../../../ -) - # libqmmpui include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -26,7 +13,7 @@ SET(libplaylistoption_SRCS SET(libplaylistoption_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libplaylistoption_RCC_SRCS ${libplaylistoption_RCCS}) +QT5_ADD_RESOURCES(libplaylistoption_RCC_SRCS ${libplaylistoption_RCCS}) # Don't forget to include output directory, otherwise @@ -36,5 +23,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(playlistoption MODULE ${libplaylistoption_SRCS} ${libplaylistoption_RCC_SRCS}) add_dependencies(playlistoption qmmpui) -target_link_libraries(playlistoption ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(playlistoption Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS playlistoption DESTINATION ${LIB_DIR}/qmmp/CommandLineOptions) diff --git a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp index 285e26f98..9f01bbca2 100644 --- a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp +++ b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp @@ -161,5 +161,3 @@ QString PlayListOption::boolToText(bool enabled) { return QString(enabled ? "[+]" : "[-]"); } - -Q_EXPORT_PLUGIN2(playlistoption, PlayListOption) diff --git a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h index 8e6f72a32..a255e095a 100644 --- a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h +++ b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.h @@ -33,6 +33,7 @@ class PlayListOption : public QObject, public CommandLineOption { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.CommandLineOptionInterface.1.0") Q_INTERFACES(CommandLineOption) public: virtual bool identify(const QString& opt_str) const; diff --git a/src/plugins/CommandLineOptions/SeekOption/CMakeLists.txt b/src/plugins/CommandLineOptions/SeekOption/CMakeLists.txt index 468e1861a..5a660e326 100644 --- a/src/plugins/CommandLineOptions/SeekOption/CMakeLists.txt +++ b/src/plugins/CommandLineOptions/SeekOption/CMakeLists.txt @@ -1,20 +1,7 @@ project(seekoption) -# 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}/../../../ -) - # libqmmpui include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -26,7 +13,7 @@ SET(seekoption_SRCS SET(seekoption_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(seekoption_RCC_SRCS ${seekoption_RCCS}) +QT5_ADD_RESOURCES(seekoption_RCC_SRCS ${seekoption_RCCS}) # Don't forget to include output directory, otherwise @@ -35,5 +22,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(seekoption MODULE ${seekoption_SRCS} ${seekoption_RCC_SRCS}) add_dependencies(seekoption qmmpui) -target_link_libraries(seekoption ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(seekoption Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS seekoption DESTINATION ${LIB_DIR}/qmmp/CommandLineOptions) diff --git a/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp b/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp index 509f62392..02e971940 100644 --- a/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp +++ b/src/plugins/CommandLineOptions/SeekOption/seekoption.cpp @@ -87,5 +87,3 @@ QTranslator *SeekOption::createTranslator(QObject *parent) translator->load(QString(":/seek_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(seekoption, SeekOption) diff --git a/src/plugins/CommandLineOptions/SeekOption/seekoption.h b/src/plugins/CommandLineOptions/SeekOption/seekoption.h index e19dae366..4310b1e53 100644 --- a/src/plugins/CommandLineOptions/SeekOption/seekoption.h +++ b/src/plugins/CommandLineOptions/SeekOption/seekoption.h @@ -31,6 +31,7 @@ class SeekOption : public QObject, public CommandLineOption { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.CommandLineOptionInterface.1.0") Q_INTERFACES(CommandLineOption) public: virtual bool identify(const QString& opt_str) const; diff --git a/src/plugins/CommandLineOptions/StatusOption/CMakeLists.txt b/src/plugins/CommandLineOptions/StatusOption/CMakeLists.txt index d04371f8a..b3bdec669 100644 --- a/src/plugins/CommandLineOptions/StatusOption/CMakeLists.txt +++ b/src/plugins/CommandLineOptions/StatusOption/CMakeLists.txt @@ -1,20 +1,7 @@ project(statusoption) -# 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}/../../../ -) - # libqmmpui include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -26,7 +13,7 @@ SET(statusoption_SRCS SET(statusoption_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(statusoption_RCC_SRCS ${statusoption_RCCS}) +QT5_ADD_RESOURCES(statusoption_RCC_SRCS ${statusoption_RCCS}) # Don't forget to include output directory, otherwise @@ -35,5 +22,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(statusoption MODULE ${statusoption_SRCS} ${statusoption_RCC_SRCS}) add_dependencies(statusoption qmmpui) -target_link_libraries(statusoption ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(statusoption Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS statusoption DESTINATION ${LIB_DIR}/qmmp/CommandLineOptions) diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp index 0450418c4..b2884fc76 100644 --- a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp +++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp @@ -139,5 +139,3 @@ QString StatusOption::genProgressBar() } return out; } - -Q_EXPORT_PLUGIN2(statusoption, StatusOption) diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.h b/src/plugins/CommandLineOptions/StatusOption/statusoption.h index 840c6ca4a..1764aa136 100644 --- a/src/plugins/CommandLineOptions/StatusOption/statusoption.h +++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.h @@ -34,6 +34,7 @@ class StatusOption : public QObject, public CommandLineOption { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.CommandLineOptionInterface.1.0") Q_INTERFACES(CommandLineOption) public: virtual bool identify(const QString& opt_str) const; diff --git a/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp b/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp index d74aebd61..a4a096f1b 100644 --- a/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp +++ b/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.cpp @@ -71,5 +71,3 @@ QTranslator *UninstallOption::createTranslator(QObject *parent) translator->load(QString(":/uninstall_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(uninstalloption, UninstallOption) diff --git a/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.h b/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.h index 9eba15f49..21eb302a2 100644 --- a/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.h +++ b/src/plugins/CommandLineOptions/UninstallOption/uninstalloption.h @@ -33,6 +33,7 @@ class UninstallOption : public QObject, public CommandLineOption { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.CommandLineOptionInterface.1.0") Q_INTERFACES(CommandLineOption) public: virtual bool identify(const QString& opt_str) const; diff --git a/src/plugins/Effect/bs2b/CMakeLists.txt b/src/plugins/Effect/bs2b/CMakeLists.txt index 884af2644..74e1d457d 100644 --- a/src/plugins/Effect/bs2b/CMakeLists.txt +++ b/src/plugins/Effect/bs2b/CMakeLists.txt @@ -1,20 +1,7 @@ project(libbs2b) -# 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) @@ -31,7 +18,7 @@ SET(libbs2b_HDRS SET(libbs2b_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libbs2b_RCC_SRCS ${libbs2b_RCCS}) +QT5_ADD_RESOURCES(libbs2b_RCC_SRCS ${libbs2b_RCCS}) pkg_search_module(BS2B libbs2b>=3.0.0) @@ -45,7 +32,7 @@ SET(libbs2b_UIS settingsdialog.ui ) -QT4_WRAP_UI(libbs2b_UIS_H ${libbs2b_UIS}) +QT5_WRAP_UI(libbs2b_UIS_H ${libbs2b_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -54,6 +41,6 @@ IF(BS2B_FOUND) ADD_LIBRARY(bs2b MODULE ${libbs2b_SRCS} ${libbs2b_UIS_H} ${libbs2b_RCC_SRCS} ${libbs2b_HDRS}) add_dependencies(bs2b qmmp) -target_link_libraries(bs2b ${QT_LIBRARIES} libqmmp ${BS2B_LDFLAGS}) +target_link_libraries(bs2b Qt5::Widgets -lqmmp ${BS2B_LDFLAGS}) install(TARGETS bs2b DESTINATION ${LIB_DIR}/qmmp/Effect) ENDIF(BS2B_FOUND) diff --git a/src/plugins/Effect/bs2b/effectbs2bfactory.cpp b/src/plugins/Effect/bs2b/effectbs2bfactory.cpp index cb43dd017..ef60a6d88 100644 --- a/src/plugins/Effect/bs2b/effectbs2bfactory.cpp +++ b/src/plugins/Effect/bs2b/effectbs2bfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009 by Ilya Kotov * + * Copyright (C) 2009-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 #include "effectbs2bfactory.h" @@ -68,5 +67,3 @@ QTranslator *EffectBs2bFactory::createTranslator(QObject *parent) translator->load(QString(":/bs2b_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(bs2b,EffectBs2bFactory) diff --git a/src/plugins/Effect/bs2b/effectbs2bfactory.h b/src/plugins/Effect/bs2b/effectbs2bfactory.h index 18cd391e1..3abe51a1d 100644 --- a/src/plugins/Effect/bs2b/effectbs2bfactory.h +++ b/src/plugins/Effect/bs2b/effectbs2bfactory.h @@ -30,7 +30,8 @@ class EffectBs2bFactory : public QObject, public EffectFactory { Q_OBJECT -Q_INTERFACES(EffectFactory); +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.EffectFactoryInterface.1.0") +Q_INTERFACES(EffectFactory) public: const EffectProperties properties() const; diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_bg.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_bg.ts index 98531e2f9..ef32f2526 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_bg.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_bg.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin - + About BS2B Effect Plugin - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. - + Visit %1 for more details - + Compiled against libbs2b-%1 - + Developers: - + Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_cs.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_cs.ts index ea37a5d85..a463b6527 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_cs.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_cs.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin Modul BS2B - + About BS2B Effect Plugin O efektovém modulu BS2B - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. Toto je modul Qmmp pro digitální efekt Borise Michajlova „Bauer stereophonic-to-binaural“, zkracovaný bs2b. - + Visit %1 for more details Pro podrobnosti navštivte %1 - + Compiled against libbs2b-%1 Sestaveno s libbs2b-%1 - + Developers: Vývojáři: - + Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_de.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_de.ts index cad2bf1fb..d5f951b67 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_de.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_de.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin BS2B-Modul - + About BS2B Effect Plugin Über BS2B-Effektmodul - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. Das ist das Qmmp-Modul von Boris Mikhaylovs Kopfhörer-DSP-Effekt „Bauer stereophonic-to-binaural”, abgekürzt bs2b. - + Visit %1 for more details Besuchen Sie %1 für mehr Informationen - + Compiled against libbs2b-%1 Kompiliert gegen libbs2b-%1 - + Developers: Entwickler: - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_el.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_el.ts index 9714495cf..eb1d55289 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_el.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_el.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin Πρόσθετο BS2B - + About BS2B Effect Plugin Σχετικά με το πρόσθετο τεχνασμάτων εντυπωσιασμού BS2B - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. Αυτό είναι η έκδοση του Qmmp του πρόσθετου του Boris Mikhaylov τεχνασμάτων ακουστικών DSP «Bauer stereophonic-to-binaural», στη συντομογραφία bs2b. - + Visit %1 for more details Ανατρέξτε στο %1 για περισσότερες πληροφορίες - + Compiled against libbs2b-%1 Μεταγλωττίστηκε χρησιμοποιώντας τη βιβλιοθήκη libbs2b-%1 - + Developers: Προγραμματιστές: - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_en.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_en.ts index ea1deddbb..7542084c5 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_en.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_en.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin - + About BS2B Effect Plugin - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. - + Visit %1 for more details - + Compiled against libbs2b-%1 - + Developers: - + Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_es.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_es.ts index a88c34288..7101c06b5 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_es.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_es.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin Módulo BS2B - + About BS2B Effect Plugin Sobre el módulo de efectos BS2B - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. Esta es la versión para Qmmp del módulo de efecto auricular DSP de Boris Mikhaylov "Bauer stereophonic-to-binaural", abreviado bs2b. - + Visit %1 for more details Visita %1 para más detalles - + Compiled against libbs2b-%1 Compilado con libbs2b-%1 - + Developers: Desarrolladores: - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_fi.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_fi.ts index b20b37397..8931eb98a 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_fi.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_fi.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin BS2B-liitännäinen - + About BS2B Effect Plugin Tietoja - BS2B-tehosteliitännäinen - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. - + Visit %1 for more details - + Compiled against libbs2b-%1 - + Developers: Kehittäjät: - + Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_fr.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_fr.ts index aacab69ce..b121fac70 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_fr.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_fr.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin Greffon BS2B - + About BS2B Effect Plugin À propos du greffon d'effets BS2B - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. Ceci est le greffon pour Qmmp de l'implémentation par Boris Mikhaylov de la conversion « stéréophonie-vers-binaural Bauer », en abrégé BS2B. - + Visit %1 for more details Visitez %1 pour plus de détails - + Compiled against libbs2b-%1 Compilé contre libbs2b-%1 - + Developers: Développeurs : - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_gl_ES.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_gl_ES.ts index 63bb98370..0a4ddd2ce 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_gl_ES.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_gl_ES.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin Engadido BS2B - + About BS2B Effect Plugin Sobre o engadido de efecto BS2B - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. Este engadido é a versión de Qmmp do efecto headphone DSP de Boris Mikhaylov "Bauer stereophonic-to-binaural", abreviado bs2b. - + Visit %1 for more details Visita %1 para máis detalles - + Compiled against libbs2b-%1 Compilado con libbs2b-%1 - + Developers: Desenvolvedores: - + Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_he.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_he.ts index f3364b33e..fe52eb6e3 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_he.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_he.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin תוסף BS2B - + About BS2B Effect Plugin אודות תוסף אפקט BS2B - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. זוהי גירסת תוסף Qmmp של אפקט אוזניות DSP של Boris Mikhaylov ‏"Bauer stereophonic-to-binaural", ובקיצור bs2b. - + Visit %1 for more details בקרו אצל %1 למידע נוסף - + Compiled against libbs2b-%1 הודר כנגד libbs2b-%1 - + Developers: מפתחים: - + Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_hu.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_hu.ts index 7c1cf3bd5..6f2646635 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_hu.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_hu.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin - + About BS2B Effect Plugin - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. - + Visit %1 for more details - + Compiled against libbs2b-%1 - + Developers: - + Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_id.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_id.ts index 2a97b754e..e26e63ba1 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_id.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_id.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin Plugin BS2B - + About BS2B Effect Plugin Tentang Plugin Efek BS2B - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. Ini adalah versi plugin Qmmp pada efek headphone Boris Mikhaylov's "Bauer stereophonic-to-binaural", yang disingkat bs2b. - + Visit %1 for more details Kunjungi %1 untuk lebih jelasnya - + Compiled against libbs2b-%1 Dikompilasi terhadap libbs2b-%1 - + Developers: Pengembang: - + Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_it.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_it.ts index 7c50336b8..d4453ebef 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_it.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_it.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin Modulo BS2B - + About BS2B Effect Plugin Info sul modulo effetti BS2B - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. Versione per Qmmp del modulo headphone DSP effect "Bauer stereophonic-to-binaural" di Boris Mikhaylov, abbreviato in bs2b - + Visit %1 for more details Visita %1 per maggiori informazioni - + Compiled against libbs2b-%1 Compilato con libbs2b-%1 - + Developers: Sviluppatori: - + Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_ja.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_ja.ts index 81cb8e467..c72f6eabc 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_ja.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_ja.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin BS2B プラグイン - + About BS2B Effect Plugin BS2B 効果プラグインについて - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. これは "Bauer stereophonic-to-binaural" (BS2B) に基づき Борис Михайлов (Boris Mikhaylov) 氏が作成したヘッドフォン用 DSP 効果ライブラリを利用するための QMMP 用プラグインです。 - + Visit %1 for more details 詳しい情報は %1 でご覧ください - + Compiled against libbs2b-%1 libbs2b-%1 を使用してコンパイル - + Developers: 開発者: - + Ilya Kotov <forkotov02@ya.ru> Илья Котов (Ilya Kotov) <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_kk.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_kk.ts index d03a37d37..9b7cf5228 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_kk.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_kk.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin - + About BS2B Effect Plugin - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. - + Visit %1 for more details - + Compiled against libbs2b-%1 - + Developers: - + Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_lt.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_lt.ts index e4aeed72c..d6c241a3f 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_lt.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_lt.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin BS2B įskiepis - + About BS2B Effect Plugin Apie BS2B įskiepį - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. Boriso Mikhaylovo ausinių DSP efektas "Bauer stereophonic-to-binaural", sutrumpinimas bs2b. - + Visit %1 for more details Daugiau informacijos %1 - + Compiled against libbs2b-%1 Surinkta iš libbs2b-%1 - + Developers: Sukūrė: - + Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_nl.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_nl.ts index 6db78ce3e..f0bef6066 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_nl.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_nl.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin BS2B Module - + About BS2B Effect Plugin Over de BS2B Effecten Module - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. Dit is de Qmmp module versie van Boris Mikhaylov's "Headset DSP effect" Bauer stereofonisch-naar-'binaural', afgekort bs2b. - + Visit %1 for more details Bezoek %1 voor meer details - + Compiled against libbs2b-%1 Gecompileerd tegen libbs2b-%1 - + Developers: Ontwikkelaars: - + Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_pl_PL.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_pl_PL.ts index 0357d3bc3..eb54b3acb 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_pl_PL.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_pl_PL.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin Wtyczka BS2B - + About BS2B Effect Plugin O wtyczce BS2B - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. Jest to wersja wtyczki efektu DSP dla słuchawek autorstwa Boris Mikhaylov'a "Bauer stereophonic-to-binaural", w skrócie bs2b. - + Visit %1 for more details Odwiedź %1 po więcej informacji - + Compiled against libbs2b-%1 Skompilowane z biblioteką w wersji-%1 - + Developers: Autorzy: - + Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_pt.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_pt.ts index 6b86a2612..c55f4bfbb 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_pt.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_pt.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin Suplemento BS2B - + About BS2B Effect Plugin Sobre o suplemento BS2B - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. Este é o suplemento Qmmp do efeito DSP "Bauer stereophonic-to-binaural", abreviado para BS2B e desenvolvido por Boris Mikhaylov. - + Visit %1 for more details Aceda a %1 para mais detalhes - + Compiled against libbs2b-%1 Compilado com libbs2b-%1 - + Developers: Programadores: - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_pt_BR.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_pt_BR.ts index 1c7719709..76e8e7fbc 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_pt_BR.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_pt_BR.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin Plugin BS2B - + About BS2B Effect Plugin Sobre o plugin BS2B - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. Este é o plugin Qmmp do efeito DSP "Bauer stereophonic-to-binaural", abreviado para BS2B e desenvolvido por Boris Mikhaylov. - + Visit %1 for more details Acesse %1 para mais detalhes - + Compiled against libbs2b-%1 Compilado com libbs2b-%1 - + Developers: Programadores: - + Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_ru.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_ru.ts index 87a0572c4..6c199dca6 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_ru.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_ru.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin Модуль BS2B - + About BS2B Effect Plugin О модуле эффектов BS2B - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. Этот модуль добавляет эффект "Bauer stereophonic-to-binaural" (сокращённо bs2b) Бориса Михайлова. - + Visit %1 for more details Для получения информации посетите %1 - + Compiled against libbs2b-%1 Собрано с libbs2b-%1 - + Developers: Разработчики: - + Ilya Kotov <forkotov02@ya.ru> Илья Котов <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_sk.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_sk.ts index b2289d268..377005d86 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_sk.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_sk.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin - + About BS2B Effect Plugin - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. - + Visit %1 for more details - + Compiled against libbs2b-%1 - + Developers: - + Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_sr_BA.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_sr_BA.ts index 82834b586..e81098393 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_sr_BA.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_sr_BA.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin БС2Б прикључак - + About BS2B Effect Plugin О прикључку за БС2Б ефекат - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. Кумп издање прикључка ДСП ефекта за слушалице „Бауерово стереофонски-на-бинаурално“ Бориса Михајлова, скраћено бс2б. - + Visit %1 for more details Посјетите %1 за више детаља - + Compiled against libbs2b-%1 Компилован на libbs2b-%1 - + Developers: Програмери: - + Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_sr_RS.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_sr_RS.ts index ab1939ccc..b7d96966a 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_sr_RS.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_sr_RS.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin БС2Б прикључак - + About BS2B Effect Plugin О прикључку за БС2Б ефекат - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. Кумп издање прикључка ДСП ефекта за слушалице „Бауерово стереофонски-на-бинаурално“ Бориса Михајлова, скраћено бс2б. - + Visit %1 for more details Посетите %1 за више детаља - + Compiled against libbs2b-%1 Компилован на libbs2b-%1 - + Developers: Програмери: - + Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_tr.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_tr.ts index 84da238fb..00d0105b2 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_tr.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_tr.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin BS2B Eklentisi - + About BS2B Effect Plugin BS2B Efekt Eklentisi Hakkında - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. Bu eklenti Boris Mikhaylov'un "Bauer-stereophonic-to-binaural", kısaca bs2b, kulaklık DSP efektinin Qmmp sürümüdür. - + Visit %1 for more details Detaylar için %1 adresini ziyaret edin - + Compiled against libbs2b-%1 libbs2b-%1 ile derlenmiştir - + Developers: Geliştiriciler: - + Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_uk_UA.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_uk_UA.ts index f52222a59..30bbeb33a 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_uk_UA.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_uk_UA.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin Модуль BS2B - + About BS2B Effect Plugin Про модуль ефектів BS2B - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. Цей модуль додає ефект "Bauer stereophonic-to-binaural" (скорочено bs2b) Бориса Михайлова. - + Visit %1 for more details Для отримання інформації відвідайте %1 - + Compiled against libbs2b-%1 Зібрано з libbs2b-%1 - + Developers: Розробники: - + Ilya Kotov <forkotov02@ya.ru> Ілля Котов <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_zh_CN.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_zh_CN.ts index c0d0d6a39..34a32b48f 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_zh_CN.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_zh_CN.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin BS2B 插件 - + About BS2B Effect Plugin 关于 BS2B 特效插件 - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. 此版本的 Qmmp 插件基于 Boris Mikhaylov 的耳机 DSP 特效 "Bauer stereophonic-to-binaural", 精简的 bs2b 。 - + Visit %1 for more details 访问 %1 了解更多情况 - + Compiled against libbs2b-%1 编译依赖 libbs2b-%1 - + Developers: 开发者： - + Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/bs2b/translations/bs2b_plugin_zh_TW.ts b/src/plugins/Effect/bs2b/translations/bs2b_plugin_zh_TW.ts index 81d8ce27a..0086491a0 100644 --- a/src/plugins/Effect/bs2b/translations/bs2b_plugin_zh_TW.ts +++ b/src/plugins/Effect/bs2b/translations/bs2b_plugin_zh_TW.ts @@ -4,42 +4,42 @@ EffectBs2bFactory - + BS2B Plugin BS2B 外掛 - + About BS2B Effect Plugin 關於BS2B 特效插件 - + This is the Qmmp plugin version of Boris Mikhaylov's headphone DSP effect "Bauer stereophonic-to-binaural", abbreviated bs2b. 此版本的 Qmmp 插件基於 Boris Mikhaylov 的耳機 DSP 特效 "Bauer stereophonic-to-binaural", 簡單的 bs2b. - + Visit %1 for more details 訪問 %1 了解更多內容 - + Compiled against libbs2b-%1 編譯依賴 libbs2b-%1 - + Developers: 開發者： - + Ilya Kotov <forkotov02@ya.ru> - + Sebastian Pipping <sebastian@pipping.org> diff --git a/src/plugins/Effect/crossfade/CMakeLists.txt b/src/plugins/Effect/crossfade/CMakeLists.txt index 5f0480f5d..3b4fdea5f 100644 --- a/src/plugins/Effect/crossfade/CMakeLists.txt +++ b/src/plugins/Effect/crossfade/CMakeLists.txt @@ -1,20 +1,7 @@ project(libcrossfade) -# 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) @@ -31,7 +18,7 @@ SET(libcrossfade_HDRS SET(libcrossfade_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libcrossfade_RCC_SRCS ${libcrossfade_RCCS}) +QT5_ADD_RESOURCES(libcrossfade_RCC_SRCS ${libcrossfade_RCCS}) # user interface @@ -39,7 +26,7 @@ SET(libcrossfade_UIS settingsdialog.ui ) -QT4_WRAP_UI(libcrossfade_UIS_H ${libcrossfade_UIS}) +QT5_WRAP_UI(libcrossfade_UIS_H ${libcrossfade_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -48,5 +35,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(crossfade MODULE ${libcrossfade_SRCS} ${libcrossfade_UIS_H} ${libcrossfade_RCC_SRCS} ${libcrossfade_HDRS}) add_dependencies(crossfade qmmp) -target_link_libraries(crossfade ${QT_LIBRARIES} libqmmp) +target_link_libraries(crossfade Qt5::Widgets -lqmmp) install(TARGETS crossfade DESTINATION ${LIB_DIR}/qmmp/Effect) diff --git a/src/plugins/Effect/crossfade/effectcrossfadefactory.cpp b/src/plugins/Effect/crossfade/effectcrossfadefactory.cpp index 09cc33b77..5fb4061e3 100644 --- a/src/plugins/Effect/crossfade/effectcrossfadefactory.cpp +++ b/src/plugins/Effect/crossfade/effectcrossfadefactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 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 "effectcrossfadefactory.h" #include "settingsdialog.h" @@ -62,5 +61,3 @@ QTranslator *EffectCrossfadeFactory::createTranslator(QObject *parent) translator->load(QString(":/crossfade_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(crossfade,EffectCrossfadeFactory) diff --git a/src/plugins/Effect/crossfade/effectcrossfadefactory.h b/src/plugins/Effect/crossfade/effectcrossfadefactory.h index 6958985af..b2f268441 100644 --- a/src/plugins/Effect/crossfade/effectcrossfadefactory.h +++ b/src/plugins/Effect/crossfade/effectcrossfadefactory.h @@ -30,7 +30,8 @@ class EffectCrossfadeFactory : public QObject, public EffectFactory { Q_OBJECT -Q_INTERFACES(EffectFactory); +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.EffectFactoryInterface.1.0") +Q_INTERFACES(EffectFactory) public: const EffectProperties properties() const; diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_bg.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_bg.ts index c5c5d9cc2..0a4d13643 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_bg.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_bg.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin - + About Crossfade Plugin - + Qmmp Crossfade Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_cs.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_cs.ts index 3d113efec..004302efa 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_cs.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_cs.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin Modul prolínání - + About Crossfade Plugin O modulu prolínání - + Qmmp Crossfade Plugin Modul prolínání Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_de.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_de.ts index 8b4ac278d..f4c1532c6 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_de.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_de.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin Überblendungsmodul - + About Crossfade Plugin Über Überblendungsmodul - + Qmmp Crossfade Plugin Qmmp Überblendungsmodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_el.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_el.ts index 887b1d1e5..0b07d2711 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_el.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_el.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin Πρόσθετο ομαλής μετάβασης - + About Crossfade Plugin Σχετικά με το πρόσθετο ομαλής μετάβασης - + Qmmp Crossfade Plugin Qmmp πρόσθετο ομαλής μετάβασης - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_en.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_en.ts index 2ab45038f..d94e6d13d 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_en.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_en.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin - + About Crossfade Plugin - + Qmmp Crossfade Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_es.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_es.ts index 111e780ff..1d0699cfa 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_es.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_es.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin Módulo Crossfade - + About Crossfade Plugin Acerca del módulo Crossfade - + Qmmp Crossfade Plugin Módulo Crossfade para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_fi.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_fi.ts index 2dc353780..eb0b9afb9 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_fi.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_fi.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin Ristiinhäivytysliitännäinen - + About Crossfade Plugin - + Qmmp Crossfade Plugin Qmmp-ristiinhäivytysliitännäinen - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_fr.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_fr.ts index 15abe547f..4d45f6f32 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_fr.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_fr.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin Greffon de fondu enchaîné - + About Crossfade Plugin À propos du greffon de fondu enchaîné - + Qmmp Crossfade Plugin Greffon de fondu enchaîné pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_gl_ES.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_gl_ES.ts index 10952df03..61ff65a63 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_gl_ES.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_gl_ES.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin Engadido Crossfade - + About Crossfade Plugin Sobre o engadido Crossfade - + Qmmp Crossfade Plugin Engadido Crossfade Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_he.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_he.ts index 0cc5e52cc..0335c075c 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_he.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_he.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin תוסף עמעום - + About Crossfade Plugin אודות תוסף עמעום - + Qmmp Crossfade Plugin תוסף עמעום של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_hu.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_hu.ts index afcd213cf..98e4caa41 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_hu.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_hu.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin - + About Crossfade Plugin - + Qmmp Crossfade Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_id.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_id.ts index c12237b0a..1161a4592 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_id.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_id.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin Plugin Crossfade - + About Crossfade Plugin Tentang Plugin Crossfade - + Qmmp Crossfade Plugin Plugin Crossfade Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_it.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_it.ts index 0e90203de..8101ff9e4 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_it.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_it.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin - + About Crossfade Plugin - + Qmmp Crossfade Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_ja.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_ja.ts index 6d54601b7..0002aa294 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_ja.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_ja.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin Crossfade プラグイン - + About Crossfade Plugin Crossfade プラグインについて - + Qmmp Crossfade Plugin QMMP Crossfade プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_kk.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_kk.ts index c0c76ec31..c36832d57 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_kk.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_kk.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin - + About Crossfade Plugin - + Qmmp Crossfade Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_lt.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_lt.ts index 45ae11d43..9ab0c2ec6 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_lt.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_lt.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin Crossfade įskiepis - + About Crossfade Plugin Apie crossfade įskiepį - + Qmmp Crossfade Plugin Qmmp Crossfade įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_nl.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_nl.ts index dfe2db39b..e6a2b1eb7 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_nl.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_nl.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin Overlap Module - + About Crossfade Plugin Over de Overlap Module - + Qmmp Crossfade Plugin Overlap Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_pl_PL.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_pl_PL.ts index 2d20858e7..6e112cf2b 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_pl_PL.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_pl_PL.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin Wtyczka Crossfade - + About Crossfade Plugin O wtyczce Crossfade - + Qmmp Crossfade Plugin Wtyczka Crossfade dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_pt.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_pt.ts index 552818e65..a544307ac 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_pt.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_pt.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin Suplemento Crossfade - + About Crossfade Plugin Sobre o suplemento Crossfade - + Qmmp Crossfade Plugin Suplemento Qmmp Crossfade - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_pt_BR.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_pt_BR.ts index a7d650166..04fa94385 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_pt_BR.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_pt_BR.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin Plugin Crossfade - + About Crossfade Plugin Sobre o plugin Crossfade - + Qmmp Crossfade Plugin Plugin Qmmp Crossfade - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_ru.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_ru.ts index 669af0c2a..6f8c0e02c 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_ru.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_ru.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin Модуль Crossfade - + About Crossfade Plugin О модуле crossfade - + Qmmp Crossfade Plugin Модуль crossfade для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_sk.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_sk.ts index 027bac533..295fe5bff 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_sk.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_sk.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin - + About Crossfade Plugin - + Qmmp Crossfade Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_sr_BA.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_sr_BA.ts index eefd3c714..0c497bbed 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_sr_BA.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_sr_BA.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin Претапање - + About Crossfade Plugin О прикључку за претапање - + Qmmp Crossfade Plugin Кумп прикључак за претапање - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_sr_RS.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_sr_RS.ts index ac26ec41b..7b7127b8e 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_sr_RS.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_sr_RS.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin Претапање - + About Crossfade Plugin О прикључку за претапање - + Qmmp Crossfade Plugin Кумп прикључак за претапање - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_tr.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_tr.ts index 3b1a7d0e5..6ab631617 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_tr.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_tr.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin - + About Crossfade Plugin - + Qmmp Crossfade Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_uk_UA.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_uk_UA.ts index c221b4131..03a409ce4 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_uk_UA.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_uk_UA.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin Модуль Crossfade - + About Crossfade Plugin Про модуль crossfade - + Qmmp Crossfade Plugin Модуль crossfade для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_zh_CN.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_zh_CN.ts index 6311ccd62..03cb8e84f 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_zh_CN.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_zh_CN.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin 交叉衰落插件 - + About Crossfade Plugin 关于交叉衰落插件 - + Qmmp Crossfade Plugin Qmmp 交叉衰落插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/crossfade/translations/crossfade_plugin_zh_TW.ts b/src/plugins/Effect/crossfade/translations/crossfade_plugin_zh_TW.ts index 763b4d2f0..c3a3d4037 100644 --- a/src/plugins/Effect/crossfade/translations/crossfade_plugin_zh_TW.ts +++ b/src/plugins/Effect/crossfade/translations/crossfade_plugin_zh_TW.ts @@ -4,22 +4,22 @@ EffectCrossfadeFactory - + Crossfade Plugin 交叉衰落插件 - + About Crossfade Plugin 關於交叉衰落插件 - + Qmmp Crossfade Plugin Qmmp 交叉衰落插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/CMakeLists.txt b/src/plugins/Effect/filewriter/CMakeLists.txt index 7fa00b30e..2e28c58fd 100644 --- a/src/plugins/Effect/filewriter/CMakeLists.txt +++ b/src/plugins/Effect/filewriter/CMakeLists.txt @@ -1,20 +1,7 @@ project(libfilewriter) -# 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) @@ -39,7 +26,7 @@ SET(libfilewriter_HDRS SET(libfilewriter_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libfilewriter_RCC_SRCS ${libfilewriter_RCCS}) +QT5_ADD_RESOURCES(libfilewriter_RCC_SRCS ${libfilewriter_RCCS}) # user interface @@ -47,7 +34,7 @@ SET(libfilewriter_UIS settingsdialog.ui ) -QT4_WRAP_UI(libfilewriter_UIS_H ${libfilewriter_UIS}) +QT5_WRAP_UI(libfilewriter_UIS_H ${libfilewriter_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -55,6 +42,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(VORBISENC_FOUND) ADD_LIBRARY(filewriter MODULE ${libfilewriter_SRCS} ${libfilewriter_UIS_H} ${libfilewriter_RCC_SRCS} ${libfilewriter_HDRS}) add_dependencies(filewriter qmmp qmmpui) -target_link_libraries(filewriter ${QT_LIBRARIES} libqmmp qmmpui ${VORBISENC_LDFLAGS}) +target_link_libraries(filewriter Qt5::Widgets -lqmmp -lqmmpui ${VORBISENC_LDFLAGS}) install(TARGETS filewriter DESTINATION ${LIB_DIR}/qmmp/Effect) ENDIF(VORBISENC_FOUND) diff --git a/src/plugins/Effect/filewriter/effectfilewriterfactory.cpp b/src/plugins/Effect/filewriter/effectfilewriterfactory.cpp index 276fcc575..140b14f50 100644 --- a/src/plugins/Effect/filewriter/effectfilewriterfactory.cpp +++ b/src/plugins/Effect/filewriter/effectfilewriterfactory.cpp @@ -20,7 +20,6 @@ #include #include -#include #include #include "filewriterplugin.h" #include "settingsdialog.h" @@ -62,5 +61,3 @@ QTranslator *EffectFileWriterFactory::createTranslator(QObject *parent) translator->load(QString(":/filewriter_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(filewriter,EffectFileWriterFactory) diff --git a/src/plugins/Effect/filewriter/effectfilewriterfactory.h b/src/plugins/Effect/filewriter/effectfilewriterfactory.h index 494f4c41b..8f15a13db 100644 --- a/src/plugins/Effect/filewriter/effectfilewriterfactory.h +++ b/src/plugins/Effect/filewriter/effectfilewriterfactory.h @@ -30,6 +30,7 @@ class EffectFileWriterFactory : public QObject, public EffectFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.EffectFactoryInterface.1.0") Q_INTERFACES(EffectFactory) public: diff --git a/src/plugins/Effect/filewriter/filewriterplugin.cpp b/src/plugins/Effect/filewriter/filewriterplugin.cpp index 1091787a1..c605370e0 100644 --- a/src/plugins/Effect/filewriter/filewriterplugin.cpp +++ b/src/plugins/Effect/filewriter/filewriterplugin.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include -#include +#include #include #include #include @@ -116,7 +116,7 @@ void FileWriterPlugin::init(const QMap &metaData) QSettings settings(Qmmp::configFile(), QSettings::IniFormat); float quality = settings.value("FileWriter/vorbis_quality", 0.8).toFloat(); - QString outDir = QDesktopServices::storageLocation(QDesktopServices::MusicLocation); + QString outDir = QStandardPaths::writableLocation(QStandardPaths::MusicLocation); outDir = settings.value("FileWriter/out_dir", outDir).toString(); QString fileName = settings.value("FileWriter/file_name", "%p%if(%p&%t, - ,)%t").toString(); if(fileName.isEmpty()) diff --git a/src/plugins/Effect/filewriter/settingsdialog.cpp b/src/plugins/Effect/filewriter/settingsdialog.cpp index 8e2731b37..e5f30e143 100644 --- a/src/plugins/Effect/filewriter/settingsdialog.cpp +++ b/src/plugins/Effect/filewriter/settingsdialog.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include -#include +#include #include #include #include @@ -37,7 +37,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) connect(fileNameMenu, SIGNAL(patternSelected(QString)), SLOT(addTitleString(QString))); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - QString outDir = QDesktopServices::storageLocation(QDesktopServices::MusicLocation); + QString outDir = QStandardPaths::writableLocation(QStandardPaths::MusicLocation); m_ui.outDirEdit->setText(settings.value("FileWriter/out_dir", outDir).toString()); m_ui.outFileEdit->setText(settings.value("FileWriter/file_name", "%p%if(%p&%t, - ,)%t").toString()); m_ui.qualitySpinBox->setValue(settings.value("FileWriter/vorbis_quality", 0.8).toFloat()); diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_bg.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_bg.ts index 6d3a5a220..63060b3eb 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_bg.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_bg.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin - + About File Writer Plugin - + Qmmp File Writer Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_cs.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_cs.ts index 723848d0e..e16d035e6 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_cs.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_cs.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin - + About File Writer Plugin - + Qmmp File Writer Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_de.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_de.ts index 43c7c05de..360a2eac6 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_de.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_de.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin - + About File Writer Plugin - + Qmmp File Writer Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_el.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_el.ts index 311a2a6a3..082d7e04b 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_el.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_el.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin Πρόσθετο εγγραφής αρχείων - + About File Writer Plugin Σχετικά με το πρόσθετο εγγραφής αρχείων - + Qmmp File Writer Plugin Πρόσθετο εγγραφής αρχείων Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_en.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_en.ts index 7d167aea3..dfbe44e86 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_en.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_en.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin - + About File Writer Plugin - + Qmmp File Writer Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_es.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_es.ts index 8f415a7c5..f984d10af 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_es.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_es.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin Módulo Escritor de Archivos - + About File Writer Plugin Acerca del Módulo Escritor de Archivos - + Qmmp File Writer Plugin Módulo Escritor de Archivos de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_fi.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_fi.ts index 2929d450e..2cbc591b0 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_fi.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_fi.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin - + About File Writer Plugin - + Qmmp File Writer Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_fr.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_fr.ts index 991f0b21e..bd3e9494c 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_fr.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_fr.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin Plugin d'écriture des fichiers - + About File Writer Plugin A propose du plugin d'écriture des fichiers - + Qmmp File Writer Plugin Plugin Qmmp d'écriture des fichiers - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_gl_ES.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_gl_ES.ts index 7e4088c60..cdb938a07 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_gl_ES.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_gl_ES.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin Engadido File Writer - + About File Writer Plugin Acerca do engadido File Writer - + Qmmp File Writer Plugin Engadido Qmmp File Writer - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_he.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_he.ts index 1aeca94c9..fc0d3711b 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_he.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_he.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin - + About File Writer Plugin - + Qmmp File Writer Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_hu.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_hu.ts index e82699b9b..4cdf988d2 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_hu.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_hu.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin - + About File Writer Plugin - + Qmmp File Writer Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_id.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_id.ts index d811145eb..ff0e49e78 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_id.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_id.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin Plugin File Writer - + About File Writer Plugin Tentang Plugin File Writer - + Qmmp File Writer Plugin Plugin File Writer Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_it.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_it.ts index 0d3bc715d..35b06215b 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_it.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_it.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin - + About File Writer Plugin - + Qmmp File Writer Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_ja.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_ja.ts index 6846e8135..7b61559f0 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_ja.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_ja.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin 音声ファイル書き出しプラグイン - + About File Writer Plugin 音声ファイル書き出しプラグインについて - + Qmmp File Writer Plugin QMMP 音声ファイル書き出しプラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_kk.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_kk.ts index b455026b2..be0d1b82c 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_kk.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_kk.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin - + About File Writer Plugin - + Qmmp File Writer Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_lt.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_lt.ts index 4e5119f2b..183583b8c 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_lt.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_lt.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin - + About File Writer Plugin - + Qmmp File Writer Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_nl.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_nl.ts index 7756ab143..5bbcb34c1 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_nl.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_nl.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin - + About File Writer Plugin - + Qmmp File Writer Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_pl_PL.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_pl_PL.ts index 25f523c44..600694001 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_pl_PL.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_pl_PL.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin - + About File Writer Plugin - + Qmmp File Writer Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_pt.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_pt.ts index 5d8370e60..ae81b2a42 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_pt.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_pt.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin Suplemento File Writer - + About File Writer Plugin Sobre o suplemento File Writer - + Qmmp File Writer Plugin Suplemento Qmmp File Writer - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_pt_BR.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_pt_BR.ts index 1dde98068..5a3c941c5 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_pt_BR.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_pt_BR.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin - + About File Writer Plugin - + Qmmp File Writer Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_ru.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_ru.ts index 6cf6017f6..a1083f973 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_ru.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_ru.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin Модуль записи файлов - + About File Writer Plugin О модуле записи файлов - + Qmmp File Writer Plugin Модуль записи файлов для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_sk.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_sk.ts index ed621b0a2..8a3a3b473 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_sk.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_sk.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin - + About File Writer Plugin - + Qmmp File Writer Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_sr_BA.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_sr_BA.ts index 94378ed6b..ff7a62e09 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_sr_BA.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_sr_BA.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin - + About File Writer Plugin - + Qmmp File Writer Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_sr_RS.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_sr_RS.ts index 5781da82f..29ea6f3b0 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_sr_RS.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_sr_RS.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin - + About File Writer Plugin - + Qmmp File Writer Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_tr.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_tr.ts index 066519d3b..8fad6e411 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_tr.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_tr.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin - + About File Writer Plugin - + Qmmp File Writer Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_uk_UA.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_uk_UA.ts index a3267b54b..2cf000c3b 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_uk_UA.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_uk_UA.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin Модуль запису файлів - + About File Writer Plugin Про модуль запису файлів - + Qmmp File Writer Plugin Модуль запису файлів для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_zh_CN.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_zh_CN.ts index 8ae09adb6..d5d52b141 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_zh_CN.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_zh_CN.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin 文件写入插件 - + About File Writer Plugin 关于文件写入插件 - + Qmmp File Writer Plugin Qmmp 文件写入插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/filewriter/translations/filewriter_plugin_zh_TW.ts b/src/plugins/Effect/filewriter/translations/filewriter_plugin_zh_TW.ts index aea7ee95e..b32076677 100644 --- a/src/plugins/Effect/filewriter/translations/filewriter_plugin_zh_TW.ts +++ b/src/plugins/Effect/filewriter/translations/filewriter_plugin_zh_TW.ts @@ -4,22 +4,22 @@ EffectFileWriterFactory - + File Writer Plugin - + About File Writer Plugin - + Qmmp File Writer Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Effect/ladspa/CMakeLists.txt b/src/plugins/Effect/ladspa/CMakeLists.txt index 98c129995..979345431 100644 --- a/src/plugins/Effect/ladspa/CMakeLists.txt +++ b/src/plugins/Effect/ladspa/CMakeLists.txt @@ -1,20 +1,7 @@ project(libladspa) -# 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,7 +21,7 @@ SET(libladspa_HDRS SET(libladspa_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libladspa_RCC_SRCS ${libladspa_RCCS}) +QT5_ADD_RESOURCES(libladspa_RCC_SRCS ${libladspa_RCCS}) # user interface @@ -42,7 +29,7 @@ SET(libladspa_UIS settingsdialog.ui ) -QT4_WRAP_UI(libladspa_UIS_H ${libladspa_UIS}) +QT5_WRAP_UI(libladspa_UIS_H ${libladspa_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -50,6 +37,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(ladspa MODULE ${libladspa_SRCS} ${libladspa_UIS_H} ${libladspa_RCC_SRCS} ${libladspa_HDRS}) add_dependencies(ladspa qmmp) -target_link_libraries(ladspa ${QT_LIBRARIES} libqmmp ${CMAKE_DL_LIBS}) +target_link_libraries(ladspa Qt5::Widgets -lqmmp ${CMAKE_DL_LIBS}) install(TARGETS ladspa DESTINATION ${LIB_DIR}/qmmp/Effect) diff --git a/src/plugins/Effect/ladspa/effectladspafactory.cpp b/src/plugins/Effect/ladspa/effectladspafactory.cpp index 24a72771a..af746e2ae 100644 --- a/src/plugins/Effect/ladspa/effectladspafactory.cpp +++ b/src/plugins/Effect/ladspa/effectladspafactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009 by Ilya Kotov * + * Copyright (C) 2009-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 "ladspahelper.h" @@ -65,5 +64,3 @@ QTranslator *EffectLADSPAFactory::createTranslator(QObject *parent) translator->load(QString(":/ladspa_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(ladspa,EffectLADSPAFactory) diff --git a/src/plugins/Effect/ladspa/effectladspafactory.h b/src/plugins/Effect/ladspa/effectladspafactory.h index 9c694a7b0..b8c9b2fdb 100644 --- a/src/plugins/Effect/ladspa/effectladspafactory.h +++ b/src/plugins/Effect/ladspa/effectladspafactory.h @@ -30,7 +30,8 @@ class EffectLADSPAFactory : public QObject, public EffectFactory { Q_OBJECT -Q_INTERFACES(EffectFactory); +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.EffectFactoryInterface.1.0") +Q_INTERFACES(EffectFactory) public: const EffectProperties properties() const; diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_bg.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_bg.ts index 9ba380a79..977cbb28b 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_bg.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_bg.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin - + About LADSPA Host for Qmmp - + LADSPA Host for Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP - + BMP-ladspa developers: - + Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_cs.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_cs.ts index e6de43f71..46fa67ec2 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_cs.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_cs.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin Modul LADSPA - + About LADSPA Host for Qmmp O modulu LADSPA hostitele pro Qmmp - + LADSPA Host for Qmmp Hostitel LADSPA pro Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP Založeno na hostiteli LADSPA pro BMP - + BMP-ladspa developers: Vývojáři BMP-ladspa: - + Nick Lamb <njl195@zepler.org.uk> Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_de.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_de.ts index 2cbac6277..0d6359e96 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_de.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_de.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin LADSPA-Modul - + About LADSPA Host for Qmmp Über LADSPA-Host für Qmmp - + LADSPA Host for Qmmp LADSPA-Host für Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP Basierend auf dem LADSPA-Host für BMP - + BMP-ladspa developers: BMP-LADSPA-Entwickler: - + Nick Lamb <njl195@zepler.org.uk> Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_el.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_el.ts index 163fdf9a0..ad79c1481 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_el.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_el.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin Πρόσθετο LADSPA - + About LADSPA Host for Qmmp Σχετικά με το πρόσθετο υποδοχέα LADSPA για το Qmmp - + LADSPA Host for Qmmp Πρόσθετο υποδοχέα LADSPA για το Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> - + Based on the LADSPA Host for BMP Βασισμένο στον υποδοχέα LADSPA για BMP - + BMP-ladspa developers: Προγραμματιστές των BMP-ladspa: - + Nick Lamb <njl195@zepler.org.uk> Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_en.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_en.ts index 4b4951f63..8be404e5e 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_en.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_en.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin - + About LADSPA Host for Qmmp - + LADSPA Host for Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP - + BMP-ladspa developers: - + Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_es.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_es.ts index 5dbc6f3f0..b0e59f5fb 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_es.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_es.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin Módulo LADSPA - + About LADSPA Host for Qmmp Acerca del módulo LADSPA para Qmmp - + LADSPA Host for Qmmp Módulo LADSPA para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP Basado en el módulo LADSPA para BMP - + BMP-ladspa developers: Desarrolladores de BMP-ladspa: - + Nick Lamb <njl195@zepler.org.uk> Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_fi.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_fi.ts index e3df01e97..397de889c 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_fi.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_fi.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin LADSPA-liitännäinen - + About LADSPA Host for Qmmp - + LADSPA Host for Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP - + BMP-ladspa developers: - + Nick Lamb <njl195@zepler.org.uk> Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_fr.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_fr.ts index d7db18f54..c215261c6 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_fr.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_fr.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin Greffon LADSPA - + About LADSPA Host for Qmmp À propos du greffon LADSPA - + LADSPA Host for Qmmp Hôte LADSPA pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP Basé sur l'hôte LADSPA pour BMP - + BMP-ladspa developers: Développeurs BMP-ladspa : - + Nick Lamb <njl195@zepler.org.uk> Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_gl_ES.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_gl_ES.ts index 0f0d7fec8..4c674c875 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_gl_ES.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_gl_ES.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin Engadido LADSPA - + About LADSPA Host for Qmmp Sobre LADSPA Host para Qmmp - + LADSPA Host for Qmmp LADSPA Host para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP Baseado no LADSPA Host para BMP - + BMP-ladspa developers: Desenvolvedores de BMP-ladspa: - + Nick Lamb <njl195@zepler.org.uk> Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_he.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_he.ts index 78c23a01d..bc34576be 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_he.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_he.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin תוסף LADSPA - + About LADSPA Host for Qmmp אודות מארח LADSPA עבור Qmmp - + LADSPA Host for Qmmp מארח LADSPA עבור Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP מבוסס על LADSPA Host עבור BMP - + BMP-ladspa developers: מפתחי BMP-ladspa: - + Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_hu.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_hu.ts index 58fef69af..b618aaa8e 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_hu.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_hu.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin - + About LADSPA Host for Qmmp - + LADSPA Host for Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP - + BMP-ladspa developers: - + Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_id.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_id.ts index a42744770..53cbe16a1 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_id.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_id.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin Plugin LADSPA - + About LADSPA Host for Qmmp Tentang Host LADSPA bagi Qmmp - + LADSPA Host for Qmmp Host LADSPA bagi Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP Berdasarkan pada Host LADSPA bagi BMP - + BMP-ladspa developers: Pengembang BMP-ladspa: - + Nick Lamb <njl195@zepler.org.uk> Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_it.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_it.ts index 94940592c..7590d8988 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_it.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_it.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin Plugin LADSPA - + About LADSPA Host for Qmmp Informazioni su LADSPA per Qmmp - + LADSPA Host for Qmmp Host LADSPA per Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Autori: Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP Basato su Host LADSPA per BMP - + BMP-ladspa developers: Sviluppatori BMP-ladspa: - + Nick Lamb <njl195@zepler.org.uk> Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_ja.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_ja.ts index 1845f045b..7cb002a7d 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_ja.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_ja.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin LADSPA プラグイン - + About LADSPA Host for Qmmp QMMP 用の LADSPA ホストについて - + LADSPA Host for Qmmp QMMP 用の LADSPA ホスト - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP BMP 用 LADSPA ホストを基に作成 - + BMP-ladspa developers: BMP-ladspa 開発者: - + Nick Lamb <njl195@zepler.org.uk> Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_kk.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_kk.ts index 479a2cb00..ebbd81420 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_kk.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_kk.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin - + About LADSPA Host for Qmmp - + LADSPA Host for Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP - + BMP-ladspa developers: - + Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_lt.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_lt.ts index e16377646..46a4f3261 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_lt.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_lt.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin LADSPA Įskiepis - + About LADSPA Host for Qmmp Apie LADSPA įskiepį - + LADSPA Host for Qmmp LADSPA įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP Sukurta "LADSPA Host for BMP" pagrindu - + BMP-ladspa developers: BMP LADSPA kurėjai: - + Nick Lamb <njl195@zepler.org.uk> Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_nl.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_nl.ts index 2c230f68d..c68fc990b 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_nl.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_nl.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin LADSPA Module - + About LADSPA Host for Qmmp Over de LADSPA Module voor Qmmp - + LADSPA Host for Qmmp LADSPA Host voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP Gebasseerd op de LADSPA Host voor BMP - + BMP-ladspa developers: BMP-ladspa ontwikkelaars: - + Nick Lamb <njl195@zepler.org.uk> Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_pl_PL.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_pl_PL.ts index 2b32250ce..786a146f6 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_pl_PL.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_pl_PL.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin Wtyczka LADSPA - + About LADSPA Host for Qmmp O wtyczce LADSPA dla Qmmp - + LADSPA Host for Qmmp Host LADSPA dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP Oparta na LADSPA Host dla BMP - + BMP-ladspa developers: Autorzy BMP-ladspa: - + Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_pt.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_pt.ts index c58e9c4eb..559d1ad09 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_pt.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_pt.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin Suplemento LADSPA - + About LADSPA Host for Qmmp Sobre o suplemento Qmmp LADSPA Host - + LADSPA Host for Qmmp Suplemento Qmmp LADSPA Host - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP Baseado no LADSPA Host para BMP - + BMP-ladspa developers: Programadores BMP-ladspa: - + Nick Lamb <njl195@zepler.org.uk> Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_pt_BR.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_pt_BR.ts index 35b82f81f..d68f53c7e 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_pt_BR.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_pt_BR.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin Plugin LADSPA - + About LADSPA Host for Qmmp Sobre o plugin Qmmp LADSPA Host - + LADSPA Host for Qmmp Plugin Qmmp LADSPA Host - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP Baseado no LADSPA Host para BMP - + BMP-ladspa developers: Programadores BMP-ladspa: - + Nick Lamb <njl195@zepler.org.uk> Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_ru.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_ru.ts index 005cc735a..06ed932cd 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_ru.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_ru.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin Модуль LADSPA - + About LADSPA Host for Qmmp О модуле LADSPA для Qmmp - + LADSPA Host for Qmmp LADSPA Host для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP Разработан на основе модуля LADSPA для BMP - + BMP-ladspa developers: Разработчики BMP-ladspa: - + Nick Lamb <njl195@zepler.org.uk> Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_sk.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_sk.ts index 2f2aecb22..5f86c6d1d 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_sk.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_sk.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin - + About LADSPA Host for Qmmp - + LADSPA Host for Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP - + BMP-ladspa developers: - + Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_sr_BA.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_sr_BA.ts index d4ec315ab..7237477ed 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_sr_BA.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_sr_BA.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin ЛАДСПА - + About LADSPA Host for Qmmp О ЛАДСПА хосту за Кумп - + LADSPA Host for Qmmp ЛАДСПА хост за Кумп - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP Заснован на ЛАДСПА хосту за БМП - + BMP-ladspa developers: БМП-ладспа програмери: - + Nick Lamb <njl195@zepler.org.uk> Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_sr_RS.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_sr_RS.ts index 369801eb8..537d5bf18 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_sr_RS.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_sr_RS.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin ЛАДСПА - + About LADSPA Host for Qmmp О ЛАДСПА хосту за Кумп - + LADSPA Host for Qmmp ЛАДСПА хост за Кумп - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP Заснован на ЛАДСПА хосту за БМП - + BMP-ladspa developers: БМП-ладспа програмери: - + Nick Lamb <njl195@zepler.org.uk> Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_tr.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_tr.ts index 8ab7ca7c1..4ad67225d 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_tr.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_tr.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin - + About LADSPA Host for Qmmp - + LADSPA Host for Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP - + BMP-ladspa developers: - + Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_uk_UA.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_uk_UA.ts index 3da605958..7cee91725 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_uk_UA.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_uk_UA.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin Модуль LADSPA - + About LADSPA Host for Qmmp Про модуль LADSPA для Qmmp - + LADSPA Host for Qmmp LADSPA Host для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP Базується на модулі LADSPA для BMP - + BMP-ladspa developers: Розробники BMP-ladspa: - + Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_zh_CN.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_zh_CN.ts index ba885c9d5..47e2fd0e7 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_zh_CN.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_zh_CN.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin LADSPA 插件 - + About LADSPA Host for Qmmp 关于 Qmmp LADSPA 主机 - + LADSPA Host for Qmmp Qmmp 的 LADSPA 主机 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP 基于 BMP 的 LADSPA 主机 - + BMP-ladspa developers: BMP-ladspa 开发者： - + Nick Lamb <njl195@zepler.org.uk> Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/ladspa/translations/ladspa_plugin_zh_TW.ts b/src/plugins/Effect/ladspa/translations/ladspa_plugin_zh_TW.ts index d2cc542a8..555c3c74d 100644 --- a/src/plugins/Effect/ladspa/translations/ladspa_plugin_zh_TW.ts +++ b/src/plugins/Effect/ladspa/translations/ladspa_plugin_zh_TW.ts @@ -4,42 +4,42 @@ EffectLADSPAFactory - + LADSPA Plugin LADSPA 外掛 - + About LADSPA Host for Qmmp 關於 Qmmp LADSPA 主机 - + LADSPA Host for Qmmp Qmmp 的 LADSPA 主机 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> - + Based on the LADSPA Host for BMP 基於 BMP 的 LADSPA 主机 - + BMP-ladspa developers: BMP-ladspa 開發者： - + Nick Lamb <njl195@zepler.org.uk> - + Giacomo Lozito <city_hunter@users.sf.net> diff --git a/src/plugins/Effect/soxr/CMakeLists.txt b/src/plugins/Effect/soxr/CMakeLists.txt index 0fd6259ea..3badea89b 100644 --- a/src/plugins/Effect/soxr/CMakeLists.txt +++ b/src/plugins/Effect/soxr/CMakeLists.txt @@ -1,13 +1,5 @@ project(libsoxr) -# 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 @@ -37,7 +29,7 @@ SET(libsoxr_HDRS SET(libsoxr_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libsoxr_RCC_SRCS ${libsoxr_RCCS}) +QT5_ADD_RESOURCES(libsoxr_RCC_SRCS ${libsoxr_RCCS}) # user interface @@ -45,7 +37,7 @@ SET(libsoxr_UIS settingsdialog.ui ) -QT4_WRAP_UI(libsoxr_UIS_H ${libsoxr_UIS}) +QT5_WRAP_UI(libsoxr_UIS_H ${libsoxr_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -53,6 +45,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(SOXR_FOUND) ADD_LIBRARY(soxr MODULE ${libsoxr_SRCS} ${libsoxr_UIS_H} ${libsoxr_RCC_SRCS} ${libsoxr_HDRS}) add_dependencies(soxr qmmp) -target_link_libraries(soxr ${QT_LIBRARIES} libqmmp ${SOXR_LDFLAGS}) +target_link_libraries(soxr Qt5::Widgets -lqmmp ${SOXR_LDFLAGS}) install(TARGETS soxr DESTINATION ${LIB_DIR}/qmmp/Effect) ENDIF(SOXR_FOUND) diff --git a/src/plugins/Effect/soxr/effectsoxrfactory.cpp b/src/plugins/Effect/soxr/effectsoxrfactory.cpp index 9343ae288..2d5004e40 100644 --- a/src/plugins/Effect/soxr/effectsoxrfactory.cpp +++ b/src/plugins/Effect/soxr/effectsoxrfactory.cpp @@ -20,7 +20,6 @@ #include #include -#include #include #include "settingsdialog.h" #include "soxresampler.h" @@ -62,5 +61,3 @@ QTranslator *EffectSoXRFactory::createTranslator(QObject *parent) translator->load(QString(":/soxr_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(soxr, EffectSoXRFactory) diff --git a/src/plugins/Effect/soxr/effectsoxrfactory.h b/src/plugins/Effect/soxr/effectsoxrfactory.h index efd643a01..c5cb435dd 100644 --- a/src/plugins/Effect/soxr/effectsoxrfactory.h +++ b/src/plugins/Effect/soxr/effectsoxrfactory.h @@ -30,7 +30,8 @@ class EffectSoXRFactory : public QObject, public EffectFactory { Q_OBJECT -Q_INTERFACES(EffectFactory); +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.EffectFactoryInterface.1.0") +Q_INTERFACES(EffectFactory) public: const EffectProperties properties() const; diff --git a/src/plugins/Effect/soxr/settingsdialog.ui b/src/plugins/Effect/soxr/settingsdialog.ui index fa253bed4..435362c88 100644 --- a/src/plugins/Effect/soxr/settingsdialog.ui +++ b/src/plugins/Effect/soxr/settingsdialog.ui @@ -7,22 +7,13 @@ 0 0 360 - 108 + 111 - SoX Resampler Settings + Sample Rate Converter Plugin Settings - - 6 - - - 6 - - - 6 - diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_bg.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_bg.ts index af7cc0813..14d5d4c0c 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_bg.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_bg.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin - + About SoX Resampler Plugin - + Qmmp SoX Resampler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings + Sample Rate Converter Plugin Settings - + Sample Rate (Hz): - + Quality: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_cs.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_cs.ts index 6e26a92be..4300579e1 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_cs.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_cs.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin - + About SoX Resampler Plugin - + Qmmp SoX Resampler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings + Sample Rate Converter Plugin Settings - + Sample Rate (Hz): Vzorkovací frekvence (Hz): - + Quality: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_de.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_de.ts index 117c3e041..f73ae2475 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_de.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_de.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin SoX-Abtastratenkonvertierermodul - + About SoX Resampler Plugin Über SoX-Abtastratenkonvertierermodul - + Qmmp SoX Resampler Plugin Qmmp SoX-Abtastratenkonvertierermodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings - Einstellungen SoX-Abtastratenkonvertierer + Sample Rate Converter Plugin Settings + - + Sample Rate (Hz): Abtastrate (Hz): - + Quality: Qualität: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_el.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_el.ts index 17dd21c41..bc97ad748 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_el.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_el.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin Πρόσθετο επαναδειγματοληψίας SoX - + About SoX Resampler Plugin Περί του Πρόσθετου επαναδειγματοληψίας SoX - + Qmmp SoX Resampler Plugin Qmmp πρόσθετο επαναδειγματοληψίας SoX - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings - Ρυθμίσεις του πρόσθετου επαναδειγματοληψίας SoX + Sample Rate Converter Plugin Settings + - + Sample Rate (Hz): Ρυθμός δειγματοληψίας (Hz): - + Quality: Ποιότητα: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_en.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_en.ts index 9ed15af21..eb2bf9e2c 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_en.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_en.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin - + About SoX Resampler Plugin - + Qmmp SoX Resampler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings + Sample Rate Converter Plugin Settings - + Sample Rate (Hz): - + Quality: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_es.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_es.ts index 8eb521873..b7b97762a 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_es.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_es.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin Módulo Recalculador SoX - + About SoX Resampler Plugin Acerca del Módulo Recalculador SoX - + Qmmp SoX Resampler Plugin Módulo Recalculador SoX de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings - Configuración de Recalculador SoX + Sample Rate Converter Plugin Settings + - + Sample Rate (Hz): Frecuencia (Hz): - + Quality: Calidad: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_fi.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_fi.ts index 3017f9dfc..f33ed26d5 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_fi.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_fi.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin - + About SoX Resampler Plugin - + Qmmp SoX Resampler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings + Sample Rate Converter Plugin Settings - + Sample Rate (Hz): Näytteenottotaajuus (Hz): - + Quality: Laatu: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_fr.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_fr.ts index 3d99afea0..035bede5c 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_fr.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_fr.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin Plugin SoX de rééchantillonnage - + About SoX Resampler Plugin A propos du plugin SoX de rééchantillonnage - + Qmmp SoX Resampler Plugin Plugin SoX Qmmp de rééchantillonnage - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings - Paramètres du rééchantillonneur SoX + Sample Rate Converter Plugin Settings + - + Sample Rate (Hz): Taux d'échantillonnage (Hz) : - + Quality: Qualité: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_gl_ES.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_gl_ES.ts index 4d18c6e7a..b682bf9a8 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_gl_ES.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_gl_ES.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin Plugin SoX Resampler - + About SoX Resampler Plugin Acerca do plugin SoX Resampler - + Qmmp SoX Resampler Plugin Plugin Qmmp SoX Resampler - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings - Configuracións SoX Resampler + Sample Rate Converter Plugin Settings + - + Sample Rate (Hz): Frecuencia (Hz): - + Quality: Calidade: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_he.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_he.ts index d420132ff..115b51ddc 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_he.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_he.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin תוסף SoX Resampler - + About SoX Resampler Plugin אודות תוסף SoX Resampler - + Qmmp SoX Resampler Plugin תוספת SoX Resampler של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings - הגדרות SoX Resampler + Sample Rate Converter Plugin Settings + - + Sample Rate (Hz): שיעור דגימה (הרץ): - + Quality: איכות: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_hu.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_hu.ts index a79f58d4d..362076b72 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_hu.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_hu.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin - + About SoX Resampler Plugin - + Qmmp SoX Resampler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings + Sample Rate Converter Plugin Settings - + Sample Rate (Hz): - + Quality: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_id.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_id.ts index 5e07692b1..da96611b9 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_id.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_id.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin Plugin Resampler SoX - + About SoX Resampler Plugin Tentang Plugin Resampler SoX - + Qmmp SoX Resampler Plugin Plugin Resampler SoX Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings - Setelan Resampler SoX + Sample Rate Converter Plugin Settings + - + Sample Rate (Hz): Sample Rate (Hz): - + Quality: Kualitas: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_it.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_it.ts index 4547b4ca6..06ae202b5 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_it.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_it.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin - + About SoX Resampler Plugin - + Qmmp SoX Resampler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings + Sample Rate Converter Plugin Settings - + Sample Rate (Hz): Campionamento (Hz): - + Quality: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_ja.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_ja.ts index 952499cd2..d4fe7ad9c 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_ja.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_ja.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin SoX Resampler プラグイン - + About SoX Resampler Plugin SoX Resampler プラグインについて - + Qmmp SoX Resampler Plugin QMMP SoX Resampler プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings - SoX Resampler の設定 + Sample Rate Converter Plugin Settings + - + Sample Rate (Hz): サンプルレート (Hz): - + Quality: 音質: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_kk.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_kk.ts index dce5b1e47..73a167313 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_kk.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_kk.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin - + About SoX Resampler Plugin - + Qmmp SoX Resampler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings + Sample Rate Converter Plugin Settings - + Sample Rate (Hz): - + Quality: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_lt.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_lt.ts index 350e111d7..7c6cf2ce4 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_lt.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_lt.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin - + About SoX Resampler Plugin - + Qmmp SoX Resampler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukurta: Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings + Sample Rate Converter Plugin Settings - + Sample Rate (Hz): Diskretizacijos dažnis (Hz): - + Quality: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_nl.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_nl.ts index 029a22d7e..947464ded 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_nl.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_nl.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin - + About SoX Resampler Plugin - + Qmmp SoX Resampler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings + Sample Rate Converter Plugin Settings - + Sample Rate (Hz): Sample frequentie (Hz): - + Quality: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_pl_PL.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_pl_PL.ts index 163bc5d60..f3c82ad76 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_pl_PL.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_pl_PL.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin - + About SoX Resampler Plugin - + Qmmp SoX Resampler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings + Sample Rate Converter Plugin Settings - + Sample Rate (Hz): Próbkowanie (Hz): - + Quality: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_pt.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_pt.ts index 96e356ddc..c3a792709 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_pt.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_pt.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin Suplemento SoX Resampler - + About SoX Resampler Plugin Sobre o suplemento SoX Resampler - + Qmmp SoX Resampler Plugin Suplemento Qmmp SoX Resampler - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings - Definições + Sample Rate Converter Plugin Settings + - + Sample Rate (Hz): Frequência (Hz): - + Quality: Qualidade: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_pt_BR.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_pt_BR.ts index 23fe8b811..c933a737a 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_pt_BR.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_pt_BR.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin Plugin SoX Resampler - + About SoX Resampler Plugin Sobre o plugin SoX Resampler - + Qmmp SoX Resampler Plugin Plugin Qmmp SoX Resampler - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings - Preferências do plugin SoX Resampler + Sample Rate Converter Plugin Settings + - + Sample Rate (Hz): Frequência (Hz): - + Quality: Qualidade: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_ru.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_ru.ts index 3ffc62b1a..94736b1c0 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_ru.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_ru.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin Модуль SoX Resampler - + About SoX Resampler Plugin О модуле SoX Resampler - + Qmmp SoX Resampler Plugin Преобразователь частоты SoX Resampler для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings - Настройки SoX Resampler + Sample Rate Converter Plugin Settings + - + Sample Rate (Hz): Частота дискретизации (Гц): - + Quality: Качество: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_sk.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_sk.ts index 93b6c239b..31b537e14 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_sk.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_sk.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin - + About SoX Resampler Plugin - + Qmmp SoX Resampler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings + Sample Rate Converter Plugin Settings - + Sample Rate (Hz): - + Quality: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_sr_BA.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_sr_BA.ts index 2baed99e6..4ba6d8939 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_sr_BA.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_sr_BA.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin - + About SoX Resampler Plugin - + Qmmp SoX Resampler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings + Sample Rate Converter Plugin Settings - + Sample Rate (Hz): Узорковање (Hz): - + Quality: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_sr_RS.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_sr_RS.ts index 1931670af..914b4ccb6 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_sr_RS.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_sr_RS.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin - + About SoX Resampler Plugin - + Qmmp SoX Resampler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings + Sample Rate Converter Plugin Settings - + Sample Rate (Hz): Узорковање (Hz): - + Quality: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_tr.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_tr.ts index c705159af..9f699b36f 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_tr.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_tr.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin - + About SoX Resampler Plugin - + Qmmp SoX Resampler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings + Sample Rate Converter Plugin Settings - + Sample Rate (Hz): Örnekleme Oranı (Hz): - + Quality: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_uk_UA.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_uk_UA.ts index f8253f1fd..aed3eaae4 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_uk_UA.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_uk_UA.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin Модуль SoX Resampler - + About SoX Resampler Plugin Про модуль SoX Resampler - + Qmmp SoX Resampler Plugin Перетворювач частоти SoX Resampler для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings - Налаштування модуля перетворювача частоти + Sample Rate Converter Plugin Settings + - + Sample Rate (Hz): Дискретизація семпла (Гц): - + Quality: Якість: diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_zh_CN.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_zh_CN.ts index 7ff35255e..bbcce6785 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_zh_CN.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_zh_CN.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin SoX重新取样器插件 - + About SoX Resampler Plugin 关于SoX重新取样器插件 - + Qmmp SoX Resampler Plugin Qmmp SoX 重新取样器插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings - SoX重新取样器设置 + Sample Rate Converter Plugin Settings + - + Sample Rate (Hz): 取样率 (Hz)： - + Quality: 质量： diff --git a/src/plugins/Effect/soxr/translations/soxr_plugin_zh_TW.ts b/src/plugins/Effect/soxr/translations/soxr_plugin_zh_TW.ts index 1ac295d35..8419ad123 100644 --- a/src/plugins/Effect/soxr/translations/soxr_plugin_zh_TW.ts +++ b/src/plugins/Effect/soxr/translations/soxr_plugin_zh_TW.ts @@ -4,22 +4,22 @@ EffectSoXRFactory - + SoX Resampler Plugin - + About SoX Resampler Plugin - + Qmmp SoX Resampler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> @@ -28,16 +28,16 @@ SettingsDialog - SoX Resampler Settings + Sample Rate Converter Plugin Settings - + Sample Rate (Hz): 取樣率 (Hz)： - + Quality: diff --git a/src/plugins/Effect/stereo/CMakeLists.txt b/src/plugins/Effect/stereo/CMakeLists.txt index a9469a2a3..b2fecd805 100644 --- a/src/plugins/Effect/stereo/CMakeLists.txt +++ b/src/plugins/Effect/stereo/CMakeLists.txt @@ -1,20 +1,7 @@ project(libstereo) -# 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) @@ -31,7 +18,7 @@ SET(libstereo_HDRS SET(libstereo_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libstereo_RCC_SRCS ${libstereo_RCCS}) +QT5_ADD_RESOURCES(libstereo_RCC_SRCS ${libstereo_RCCS}) # user interface @@ -39,7 +26,7 @@ SET(libstereo_UIS settingsdialog.ui ) -QT4_WRAP_UI(libstereo_UIS_H ${libstereo_UIS}) +QT5_WRAP_UI(libstereo_UIS_H ${libstereo_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -47,5 +34,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(stereo MODULE ${libstereo_SRCS} ${libstereo_UIS_H} ${libstereo_RCC_SRCS} ${libstereo_HDRS}) add_dependencies(stereo qmmp) -target_link_libraries(stereo ${QT_LIBRARIES} libqmmp) +target_link_libraries(stereo Qt5::Widgets -lqmmp) install(TARGETS stereo DESTINATION ${LIB_DIR}/qmmp/Effect) diff --git a/src/plugins/Effect/stereo/effectstereofactory.cpp b/src/plugins/Effect/stereo/effectstereofactory.cpp index bb9d434a4..4c87179d8 100644 --- a/src/plugins/Effect/stereo/effectstereofactory.cpp +++ b/src/plugins/Effect/stereo/effectstereofactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009 by Ilya Kotov * + * Copyright (C) 2009-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 "effectstereofactory.h" #include "settingsdialog.h" @@ -62,5 +61,3 @@ QTranslator *EffectStereoFactory::createTranslator(QObject *parent) translator->load(QString(":/stereo_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(stereo,EffectStereoFactory) diff --git a/src/plugins/Effect/stereo/effectstereofactory.h b/src/plugins/Effect/stereo/effectstereofactory.h index 9d83147fd..5e072d23d 100644 --- a/src/plugins/Effect/stereo/effectstereofactory.h +++ b/src/plugins/Effect/stereo/effectstereofactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011 by Ilya Kotov * + * Copyright (C) 2011-2015 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -30,7 +30,8 @@ class EffectStereoFactory : public QObject, public EffectFactory { Q_OBJECT -Q_INTERFACES(EffectFactory); +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.EffectFactoryInterface.1.0") +Q_INTERFACES(EffectFactory) public: const EffectProperties properties() const; diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_bg.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_bg.ts index 7072cd1b7..dc7488675 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_bg.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_bg.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin - + About Extra Stereo Plugin - + Qmmp Extra Stereo Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_cs.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_cs.ts index 4fca7fc5a..d8916afdd 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_cs.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_cs.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin Modul pro rozšířené stereo - + About Extra Stereo Plugin O modulu pro rozšířené stereo - + Qmmp Extra Stereo Plugin Modul Qmmp pro rozšířené stereo - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin Založeno na Extra Stereo Plugin pro XMMS od Johana Levina diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_de.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_de.ts index a956d3802..30842a77b 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_de.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_de.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin Extra-Stereo-Modul - + About Extra Stereo Plugin Über Extra-Stereo-Modul - + Qmmp Extra Stereo Plugin Qmmp Extra-Stereo-Modul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin Basiert auf dem Extra-Stereo-Modul für XMMS von Johan Levin diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_el.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_el.ts index 87a1fbb89..dcec48044 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_el.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_el.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin Πρόσθετο επιπλέον στερεοφωνικού - + About Extra Stereo Plugin Σχετικά με το πρόσθετο επιπλέον στερεοφωνικού - + Qmmp Extra Stereo Plugin Qmmp πρόσθετο επιπλέον στερεοφωνικού - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin Βασισμένο στο πρόσθετο επιπλέον στερεοφωνικού για το Xmms από τον Johan Levin diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_en.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_en.ts index 7ed937546..9b78cd298 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_en.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_en.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin - + About Extra Stereo Plugin - + Qmmp Extra Stereo Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_es.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_es.ts index c55ffd4a7..327dfe31a 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_es.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_es.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin Módulo de estéreo extra - + About Extra Stereo Plugin Acerca del módulo de estéreo extra - + Qmmp Extra Stereo Plugin Módulo de estéreo extra para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin Basado en el módulo de estéreo extra para Xmms de Johan Levin diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_fi.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_fi.ts index 830969d0a..1df819551 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_fi.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_fi.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin - + About Extra Stereo Plugin - + Qmmp Extra Stereo Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_fr.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_fr.ts index 151241a29..7b861ec0b 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_fr.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_fr.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin Greffon de stéréo augmentée - + About Extra Stereo Plugin À propos du greffon de stéréo augmentée - + Qmmp Extra Stereo Plugin Greffon de stéréo augmentée pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin Basé sur le greffon de stéréo augmentée pour Xmms par Johan Levin diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_gl_ES.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_gl_ES.ts index 1a14cbc91..e003782cb 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_gl_ES.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_gl_ES.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin Engadido Extra Stereo - + About Extra Stereo Plugin Sobre o engadido Extra Stereo - + Qmmp Extra Stereo Plugin Engadido Qmmp Extra Stereo Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin Baseado no engadido Extra Stereo para Xmms por Johan Levin diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_he.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_he.ts index 284e99bc9..f0c61640f 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_he.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_he.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin תוסף סטריאו נוסף - + About Extra Stereo Plugin אודות תוסף סטריאו נוסף - + Qmmp Extra Stereo Plugin תוסף סטריאו נוסף של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin מבוסס על תוסף סטריאו נוסף עבור Xmms מאתJohan Levin diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_hu.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_hu.ts index 03c003f77..f81135731 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_hu.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_hu.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin - + About Extra Stereo Plugin - + Qmmp Extra Stereo Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_id.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_id.ts index 50267cf44..51fb44d5b 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_id.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_id.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin Plugin Stereo Extra - + About Extra Stereo Plugin Tentang Plugin Stereo Extra - + Qmmp Extra Stereo Plugin Plugin Stereo Extra Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin Berdasarkan pada Plugin Stereo Extra untuk Xmms oleh Johan Levin diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_it.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_it.ts index edfa96601..fedcc752f 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_it.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_it.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin - + About Extra Stereo Plugin - + Qmmp Extra Stereo Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_ja.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_ja.ts index 56a87c2d4..e80875db0 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_ja.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_ja.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin 拡張ステレオプラグイン - + About Extra Stereo Plugin 拡張ステレオプラグインについて - + Qmmp Extra Stereo Plugin QMMP 拡張ステレオプラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin Johan Levin 作の XMMS 拡張ステレオプラグインを基に作成 diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_kk.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_kk.ts index 66a6a015e..e557f8469 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_kk.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_kk.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin - + About Extra Stereo Plugin - + Qmmp Extra Stereo Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_lt.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_lt.ts index 11ede0322..ff866af11 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_lt.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_lt.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin Ekstra Stereo įskiepis - + About Extra Stereo Plugin Apie Ekstra Stereo įskiepį - + Qmmp Extra Stereo Plugin Qmmp Ekstra tereo įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin Sukurta Xmms Ekstra Stereo įskiepio pagrindu, kurio autorius Johan Levin diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_nl.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_nl.ts index 0aef7d602..4616f3568 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_nl.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_nl.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin Extra Stereo Module - + About Extra Stereo Plugin Over de Extra Stereo Module - + Qmmp Extra Stereo Plugin Extra Stereo Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin Gebasseerd op de Extra Stereo Module voor Xmms geschreven door Johan Levin diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_pl_PL.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_pl_PL.ts index 6eba8b8ea..a11bc6577 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_pl_PL.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_pl_PL.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin Wtyczka Ekstra Stereo - + About Extra Stereo Plugin O wtyczce Ekstra Stereo - + Qmmp Extra Stereo Plugin Wtyczka Ekstra Stereo dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin Oparta na wtyczce Ekstra Stereo dla Xmms (Johan Levin) diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_pt.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_pt.ts index 069ecda63..45ce3f80d 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_pt.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_pt.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin Suplemento Extra Stereo - + About Extra Stereo Plugin Sobre o suplemento Extra Stereo - + Qmmp Extra Stereo Plugin Suplemento Qmmp Extra Stereo - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin Baseado no suplemento Extra Stereo Plugin for Xmms de Johan Levin diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_pt_BR.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_pt_BR.ts index 85956d7ea..11562f187 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_pt_BR.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_pt_BR.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin Plugin Extra Stereo - + About Extra Stereo Plugin Sobre o plugin Extra Stereo - + Qmmp Extra Stereo Plugin Plugin Qmmp Extra Stereo - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin Baseado no Extra Stereo Plugin for Xmms de Johan Levin diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_ru.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_ru.ts index 68b9bde67..d9928d572 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_ru.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_ru.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin Модуль расш. стереобазы - + About Extra Stereo Plugin О модуле расширения стереобащы - + Qmmp Extra Stereo Plugin Модуль расширения стереобазы для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin Основан на базе модуля Extra Stereo для Xmms (разработчик: Johan Levin) diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_sk.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_sk.ts index 95835ab6e..f6443b270 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_sk.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_sk.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin - + About Extra Stereo Plugin - + Qmmp Extra Stereo Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_sr_BA.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_sr_BA.ts index aa2c76085..d4c333a49 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_sr_BA.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_sr_BA.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin Додатни стерео - + About Extra Stereo Plugin О прикључку за додатни стерео - + Qmmp Extra Stereo Plugin Кумп прикључак за додатни стерео - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin Заснован на ИксММС прикључку додатног стереа од Јохана Левина (Johan Levin) diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_sr_RS.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_sr_RS.ts index 24910500b..cb1c2a869 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_sr_RS.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_sr_RS.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin Додатни стерео - + About Extra Stereo Plugin О прикључку за додатни стерео - + Qmmp Extra Stereo Plugin Кумп прикључак за додатни стерео - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin Заснован на ИксММС прикључку додатног стереа од Јохана Левина (Johan Levin) diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_tr.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_tr.ts index 8cd26c6c7..3171a91c8 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_tr.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_tr.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin - + About Extra Stereo Plugin - + Qmmp Extra Stereo Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_uk_UA.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_uk_UA.ts index 282bbe26e..4927ad227 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_uk_UA.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_uk_UA.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin Модуль розширення стереобази - + About Extra Stereo Plugin Про модуль розширення стереобази - + Qmmp Extra Stereo Plugin Модуль розширення стереобази для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin Базується на модулі розширення стерео для Xmms від Johan Levin diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_zh_CN.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_zh_CN.ts index f35bc1a20..f038461a0 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_zh_CN.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_zh_CN.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin 立体声扩展插件 - + About Extra Stereo Plugin 关于立体声扩展插件 - + Qmmp Extra Stereo Plugin Qmmp 立体声扩展插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin 基于 Johan Levin 的 Xmms 立体声扩展插件 diff --git a/src/plugins/Effect/stereo/translations/stereo_plugin_zh_TW.ts b/src/plugins/Effect/stereo/translations/stereo_plugin_zh_TW.ts index 9b8c21e7f..b36bd9150 100644 --- a/src/plugins/Effect/stereo/translations/stereo_plugin_zh_TW.ts +++ b/src/plugins/Effect/stereo/translations/stereo_plugin_zh_TW.ts @@ -4,27 +4,27 @@ EffectStereoFactory - + Extra Stereo Plugin 立体聲擴展插件 - + About Extra Stereo Plugin 關於立体聲擴展插件 - + Qmmp Extra Stereo Plugin Qmmp 立体聲擴展插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> - + Based on the Extra Stereo Plugin for Xmms by Johan Levin 基於 Johan Levin 的 Xmms 立体聲擴展插件 diff --git a/src/plugins/Engines/mplayer/CMakeLists.txt b/src/plugins/Engines/mplayer/CMakeLists.txt index a835950e7..af0f2d09d 100644 --- a/src/plugins/Engines/mplayer/CMakeLists.txt +++ b/src/plugins/Engines/mplayer/CMakeLists.txt @@ -1,20 +1,7 @@ project(libmplayer) -# 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_BINARY_DIR}/../../../ -) - # libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) @@ -29,7 +16,7 @@ SET(libmplayer_SRCS SET(libmplayer_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libmplayer_RCC_SRCS ${libmplayer_RCCS}) +QT5_ADD_RESOURCES(libmplayer_RCC_SRCS ${libmplayer_RCCS}) # user interface @@ -38,13 +25,13 @@ SET(libmplayer_UIS settingsdialog.ui ) -QT4_WRAP_UI(libmplayer_UIS_H ${libmplayer_UIS}) +QT5_WRAP_UI(libmplayer_UIS_H ${libmplayer_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(mplayer MODULE ${libmplayer_SRCS} ${libmplayer_RCC_SRCS} ${libmplayer_UIS_H}) add_dependencies(mplayer qmmp) -target_link_libraries(mplayer ${QT_LIBRARIES} libqmmp) +target_link_libraries(mplayer Qt5::Widgets -lqmmp) install(TARGETS mplayer DESTINATION ${LIB_DIR}/qmmp/Engines) diff --git a/src/plugins/Engines/mplayer/mplayerengine.cpp b/src/plugins/Engines/mplayer/mplayerengine.cpp index 08196b05e..4de93fb96 100644 --- a/src/plugins/Engines/mplayer/mplayerengine.cpp +++ b/src/plugins/Engines/mplayer/mplayerengine.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * + * Copyright (C) 2008-2015 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -56,7 +56,7 @@ FileInfo *MplayerInfo::createFileInfo(const QString &path) mplayer_process.start("mplayer", args); mplayer_process.waitForFinished(1500); mplayer_process.kill(); - QString str = QString::fromLocal8Bit(mplayer_process.readAll().constData()).trimmed(); + QString str = QString::fromLocal8Bit(mplayer_process.readAll()).trimmed(); FileInfo *info = new FileInfo(path); QStringList lines = str.split("\n"); foreach(QString line, lines) @@ -194,7 +194,7 @@ void MplayerEngine::setMuted(bool muted) void MplayerEngine::readStdOut() { - QString line = QString::fromLocal8Bit(m_process->readAll().constData()).trimmed(); + QString line = QString::fromLocal8Bit(m_process->readAll ()).trimmed(); QStringList lines = line.split("\n"); foreach(line, lines) { diff --git a/src/plugins/Engines/mplayer/mplayerenginefactory.cpp b/src/plugins/Engines/mplayer/mplayerenginefactory.cpp index 9f106052b..3e90dba9c 100644 --- a/src/plugins/Engines/mplayer/mplayerenginefactory.cpp +++ b/src/plugins/Engines/mplayer/mplayerenginefactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * + * Copyright (C) 2008-2015 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -20,7 +20,6 @@ #include #include -#include #include "mplayermetadatamodel.h" #include "settingsdialog.h" #include "mplayerengine.h" @@ -94,5 +93,3 @@ QTranslator *MplayerEngineFactory::createTranslator(QObject *parent) translator->load(QString(":/mplayer_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(mplayer,MplayerEngineFactory) diff --git a/src/plugins/Engines/mplayer/mplayerenginefactory.h b/src/plugins/Engines/mplayer/mplayerenginefactory.h index df2c96599..30857e63a 100644 --- a/src/plugins/Engines/mplayer/mplayerenginefactory.h +++ b/src/plugins/Engines/mplayer/mplayerenginefactory.h @@ -33,6 +33,7 @@ class MplayerEngineFactory : public QObject, EngineFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.EngineFactoryInterface.1.0") Q_INTERFACES(EngineFactory) public: diff --git a/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp b/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp index a16a4dabf..efac4af80 100644 --- a/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp +++ b/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp @@ -64,7 +64,7 @@ QHash MplayerMetaDataModel::audioProperties() QProcess mplayer_process; mplayer_process.start("mplayer", args); mplayer_process.waitForFinished(); - QString str = QString::fromLocal8Bit(mplayer_process.readAll().constData()).trimmed(); + QString str = QString::fromLocal8Bit(mplayer_process.readAll()).trimmed(); QStringList lines = str.split("\n"); int height = 0, width = 0; //mplayer std output parsing diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_bg.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_bg.ts index 1ba90614e..a448b35f1 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_bg.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_bg.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin - + Video Files - + About MPlayer Plugin - + Qmmp MPlayer Plugin - + This plugin uses MPlayer as backend - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_cs.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_cs.ts index 4b4c40419..2af0d31d0 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_cs.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_cs.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin Modul MPlayer - + Video Files Videosoubory - + About MPlayer Plugin O modulu MPlayer - + Qmmp MPlayer Plugin Modul Qmmp MPlayer - + This plugin uses MPlayer as backend Tento modul používá jako backend MPlayer - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_de.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_de.ts index ad55e49d0..c15acc615 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_de.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_de.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin MPlayer-Modul - + Video Files Videodateien - + About MPlayer Plugin Über MPlayer-Modul - + Qmmp MPlayer Plugin Qmmp MPlayer-Modul - + This plugin uses MPlayer as backend Dieses Modul nutzt MPlayer als Backend - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_el.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_el.ts index 8ef240db4..97a8d07ff 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_el.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_el.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin Πρόσθετο Mplayer - + Video Files Αρχεία βίντεο - + About MPlayer Plugin Σχετικά με το πρόσθετο MPlayer - + Qmmp MPlayer Plugin Qmmp πρόσθετο MPlayer - + This plugin uses MPlayer as backend Αυτό το πρόσθετο χρησιμοποιεί το MPlayer ως σύστημα υποστήριξης - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_en.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_en.ts index 0e5ac7e91..c85b40073 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_en.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_en.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin - + Video Files - + About MPlayer Plugin - + Qmmp MPlayer Plugin - + This plugin uses MPlayer as backend - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_es.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_es.ts index ac283182d..3dfdcc653 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_es.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_es.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin Módulo MPlayer - + Video Files Archivos de vídeo - + About MPlayer Plugin Acerca del módulo MPlayer - + Qmmp MPlayer Plugin Modulo MPlayer para Qmmp - + This plugin uses MPlayer as backend Este módulo utiliza MPlayer como soporte - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_fi.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_fi.ts index 50f341a37..cc4e713f7 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_fi.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_fi.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin Mplayer-liitännäinen - + Video Files Videotiedostot - + About MPlayer Plugin - + Qmmp MPlayer Plugin - + This plugin uses MPlayer as backend - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_fr.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_fr.ts index 8a80862c2..1610c3afc 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_fr.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_fr.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin Greffon MPlayer - + Video Files Fichiers vidéo - + About MPlayer Plugin À propos du greffon MPlayer - + Qmmp MPlayer Plugin Greffon MPlayer pour Qmmp - + This plugin uses MPlayer as backend Ce greffon utilise MPlayer comme programme d'arrière-plan - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_gl_ES.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_gl_ES.ts index cb0acd172..4c1fcaa73 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_gl_ES.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_gl_ES.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin Engadido Mplayer - + Video Files Ficheiros de vídeo - + About MPlayer Plugin Sobre o engadido Mplayer - + Qmmp MPlayer Plugin Engadido Qmmp Mplayer - + This plugin uses MPlayer as backend Este engadido usa Mplayer como motor - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_he.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_he.ts index 527f9a5f9..d13f7a600 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_he.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_he.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin תוסף Mplayer - + Video Files קבצי וידיאו - + About MPlayer Plugin אודות תוסף MPlayer - + Qmmp MPlayer Plugin תוסף MPlayer של Qmmp - + This plugin uses MPlayer as backend תוסף זו משתמש ביישום MPlayer בתור מגשר עורפי - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_hu.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_hu.ts index 9562eeaf7..87c6e0b02 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_hu.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_hu.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin - + Video Files - + About MPlayer Plugin - + Qmmp MPlayer Plugin - + This plugin uses MPlayer as backend - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_id.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_id.ts index e39da2045..8a0205078 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_id.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_id.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin Plugin Mplayer - + Video Files File Video - + About MPlayer Plugin Tentang Plugin Mplayer - + Qmmp MPlayer Plugin Plugin Mplayer Qmmp - + This plugin uses MPlayer as backend Plugin ini digunakan MPlayer sebagai backend - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_it.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_it.ts index 04b8c8920..d6a00a87e 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_it.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_it.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin Modulo MPlayer - + Video Files Documenti video - + About MPlayer Plugin Info sul modulo MPlayer - + Qmmp MPlayer Plugin Modulo MPlayer per Qmmp - + This plugin uses MPlayer as backend Modulo che usa MPlayer come Backend - + Written by: Ilya Kotov <forkotov02@ya.ru> Autori: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_ja.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_ja.ts index 1ddfdc29a..11a44c70b 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_ja.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_ja.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin Mplayer プラグイン - + Video Files ビデオファイル - + About MPlayer Plugin MPlayer プラグインについて - + Qmmp MPlayer Plugin QMMP MPlayer プラグイン - + This plugin uses MPlayer as backend このプラグインの実行は MPlayer で裏打ちされています - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_kk.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_kk.ts index f725f2881..0eb1494ef 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_kk.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_kk.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin - + Video Files - + About MPlayer Plugin - + Qmmp MPlayer Plugin - + This plugin uses MPlayer as backend - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_lt.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_lt.ts index 736707935..bc07e35b7 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_lt.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_lt.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin MPlayer įskiepis - + Video Files Video bylos - + About MPlayer Plugin Apie MPlayer Qmmp įskiepį - + Qmmp MPlayer Plugin Qmmp MPlayer įskiepis - + This plugin uses MPlayer as backend Šis įskiepis naudoja Mplayer video grojimui - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_nl.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_nl.ts index 8aa46c3ad..b164aada9 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_nl.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_nl.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin MPlayer Module - + Video Files Videobestanden - + About MPlayer Plugin Over de MPlayer Module - + Qmmp MPlayer Plugin MPlayer Module voor Qmmp - + This plugin uses MPlayer as backend Deze plugin gebruikt MPlayer - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_pl_PL.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_pl_PL.ts index a80d7fa5b..598a81fa7 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_pl_PL.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_pl_PL.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin Wtyczka Mplayer - + Video Files Pliki wideo - + About MPlayer Plugin O wtyczce Mplayer - + Qmmp MPlayer Plugin Wtyczka Mplayer dla Qmmp - + This plugin uses MPlayer as backend Ta wtyczka używa Mplayer do odtwarzania - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_pt.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_pt.ts index 076d1f632..30912b918 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_pt.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_pt.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin Suplemento Mplayer - + Video Files Ficheiros de vídeo - + About MPlayer Plugin Sobre o suplemento Mplayer - + Qmmp MPlayer Plugin Suplemento Qmmp Mplayer - + This plugin uses MPlayer as backend Este suplemento utiliza o mplayer para a reprodução - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_pt_BR.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_pt_BR.ts index f6747d0da..f43749ec5 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_pt_BR.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_pt_BR.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin Plugin Mplayer - + Video Files Arquivos de vídeo - + About MPlayer Plugin Sobre o plugin Mplayer - + Qmmp MPlayer Plugin Plugin Qmmp Mplayer - + This plugin uses MPlayer as backend Este plugin utiliza o Mplayer para a reprodução - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_ru.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_ru.ts index 00d991933..9ecb11b71 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_ru.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_ru.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin Модуль MPlayer - + Video Files Файлы видео - + About MPlayer Plugin О модуле MPlayer для Qmmp - + Qmmp MPlayer Plugin Модуль поддержки MPlayer для Qmmp - + This plugin uses MPlayer as backend В этом модуле для воспроизведения используется Mplayer - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_sk.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_sk.ts index 690d1690c..b3f0ee089 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_sk.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_sk.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin - + Video Files - + About MPlayer Plugin - + Qmmp MPlayer Plugin - + This plugin uses MPlayer as backend - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_sr_BA.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_sr_BA.ts index fe21ac02e..9665c2c52 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_sr_BA.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_sr_BA.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin Мплејер прикључак - + Video Files Видео фајлови - + About MPlayer Plugin О прикључку за Мплејер - + Qmmp MPlayer Plugin Кумп прикључак за Мплејер - + This plugin uses MPlayer as backend Мплејер мотор за Кумп - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_sr_RS.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_sr_RS.ts index 46ebbf53a..4f1286584 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_sr_RS.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_sr_RS.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin Мплејер прикључак - + Video Files Видео фајлови - + About MPlayer Plugin О прикључку за Мплејер - + Qmmp MPlayer Plugin Кумп прикључак за Мплејер - + This plugin uses MPlayer as backend Мплејер мотор за Кумп - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_tr.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_tr.ts index 8ab0a1d61..970344d35 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_tr.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_tr.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin Mplayer Eklentisi - + Video Files Video Dosyaları - + About MPlayer Plugin MPlayer Eklentisi Hakkında - + Qmmp MPlayer Plugin Qmmp MPlayer Eklentisi - + This plugin uses MPlayer as backend Bu eklenti arka uç olarak MPlayer kullanır - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_uk_UA.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_uk_UA.ts index c2c3f8a51..6674150d4 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_uk_UA.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_uk_UA.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin Модуль Mplayer - + Video Files Відео файли - + About MPlayer Plugin Про модуль Mplayer - + Qmmp MPlayer Plugin Модуль Mplayer для Qmmp - + This plugin uses MPlayer as backend Цей модуль використовує MPlayer як бекенд - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_zh_CN.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_zh_CN.ts index b1bcdb85a..80a47ed8c 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_zh_CN.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_zh_CN.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin Mplayer 插件 - + Video Files 视频文件 - + About MPlayer Plugin 关于 MPlayer 插件 - + Qmmp MPlayer Plugin Qmmp MPlayer 插件 - + This plugin uses MPlayer as backend 此插件使用 MPlayer 后端 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Engines/mplayer/translations/mplayer_plugin_zh_TW.ts b/src/plugins/Engines/mplayer/translations/mplayer_plugin_zh_TW.ts index 10cd85bf0..9ffef0d27 100644 --- a/src/plugins/Engines/mplayer/translations/mplayer_plugin_zh_TW.ts +++ b/src/plugins/Engines/mplayer/translations/mplayer_plugin_zh_TW.ts @@ -4,32 +4,32 @@ MplayerEngineFactory - + Mplayer Plugin Mplayer 外掛 - + Video Files 視頻文件 - + About MPlayer Plugin 關於 Mplayer 外掛 - + Qmmp MPlayer Plugin Qmmp Mplayer 外掛 - + This plugin uses MPlayer as backend 此插件使用 Mplayer 後端 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/FileDialogs/QmmpFileDialog/CMakeLists.txt b/src/plugins/FileDialogs/QmmpFileDialog/CMakeLists.txt index b699ceeee..7355d3f45 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/CMakeLists.txt +++ b/src/plugins/FileDialogs/QmmpFileDialog/CMakeLists.txt @@ -1,20 +1,7 @@ project(libqmmpfiledialog) -# 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}/../../../ -) - # libqmmpui include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -28,7 +15,7 @@ SET(libqmmpfiledialog_SRCS SET(libqmmpfiledialog_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libqmmpfiledialog_RCC_SRCS ${libqmmpfiledialog_RCCS}) +QT5_ADD_RESOURCES(libqmmpfiledialog_RCC_SRCS ${libqmmpfiledialog_RCCS}) # user interface @@ -37,12 +24,12 @@ SET(libqmmpfiledialog_UIS qmmpfiledialog.ui ) -QT4_WRAP_UI(libqmmpfiledialog_UIS_H ${libqmmpfiledialog_UIS}) +QT5_WRAP_UI(libqmmpfiledialog_UIS_H ${libqmmpfiledialog_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(qmmpfiledialog MODULE ${libqmmpfiledialog_SRCS} ${libqmmpfiledialog_UIS_H} ${libqmmpfiledialog_RCC_SRCS}) add_dependencies(qmmpfiledialog qmmpui) -target_link_libraries(qmmpfiledialog ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(qmmpfiledialog Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS qmmpfiledialog DESTINATION ${LIB_DIR}/qmmp/FileDialogs) diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp index da825dbe7..298ddfa72 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp +++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp @@ -41,6 +41,7 @@ void QmmpFileDialog::raise(const QString &dir, Mode mode, const QString &caption { m_dialog->setModeAndMask(dir, mode, mask); m_dialog->setWindowTitle(caption); + m_dialog->loadMountedVolumes(); m_dialog->show(); m_dialog->raise(); } @@ -91,5 +92,3 @@ QTranslator *QmmpFileDialogFactory::createTranslator(QObject *parent) translator->load(QString(":/qmmp_file_dialog_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(qmmpfiledialog, QmmpFileDialogFactory) diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.h b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.h index d9ad4b17a..d0d0e5c26 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.h +++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.h @@ -46,8 +46,9 @@ private: class QmmpFileDialogFactory : public QObject, public FileDialogFactory { - Q_OBJECT - Q_INTERFACES(FileDialogFactory) +Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.FileDialogFactoryInterface.1.0") +Q_INTERFACES(FileDialogFactory) public: virtual FileDialog* create(); virtual const FileDialogProperties properties() const; diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.ui b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.ui index 6164bc4b5..071bd4b6c 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.ui +++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.ui @@ -6,8 +6,8 @@ 0 0 - 574 - 374 + 616 + 367 @@ -23,8 +23,141 @@ 6 + + + + + 0 + 0 + + + + Qt::Horizontal + + + + + 0 + + + + + 0 + + + + + QAbstractItemView::ExtendedSelection + + + QListView::Free + + + true + + + QListView::Adjust + + + QListView::SinglePass + + + false + + + false + + + + + + + + + 0 + + + + + QAbstractItemView::ExtendedSelection + + + false + + + false + + + true + + + true + + + + + + + + + + + + File name: + + + + + + + + + + + 0 + 0 + + + + Add + + + + + + + Files of type: + + + + + + + + 0 + 0 + + + + QComboBox::AdjustToMinimumContentsLength + + + + + + + + 0 + 0 + + + + Close + + + - + @@ -113,127 +246,6 @@ - - - - 1 - - - - - 0 - - - - - QAbstractItemView::ExtendedSelection - - - QListView::Free - - - true - - - QListView::Adjust - - - QListView::SinglePass - - - false - - - false - - - - - - - - - 0 - - - - - QAbstractItemView::ExtendedSelection - - - false - - - false - - - true - - - true - - - - - - - - - - - File name: - - - - - - - - - - - 0 - 0 - - - - Add - - - - - - - Files of type: - - - - - - - - 0 - 0 - - - - QComboBox::AdjustToMinimumContentsLength - - - - - - - - 0 - 0 - - - - Close - - - diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp index 2181a0428..7c3388c7d 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp +++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp @@ -27,7 +27,8 @@ #include #include #include - +#include +#include #include #define HISTORY_SIZE 8 @@ -94,6 +95,11 @@ QmmpFileDialogImpl::QmmpFileDialogImpl(QWidget * parent, Qt::WindowFlags f) : QD addPushButton->setIcon(qApp->style()->standardIcon(QStyle::SP_DialogOpenButton)); closePushButton->setIcon(qApp->style()->standardIcon(QStyle::SP_DialogCloseButton)); } + + splitter->setStretchFactor(0, 0); + splitter->setStretchFactor(1, 10); + splitter->setSizes(QList() << 150 << width() - 150); + splitter->restoreState(settings.value("QMMPFileDialog/splitter_state").toByteArray()); } QmmpFileDialogImpl::~QmmpFileDialogImpl() @@ -117,6 +123,12 @@ QStringList QmmpFileDialogImpl::selectedFiles () return l; } +void QmmpFileDialogImpl::on_mountPointsListWidget_itemClicked(QListWidgetItem *item) +{ + lookInComboBox->setEditText(item->data(Qt::UserRole).toString()); + on_lookInComboBox_activated(item->data(Qt::UserRole).toString()); +} + void QmmpFileDialogImpl::on_lookInComboBox_activated(const QString &path) { if (QDir(path).exists ()) @@ -300,6 +312,23 @@ void QmmpFileDialogImpl::setModeAndMask(const QString& d,FileDialog::Mode m, con lookInComboBox->setEditText(QDir::cleanPath(path)); } +void QmmpFileDialogImpl::loadMountedVolumes() +{ + mountPointsListWidget->clear(); + foreach (QStorageInfo i, QStorageInfo::mountedVolumes()) + { + if(i.fileSystemType() == "tmpfs") + continue; + QString name = i.displayName(); + name.replace("\\x20", " "); + QListWidgetItem *item = new QListWidgetItem(name); + item->setData(Qt::UserRole, i.rootPath()); + item->setToolTip(i.rootPath()); + item->setIcon(style()->standardIcon(QStyle::SP_DirIcon)); + mountPointsListWidget->addItem(item); + } +} + void QmmpFileDialogImpl::on_listToolButton_toggled(bool yes) { if (yes) @@ -327,6 +356,7 @@ void QmmpFileDialogImpl::hideEvent (QHideEvent *event) settings.setValue("QMMPFileDialog/close_on_add", closeOnAddToolButton->isChecked()); settings.setValue("QMMPFileDialog/geometry", saveGeometry()); settings.setValue("QMMPFileDialog/history", m_history); + settings.setValue("QMMPFileDialog/splitter_state", splitter->saveState()); QWidget::hideEvent(event); } diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.h b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.h index 7419f08cf..6b3463fdc 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.h +++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.h @@ -38,9 +38,11 @@ public: ~QmmpFileDialogImpl(); void setModeAndMask(const QString&,FileDialog::Mode m, const QStringList& mask = QStringList()); + void loadMountedVolumes(); QStringList selectedFiles (); protected slots: + void on_mountPointsListWidget_itemClicked(QListWidgetItem *item); void on_lookInComboBox_activated(const QString&); void on_upToolButton_clicked(); void on_fileListView_doubleClicked(const QModelIndex&); diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_bg.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_bg.ts index d52328e01..d47e9a8e1 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_bg.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_bg.ts @@ -9,50 +9,50 @@ - + Up - - - - + + + + ... - + List view - + Detailed view - + Close dialog on add - + File name: - + Add - + Files of type: - + Close @@ -60,25 +60,25 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog - + About Qmmp File Dialog - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library @@ -86,22 +86,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add - + Save - + Directories - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_cs.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_cs.ts index 0a0ecf0d0..fa377f4e3 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_cs.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_cs.ts @@ -9,50 +9,50 @@ Přidat soubory - + Up Nahoru - - - - + + + + ... … - + List view Seznam - + Detailed view Podrobnosti - + Close dialog on add Zavřít dialog po přidání - + File name: Název souboru: - + Add Přidat - + Files of type: Soubory typu: - + Close Zavřít @@ -60,25 +60,25 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog Souborový dialog Qmmp - + About Qmmp File Dialog O souborovém dialogu Qmmp - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library Část kódu je zkopírována z knihovny Qt @@ -86,22 +86,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add Přidat - + Save Uložit - + Directories Adresáře - + %1 already exists. Do you want to replace it? %1 již existuje. diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_de.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_de.ts index 6c03937eb..fade8dedb 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_de.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_de.ts @@ -9,50 +9,50 @@ Datei(en) hinzufügen - + Up Nach oben - - - - + + + + ... … - + List view Listenansicht - + Detailed view Detailansicht - + Close dialog on add Dialog nach Hinzufügen schließen - + File name: Dateiname: - + Add Hinzufügen - + Files of type: Filter: - + Close Schließen @@ -60,18 +60,18 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog Qmmp Datei-Dialog - + About Qmmp File Dialog Über Qmmp Datei-Dialog - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> @@ -80,7 +80,7 @@ Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library Einige Codezeilen wurden von der Qt-Bibliothek übernommen @@ -88,22 +88,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add Hinzufügen - + Save Speichern - + Directories Verzeichnisse - + %1 already exists. Do you want to replace it? %1 existiert bereits. diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_el.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_el.ts index 481660a3f..4fb92c944 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_el.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_el.ts @@ -9,50 +9,50 @@ Προσθήκη αρχείων - + Up Πάνω - - - - + + + + ... ... - + List view Προβολή λίστας - + Detailed view Προβολή λεπτομερειών - + Close dialog on add Κλείσιμο του διαλόγου κατά την προσθήκη - + File name: Όνομα αρχείου: - + Add Προσθήκη - + Files of type: Τύποι αρχείων: - + Close Κλείσιμο @@ -60,18 +60,18 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog Διάλογος αρχείων Qmmp - + About Qmmp File Dialog Σχετικά με το διάλογο αρχείων Qmmp - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> @@ -80,7 +80,7 @@ Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library Έχουν χρησιμοποιηθεί αποσπάσματα κώδικα από τη βιβλιοθήκη Qt @@ -88,22 +88,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add Προσθήκη - + Save Αποθήκευση - + Directories Καταλόγοι - + %1 already exists. Do you want to replace it? Το %1 υπάρχει ήδη. diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_en.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_en.ts index 669770dfa..a4be80178 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_en.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_en.ts @@ -9,50 +9,50 @@ - + Up - - - - + + + + ... - + List view - + Detailed view - + Close dialog on add - + File name: - + Add - + Files of type: - + Close @@ -60,25 +60,25 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog - + About Qmmp File Dialog - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library @@ -86,22 +86,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add - + Save - + Directories - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_es.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_es.ts index 2e3279ed8..6a01ccb17 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_es.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_es.ts @@ -9,50 +9,50 @@ Añadir archivos - + Up Subir - - - - + + + + ... ... - + List view Vista de lista - + Detailed view Vista detallada - + Close dialog on add Cerrar diálogo al añadir - + File name: Nombre del archivo: - + Add Añadir - + Files of type: Archivos de tipo: - + Close Cerrar @@ -60,18 +60,18 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog Diálogo de archivos para Qmmp - + About Qmmp File Dialog Acerca del diálogo de archivos para Qmmp - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> @@ -80,7 +80,7 @@ Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library Parte del código se ha copiado de la librería Qt @@ -88,22 +88,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add Añadir - + Save Guardar - + Directories Directorios - + %1 already exists. Do you want to replace it? %1 ya existe. diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_fi.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_fi.ts index e80506068..446dc09ed 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_fi.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_fi.ts @@ -9,50 +9,50 @@ Lisää tiedostoja - + Up - - - - + + + + ... ... - + List view - + Detailed view - + Close dialog on add - + File name: Tiedostonimi: - + Add Lisää - + Files of type: - + Close Sulje @@ -60,25 +60,25 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog - + About Qmmp File Dialog - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library @@ -86,22 +86,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add Lisää - + Save Tallenna - + Directories Kansiot - + %1 already exists. Do you want to replace it? %1 on jo olemassa. diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_fr.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_fr.ts index 98175498c..a2c66d800 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_fr.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_fr.ts @@ -9,50 +9,50 @@ Ajouter des fichiers - + Up Haut - - - - + + + + ... ... - + List view Vue par liste - + Detailed view Vue détaillée - + Close dialog on add Fermer le dialogue après ajout - + File name: Nom du fichier : - + Add Ajouter - + Files of type: Fichiers de type : - + Close Fermer @@ -60,18 +60,18 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog Dialogue de fichier Qmmp - + About Qmmp File Dialog À propos de Dialogue de fichier Qmmp - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> @@ -80,7 +80,7 @@ Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library Du code est copié de la bibliothèque Qt @@ -88,22 +88,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add Ajouter - + Save Sauver - + Directories Répertoires - + %1 already exists. Do you want to replace it? %1 existe déjà. diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_gl_ES.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_gl_ES.ts index dfba68656..1e2dfab60 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_gl_ES.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_gl_ES.ts @@ -9,50 +9,50 @@ Engadir ficheiros - + Up Arriba - - - - + + + + ... ... - + List view Vista de lista - + Detailed view Vista detallada - + Close dialog on add Pechar diálogo ó engadir - + File name: Nome do ficheiro: - + Add Engadir - + Files of type: Tipos de ficheiro: - + Close Pechar @@ -60,25 +60,25 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog Diálogo de ficheiro de Qmmp - + About Qmmp File Dialog Sobre diálogo de ficheiro de Qmmp - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library Algún código está copiado da librería Qt @@ -86,22 +86,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add Engadir - + Save Gardar - + Directories Directorios - + %1 already exists. Do you want to replace it? %1 xa existe diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_he.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_he.ts index 5ed4a09fb..14e8a1790 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_he.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_he.ts @@ -9,50 +9,50 @@ הוסף קבצים - + Up מעלה - - - - + + + + ... ... - + List view תצוגת רשימה - + Detailed view תצוגה מפורטת - + Close dialog on add סגור דו שיח בעת הוספה - + File name: שם קובץ: - + Add הוסף - + Files of type: קבצים מטיפוס: - + Close סגור @@ -60,25 +60,25 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog דו שיח קובץ Qmmp - + About Qmmp File Dialog אודות דו שיח קובץ Qmmp - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library קוד מסוים מועתק מתוך הספרייה Qt @@ -86,22 +86,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add הוסף - + Save שמור - + Directories מדורים - + %1 already exists. Do you want to replace it? %1 כבר קיים. diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_hu.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_hu.ts index 569d4eb3e..86d4732f5 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_hu.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_hu.ts @@ -9,50 +9,50 @@ - + Up - - - - + + + + ... - + List view - + Detailed view - + Close dialog on add - + File name: - + Add - + Files of type: - + Close @@ -60,25 +60,25 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog - + About Qmmp File Dialog - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library @@ -86,22 +86,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add - + Save - + Directories - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_id.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_id.ts index f0f2a28c6..05e6fbf62 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_id.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_id.ts @@ -9,50 +9,50 @@ Tambah File - + Up Naik - - - - + + + + ... ... - + List view Tinjau daftar - + Detailed view Tinjau rincian - + Close dialog on add Tutup dialog pada tambah - + File name: Nama file: - + Add Tambah - + Files of type: Tipe-tipe file: - + Close Tutup @@ -60,25 +60,25 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog Dialog File Qmmp - + About Qmmp File Dialog Tentang Dialog File Qmmp - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library Beberapa kode adalah salinan dari pustaka Qt @@ -86,22 +86,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add Tambah - + Save Simpan - + Directories Direktori - + %1 already exists. Do you want to replace it? %1 sudah ada. diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_it.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_it.ts index a70ff0857..cf134bfa3 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_it.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_it.ts @@ -9,50 +9,50 @@ Aggiungi brani - + Up Livello Superiore - - - - + + + + ... ... - + List view Mostra lista - + Detailed view Mostra Dettagli - + Close dialog on add Chiudi finestra quando aggiungi - + File name: Nome brano: - + Add Aggiungi - + Files of type: Tipo brani: - + Close Chiudi @@ -60,18 +60,18 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog Finestra di dialogo Qmmp - + About Qmmp File Dialog Info sulla finestra di dialogo Qmmp - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> @@ -80,7 +80,7 @@ Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library Parti del codice sono riprese dalla libreria Qt @@ -88,22 +88,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add Aggiungi - + Save Salva - + Directories Cartelle - + %1 already exists. Do you want to replace it? %1 esiste già. Vuoi sostituirlo? diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_ja.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_ja.ts index eae113240..1ca443902 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_ja.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_ja.ts @@ -9,50 +9,50 @@ ファイルを追加 - + Up 親階層へ - - - - + + + + ... ... - + List view 一覧表示 - + Detailed view 詳細表示 - + Close dialog on add 追加を終えるとダイアログも閉じる - + File name: ファイル名: - + Add 追加 - + Files of type: この種のファイル: - + Close 閉じる @@ -60,18 +60,18 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog QMMP ファイルダイアログ - + About Qmmp File Dialog QMMP ファイルダイアログについて - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> @@ -80,7 +80,7 @@ Ilya Kotov <forkotov02@ya.ru> Илья Котов (Ilya Kotov) <forkotov02@ya.ru> - + Some code is copied from the Qt library コードの一部に Qt ライブラリのソースを流用しています @@ -88,22 +88,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add 追加 - + Save 保存 - + Directories ディレクトリ - + %1 already exists. Do you want to replace it? %1 は既にあります。 diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_kk.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_kk.ts index 5a0350c4c..63033a1a7 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_kk.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_kk.ts @@ -9,50 +9,50 @@ - + Up - - - - + + + + ... - + List view - + Detailed view - + Close dialog on add - + File name: - + Add - + Files of type: - + Close @@ -60,25 +60,25 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog - + About Qmmp File Dialog - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library @@ -86,22 +86,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add - + Save - + Directories - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_lt.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_lt.ts index c0a8c2e1f..095a73d8e 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_lt.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_lt.ts @@ -9,50 +9,50 @@ Įdėti bylas - + Up Į viršų - - - - + + + + ... ... - + List view Sąrašo peržiūra - + Detailed view Detali peržiūra - + Close dialog on add Užverti pridėjus - + File name: Bylos pavadinimas: - + Add Pridėti - + Files of type: Bylų tipai: - + Close Užverti @@ -60,18 +60,18 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog Qmmp bylų langas - + About Qmmp File Dialog Apie Qmmp bylų langą - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> @@ -80,7 +80,7 @@ Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library Dalis kodo nukopijuota iš Qt bibliotekos @@ -88,22 +88,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add Pridėti - + Save Išsaugoti - + Directories Aplankai - + %1 already exists. Do you want to replace it? %1 jau yra. diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_nl.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_nl.ts index 9325815d5..36ed011aa 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_nl.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_nl.ts @@ -9,50 +9,50 @@ Bestanden toevoegen - + Up Omhoog - - - - + + + + ... - + List view Weergave modus - + Detailed view Gedetailleerde weergave - + Close dialog on add Sluit venster na toevoegen - + File name: Bestandsnaam: - + Add Toevoegen - + Files of type: Bestandstype: - + Close Sluiten @@ -60,18 +60,18 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog Qmmp Bestandsdialoog - + About Qmmp File Dialog Over de Qmmp Bestandsdialoog - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> @@ -80,7 +80,7 @@ Vladimír Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library Sommige code is gekopiëerd van de Qt bibliotheek @@ -88,22 +88,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add Toevoegen - + Save Bewaren - + Directories Mappen - + %1 already exists. Do you want to replace it? %1 bestaat al. diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_pl_PL.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_pl_PL.ts index 6ccac80e5..4e709237f 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_pl_PL.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_pl_PL.ts @@ -9,50 +9,50 @@ Dodaj pliki - + Up W górę - - - - + + + + ... ... - + List view Widok listy - + Detailed view Widok szczegółowy - + Close dialog on add Zamknij okno dialogowe po dodaniu - + File name: Nazwa pliku: - + Add Dodaj - + Files of type: Typy plików: - + Close Zamknij @@ -60,25 +60,25 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog Qmmp Okno Dialogowe - + About Qmmp File Dialog O Qmmp File Dialog - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library Część kodu zostało skopiowane z biblioteki QT @@ -86,22 +86,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add Dodaj - + Save Zapisz - + Directories Katalogi - + %1 already exists. Do you want to replace it? %1 już istnieje. diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_pt.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_pt.ts index 742e382b2..ce1ee5c42 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_pt.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_pt.ts @@ -9,50 +9,50 @@ Adicionar ficheiros - + Up Cima - - - - + + + + ... ... - + List view Vista em lista - + Detailed view Vista detalhada - + Close dialog on add Fechar diálogo ao adicionar - + File name: Nome do ficheiro - + Add Adicionar - + Files of type: Ficheiros do tipo: - + Close Fechar @@ -60,18 +60,18 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog Qmmp File Dialog - + About Qmmp File Dialog Sobre o Qmmp File Dialog - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> @@ -80,7 +80,7 @@ Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library Utiliza algum código da biblioteca Qt @@ -88,22 +88,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add Adicionar - + Save Guardar - + Directories Diretórios - + %1 already exists. Do you want to replace it? %1 já existe. diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_pt_BR.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_pt_BR.ts index b08229576..6e47ce7a5 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_pt_BR.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_pt_BR.ts @@ -9,50 +9,50 @@ Adicionar arquivos - + Up Cima - - - - + + + + ... ... - + List view Vista em lista - + Detailed view Vista detalhada - + Close dialog on add Fechar caixa de diálogo ao adicionar - + File name: Nome do arquivo: - + Add Adicionar - + Files of type: Arquivos do tipo: - + Close Fechar @@ -60,25 +60,25 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog Qmmp File Dialog - + About Qmmp File Dialog Sobre o Qmmp File Dialog - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library Utiliza algum código da biblioteca Qt @@ -86,22 +86,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add Adicionar - + Save Salvar - + Directories Pastas - + %1 already exists. Do you want to replace it? %1 já existe. diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_ru.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_ru.ts index 04ffee44c..93979573b 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_ru.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_ru.ts @@ -9,50 +9,50 @@ Добавить файлы - + Up Вверх - - - - + + + + ... ... - + List view Краткое представление - + Detailed view Детальное представление - + Close dialog on add Закрыть при добавлении - + File name: Имя файла: - + Add Добавить - + Files of type: Тип файла: - + Close Закрыть @@ -60,18 +60,18 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog Файловый диалог Qmmp - + About Qmmp File Dialog О файловом диалоге Qmmp - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> @@ -80,7 +80,7 @@ Ilya Kotov <forkotov02@ya.ru> Илья Котов <forkotov02@ya.ru> - + Some code is copied from the Qt library Часть кода использована из библиотеки Qt @@ -88,22 +88,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add Добавить - + Save Сохранить - + Directories Директории - + %1 already exists. Do you want to replace it? %1 уже существует. diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_sk.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_sk.ts index f2449bea3..87140bf31 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_sk.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_sk.ts @@ -9,50 +9,50 @@ - + Up - - - - + + + + ... - + List view - + Detailed view - + Close dialog on add - + File name: - + Add - + Files of type: - + Close @@ -60,25 +60,25 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog - + About Qmmp File Dialog - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library @@ -86,22 +86,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add - + Save - + Directories - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_sr_BA.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_sr_BA.ts index 74dc58ed5..dc9efb718 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_sr_BA.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_sr_BA.ts @@ -9,50 +9,50 @@ Додавање фајлова - + Up Горе - - - - + + + + ... ... - + List view Сажети приказ - + Detailed view Приказ детаља - + Close dialog on add Затвори дијалог по додавању - + File name: Име фајла: - + Add Додај - + Files of type: Типови фајлова: - + Close Затвори @@ -60,18 +60,18 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog Кумп дијалог фајлова - + About Qmmp File Dialog О Кумповом дијалогу фајлова - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> @@ -80,7 +80,7 @@ Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library Дио кôда је преузет из Кут библиотеке @@ -88,22 +88,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add Додај - + Save Сачувај - + Directories Фасцикле - + %1 already exists. Do you want to replace it? %1 већ постоји. diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_sr_RS.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_sr_RS.ts index ea699640c..5660556f3 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_sr_RS.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_sr_RS.ts @@ -9,50 +9,50 @@ Додавање фајлова - + Up Горе - - - - + + + + ... ... - + List view Сажети приказ - + Detailed view Приказ детаља - + Close dialog on add Затвори дијалог по додавању - + File name: Име фајла: - + Add Додај - + Files of type: Типови фајлова: - + Close Затвори @@ -60,18 +60,18 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog Кумп дијалог фајлова - + About Qmmp File Dialog О Кумповом дијалогу фајлова - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> @@ -80,7 +80,7 @@ Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library Део кôда је преузет из Кут библиотеке @@ -88,22 +88,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add Додај - + Save Сачувај - + Directories Фасцикле - + %1 already exists. Do you want to replace it? %1 већ постоји. diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_tr.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_tr.ts index 66f3aeafb..9e1d8be24 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_tr.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_tr.ts @@ -9,50 +9,50 @@ Dosya Ekle - + Up Yukarı - - - - + + + + ... ... - + List view Liste görünümü - + Detailed view Detaylı görünüm - + Close dialog on add Eklenince diyaloğu kapat - + File name: Dosya adı: - + Add Ekle - + Files of type: Dosya tipi: - + Close Kapat @@ -60,18 +60,18 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog Qmmp Dosya Diyaloğu - + About Qmmp File Dialog Qmmp Dosya Diyaloğu Hakkında - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> @@ -80,7 +80,7 @@ Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library Bazı kodlar Qt kitaplığından kopyalanmıştır @@ -88,22 +88,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add Ekle - + Save Kaydet - + Directories Dizinler - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_uk_UA.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_uk_UA.ts index e76267471..f14648556 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_uk_UA.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_uk_UA.ts @@ -9,50 +9,50 @@ Додати файли - + Up Вгору - - - - + + + + ... ... - + List view Перегляд списком - + Detailed view Деталізований перегляд - + Close dialog on add Закрити після додавання - + File name: Ім'я файлу: - + Add Додати - + Files of type: Типи файлів: - + Close Закрити @@ -60,18 +60,18 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog Діалог файлів Qmmp - + About Qmmp File Dialog Про діалог файлів Qmmp - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> @@ -80,7 +80,7 @@ Ilya Kotov <forkotov02@ya.ru> Ілля Котов <forkotov02@ya.ru> - + Some code is copied from the Qt library Деякий код скопійовано з бібліотеки Qt @@ -88,22 +88,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add Додати - + Save Зберегти - + Directories Теки - + %1 already exists. Do you want to replace it? %1 існує. diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_zh_CN.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_zh_CN.ts index 0a39168be..062a1809a 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_zh_CN.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_zh_CN.ts @@ -9,50 +9,50 @@ 添加文件 - + Up 向上 - - - - + + + + ... … - + List view 列表视图 - + Detailed view 详细视图 - + Close dialog on add 关闭对话并打开已添加 - + File name: 文件名： - + Add 添加 - + Files of type: 文件类型： - + Close 关闭 @@ -60,25 +60,25 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog Qmmp 文件对话 - + About Qmmp File Dialog 关于 Qmmp 文件对话 - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library 一些源码基于 Qt 库 @@ -86,22 +86,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add 添加 - + Save 保存 - + Directories 目录 - + %1 already exists. Do you want to replace it? %1 早已存在。 diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_zh_TW.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_zh_TW.ts index b0900ec89..2137d46bc 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_zh_TW.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_zh_TW.ts @@ -9,50 +9,50 @@ 添加文件 - + Up 向上 - - - - + + + + ... ... - + List view 清單視圖 - + Detailed view 詳細視圖 - + Close dialog on add 關閉對話並打開已添加 - + File name: 文件名： - + Add 添加 - + Files of type: 文件類型： - + Close 關閉 @@ -60,18 +60,18 @@ QmmpFileDialogFactory - - + + Qmmp File Dialog Qmmp 檔案會話 - + About Qmmp File Dialog 關於 Qmmp 檔案會話 - + Written by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> @@ -80,7 +80,7 @@ Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@ya.ru> - + Some code is copied from the Qt library 一些源碼基於 Qt 程式庫 @@ -88,22 +88,22 @@ Ilya Kotov <forkotov02@ya.ru> QmmpFileDialogImpl - + Add 添加 - + Save 儲存 - + Directories 目錄 - + %1 already exists. Do you want to replace it? ％1早已存在。 diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/CMakeLists.txt b/src/plugins/FileDialogs/TwoPanelFileDialog/CMakeLists.txt index d7f7a7e50..22f723f9d 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/CMakeLists.txt +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/CMakeLists.txt @@ -1,20 +1,7 @@ project(libtwopanelfiledialog) -# 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}/../../../ -) - # libqmmpui include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -28,7 +15,7 @@ SET(libtwopanelfiledialog_SRCS SET(libtwopanelfiledialog_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libtwopanelfiledialog_RCC_SRCS ${libtwopanelfiledialog_RCCS}) +QT5_ADD_RESOURCES(libtwopanelfiledialog_RCC_SRCS ${libtwopanelfiledialog_RCCS}) # user interface @@ -37,12 +24,12 @@ SET(libtwopanelfiledialog_UIS twopanelfiledialog.ui ) -QT4_WRAP_UI(libtwopanelfiledialog_UIS_H ${libtwopanelfiledialog_UIS}) +QT5_WRAP_UI(libtwopanelfiledialog_UIS_H ${libtwopanelfiledialog_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(twopanelfiledialog MODULE ${libtwopanelfiledialog_SRCS} ${libtwopanelfiledialog_UIS_H} ${libtwopanelfiledialog_RCC_SRCS}) add_dependencies(twopanelfiledialog qmmpui) -target_link_libraries(twopanelfiledialog ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(twopanelfiledialog Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS twopanelfiledialog DESTINATION ${LIB_DIR}/qmmp/FileDialogs) diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_bg.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_bg.ts index 21f25a469..6ee21e74c 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_bg.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_bg.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add - + Directories - + Save - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_cs.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_cs.ts index 8268c5d54..09ab7b251 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_cs.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_cs.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Přidat - + Directories Adresáře - + Save Uložit - + %1 already exists. Do you want to replace it? %1 již existuje. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_de.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_de.ts index bf5c7fe73..1e0fe7d06 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_de.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_de.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Hinzufügen - + Directories Verzeichnisse - + Save Speichern - + %1 already exists. Do you want to replace it? %1 existiert bereits. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_el.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_el.ts index b90a239f2..949b1b335 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_el.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_el.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Προσθήκη - + Directories Καταλόγοι - + Save Αποθήκευση - + %1 already exists. Do you want to replace it? Το %1 υπάρχει ήδη. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_en.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_en.ts index 897b41ea4..e23a5ce80 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_en.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_en.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add - + Directories - + Save - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_es.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_es.ts index ce42e6e4a..ad8fc545f 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_es.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_es.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Añadir - + Directories Directorios - + Save Guardar - + %1 already exists. Do you want to replace it? %1 ya existe. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_fi.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_fi.ts index e61b8825d..0bf2b550a 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_fi.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_fi.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Lisää - + Directories Kansiot - + Save Tallenna - + %1 already exists. Do you want to replace it? %1 on jo olemassa. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_fr.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_fr.ts index 32e1d2edb..8db55303b 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_fr.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_fr.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Ajouter - + Directories Répertoires - + Save Sauver - + %1 already exists. Do you want to replace it? %1 existe déjà. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_gl_ES.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_gl_ES.ts index a911bde37..2b54c8003 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_gl_ES.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_gl_ES.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Engadir - + Directories Directorios - + Save Gardar - + %1 already exists. Do you want to replace it? %1 xa existe diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_he.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_he.ts index fd7a685db..86b2cf7d4 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_he.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_he.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add הוסף - + Directories מדורים - + Save שמור - + %1 already exists. Do you want to replace it? %1 כבר קיים. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_hu.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_hu.ts index 7cce0ff78..68c55d147 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_hu.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_hu.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add - + Directories - + Save - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_id.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_id.ts index f696eb624..88eff103c 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_id.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_id.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Tambah - + Directories Direktori - + Save Simpan - + %1 already exists. Do you want to replace it? %1 sudah ada. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_it.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_it.ts index c3d63881c..cec174efd 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_it.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_it.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add - + Directories - + Save - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_ja.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_ja.ts index 49f229f46..67e854b8a 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_ja.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_ja.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add 追加 - + Directories ディレクトリー - + Save 保存 - + %1 already exists. Do you want to replace it? %1 が既にあります。 diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_kk.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_kk.ts index 539a16ded..3a9410b3f 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_kk.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_kk.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add - + Directories - + Save - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_lt.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_lt.ts index 2ab0e8c50..1929ea8ba 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_lt.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_lt.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add - + Directories - + Save - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_nl.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_nl.ts index c323f5e42..63ad06445 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_nl.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_nl.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add - + Directories - + Save - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pl_PL.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pl_PL.ts index 1e5235b0d..5f5f58a31 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pl_PL.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pl_PL.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Dodaj - + Directories Katalogi - + Save Zapisz - + %1 already exists. Do you want to replace it? %1 już istnieje. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pt.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pt.ts index a190c1d2b..6d02ae318 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pt.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pt.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Adicionar - + Directories Diretórios - + Save Guardar - + %1 already exists. Do you want to replace it? %1 já existe. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pt_BR.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pt_BR.ts index 0ac754a99..73e5ae701 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pt_BR.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_pt_BR.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Adicionar - + Directories Pastas - + Save Salvar - + %1 already exists. Do you want to replace it? %1 já existe. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_ru.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_ru.ts index 6e1a119f8..497c2d23b 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_ru.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_ru.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Добавить - + Directories Директории - + Save Сохранить - + %1 already exists. Do you want to replace it? %1 уже существует. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sk.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sk.ts index e51e7bcf2..c0fe7fae4 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sk.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sk.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add - + Directories - + Save - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sr_BA.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sr_BA.ts index a421ed30e..df960dff7 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sr_BA.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sr_BA.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add - + Directories - + Save - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sr_RS.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sr_RS.ts index bcc0b7eb7..818809a93 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sr_RS.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_sr_RS.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add - + Directories - + Save - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_tr.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_tr.ts index f45ef4643..7619ab81b 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_tr.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_tr.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add - + Directories - + Save - + %1 already exists. Do you want to replace it? diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_uk_UA.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_uk_UA.ts index 8322bedec..d53618595 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_uk_UA.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_uk_UA.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add Додати - + Directories Теки - + Save Зберегти - + %1 already exists. Do you want to replace it? %1 вже існує. diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_zh_CN.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_zh_CN.ts index 0e2eedff9..d1beea248 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_zh_CN.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_zh_CN.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add 添加 - + Directories 目录 - + Save 保存 - + %1 already exists. Do you want to replace it? %1 早已存在。 diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_zh_TW.ts b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_zh_TW.ts index fd4e5e8d1..f09afd8ff 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_zh_TW.ts +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/translations/two_panel_file_dialog_plugin_zh_TW.ts @@ -61,23 +61,23 @@ TwoPanelFileDialogImpl - - + + Add 添加 - + Directories 目錄 - + Save 儲存 - + %1 already exists. Do you want to replace it? ％1早已存在。 diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.cpp b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.cpp index e236e2a6a..9d182189b 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.cpp +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.cpp @@ -87,5 +87,3 @@ QTranslator *TwoPanelFileDialogFactory::createTranslator(QObject *parent) translator->load(QString(":/two_panel_file_dialog_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(TwoPanelFileDialog, TwoPanelFileDialogFactory) diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.h b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.h index 61a029ca2..5cd2b7455 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.h +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialog.h @@ -54,6 +54,7 @@ private: class TwoPanelFileDialogFactory : public QObject, public FileDialogFactory { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.FileDialogFactoryInterface.1.0") Q_INTERFACES(FileDialogFactory) public: FileDialog* create(); diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.cpp b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.cpp index bd13e462c..09828fc11 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.cpp +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.cpp @@ -63,11 +63,7 @@ TwoPanelFileDialogImpl::TwoPanelFileDialogImpl(QWidget * parent) : QDialog(paren m_dirModel->setReadOnly(true); m_ui.dirListView->setModel(m_dirModel); m_dirModel->setRootPath(""); -#if (QT_VERSION >= 0x040700) m_dirModel->setFilter(QDir::AllDirs | QDir::NoDot); -#else - m_dirModel->setFilter(QDir::AllDirs); -#endif m_dirModel->setNameFilterDisables (false); connect(m_ui.dirListView->selectionModel(), diff --git a/src/plugins/General/CMakeLists.txt b/src/plugins/General/CMakeLists.txt index bbeec67cf..80acaf8b2 100644 --- a/src/plugins/General/CMakeLists.txt +++ b/src/plugins/General/CMakeLists.txt @@ -5,7 +5,6 @@ SET(USE_NOTIFIER TRUE CACHE BOOL "enable/disable notifier plugin") SET(USE_LYRICS TRUE CACHE BOOL "enable/disable lyrics version") SET(USE_HAL (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") CACHE BOOL "enable/disable hal plugin") SET(USE_UDISKS2 TRUE CACHE BOOL "enable/disable udisks2 plugin") -SET(USE_UDISKS FALSE CACHE BOOL "enable/disable udisks plugin") SET(USE_HOTKEY TRUE CACHE BOOL "enable/disable global hotkey plugin") SET(USE_GNOMEHOTKEY TRUE CACHE BOOL "enable/disable gnome hotkey plugin") SET(USE_FILEOPS TRUE CACHE BOOL "enable/disable fileops plugin") @@ -17,9 +16,9 @@ SET(USE_SB TRUE CACHE BOOL "enable/disable stream browser plugin") SET(USE_TRACKCHANGE TRUE CACHE BOOL "enable/disable track change plugin") SET(USE_COPYPASTE TRUE CACHE BOOL "enable/disable copy/paste change plugin") -IF(USE_MPRIS) +IF(USE_MPRIS AND Qt5DBus_FOUND) add_subdirectory(mpris) -ENDIF(USE_MPRIS) +ENDIF(USE_MPRIS AND Qt5DBus_FOUND) IF(USE_SCROBBLER) add_subdirectory(scrobbler) @@ -37,21 +36,17 @@ IF(USE_LYRICS) add_subdirectory(lyrics) ENDIF(USE_LYRICS) -IF(USE_HAL) +IF(USE_HAL AND Qt5DBus_FOUND) add_subdirectory(hal) -ENDIF(USE_HAL) +ENDIF(USE_HAL AND Qt5DBus_FOUND) -IF(USE_UDISKS2) +IF(USE_UDISKS2 AND Qt5DBus_FOUND) add_subdirectory(udisks2) -ENDIF(USE_UDISKS2) +ENDIF(USE_UDISKS2 AND Qt5DBus_FOUND) -IF(USE_UDISKS) -add_subdirectory(udisks) -ENDIF(USE_UDISKS) - -IF(USE_HOTKEY) +IF(USE_HOTKEY AND Qt5X11Extras_FOUND) add_subdirectory(hotkey) -ENDIF(USE_HOTKEY) +ENDIF(USE_HOTKEY AND Qt5X11Extras_FOUND) IF(USE_FILEOPS) add_subdirectory(fileops) @@ -61,9 +56,9 @@ IF(USE_COVER) add_subdirectory(covermanager) ENDIF(USE_COVER) -IF(USE_KDENOTIFY) +IF(USE_KDENOTIFY AND Qt5DBus_FOUND) add_subdirectory(kdenotify) -ENDIF(USE_KDENOTIFY) +ENDIF(USE_KDENOTIFY AND Qt5DBus_FOUND) IF(USE_CONVERTER AND TAGLIB_FOUND) add_subdirectory(converter) @@ -85,6 +80,6 @@ IF(USE_COPYPASTE) add_subdirectory(copypaste) ENDIF(USE_COPYPASTE) -IF(USE_GNOMEHOTKEY) +IF(USE_GNOMEHOTKEY AND Qt5DBus_FOUND) add_subdirectory(gnomehotkey) -ENDIF(USE_GNOMEHOTKEY) +ENDIF(USE_GNOMEHOTKEY AND Qt5DBus_FOUND) diff --git a/src/plugins/General/General.pro b/src/plugins/General/General.pro index 9484a4b3d..03727ba7d 100644 --- a/src/plugins/General/General.pro +++ b/src/plugins/General/General.pro @@ -16,10 +16,6 @@ unix:SUBDIRS += mpris \ converter \ gnomehotkey -contains(CONFIG, UDISKS_PLUGIN){ - unix:SUBDIRS += udisks -} - contains(CONFIG, UDISKS2_PLUGIN){ unix:SUBDIRS += udisks2 } diff --git a/src/plugins/General/converter/CMakeLists.txt b/src/plugins/General/converter/CMakeLists.txt index 2d67bd731..e9de97024 100644 --- a/src/plugins/General/converter/CMakeLists.txt +++ b/src/plugins/General/converter/CMakeLists.txt @@ -1,22 +1,7 @@ project(libconverter) -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}/../../../ -) - # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -39,7 +24,7 @@ SET(libconverter_SRCS SET(libconverter_RCCS translations/translations.qrc presets.qrc) -QT4_ADD_RESOURCES(libconverter_RCC_SRCS ${libconverter_RCCS}) +QT5_ADD_RESOURCES(libconverter_RCC_SRCS ${libconverter_RCCS}) # user interface @@ -48,12 +33,12 @@ SET(libconverter_UIS preseteditor.ui ) -QT4_WRAP_UI(libconverter_UIS_H ${libconverter_UIS}) +QT5_WRAP_UI(libconverter_UIS_H ${libconverter_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(converter MODULE ${libconverter_SRCS} ${libconverter_UIS_H} ${libconverter_RCC_SRCS}) add_dependencies(converter qmmpui) -target_link_libraries(converter ${QT_LIBRARIES} qmmpui libqmmp ${TAGLIB_LDFLAGS}) +target_link_libraries(converter Qt5::Widgets -lqmmpui -lqmmp ${TAGLIB_LDFLAGS}) install(TARGETS converter DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/converter/converter.cpp b/src/plugins/General/converter/converter.cpp index 32a63ec53..f11a28ca5 100644 --- a/src/plugins/General/converter/converter.cpp +++ b/src/plugins/General/converter/converter.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include @@ -33,8 +33,6 @@ #include #include "converter.h" -#define QStringToTString_qt4(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8) - Converter::Converter(QObject *parent) : QObject(parent), QRunnable() { m_user_stop = false; @@ -170,7 +168,7 @@ void Converter::run() QString command = m_preset["command"].toString(); command.replace("%o", "\"" + full_path + "\""); - QString tmp_path = QDesktopServices::storageLocation(QDesktopServices::TempLocation) + "/tmp.wav"; + QString tmp_path = QStandardPaths::writableLocation(QStandardPaths::TempLocation) + "/tmp.wav"; bool use_file = command.contains("%i"); command.replace("%i", "\"" + tmp_path + "\""); @@ -258,11 +256,11 @@ void Converter::run() TagLib::FileRef file(qPrintable(full_path)); if(file.tag()) { - file.tag()->setTitle(QStringToTString_qt4(metadata[Qmmp::TITLE])); - file.tag()->setArtist(QStringToTString_qt4(metadata[Qmmp::ARTIST])); - file.tag()->setAlbum(QStringToTString_qt4(metadata[Qmmp::ALBUM])); - file.tag()->setGenre(QStringToTString_qt4(metadata[Qmmp::GENRE])); - file.tag()->setComment(QStringToTString_qt4(metadata[Qmmp::COMMENT])); + file.tag()->setTitle(QStringToTString(metadata[Qmmp::TITLE])); + file.tag()->setArtist(QStringToTString(metadata[Qmmp::ARTIST])); + file.tag()->setAlbum(QStringToTString(metadata[Qmmp::ALBUM])); + file.tag()->setGenre(QStringToTString(metadata[Qmmp::GENRE])); + file.tag()->setComment(QStringToTString(metadata[Qmmp::COMMENT])); file.tag()->setYear(metadata[Qmmp::YEAR].toUInt()); file.tag()->setTrack(metadata[Qmmp::TRACK].toUInt()); diff --git a/src/plugins/General/converter/converterdialog.cpp b/src/plugins/General/converter/converterdialog.cpp index 11266e611..2325b125b 100644 --- a/src/plugins/General/converter/converterdialog.cpp +++ b/src/plugins/General/converter/converterdialog.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include -#include +#include #include #include #include @@ -40,7 +40,7 @@ ConverterDialog::ConverterDialog(QList tracks, QWidget *paren { m_ui.setupUi(this); m_ui.tableWidget->verticalHeader()->setDefaultSectionSize(fontMetrics().height() + 3); - m_ui.tableWidget->verticalHeader()->setResizeMode(QHeaderView::Fixed); + m_ui.tableWidget->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed); QStringList paths; MetaDataFormatter formatter("%if(%p&%t,%p - %t,%f) - %l"); @@ -72,7 +72,7 @@ ConverterDialog::ConverterDialog(QList tracks, QWidget *paren QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("Converter"); - QString music_path = QDesktopServices::storageLocation(QDesktopServices::MusicLocation); + QString music_path = QStandardPaths::writableLocation(QStandardPaths::MusicLocation); m_ui.outDirEdit->setText(settings.value("out_dir", music_path).toString()); m_ui.outFileEdit->setText(settings.value("file_name","%p - %t").toString()); m_ui.overwriteCheckBox->setChecked(settings.value("overwrite",false).toBool()); @@ -272,7 +272,7 @@ void ConverterDialog::readPresets(const QString &path) QList dataList; while(!file.atEnd()) { - QString line = QString::fromUtf8(file.readLine().trimmed().constData()); + QString line = QString::fromUtf8(file.readLine().trimmed()); if(!line.contains("=")) continue; QString key = line.split("=").at(0); diff --git a/src/plugins/General/converter/converterfactory.cpp b/src/plugins/General/converter/converterfactory.cpp index 6b2e32a43..cda17108c 100644 --- a/src/plugins/General/converter/converterfactory.cpp +++ b/src/plugins/General/converter/converterfactory.cpp @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ + #include -#include -#include #include "converterhelper.h" #include "converterfactory.h" @@ -62,5 +61,3 @@ QTranslator *ConverterFactory::createTranslator(QObject *parent) translator->load(QString(":/converter_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(converter, ConverterFactory) diff --git a/src/plugins/General/converter/converterfactory.h b/src/plugins/General/converter/converterfactory.h index 27b340296..88017bfcf 100644 --- a/src/plugins/General/converter/converterfactory.h +++ b/src/plugins/General/converter/converterfactory.h @@ -33,6 +33,7 @@ class ConverterFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/converter/translations/converter_plugin_bg.ts b/src/plugins/General/converter/translations/converter_plugin_bg.ts index d68f7c317..cd633677d 100644 --- a/src/plugins/General/converter/translations/converter_plugin_bg.ts +++ b/src/plugins/General/converter/translations/converter_plugin_bg.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin - + About Converter Plugin - + Qmmp Converter Plugin - + This plugin converts supported audio files to other file formats using external command-line encoders - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_cs.ts b/src/plugins/General/converter/translations/converter_plugin_cs.ts index c4cc65d8e..18400f78d 100644 --- a/src/plugins/General/converter/translations/converter_plugin_cs.ts +++ b/src/plugins/General/converter/translations/converter_plugin_cs.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error Chyba - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Modul konvertoru - + About Converter Plugin O modulu konvertoru - + Qmmp Converter Plugin Modul Qmmp pro konverzi - + This plugin converts supported audio files to other file formats using external command-line encoders Tento modul konvertuje podporované zvukové soubory do jiných formátů pomocí externích kodérů - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_de.ts b/src/plugins/General/converter/translations/converter_plugin_de.ts index 566175bde..aa7244830 100644 --- a/src/plugins/General/converter/translations/converter_plugin_de.ts +++ b/src/plugins/General/converter/translations/converter_plugin_de.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled Abgebrochen - - + + Error Fehler - + Converting Konvertierungsvorgang - + Encoding Kodierung - + Finished Fertiggestellt @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Konvertermodul - + About Converter Plugin Über Konvertermodul - + Qmmp Converter Plugin Qmmp Konvertermodul - + This plugin converts supported audio files to other file formats using external command-line encoders Dieses Modul konvertiert unterstützte Audiodateien durch externe Befehlszeilen-Kodierer in andere Formate - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_el.ts b/src/plugins/General/converter/translations/converter_plugin_el.ts index 2b0eb5c5a..b1e2624bd 100644 --- a/src/plugins/General/converter/translations/converter_plugin_el.ts +++ b/src/plugins/General/converter/translations/converter_plugin_el.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled Ακυρώθηκε - - + + Error Σφάλμα - + Converting Μετατρέπεται - + Encoding Κωδικοποίηση - + Finished Ολοκληρώθηκε @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Πρόσθετο Μετατροπέας - + About Converter Plugin Σχετικά με το πρόσθετο Μετατροπέας - + Qmmp Converter Plugin Qmmp πρόσθετο Μετατροπέας - + This plugin converts supported audio files to other file formats using external command-line encoders Αυτό το πρόσθετο μετατρέπει υποστηριζόμενους τύπους αρχείων ήχου σε άλλες μορφές χρησιμοποιώντας κωδικοποιητές της γραμμής εντολών - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_en.ts b/src/plugins/General/converter/translations/converter_plugin_en.ts index 4faaa7d45..90bff91ea 100644 --- a/src/plugins/General/converter/translations/converter_plugin_en.ts +++ b/src/plugins/General/converter/translations/converter_plugin_en.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin - + About Converter Plugin - + Qmmp Converter Plugin - + This plugin converts supported audio files to other file formats using external command-line encoders - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_es.ts b/src/plugins/General/converter/translations/converter_plugin_es.ts index ef23b1be2..801c09b3e 100644 --- a/src/plugins/General/converter/translations/converter_plugin_es.ts +++ b/src/plugins/General/converter/translations/converter_plugin_es.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled Cancelado - - + + Error Error - + Converting Convirtiendo - + Encoding Codificando - + Finished Finalizado @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Módulo Convertidor - + About Converter Plugin Acerca del Módulo Convertidor - + Qmmp Converter Plugin Módulo Convertidor de Qmmp - + This plugin converts supported audio files to other file formats using external command-line encoders Este módulo convierte archivos de audio soportados hacia otros formatos utilizando codificadores externos de consola - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_fi.ts b/src/plugins/General/converter/translations/converter_plugin_fi.ts index 62e46df78..7b273ff46 100644 --- a/src/plugins/General/converter/translations/converter_plugin_fi.ts +++ b/src/plugins/General/converter/translations/converter_plugin_fi.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled Peruttu - - + + Error Virhe - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin - + About Converter Plugin - + Qmmp Converter Plugin - + This plugin converts supported audio files to other file formats using external command-line encoders - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_fr.ts b/src/plugins/General/converter/translations/converter_plugin_fr.ts index 656c3e8f7..069337923 100644 --- a/src/plugins/General/converter/translations/converter_plugin_fr.ts +++ b/src/plugins/General/converter/translations/converter_plugin_fr.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled Annulé - - + + Error Erreur - + Converting Conversion - + Encoding Encodage - + Finished Terminé @@ -135,27 +135,27 @@ ConverterFactory - + Converter Plugin Greffon de conversion - + About Converter Plugin À propos du greffon de conversion - + Qmmp Converter Plugin Greffon de conversion pour Qmmp - + This plugin converts supported audio files to other file formats using external command-line encoders Ce greffon convertit les fichiers audio supportés dans d'autres formats en utilisant des encodeurs en ligne de commande - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_gl_ES.ts b/src/plugins/General/converter/translations/converter_plugin_gl_ES.ts index 81a019566..de42b71b0 100644 --- a/src/plugins/General/converter/translations/converter_plugin_gl_ES.ts +++ b/src/plugins/General/converter/translations/converter_plugin_gl_ES.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled Cancelado - - + + Error Erro - + Converting Convertendo - + Encoding Codificando - + Finished Rematado @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Engadido Converter - + About Converter Plugin Sobre o engadido Converter - + Qmmp Converter Plugin Engadido Qmmp Converter - + This plugin converts supported audio files to other file formats using external command-line encoders Este engadido converte ficheiros de audio soportados a outros formatos de ficheiro usando codificadores por liña de comandos externos - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_he.ts b/src/plugins/General/converter/translations/converter_plugin_he.ts index 29ee7569d..624cc0624 100644 --- a/src/plugins/General/converter/translations/converter_plugin_he.ts +++ b/src/plugins/General/converter/translations/converter_plugin_he.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled בוטלה - - + + Error שגיאה - + Converting המרה - + Encoding קידוד - + Finished נסתיימה @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin תוסף ממיר - + About Converter Plugin אודות תוסף ממיר - + Qmmp Converter Plugin תוסף ממיר של Qmmp - + This plugin converts supported audio files to other file formats using external command-line encoders תוסף זה ממיר קבצי שמע נתמכים לפורמט קובץ באמצעות שורת פקודה של מקודדים חיצוניים - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_hu.ts b/src/plugins/General/converter/translations/converter_plugin_hu.ts index fae3f3b6f..a13158f8c 100644 --- a/src/plugins/General/converter/translations/converter_plugin_hu.ts +++ b/src/plugins/General/converter/translations/converter_plugin_hu.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin - + About Converter Plugin - + Qmmp Converter Plugin - + This plugin converts supported audio files to other file formats using external command-line encoders - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_id.ts b/src/plugins/General/converter/translations/converter_plugin_id.ts index 046fdfbf1..72c447932 100644 --- a/src/plugins/General/converter/translations/converter_plugin_id.ts +++ b/src/plugins/General/converter/translations/converter_plugin_id.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled Dibatalkan - - + + Error Galat - + Converting Mengkonversi - + Encoding Mengenkode - + Finished Selesai @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Plugin Converter - + About Converter Plugin Tentang Plugin Converter - + Qmmp Converter Plugin Plugin Converter Qmmp - + This plugin converts supported audio files to other file formats using external command-line encoders Plugin ini mengkonversi file audio yang didukung ke format file lainnya menggunakan enkoder baris-perintah eksternal - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_it.ts b/src/plugins/General/converter/translations/converter_plugin_it.ts index ef317b5da..cd94bee4d 100644 --- a/src/plugins/General/converter/translations/converter_plugin_it.ts +++ b/src/plugins/General/converter/translations/converter_plugin_it.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin - + About Converter Plugin - + Qmmp Converter Plugin - + This plugin converts supported audio files to other file formats using external command-line encoders - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_ja.ts b/src/plugins/General/converter/translations/converter_plugin_ja.ts index a581d8bc1..21264f0a1 100644 --- a/src/plugins/General/converter/translations/converter_plugin_ja.ts +++ b/src/plugins/General/converter/translations/converter_plugin_ja.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled 中止しました - - + + Error エラーです - + Converting 転換しています - + Encoding 符号化しています - + Finished 完了しました @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin ファイル形式転換プラグイン - + About Converter Plugin 転換プラグインについて - + Qmmp Converter Plugin QMMP 転換プラグイン - + This plugin converts supported audio files to other file formats using external command-line encoders このプラグインは外部のコマンドライン方式のエンコーダーを利用してサポート対象形式間で音声ファイルを転換し別の音声ファイルを生成します。 - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_kk.ts b/src/plugins/General/converter/translations/converter_plugin_kk.ts index 08897f006..c2ec6aab0 100644 --- a/src/plugins/General/converter/translations/converter_plugin_kk.ts +++ b/src/plugins/General/converter/translations/converter_plugin_kk.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin - + About Converter Plugin - + Qmmp Converter Plugin - + This plugin converts supported audio files to other file formats using external command-line encoders - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_lt.ts b/src/plugins/General/converter/translations/converter_plugin_lt.ts index 722a4a228..c646e5162 100644 --- a/src/plugins/General/converter/translations/converter_plugin_lt.ts +++ b/src/plugins/General/converter/translations/converter_plugin_lt.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Perkodavimo įskiepis - + About Converter Plugin Apie perkodavimo įskiepį - + Qmmp Converter Plugin Qmmp perkodavimo įskiepis - + This plugin converts supported audio files to other file formats using external command-line encoders Šis įskiepis perkoduoja palaikomas audio bylas, naudodamasis išorinėmis perkodavimo programomis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_nl.ts b/src/plugins/General/converter/translations/converter_plugin_nl.ts index 07fbcc05e..0f3063cf2 100644 --- a/src/plugins/General/converter/translations/converter_plugin_nl.ts +++ b/src/plugins/General/converter/translations/converter_plugin_nl.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Converteer Module - + About Converter Plugin Over de Converteer Module - + Qmmp Converter Plugin Converteer Module voor Qmmp - + This plugin converts supported audio files to other file formats using external command-line encoders Deze module converteert ondersteunde audiobestanden naar andere formaten door gebruik van externe commando prompt encoders - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_pl_PL.ts b/src/plugins/General/converter/translations/converter_plugin_pl_PL.ts index 18b51ab85..a64d143ab 100644 --- a/src/plugins/General/converter/translations/converter_plugin_pl_PL.ts +++ b/src/plugins/General/converter/translations/converter_plugin_pl_PL.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error Błąd - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Wtyczka konwertera - + About Converter Plugin O wtyczce Konwerter - + Qmmp Converter Plugin Wtyczka Konwerter dla Qmmp - + This plugin converts supported audio files to other file formats using external command-line encoders Ta wtyczka konwertuje wspierane pliki dźwiękowe do innego formatu przy użyciu zewnętrznych programów - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_pt.ts b/src/plugins/General/converter/translations/converter_plugin_pt.ts index ff2f4d30c..14d7b535a 100644 --- a/src/plugins/General/converter/translations/converter_plugin_pt.ts +++ b/src/plugins/General/converter/translations/converter_plugin_pt.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled Cancelada - - + + Error Erro - + Converting Conversão - + Encoding Codificação - + Finished Terminada @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Suplemento Converter - + About Converter Plugin Sobre o suplemento Converter - + Qmmp Converter Plugin Suplemento Qmmp Converter - + This plugin converts supported audio files to other file formats using external command-line encoders Este suplemento converte os ficheiros áudio suportados para outros formatos através da utilização de codificadores externos - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_pt_BR.ts b/src/plugins/General/converter/translations/converter_plugin_pt_BR.ts index 7edb6c99e..bc2bf1a63 100644 --- a/src/plugins/General/converter/translations/converter_plugin_pt_BR.ts +++ b/src/plugins/General/converter/translations/converter_plugin_pt_BR.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled Cancelada - - + + Error Erro - + Converting Conversão - + Encoding Codificação - + Finished Terminada @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Plugin Converter - + About Converter Plugin Sobre o plugin Converter - + Qmmp Converter Plugin Plugin Qmmp Converter - + This plugin converts supported audio files to other file formats using external command-line encoders Este plugin converte os arquivos de áudio suportados para outros formatos através da utilização de codificadores externos - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_ru.ts b/src/plugins/General/converter/translations/converter_plugin_ru.ts index 3414b2879..0c253645f 100644 --- a/src/plugins/General/converter/translations/converter_plugin_ru.ts +++ b/src/plugins/General/converter/translations/converter_plugin_ru.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled Отменено - - + + Error Ошибка - + Converting Преобразование - + Encoding Кодирование - + Finished Завершено @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Модуль преобр. форматов - + About Converter Plugin О преобразователе форматов - + Qmmp Converter Plugin Модуль преобразования аудио-форматов для Qmmp - + This plugin converts supported audio files to other file formats using external command-line encoders Этот модуль предназначен для преобразования поддерживаемых аудио-файлов в другой формат с использованием внешних консольных программ - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_sk.ts b/src/plugins/General/converter/translations/converter_plugin_sk.ts index afabc8b6f..b0153dbcf 100644 --- a/src/plugins/General/converter/translations/converter_plugin_sk.ts +++ b/src/plugins/General/converter/translations/converter_plugin_sk.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin - + About Converter Plugin - + Qmmp Converter Plugin - + This plugin converts supported audio files to other file formats using external command-line encoders - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_sr_BA.ts b/src/plugins/General/converter/translations/converter_plugin_sr_BA.ts index dfffab661..5522c4f73 100644 --- a/src/plugins/General/converter/translations/converter_plugin_sr_BA.ts +++ b/src/plugins/General/converter/translations/converter_plugin_sr_BA.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Претварач - + About Converter Plugin О претварачу - + Qmmp Converter Plugin Кумп прикључак за претварање - + This plugin converts supported audio files to other file formats using external command-line encoders Претвара подржане фајлове звука у остале формате користећи спољашње програме - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_sr_RS.ts b/src/plugins/General/converter/translations/converter_plugin_sr_RS.ts index 8c8d525e3..67cb72af9 100644 --- a/src/plugins/General/converter/translations/converter_plugin_sr_RS.ts +++ b/src/plugins/General/converter/translations/converter_plugin_sr_RS.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Претварач - + About Converter Plugin О претварачу - + Qmmp Converter Plugin Кумп прикључак за претварање - + This plugin converts supported audio files to other file formats using external command-line encoders Претвара подржане фајлове звука у остале формате користећи спољашње програме - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_tr.ts b/src/plugins/General/converter/translations/converter_plugin_tr.ts index 9cb1ff6a4..791d4ea54 100644 --- a/src/plugins/General/converter/translations/converter_plugin_tr.ts +++ b/src/plugins/General/converter/translations/converter_plugin_tr.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin - + About Converter Plugin - + Qmmp Converter Plugin - + This plugin converts supported audio files to other file formats using external command-line encoders - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_uk_UA.ts b/src/plugins/General/converter/translations/converter_plugin_uk_UA.ts index ece5917c3..cdae9dc5d 100644 --- a/src/plugins/General/converter/translations/converter_plugin_uk_UA.ts +++ b/src/plugins/General/converter/translations/converter_plugin_uk_UA.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled Скасовано - - + + Error Помилка - + Converting Конвертування - + Encoding Кодування - + Finished Завершено @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin Модуль конвертера - + About Converter Plugin Про модуль конвертера - + Qmmp Converter Plugin Модуль конвертера для Qmmp - + This plugin converts supported audio files to other file formats using external command-line encoders Цей модуль призначений для конвертування аудіофайлів, що підтримуються, в інший формат з використанням зовнішніх консольних програм - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_zh_CN.ts b/src/plugins/General/converter/translations/converter_plugin_zh_CN.ts index 448987a41..b23b6c488 100644 --- a/src/plugins/General/converter/translations/converter_plugin_zh_CN.ts +++ b/src/plugins/General/converter/translations/converter_plugin_zh_CN.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled 已取消 - - + + Error 错误 - + Converting 转化中 - + Encoding 编码中 - + Finished 完成 @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin 转换器插件 - + About Converter Plugin 关于转换器插件 - + Qmmp Converter Plugin Qmmp转换器插件 - + This plugin converts supported audio files to other file formats using external command-line encoders 该插件使用外置命令行编码器转换支持格式的音频文件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/converter/translations/converter_plugin_zh_TW.ts b/src/plugins/General/converter/translations/converter_plugin_zh_TW.ts index 4d50ddb1e..c0bb91df4 100644 --- a/src/plugins/General/converter/translations/converter_plugin_zh_TW.ts +++ b/src/plugins/General/converter/translations/converter_plugin_zh_TW.ts @@ -4,29 +4,29 @@ Converter - - + + Cancelled - - + + Error 錯誤 - + Converting - + Encoding - + Finished @@ -134,27 +134,27 @@ ConverterFactory - + Converter Plugin - + About Converter Plugin - + Qmmp Converter Plugin - + This plugin converts supported audio files to other file formats using external command-line encoders - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/CMakeLists.txt b/src/plugins/General/copypaste/CMakeLists.txt index a1d3842d9..1172ef9a2 100644 --- a/src/plugins/General/copypaste/CMakeLists.txt +++ b/src/plugins/General/copypaste/CMakeLists.txt @@ -1,22 +1,7 @@ project(libcopypaste) -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}/../../../ -) - # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -30,7 +15,7 @@ SET(libcopypaste_SRCS SET(libcopypaste_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libcopypaste_RCC_SRCS ${libcopypaste_RCCS}) +QT5_ADD_RESOURCES(libcopypaste_RCC_SRCS ${libcopypaste_RCCS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! @@ -38,5 +23,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(copypaste MODULE ${libcopypaste_SRCS} ${libcopypaste_UIS_H} ${libcopypaste_RCC_SRCS}) add_dependencies(copypaste qmmpui) -target_link_libraries(copypaste ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(copypaste Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS copypaste DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/copypaste/copypastefactory.cpp b/src/plugins/General/copypaste/copypastefactory.cpp index b4fd61a6b..bbd189c55 100644 --- a/src/plugins/General/copypaste/copypastefactory.cpp +++ b/src/plugins/General/copypaste/copypastefactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2016 by Ilya Kotov * + * Copyright (C) 2013 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 "copypaste.h" #include "copypastefactory.h" @@ -60,5 +59,3 @@ QTranslator *CopyPasteFactory::createTranslator(QObject *parent) translator->load(QString(":/copypaste_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(copypaste, CopyPasteFactory) diff --git a/src/plugins/General/copypaste/copypastefactory.h b/src/plugins/General/copypaste/copypastefactory.h index 2e157cb2e..0b8f5c7fa 100644 --- a/src/plugins/General/copypaste/copypastefactory.h +++ b/src/plugins/General/copypaste/copypastefactory.h @@ -32,6 +32,7 @@ class CopyPasteFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_bg.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_bg.ts index 98c0085ea..6a1fc53cc 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_bg.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_bg.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin - + About Copy/Paste Plugin - + Qmmp Copy/Paste Plugin - + This plugin allows one to copy selected tracks from one playlist to another - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_cs.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_cs.ts index dfdd321eb..c3ec00d4e 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_cs.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_cs.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Modul kopírování/vkládání - + About Copy/Paste Plugin O modulu kopírování/vkládání - + Qmmp Copy/Paste Plugin Modul Qmmp pro kopírování a vkládání - + This plugin allows one to copy selected tracks from one playlist to another Tento modul umožňuje kopírovat vybrané stopy z jednoho seznamu stop do jiného - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_de.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_de.ts index d8d6286fb..5ed18042a 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_de.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_de.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Kopieren/Einfügen-Modul - + About Copy/Paste Plugin Über Kopieren/Einfügen-Modul - + Qmmp Copy/Paste Plugin Qmmp Kopieren/Einfügen-Modul - + This plugin allows one to copy selected tracks from one playlist to another Dieses Modul ermöglicht es, ausgewählte Titel aus einer Wiedergabeliste in eine andere zu kopieren - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_el.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_el.ts index 720a80754..19b184fc8 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_el.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_el.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Πρόσθετο Αντιγραφής/Επικόλλησης - + About Copy/Paste Plugin Σχετικά με το πρόσθετο Αντιγραφής/Επικόλλησης - + Qmmp Copy/Paste Plugin Qmmp πρόσθετο Αντιγραφής/Επικόλλησης - + This plugin allows one to copy selected tracks from one playlist to another Αυτό το πρόσθετο επιτρέπει την αντιγραφή επιλεγμένων κομματιών από μια λίστα αναπαραγωγής σε μια άλλη. - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_en.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_en.ts index fb3629321..263380368 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_en.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_en.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin - + About Copy/Paste Plugin - + Qmmp Copy/Paste Plugin - + This plugin allows one to copy selected tracks from one playlist to another - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_es.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_es.ts index 3560d5d4a..98f1fef60 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_es.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_es.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Módulo Copiar/Pegar - + About Copy/Paste Plugin Acerca del Módulo Copiar/Pegar - + Qmmp Copy/Paste Plugin Módulo Copiar/Pegar de Qmmp - + This plugin allows one to copy selected tracks from one playlist to another Este módulo permite copiar pistas seleccionadas desde una lista de hacia otra - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_fi.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_fi.ts index f07c1e26c..7c5d22969 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_fi.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_fi.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Kopioi/liitä-liitännäinen - + About Copy/Paste Plugin - + Qmmp Copy/Paste Plugin - + This plugin allows one to copy selected tracks from one playlist to another - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_fr.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_fr.ts index 93fdf5ce2..ded128787 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_fr.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_fr.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Greffon copier/coller - + About Copy/Paste Plugin À propos du greffon copier/coller - + Qmmp Copy/Paste Plugin Greffon copier/coller pour Qmmp - + This plugin allows one to copy selected tracks from one playlist to another Ce greffon permet de copier les pistes sélectionnées d'une liste à une autre. - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_gl_ES.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_gl_ES.ts index 9c17ed948..3a36baad5 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_gl_ES.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_gl_ES.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Engadido Copiar/Pegar - + About Copy/Paste Plugin Sobre o engadido Copiar/Pegar - + Qmmp Copy/Paste Plugin Engadido Qmmp Copiar/Pegar - + This plugin allows one to copy selected tracks from one playlist to another Este engadido permite copiar pistas seleccionadas dunha lista de reprodución a outra - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_he.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_he.ts index 96da5b8dd..1bf897c2c 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_he.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_he.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin תוסף העתק/הדבק - + About Copy/Paste Plugin אודות תוסף העתק/הדבק - + Qmmp Copy/Paste Plugin תוסף העתק/הדבק של Qmmp - + This plugin allows one to copy selected tracks from one playlist to another תוסף זה מתיר לך להעתיק רצועות נבחרות מתוך רשימת נגינה אחת לאחרת - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_hu.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_hu.ts index 27fdd105b..4acb2b44c 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_hu.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_hu.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin - + About Copy/Paste Plugin - + Qmmp Copy/Paste Plugin - + This plugin allows one to copy selected tracks from one playlist to another - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_id.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_id.ts index cabe5a2e6..9d16d31b0 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_id.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_id.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Plugin Salin/Tempel - + About Copy/Paste Plugin Tentang Plugin Salin/Tempel - + Qmmp Copy/Paste Plugin Plugin Salin/Tempel Qmmp - + This plugin allows one to copy selected tracks from one playlist to another Plugin ini membolehkan untuk menyalin track terpilih dari salah satu daftarmain ke yang lain - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_it.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_it.ts index dc692ff30..493e8b2c8 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_it.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_it.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin - + About Copy/Paste Plugin - + Qmmp Copy/Paste Plugin - + This plugin allows one to copy selected tracks from one playlist to another - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_ja.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_ja.ts index 44b1f77b7..62823b594 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_ja.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_ja.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin プレイリスト切り貼りプラグイン - + About Copy/Paste Plugin 切り貼りプラグインについて - + Qmmp Copy/Paste Plugin QMMP 切り貼りプラグイン - + This plugin allows one to copy selected tracks from one playlist to another このプラグインでプレイリストからトラックを選んで他のプレイリストにコピーできます - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_kk.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_kk.ts index 43be73333..a129f2c50 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_kk.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_kk.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin - + About Copy/Paste Plugin - + Qmmp Copy/Paste Plugin - + This plugin allows one to copy selected tracks from one playlist to another - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_lt.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_lt.ts index c7b356987..e7d3b1990 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_lt.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_lt.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Copy/Paste Įskiepis - + About Copy/Paste Plugin Apie Copy/Paste Įskiepį - + Qmmp Copy/Paste Plugin Qmmp Copy/Paste Įskiepis - + This plugin allows one to copy selected tracks from one playlist to another Šis įskiepis leidžia kopijuoti pasirinktus takelius iš vieno grojaraščio į kitą - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_nl.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_nl.ts index bcab01a99..7916a1f7b 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_nl.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_nl.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin - + About Copy/Paste Plugin - + Qmmp Copy/Paste Plugin - + This plugin allows one to copy selected tracks from one playlist to another - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_pl_PL.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_pl_PL.ts index 9812d857e..a17772781 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_pl_PL.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_pl_PL.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Wtyczka Kopiuj/Wklej - + About Copy/Paste Plugin O wtyczce Kopiuj/Wklej - + Qmmp Copy/Paste Plugin Wtyczka Kopiuj/Wklej dla Qmmp - + This plugin allows one to copy selected tracks from one playlist to another Ta wtyczka pozwala na kopiowanie wybranych utworów z jednej listy odtwarzania do innej - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_pt.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_pt.ts index 745e7289f..bdd3d57c5 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_pt.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_pt.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Suplemento Copy/Paste - + About Copy/Paste Plugin Sobre o suplemento Copy/Paste - + Qmmp Copy/Paste Plugin Suplemento Qmmp Copy/Paste - + This plugin allows one to copy selected tracks from one playlist to another Este suplemento permite copiar as faixas entre as várias listas de reprodução - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_pt_BR.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_pt_BR.ts index 856091efb..7afcdc247 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_pt_BR.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_pt_BR.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Plugin Copy/Paste - + About Copy/Paste Plugin Sobre o plugin Copy/Paste - + Qmmp Copy/Paste Plugin Plugin Qmmp Copy/Paste - + This plugin allows one to copy selected tracks from one playlist to another Este plugin permite copiar faixas selecionadas de uma lista de reprodução para outra - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_ru.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_ru.ts index 59bfbac8e..c3be5e484 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_ru.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_ru.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Модуль копир./вставки - + About Copy/Paste Plugin О модуле копирования/вставки - + Qmmp Copy/Paste Plugin Модуль копирования/вставки - + This plugin allows one to copy selected tracks from one playlist to another Данный модуль позволяет копировать выбранные треки из одного списка воспроизведения в другой - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_sk.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_sk.ts index c1d42d10a..613222d83 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_sk.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_sk.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin - + About Copy/Paste Plugin - + Qmmp Copy/Paste Plugin - + This plugin allows one to copy selected tracks from one playlist to another - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_sr_BA.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_sr_BA.ts index 8e7ac2b66..ebaa94376 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_sr_BA.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_sr_BA.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Копирај/налијепи - + About Copy/Paste Plugin О прикључку за копирање/лијепљење - + Qmmp Copy/Paste Plugin Кумп прикључак за копирање/лијепљење - + This plugin allows one to copy selected tracks from one playlist to another Омогућује копирање изабране нумере са једне листе нумера на другу - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_sr_RS.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_sr_RS.ts index 52b7a0a6b..b970f6f73 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_sr_RS.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_sr_RS.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Копирај/налепи - + About Copy/Paste Plugin О прикључку за копирање/лепљење - + Qmmp Copy/Paste Plugin Кумп прикључак за копирање/лепљење - + This plugin allows one to copy selected tracks from one playlist to another Омогућује копирање изабране нумере са једне листе нумера на другу - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_tr.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_tr.ts index c09e0e0f6..41ee131bb 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_tr.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_tr.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin - + About Copy/Paste Plugin - + Qmmp Copy/Paste Plugin - + This plugin allows one to copy selected tracks from one playlist to another - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_uk_UA.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_uk_UA.ts index f41f666fc..16aafe9eb 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_uk_UA.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_uk_UA.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin Модуль копіюв./вставки - + About Copy/Paste Plugin Про модуль копіювання/вставки - + Qmmp Copy/Paste Plugin Модуль копіювання/вставки Qmmp - + This plugin allows one to copy selected tracks from one playlist to another Даний модуль дозволяє копіювати выбрані треки з одного переліка відтворення в інший - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_zh_CN.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_zh_CN.ts index 4ecc73538..bc0edef2e 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_zh_CN.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_zh_CN.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin 复制/粘贴插件 - + About Copy/Paste Plugin 关于复制/粘贴插件 - + Qmmp Copy/Paste Plugin Qmmp复制/粘贴插件 - + This plugin allows one to copy selected tracks from one playlist to another 此插件允许操作者从一个播放列表中复制选定的曲目到另一个播放列表中 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/copypaste/translations/copypaste_plugin_zh_TW.ts b/src/plugins/General/copypaste/translations/copypaste_plugin_zh_TW.ts index 6352cd0b6..4b1042d3e 100644 --- a/src/plugins/General/copypaste/translations/copypaste_plugin_zh_TW.ts +++ b/src/plugins/General/copypaste/translations/copypaste_plugin_zh_TW.ts @@ -37,27 +37,27 @@ CopyPasteFactory - + Copy/Paste Plugin - + About Copy/Paste Plugin - + Qmmp Copy/Paste Plugin - + This plugin allows one to copy selected tracks from one playlist to another - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/CMakeLists.txt b/src/plugins/General/covermanager/CMakeLists.txt index 10265b03a..54a1d83d3 100644 --- a/src/plugins/General/covermanager/CMakeLists.txt +++ b/src/plugins/General/covermanager/CMakeLists.txt @@ -1,18 +1,5 @@ project(libcovermanager) -SET(QT_USE_QTNETWORK 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}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) @@ -33,7 +20,7 @@ SET(libcovermanager_RCCS images/cm_images.qrc ) -QT4_ADD_RESOURCES(libcovermanager_RCC_SRCS ${libcovermanager_RCCS}) +QT5_ADD_RESOURCES(libcovermanager_RCC_SRCS ${libcovermanager_RCCS}) # user interface @@ -41,7 +28,7 @@ QT4_ADD_RESOURCES(libcovermanager_RCC_SRCS ${libcovermanager_RCCS}) SET(libcovermanager_UIS ) -QT4_WRAP_UI(libcovermanager_UIS_H ${libcovermanager_UIS}) +QT5_WRAP_UI(libcovermanager_UIS_H ${libcovermanager_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -49,5 +36,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(covermanager MODULE ${libcovermanager_SRCS} ${libcovermanager_UIS_H} ${libcovermanager_RCC_SRCS}) add_dependencies(covermanager qmmpui) -target_link_libraries(covermanager ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(covermanager Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS covermanager DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/covermanager/covermanagerfactory.cpp b/src/plugins/General/covermanager/covermanagerfactory.cpp index ad44dc095..1bdc22f99 100644 --- a/src/plugins/General/covermanager/covermanagerfactory.cpp +++ b/src/plugins/General/covermanager/covermanagerfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2016 by Ilya Kotov * + * Copyright (C) 2009-2012 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 "covermanager.h" #include "covermanagerfactory.h" @@ -60,5 +59,3 @@ QTranslator *CoverManagerFactory::createTranslator(QObject *parent) translator->load(QString(":/covermanager_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(covermanager, CoverManagerFactory) diff --git a/src/plugins/General/covermanager/covermanagerfactory.h b/src/plugins/General/covermanager/covermanagerfactory.h index 02a37bdb6..c0394cc75 100644 --- a/src/plugins/General/covermanager/covermanagerfactory.h +++ b/src/plugins/General/covermanager/covermanagerfactory.h @@ -32,6 +32,7 @@ class CoverManagerFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_bg.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_bg.ts index 36054e560..d7a04d25e 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_bg.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_bg.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin - + About Cover Manager Plugin - + Qmmp Cover Manager Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_cs.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_cs.ts index 58d111983..2c9b8114c 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_cs.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_cs.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Modul správy obalů - + About Cover Manager Plugin O modulu správy obalů - + Qmmp Cover Manager Plugin Modul Qmmp pro správu obalů - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_de.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_de.ts index bbf0a5793..2ba056074 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_de.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_de.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Cover-Verwaltungsmodul - + About Cover Manager Plugin Über Cover-Verwaltungsmodul - + Qmmp Cover Manager Plugin Qmmp Cover-Verwaltungsmodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_el.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_el.ts index e9308d20e..b0ecbb6a7 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_el.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_el.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Πρόσθετο διαχείρισης εξώφυλλων - + About Cover Manager Plugin Σχετικά με το πρόσθετο διαχείρισης εξώφυλλων - + Qmmp Cover Manager Plugin Qmmp πρόσθετο διαχείρισης εξώφυλλων - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_en.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_en.ts index aeecb3ed1..786e9dc23 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_en.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_en.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin - + About Cover Manager Plugin - + Qmmp Cover Manager Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_es.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_es.ts index f5f7fe12a..c8e5ba723 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_es.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_es.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Módulo de gestión de carátulas - + About Cover Manager Plugin Acerca del módulo de gestión de carátulas - + Qmmp Cover Manager Plugin Módulo de gestión de carátulas para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_fi.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_fi.ts index d3fa5e060..de0134b5f 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_fi.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_fi.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Kansikuvien hallinta -liitännäinen - + About Cover Manager Plugin Tietoja - Kansikuvien hallinta -liitännäinen - + Qmmp Cover Manager Plugin Qmmp:n kansikuvien hallinta -liitännäinen - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_fr.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_fr.ts index f3a747e5a..eea98e9f8 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_fr.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_fr.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Greffon de gestion des couvertures - + About Cover Manager Plugin À propos du greffon de gestion des couvertures - + Qmmp Cover Manager Plugin Greffon de gestion des couvertures pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_gl_ES.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_gl_ES.ts index b04ea5fa0..781e86ab3 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_gl_ES.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_gl_ES.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Engadido de manexador de cubertas - + About Cover Manager Plugin Sobre o engadido de cubertas - + Qmmp Cover Manager Plugin Engadido Qmmp de cubertas - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_he.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_he.ts index c7ce80f40..a8f8975eb 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_he.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_he.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin תוסף ניהול כיסוי - + About Cover Manager Plugin אודות תוסף ניהול כיסוי - + Qmmp Cover Manager Plugin תוסף ניהול כיסוי של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_hu.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_hu.ts index 463a3437f..bffdebca3 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_hu.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_hu.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin - + About Cover Manager Plugin - + Qmmp Cover Manager Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_id.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_id.ts index b6f66d1bc..389523fc4 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_id.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_id.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Plugin Manager Cover - + About Cover Manager Plugin Tentang Plugin Manager Cover - + Qmmp Cover Manager Plugin Plugin Manager Cover Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_it.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_it.ts index 5cd2b3d8b..e43f8e3f3 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_it.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_it.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Plugin gestione copertine - + About Cover Manager Plugin Info sul Plugin gestione copertine - + Qmmp Cover Manager Plugin Plugin gestione copertine - + Written by: Ilya Kotov <forkotov02@ya.ru> Autori: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_ja.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_ja.ts index 9b90fbb62..7946c511d 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_ja.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_ja.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin カバーマネージャープラグイン - + About Cover Manager Plugin カバーマネージャープラグインについて - + Qmmp Cover Manager Plugin QMMP カバーマネージャープラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_kk.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_kk.ts index 89a77f328..632fad5da 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_kk.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_kk.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin - + About Cover Manager Plugin - + Qmmp Cover Manager Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_lt.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_lt.ts index c4a71d988..35a147168 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_lt.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_lt.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Viršelų tvarkyklės įskiepis - + About Cover Manager Plugin Apie viršelių tvarkyklės įskiepį - + Qmmp Cover Manager Plugin Qmmp viršelių tvarkyklės įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_nl.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_nl.ts index 0e96d8153..947d3320d 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_nl.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_nl.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Albumhoes Module - + About Cover Manager Plugin Over de Albumhoes Module - + Qmmp Cover Manager Plugin Albumhoes Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_pl_PL.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_pl_PL.ts index 8c65ea8fe..b0d2b3718 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_pl_PL.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_pl_PL.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Wtyczka zarządzania okładkami - + About Cover Manager Plugin O wtyczce Menedżer okładek - + Qmmp Cover Manager Plugin Wtyczka Menedżer Okładek dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_pt.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_pt.ts index 4bfbd0408..cf962eb0b 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_pt.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_pt.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Suplemento Cover Manager - + About Cover Manager Plugin Sobre o suplemento Cover Manager - + Qmmp Cover Manager Plugin Suplemento Qmmp Cover Manager - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_pt_BR.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_pt_BR.ts index dca0516ed..b8c5323fc 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_pt_BR.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_pt_BR.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Plugin Cover Manager - + About Cover Manager Plugin Sobre o plugin Cover Manager - + Qmmp Cover Manager Plugin Plugin Qmmp Cover Manager - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_ru.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_ru.ts index 9b3ac359c..8d1559277 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_ru.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_ru.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Модуль упр. обложками - + About Cover Manager Plugin О модуле управления обложками - + Qmmp Cover Manager Plugin Модуль управления обложками для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_sk.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_sk.ts index 39ce0a23c..c1d9e1f9b 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_sk.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_sk.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin - + About Cover Manager Plugin - + Qmmp Cover Manager Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_sr_BA.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_sr_BA.ts index 0041f3697..4c95579b2 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_sr_BA.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_sr_BA.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Уређивач омота - + About Cover Manager Plugin О уређивачу омота - + Qmmp Cover Manager Plugin Кумп прикључак за уређивање омота - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_sr_RS.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_sr_RS.ts index ca31ff855..a76af955b 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_sr_RS.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_sr_RS.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Уређивач омота - + About Cover Manager Plugin О уређивачу омота - + Qmmp Cover Manager Plugin Кумп прикључак за уређивање омота - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_tr.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_tr.ts index 6ecb14e7c..c9bb6e420 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_tr.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_tr.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin - + About Cover Manager Plugin - + Qmmp Cover Manager Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_uk_UA.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_uk_UA.ts index 0e815804a..7b894e7fc 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_uk_UA.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_uk_UA.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin Модуль керування обкладинками - + About Cover Manager Plugin Про модуль керування обкладинками - + Qmmp Cover Manager Plugin Модуль керування обкладинками для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_zh_CN.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_zh_CN.ts index 97ddd4afe..25de03aa3 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_zh_CN.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_zh_CN.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin 封面管理插件 - + About Cover Manager Plugin 关于封面管理插件 - + Qmmp Cover Manager Plugin Qmmp 封面管理插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/covermanager/translations/covermanager_plugin_zh_TW.ts b/src/plugins/General/covermanager/translations/covermanager_plugin_zh_TW.ts index e65bb82d3..2d19c820d 100644 --- a/src/plugins/General/covermanager/translations/covermanager_plugin_zh_TW.ts +++ b/src/plugins/General/covermanager/translations/covermanager_plugin_zh_TW.ts @@ -17,22 +17,22 @@ CoverManagerFactory - + Cover Manager Plugin 封面管理插件 - + About Cover Manager Plugin 關於封面管理插件 - + Qmmp Cover Manager Plugin Qmmp 封面管理插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/CMakeLists.txt b/src/plugins/General/fileops/CMakeLists.txt index a66716870..bdfd43e42 100644 --- a/src/plugins/General/fileops/CMakeLists.txt +++ b/src/plugins/General/fileops/CMakeLists.txt @@ -1,22 +1,7 @@ project(libfileops) -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}/../../../ -) - # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -32,7 +17,7 @@ SET(libfileops_SRCS SET(libfileops_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libfileops_RCC_SRCS ${libfileops_RCCS}) +QT5_ADD_RESOURCES(libfileops_RCC_SRCS ${libfileops_RCCS}) # user interface @@ -41,12 +26,12 @@ SET(libfileops_UIS hotkeydialog.ui ) -QT4_WRAP_UI(libfileops_UIS_H ${libfileops_UIS}) +QT5_WRAP_UI(libfileops_UIS_H ${libfileops_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(fileops MODULE ${libfileops_SRCS} ${libfileops_UIS_H} ${libfileops_RCC_SRCS}) add_dependencies(fileops qmmpui) -target_link_libraries(fileops ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(fileops Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS fileops DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/fileops/fileopsfactory.cpp b/src/plugins/General/fileops/fileopsfactory.cpp index 854afb31c..799d9e3db 100644 --- a/src/plugins/General/fileops/fileopsfactory.cpp +++ b/src/plugins/General/fileops/fileopsfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2016 by Ilya Kotov * + * Copyright (C) 2009-2012 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 "fileops.h" #include "settingsdialog.h" #include "fileopsfactory.h" @@ -60,5 +59,3 @@ QTranslator *FileOpsFactory::createTranslator(QObject *parent) translator->load(QString(":/fileops_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(fileops, FileOpsFactory) diff --git a/src/plugins/General/fileops/fileopsfactory.h b/src/plugins/General/fileops/fileopsfactory.h index e95fa581b..5d070c2a6 100644 --- a/src/plugins/General/fileops/fileopsfactory.h +++ b/src/plugins/General/fileops/fileopsfactory.h @@ -33,6 +33,7 @@ class FileOpsFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/fileops/settingsdialog.cpp b/src/plugins/General/fileops/settingsdialog.cpp index 702602082..2431a8ba2 100644 --- a/src/plugins/General/fileops/settingsdialog.cpp +++ b/src/plugins/General/fileops/settingsdialog.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include @@ -34,9 +34,9 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent) { m_ui.setupUi(this); - m_ui.tableWidget->verticalHeader()->setResizeMode(QHeaderView::ResizeToContents); + m_ui.tableWidget->verticalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); m_ui.tableWidget->verticalHeader()->hide(); - m_ui.tableWidget->horizontalHeader()->setResizeMode(QHeaderView::ResizeToContents); + m_ui.tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("FileOps"); @@ -135,7 +135,7 @@ void SettingsDialog::on_newButton_clicked() comboBox->setFocusPolicy (Qt::NoFocus); ActionItem *item = new ActionItem(tr("New action")); - item->setDestination(QDesktopServices::storageLocation(QDesktopServices::MusicLocation)); + item->setDestination(QStandardPaths::writableLocation(QStandardPaths::MusicLocation)); item->setPattern("%p - %t"); connect(comboBox, SIGNAL(activated(int)), SLOT(updateLineEdits())); diff --git a/src/plugins/General/fileops/translations/fileops_plugin_bg.ts b/src/plugins/General/fileops/translations/fileops_plugin_bg.ts index f9877102a..e454d3f85 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_bg.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_bg.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin - + About File Operations Plugin - + Qmmp File Operations Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_cs.ts b/src/plugins/General/fileops/translations/fileops_plugin_cs.ts index 0e9cd90b9..4c09f617c 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_cs.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_cs.ts @@ -73,22 +73,22 @@ FileOpsFactory - + File Operations Plugin Modul pro operace se soubory - + About File Operations Plugin O modulu pro operace se soubory - + Qmmp File Operations Plugin Modul Qmmp pro operace se soubory - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_de.ts b/src/plugins/General/fileops/translations/fileops_plugin_de.ts index 532dc3a0b..030e06274 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_de.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_de.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin Dateioperationsmodul - + About File Operations Plugin Über Dateioperationsmodul - + Qmmp File Operations Plugin Qmmp Dateioperationsmodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_el.ts b/src/plugins/General/fileops/translations/fileops_plugin_el.ts index 95fa888c6..0673d58db 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_el.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_el.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin Πρόσθετο λειτουργιών αρχείων - + About File Operations Plugin Σχετικά με το πρόσθετο λειτουργιών αρχείων - + Qmmp File Operations Plugin Qmmp πρόσθετο λειτουργιών αρχείων - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_en.ts b/src/plugins/General/fileops/translations/fileops_plugin_en.ts index ef6da3239..6c86cfb71 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_en.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_en.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin - + About File Operations Plugin - + Qmmp File Operations Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_es.ts b/src/plugins/General/fileops/translations/fileops_plugin_es.ts index 139fbc9ab..633990cbc 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_es.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_es.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin Módulo de operaciones de archivo - + About File Operations Plugin Acerca del módulo de operaciones de archivo - + Qmmp File Operations Plugin Módulo de operaciones de archivo para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_fi.ts b/src/plugins/General/fileops/translations/fileops_plugin_fi.ts index c0280fc89..6cf2a6ec3 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_fi.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_fi.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin - + About File Operations Plugin - + Qmmp File Operations Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_fr.ts b/src/plugins/General/fileops/translations/fileops_plugin_fr.ts index 9ac01c381..eeaf0374f 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_fr.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_fr.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin Greffon d'opérations sur fichiers - + About File Operations Plugin À propos du greffon d'opérations sur fichiers - + Qmmp File Operations Plugin Greffon d'opérations sur fichiers pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_gl_ES.ts b/src/plugins/General/fileops/translations/fileops_plugin_gl_ES.ts index fd94b8204..42b653ec4 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_gl_ES.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_gl_ES.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin Engadido de operacións de ficheiro - + About File Operations Plugin Sobre o engadido de operacións de ficheiro - + Qmmp File Operations Plugin Engadido Qmmp operacións de ficheiro - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_he.ts b/src/plugins/General/fileops/translations/fileops_plugin_he.ts index cee1652c8..e3e8fcff7 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_he.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_he.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin תוסף מבצעי קובץ - + About File Operations Plugin אודות תוסף מבצעי קובץ - + Qmmp File Operations Plugin תוסף מבצעי קובץ של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_hu.ts b/src/plugins/General/fileops/translations/fileops_plugin_hu.ts index 4823e46f9..26620e5e2 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_hu.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_hu.ts @@ -69,22 +69,22 @@ FileOpsFactory - + File Operations Plugin - + About File Operations Plugin - + Qmmp File Operations Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_id.ts b/src/plugins/General/fileops/translations/fileops_plugin_id.ts index a095eab3a..e628148df 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_id.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_id.ts @@ -69,22 +69,22 @@ FileOpsFactory - + File Operations Plugin Plugin Operasi File - + About File Operations Plugin Tentang Plugin Operasi File - + Qmmp File Operations Plugin Plugin Operasi File Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_it.ts b/src/plugins/General/fileops/translations/fileops_plugin_it.ts index ed0790d0e..4aab3d8c5 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_it.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_it.ts @@ -69,22 +69,22 @@ FileOpsFactory - + File Operations Plugin Modulo Operazioni su file - + About File Operations Plugin Info sul modulo Operazioni file - + Qmmp File Operations Plugin Modulo Operazioni su file di Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_ja.ts b/src/plugins/General/fileops/translations/fileops_plugin_ja.ts index 7efc2da0e..1adf20234 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_ja.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_ja.ts @@ -69,22 +69,22 @@ FileOpsFactory - + File Operations Plugin ファイル操作プラグイン - + About File Operations Plugin ファイル操作プラグインについて - + Qmmp File Operations Plugin QMMP ファイル操作プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_kk.ts b/src/plugins/General/fileops/translations/fileops_plugin_kk.ts index f4ce01c4a..90d530d19 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_kk.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_kk.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin - + About File Operations Plugin - + Qmmp File Operations Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_lt.ts b/src/plugins/General/fileops/translations/fileops_plugin_lt.ts index a682ef81c..92abdab75 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_lt.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_lt.ts @@ -73,22 +73,22 @@ FileOpsFactory - + File Operations Plugin Bylų įskiepis - + About File Operations Plugin Apie bylų įskiepį - + Qmmp File Operations Plugin Qmmp bylų įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_nl.ts b/src/plugins/General/fileops/translations/fileops_plugin_nl.ts index f965bd95f..39d45ccec 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_nl.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_nl.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin Bestands Beheer Module - + About File Operations Plugin Over de Bestands Beheer Module - + Qmmp File Operations Plugin Bestands Beheer Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_pl_PL.ts b/src/plugins/General/fileops/translations/fileops_plugin_pl_PL.ts index 816e81695..e7d039a8b 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_pl_PL.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_pl_PL.ts @@ -73,22 +73,22 @@ FileOpsFactory - + File Operations Plugin Wtyczka Operacji na plikach - + About File Operations Plugin O wtyczce Operacje na plikach - + Qmmp File Operations Plugin Wtyczka Operacje na plikach dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_pt.ts b/src/plugins/General/fileops/translations/fileops_plugin_pt.ts index f3e0096d3..259920ff8 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_pt.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_pt.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin Suplemento File Operations - + About File Operations Plugin Sobre o suplemento File Operations - + Qmmp File Operations Plugin Suplemento Qmmp File Operations - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_pt_BR.ts b/src/plugins/General/fileops/translations/fileops_plugin_pt_BR.ts index cf5b612aa..8a99af994 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_pt_BR.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_pt_BR.ts @@ -71,22 +71,22 @@ FileOpsFactory - + File Operations Plugin Plugin File Operations - + About File Operations Plugin Sobre o plugin File Operations - + Qmmp File Operations Plugin Plugin Qmmp File Operations - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_ru.ts b/src/plugins/General/fileops/translations/fileops_plugin_ru.ts index db2051784..c33768f33 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_ru.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_ru.ts @@ -73,22 +73,22 @@ FileOpsFactory - + File Operations Plugin Модуль файловых операций - + About File Operations Plugin О модуле файловых операций - + Qmmp File Operations Plugin Модуль работы с файлами для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_sk.ts b/src/plugins/General/fileops/translations/fileops_plugin_sk.ts index ca25c3d9c..fcccf0d63 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_sk.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_sk.ts @@ -73,22 +73,22 @@ FileOpsFactory - + File Operations Plugin - + About File Operations Plugin - + Qmmp File Operations Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_sr_BA.ts b/src/plugins/General/fileops/translations/fileops_plugin_sr_BA.ts index ce71614a1..34db0d704 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_sr_BA.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_sr_BA.ts @@ -73,22 +73,22 @@ FileOpsFactory - + File Operations Plugin Руковање фајловима - + About File Operations Plugin О прикључку за руковање фајловима - + Qmmp File Operations Plugin Кумп прикључак за руковање фајловима - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_sr_RS.ts b/src/plugins/General/fileops/translations/fileops_plugin_sr_RS.ts index 00eba52b3..7c6541e76 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_sr_RS.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_sr_RS.ts @@ -73,22 +73,22 @@ FileOpsFactory - + File Operations Plugin Руковање фајловима - + About File Operations Plugin О прикључку за руковање фајловима - + Qmmp File Operations Plugin Кумп прикључак за руковање фајловима - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_tr.ts b/src/plugins/General/fileops/translations/fileops_plugin_tr.ts index 1eff3830b..03389fdd0 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_tr.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_tr.ts @@ -69,22 +69,22 @@ FileOpsFactory - + File Operations Plugin Dosya İşlemleri Eklentisi - + About File Operations Plugin Dosya İşlemleri Eklentisi Hakkında - + Qmmp File Operations Plugin Qmmp Dosya İşlemleri Eklentisi - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_uk_UA.ts b/src/plugins/General/fileops/translations/fileops_plugin_uk_UA.ts index ac1ccdc9b..4f4f6790e 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_uk_UA.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_uk_UA.ts @@ -73,22 +73,22 @@ FileOpsFactory - + File Operations Plugin Модуль файлових операцій - + About File Operations Plugin Про модуль файлових операцій - + Qmmp File Operations Plugin Модуль роботи з файлами для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_zh_CN.ts b/src/plugins/General/fileops/translations/fileops_plugin_zh_CN.ts index d7cfb3b55..dfd9166a6 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_zh_CN.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_zh_CN.ts @@ -69,22 +69,22 @@ FileOpsFactory - + File Operations Plugin 文件操作插件 - + About File Operations Plugin 关于文件操作插件 - + Qmmp File Operations Plugin Qmmp 文件操作插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/fileops/translations/fileops_plugin_zh_TW.ts b/src/plugins/General/fileops/translations/fileops_plugin_zh_TW.ts index 090b033bd..64a40d430 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_zh_TW.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_zh_TW.ts @@ -69,22 +69,22 @@ FileOpsFactory - + File Operations Plugin 檔案操作插件 - + About File Operations Plugin 關於檔案操作插件 - + Qmmp File Operations Plugin Qmmp 檔案操作插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/CMakeLists.txt b/src/plugins/General/gnomehotkey/CMakeLists.txt index 2916ada2f..a43c99e0d 100644 --- a/src/plugins/General/gnomehotkey/CMakeLists.txt +++ b/src/plugins/General/gnomehotkey/CMakeLists.txt @@ -1,20 +1,5 @@ project(libgnomehotkey) - -SET (QT_USE_QTDBUS 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}) # libqmmpui & libqmmp @@ -29,7 +14,7 @@ SET(libgnomehotkey_SRCS SET(libgnomehotkey_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libgnomehotkey_RCC_SRCS ${libgnomehotkey_RCCS}) +QT5_ADD_RESOURCES(libgnomehotkey_RCC_SRCS ${libgnomehotkey_RCCS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! @@ -37,5 +22,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(gnomehotkey MODULE ${libgnomehotkey_SRCS} ${libgnomehotkey_RCC_SRCS}) add_dependencies(gnomehotkey qmmpui) -target_link_libraries(gnomehotkey ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(gnomehotkey Qt5::Widgets Qt5::DBus -lqmmpui -lqmmp) install(TARGETS gnomehotkey DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/gnomehotkey/gnomehotkeyfactory.cpp b/src/plugins/General/gnomehotkey/gnomehotkeyfactory.cpp index dd7e8699d..82c535c28 100644 --- a/src/plugins/General/gnomehotkey/gnomehotkeyfactory.cpp +++ b/src/plugins/General/gnomehotkey/gnomehotkeyfactory.cpp @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ + #include -#include -#include #include #include "mediakeys.h" #include "gnomehotkeyfactory.h" @@ -62,5 +61,3 @@ QTranslator *GnomeHotkeyFactory::createTranslator(QObject *parent) translator->load(QString(":/gnomehotkey_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(gnomehotkey, GnomeHotkeyFactory) diff --git a/src/plugins/General/gnomehotkey/gnomehotkeyfactory.h b/src/plugins/General/gnomehotkey/gnomehotkeyfactory.h index 1a4230783..0210dde80 100644 --- a/src/plugins/General/gnomehotkey/gnomehotkeyfactory.h +++ b/src/plugins/General/gnomehotkey/gnomehotkeyfactory.h @@ -32,6 +32,7 @@ class GnomeHotkeyFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_bg.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_bg.ts index 7e22e4cc3..bcaf9052f 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_bg.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_bg.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin - + About Gnome Hotkey Plugin - + Qmmp Gnome Hotkey Plugin - + This plugin adds support of the GNOME/Cinnamon hotkeys - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_cs.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_cs.ts index 02d4728a8..7cba177eb 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_cs.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_cs.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin - + About Gnome Hotkey Plugin - + Qmmp Gnome Hotkey Plugin Modul Qmmp Gnome pro klávesové zkratky - + This plugin adds support of the GNOME/Cinnamon hotkeys - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_de.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_de.ts index 0709ba086..b15be7861 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_de.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_de.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Gnome-Kurzbefehle-Modul - + About Gnome Hotkey Plugin Über Gnome-Kurzbefehle-Modul - + Qmmp Gnome Hotkey Plugin Qmmp Gnome-Kurzbefehle-Modul - + This plugin adds support of the GNOME/Cinnamon hotkeys Dieses Modul fügt die Unterstützung der GNOME/Cinnamon-Kurzbefehle hinzu - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_el.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_el.ts index a3ce13f72..154fc1fd0 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_el.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_el.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Πρόσθετο συντομεύσεων Gnome - + About Gnome Hotkey Plugin Σχετικά με το πρόσθετο συντομεύσεων Gnome - + Qmmp Gnome Hotkey Plugin Qmmp πρόσθετο συντομεύσεων Gnome - + This plugin adds support of the GNOME/Cinnamon hotkeys Αυτό το πρόσθετο προσθέτει υποστήριξη συντομεύσεων για GNOME/Cinnamon - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_en.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_en.ts index 6e5e5c890..d93939c40 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_en.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_en.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin - + About Gnome Hotkey Plugin - + Qmmp Gnome Hotkey Plugin - + This plugin adds support of the GNOME/Cinnamon hotkeys - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_es.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_es.ts index ebc48ecbf..bb2acfb07 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_es.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_es.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Módulo Acceso Rápido de GNOME - + About Gnome Hotkey Plugin Acerca del Módulo Acceso Rápido de GNOME - + Qmmp Gnome Hotkey Plugin Módulo Acceso Rápido de GNOME de Qmmp - + This plugin adds support of the GNOME/Cinnamon hotkeys El módulo añade soporte para los accesos rápidos de GNOME/Cinnamon - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_fi.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_fi.ts index 89c711e02..cd6c35c30 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_fi.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_fi.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin - + About Gnome Hotkey Plugin - + Qmmp Gnome Hotkey Plugin - + This plugin adds support of the GNOME/Cinnamon hotkeys - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_fr.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_fr.ts index dcb76af75..fbdb26571 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_fr.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_fr.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Greffon de raccourci clavier pour Gnome - + About Gnome Hotkey Plugin À propos du greffon de raccourci clavier pour Gnome - + Qmmp Gnome Hotkey Plugin Greffon de raccourci clavier pour Gnome, pour Qmmp - + This plugin adds support of the GNOME/Cinnamon hotkeys Ce greffon ajoute le support des raccourcis clavier pour Gnome/Cinnamon - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_gl_ES.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_gl_ES.ts index 067396eab..5581bf660 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_gl_ES.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_gl_ES.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Engadido teclas de acceso rápido para Gnome - + About Gnome Hotkey Plugin Acerca do engadido de teclas de acceso rápido para Gnome - + Qmmp Gnome Hotkey Plugin Engadido Qmmp teclas de acceso rápido para Gnome - + This plugin adds support of the GNOME/Cinnamon hotkeys Este engadido engade soporte para as teclas de acceso rápido de GNOME/Cinnamon - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_he.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_he.ts index 680d55e69..9bd2968bb 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_he.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_he.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin תוסף מקשים חמים Gnome - + About Gnome Hotkey Plugin אודות תוסף מקשים חמים Gnome - + Qmmp Gnome Hotkey Plugin מקשים חמים Gnome של Qmmp - + This plugin adds support of the GNOME/Cinnamon hotkeys תוסף זה מוסיף תמיכה למקשים חמים של GNOME/Cinnamon - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_hu.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_hu.ts index 864afccbb..c9cfed5ff 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_hu.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_hu.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin - + About Gnome Hotkey Plugin - + Qmmp Gnome Hotkey Plugin - + This plugin adds support of the GNOME/Cinnamon hotkeys - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_id.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_id.ts index 6acf6e7cd..cda05cb01 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_id.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_id.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Plugin Hotkey Gnome - + About Gnome Hotkey Plugin Tentang Plugin Hotkey Gnome - + Qmmp Gnome Hotkey Plugin Plugin Hotkey Gnome Qmmp - + This plugin adds support of the GNOME/Cinnamon hotkeys Plugin ini menambahkan dukungan pada hotkey GNOME/Cinnamon - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_it.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_it.ts index 134276c08..4a1a2905b 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_it.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_it.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin - + About Gnome Hotkey Plugin - + Qmmp Gnome Hotkey Plugin - + This plugin adds support of the GNOME/Cinnamon hotkeys - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ja.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ja.ts index 127f1b694..c7af561ed 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ja.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ja.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin GNOME ホットキープラグイン - + About Gnome Hotkey Plugin GNOME ホットキープラグインについて - + Qmmp Gnome Hotkey Plugin QMMP GNOME ホットキープラグイン - + This plugin adds support of the GNOME/Cinnamon hotkeys このプラグインは GNOME/Cinnamon ホットキーをサポートします - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_kk.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_kk.ts index 26a60afd6..28fe62edb 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_kk.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_kk.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin - + About Gnome Hotkey Plugin - + Qmmp Gnome Hotkey Plugin - + This plugin adds support of the GNOME/Cinnamon hotkeys - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_lt.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_lt.ts index bf1745c01..8ca518be6 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_lt.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_lt.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Gnome Hotkey įskiepis - + About Gnome Hotkey Plugin Apie Gnome Hotkey Įskiepį - + Qmmp Gnome Hotkey Plugin Qmmp Gnome Hotkey Įskiepis - + This plugin adds support of the GNOME/Cinnamon hotkeys Šis įskiepis įgalina GNOME/Cinnamon sparčiūjų klavišų palaikymą - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_nl.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_nl.ts index aca7a8998..ab038921e 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_nl.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_nl.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin - + About Gnome Hotkey Plugin - + Qmmp Gnome Hotkey Plugin - + This plugin adds support of the GNOME/Cinnamon hotkeys - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pl_PL.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pl_PL.ts index 0fc2d0722..50675ad19 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pl_PL.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pl_PL.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Wtyczka Skrótów Klawiszowych Gnome - + About Gnome Hotkey Plugin O wtyczce Skrótów Klawiszowych dla Gnome - + Qmmp Gnome Hotkey Plugin Wtyczka Skrótów Klawiszowych Gnome dla Qmmp - + This plugin adds support of the GNOME/Cinnamon hotkeys Ta wtyczka dodaje wsparcie skrótów klawiszowych dla GNOME/Cinnamon - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pt.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pt.ts index e2697e82c..ddfced0fb 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pt.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pt.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Suplemento Gnome Hotkey - + About Gnome Hotkey Plugin Sobre o suplemento Gnome Hotkey - + Qmmp Gnome Hotkey Plugin Suplemento Qmmp Gnome Hotkey - + This plugin adds support of the GNOME/Cinnamon hotkeys Este suplemento adiciona suporte as teclas de atalho GNOME/Cinnamon - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pt_BR.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pt_BR.ts index f59e8455f..80e8e94a1 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pt_BR.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_pt_BR.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Plugin Gnome Hotkey - + About Gnome Hotkey Plugin Sobre o plugin Gnome Hotkey - + Qmmp Gnome Hotkey Plugin Plugin Qmmp Gnome Hotkey - + This plugin adds support of the GNOME/Cinnamon hotkeys Este plugin adiciona suporte as teclas de atalho GNOME/Cinnamon - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ru.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ru.ts index f5085913b..47eadf8c4 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ru.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_ru.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Модуль клавиш GNOME - + About Gnome Hotkey Plugin О модуле горячих клавиш GNOME - + Qmmp Gnome Hotkey Plugin Модуль горчих клавиш GNOME для Qmmp - + This plugin adds support of the GNOME/Cinnamon hotkeys Этот модуль добавляет поддержку горячих клавиш GNOME/Cinnamon - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sk.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sk.ts index 2cc7bdaa5..5395e9526 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sk.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sk.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin - + About Gnome Hotkey Plugin - + Qmmp Gnome Hotkey Plugin - + This plugin adds support of the GNOME/Cinnamon hotkeys - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sr_BA.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sr_BA.ts index c6d7afb01..5a6ec8c01 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sr_BA.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sr_BA.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Пречице за Гном - + About Gnome Hotkey Plugin О пречицама за Гном - + Qmmp Gnome Hotkey Plugin Кумп прикључак за пречице за Гном - + This plugin adds support of the GNOME/Cinnamon hotkeys Функционалност пречица за Гном/Цинамон - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sr_RS.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sr_RS.ts index 4c3b5c34b..46486fa76 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sr_RS.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_sr_RS.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Пречице за Гном - + About Gnome Hotkey Plugin О пречицама за Гном - + Qmmp Gnome Hotkey Plugin Кумп прикључак за пречице за Гном - + This plugin adds support of the GNOME/Cinnamon hotkeys Функционалност пречица за Гном/Цинамон - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_tr.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_tr.ts index acc8d166c..cad47fe52 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_tr.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_tr.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin - + About Gnome Hotkey Plugin - + Qmmp Gnome Hotkey Plugin - + This plugin adds support of the GNOME/Cinnamon hotkeys - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_uk_UA.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_uk_UA.ts index 435b1243c..0372cb90a 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_uk_UA.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_uk_UA.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Модуль гарячих клавіш GNOME - + About Gnome Hotkey Plugin Про модуль гарячих клавіш GNOME - + Qmmp Gnome Hotkey Plugin Модуль гарячих клавіш GNOME для Qmmp - + This plugin adds support of the GNOME/Cinnamon hotkeys Цей модуль додає підтримку гарячих клавіш GNOME/Cinnamon - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_zh_CN.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_zh_CN.ts index 7c4eda20b..d4fd7d18f 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_zh_CN.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_zh_CN.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin Gnome热键插件 - + About Gnome Hotkey Plugin 关于Gnome热键插件 - + Qmmp Gnome Hotkey Plugin Qmmp Gnome 热键插件 - + This plugin adds support of the GNOME/Cinnamon hotkeys 此插件增加了对GNOME/Cinnamon热键的支持 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_zh_TW.ts b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_zh_TW.ts index c89ede0dc..9b79fcc5a 100644 --- a/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_zh_TW.ts +++ b/src/plugins/General/gnomehotkey/translations/gnomehotkey_plugin_zh_TW.ts @@ -4,27 +4,27 @@ GnomeHotkeyFactory - + Gnome Hotkey Plugin - + About Gnome Hotkey Plugin - + Qmmp Gnome Hotkey Plugin - + This plugin adds support of the GNOME/Cinnamon hotkeys - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hal/CMakeLists.txt b/src/plugins/General/hal/CMakeLists.txt index 0ed5eb996..d6f786962 100644 --- a/src/plugins/General/hal/CMakeLists.txt +++ b/src/plugins/General/hal/CMakeLists.txt @@ -1,20 +1,5 @@ project(libhal) - -SET (QT_USE_QTDBUS 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}) # libqmmpui & libqmmp @@ -32,7 +17,7 @@ SET(libhal_SRCS SET(libhal_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libhal_RCC_SRCS ${libhal_RCCS}) +QT5_ADD_RESOURCES(libhal_RCC_SRCS ${libhal_RCCS}) # user interface @@ -40,12 +25,12 @@ SET(libhal_UIS settingsdialog.ui ) -QT4_WRAP_UI(libhal_UIS_H ${libhal_UIS}) +QT5_WRAP_UI(libhal_UIS_H ${libhal_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(hal MODULE ${libhal_SRCS} ${libhal_UIS_H} ${libhal_RCC_SRCS}) add_dependencies(hal qmmpui) -target_link_libraries(hal ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(hal Qt5::Widgets Qt5::DBus -lqmmpui -lqmmp) install(TARGETS hal DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/hal/halfactory.cpp b/src/plugins/General/hal/halfactory.cpp index f28207645..cbdd0d825 100644 --- a/src/plugins/General/hal/halfactory.cpp +++ b/src/plugins/General/hal/halfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2016 by Ilya Kotov * + * Copyright (C) 2009-2012 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 "settingsdialog.h" #include "halplugin.h" @@ -63,5 +62,3 @@ QTranslator *HalFactory::createTranslator(QObject *parent) translator->load(QString(":/hal_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(hal, HalFactory) diff --git a/src/plugins/General/hal/halfactory.h b/src/plugins/General/hal/halfactory.h index 1a78b7e25..02c063993 100644 --- a/src/plugins/General/hal/halfactory.h +++ b/src/plugins/General/hal/halfactory.h @@ -32,6 +32,7 @@ class HalFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/hal/translations/hal_plugin_bg.ts b/src/plugins/General/hal/translations/hal_plugin_bg.ts index a9f991fe9..dddaac30d 100644 --- a/src/plugins/General/hal/translations/hal_plugin_bg.ts +++ b/src/plugins/General/hal/translations/hal_plugin_bg.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin - + About HAL Plugin - + Qmmp HAL Plugin - + This plugin provides removable devices detection using HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) diff --git a/src/plugins/General/hal/translations/hal_plugin_cs.ts b/src/plugins/General/hal/translations/hal_plugin_cs.ts index c60b36002..1f28066c8 100644 --- a/src/plugins/General/hal/translations/hal_plugin_cs.ts +++ b/src/plugins/General/hal/translations/hal_plugin_cs.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Modul HAL - + About HAL Plugin O modulu HAL - + Qmmp HAL Plugin Modul Qmmp HAL - + This plugin provides removable devices detection using HAL Tento modul umožňuje detekci odpojitelných zařízení prostřednictvím HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Založeno na Solid (knihovna KDE pro hardware) diff --git a/src/plugins/General/hal/translations/hal_plugin_de.ts b/src/plugins/General/hal/translations/hal_plugin_de.ts index f73ab613d..62cf2c6a7 100644 --- a/src/plugins/General/hal/translations/hal_plugin_de.ts +++ b/src/plugins/General/hal/translations/hal_plugin_de.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin HAL-Modul - + About HAL Plugin Über HAL-Modul - + Qmmp HAL Plugin Qmmp HAL-Modul - + This plugin provides removable devices detection using HAL Dieses Modul bietet Wechsellaufwerkerkennung unter Verwendung von HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Basiert auf Solid (KDE Hardware-Bibliothek) diff --git a/src/plugins/General/hal/translations/hal_plugin_el.ts b/src/plugins/General/hal/translations/hal_plugin_el.ts index c9cf9935e..236863f5c 100644 --- a/src/plugins/General/hal/translations/hal_plugin_el.ts +++ b/src/plugins/General/hal/translations/hal_plugin_el.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Πρόσθετο HAL - + About HAL Plugin Σχετικά με το πρόσθετο HAL - + Qmmp HAL Plugin Qmmp πρόσθετο HAL - + This plugin provides removable devices detection using HAL Αυτό το πρόσθετο παρέχει την ανίχνευση των αφαιρούμενων συσκευών μέσω του HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> - + Based on Solid (KDE hardware library) Βασίζεται στο Solid (Βιβλιοθήκη υλικού του KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_en.ts b/src/plugins/General/hal/translations/hal_plugin_en.ts index 3e3a33e99..5a30c027d 100644 --- a/src/plugins/General/hal/translations/hal_plugin_en.ts +++ b/src/plugins/General/hal/translations/hal_plugin_en.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin - + About HAL Plugin - + Qmmp HAL Plugin - + This plugin provides removable devices detection using HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) diff --git a/src/plugins/General/hal/translations/hal_plugin_es.ts b/src/plugins/General/hal/translations/hal_plugin_es.ts index 394856189..102c88965 100644 --- a/src/plugins/General/hal/translations/hal_plugin_es.ts +++ b/src/plugins/General/hal/translations/hal_plugin_es.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Módulo HAL - + About HAL Plugin Acerca del módulo HAL - + Qmmp HAL Plugin Módulo HAL para Qmmp - + This plugin provides removable devices detection using HAL Este módulo proporciona detección de dispositivos extraibles mediante HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Basado en Solid (librería de hardware KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_fi.ts b/src/plugins/General/hal/translations/hal_plugin_fi.ts index b9ff9f39f..095de115f 100644 --- a/src/plugins/General/hal/translations/hal_plugin_fi.ts +++ b/src/plugins/General/hal/translations/hal_plugin_fi.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin HAL-liitännäinen - + About HAL Plugin - + Qmmp HAL Plugin Qmmp:n HAL-liitännäinen - + This plugin provides removable devices detection using HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) diff --git a/src/plugins/General/hal/translations/hal_plugin_fr.ts b/src/plugins/General/hal/translations/hal_plugin_fr.ts index a3badfe75..a265aff6c 100644 --- a/src/plugins/General/hal/translations/hal_plugin_fr.ts +++ b/src/plugins/General/hal/translations/hal_plugin_fr.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Greffon HAL - + About HAL Plugin À propos du greffon HAL - + Qmmp HAL Plugin Greffon HAL pour Qmmp - + This plugin provides removable devices detection using HAL Ce greffon fournit une détection de périphériques amovibles en utilisant HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Basé sur Solid (bibliothèque matérielle KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_gl_ES.ts b/src/plugins/General/hal/translations/hal_plugin_gl_ES.ts index dfce0774e..dce0b5a33 100644 --- a/src/plugins/General/hal/translations/hal_plugin_gl_ES.ts +++ b/src/plugins/General/hal/translations/hal_plugin_gl_ES.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Engadido HAL - + About HAL Plugin Sobre engadido HAL - + Qmmp HAL Plugin Engadido Qmmp HAL - + This plugin provides removable devices detection using HAL Este engadido provén detección de dispositivos extraíbles usando HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Baseado en Solid (librería hardware KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_he.ts b/src/plugins/General/hal/translations/hal_plugin_he.ts index c5a9205a6..de1cdf012 100644 --- a/src/plugins/General/hal/translations/hal_plugin_he.ts +++ b/src/plugins/General/hal/translations/hal_plugin_he.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin תוסף HAL - + About HAL Plugin אודות תוסף HAL - + Qmmp HAL Plugin תוסף HAL של Qmmp - + This plugin provides removable devices detection using HAL תוסף זה מספק איתור של התקנים נשלפים באמצעות HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) מבוססת על Solid (ספריית קושחה של KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_hu.ts b/src/plugins/General/hal/translations/hal_plugin_hu.ts index 9600266c9..14878f981 100644 --- a/src/plugins/General/hal/translations/hal_plugin_hu.ts +++ b/src/plugins/General/hal/translations/hal_plugin_hu.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin - + About HAL Plugin - + Qmmp HAL Plugin - + This plugin provides removable devices detection using HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) diff --git a/src/plugins/General/hal/translations/hal_plugin_id.ts b/src/plugins/General/hal/translations/hal_plugin_id.ts index 33e66fef7..dc6612b61 100644 --- a/src/plugins/General/hal/translations/hal_plugin_id.ts +++ b/src/plugins/General/hal/translations/hal_plugin_id.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Plugin HAL - + About HAL Plugin Tentang Plugin HAL - + Qmmp HAL Plugin Plugin HAL Qmmp - + This plugin provides removable devices detection using HAL Plugin ini menyediakan deteksi perangkat dapat-dilepas menggunakan HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Berdasarkan pada Solid (pustaka hardware KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_it.ts b/src/plugins/General/hal/translations/hal_plugin_it.ts index e1b974362..8ea018ac5 100644 --- a/src/plugins/General/hal/translations/hal_plugin_it.ts +++ b/src/plugins/General/hal/translations/hal_plugin_it.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Modulo HAL - + About HAL Plugin Info sul modulo HAL - + Qmmp HAL Plugin Modulo HAL per Qmmp - + This plugin provides removable devices detection using HAL Modulo che permette il rilevamento di dispositivi rimovibili utilizzando HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Basato su Solid (libreria hardware KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_ja.ts b/src/plugins/General/hal/translations/hal_plugin_ja.ts index 4db80dd2e..68129193d 100644 --- a/src/plugins/General/hal/translations/hal_plugin_ja.ts +++ b/src/plugins/General/hal/translations/hal_plugin_ja.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin HAL プラグイン - + About HAL Plugin HAL プラグインについて - + Qmmp HAL Plugin QMMP HAL プラグイン - + This plugin provides removable devices detection using HAL このプラグインは着脱可能なデバイスの検知機能を HAL によって提供します - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Solid (KDE ハードウェアライブラリ) を基に作成 diff --git a/src/plugins/General/hal/translations/hal_plugin_kk.ts b/src/plugins/General/hal/translations/hal_plugin_kk.ts index 4cbf7df9e..c6e959023 100644 --- a/src/plugins/General/hal/translations/hal_plugin_kk.ts +++ b/src/plugins/General/hal/translations/hal_plugin_kk.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin - + About HAL Plugin - + Qmmp HAL Plugin - + This plugin provides removable devices detection using HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) diff --git a/src/plugins/General/hal/translations/hal_plugin_lt.ts b/src/plugins/General/hal/translations/hal_plugin_lt.ts index 6cbe1ca01..5162bd0d6 100644 --- a/src/plugins/General/hal/translations/hal_plugin_lt.ts +++ b/src/plugins/General/hal/translations/hal_plugin_lt.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin HAL įskiepis - + About HAL Plugin Apie HAL įskiepį - + Qmmp HAL Plugin qmmp HAL įskiepis - + This plugin provides removable devices detection using HAL Šis įskiepis atlieka išorinių prijungiamų įrenginių aptikimą naudojant HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov - + Based on Solid (KDE hardware library) Sukurta Solid pagrindu (KDE biblioteka) diff --git a/src/plugins/General/hal/translations/hal_plugin_nl.ts b/src/plugins/General/hal/translations/hal_plugin_nl.ts index 0c3ccfbbb..bb5b72eef 100644 --- a/src/plugins/General/hal/translations/hal_plugin_nl.ts +++ b/src/plugins/General/hal/translations/hal_plugin_nl.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin HAL Module - + About HAL Plugin Over de HAL Module - + Qmmp HAL Plugin HAL Module voor Qmmp - + This plugin provides removable devices detection using HAL Deze module faciliteert detectie van verwisselbare apparaten, gebruikmakend van HAL (Verouderd, gebruik UDisks module) - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Gebasseerd op Solid (KDE hardware bibliotheek) diff --git a/src/plugins/General/hal/translations/hal_plugin_pl_PL.ts b/src/plugins/General/hal/translations/hal_plugin_pl_PL.ts index 30aca83ac..c82edcfe8 100644 --- a/src/plugins/General/hal/translations/hal_plugin_pl_PL.ts +++ b/src/plugins/General/hal/translations/hal_plugin_pl_PL.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Wtyczka HAL - + About HAL Plugin O wtyczce HAL - + Qmmp HAL Plugin Wtyczka HAL dla Qmmp - + This plugin provides removable devices detection using HAL Ta wtyczka umożliwia detekcję urządzeń przenośnych dzięki HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Oparte na Solid (biblioteka urządzeń dla KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_pt.ts b/src/plugins/General/hal/translations/hal_plugin_pt.ts index db1defafa..1288ad2cc 100644 --- a/src/plugins/General/hal/translations/hal_plugin_pt.ts +++ b/src/plugins/General/hal/translations/hal_plugin_pt.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Suplemento HAL - + About HAL Plugin Sobre o suplemento HAL - + Qmmp HAL Plugin Suplemento Qmmp HAL - + This plugin provides removable devices detection using HAL Este suplemento permite a deteção de discos amovíveis através do serviço HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Baseado no Solid (biblioteca do KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_pt_BR.ts b/src/plugins/General/hal/translations/hal_plugin_pt_BR.ts index 7726b5449..396d4c0b8 100644 --- a/src/plugins/General/hal/translations/hal_plugin_pt_BR.ts +++ b/src/plugins/General/hal/translations/hal_plugin_pt_BR.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Plugin HAL - + About HAL Plugin Sobre o plugin HAL - + Qmmp HAL Plugin Plugin Qmmp HAL - + This plugin provides removable devices detection using HAL Este plugin permite a detecção de dispositivos removíveis através do serviço HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Baseado no Solid (biblioteca do KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_ru.ts b/src/plugins/General/hal/translations/hal_plugin_ru.ts index 6e4a552b4..fa74fa422 100644 --- a/src/plugins/General/hal/translations/hal_plugin_ru.ts +++ b/src/plugins/General/hal/translations/hal_plugin_ru.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Модуль HAL - + About HAL Plugin О Модуле HAL - + Qmmp HAL Plugin Модуль HAL для Qmmp - + This plugin provides removable devices detection using HAL Этот модуль отслеживает съёмные устройства с помощью HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Основан на базе Solid (библиотека KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_sk.ts b/src/plugins/General/hal/translations/hal_plugin_sk.ts index 21c5771c5..82a8531e7 100644 --- a/src/plugins/General/hal/translations/hal_plugin_sk.ts +++ b/src/plugins/General/hal/translations/hal_plugin_sk.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin - + About HAL Plugin - + Qmmp HAL Plugin - + This plugin provides removable devices detection using HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) diff --git a/src/plugins/General/hal/translations/hal_plugin_sr_BA.ts b/src/plugins/General/hal/translations/hal_plugin_sr_BA.ts index 0f263b198..fc686c047 100644 --- a/src/plugins/General/hal/translations/hal_plugin_sr_BA.ts +++ b/src/plugins/General/hal/translations/hal_plugin_sr_BA.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin ХАЛ - + About HAL Plugin О прикључку за ХАЛ - + Qmmp HAL Plugin Кумп прикључак за ХАЛ - + This plugin provides removable devices detection using HAL Омогућује откривање уклоњивих уређаја користећи ХАЛ - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Заснован на Солиду (КДЕ-овој библиотеци) diff --git a/src/plugins/General/hal/translations/hal_plugin_sr_RS.ts b/src/plugins/General/hal/translations/hal_plugin_sr_RS.ts index bf117ebb3..955c69c7d 100644 --- a/src/plugins/General/hal/translations/hal_plugin_sr_RS.ts +++ b/src/plugins/General/hal/translations/hal_plugin_sr_RS.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin ХАЛ - + About HAL Plugin О прикључку за ХАЛ - + Qmmp HAL Plugin Кумп прикључак за ХАЛ - + This plugin provides removable devices detection using HAL Омогућује откривање уклоњивих уређаја користећи ХАЛ - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Заснован на Солиду (КДЕ-овој библиотеци) diff --git a/src/plugins/General/hal/translations/hal_plugin_tr.ts b/src/plugins/General/hal/translations/hal_plugin_tr.ts index 757797614..0e4339d04 100644 --- a/src/plugins/General/hal/translations/hal_plugin_tr.ts +++ b/src/plugins/General/hal/translations/hal_plugin_tr.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin HAL Eklentisi - + About HAL Plugin HAL Eklentisi Hakkında - + Qmmp HAL Plugin Qmmp HAL Eklentisi - + This plugin provides removable devices detection using HAL Bu eklenti HAL kullanarak çıkarılabilir aygıtların tanınmasını sağlar - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Solid (KDE donanım kitaplığı) temellidir diff --git a/src/plugins/General/hal/translations/hal_plugin_uk_UA.ts b/src/plugins/General/hal/translations/hal_plugin_uk_UA.ts index 4ccb1535f..00fdf1ec6 100644 --- a/src/plugins/General/hal/translations/hal_plugin_uk_UA.ts +++ b/src/plugins/General/hal/translations/hal_plugin_uk_UA.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin Модуль HAL - + About HAL Plugin Про модуль HAL - + Qmmp HAL Plugin Модуль HAL для Qmmp - + This plugin provides removable devices detection using HAL Цей модуль відстежує з'ємні пристрої за допомогою HAL - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) Базується на базі Solid (бібліотека KDE) diff --git a/src/plugins/General/hal/translations/hal_plugin_zh_CN.ts b/src/plugins/General/hal/translations/hal_plugin_zh_CN.ts index 730ade340..f30201fd8 100644 --- a/src/plugins/General/hal/translations/hal_plugin_zh_CN.ts +++ b/src/plugins/General/hal/translations/hal_plugin_zh_CN.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin HAL 插件 - + About HAL Plugin 关于 HAL 插件 - + Qmmp HAL Plugin Qmmp HAL 插件 - + This plugin provides removable devices detection using HAL 此插件利用 HAL 提供可移动设备的检测 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) 基于 Solid (KDE 硬件库) diff --git a/src/plugins/General/hal/translations/hal_plugin_zh_TW.ts b/src/plugins/General/hal/translations/hal_plugin_zh_TW.ts index ab0da5153..9eb86eb1b 100644 --- a/src/plugins/General/hal/translations/hal_plugin_zh_TW.ts +++ b/src/plugins/General/hal/translations/hal_plugin_zh_TW.ts @@ -4,32 +4,32 @@ HalFactory - + HAL Plugin HAL 外掛 - + About HAL Plugin 關於 HAL 外掛 - + Qmmp HAL Plugin Qmmp HAL 外掛 - + This plugin provides removable devices detection using HAL 此插件利用 HAL 提供可移動設備的檢測 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> - + Based on Solid (KDE hardware library) 基於 Solid (KDE 硬件程式庫) diff --git a/src/plugins/General/hotkey/CMakeLists.txt b/src/plugins/General/hotkey/CMakeLists.txt index 9cf51d112..ca8188a31 100644 --- a/src/plugins/General/hotkey/CMakeLists.txt +++ b/src/plugins/General/hotkey/CMakeLists.txt @@ -2,22 +2,8 @@ project(libhotkey) 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) -ADD_DEFINITIONS(${X11_CFLAGS}) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - include_directories(${X11_INCLUDE_DIRS}) link_directories(${X11_LIBRARY_DIRS}) @@ -45,7 +31,7 @@ SET(libhotkey_RCCS translations/translations.qrc ) -QT4_ADD_RESOURCES(libhotkey_RCC_SRCS ${libhotkey_RCCS}) +QT5_ADD_RESOURCES(libhotkey_RCC_SRCS ${libhotkey_RCCS}) # user interface @@ -55,7 +41,7 @@ SET(libhotkey_UIS hotkeydialog.ui ) -QT4_WRAP_UI(libhotkey_UIS_H ${libhotkey_UIS}) +QT5_WRAP_UI(libhotkey_UIS_H ${libhotkey_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -64,6 +50,6 @@ IF(X11_FOUND) set_property(SOURCE hotkeymanager_x11.cpp PROPERTY SKIP_AUTOMOC ON) ADD_LIBRARY(hotkey MODULE ${libhotkey_SRCS} ${libhotkey_UIS_H} ${libhotkey_RCC_SRCS}) add_dependencies(hotkey qmmpui) -target_link_libraries(hotkey ${QT_LIBRARIES} qmmpui libqmmp ${X11_LDFLAGS}) +target_link_libraries(hotkey Qt5::Widgets Qt5::X11Extras -lqmmpui -lqmmp ${X11_LDFLAGS}) install(TARGETS hotkey DESTINATION ${LIB_DIR}/qmmp/General) ENDIF(X11_FOUND) diff --git a/src/plugins/General/hotkey/hotkey.pro b/src/plugins/General/hotkey/hotkey.pro index 7195a5811..e8477431e 100644 --- a/src/plugins/General/hotkey/hotkey.pro +++ b/src/plugins/General/hotkey/hotkey.pro @@ -25,4 +25,5 @@ unix { INSTALLS += target PKGCONFIG += x11 DEFINES += HAVE_XKBLIB_H + QT += x11extras } diff --git a/src/plugins/General/hotkey/hotkeyfactory.cpp b/src/plugins/General/hotkey/hotkeyfactory.cpp index de944514e..7c0c176de 100644 --- a/src/plugins/General/hotkey/hotkeyfactory.cpp +++ b/src/plugins/General/hotkey/hotkeyfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2016 by Ilya Kotov * + * Copyright (C) 2009-2012 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 "settingsdialog.h" #include "hotkeymanager.h" @@ -62,5 +61,3 @@ QTranslator *HotkeyFactory::createTranslator(QObject *parent) translator->load(QString(":/hotkey_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(hotkey, HotkeyFactory) diff --git a/src/plugins/General/hotkey/hotkeyfactory.h b/src/plugins/General/hotkey/hotkeyfactory.h index caae05029..d4f1618a5 100644 --- a/src/plugins/General/hotkey/hotkeyfactory.h +++ b/src/plugins/General/hotkey/hotkeyfactory.h @@ -32,6 +32,7 @@ class HotkeyFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/hotkey/hotkeymanager.h b/src/plugins/General/hotkey/hotkeymanager.h index cf816dd6f..200aa68f4 100644 --- a/src/plugins/General/hotkey/hotkeymanager.h +++ b/src/plugins/General/hotkey/hotkeymanager.h @@ -20,6 +20,7 @@ #ifndef HOTKEYMANAGER_H #define HOTKEYMANAGER_H +#include #include #include #include @@ -80,13 +81,13 @@ public: static QList ignModifiersList(); static quint32 keycodeToKeysym(quint32 keycode); -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 protected: virtual bool eventFilter(QObject* o, QEvent* e); #endif private: -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 static void ensureModifiers(); QList m_grabbedKeys; static long m_alt_mask; diff --git a/src/plugins/General/hotkey/hotkeymanager_x11.cpp b/src/plugins/General/hotkey/hotkeymanager_x11.cpp index 3954eebb3..05b46280a 100644 --- a/src/plugins/General/hotkey/hotkeymanager_x11.cpp +++ b/src/plugins/General/hotkey/hotkeymanager_x11.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ #include -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 #include #include #include @@ -80,6 +80,12 @@ quint32 Hotkey::defaultKey(int act) HotkeyManager::HotkeyManager(QObject *parent) : QObject(parent) { +#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) + //Workaround Qt regression of no longer delivering events for the root window + //See qtbase commit 2b34aefcf02f09253473b096eb4faffd3e62b5f4 + //More information: https://bugs.kde.org/show_bug.cgi?id=360841 + qApp->desktop()->winId(); +#endif QCoreApplication::instance()->installEventFilter(this); WId rootWindow = QX11Info::appRootWindow(); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); //load settings @@ -138,8 +144,7 @@ const QString HotkeyManager::getKeyString(quint32 key, quint32 modifiers) bool HotkeyManager::eventFilter(QObject* o, QEvent* e) { - //receive events from active and root windows only - if (e->type() == QEvent::KeyPress && (o == qApp->desktop () || o == qApp->activeWindow ())) + if (e->type() == QEvent::KeyPress) { QKeyEvent* k = static_cast(e); quint32 key = keycodeToKeysym(k->nativeScanCode()); @@ -198,7 +203,7 @@ bool HotkeyManager::eventFilter(QObject* o, QEvent* e) break; } - qApp->processEvents(); + return true; } } return QObject::eventFilter(o, e); diff --git a/src/plugins/General/hotkey/settingsdialog.cpp b/src/plugins/General/hotkey/settingsdialog.cpp index 08d429227..2830e58ee 100644 --- a/src/plugins/General/hotkey/settingsdialog.cpp +++ b/src/plugins/General/hotkey/settingsdialog.cpp @@ -30,9 +30,9 @@ SettingsDialog::SettingsDialog(QWidget *parent) { m_ui.setupUi(this); m_ui.tableWidget->verticalHeader()->setDefaultSectionSize(fontMetrics().height()); - m_ui.tableWidget->verticalHeader()->setResizeMode(QHeaderView::Fixed); + m_ui.tableWidget->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed); m_ui.tableWidget->verticalHeader()->hide(); - m_ui.tableWidget->horizontalHeader()->setResizeMode(QHeaderView::Stretch); + m_ui.tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch); m_ui.tableWidget->setRowCount (13); m_ui.tableWidget->setItem(0,0, new QTableWidgetItem(tr("Play"))); m_ui.tableWidget->setItem(1,0, new QTableWidgetItem(tr("Stop"))); diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_bg.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_bg.ts index 5b0d9cf86..fb4ee116d 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_bg.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_bg.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin - + About Global Hotkey Plugin - + Qmmp Global Hotkey Plugin - + This plugin adds support for multimedia keys or global key combinations - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_cs.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_cs.ts index f50bb126d..e0af4d5ad 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_cs.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_cs.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Modul klávesových zkratek - + About Global Hotkey Plugin O modulu klávesových zkratek - + Qmmp Global Hotkey Plugin Modul Qmmp pro klávesové zkratky - + This plugin adds support for multimedia keys or global key combinations Tento modul přidává podporu multimediálních kláves a globálních klávesových zkratek - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_de.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_de.ts index 0df163b93..7458400df 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_de.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_de.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Globales Kurzbefehle-Modul - + About Global Hotkey Plugin Über Globales Kurzbefehle-Modul - + Qmmp Global Hotkey Plugin Qmmp Globales Kurzbefehle-Modul - + This plugin adds support for multimedia keys or global key combinations Dieses Modul fügt Unterstützung für Multimedia-Tasten oder allgemeine Tastaturkombinationen hinzu - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_el.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_el.ts index 4e1a449fe..49476d733 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_el.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_el.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Πρόσθετο καθολικών συντομεύσεων - + About Global Hotkey Plugin Σχετικά με το πρόσθετο καθολικών συντομεύσεων - + Qmmp Global Hotkey Plugin Qmmp πρόσθετο καθολικών συντομεύσεων - + This plugin adds support for multimedia keys or global key combinations Αυτό το πρόσθετο προσθέτει υποστήριξη για συνδυασμό πλήκτρων πληκτρολογίου ή πολυμέσων - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_en.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_en.ts index 42e4c65a9..c6e3a99bf 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_en.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_en.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin - + About Global Hotkey Plugin - + Qmmp Global Hotkey Plugin - + This plugin adds support for multimedia keys or global key combinations - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_es.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_es.ts index 1a30c5d43..bcf035c72 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_es.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_es.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Módulo de atajos de teclado global - + About Global Hotkey Plugin Acerca del módulo de atajos de teclado global - + Qmmp Global Hotkey Plugin Módulo de atajos de teclado global para Qmmp - + This plugin adds support for multimedia keys or global key combinations Este módulo añade soporte para teclas multimedia o combinaciones de teclas globales - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_fi.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_fi.ts index 6164beda1..ad49e3973 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_fi.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_fi.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin - + About Global Hotkey Plugin - + Qmmp Global Hotkey Plugin - + This plugin adds support for multimedia keys or global key combinations - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_fr.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_fr.ts index a999d317f..666de769c 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_fr.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_fr.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Greffon de raccourci clavier global - + About Global Hotkey Plugin À propos du greffon de raccourci clavier global - + Qmmp Global Hotkey Plugin Greffon de raccourci clavier global pour Qmmp - + This plugin adds support for multimedia keys or global key combinations Ce greffon ajoute un support pour des touches multimédia ou des combinaisons globales de touches - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_gl_ES.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_gl_ES.ts index eea0cad45..79b5cd202 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_gl_ES.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_gl_ES.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Engadido Global Hotkey - + About Global Hotkey Plugin Sobre o engadido Global Hotkey - + Qmmp Global Hotkey Plugin Engadido Qmmp Global Hotkey - + This plugin adds support for multimedia keys or global key combinations Este engadido ofrece soporte para teclas multimedia ou combinacións de teclas globais - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_he.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_he.ts index 8db3d759c..1e7357a01 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_he.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_he.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin תוסף מקש חם גלובלי - + About Global Hotkey Plugin אודות תוסף מקש חם גלובלי - + Qmmp Global Hotkey Plugin תוסף מקש חם גלובלי של Qmmp - + This plugin adds support for multimedia keys or global key combinations תוסף זה מוסיף תמיכה למקשי מולטימדיה או צירופי מקש גלובלי - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_hu.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_hu.ts index 35ec12deb..6977a2e40 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_hu.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_hu.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin - + About Global Hotkey Plugin - + Qmmp Global Hotkey Plugin - + This plugin adds support for multimedia keys or global key combinations - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_id.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_id.ts index a85361684..930f51e4b 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_id.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_id.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Plugin Hotkey Global - + About Global Hotkey Plugin Tentang Plugin Hotkey Global - + Qmmp Global Hotkey Plugin Plugin Hotkey Global Qmmp - + This plugin adds support for multimedia keys or global key combinations Plugin ini menambahkan dukungan untuk tombol multimedia atau kombinasi tombol global - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_it.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_it.ts index 146fab9b5..10166150f 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_it.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_it.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Modulo scorciatoie globali - + About Global Hotkey Plugin Info sul modulo scorciatoie globali - + Qmmp Global Hotkey Plugin Modulo scorciatoie globali per Qmmp - + This plugin adds support for multimedia keys or global key combinations Modulo che aggiunge il supporto per combinazione di tasti multimedia o scorciatoie - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_ja.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_ja.ts index 48ca697e2..2a53c59c9 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_ja.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_ja.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin 共通ホットキープラグイン - + About Global Hotkey Plugin 共通ホットキープラグインについて - + Qmmp Global Hotkey Plugin QMMP 通用ホットキープラグイン - + This plugin adds support for multimedia keys or global key combinations このプラグインはマルティミディアキーや共通キーを組み合わせるサポートを加えます - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_kk.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_kk.ts index 1c4373e0f..b6717ce8e 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_kk.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_kk.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin - + About Global Hotkey Plugin - + Qmmp Global Hotkey Plugin - + This plugin adds support for multimedia keys or global key combinations - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_lt.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_lt.ts index fcbfc62cc..4a4a74e7f 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_lt.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_lt.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Global Hotkey klavišų įskiepis - + About Global Hotkey Plugin Apie Global Hotkey įskiepį - + Qmmp Global Hotkey Plugin Qmmp Global Hotkey įskiepis - + This plugin adds support for multimedia keys or global key combinations This plugin adds support for multimedia keys or global key combinations - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_nl.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_nl.ts index 56e1ea8ac..4278e1cc0 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_nl.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_nl.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Globale Sneltoets Module - + About Global Hotkey Plugin Over de Globale Sneltoets Module - + Qmmp Global Hotkey Plugin Globale Sneltoets Module voor Qmmp - + This plugin adds support for multimedia keys or global key combinations Deze module voegt ondersteuning toe voor multimedia toetsen of globale toetscombinaties - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_pl_PL.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_pl_PL.ts index daa25cf53..e53d9f27a 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_pl_PL.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_pl_PL.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Wtyczka klawiszów skrótowych - + About Global Hotkey Plugin O wtyczce Klawisze Skrótowe - + Qmmp Global Hotkey Plugin Wtyczka Skróŧy Klawiszowe dla Qmmp - + This plugin adds support for multimedia keys or global key combinations Ta wtyczka obsługuje klawisze multimedialne oraz globalne kombinacje klawiszów skrótowych - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_pt.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_pt.ts index 2adc4fde7..c26e27d32 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_pt.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_pt.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Suplemento Global Hotkey - + About Global Hotkey Plugin Sobre o suplemento Global Hotkey - + Qmmp Global Hotkey Plugin Suplemento Qmmp Global Hotkey - + This plugin adds support for multimedia keys or global key combinations Este suplemento adiciona suporte às teclas multimédia ou a combinações de teclas - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_pt_BR.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_pt_BR.ts index a89444930..585cc440b 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_pt_BR.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_pt_BR.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Plugin Global Hotkey - + About Global Hotkey Plugin Sobre o plugin Global Hotkey - + Qmmp Global Hotkey Plugin Plugin Qmmp Global Hotkey - + This plugin adds support for multimedia keys or global key combinations Este plugin adiciona suporte às teclas multimídia ou a combinações de teclas - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_ru.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_ru.ts index b8bb9e1e7..d84aaf4c4 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_ru.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_ru.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Модуль глоб. клавиш - + About Global Hotkey Plugin О модуле глобальных клавиш - + Qmmp Global Hotkey Plugin Модуль глобальных клавиш для Qmmp - + This plugin adds support for multimedia keys or global key combinations Этот модуль добавляет поддержку медиа- или глобальных клавиш - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_sk.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_sk.ts index 36bd98162..1743d2e1b 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_sk.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_sk.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin - + About Global Hotkey Plugin - + Qmmp Global Hotkey Plugin - + This plugin adds support for multimedia keys or global key combinations - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_sr_BA.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_sr_BA.ts index ce2bf7062..67c64b838 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_sr_BA.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_sr_BA.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Глобалне пречице - + About Global Hotkey Plugin О прикључку за глобалне пречице - + Qmmp Global Hotkey Plugin Кумп прикључак за глобалне пречице - + This plugin adds support for multimedia keys or global key combinations Подршка за мултимедијалне тастере или глобалне комбинације тастера - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_sr_RS.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_sr_RS.ts index 80b173f2a..0941e8ba5 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_sr_RS.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_sr_RS.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Глобалне пречице - + About Global Hotkey Plugin О прикључку за глобалне пречице - + Qmmp Global Hotkey Plugin Кумп прикључак за глобалне пречице - + This plugin adds support for multimedia keys or global key combinations Подршка за мултимедијалне тастере или глобалне комбинације тастера - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_tr.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_tr.ts index 3161c133e..f225c967a 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_tr.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_tr.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Genel Kısayol Eklentisi - + About Global Hotkey Plugin Genel Kısayol Eklentisi Hakkında - + Qmmp Global Hotkey Plugin Qmmp Genel Kısayol Eklentisi - + This plugin adds support for multimedia keys or global key combinations Bu eklenti çokluortam tuşları veya genel tuş kombinasyonu desteği ekler - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_uk_UA.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_uk_UA.ts index 29c63d8af..3142f5288 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_uk_UA.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_uk_UA.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin Модуль глобальних клавіш - + About Global Hotkey Plugin Про модуль глобальних клавіш - + Qmmp Global Hotkey Plugin Модуль глобальних клавіш для Qmmp - + This plugin adds support for multimedia keys or global key combinations Цей модуль додає підтримку мультимедійних чи глобальних клавіш - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_zh_CN.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_zh_CN.ts index 05cf83a54..29f5eaf20 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_zh_CN.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_zh_CN.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin 全局快捷键插件 - + About Global Hotkey Plugin 关于全局快捷键插件 - + Qmmp Global Hotkey Plugin Qmmp 全局快捷键插件 - + This plugin adds support for multimedia keys or global key combinations 此插件支持增加多媒体快捷键和全局快捷键 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/hotkey/translations/hotkey_plugin_zh_TW.ts b/src/plugins/General/hotkey/translations/hotkey_plugin_zh_TW.ts index 8f068a3d0..6bfa96cbd 100644 --- a/src/plugins/General/hotkey/translations/hotkey_plugin_zh_TW.ts +++ b/src/plugins/General/hotkey/translations/hotkey_plugin_zh_TW.ts @@ -22,27 +22,27 @@ HotkeyFactory - + Global Hotkey Plugin 全局熱鍵插件 - + About Global Hotkey Plugin 關於全局熱鍵插件 - + Qmmp Global Hotkey Plugin Qmmp 全局熱鍵插件 - + This plugin adds support for multimedia keys or global key combinations 此插件支援添加多媒體熱鍵與全局熱鍵 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/kdenotify/CMakeLists.txt b/src/plugins/General/kdenotify/CMakeLists.txt index e24ae1711..abfab62d0 100644 --- a/src/plugins/General/kdenotify/CMakeLists.txt +++ b/src/plugins/General/kdenotify/CMakeLists.txt @@ -1,22 +1,5 @@ project(libkdenotify) - -SET (QT_USE_QTDBUS 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}) # libqmmpui & libqmmp @@ -32,25 +15,23 @@ SET(libkdenotify_SRCS SET(libkdenotify_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libkdenotify_RCC_SRCS ${libkdenotify_RCCS}) +QT5_ADD_RESOURCES(libkdenotify_RCC_SRCS ${libkdenotify_RCCS}) # user interface SET(libkdenotify_UIS settingsdialog.ui ) -QT4_WRAP_UI(libkdenotify_UIS_H ${libkdenotify_UIS}) +QT5_WRAP_UI(libkdenotify_UIS_H ${libkdenotify_UIS}) -# QT4_WRAP_UI(libkdenotify_UIS_H ${libkdenotify_UIS}) +# QT5_WRAP_UI(libkdenotify_UIS_H ${libkdenotify_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(kdenotify MODULE ${libkdenotify_SRCS} ${libkdenotify_RCC_SRCS} ${libkdenotify_UIS_H}) add_dependencies(kdenotify qmmpui) -target_link_libraries(kdenotify ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(kdenotify Qt5::Widgets Qt5::DBus -lqmmpui -lqmmp) install(TARGETS kdenotify DESTINATION ${LIB_DIR}/qmmp/General) -IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - install(FILES images/empty_cover.png DESTINATION share/qmmp/images) - install(FILES images/app_icon.png DESTINATION share/qmmp/images) -ENDIF() +install(FILES images/empty_cover.png DESTINATION share/qmmp/images) +install(FILES images/app_icon.png DESTINATION share/qmmp/images) diff --git a/src/plugins/General/kdenotify/kdenotifyfactory.cpp b/src/plugins/General/kdenotify/kdenotifyfactory.cpp index 557c9f024..2de043e0f 100644 --- a/src/plugins/General/kdenotify/kdenotifyfactory.cpp +++ b/src/plugins/General/kdenotify/kdenotifyfactory.cpp @@ -19,13 +19,12 @@ ***************************************************************************/ #include -#include -#include #include "kdenotifyfactory.h" #include "kdenotify.h" #include "settingsdialog.h" + const GeneralProperties KdeNotifyFactory::properties() const { GeneralProperties properties; @@ -61,5 +60,3 @@ QTranslator *KdeNotifyFactory::createTranslator(QObject *parent) translator->load(QString(":/kdenotify_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(kdenotify, KdeNotifyFactory) diff --git a/src/plugins/General/kdenotify/kdenotifyfactory.h b/src/plugins/General/kdenotify/kdenotifyfactory.h index 9eb0b49fa..1c6f7543a 100644 --- a/src/plugins/General/kdenotify/kdenotifyfactory.h +++ b/src/plugins/General/kdenotify/kdenotifyfactory.h @@ -30,8 +30,9 @@ class KdeNotifyFactory : public QObject, public GeneralFactory { - Q_OBJECT - Q_INTERFACES(GeneralFactory) +Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") +Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; QObject *create(QObject *parent); diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_bg.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_bg.ts index beb9b7037..40c963dc8 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_bg.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_bg.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin - + About KDE Notification Plugin - + KDE 4 notification plugin for Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_cs.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_cs.ts index 5df07c248..f30102e24 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_cs.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_cs.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Notifikační modul pro KDE4 - + About KDE Notification Plugin O notifikačním modulu pro KDE - + KDE 4 notification plugin for Qmmp Notifikační modul Qmmp pro KDE4 diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_de.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_de.ts index ce3a0fafc..633cb9d2a 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_de.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_de.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin KDE-4-Benachrichtigungsmodul - + About KDE Notification Plugin Über KDE-4-Benachrichtigungsmodul - + KDE 4 notification plugin for Qmmp KDE-4-Benachrichtigungsmodul für Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_el.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_el.ts index e890c5199..0c88946a2 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_el.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_el.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Πρόσθετο ειδοποιήσεων του KDE4 - + About KDE Notification Plugin Σχετικά με το πρόσθετο ειδοποιήσεων KDE - + KDE 4 notification plugin for Qmmp Qmmp πρόσθετο ειδοποιήσεων του KDE4 diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_en.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_en.ts index d3ee0067e..c35ba83bc 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_en.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_en.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin - + About KDE Notification Plugin - + KDE 4 notification plugin for Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_es.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_es.ts index deb49854a..cb46d77ec 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_es.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_es.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Módulo de notificación KDE 4 - + About KDE Notification Plugin Acerca del módulo de notificación KDE - + KDE 4 notification plugin for Qmmp Módulo de notificación KDE 4 para Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_fi.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_fi.ts index 36d4aef3c..767e5d3bb 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_fi.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_fi.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin - + About KDE Notification Plugin - + KDE 4 notification plugin for Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_fr.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_fr.ts index f6d93a975..1e97d7e03 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_fr.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_fr.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Greffon de notification KDE 4 - + About KDE Notification Plugin À propos du greffon de notification KDE 4 - + KDE 4 notification plugin for Qmmp Greffon de notification KDE 4 pour Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_gl_ES.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_gl_ES.ts index f753367d0..1923fa0e4 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_gl_ES.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_gl_ES.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Engadido para as notificacións de KDE 4 - + About KDE Notification Plugin Sobre o engadido para as notificacións de KDE - + KDE 4 notification plugin for Qmmp Engadido de Qmmp para as notificacións de KDE 4 diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_he.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_he.ts index 2910c2c7e..99b5569c2 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_he.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_he.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin תוסף התראת KDE 4 - + About KDE Notification Plugin אודות תוסף התראת KDE 4 - + KDE 4 notification plugin for Qmmp תוסף התראת KDE 4 עבור Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_hu.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_hu.ts index d889fee31..21ca28642 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_hu.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_hu.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin - + About KDE Notification Plugin - + KDE 4 notification plugin for Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_id.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_id.ts index 369eb583e..683bab14c 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_id.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_id.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Plugin pemberitahuan KDE 4 - + About KDE Notification Plugin Tentang Plugin Pemberitahuan KDE - + KDE 4 notification plugin for Qmmp Plugin pemberitahuan KDE 4 bagi Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_it.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_it.ts index 91a28c2db..29964f409 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_it.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_it.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Plugin notificazione per KDE 4 - + About KDE Notification Plugin Info sul Plugin di notificazione per KDE - + KDE 4 notification plugin for Qmmp Plugin di notificazione epr KDE 4 diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_ja.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_ja.ts index 235e4046e..84205be58 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_ja.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_ja.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin KDE 4 通知プラグイン - + About KDE Notification Plugin KDE 通知プラグインについて - + KDE 4 notification plugin for Qmmp QMMP 用 KDE 4 通知プラグイン diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_kk.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_kk.ts index 909e5551b..fa863946d 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_kk.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_kk.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin - + About KDE Notification Plugin - + KDE 4 notification plugin for Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_lt.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_lt.ts index 5da6bca99..3b849fc41 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_lt.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_lt.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin KDE 4 pranešimų įskiepis - + About KDE Notification Plugin Apie qmmp KDE 4 pranešimų įskiepį - + KDE 4 notification plugin for Qmmp Qmmp KDE 4 pranešimų įskiepis diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_nl.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_nl.ts index edc0ba3be..a4b110575 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_nl.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_nl.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Notificatie Module voor KDE 4 - + About KDE Notification Plugin Over de KDE 4 Notificatie Module - + KDE 4 notification plugin for Qmmp KDE 4 Notificatie Module voor Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_pl_PL.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_pl_PL.ts index 7e661c9cc..a3ec0c8ef 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_pl_PL.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_pl_PL.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Wtyczka powiadamiania KDE 4 - + About KDE Notification Plugin O wtyczce Powiadomienia KDE - + KDE 4 notification plugin for Qmmp Wtyczka Powiadomienia KDE 4 dla Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_pt.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_pt.ts index e2df55434..ff22b93b5 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_pt.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_pt.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Suplemento KDE4 Notification - + About KDE Notification Plugin Sobre o suplemento KDE4 Notification - + KDE 4 notification plugin for Qmmp Suplemento Qmmp KDE4 Notification diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_pt_BR.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_pt_BR.ts index 6c9903166..d877c726e 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_pt_BR.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_pt_BR.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Plugin KDE 4 Notification - + About KDE Notification Plugin Sobre o plugin KDE Notification - + KDE 4 notification plugin for Qmmp Plugin KDE 4 Notification para o Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_ru.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_ru.ts index b194e558c..af1b7bdfa 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_ru.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_ru.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Модуль уведомлений KDE4 - + About KDE Notification Plugin О модуле уведомлений KDE4 - + KDE 4 notification plugin for Qmmp Модуль уведомлений KDE4 для Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_sk.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_sk.ts index 70f5a5625..d6cdc473d 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_sk.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_sk.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin - + About KDE Notification Plugin - + KDE 4 notification plugin for Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_sr_BA.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_sr_BA.ts index 60f7826c9..9bec3e346 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_sr_BA.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_sr_BA.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin КДЕ4 обавјештавач - + About KDE Notification Plugin О КДЕ4 обавјештавачу - + KDE 4 notification plugin for Qmmp Кумп прикључак за обавјештавање у КДЕ4 diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_sr_RS.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_sr_RS.ts index ad990896b..97ef9586f 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_sr_RS.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_sr_RS.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin КДЕ4 обавештавач - + About KDE Notification Plugin О КДЕ4 обавештавачу - + KDE 4 notification plugin for Qmmp Кумп прикључак за обавештавање у КДЕ4 diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_tr.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_tr.ts index 6d06f14b3..c038ccb28 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_tr.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_tr.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin - + About KDE Notification Plugin - + KDE 4 notification plugin for Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_uk_UA.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_uk_UA.ts index 3f89537d1..851e727f8 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_uk_UA.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_uk_UA.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin Модуль повідомлень KDE4 - + About KDE Notification Plugin Про модуль повідомлень KDE4 - + KDE 4 notification plugin for Qmmp Модуль повідомлень KDE4 для Qmmp diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_CN.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_CN.ts index 9cf44ac53..1171d7421 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_CN.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_CN.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin KDE 4 通知插件 - + About KDE Notification Plugin 关于 KDE 4 通知插件 - + KDE 4 notification plugin for Qmmp Qmmp KDE 4 通知插件 diff --git a/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_TW.ts b/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_TW.ts index 3874720e7..8f7e5c2b1 100644 --- a/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_TW.ts +++ b/src/plugins/General/kdenotify/translations/kdenotify_plugin_zh_TW.ts @@ -12,17 +12,17 @@ KdeNotifyFactory - + KDE 4 notification plugin KDE 4 通知插件 - + About KDE Notification Plugin 關於 KDE 通知插件 - + KDE 4 notification plugin for Qmmp Qmmp 的 KDE 4通知插件 diff --git a/src/plugins/General/lyrics/CMakeLists.txt b/src/plugins/General/lyrics/CMakeLists.txt index 64a1da810..c2703ff48 100644 --- a/src/plugins/General/lyrics/CMakeLists.txt +++ b/src/plugins/General/lyrics/CMakeLists.txt @@ -1,26 +1,7 @@ project(liblyrics) - -SET(QT_USE_QTNETWORK 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}/../../../ -) - # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -35,7 +16,7 @@ SET(liblyrics_SRCS SET(liblyrics_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(liblyrics_RCC_SRCS ${liblyrics_RCCS}) +QT5_ADD_RESOURCES(liblyrics_RCC_SRCS ${liblyrics_RCCS}) # user interface @@ -43,12 +24,12 @@ SET(liblyrics_UIS lyricswindow.ui ) -QT4_WRAP_UI(liblyrics_UIS_H ${liblyrics_UIS}) +QT5_WRAP_UI(liblyrics_UIS_H ${liblyrics_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(lyrics MODULE ${liblyrics_SRCS} ${liblyrics_UIS_H} ${liblyrics_RCC_SRCS}) add_dependencies(lyrics qmmpui) -target_link_libraries(lyrics ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(lyrics Qt5::Widgets Qt5::Network -lqmmpui -lqmmp) install(TARGETS lyrics DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/lyrics/lyricsfactory.cpp b/src/plugins/General/lyrics/lyricsfactory.cpp index 0ddfd6224..60cb001f1 100644 --- a/src/plugins/General/lyrics/lyricsfactory.cpp +++ b/src/plugins/General/lyrics/lyricsfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2016 by Ilya Kotov * + * Copyright (C) 2009 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 "lyrics.h" #include "lyricsfactory.h" @@ -61,5 +60,3 @@ QTranslator *LyricsFactory::createTranslator(QObject *parent) translator->load(QString(":/lyrics_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(lyrcis, LyricsFactory) diff --git a/src/plugins/General/lyrics/lyricsfactory.h b/src/plugins/General/lyrics/lyricsfactory.h index a35af440b..6d61e864c 100644 --- a/src/plugins/General/lyrics/lyricsfactory.h +++ b/src/plugins/General/lyrics/lyricsfactory.h @@ -33,6 +33,7 @@ class LyricsFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/lyrics/lyricswindow.cpp b/src/plugins/General/lyrics/lyricswindow.cpp index c899e71bc..d914e1630 100644 --- a/src/plugins/General/lyrics/lyricswindow.cpp +++ b/src/plugins/General/lyrics/lyricswindow.cpp @@ -189,7 +189,7 @@ QString LyricsWindow::cacheFilePath() const { QString name = m_ui.artistLineEdit->text() + "_" + m_ui.titleLineEdit->text(); QByteArray hash = QCryptographicHash::hash(name.toUtf8(), QCryptographicHash::Md5); - return m_cachePath + QString::fromLatin1(hash.toHex().constData()) + ".html"; + return m_cachePath + QString::fromLatin1(hash.toHex()) + ".html"; } bool LyricsWindow::loadFromCache() @@ -205,7 +205,7 @@ bool LyricsWindow::loadFromCache() return false; } - m_ui.textBrowser->setHtml(QString::fromUtf8(file.readAll().constData())); + m_ui.textBrowser->setHtml(QString::fromUtf8(file.readAll())); m_ui.stateLabel->setText(tr("Done")); return true; } diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_bg.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_bg.ts index 3c3d04b06..183a6a45c 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_bg.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_bg.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin - + About Lyrics Plugin - + Qmmp Lyrics Plugin - + This plugin retrieves lyrics from LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts index 1ca4aa101..54e91fd64 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Modul pro texty písní - + About Lyrics Plugin O modulu pro texty písní - + Qmmp Lyrics Plugin Modul Qmmp pro texty písní - + This plugin retrieves lyrics from LyricWiki Tento modul získává texty písní z LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts index 4c51d3fbd..daca2344f 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Liedtext-Modul - + About Lyrics Plugin Über Liedtext-Modul - + Qmmp Lyrics Plugin Qmmp Liedtext-Modul - + This plugin retrieves lyrics from LyricWiki Dieses Modul empfängt Liedtexte von LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_el.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_el.ts index 968ea2adb..348a51748 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_el.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_el.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Πρόσθετο στίχων - + About Lyrics Plugin Σχετικά με το πρόσθετο στίχων - + Qmmp Lyrics Plugin Qmmp πρόσθετο στίχων - + This plugin retrieves lyrics from LyricWiki Αυτό το πρόσθετο κάνει λήψη στίχων από το LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_en.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_en.ts index b412af515..4c6372133 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_en.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_en.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin - + About Lyrics Plugin - + Qmmp Lyrics Plugin - + This plugin retrieves lyrics from LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_es.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_es.ts index 9add9e221..33e58ff1f 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_es.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_es.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Módulo de letras - + About Lyrics Plugin Acerca del módulo de letras - + Qmmp Lyrics Plugin Módulo de letras para Qmmp - + This plugin retrieves lyrics from LyricWiki Este módulo descarga letras de LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_fi.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_fi.ts index 71a941c2d..3f1b62b0a 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_fi.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_fi.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Sanoitusliitännäinen - + About Lyrics Plugin Tietoja - Sanoitusliitännäinen - + Qmmp Lyrics Plugin Qmmp-sanoitusliitännäinen - + This plugin retrieves lyrics from LyricWiki Tämä liitännäinen noutaa sanoituksia LyricWikistä - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_fr.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_fr.ts index 8ba2e6297..db7624a31 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_fr.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_fr.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Greffon de paroles - + About Lyrics Plugin À propos du greffon de paroles - + Qmmp Lyrics Plugin Greffon de paroles pour Qmmp - + This plugin retrieves lyrics from LyricWiki Ce greffon récupère les paroles depuis LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_gl_ES.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_gl_ES.ts index 7f1f07e4d..935c5161f 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_gl_ES.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_gl_ES.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Engadido de letras - + About Lyrics Plugin Sobre o engadido de letras - + Qmmp Lyrics Plugin Engadido de letras de Qmmp - + This plugin retrieves lyrics from LyricWiki Este engadido recupera letras dende LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_he.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_he.ts index ea487c866..60ad7087c 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_he.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_he.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin תוסף מילות שיר - + About Lyrics Plugin אודות תוסף מילות שיר - + Qmmp Lyrics Plugin תוסף מילות שיר של Qmmp - + This plugin retrieves lyrics from LyricWiki תוסף zv מאחזר מילות שיר מתוך LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_hu.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_hu.ts index 32a73f846..53b302bd7 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_hu.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_hu.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin - + About Lyrics Plugin - + Qmmp Lyrics Plugin - + This plugin retrieves lyrics from LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_id.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_id.ts index 18e441cdc..b1e3c86ba 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_id.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_id.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Plugin Lyrics - + About Lyrics Plugin Tentang Plugin Lyrics - + Qmmp Lyrics Plugin Plugin Lyrics Qmmp - + This plugin retrieves lyrics from LyricWiki Plugin ini menarik lirik dari LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts index d1648aad9..d5c3a9dfe 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Modulo Lirica - + About Lyrics Plugin Info sul modulo Lirica - + Qmmp Lyrics Plugin Modulo Lirica per Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> - + This plugin retrieves lyrics from LyricWiki Modulo che permette di trovare testi di canzoni da LyricWiki diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_ja.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_ja.ts index 1ae083ea9..69f206b62 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_ja.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_ja.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin 歌詞プラグイン - + About Lyrics Plugin 歌詞プラグインについて - + Qmmp Lyrics Plugin QMMP 歌詞プラグイン - + This plugin retrieves lyrics from LyricWiki このプラグインは LyricWiki より歌詞を取得します - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_kk.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_kk.ts index fb65f759b..fb2d2d440 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_kk.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_kk.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin - + About Lyrics Plugin - + Qmmp Lyrics Plugin - + This plugin retrieves lyrics from LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts index 9e7a9f371..51d855138 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Lyrics įskiepis - + About Lyrics Plugin Apie Lyrics įskiepį - + Qmmp Lyrics Plugin Qmmp Lyrics įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> - + This plugin retrieves lyrics from LyricWiki Šis įskiepis atsiunčia dainų žodžius iš LyricWiki diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_nl.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_nl.ts index b0050779f..ba07b208c 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_nl.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_nl.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Liedtekst Module - + About Lyrics Plugin Over de Liedtekst Module - + Qmmp Lyrics Plugin Liedtekst Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> - + This plugin retrieves lyrics from LyricWiki Deze module haalt liedteksten van LyricWiki diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_pl_PL.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_pl_PL.ts index 58087a58c..ab7b7b747 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_pl_PL.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_pl_PL.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Wtyczka tekstów piosenek - + About Lyrics Plugin O wtyczce Teksty piosenek - + Qmmp Lyrics Plugin Wtyczka Teksty Piosenek dla Qmmp - + This plugin retrieves lyrics from LyricWiki Ta wtyczka ściąga teksty piosenek z LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_pt.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_pt.ts index 97810ea47..ee087d112 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_pt.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_pt.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Suplemento Lyrics - + About Lyrics Plugin Sobre o suplemento Lyrics - + Qmmp Lyrics Plugin Suplemento Qmmp Lyrics - + This plugin retrieves lyrics from LyricWiki Este suplemento obtém as letras através do sítio web LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_pt_BR.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_pt_BR.ts index 48a78d554..7abe4c106 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_pt_BR.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_pt_BR.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Plugin Lyrics - + About Lyrics Plugin Sobre o plugin Lyrics - + Qmmp Lyrics Plugin Plugin Qmmp Lyrics - + This plugin retrieves lyrics from LyricWiki Este plugin obtém as letras através do LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts index a7ad26918..268d1a604 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Модуль показа текстов - + About Lyrics Plugin О модуле показа текстов песен - + Qmmp Lyrics Plugin Модуль показа текстов песен для Qmmp - + This plugin retrieves lyrics from LyricWiki Этот модуль предназначен для получания текстов песен из LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_sk.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_sk.ts index 22d4f1c6d..6ff871a84 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_sk.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_sk.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin - + About Lyrics Plugin - + Qmmp Lyrics Plugin - + This plugin retrieves lyrics from LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_sr_BA.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_sr_BA.ts index 3f65cf492..9ee5429c0 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_sr_BA.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_sr_BA.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Стихови - + About Lyrics Plugin О прикључку за стихове - + Qmmp Lyrics Plugin Кумп прикључак за стихове - + This plugin retrieves lyrics from LyricWiki Добавља стихове са LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_sr_RS.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_sr_RS.ts index 649c2284b..ebe6af459 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_sr_RS.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_sr_RS.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Стихови - + About Lyrics Plugin О прикључку за стихове - + Qmmp Lyrics Plugin Кумп прикључак за стихове - + This plugin retrieves lyrics from LyricWiki Добавља стихове са LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts index 528c4937b..91671892d 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Şarkı Sözü Eklentisi - + About Lyrics Plugin Şarkı Sözü Eklentisi Hakkında - + Qmmp Lyrics Plugin Qmmp Şarkı Sözü Eklentisi - + This plugin retrieves lyrics from LyricWiki Bu eklenti şarkı sözlerini LyricWiki adresinden alır - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts index 1e2f034d7..862ff4af4 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin Модуль текстів - + About Lyrics Plugin Про модуль текстів - + Qmmp Lyrics Plugin Модуль текстів для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> - + This plugin retrieves lyrics from LyricWiki Цей модуль отримує тексти з LyricWiki diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts index 72d066523..989d4515c 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin 歌词插件 - + About Lyrics Plugin 关于歌词插件 - + Qmmp Lyrics Plugin Qmmp 歌词插件 - + This plugin retrieves lyrics from LyricWiki 此插件使用的歌词来源于 LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts index 17188b091..8ec6a2f2d 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts @@ -17,27 +17,27 @@ LyricsFactory - + Lyrics Plugin 歌詞插件 - + About Lyrics Plugin 關於歌詞插件 - + Qmmp Lyrics Plugin Qmmp 歌詞插件 - + This plugin retrieves lyrics from LyricWiki 此插件歌詞來自於 LyricWiki - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/CMakeLists.txt b/src/plugins/General/mpris/CMakeLists.txt index 6126c4040..75c98dc88 100644 --- a/src/plugins/General/mpris/CMakeLists.txt +++ b/src/plugins/General/mpris/CMakeLists.txt @@ -1,22 +1,5 @@ project(libmpris) - -SET (QT_USE_QTDBUS 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}) # libqmmpui & libqmmp @@ -36,17 +19,17 @@ SET(libmpris_SRCS SET(libmpris_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libmpris_RCC_SRCS ${libmpris_RCCS}) +QT5_ADD_RESOURCES(libmpris_RCC_SRCS ${libmpris_RCCS}) # user interface -# QT4_WRAP_UI(libmpris_UIS_H ${libmpris_UIS}) +# QT5_WRAP_UI(libmpris_UIS_H ${libmpris_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(mpris MODULE ${libmpris_SRCS} ${libmpris_RCC_SRCS}) add_dependencies(mpris qmmpui) -target_link_libraries(mpris ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(mpris Qt5::Widgets Qt5::DBus -lqmmpui -lqmmp) install(TARGETS mpris DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/mpris/mprisfactory.cpp b/src/plugins/General/mpris/mprisfactory.cpp index 5f48a3540..30c013713 100644 --- a/src/plugins/General/mpris/mprisfactory.cpp +++ b/src/plugins/General/mpris/mprisfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * + * Copyright (C) 2008-2012 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 "mpris.h" #include "mprisfactory.h" @@ -60,5 +59,3 @@ QTranslator *MPRISFactory::createTranslator(QObject *parent) translator->load(QString(":/mpris_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(mpris, MPRISFactory) diff --git a/src/plugins/General/mpris/mprisfactory.h b/src/plugins/General/mpris/mprisfactory.h index 7f5b9a1c3..7d1fd85e3 100644 --- a/src/plugins/General/mpris/mprisfactory.h +++ b/src/plugins/General/mpris/mprisfactory.h @@ -32,6 +32,7 @@ class MPRISFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/mpris/translations/mpris_plugin_bg.ts b/src/plugins/General/mpris/translations/mpris_plugin_bg.ts index fb85f0df4..9c66e343f 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_bg.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_bg.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin - + About MPRIS Plugin - + Qmmp MPRIS Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_cs.ts b/src/plugins/General/mpris/translations/mpris_plugin_cs.ts index 885041a08..9cf323a9f 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_cs.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_cs.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Modul MPRIS - + About MPRIS Plugin O modulu MPRIS - + Qmmp MPRIS Plugin Modul Qmmp MPRIS - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_de.ts b/src/plugins/General/mpris/translations/mpris_plugin_de.ts index 125223494..a691a54af 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_de.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_de.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin MPRIS-Modul - + About MPRIS Plugin Über MPRIS-Modul - + Qmmp MPRIS Plugin Qmmp MPRIS-Modul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_el.ts b/src/plugins/General/mpris/translations/mpris_plugin_el.ts index 6580b0fb7..84645abc9 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_el.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_el.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Πρόσθετο MPRIS - + About MPRIS Plugin Σχετικά με το πρόσθετο MPRIS - + Qmmp MPRIS Plugin Qmmp πρόσθετο MPRIS - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_en.ts b/src/plugins/General/mpris/translations/mpris_plugin_en.ts index bc0fdea35..9eee38910 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_en.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_en.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin - + About MPRIS Plugin - + Qmmp MPRIS Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_es.ts b/src/plugins/General/mpris/translations/mpris_plugin_es.ts index e30621262..784a4ede1 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_es.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_es.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Módulo MPRIS - + About MPRIS Plugin Acerca del módulo MPRIS - + Qmmp MPRIS Plugin Módulo MPRIS para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_fi.ts b/src/plugins/General/mpris/translations/mpris_plugin_fi.ts index 71b0cd7bc..90f167c0a 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_fi.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_fi.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin MPRIS-liitännäinen - + About MPRIS Plugin Tietoja - MPRIS-liitännäinen - + Qmmp MPRIS Plugin Qmmp:n MPRIS-liitännäinen - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_fr.ts b/src/plugins/General/mpris/translations/mpris_plugin_fr.ts index f09a35e75..0c58a4dda 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_fr.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_fr.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Greffon MPRIS - + About MPRIS Plugin À propos du greffon MPRIS - + Qmmp MPRIS Plugin Greffon MPRIS pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_gl_ES.ts b/src/plugins/General/mpris/translations/mpris_plugin_gl_ES.ts index cac689b1b..807d926f6 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_gl_ES.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_gl_ES.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Engadido MPRIS - + About MPRIS Plugin Sobre o engadido MPRIS - + Qmmp MPRIS Plugin Engadido MPRIS de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_he.ts b/src/plugins/General/mpris/translations/mpris_plugin_he.ts index 81dc7ff3b..804b08523 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_he.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_he.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin תוסף MPRIS - + About MPRIS Plugin אודות תוסף MPRIS - + Qmmp MPRIS Plugin תוסף MPRIS של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_hu.ts b/src/plugins/General/mpris/translations/mpris_plugin_hu.ts index ea8227776..12d5505ad 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_hu.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_hu.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin - + About MPRIS Plugin - + Qmmp MPRIS Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_id.ts b/src/plugins/General/mpris/translations/mpris_plugin_id.ts index 642dfc52e..5d3b0c4ee 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_id.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_id.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Plugin MPRIS - + About MPRIS Plugin Tentang Plugin MPRIS - + Qmmp MPRIS Plugin Plugin MPRIS Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_it.ts b/src/plugins/General/mpris/translations/mpris_plugin_it.ts index ee644aa25..d2ad842ab 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_it.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_it.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Modulo MPRIS - + About MPRIS Plugin Info sul modulo MPRIS - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> - + Qmmp MPRIS Plugin Modulo MPRIS per Qmmp diff --git a/src/plugins/General/mpris/translations/mpris_plugin_ja.ts b/src/plugins/General/mpris/translations/mpris_plugin_ja.ts index daef2d672..eed97338f 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_ja.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_ja.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin MPRIS プラグイン - + About MPRIS Plugin MPRIS プラグインについて - + Qmmp MPRIS Plugin QMMP MPRIS プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_kk.ts b/src/plugins/General/mpris/translations/mpris_plugin_kk.ts index 123ad2f5e..3feab0a1a 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_kk.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_kk.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin - + About MPRIS Plugin - + Qmmp MPRIS Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_lt.ts b/src/plugins/General/mpris/translations/mpris_plugin_lt.ts index a8e268bd6..741930a51 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_lt.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_lt.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin MPRIS įskiepis - + About MPRIS Plugin Apie MPRIS įskiepį - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> - + Qmmp MPRIS Plugin Qmmp MPRIS įskiepis diff --git a/src/plugins/General/mpris/translations/mpris_plugin_nl.ts b/src/plugins/General/mpris/translations/mpris_plugin_nl.ts index 88d59078a..419b667f4 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_nl.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_nl.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin MPRIS Module - + About MPRIS Plugin Over de MPRIS Module - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> - + Qmmp MPRIS Plugin Qmmp MPRIS Module diff --git a/src/plugins/General/mpris/translations/mpris_plugin_pl_PL.ts b/src/plugins/General/mpris/translations/mpris_plugin_pl_PL.ts index a175b7905..330dfc2ce 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_pl_PL.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_pl_PL.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Wtyczka MPRIS - + About MPRIS Plugin O wtyczce MPRIS - + Qmmp MPRIS Plugin Wtyczka MPRIS dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_pt.ts b/src/plugins/General/mpris/translations/mpris_plugin_pt.ts index 606bb3892..e71e13ba6 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_pt.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_pt.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Suplemento MPRIS - + About MPRIS Plugin Sobre o suplemento MPRIS - + Qmmp MPRIS Plugin Suplemento Qmmp MPRIS - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_pt_BR.ts b/src/plugins/General/mpris/translations/mpris_plugin_pt_BR.ts index 537d2d76f..c14386703 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_pt_BR.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_pt_BR.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Plugin MPRIS - + About MPRIS Plugin Sobre o plugin MPRIS - + Qmmp MPRIS Plugin Plugin Qmmp MPRIS - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_ru.ts b/src/plugins/General/mpris/translations/mpris_plugin_ru.ts index 7f19d9590..360e63e85 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_ru.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_ru.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Модуль MPRIS - + About MPRIS Plugin О модуле MPRIS - + Qmmp MPRIS Plugin Модуль MPRIS для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_sk.ts b/src/plugins/General/mpris/translations/mpris_plugin_sk.ts index 95e729fd1..758107fcf 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_sk.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_sk.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin - + About MPRIS Plugin - + Qmmp MPRIS Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_sr_BA.ts b/src/plugins/General/mpris/translations/mpris_plugin_sr_BA.ts index 0299c1036..46ae1273d 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_sr_BA.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_sr_BA.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin МПРИС - + About MPRIS Plugin О прикључку за МПРИС - + Qmmp MPRIS Plugin Кумп МПРИС прикључак - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_sr_RS.ts b/src/plugins/General/mpris/translations/mpris_plugin_sr_RS.ts index d3d9badb2..fc0749e40 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_sr_RS.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_sr_RS.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin МПРИС - + About MPRIS Plugin О прикључку за МПРИС - + Qmmp MPRIS Plugin Кумп МПРИС прикључак - + Written by: Ilya Kotov <forkotov02@ya.ru> Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_tr.ts b/src/plugins/General/mpris/translations/mpris_plugin_tr.ts index 455210030..aa3fb2fa8 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_tr.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_tr.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin MPRIS Eklentisi - + About MPRIS Plugin MPRIS Eklentisi Hakkında - + Qmmp MPRIS Plugin Qmmp MPRIS Eklentisi - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_uk_UA.ts b/src/plugins/General/mpris/translations/mpris_plugin_uk_UA.ts index b1e28aa53..02b61a295 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_uk_UA.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_uk_UA.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin Модуль MPRIS - + About MPRIS Plugin Про модуль MPRIS - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> - + Qmmp MPRIS Plugin Модуль MPRIS для Qmmp diff --git a/src/plugins/General/mpris/translations/mpris_plugin_zh_CN.ts b/src/plugins/General/mpris/translations/mpris_plugin_zh_CN.ts index 61effea64..170737967 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_zh_CN.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_zh_CN.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin MPRIS 插件 - + About MPRIS Plugin 关于 MPRIS 插件 - + Qmmp MPRIS Plugin Qmmp MPRIS 插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/mpris/translations/mpris_plugin_zh_TW.ts b/src/plugins/General/mpris/translations/mpris_plugin_zh_TW.ts index b40a05bfb..14080aaea 100644 --- a/src/plugins/General/mpris/translations/mpris_plugin_zh_TW.ts +++ b/src/plugins/General/mpris/translations/mpris_plugin_zh_TW.ts @@ -4,22 +4,22 @@ MPRISFactory - + MPRIS Plugin MPRIS 外掛 - + About MPRIS Plugin 關於 MPRIS 外掛 - + Qmmp MPRIS Plugin Qmmp MPRIS 外掛 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/CMakeLists.txt b/src/plugins/General/notifier/CMakeLists.txt index ae11cd7c0..0b2df2839 100644 --- a/src/plugins/General/notifier/CMakeLists.txt +++ b/src/plugins/General/notifier/CMakeLists.txt @@ -1,20 +1,7 @@ project(libnotifier) -# 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}/../../../ -) - # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -27,11 +14,11 @@ SET(libnotifier_SRCS popupwidget.cpp ) -SET(libnotifier_RCCS +SET(libnotifier_RCCS translations/translations.qrc notifier_images.qrc) -QT4_ADD_RESOURCES(libnotifier_RCC_SRCS ${libnotifier_RCCS}) +QT5_ADD_RESOURCES(libnotifier_RCC_SRCS ${libnotifier_RCCS}) # user interface @@ -40,20 +27,20 @@ SET(libnotifier_UIS settingsdialog.ui ) -QT4_WRAP_UI(libnotifier_UIS_H ${libnotifier_UIS}) +QT5_WRAP_UI(libnotifier_UIS_H ${libnotifier_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(notifier MODULE ${libnotifier_SRCS} ${libnotifier_UIS_H} ${libnotifier_RCC_SRCS}) add_dependencies(notifier qmmpui) -IF(X11_FOUND) +IF(X11_FOUND AND Qt5X11Extras_FOUND) include_directories(${X11_INCLUDE_DIRS}) link_directories(${X11_LIBRARY_DIRS}) ADD_DEFINITIONS(${X11_CFLAGS}) ADD_DEFINITIONS(-DX11_FOUND) - target_link_libraries(notifier ${QT_LIBRARIES} qmmpui libqmmp ${X11_LDFLAGS}) -ELSE(X11_FOUND) - target_link_libraries(notifier ${QT_LIBRARIES} qmmpui libqmmp) -ENDIF(X11_FOUND) + target_link_libraries(notifier Qt5::X11Extras Qt5::Widgets ${X11_LDFLAGS} -lqmmpui -lqmmp) +ELSE(X11_FOUND AND Qt5X11Extras_FOUND) + target_link_libraries(notifier Qt5::Widgets -lqmmpui -lqmmp) +ENDIF(X11_FOUND AND Qt5X11Extras_FOUND) install(TARGETS notifier DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/notifier/notifier.cpp b/src/plugins/General/notifier/notifier.cpp index 1edaeaf36..c55008406 100644 --- a/src/plugins/General/notifier/notifier.cpp +++ b/src/plugins/General/notifier/notifier.cpp @@ -32,7 +32,7 @@ #include #include #include -#elif defined (Q_OS_WIN) +#elif defined(Q_OS_WIN) #include #endif diff --git a/src/plugins/General/notifier/notifier.pro b/src/plugins/General/notifier/notifier.pro index eea864b6c..d3e38c6fc 100644 --- a/src/plugins/General/notifier/notifier.pro +++ b/src/plugins/General/notifier/notifier.pro @@ -20,8 +20,9 @@ RESOURCES = notifier_images.qrc \ LIBS += $$QMMPUI_LIB unix { - PKGCONFIG += x11 - DEFINES += X11_FOUND target.path = $$LIB_DIR/qmmp/General INSTALLS += target + PKGCONFIG += x11 + QT += x11extras + DEFINES += X11_FOUND } diff --git a/src/plugins/General/notifier/notifierfactory.cpp b/src/plugins/General/notifier/notifierfactory.cpp index d7bc37b07..1e6f47d36 100644 --- a/src/plugins/General/notifier/notifierfactory.cpp +++ b/src/plugins/General/notifier/notifierfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * + * Copyright (C) 2008-2012 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 "notifier.h" #include "settingsdialog.h" #include "notifierfactory.h" @@ -60,5 +59,3 @@ QTranslator *NotifierFactory::createTranslator(QObject *parent) translator->load(QString(":/notifier_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(notifier,NotifierFactory) diff --git a/src/plugins/General/notifier/notifierfactory.h b/src/plugins/General/notifier/notifierfactory.h index e11a8662e..a968c9c67 100644 --- a/src/plugins/General/notifier/notifierfactory.h +++ b/src/plugins/General/notifier/notifierfactory.h @@ -33,6 +33,7 @@ class NotifierFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/notifier/translations/notifier_plugin_bg.ts b/src/plugins/General/notifier/translations/notifier_plugin_bg.ts index b2461d263..5b8ea6288 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_bg.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_bg.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin - + About Notifier Plugin - + Qmmp Notifier Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_cs.ts b/src/plugins/General/notifier/translations/notifier_plugin_cs.ts index 274d3e2ce..ec7727e7d 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_cs.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_cs.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Notifikační modul - + About Notifier Plugin O notifikačním modulu - + Qmmp Notifier Plugin Notifikační modul Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_de.ts b/src/plugins/General/notifier/translations/notifier_plugin_de.ts index 23252a6de..c3016380c 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_de.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_de.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Benachrichtigungsmodul - + About Notifier Plugin Über Benachrichtigungsmodul - + Qmmp Notifier Plugin Qmmp Benachrichtigungsmodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_el.ts b/src/plugins/General/notifier/translations/notifier_plugin_el.ts index 41fc9e8cb..e193eae43 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_el.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_el.ts @@ -4,25 +4,25 @@ NotifierFactory - + Notifier Plugin Πρόσθετο ειδοποιήσεων - + About Notifier Plugin Σχετικά με το πρόσθετο ειδοποιήσεων - + Qmmp Notifier Plugin Qmmp πρόσθετο ειδοποιήσεων - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_en.ts b/src/plugins/General/notifier/translations/notifier_plugin_en.ts index fd09d7bc9..1561310da 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_en.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_en.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin - + About Notifier Plugin - + Qmmp Notifier Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_es.ts b/src/plugins/General/notifier/translations/notifier_plugin_es.ts index 6734b1c01..357552032 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_es.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_es.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Módulo de avisos - + About Notifier Plugin Acerca del módulo de avisos - + Qmmp Notifier Plugin Módulo de avisos para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_fi.ts b/src/plugins/General/notifier/translations/notifier_plugin_fi.ts index 8fd2ad648..677cdc067 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_fi.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_fi.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin - + About Notifier Plugin - + Qmmp Notifier Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_fr.ts b/src/plugins/General/notifier/translations/notifier_plugin_fr.ts index 0e24bce50..b4aae94ea 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_fr.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_fr.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Greffon de notification - + About Notifier Plugin À propos du greffon de notification - + Qmmp Notifier Plugin Greffon de notification pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_gl_ES.ts b/src/plugins/General/notifier/translations/notifier_plugin_gl_ES.ts index b3e3914d0..7d771c4bb 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_gl_ES.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_gl_ES.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Engadido notificador - + About Notifier Plugin Sobre o engadido notificador - + Qmmp Notifier Plugin Engadido notificador de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_he.ts b/src/plugins/General/notifier/translations/notifier_plugin_he.ts index 41579206c..2981a909d 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_he.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_he.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin תוסף התראה - + About Notifier Plugin אודות תוסף התראה - + Qmmp Notifier Plugin תוסף התראה של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_hu.ts b/src/plugins/General/notifier/translations/notifier_plugin_hu.ts index 33b0ddc5f..49e6d36d6 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_hu.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_hu.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin - + About Notifier Plugin - + Qmmp Notifier Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_id.ts b/src/plugins/General/notifier/translations/notifier_plugin_id.ts index ed1ce1747..6b8a72f4f 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_id.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_id.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Plugin Notifier - + About Notifier Plugin Tentang Plugin Notifier - + Qmmp Notifier Plugin Plugin Notifier Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_it.ts b/src/plugins/General/notifier/translations/notifier_plugin_it.ts index bd0bf3a10..27ee940cf 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_it.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_it.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Modulo notifica - + About Notifier Plugin Info sul modulo notifica - + Qmmp Notifier Plugin Modulo notifica per Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_ja.ts b/src/plugins/General/notifier/translations/notifier_plugin_ja.ts index 064b25cfd..cef35786c 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_ja.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_ja.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin 通知プラグイン - + About Notifier Plugin 通知プラグインについて - + Qmmp Notifier Plugin QMMP 通知プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_kk.ts b/src/plugins/General/notifier/translations/notifier_plugin_kk.ts index 9995ce780..2ad30aa85 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_kk.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_kk.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin - + About Notifier Plugin - + Qmmp Notifier Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_lt.ts b/src/plugins/General/notifier/translations/notifier_plugin_lt.ts index 758e6ac00..f29d26057 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_lt.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_lt.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Notifier įskiepis - + About Notifier Plugin Apie Notifier įskiepį - + Qmmp Notifier Plugin Qmmp Notifier Įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_nl.ts b/src/plugins/General/notifier/translations/notifier_plugin_nl.ts index cac6be165..9cec0058a 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_nl.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_nl.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Notificatie Module - + About Notifier Plugin Over de Notificatie Module - + Qmmp Notifier Plugin Notificatie Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_pl_PL.ts b/src/plugins/General/notifier/translations/notifier_plugin_pl_PL.ts index 8b63f9b2a..8106ad27a 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_pl_PL.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_pl_PL.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Wtyczka Notifier - + About Notifier Plugin O wtyczce Notifier - + Qmmp Notifier Plugin Wtyczka Notifier dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_pt.ts b/src/plugins/General/notifier/translations/notifier_plugin_pt.ts index 9fbb2adae..f5a30f9fe 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_pt.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_pt.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Suplemento Notifier - + About Notifier Plugin Sobre o suplemento Notifier - + Qmmp Notifier Plugin Suplemento Qmmp Notifier - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_pt_BR.ts b/src/plugins/General/notifier/translations/notifier_plugin_pt_BR.ts index a27043739..aa96c0478 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_pt_BR.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_pt_BR.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Plugin Notifier - + About Notifier Plugin Sobre o plugin Notifier - + Qmmp Notifier Plugin Plugin Qmmp Notifier - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_ru.ts b/src/plugins/General/notifier/translations/notifier_plugin_ru.ts index 17d184156..793f0c791 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_ru.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_ru.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Модуль уведомлений - + About Notifier Plugin О модуле уведомлений - + Qmmp Notifier Plugin Модуль уведомлений для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_sk.ts b/src/plugins/General/notifier/translations/notifier_plugin_sk.ts index 12c7fb01c..17c888933 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_sk.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_sk.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin - + About Notifier Plugin - + Qmmp Notifier Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_sr_BA.ts b/src/plugins/General/notifier/translations/notifier_plugin_sr_BA.ts index e525b6b39..6ca5dada4 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_sr_BA.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_sr_BA.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Обавјештавач - + About Notifier Plugin О обавјештавачу - + Qmmp Notifier Plugin Кумп прикључак за обавјештавање - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_sr_RS.ts b/src/plugins/General/notifier/translations/notifier_plugin_sr_RS.ts index 8ad6dd98d..758cf9880 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_sr_RS.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_sr_RS.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Обавештавач - + About Notifier Plugin О обавештавачу - + Qmmp Notifier Plugin Кумп прикључак за обавештавање - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_tr.ts b/src/plugins/General/notifier/translations/notifier_plugin_tr.ts index 5ea682c19..d7785b990 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_tr.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_tr.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Bildirim Eklentisi - + About Notifier Plugin Bildirim Eklentisi Hakkında - + Qmmp Notifier Plugin Qmmp Bildirim Eklentisi - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_uk_UA.ts b/src/plugins/General/notifier/translations/notifier_plugin_uk_UA.ts index 8eb5fdba4..ddb855f88 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_uk_UA.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_uk_UA.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin Модуль повідомлень - + About Notifier Plugin Про модуль повідомлень - + Qmmp Notifier Plugin Модуль повідомлень для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_zh_CN.ts b/src/plugins/General/notifier/translations/notifier_plugin_zh_CN.ts index 789e3c144..7c7a95519 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_zh_CN.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_zh_CN.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin 通知插件 - + About Notifier Plugin 关于通知插件 - + Qmmp Notifier Plugin Qmmp 通知插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_zh_TW.ts b/src/plugins/General/notifier/translations/notifier_plugin_zh_TW.ts index 30f5c2c8a..204232177 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_zh_TW.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_zh_TW.ts @@ -4,22 +4,22 @@ NotifierFactory - + Notifier Plugin 通知插件 - + About Notifier Plugin 關於通知插件 - + Qmmp Notifier Plugin Qmmp 通知插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/rgscan/CMakeLists.txt b/src/plugins/General/rgscan/CMakeLists.txt index 62cd415e9..4e420afe5 100644 --- a/src/plugins/General/rgscan/CMakeLists.txt +++ b/src/plugins/General/rgscan/CMakeLists.txt @@ -1,22 +1,7 @@ project(librgscan) -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}/../../../ -) - # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -44,7 +29,7 @@ SET(librgscan_RCCS translations/translations.qrc ) -QT4_ADD_RESOURCES(librgscan_RCC_SRCS ${librgscan_RCCS}) +QT5_ADD_RESOURCES(librgscan_RCC_SRCS ${librgscan_RCCS}) # user interface @@ -52,12 +37,12 @@ SET(librgscan_UIS rgscandialog.ui ) -QT4_WRAP_UI(librgscan_UIS_H ${librgscan_UIS}) +QT5_WRAP_UI(librgscan_UIS_H ${librgscan_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(rgscan MODULE ${librgscan_SRCS} ${librgscan_UIS_H} ${librgscan_HDRS} ${librgscan_RCC_SRCS}) add_dependencies(rgscan qmmpui) -target_link_libraries(rgscan ${QT_LIBRARIES} qmmpui libqmmp ${TAGLIB_LDFLAGS}) +target_link_libraries(rgscan Qt5::Widgets -lqmmpui -lqmmp ${TAGLIB_LDFLAGS}) install(TARGETS rgscan DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/rgscan/rgscandialog.cpp b/src/plugins/General/rgscan/rgscandialog.cpp index 183cd2218..2784a1a42 100644 --- a/src/plugins/General/rgscan/rgscandialog.cpp +++ b/src/plugins/General/rgscan/rgscandialog.cpp @@ -35,15 +35,11 @@ #include #include #include -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 10)) #include -#endif -#include #include "rgscanner.h" #include "gain_analysis.h" #include "rgscandialog.h" -#define QStringToTString_qt4(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8) #define FILE_SKIPPED (Qt::UserRole + 1) struct ReplayGainInfoItem @@ -57,7 +53,7 @@ RGScanDialog::RGScanDialog(QList tracks, QWidget *parent) : Q { m_ui.setupUi(this); m_ui.tableWidget->verticalHeader()->setDefaultSectionSize(fontMetrics().height() + 3); - m_ui.tableWidget->verticalHeader()->setResizeMode(QHeaderView::Fixed); + m_ui.tableWidget->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed); QStringList paths; MetaDataFormatter formatter("%if(%p&%t,%p - %t,%f) - %l"); @@ -79,12 +75,8 @@ RGScanDialog::RGScanDialog(QList tracks, QWidget *parent) : Q ext == "flac" || //native flac ext == "oga" || //ogg flac ext == "ogg" || //ogg vorbis - ext == "wv" //wavpack -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 10)) - || ext == "m4a") //aac (mp4 container) -#else - ) -#endif + ext == "wv" || //wavpack + ext == "m4a") //aac (mp4 container) { paths.append(track->url()); QString name = formatter.format(track); @@ -293,12 +285,12 @@ QString RGScanDialog::getAlbumName(const QString &url) TagLib::String RGScanDialog::gainToString(double value) { - return QStringToTString_qt4(QString("%1 dB").arg(value, 0, 'f', 2)); + return QStringToTString(QString("%1 dB").arg(value, 0, 'f', 2)); } TagLib::String RGScanDialog::peakToString(double value) { - return QStringToTString_qt4(QString("%1").arg(value, 0, 'f', 6)); + return QStringToTString(QString("%1").arg(value, 0, 'f', 6)); } TagLib::StringList RGScanDialog::gainToStringList(double value) @@ -376,10 +368,8 @@ void RGScanDialog::writeVorbisComment(TagLib::Ogg::XiphComment *tag, ReplayGainI } } -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 10)) void RGScanDialog::writeMP4Tag(TagLib::MP4::Tag *tag, ReplayGainInfoItem *item) { - if(m_ui.trackCheckBox->isChecked()) { tag->setItem("----:com.apple.iTunes:replaygain_track_gain", @@ -395,7 +385,6 @@ void RGScanDialog::writeMP4Tag(TagLib::MP4::Tag *tag, ReplayGainInfoItem *item) gainToStringList(item->info[Qmmp::REPLAYGAIN_ALBUM_PEAK])); } } -#endif void RGScanDialog::on_writeButton_clicked() { @@ -439,13 +428,11 @@ void RGScanDialog::on_writeButton_clicked() writeAPETag(file.APETag(true), item); file.save(); } -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 10)) else if(ext == "m4a") //MPEG-4 Part 14 { TagLib::MP4::File file(qPrintable(item->url)); writeMP4Tag(file.tag(), item); file.save(); } -#endif } } diff --git a/src/plugins/General/rgscan/rgscandialog.h b/src/plugins/General/rgscan/rgscandialog.h index 761b594c2..18dcda9ad 100644 --- a/src/plugins/General/rgscan/rgscandialog.h +++ b/src/plugins/General/rgscan/rgscandialog.h @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include "ui_rgscandialog.h" @@ -49,12 +48,10 @@ namespace TagLib { class XiphComment; } -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 10)) namespace MP4 { class Tag; } -#endif } /** @@ -84,9 +81,7 @@ private: void writeAPETag(TagLib::APE::Tag *tag, ReplayGainInfoItem *item); void writeID3v2Tag(TagLib::ID3v2::Tag *tag, ReplayGainInfoItem *item); void writeVorbisComment(TagLib::Ogg::XiphComment *tag, ReplayGainInfoItem *item); -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 10)) void writeMP4Tag(TagLib::MP4::Tag *tag, ReplayGainInfoItem *item); -#endif Ui::RGScanDialog m_ui; QList m_scanners; QList m_replayGainItemList; diff --git a/src/plugins/General/rgscan/rgscanfactory.cpp b/src/plugins/General/rgscan/rgscanfactory.cpp index e3f3992d8..1bc3545fe 100644 --- a/src/plugins/General/rgscan/rgscanfactory.cpp +++ b/src/plugins/General/rgscan/rgscanfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2016 by Ilya Kotov * + * Copyright (C) 2013 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 "rgscanhelper.h" #include "rgscanfactory.h" @@ -66,5 +65,3 @@ QTranslator *RGScanFactory::createTranslator(QObject *parent) translator->load(QString(":/rgscan_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(rgscan, RGScanFactory) diff --git a/src/plugins/General/rgscan/rgscanfactory.h b/src/plugins/General/rgscan/rgscanfactory.h index 13e66d474..ecd75a49a 100644 --- a/src/plugins/General/rgscan/rgscanfactory.h +++ b/src/plugins/General/rgscan/rgscanfactory.h @@ -32,6 +32,7 @@ class RGScanFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_bg.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_bg.ts index a7ee1b520..d35a060db 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_bg.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_bg.ts @@ -64,16 +64,16 @@ - - + + Error - - - - + + + + %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin - + About ReplayGain Scanner Plugin - + ReplayGain Scanner Plugin for Qmmp - + This plugin scans audio files and gives information for volume normalization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_cs.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_cs.ts index 953d0777b..eb6806f41 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_cs.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_cs.ts @@ -64,16 +64,16 @@ - - + + Error Chyba - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin - + About ReplayGain Scanner Plugin - + ReplayGain Scanner Plugin for Qmmp - + This plugin scans audio files and gives information for volume normalization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_de.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_de.ts index 68c106424..9f4b01b96 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_de.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_de.ts @@ -64,16 +64,16 @@ Albumverstärkung/-spitzenwert schreiben - - + + Error Fehler - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Wiedergabeverstärkungsscanner-Modul - + About ReplayGain Scanner Plugin Über Wiedergabeverstärkungsscanner-Modul - + ReplayGain Scanner Plugin for Qmmp Wiedergabeverstärkungsscanner-Modul für Qmmp - + This plugin scans audio files and gives information for volume normalization Dieses Modul scannt Audiodateien und gibt Informationen zur Lautstärkenormalisierung - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: Basiert auf Quellcode von: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_el.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_el.ts index f1723996b..840f8074c 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_el.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_el.ts @@ -64,16 +64,16 @@ Εγγραφή ενίσχυσης/κορυφής άλμπουμ - - + + Error Σφάλμα - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Πρόσθετο σάρωσης ενίσχυσης αναπαραγωγής - + About ReplayGain Scanner Plugin Σχετικά με το πρόσθετο σάρωσης ενίσχυσης αναπαραγωγής - + ReplayGain Scanner Plugin for Qmmp Qmmp πρόσθετο σάρωσης ενίσχυσης αναπαραγωγής - + This plugin scans audio files and gives information for volume normalization Αυτό το πρόσθετο σαρώνει τα αρχεία ήχου και δίνει πληροφορίες για την κανονικοποίηση της έντασης - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> - + Based on source code by: Βασισμένο στον πηγαίο κώδικα των: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_en.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_en.ts index 564ea0eed..a00d3e0cc 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_en.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_en.ts @@ -64,16 +64,16 @@ - - + + Error - - - - + + + + %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin - + About ReplayGain Scanner Plugin - + ReplayGain Scanner Plugin for Qmmp - + This plugin scans audio files and gives information for volume normalization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_es.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_es.ts index ac725232a..1de1ab68a 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_es.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_es.ts @@ -64,16 +64,16 @@ Escribir ganancia/pico de álbum - - + + Error Error - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Módulo de Escáner de Ganancia de Repetición - + About ReplayGain Scanner Plugin Acerca del Módulo de Escáner de Ganancia de Repetición - + ReplayGain Scanner Plugin for Qmmp Módulo de Escáner de Ganancia de Repetición de Qmmp - + This plugin scans audio files and gives information for volume normalization Este módulo escanea archivos de audio y proporciona información para la normalización del volumen - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: Basado sobre código fuente por: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_fi.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_fi.ts index c1f0a7d2b..57b1198f2 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_fi.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_fi.ts @@ -64,16 +64,16 @@ - - + + Error Virhe - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin - + About ReplayGain Scanner Plugin - + ReplayGain Scanner Plugin for Qmmp - + This plugin scans audio files and gives information for volume normalization - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_fr.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_fr.ts index f4af4feeb..45f5ba615 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_fr.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_fr.ts @@ -64,16 +64,16 @@ Écrire gain et pic et l'album - - + + Error Erreur - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Greffon analyseur ReplayGain - + About ReplayGain Scanner Plugin À propos du greffon analyseur ReplayGain - + ReplayGain Scanner Plugin for Qmmp Greffon analyseur ReplayGain pour Qmmp - + This plugin scans audio files and gives information for volume normalization Ce greffon analyse les fichiers audio pour obtenir des information de normalisation du volume - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: Basé sur le code source par : - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_gl_ES.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_gl_ES.ts index 0b35591a0..8798187a5 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_gl_ES.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_gl_ES.ts @@ -64,16 +64,16 @@ Escribir ganancia/pico do álbum - - + + Error Erro - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Plugin ReplayGain Scanner - + About ReplayGain Scanner Plugin Acerca do plugin ReplayGain Scanner - + ReplayGain Scanner Plugin for Qmmp Plugin ReplayGain Scanner para Qmmp - + This plugin scans audio files and gives information for volume normalization Este plugin escanea os arquivos de audio e proporciona información sobre a normalización do volume - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: Basado no código fonte por: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_he.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_he.ts index e03ce5f79..62c7988d6 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_he.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_he.ts @@ -64,16 +64,16 @@ רשום הישג/שיא אלבום - - + + Error שגיאה - - - - + + + + %1 dB %1 דציבלים @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin תוסף סורק ReplayGain - + About ReplayGain Scanner Plugin אודות תוסף סורק ReplayGain - + ReplayGain Scanner Plugin for Qmmp תוסף סורק ReplayGain עבור Qmmp - + This plugin scans audio files and gives information for volume normalization תוסף זה סורק קבצי שמע ונותן מידע עבור נורמליזציה של עוצמת שמע - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: מבוסס על קוד מקור מאת: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_hu.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_hu.ts index 1d37f61ae..f623bedd2 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_hu.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_hu.ts @@ -64,16 +64,16 @@ - - + + Error - - - - + + + + %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin - + About ReplayGain Scanner Plugin - + ReplayGain Scanner Plugin for Qmmp - + This plugin scans audio files and gives information for volume normalization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_id.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_id.ts index ddf72a1d5..f9ea6d21c 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_id.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_id.ts @@ -64,16 +64,16 @@ Tulis gain/puncak album - - + + Error Galat - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Plugin Scanner ReplayGain - + About ReplayGain Scanner Plugin Tentang Plugin Scanner ReplayGain - + ReplayGain Scanner Plugin for Qmmp Plugin Scanner ReplayGain untuk Qmmp - + This plugin scans audio files and gives information for volume normalization Plugin ini men-scan file audio dan memberikan informasi untuk normalisasi volume - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: Berdasarkan pada kode sumber oleh: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_it.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_it.ts index ca6f94bbc..4f713c15a 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_it.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_it.ts @@ -64,16 +64,16 @@ - - + + Error - - - - + + + + %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin - + About ReplayGain Scanner Plugin - + ReplayGain Scanner Plugin for Qmmp - + This plugin scans audio files and gives information for volume normalization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_ja.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_ja.ts index 942ac3b3e..84bb85df4 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_ja.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_ja.ts @@ -64,16 +64,16 @@ アルバム全体利得とアルバムピーク値を書き込む - - + + Error エラー - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin リプレイゲイン スキャナー プラグイン - + About ReplayGain Scanner Plugin リプレイゲイン スキャナー プラグインについて - + ReplayGain Scanner Plugin for Qmmp QMMP リプレイゲイン スキャナー プラグイン - + This plugin scans audio files and gives information for volume normalization このプラグインは音声ファイルの音量を計測し適正音量レベルに直すための情報を提供します - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> - + Based on source code by: 元になったコードの作者: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_kk.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_kk.ts index 3faf55c12..0c7795799 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_kk.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_kk.ts @@ -64,16 +64,16 @@ - - + + Error - - - - + + + + %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin - + About ReplayGain Scanner Plugin - + ReplayGain Scanner Plugin for Qmmp - + This plugin scans audio files and gives information for volume normalization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_lt.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_lt.ts index 95fc7673f..da05d05fd 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_lt.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_lt.ts @@ -64,16 +64,16 @@ Įrašyti albumo didėjimą/piką - - + + Error Klaida - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin ReplayGain Skanerio Įskiepis - + About ReplayGain Scanner Plugin Apie ReplayGain Skanerio Įskiepį - + ReplayGain Scanner Plugin for Qmmp ReplayGain Skanerio Įskiepis Qmmp - + This plugin scans audio files and gives information for volume normalization Šis įskiepis skenuja audio bylas ir parodo informaciją apie garso normalizavimą - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: Sukurta iš šaltinio pagal: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_nl.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_nl.ts index d3bddca6d..935573751 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_nl.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_nl.ts @@ -64,16 +64,16 @@ - - + + Error - - - - + + + + %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin - + About ReplayGain Scanner Plugin - + ReplayGain Scanner Plugin for Qmmp - + This plugin scans audio files and gives information for volume normalization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_pl_PL.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_pl_PL.ts index f70fd30a0..32ad26023 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_pl_PL.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_pl_PL.ts @@ -64,16 +64,16 @@ - - + + Error Błąd - - - - + + + + %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Wtyczka Skaner ReplayGain - + About ReplayGain Scanner Plugin O wtyczce Skaner ReplayGain - + ReplayGain Scanner Plugin for Qmmp Wtyczka ReplayGain dla Qmmp - + This plugin scans audio files and gives information for volume normalization Wtyczka skanuje pliki dźwiękowe i podaje informacje na temat normalizacji dźwięku - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: Oparte na kodzie stworzonym przez: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_pt.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_pt.ts index 57da952cd..f3d94cab2 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_pt.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_pt.ts @@ -64,16 +64,16 @@ Gravar ganho/picos do álbum - - + + Error Erro - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Suplemento ReplayGain - + About ReplayGain Scanner Plugin Sobre o suplemento ReplayGain - + ReplayGain Scanner Plugin for Qmmp Suplemento Qmmp ReplayGain - + This plugin scans audio files and gives information for volume normalization Este suplemento analisa os ficheiros áudio e as informações para normalização de volume - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: Baseado no código fonte de: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_pt_BR.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_pt_BR.ts index 67cc19e8b..2757cb280 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_pt_BR.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_pt_BR.ts @@ -64,16 +64,16 @@ Salvar ganho/picos do álbum - - + + Error Erro - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Plugin ReplayGain - + About ReplayGain Scanner Plugin Sobre o plugin ReplayGain - + ReplayGain Scanner Plugin for Qmmp Plugin Qmmp ReplayGain - + This plugin scans audio files and gives information for volume normalization Este plugin analisa os arquivos de áudio e as informações para normalização de volume - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: Baseado no código fonte de: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_ru.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_ru.ts index 7e3dded4f..9ad6ecad5 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_ru.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_ru.ts @@ -64,16 +64,16 @@ Записывать пик/усиление для альбома - - + + Error Ошибка - - - - + + + + %1 dB %1 дБ @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Модуль сканир. ReplayGain - + About ReplayGain Scanner Plugin О модуле сканирования ReplayGain - + ReplayGain Scanner Plugin for Qmmp Модуль сканирования ReplayGain для Qmmp - + This plugin scans audio files and gives information for volume normalization Данный модуль сканирует аудио-файлы и выдаёт информацию для нормализации громкости - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> - + Based on source code by: Основан на исходном коде следующих разработчиков: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_sk.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_sk.ts index c5cbca2ac..2b38719c0 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_sk.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_sk.ts @@ -64,16 +64,16 @@ - - + + Error - - - - + + + + %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin - + About ReplayGain Scanner Plugin - + ReplayGain Scanner Plugin for Qmmp - + This plugin scans audio files and gives information for volume normalization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_sr_BA.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_sr_BA.ts index 1a487bac8..8a3f20d19 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_sr_BA.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_sr_BA.ts @@ -64,16 +64,16 @@ Упиши ниво/врх албума - - + + Error Грешка - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Скенер нивелације - + About ReplayGain Scanner Plugin О прикључку за скенирање нивелације - + ReplayGain Scanner Plugin for Qmmp Кумп прикључак за скенирање нивелације - + This plugin scans audio files and gives information for volume normalization Скенира фајлове звука и даје податке за нормализацију звука - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: Заснован на кôду од: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_sr_RS.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_sr_RS.ts index 6671bf0f0..a2e2e5b40 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_sr_RS.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_sr_RS.ts @@ -64,16 +64,16 @@ Упиши ниво/врх албума - - + + Error Грешка - - - - + + + + %1 dB %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Скенер нивелације - + About ReplayGain Scanner Plugin О прикључку за скенирање нивелације - + ReplayGain Scanner Plugin for Qmmp Кумп прикључак за скенирање нивелације - + This plugin scans audio files and gives information for volume normalization Скенира фајлове звука и даје податке за нормализацију звука - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: Заснован на кôду од: - + David Robinson <David@Robinson.org> David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_tr.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_tr.ts index 77c489489..9014d22d0 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_tr.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_tr.ts @@ -64,16 +64,16 @@ - - + + Error - - - - + + + + %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin - + About ReplayGain Scanner Plugin - + ReplayGain Scanner Plugin for Qmmp - + This plugin scans audio files and gives information for volume normalization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_uk_UA.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_uk_UA.ts index a242eaf4f..96573ad94 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_uk_UA.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_uk_UA.ts @@ -64,16 +64,16 @@ Записувати пік/підсилення для альбому - - + + Error Помилка - - - - + + + + %1 dB %1 дБ @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin Модуль сканування ReplayGain - + About ReplayGain Scanner Plugin Про модуль сканування ReplayGain - + ReplayGain Scanner Plugin for Qmmp Модуль сканування ReplayGain для Qmmp - + This plugin scans audio files and gives information for volume normalization Цей модуль сканує аудіо файли і видає інформацію для нормалізації гучності - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> - + Based on source code by: Заснований на вихідному коді наступних розробників: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_zh_CN.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_zh_CN.ts index 00218a37c..ecc2e14ef 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_zh_CN.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_zh_CN.ts @@ -64,16 +64,16 @@ 写专辑的增益/峰值 - - + + Error 错误 - - - - + + + + %1 dB %1分贝 @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin 回放增益扫描器插件 - + About ReplayGain Scanner Plugin 关于回放增益扫描器插件 - + ReplayGain Scanner Plugin for Qmmp 用于Qmmp播放器的回放增益扫描器插件 - + This plugin scans audio files and gives information for volume normalization 本插件扫描音频文件并提供音量正常化的相关信息 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: 基于以下作者的源代码： - + David Robinson <David@Robinson.org> 戴维.罗宾逊 <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> 格林.索耶尔 <mp3gain@hotmail.com> - + Frank Klemm 弗兰克.克莱姆 diff --git a/src/plugins/General/rgscan/translations/rgscan_plugin_zh_TW.ts b/src/plugins/General/rgscan/translations/rgscan_plugin_zh_TW.ts index b5e042bae..c4c3138e4 100644 --- a/src/plugins/General/rgscan/translations/rgscan_plugin_zh_TW.ts +++ b/src/plugins/General/rgscan/translations/rgscan_plugin_zh_TW.ts @@ -64,16 +64,16 @@ - - + + Error 錯誤 - - - - + + + + %1 dB @@ -81,47 +81,47 @@ RGScanFactory - + ReplayGain Scanner Plugin - + About ReplayGain Scanner Plugin - + ReplayGain Scanner Plugin for Qmmp - + This plugin scans audio files and gives information for volume normalization - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> - + Based on source code by: - + David Robinson <David@Robinson.org> - + Glen Sawyer <mp3gain@hotmail.com> - + Frank Klemm diff --git a/src/plugins/General/scrobbler/CMakeLists.txt b/src/plugins/General/scrobbler/CMakeLists.txt index 6a0b53bb9..d4fbdb2a2 100644 --- a/src/plugins/General/scrobbler/CMakeLists.txt +++ b/src/plugins/General/scrobbler/CMakeLists.txt @@ -1,20 +1,5 @@ project(libscrobbler) - - -SET(QT_USE_QTNETWORK 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}) # libqmmpui @@ -38,7 +23,7 @@ SET(libscrobbler_HDRS SET(libscrobbler_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libscrobbler_RCC_SRCS ${libscrobbler_RCCS}) +QT5_ADD_RESOURCES(libscrobbler_RCC_SRCS ${libscrobbler_RCCS}) # user interface @@ -47,7 +32,7 @@ SET(libscrobbler_UIS settingsdialog.ui ) -QT4_WRAP_UI(libscrobbler_UIS_H ${libscrobbler_UIS}) +QT5_WRAP_UI(libscrobbler_UIS_H ${libscrobbler_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -55,5 +40,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(scrobbler MODULE ${libscrobbler_SRCS} ${libscrobbler_UIS_H} ${libscrobbler_RCC_SRCS} ${libscrobbler_HDRS}) add_dependencies(scrobbler qmmpui) -target_link_libraries(scrobbler ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(scrobbler Qt5::Widgets Qt5::Network -lqmmpui -lqmmp) install(TARGETS scrobbler DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/scrobbler/scrobbler.cpp b/src/plugins/General/scrobbler/scrobbler.cpp index c84cba99d..b4f10e634 100644 --- a/src/plugins/General/scrobbler/scrobbler.cpp +++ b/src/plugins/General/scrobbler/scrobbler.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -312,7 +313,7 @@ void Scrobbler::submit() QUrl url(m_scrobblerUrl); url.setPort(m_scrobblerUrl.startsWith("https") ? 443 : 80); - QUrl body(""); + QUrlQuery body(""); QByteArray data; foreach (QString key, params.keys()) { @@ -321,7 +322,7 @@ void Scrobbler::submit() } data.append(SECRET); body.addQueryItem("api_sig", QCryptographicHash::hash(data, QCryptographicHash::Md5).toHex()); - QByteArray bodyData = body.toEncoded().remove(0,1); + QByteArray bodyData = body.query(QUrl::FullyEncoded).toUtf8(); bodyData.replace("+", QUrl::toPercentEncoding("+")); QNetworkRequest request(url); @@ -361,7 +362,7 @@ void Scrobbler::sendNotification(const SongInfo &info) QUrl url(m_scrobblerUrl); url.setPort(m_scrobblerUrl.startsWith("https") ? 443 : 80); - QUrl body(""); + QUrlQuery body(""); QByteArray data; foreach (QString key, params.keys()) { @@ -370,7 +371,7 @@ void Scrobbler::sendNotification(const SongInfo &info) } data.append(SECRET); body.addQueryItem("api_sig", QCryptographicHash::hash(data, QCryptographicHash::Md5).toHex()); - QByteArray bodyData = body.toEncoded().remove(0,1); + QByteArray bodyData = body.query(QUrl::FullyEncoded).toUtf8(); bodyData.replace("+", QUrl::toPercentEncoding("+")); QNetworkRequest request(url); @@ -415,14 +416,16 @@ void ScrobblerAuth::getToken() m_session.clear(); QUrl url(m_scrobblerUrl + "?"); url.setPort(m_scrobblerUrl.startsWith("https") ? 443 : 80); - url.addQueryItem("method", "auth.getToken"); - url.addQueryItem("api_key", API_KEY); + QUrlQuery q; + q.addQueryItem("method", "auth.getToken"); + q.addQueryItem("api_key", API_KEY); QByteArray data; data.append("api_key" API_KEY); data.append("methodauth.getToken"); data.append(SECRET); - url.addQueryItem("api_sig", QCryptographicHash::hash(data,QCryptographicHash::Md5).toHex()); + q.addQueryItem("api_sig", QCryptographicHash::hash(data,QCryptographicHash::Md5).toHex()); + url.setQuery(q); QNetworkRequest request(url); request.setRawHeader("User-Agent", m_ua); @@ -436,16 +439,18 @@ void ScrobblerAuth::getSession() qDebug("ScrobblerAuth[%s]: new session request", qPrintable(m_name)); QUrl url(m_scrobblerUrl + "?"); url.setPort(m_scrobblerUrl.startsWith("https") ? 443 : 80); - url.addQueryItem("api_key", API_KEY); - url.addQueryItem("method", "auth.getSession"); - url.addQueryItem("token", m_token); + QUrlQuery q; + q.addQueryItem("api_key", API_KEY); + q.addQueryItem("method", "auth.getSession"); + q.addQueryItem("token", m_token); QByteArray data; data.append("api_key" API_KEY); data.append("methodauth.getSession"); data.append("token" + m_token.toUtf8()); data.append(SECRET); - url.addQueryItem("api_sig", QCryptographicHash::hash(data, QCryptographicHash::Md5).toHex()); + q.addQueryItem("api_sig", QCryptographicHash::hash(data, QCryptographicHash::Md5).toHex()); + url.setQuery(q); QNetworkRequest request(url); request.setRawHeader("User-Agent", m_ua); @@ -466,7 +471,7 @@ void ScrobblerAuth::checkSession(const QString &session) QUrl url(m_scrobblerUrl); url.setPort(m_scrobblerUrl.startsWith("https") ? 443 : 80); - QUrl body(""); + QUrlQuery body(""); QByteArray data; foreach (QString key, params.keys()) { @@ -475,7 +480,7 @@ void ScrobblerAuth::checkSession(const QString &session) } data.append(SECRET); body.addQueryItem("api_sig", QCryptographicHash::hash(data, QCryptographicHash::Md5).toHex()); - QByteArray bodyData = body.toEncoded().remove(0,1); + QByteArray bodyData = body.query(QUrl::FullyEncoded).toUtf8(); bodyData.replace("+", QUrl::toPercentEncoding("+")); QNetworkRequest request(url); diff --git a/src/plugins/General/scrobbler/scrobblercache.cpp b/src/plugins/General/scrobbler/scrobblercache.cpp index b6b1eec78..667079fdd 100644 --- a/src/plugins/General/scrobbler/scrobblercache.cpp +++ b/src/plugins/General/scrobbler/scrobblercache.cpp @@ -125,7 +125,7 @@ QList ScrobblerCache::load() while (!file.atEnd()) { - line = QString::fromUtf8(file.readLine().constData()).trimmed(); + line = QString::fromUtf8(file.readLine()).trimmed(); if ((s = line.indexOf("=")) < 0) continue; diff --git a/src/plugins/General/scrobbler/scrobblerfactory.cpp b/src/plugins/General/scrobbler/scrobblerfactory.cpp index 331e258bb..4cfced38c 100644 --- a/src/plugins/General/scrobbler/scrobblerfactory.cpp +++ b/src/plugins/General/scrobbler/scrobblerfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * + * Copyright (C) 2008-2012 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 "scrobblerhandler.h" #include "settingsdialog.h" @@ -61,5 +60,3 @@ QTranslator *ScrobblerFactory::createTranslator(QObject *parent) translator->load(QString(":/scrobbler_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(scrobbler, ScrobblerFactory) diff --git a/src/plugins/General/scrobbler/scrobblerfactory.h b/src/plugins/General/scrobbler/scrobblerfactory.h index 0d1ea8035..d41d674ca 100644 --- a/src/plugins/General/scrobbler/scrobblerfactory.h +++ b/src/plugins/General/scrobbler/scrobblerfactory.h @@ -32,6 +32,7 @@ class ScrobblerFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_bg.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_bg.ts index 643b43b04..4085244a2 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_bg.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_bg.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin - + About Scrobbler Plugin - + Qmmp AudioScrobbler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_cs.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_cs.ts index 301209963..07b039864 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_cs.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_cs.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Modul Scrobbler - + About Scrobbler Plugin O modulu Scrobbler - + Qmmp AudioScrobbler Plugin Modul Qmmp Scrobbler - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_de.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_de.ts index 18af65d2b..812558220 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_de.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_de.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Scrobbler-Modul - + About Scrobbler Plugin Über Scrobbler-Modul - + Qmmp AudioScrobbler Plugin Qmmp AudioScrobbler-Modul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_el.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_el.ts index 5a3d57ef4..96bf5fa42 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_el.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_el.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Πρόσθετο Scrobbler - + About Scrobbler Plugin Σχετικά με το πρόσθετο Scrobbler - + Qmmp AudioScrobbler Plugin Qmmp πρόσθετο AudioScrobbler - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_en.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_en.ts index 8e2abb88c..974476db3 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_en.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_en.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin - + About Scrobbler Plugin - + Qmmp AudioScrobbler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_es.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_es.ts index 921b7d6b2..b601cf556 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_es.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_es.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Módulo Scrobbler - + About Scrobbler Plugin Acerca del módulo Scrobbler - + Qmmp AudioScrobbler Plugin Módulo AudioScrobbler para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_fi.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_fi.ts index 01c112fee..24ff62c5b 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_fi.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_fi.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Scrobbler-liitännäinen - + About Scrobbler Plugin Tietoja - Scrobbler-liitännäinen - + Qmmp AudioScrobbler Plugin Qmmp:n AudioScrobbler-liitännäinen - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_fr.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_fr.ts index a82a3444b..17c8e0350 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_fr.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_fr.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Greffon AudioScrobbler - + About Scrobbler Plugin À propos du greffon AudioScrobbler - + Qmmp AudioScrobbler Plugin Greffon AudioScrobbler pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_gl_ES.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_gl_ES.ts index eb659460b..b9e66912f 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_gl_ES.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_gl_ES.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Engadido Scrobbler - + About Scrobbler Plugin Sobre o engadido Scrobbler - + Qmmp AudioScrobbler Plugin Engadio AudioScrobbler de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_he.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_he.ts index 071125077..e73194500 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_he.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_he.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin תוסף Scrobbler - + About Scrobbler Plugin אודות תוסף Scrobbler - + Qmmp AudioScrobbler Plugin תוסף AudioScrobbler של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_hu.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_hu.ts index 68a7080d9..8e2d89e64 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_hu.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_hu.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin - + About Scrobbler Plugin - + Qmmp AudioScrobbler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_id.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_id.ts index c1f25fdfb..a90c3d57f 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_id.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_id.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Plugin Scrobbler - + About Scrobbler Plugin Tentang Plugin Scrobbler - + Qmmp AudioScrobbler Plugin Plugin AudioScrobbler Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_it.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_it.ts index 43ae94dec..115db2846 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_it.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_it.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Modulo Scrobbler - + About Scrobbler Plugin Info sul modulo Scrobbler - + Qmmp AudioScrobbler Plugin Modulo AudioScrobbler per Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_ja.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_ja.ts index 86037b088..aab9cd90c 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_ja.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_ja.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Scrobbler プラグイン - + About Scrobbler Plugin Scrobbler プラグインについて - + Qmmp AudioScrobbler Plugin QMMP Scrobbler プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_kk.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_kk.ts index 665e5907d..a4785023d 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_kk.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_kk.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin - + About Scrobbler Plugin - + Qmmp AudioScrobbler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_lt.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_lt.ts index 68765f521..e858e2302 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_lt.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_lt.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Scrobbler įskiepis - + About Scrobbler Plugin Apie Scrobbler įskiepį - + Qmmp AudioScrobbler Plugin Qmmp AudioScrobbler įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_nl.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_nl.ts index f220b9b11..00b2cd118 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_nl.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_nl.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Scrobbler Module - + About Scrobbler Plugin Over de Scrobbler Module - + Qmmp AudioScrobbler Plugin AudioScrobbler Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_pl_PL.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_pl_PL.ts index 2a71657d4..40800818a 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_pl_PL.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_pl_PL.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Wtyczka Scrobbler - + About Scrobbler Plugin O wtyczce Scrobbler - + Qmmp AudioScrobbler Plugin Wtyczka AudioScrobbler dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_pt.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_pt.ts index b144a330d..ed8a4543a 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_pt.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_pt.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Suplemento Scrobbler - + About Scrobbler Plugin Sobre o suplemento Scrobbler - + Qmmp AudioScrobbler Plugin Suplemento Qmmp AudioScrobbler - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_pt_BR.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_pt_BR.ts index 6d884a52b..806bee3a8 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_pt_BR.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_pt_BR.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Plugin Scrobbler - + About Scrobbler Plugin Sobre o plugin Scrobbler - + Qmmp AudioScrobbler Plugin Plugin Qmmp AudioScrobbler - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_ru.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_ru.ts index 65743f423..e861f91b0 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_ru.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_ru.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Модуль scrobbler - + About Scrobbler Plugin О модуле Scrobbler - + Qmmp AudioScrobbler Plugin Модуль AudioScrobbler для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_sk.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_sk.ts index e8303e43a..300d6f8f6 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_sk.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_sk.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin - + About Scrobbler Plugin - + Qmmp AudioScrobbler Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_sr_BA.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_sr_BA.ts index 2ea3892f0..3e5159efe 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_sr_BA.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_sr_BA.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Скроблер - + About Scrobbler Plugin О прикључку за скробловање - + Qmmp AudioScrobbler Plugin Кумп прикључак за скробловање - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_sr_RS.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_sr_RS.ts index 5cc6c7239..1ac6f95cb 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_sr_RS.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_sr_RS.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Скроблер - + About Scrobbler Plugin О прикључку за скробловање - + Qmmp AudioScrobbler Plugin Кумп прикључак за скробловање - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_tr.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_tr.ts index 1c1328aa7..ed25f4ebd 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_tr.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_tr.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Scrobbler Eklentisi - + About Scrobbler Plugin Scrobbler Eklentisi Hakkında - + Qmmp AudioScrobbler Plugin Qmmp Scrobbler Eklentisi - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_uk_UA.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_uk_UA.ts index 4e7cbad2b..7df95b11a 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_uk_UA.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_uk_UA.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Модуль scrobbler - + About Scrobbler Plugin Про модуль Scrobbler - + Qmmp AudioScrobbler Plugin Модуль AudioScrobbler для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_CN.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_CN.ts index 7771f7f9c..a9c9d4495 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_CN.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_CN.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Scrobbler 插件 - + About Scrobbler Plugin 关于 Scrobbler 插件 - + Qmmp AudioScrobbler Plugin Qmmp Scrobbler 插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_TW.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_TW.ts index 9097809b6..b42dff169 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_TW.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_TW.ts @@ -4,22 +4,22 @@ ScrobblerFactory - + Scrobbler Plugin Scrobbler 外掛 - + About Scrobbler Plugin 關於 Scrobbler 外掛 - + Qmmp AudioScrobbler Plugin Qmmp Scrobbler 外掛 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/statusicon/CMakeLists.txt b/src/plugins/General/statusicon/CMakeLists.txt index 64942b72a..70ac8981f 100644 --- a/src/plugins/General/statusicon/CMakeLists.txt +++ b/src/plugins/General/statusicon/CMakeLists.txt @@ -1,20 +1,7 @@ project(libstatusicon) -# 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}/../../../ -) - # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -33,7 +20,7 @@ SET(libstatusicon_RCCS translations/translations.qrc images/tray_images.qrc) -QT4_ADD_RESOURCES(libstatusicon_RCC_SRCS ${libstatusicon_RCCS}) +QT5_ADD_RESOURCES(libstatusicon_RCC_SRCS ${libstatusicon_RCCS}) # user interface @@ -42,12 +29,12 @@ SET(libstatusicon_UIS settingsdialog.ui ) -QT4_WRAP_UI(libstatusicon_UIS_H ${libstatusicon_UIS}) +QT5_WRAP_UI(libstatusicon_UIS_H ${libstatusicon_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(statusicon MODULE ${libstatusicon_SRCS} ${libstatusicon_UIS_H} ${libstatusicon_RCC_SRCS}) add_dependencies(statusicon qmmpui libqmmp) -target_link_libraries(statusicon ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(statusicon Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS statusicon DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/statusicon/qmmptrayicon.cpp b/src/plugins/General/statusicon/qmmptrayicon.cpp index 4113b53a4..5667d8637 100644 --- a/src/plugins/General/statusicon/qmmptrayicon.cpp +++ b/src/plugins/General/statusicon/qmmptrayicon.cpp @@ -21,11 +21,12 @@ #include #include #include -#include +#include +#include #include #include "qmmptrayicon.h" -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 #include "statusiconpopupwidget.h" #endif @@ -41,19 +42,24 @@ QmmpTrayIcon::~QmmpTrayIcon() void QmmpTrayIcon::setToolTip(const QString &tip) { -#ifdef Q_WS_X11 - m_message = tip; - if(m_popupWidget) - showToolTip(); +#ifdef QMMP_WS_X11 + if(hasToolTipEvent()) + { + m_message = tip; + if(m_popupWidget) + showToolTip(); + } + else + QSystemTrayIcon::setToolTip(tip); #else QSystemTrayIcon::setToolTip(tip); #endif } -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 bool QmmpTrayIcon::event(QEvent *e) { - if (e->type() == QEvent::Wheel) + if (e->type() == QEvent::Wheel ) { wheelEvent((QWheelEvent *) e); e->accept(); @@ -68,6 +74,18 @@ bool QmmpTrayIcon::event(QEvent *e) return QSystemTrayIcon::event(e); } +bool QmmpTrayIcon::hasToolTipEvent() +{ + //checking for XEmbed system tray implementation + //only this implementation is able to send QHelpEvent + foreach (QWindow *w, qApp->allWindows()) + { + if(w->objectName() == "QSystemTrayIconSysWindow") + return true; + } + return false; +} + void QmmpTrayIcon::wheelEvent(QWheelEvent *e) { SoundCore::instance()->changeVolume(e->delta()/20); diff --git a/src/plugins/General/statusicon/qmmptrayicon.h b/src/plugins/General/statusicon/qmmptrayicon.h index 1aac4736d..220b59929 100644 --- a/src/plugins/General/statusicon/qmmptrayicon.h +++ b/src/plugins/General/statusicon/qmmptrayicon.h @@ -25,7 +25,7 @@ class QEvent; class QWheelEvent; -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 class StatusIconPopupWidget; #endif @@ -41,11 +41,13 @@ public: void setToolTip(const QString &tip); -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 private: bool event(QEvent *e); void wheelEvent(QWheelEvent *e); void showToolTip(); + + bool hasToolTipEvent(); QPointer m_popupWidget; QString m_message; #endif diff --git a/src/plugins/General/statusicon/settingsdialog.cpp b/src/plugins/General/statusicon/settingsdialog.cpp index ceab6b0dc..7754abc83 100644 --- a/src/plugins/General/statusicon/settingsdialog.cpp +++ b/src/plugins/General/statusicon/settingsdialog.cpp @@ -34,7 +34,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) m_ui.messageGroupBox->setChecked(settings.value("show_message",false).toBool()); m_ui.messageDelaySpinBox->setValue(settings.value("message_delay", 2000).toInt()); m_ui.niceTooltipGroupBox->setChecked(settings.value("show_tooltip", true).toBool()); -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 m_ui.niceTooltipDelaySpinBox->setValue(settings.value("tooltip_delay",2000).toInt()); m_ui.transparencySlider->setValue(settings.value("tooltip_transparency",0).toInt()); m_ui.coverSizeSlider->setValue(settings.value("tooltip_cover_size", 100).toInt()); @@ -64,7 +64,7 @@ void SettingsDialog::accept() settings.setValue("use_standard_icons", m_ui.standardIconsCheckBox->isChecked()); settings.setValue("show_tooltip", m_ui.niceTooltipGroupBox->isChecked()); settings.setValue("split_file_name", m_ui.niceTooltipSplitCheckBox->isChecked()); -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 settings.setValue("tooltip_delay", m_ui.niceTooltipDelaySpinBox->value()); settings.setValue("tooltip_transparency", m_ui.transparencySlider->value()); settings.setValue("tooltip_cover_size", m_ui.coverSizeSlider->value()); diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp index a34fa133c..f33e395e8 100644 --- a/src/plugins/General/statusicon/statusicon.cpp +++ b/src/plugins/General/statusicon/statusicon.cpp @@ -48,7 +48,7 @@ StatusIcon::StatusIcon(QObject *parent) : QObject(parent) m_useStandardIcons = settings.value("use_standard_icons",false).toBool(); m_showToolTip = settings.value("show_tooltip",true).toBool(); m_splitFileName = settings.value("split_file_name",true).toBool(); -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 m_toolTipTemplate = settings.value("tooltip_template", DEFAULT_TEMPLATE).toString(); #else m_toolTipTemplate = "%p%if(%p&%t, - ,)%t"; diff --git a/src/plugins/General/statusicon/statusiconfactory.cpp b/src/plugins/General/statusicon/statusiconfactory.cpp index 5c1f094fe..bdc5acb84 100644 --- a/src/plugins/General/statusicon/statusiconfactory.cpp +++ b/src/plugins/General/statusicon/statusiconfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * + * Copyright (C) 2008-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 "statusicon.h" #include "settingsdialog.h" #include "statusiconfactory.h" @@ -62,5 +61,3 @@ QTranslator *StatusIconFactory::createTranslator(QObject *parent) translator->load(QString(":/statusicon_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(statusicon, StatusIconFactory) diff --git a/src/plugins/General/statusicon/statusiconfactory.h b/src/plugins/General/statusicon/statusiconfactory.h index a310cfafe..af6f2ae92 100644 --- a/src/plugins/General/statusicon/statusiconfactory.h +++ b/src/plugins/General/statusicon/statusiconfactory.h @@ -33,6 +33,7 @@ class StatusIconFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/statusicon/statusiconpopupwidget.cpp b/src/plugins/General/statusicon/statusiconpopupwidget.cpp index e4442d742..11439ecd6 100644 --- a/src/plugins/General/statusicon/statusiconpopupwidget.cpp +++ b/src/plugins/General/statusicon/statusiconpopupwidget.cpp @@ -21,8 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 #include #include diff --git a/src/plugins/General/statusicon/statusiconpopupwidget.h b/src/plugins/General/statusicon/statusiconpopupwidget.h index a239ce162..7a9aaa7a4 100644 --- a/src/plugins/General/statusicon/statusiconpopupwidget.h +++ b/src/plugins/General/statusicon/statusiconpopupwidget.h @@ -24,8 +24,8 @@ #ifndef STATUSICONPOPUPWIDGET_H #define STATUSICONPOPUPWIDGET_H -#include -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 + #include #include #include diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_bg.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_bg.ts index 9ee5bfcb6..e576209c8 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_bg.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_bg.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin - + About Status Icon Plugin - + Qmmp Status Icon Plugin - + Written by: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_cs.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_cs.ts index c9fe8efd5..afc2c683e 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_cs.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_cs.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Modul stavové ikony - + About Status Icon Plugin O modulu stavové ikony - + Qmmp Status Icon Plugin Modul stavové ikony Qmmp - + Written by: Autoři: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_de.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_de.ts index a01e35267..0fe8f8e85 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_de.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_de.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Statussymbolmodul - + About Status Icon Plugin Über Statussymbolmodul - + Qmmp Status Icon Plugin Qmmp Statussymbolmodul - + Written by: Autor: - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_el.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_el.ts index 27a29808d..61e546063 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_el.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_el.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Πρόσθετου εικονιδίου κατάστασης - + About Status Icon Plugin Σχετικά με το πρόσθετο εικονιδίου κατάστασης - + Qmmp Status Icon Plugin Qmmp πρόσθετο εικονιδίου κατάστασης - + Written by: Γράφτηκε από: - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_en.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_en.ts index c22bf1afb..5065f2bf4 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_en.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_en.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin - + About Status Icon Plugin - + Qmmp Status Icon Plugin - + Written by: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_es.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_es.ts index 3f728ed63..140207868 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_es.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_es.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Módulo de icono de estado - + About Status Icon Plugin Acerca del módulo de icono de estado - + Qmmp Status Icon Plugin Módulo de icono de estado para Qmmp - + Written by: Escrito por: - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_fi.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_fi.ts index 4fd5c17bb..24809a3de 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_fi.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_fi.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin - + About Status Icon Plugin - + Qmmp Status Icon Plugin - + Written by: Toteutus: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_fr.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_fr.ts index b03304fbb..f72a4caac 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_fr.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_fr.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Greffon d'icône de statut - + About Status Icon Plugin À propos du greffon d'icône de statut - + Qmmp Status Icon Plugin Greffon d'icône de statut pour Qmmp - + Written by: Écrit par : - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_gl_ES.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_gl_ES.ts index 517f4cfc5..dc2de44d8 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_gl_ES.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_gl_ES.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Engadido icona de estado - + About Status Icon Plugin Sobre o engadido icona de estado - + Qmmp Status Icon Plugin Engadido icona de estado de Qmmp - + Written by: Escrito por: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_he.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_he.ts index 732a5e3a9..34d7ecbb1 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_he.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_he.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin תוסף סמל מצב - + About Status Icon Plugin אודות תוסף סמל מצב - + Qmmp Status Icon Plugin תוסף סמל מצב של Qmmp - + Written by: חובר על ידי: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_hu.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_hu.ts index 7e84580b5..373d5ae25 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_hu.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_hu.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin - + About Status Icon Plugin - + Qmmp Status Icon Plugin - + Written by: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_id.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_id.ts index 976a861c0..b01db32b7 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_id.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_id.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Plugin Icon Status - + About Status Icon Plugin Tentang Plugin Icon Status - + Qmmp Status Icon Plugin Plugin Icon Status Qmmp - + Written by: Ditulis oleh: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_it.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_it.ts index 19ed588c5..dc7359602 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_it.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_it.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Modulo icona di stato - + Qmmp Status Icon Plugin Modulo icona di stato per Qmmp - + Written by: Autori: - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> - + About Status Icon Plugin Info sul modulo icona di stato diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_ja.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_ja.ts index 0f326fb12..c9858a9d5 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_ja.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_ja.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin 状況アイコンプラグイン - + About Status Icon Plugin 状況アイコンプラグインについて - + Qmmp Status Icon Plugin QMMP 状況アイコンプラグイン - + Written by: 制作: - + Ilya Kotov <forkotov02@ya.ru> Илья Котов (Ilya Kotov) <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_kk.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_kk.ts index b3e63ad8a..69039ab74 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_kk.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_kk.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin - + About Status Icon Plugin - + Qmmp Status Icon Plugin - + Written by: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_lt.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_lt.ts index d152eb395..5977067a7 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_lt.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_lt.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Status Icon įskiepis - + About Status Icon Plugin Apie Status Icon įskiepį - + Qmmp Status Icon Plugin Qmmp Status Icon įskiepis - + Written by: Sukūrė: - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_nl.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_nl.ts index 416d3e74d..1dbf43229 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_nl.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_nl.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Status Icoon Module - + Qmmp Status Icon Plugin Status Icoon Module voor Qmmp - + Written by: Auteur: - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> - + About Status Icon Plugin Over de Status Icoon Module diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_pl_PL.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_pl_PL.ts index 6350a8f0c..6b247993b 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_pl_PL.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_pl_PL.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Wtyczka Ikona Statusu - + About Status Icon Plugin O Wtyczce Ikona Statusu - + Qmmp Status Icon Plugin Wtyczka Ikona Statusu dla Qmmp - + Written by: Napisana przez: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_pt.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_pt.ts index 7e00dafbb..b51f16523 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_pt.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_pt.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Suplemento Status Icon - + About Status Icon Plugin Sobre o suplemento Status Icon - + Qmmp Status Icon Plugin Suplemento QMMP Status Icon - + Written by: Desenvolvido por: - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_pt_BR.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_pt_BR.ts index d172f9b70..0b3cd43c6 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_pt_BR.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_pt_BR.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Plugin Status Icon - + About Status Icon Plugin Sobre o plugin Status Icon - + Qmmp Status Icon Plugin Plugin QMMP Status Icon - + Written by: Desenvolvido por: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_ru.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_ru.ts index f1d7d015d..3733bf591 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_ru.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_ru.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Модуль Status Icon - + About Status Icon Plugin О модуле Status Icon - + Qmmp Status Icon Plugin Модуль Status Icon для Qmmp - + Written by: Разработчики: - + Ilya Kotov <forkotov02@ya.ru> Илья Котов <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_sk.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_sk.ts index b76b875f5..83df8a0f6 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_sk.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_sk.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin - + About Status Icon Plugin - + Qmmp Status Icon Plugin - + Written by: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_sr_BA.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_sr_BA.ts index 25cedc9cb..9060d98cf 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_sr_BA.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_sr_BA.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Икона системске палете - + About Status Icon Plugin О прикључку за икону системске палете - + Qmmp Status Icon Plugin Кумп икона системске палете - + Written by: Аутори: - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_sr_RS.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_sr_RS.ts index 8b40d5c7c..0b98dd48c 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_sr_RS.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_sr_RS.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Икона системске палете - + About Status Icon Plugin О прикључку за икону системске палете - + Qmmp Status Icon Plugin Кумп икона системске палете - + Written by: Аутори: - + Ilya Kotov <forkotov02@ya.ru> Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_tr.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_tr.ts index 359071d93..02069ec5d 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_tr.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_tr.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Durum Simgesi Eklentisi - + About Status Icon Plugin Durum Simgesi Eklentisi Hakkında - + Qmmp Status Icon Plugin Qmmp Durum Simgesi Eklentisi - + Written by: - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_uk_UA.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_uk_UA.ts index 06e63510d..2ad22b898 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_uk_UA.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_uk_UA.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin Модуль Status Icon - + About Status Icon Plugin Про модуль Status Icon - + Qmmp Status Icon Plugin Модуль Status Icon для Qmmp - + Written by: Розробники: - + Ilya Kotov <forkotov02@ya.ru> Ілля Котов <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_zh_CN.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_zh_CN.ts index 31fe6f16e..a70c2d9d3 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_zh_CN.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_zh_CN.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin 状态图标插件 - + About Status Icon Plugin 关于状态图标插件 - + Qmmp Status Icon Plugin Qmmp 状态图标插件 - + Written by: 作者： - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_zh_TW.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_zh_TW.ts index 1e8245d58..644404cac 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_zh_TW.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_zh_TW.ts @@ -116,32 +116,32 @@ StatusIconFactory - + Status Icon Plugin 狀態圖像插件 - + About Status Icon Plugin 關於狀態圖像插件 - + Qmmp Status Icon Plugin Qmmp 狀態圖像插件 - + Written by: 作者： - + Ilya Kotov <forkotov02@ya.ru> - + Artur Guzik <a.guzik88@gmail.com> diff --git a/src/plugins/General/streambrowser/CMakeLists.txt b/src/plugins/General/streambrowser/CMakeLists.txt index a63b00e60..064525673 100644 --- a/src/plugins/General/streambrowser/CMakeLists.txt +++ b/src/plugins/General/streambrowser/CMakeLists.txt @@ -1,26 +1,7 @@ project(libstreambrowser) - -SET(QT_USE_QTNETWORK 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}/../../../ -) - # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -35,7 +16,7 @@ SET(libstreambrowser_SRCS SET(libstreambrowser_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libstreambrowser_RCC_SRCS ${libstreambrowser_RCCS}) +QT5_ADD_RESOURCES(libstreambrowser_RCC_SRCS ${libstreambrowser_RCCS}) # user interface @@ -43,12 +24,12 @@ SET(libstreambrowser_UIS streamwindow.ui ) -QT4_WRAP_UI(libstreambrowser_UIS_H ${libstreambrowser_UIS}) +QT5_WRAP_UI(libstreambrowser_UIS_H ${libstreambrowser_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(streambrowser MODULE ${libstreambrowser_SRCS} ${libstreambrowser_UIS_H} ${libstreambrowser_RCC_SRCS}) add_dependencies(streambrowser qmmpui) -target_link_libraries(streambrowser ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(streambrowser Qt5::Widgets Qt5::Network -lqmmpui -lqmmp) install(TARGETS streambrowser DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/streambrowser/streambrowserfactory.cpp b/src/plugins/General/streambrowser/streambrowserfactory.cpp index 182e3d414..8c4b53fbe 100644 --- a/src/plugins/General/streambrowser/streambrowserfactory.cpp +++ b/src/plugins/General/streambrowser/streambrowserfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2012-2016 by Ilya Kotov * + * Copyright (C) 2012 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 "streambrowser.h" #include "streambrowserfactory.h" @@ -61,5 +60,3 @@ QTranslator *StreamBrowserFactory::createTranslator(QObject *parent) translator->load(QString(":/streambrowser_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(streambrowser, StreamBrowserFactory) diff --git a/src/plugins/General/streambrowser/streambrowserfactory.h b/src/plugins/General/streambrowser/streambrowserfactory.h index aac26dd09..fcaba574c 100644 --- a/src/plugins/General/streambrowser/streambrowserfactory.h +++ b/src/plugins/General/streambrowser/streambrowserfactory.h @@ -33,6 +33,7 @@ class StreamBrowserFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/streambrowser/streamwindow.cpp b/src/plugins/General/streambrowser/streamwindow.cpp index 7153abe48..c3132ed30 100644 --- a/src/plugins/General/streambrowser/streamwindow.cpp +++ b/src/plugins/General/streambrowser/streamwindow.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -59,7 +60,7 @@ StreamWindow::StreamWindow(QWidget *parent) : QWidget(parent) //icecast table ui.icecastTableView->setModel(m_iceCastFilterModel); ui.icecastTableView->verticalHeader()->setDefaultSectionSize(fontMetrics().height() + 3); - ui.icecastTableView->verticalHeader()->setResizeMode(QHeaderView::Fixed); + ui.icecastTableView->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed); ui.icecastTableView->setEditTriggers(QAbstractItemView::NoEditTriggers); ui.icecastTableView->setContextMenuPolicy(Qt::CustomContextMenu); connect(ui.icecastTableView, SIGNAL(customContextMenuRequested(QPoint)), @@ -77,7 +78,7 @@ StreamWindow::StreamWindow(QWidget *parent) : QWidget(parent) //favorites table ui.favoritesTableView->setModel(m_favoritesFilterModel); ui.favoritesTableView->verticalHeader()->setDefaultSectionSize(fontMetrics().height() + 3); - ui.favoritesTableView->verticalHeader()->setResizeMode(QHeaderView::Fixed); + ui.favoritesTableView->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed); ui.favoritesTableView->setEditTriggers(QAbstractItemView::NoEditTriggers); ui.favoritesTableView->setContextMenuPolicy(Qt::CustomContextMenu); connect(ui.favoritesTableView, SIGNAL(customContextMenuRequested(QPoint)), @@ -231,7 +232,7 @@ void StreamWindow::removeFromFavorites() { rows_to_remove.append(m_favoritesFilterModel->mapToSource(index).row()); } - qStableSort(rows_to_remove); + std::stable_sort(rows_to_remove.begin(), rows_to_remove.end()); int prev_row = -1; for(int i = rows_to_remove.count() - 1; i >= 0; i -= 1 ) { diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_bg.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_bg.ts index e5c53d93b..4cc86218e 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_bg.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_bg.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin - + About Stream Browser Plugin - + Qmmp Stream Browser Plugin - + This plugin allows one to add stream from IceCast stream directory - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -74,58 +74,58 @@ Update - - - - Name - - - Genre + Name - Bitrate + Genre + Bitrate + + + + + Format - + &Add to favorites - + &Add to playlist - + &Remove - + Done - + Error - + Receiving diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_cs.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_cs.ts index 7f0910d7f..e03567c12 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_cs.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_cs.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Modul prohlížeče proudů - + About Stream Browser Plugin O modulu prohlížeče proudů - + Qmmp Stream Browser Plugin Modul Qmmp na prohlížení proudů - + This plugin allows one to add stream from IceCast stream directory Tento modul umožňuje přidat proud z adresáře proudů IceCast - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Aktualizovat - - + + Name Název - - + + Genre Žánr - - + + Bitrate Datový tok - - + + Format Formát - + &Add to favorites Přidat k &oblíbeným - + &Add to playlist Přidat do &seznamu - + &Remove Odst&ranit - + Done Hotovo - + Error Chyba - + Receiving Příjímám diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_de.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_de.ts index 846526a62..d5d3f4019 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_de.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_de.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Stream-Browser-Modul - + About Stream Browser Plugin Über Stream-Browser-Modul - + Qmmp Stream Browser Plugin Qmmp Stream-Browser-Modul - + This plugin allows one to add stream from IceCast stream directory Dieses Modul ermöglicht das Hinzufügen von Streams aus dem IceCast-Streamverzeichnis - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Aktualisieren - - + + Name Name - - + + Genre Genre - - + + Bitrate Bitrate - - + + Format Format - + &Add to favorites Zu &den Favoriten hinzufügen - + &Add to playlist Zu&r Wiedergabeliste hinzufügen - + &Remove &Entfernen - + Done Fertig - + Error Fehler - + Receiving Daten werden empfangen diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_el.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_el.ts index 564286b6f..d4bb33bba 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_el.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_el.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Πρόσθετο περιηγητή ροών - + About Stream Browser Plugin Σχετικά με το πρόσθετο περιηγητή ροών - + Qmmp Stream Browser Plugin Qmmp πρόσθετο περιηγητή ροών - + This plugin allows one to add stream from IceCast stream directory Αυτό το πρόσθετο επιτρέπει την προσθήκη μιας ροής από τον κατάλογο ροών του IceCast - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> @@ -75,57 +75,57 @@ Ενημέρωση - - + + Name Όνομα - - + + Genre Είδος - - + + Bitrate Ρυθμός bit - - + + Format Μορφή - + &Add to favorites &Προσθήκη στα προτιμώμενα - + &Add to playlist Προσθήκη στη &λίστα αναπαραγωγής - + &Remove &Αφαίρεση - + Done Έγινε - + Error Σφάλμα - + Receiving Γίνεται λήψη diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_en.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_en.ts index 63aaea510..597d77e9a 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_en.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_en.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin - + About Stream Browser Plugin - + Qmmp Stream Browser Plugin - + This plugin allows one to add stream from IceCast stream directory - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -74,58 +74,58 @@ Update - - - - Name - - - Genre + Name - Bitrate + Genre + Bitrate + + + + + Format - + &Add to favorites - + &Add to playlist - + &Remove - + Done - + Error - + Receiving diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_es.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_es.ts index eb8b3d229..fe64c5521 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_es.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_es.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Módulo Navegador de Flujos - + About Stream Browser Plugin Acerca de el Módulo Navegador de Flujos de Qmmp - + Qmmp Stream Browser Plugin Módulo Navegador de Flujos de Qmmp - + This plugin allows one to add stream from IceCast stream directory Este módulo permite a uno añadir flujos desde directorio de flujos de IceCast - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Actualizar - - + + Name Nombre - - + + Genre Género - - + + Bitrate Tasa de bits - - + + Format Formato - + &Add to favorites &Añadir a favoritos - + &Add to playlist &Añadir a lista de reproducción - + &Remove Quita&r - + Done Hecho - + Error Error - + Receiving Recibiendo diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_fi.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_fi.ts index d0450093c..cbda1558d 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_fi.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_fi.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin - + About Stream Browser Plugin - + Qmmp Stream Browser Plugin - + This plugin allows one to add stream from IceCast stream directory - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Päivitä - - + + Name Nimi - - + + Genre Tyylilaji - - + + Bitrate Bittinopeus - - + + Format - + &Add to favorites &Lisää suosikkeihin - + &Add to playlist &Lisää soittolistaan - + &Remove Poi&sta - + Done Valmis - + Error Virhe - + Receiving Vastaanotetaan diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_fr.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_fr.ts index ae6ec52ca..5292fec47 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_fr.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_fr.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Greffon de navigation de flux - + About Stream Browser Plugin À propos du greffon de navigation de flux - + Qmmp Stream Browser Plugin Greffon de navigation de flux pour Qmmp - + This plugin allows one to add stream from IceCast stream directory Ce greffon permet d'ajouter un flux depuis un annuaire de flux IceCast - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Mettre à jour - - + + Name Nom - - + + Genre Genre - - + + Bitrate Débit binaire - - + + Format Format - + &Add to favorites &Ajouter aux favoris - + &Add to playlist Ajouter à la liste - + &Remove &Enlever - + Done Fait - + Error Erreur - + Receiving Réception diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_gl_ES.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_gl_ES.ts index 4146f450c..033d6732b 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_gl_ES.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_gl_ES.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Engadido de buscador de fluxos - + About Stream Browser Plugin Sobre o engadido buscador de fluxos - + Qmmp Stream Browser Plugin Engadido buscador de fluxos de Qmmp - + This plugin allows one to add stream from IceCast stream directory Este engadido permite engadir fluxos dende o directorio de fluxos de IceCast - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Actualizar - - + + Name Nome - - + + Genre Xénero - - + + Bitrate Taxa de bits - - + + Format Formato - + &Add to favorites &Engadir a favoritos - + &Add to playlist &Engadir á lista de reprodución - + &Remove &Eliminar - + Done Feito - + Error Erro - + Receiving Recibindo diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_he.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_he.ts index b10cc7858..61bff4b74 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_he.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_he.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin תוסף Stream Browser - + About Stream Browser Plugin אודות תוסף Stream Browser - + Qmmp Stream Browser Plugin תוסף Stream Browser של Qmmp - + This plugin allows one to add stream from IceCast stream directory תוסף זה מתיר לך להוסיף זרם מתוך ספריית זרם IceCast - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ עדכן - - + + Name שם - - + + Genre ז׳אנר - - + + Bitrate שיעור סיביות - - + + Format פורמט - + &Add to favorites הוסף אל &מועדפים - + &Add to playlist הוסף אל &רשימת נגינה - + &Remove הס&ר - + Done סיום - + Error שגיאה - + Receiving קבלה diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_hu.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_hu.ts index 8ab7dcc29..0d80b659f 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_hu.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_hu.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin - + About Stream Browser Plugin - + Qmmp Stream Browser Plugin - + This plugin allows one to add stream from IceCast stream directory - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -74,58 +74,58 @@ Update - - - - Name - - - Genre + Name - Bitrate + Genre + Bitrate + + + + + Format - + &Add to favorites - + &Add to playlist - + &Remove - + Done - + Error - + Receiving diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_id.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_id.ts index 25295cbf7..1b71aa323 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_id.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_id.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Plugin Browser Stream - + About Stream Browser Plugin Tentang Browser Stream - + Qmmp Stream Browser Plugin Plugin Browser Stream Qmmp - + This plugin allows one to add stream from IceCast stream directory Plugin ini membolehkan untuk menambahkan stream dari direktori stream IceCast - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Perbarui - - + + Name Nama - - + + Genre Genre - - + + Bitrate Bitrate - - + + Format Format - + &Add to favorites &Tambah ke favorit - + &Add to playlist &Tambah ke daftarmain - + &Remove &Buang - + Done Kelar - + Error Galat - + Receiving Menerima diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_it.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_it.ts index f0fa53004..61f7533f8 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_it.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_it.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin - + About Stream Browser Plugin - + Qmmp Stream Browser Plugin - + This plugin allows one to add stream from IceCast stream directory - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> @@ -74,58 +74,58 @@ Update - - - - Name - - - Genre + Name - Bitrate + Genre + Bitrate + + + + + Format - + &Add to favorites - + &Add to playlist - + &Remove - + Done - + Error - + Receiving Ricezione diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_ja.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_ja.ts index a543bcab9..5ef9726b1 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_ja.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_ja.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin ストリームブラウザープラグイン - + About Stream Browser Plugin ストリームブラウザープラグインについて - + Qmmp Stream Browser Plugin QMMP ストリームブラウザープラグイン - + This plugin allows one to add stream from IceCast stream directory このプラグインで IceCast ストリームディレクトリーからストリームの取り込みが可能になります - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> @@ -75,57 +75,57 @@ 更新 - - + + Name 局名 - - + + Genre ジャンル - - + + Bitrate ビットレート - - + + Format 形式 - + &Add to favorites お気にいりに追加(&A) - + &Add to playlist プレイリストに追加(&P) - + &Remove 削除(&R) - + Done 完了 - + Error 事故 - + Receiving 取得中 diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_kk.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_kk.ts index 7fd931b9f..1a3f72c0a 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_kk.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_kk.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin - + About Stream Browser Plugin - + Qmmp Stream Browser Plugin - + This plugin allows one to add stream from IceCast stream directory - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -74,58 +74,58 @@ Update - - - - Name - - - Genre + Name - Bitrate + Genre + Bitrate + + + + + Format - + &Add to favorites - + &Add to playlist - + &Remove - + Done - + Error - + Receiving diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_lt.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_lt.ts index 200a88d5d..eb1062f5e 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_lt.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_lt.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Srautų naršyklės įskiepis - + About Stream Browser Plugin Apie srautų naršyklės įskiepį - + Qmmp Stream Browser Plugin Qmmp srautų naršyklės įskiepis - + This plugin allows one to add stream from IceCast stream directory Šis įskiepis leidžia įdėti IceCast srautus į grojaraštį - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Atnaujinti - - + + Name Pavadinimas - - + + Genre Žanras - - + + Bitrate Kokybė - - + + Format Formatas - + &Add to favorites &Įkelti į mėgstamus - + &Add to playlist &Įkelti į grojaraštį - + &Remove &Pašalinti - + Done Atlikta - + Error Klaida - + Receiving Gaunu diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_nl.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_nl.ts index 4310ffd34..62ad67421 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_nl.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_nl.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Radio Navigator Module - + About Stream Browser Plugin Over de Radio Navigator Module - + Qmmp Stream Browser Plugin Radio Navigator Module voor Qmmp - + This plugin allows one to add stream from IceCast stream directory Deze module faciliteert in het toevoegen van radiostations uit de IceCast verzameling - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Bijwerken - - + + Name Naam - - + + Genre - - + + Bitrate Bitsnelheid - - + + Format Formaat - + &Add to favorites &Voeg toe aan favorieten - + &Add to playlist &Voeg toe aan afspeellijst - + &Remove &Verwijder - + Done Klaar - + Error Fout - + Receiving Bezig met ontvangen diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_pl_PL.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_pl_PL.ts index 28b580aec..8b7f74c82 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_pl_PL.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_pl_PL.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Wtyczka Przeglądarka strumieni - + About Stream Browser Plugin O wtyczce Przeglądarka strumieni - + Qmmp Stream Browser Plugin Wtyczka Qmmp Przeglądarka strumieni - + This plugin allows one to add stream from IceCast stream directory Ta wtyczka pozwala dodawać strumienie z katalogu strumieni IceCast - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Aktualizuj - - + + Name Nazwa - - + + Genre Gatunek - - + + Bitrate Przepływność - - + + Format Format - + &Add to favorites &Dodaj do ulubionych - + &Add to playlist &Dodaj do listy odtwarzania - + &Remove &Usuń - + Done Gotowe - + Error Błąd - + Receiving Pobieranie diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_pt.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_pt.ts index 29a2fe263..04a186d2b 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_pt.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_pt.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Suplemento Stream Browser - + About Stream Browser Plugin Sobre o suplemento Stream Browser - + Qmmp Stream Browser Plugin Suplemento Qmmp Stream Browser - + This plugin allows one to add stream from IceCast stream directory Este suplemento permite a adição de emissões do diretório Icecast - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Atualizar - - + + Name Nome - - + + Genre Género - - + + Bitrate Taxa de dados - - + + Format Formato - + &Add to favorites &Adicionar às favoritas - + &Add to playlist A&dicionar à lista de reprodução - + &Remove &Remover - + Done Terminado - + Error Erro - + Receiving Receção diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_pt_BR.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_pt_BR.ts index c7ff4bd4c..26b53599c 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_pt_BR.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_pt_BR.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Plugin Stream Browser - + About Stream Browser Plugin Sobre o plugin Stream Browser - + Qmmp Stream Browser Plugin Plugin Qmmp Stream Browser - + This plugin allows one to add stream from IceCast stream directory Este plugin permite a adição de transmissões do diretório Icecast - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Atualizar - - + + Name Nome - - + + Genre Gênero - - + + Bitrate Taxa de dados - - + + Format Formato - + &Add to favorites &Adicionar às favoritas - + &Add to playlist A&dicionar à lista de reprodução - + &Remove &Remover - + Done Terminado - + Error Erro - + Receiving Recebendo diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_ru.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_ru.ts index f2810c7d2..3ee46de9f 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_ru.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_ru.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Модуль обзора потоков - + About Stream Browser Plugin О модуле обзора потоков - + Qmmp Stream Browser Plugin Модуль обзора потоков для Qmmp - + This plugin allows one to add stream from IceCast stream directory Этот модуль предназначен для добавления потоков из директории IceCast - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Обновить - - + + Name Имя - - + + Genre Жанр - - + + Bitrate Битовая частота - - + + Format Формат - + &Add to favorites &Добавить в избранное - + &Add to playlist &Добавить в список воспроизведения - + &Remove &Удалить - + Done Готово - + Error Ошибка - + Receiving Получение diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_sk.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_sk.ts index 154eaa945..36cbdcbbd 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_sk.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_sk.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin - + About Stream Browser Plugin - + Qmmp Stream Browser Plugin - + This plugin allows one to add stream from IceCast stream directory - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -74,58 +74,58 @@ Update - - - - Name - - - Genre + Name - Bitrate + Genre + Bitrate + + + + + Format - + &Add to favorites - + &Add to playlist - + &Remove - + Done - + Error - + Receiving diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_sr_BA.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_sr_BA.ts index a92e27eac..924cb4ea8 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_sr_BA.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_sr_BA.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Прегледач токова - + About Stream Browser Plugin О прегледачу токова - + Qmmp Stream Browser Plugin Кумп прегледач токова - + This plugin allows one to add stream from IceCast stream directory Функција додавања токова са АјсКаст директоријума токова - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Ажурирај - - + + Name име - - + + Genre жанр - - + + Bitrate битски проток - - + + Format формат - + &Add to favorites Додај у &омиљене - + &Add to playlist Додај у &листу нумера - + &Remove &Уклони - + Done Завршено - + Error Грешка - + Receiving Примање diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_sr_RS.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_sr_RS.ts index 2ca3fee7f..cf25e7ee2 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_sr_RS.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_sr_RS.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Прегледач токова - + About Stream Browser Plugin О прегледачу токова - + Qmmp Stream Browser Plugin Кумп прегледач токова - + This plugin allows one to add stream from IceCast stream directory Функција додавања токова са АјсКаст директоријума токова - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Ажурирај - - + + Name име - - + + Genre жанр - - + + Bitrate битски проток - - + + Format формат - + &Add to favorites Додај у &омиљене - + &Add to playlist Додај у &листу нумера - + &Remove &Уклони - + Done Завршено - + Error Грешка - + Receiving Примање diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_tr.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_tr.ts index 4a403e653..1d27f5354 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_tr.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_tr.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin - + About Stream Browser Plugin - + Qmmp Stream Browser Plugin - + This plugin allows one to add stream from IceCast stream directory - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> @@ -74,58 +74,58 @@ Update - - - - Name - - - Genre + Name - Bitrate + Genre + Bitrate + + + + + Format - + &Add to favorites - + &Add to playlist - + &Remove - + Done - + Error - + Receiving Alınıyor diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_uk_UA.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_uk_UA.ts index c768227dc..77e36a667 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_uk_UA.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_uk_UA.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin Модуль огляду потоків - + About Stream Browser Plugin Про модуль огляду потоків - + Qmmp Stream Browser Plugin Модуль огляду потоків для Qmmp - + This plugin allows one to add stream from IceCast stream directory Цей модуль дозволяє додавати потоки з каталогу IceCast - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> @@ -75,57 +75,57 @@ Оновити - - + + Name Ім'я - - + + Genre Жанр - - + + Bitrate Бітрейт - - + + Format Формат - + &Add to favorites &Додати до вибраного - + &Add to playlist &Додати до списку - + &Remove &Видалити - + Done Готово - + Error Помилка - + Receiving Отримання diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_CN.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_CN.ts index b8509bbf7..93cde669d 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_CN.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_CN.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin 媒体流浏览器插件 - + About Stream Browser Plugin 关于媒体流浏览器插件 - + Qmmp Stream Browser Plugin Qmmp媒体流浏览器插件 - + This plugin allows one to add stream from IceCast stream directory 此插件允许从IceCast媒体流文件夹向Qmmp中添加媒体流 - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ 更新 - - + + Name 名称 - - + + Genre 风格 - - + + Bitrate 比特率 - - + + Format 格式 - + &Add to favorites 添加到最爱清单(&A) - + &Add to playlist 添加到播放列表中(&A) - + &Remove 移除(&R) - + Done 完成 - + Error 错误 - + Receiving 接收中 diff --git a/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_TW.ts b/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_TW.ts index fa942d7c8..15ca48b85 100644 --- a/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_TW.ts +++ b/src/plugins/General/streambrowser/translations/streambrowser_plugin_zh_TW.ts @@ -17,27 +17,27 @@ StreamBrowserFactory - + Stream Browser Plugin - + About Stream Browser Plugin - + Qmmp Stream Browser Plugin - + This plugin allows one to add stream from IceCast stream directory - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> @@ -75,57 +75,57 @@ - - + + Name 名稱 - - + + Genre 流派 - - + + Bitrate 比特率 - - + + Format 格式 - + &Add to favorites - + &Add to playlist - + &Remove - + Done 完成 - + Error 錯誤 - + Receiving 接受 diff --git a/src/plugins/General/trackchange/CMakeLists.txt b/src/plugins/General/trackchange/CMakeLists.txt index bf52689a7..d47034de3 100644 --- a/src/plugins/General/trackchange/CMakeLists.txt +++ b/src/plugins/General/trackchange/CMakeLists.txt @@ -1,22 +1,7 @@ project(libtrackchange) -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}/../../../ -) - # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -31,19 +16,19 @@ SET(libtrackchange_SRCS SET(libtrackchange_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libtrackchange_RCC_SRCS ${libtrackchange_RCCS}) +QT5_ADD_RESOURCES(libtrackchange_RCC_SRCS ${libtrackchange_RCCS}) # user interface SET(libtrackchange_UIS settingsdialog.ui ) -QT4_WRAP_UI(libtrackchange_UIS_H ${libtrackchange_UIS}) +QT5_WRAP_UI(libtrackchange_UIS_H ${libtrackchange_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(trackchange MODULE ${libtrackchange_SRCS} ${libtrackchange_UIS_H} ${libtrackchange_RCC_SRCS}) add_dependencies(trackchange qmmpui) -target_link_libraries(trackchange ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(trackchange Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS trackchange DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/trackchange/trackchange.pro b/src/plugins/General/trackchange/trackchange.pro index 9dba6c5b9..f5b0264e1 100644 --- a/src/plugins/General/trackchange/trackchange.pro +++ b/src/plugins/General/trackchange/trackchange.pro @@ -1,22 +1,29 @@ include(../../plugins.pri) -TARGET = $$PLUGINS_PREFIX/General/trackchange +CONFIG += warn_on \ +plugin +TARGET =$$PLUGINS_PREFIX/General/trackchange +unix : QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libtrackchange.so + + +TEMPLATE = lib +unix : LIBS += -lqmmpui -lqmmp + +win32 : LIBS += -lqmmpui0 -lqmmp0 + +RESOURCES = translations/translations.qrc +unix { + target.path = $$LIB_DIR/qmmp/General + INSTALLS += target +} HEADERS += trackchangefactory.h \ trackchange.h \ settingsdialog.h +win32 : HEADERS += ../../../../src/qmmpui/general.h SOURCES += trackchangefactory.cpp \ trackchange.cpp \ settingsdialog.cpp FORMS += settingsdialog.ui - -RESOURCES = translations/translations.qrc - -LIBS += $$QMMPUI_LIB - -unix { - target.path = $$LIB_DIR/qmmp/General - INSTALLS += target -} diff --git a/src/plugins/General/trackchange/trackchangefactory.cpp b/src/plugins/General/trackchange/trackchangefactory.cpp index af8f125b7..dcbf6000b 100644 --- a/src/plugins/General/trackchange/trackchangefactory.cpp +++ b/src/plugins/General/trackchange/trackchangefactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2016 by Ilya Kotov * + * Copyright (C) 2013 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 "trackchange.h" #include "settingsdialog.h" #include "trackchangefactory.h" @@ -61,5 +60,3 @@ QTranslator *TrackChangeFactory::createTranslator(QObject *parent) translator->load(QString(":/trackchange_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(trackchange, TrackChangeFactory) diff --git a/src/plugins/General/trackchange/trackchangefactory.h b/src/plugins/General/trackchange/trackchangefactory.h index d42371431..482d973b6 100644 --- a/src/plugins/General/trackchange/trackchangefactory.h +++ b/src/plugins/General/trackchange/trackchangefactory.h @@ -32,6 +32,7 @@ class TrackChangeFactory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_bg.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_bg.ts index 03ffd67ef..aa475db3d 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_bg.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_bg.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin - + About Track Change Plugin - + Qmmp Track Change Plugin - + This plugin executes external command when current track is changed - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_cs.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_cs.ts index 64ac247e8..8ae1de127 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_cs.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_cs.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Modul změny stopy - + About Track Change Plugin O modulu změny stopy - + Qmmp Track Change Plugin Modul změny stopy Qmmp - + This plugin executes external command when current track is changed Tento modul při změně stopy spustí externí příkaz - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_de.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_de.ts index a878776f5..af2573465 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_de.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_de.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Titeländerungsmodul - + About Track Change Plugin Über Titeländerungsmodul - + Qmmp Track Change Plugin Qmmp Titeländerungsmodul - + This plugin executes external command when current track is changed Dieses Modul führt einen externen Befehl aus, wenn der aktuelle Titel geändert wird - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_el.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_el.ts index 50cc6ce03..3d45bd384 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_el.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_el.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Πρόσθετο αλλαγής κομματιού - + About Track Change Plugin Σχετικά με το πρόσθετο αλλαγής κομματιού - + Qmmp Track Change Plugin Qmmp πρόσθετο αλλαγής κομματιού - + This plugin executes external command when current track is changed Αυτό το πρόσθετο εκτελεί μια εξωτερική εντολή κατά την αλλαγή του τρέχοντος κομματιού - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_en.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_en.ts index 726b86ba6..d47c395b4 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_en.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_en.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin - + About Track Change Plugin - + Qmmp Track Change Plugin - + This plugin executes external command when current track is changed - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_es.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_es.ts index cb8e1c517..360cbe778 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_es.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_es.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Módulo de Cambio de Pista - + About Track Change Plugin Acerca del Módulo de Cambio de Pista - + Qmmp Track Change Plugin Módulo de Cambio de Pista de Qmmp - + This plugin executes external command when current track is changed Este módulo ejecuta programas externos de consola cuando la pista actual cambia - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_fi.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_fi.ts index 209e65c35..3a86905a8 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_fi.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_fi.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin - + About Track Change Plugin - + Qmmp Track Change Plugin - + This plugin executes external command when current track is changed - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_fr.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_fr.ts index 64a1d9171..eb9bae4b4 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_fr.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_fr.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Greffon de suivi de changements - + About Track Change Plugin À propos du greffon de suivi de changements - + Qmmp Track Change Plugin Greffon de suivi de changements pour Qmmp - + This plugin executes external command when current track is changed Ce greffon exécute des commandes externes quand le morceau courant change - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_gl_ES.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_gl_ES.ts index c23941169..0400b2750 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_gl_ES.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_gl_ES.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Engadido de Cambio de Pista - + About Track Change Plugin Sobre o engadido Cambio de Pista - + Qmmp Track Change Plugin Engadido Cambio de Pista de Qmmp - + This plugin executes external command when current track is changed Este engadido executa comandos externos cando se cambia de pista - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_he.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_he.ts index 3314fbe4f..d7d491eb2 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_he.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_he.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin תוסף שינוי רצועה - + About Track Change Plugin אודות תוסף שינוי רצועה - + Qmmp Track Change Plugin תוסף שינוי רצועה של Qmmp - + This plugin executes external command when current track is changed תוסף זה מבצע פקודה חיצונית כאשר רצועה נוכחית משתנה - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_hu.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_hu.ts index a3fef3dac..08a0e2d42 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_hu.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_hu.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin - + About Track Change Plugin - + Qmmp Track Change Plugin - + This plugin executes external command when current track is changed - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_id.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_id.ts index 7b3b3bed9..06910706f 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_id.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_id.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Plugin Perubahan Track - + About Track Change Plugin Tentang Plugin Perubahan Track - + Qmmp Track Change Plugin Plugin Perubahan Track Qmmp - + This plugin executes external command when current track is changed Plugin ini mengeksekusi perintah eksternal ketika track saat ini telah diubah - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_it.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_it.ts index e2f50ec20..e423eaf7f 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_it.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_it.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin - + About Track Change Plugin - + Qmmp Track Change Plugin - + This plugin executes external command when current track is changed - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_ja.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_ja.ts index 0e4d5cdf3..bab952c29 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_ja.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_ja.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin トラック変化プラグイン - + About Track Change Plugin トラック変化プラグインについて - + Qmmp Track Change Plugin QMMP トラック変化プラグイン - + This plugin executes external command when current track is changed このプラグインはトラック (演目) が切り換わる際に外部コマンドを実行します。 - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_kk.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_kk.ts index 1a86299e0..771a13910 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_kk.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_kk.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin - + About Track Change Plugin - + Qmmp Track Change Plugin - + This plugin executes external command when current track is changed - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_lt.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_lt.ts index 748f8614d..22f763aa9 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_lt.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_lt.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Takelio Pasikeitimo Įskiepis - + About Track Change Plugin Apie Takelio Pasikeitimo Įskiepį - + Qmmp Track Change Plugin Qmmp Takelio Pasikeitimo Įskiepis - + This plugin executes external command when current track is changed Šis įskiepis įvykdo išorinę komandą kai pasikeičia dabartinis takelis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė:Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_nl.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_nl.ts index 7f643440d..94c0cb3f0 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_nl.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_nl.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin - + About Track Change Plugin - + Qmmp Track Change Plugin - + This plugin executes external command when current track is changed - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_pl_PL.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_pl_PL.ts index 0c92824eb..7f540a135 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_pl_PL.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_pl_PL.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Wtyczka Zmiany Utworu - + About Track Change Plugin O wtyczce Zmiany Utworu - + Qmmp Track Change Plugin Wtyczka Zmiany Utworu dla Qmmp - + This plugin executes external command when current track is changed Uruchamia zewnętrzne polecenia przy zmianie utworu - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_pt.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_pt.ts index 2193ad270..fe91b1c95 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_pt.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_pt.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Suplemento Track Change - + About Track Change Plugin Sobre o suplemento Track Change - + Qmmp Track Change Plugin Suplemento Qmmp Track Change - + This plugin executes external command when current track is changed Este suplemento executa comandos externos se a faixa em reprodução for alterada - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_pt_BR.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_pt_BR.ts index 12419d42b..115707c42 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_pt_BR.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_pt_BR.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Plugin Track Change - + About Track Change Plugin Sobre o plugin Track Change - + Qmmp Track Change Plugin Plugin Qmmp Track Change - + This plugin executes external command when current track is changed Este plugin executa comandos externos se a faixa em reprodução for alterada - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_ru.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_ru.ts index 4e7411de2..f81fde9da 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_ru.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_ru.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Модуль смены трека - + About Track Change Plugin О модуле смены трека - + Qmmp Track Change Plugin Модуль смены трека для Qmmp - + This plugin executes external command when current track is changed Данный модуль предназначен для запуска внешней команды при смене текущего трека - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_sk.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_sk.ts index ae72d4185..107ab15a4 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_sk.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_sk.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin - + About Track Change Plugin - + Qmmp Track Change Plugin - + This plugin executes external command when current track is changed - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_sr_BA.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_sr_BA.ts index 9f0948fae..629d7260c 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_sr_BA.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_sr_BA.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Измјена нумере - + About Track Change Plugin О прикључку измјене нумере - + Qmmp Track Change Plugin Кумп прикључак измјене нумере - + This plugin executes external command when current track is changed Извршава спољашњу наредбу при измјени нумере - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_sr_RS.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_sr_RS.ts index 6c0341e2e..4a1ecb1b5 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_sr_RS.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_sr_RS.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Измена нумере - + About Track Change Plugin О прикључку измене нумере - + Qmmp Track Change Plugin Кумп прикључак измене нумере - + This plugin executes external command when current track is changed Извршава спољашњу наредбу при измени нумере - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_tr.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_tr.ts index e4e65e754..40c45febb 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_tr.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_tr.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin - + About Track Change Plugin - + Qmmp Track Change Plugin - + This plugin executes external command when current track is changed - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_uk_UA.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_uk_UA.ts index 6a8864031..b094a22bf 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_uk_UA.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_uk_UA.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin Модуль зміни треку - + About Track Change Plugin Про модуль зміни треку - + Qmmp Track Change Plugin Модуль зміни треку для Qmmp - + This plugin executes external command when current track is changed Цей модуль призначено для запуску зовнішньої команди при зміні поточного треку - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_zh_CN.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_zh_CN.ts index 34851a9f0..8732eb16e 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_zh_CN.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_zh_CN.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin 曲目变更插件 - + About Track Change Plugin 关于曲目变更插件 - + Qmmp Track Change Plugin Qmmp曲目变更插件 - + This plugin executes external command when current track is changed 该插件允许在当前曲目发生变化时执行外部命令 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/trackchange/translations/trackchange_plugin_zh_TW.ts b/src/plugins/General/trackchange/translations/trackchange_plugin_zh_TW.ts index c6dec1c38..3f0b9e8ac 100644 --- a/src/plugins/General/trackchange/translations/trackchange_plugin_zh_TW.ts +++ b/src/plugins/General/trackchange/translations/trackchange_plugin_zh_TW.ts @@ -40,27 +40,27 @@ TrackChangeFactory - + Track Change Plugin - + About Track Change Plugin - + Qmmp Track Change Plugin - + This plugin executes external command when current track is changed - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks/CMakeLists.txt b/src/plugins/General/udisks/CMakeLists.txt deleted file mode 100644 index d1538c184..000000000 --- a/src/plugins/General/udisks/CMakeLists.txt +++ /dev/null @@ -1,51 +0,0 @@ -project(libudisks) - - -SET (QT_USE_QTDBUS 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}) - -# libqmmpui & libqmmp -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) -link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) -link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) - -SET(libudisks_SRCS - udisksfactory.cpp - udisksmanager.cpp - udisksplugin.cpp - udisksdevice.cpp - settingsdialog.cpp -) - -SET(libudisks_RCCS translations/translations.qrc) - -QT4_ADD_RESOURCES(libudisks_RCC_SRCS ${libudisks_RCCS}) - -# user interface - -SET(libudisks_UIS - settingsdialog.ui -) - -QT4_WRAP_UI(libudisks_UIS_H ${libudisks_UIS}) -# Don't forget to include output directory, otherwise -# the UI file won't be wrapped! -include_directories(${CMAKE_CURRENT_BINARY_DIR}) - -ADD_LIBRARY(udisks MODULE ${libudisks_SRCS} ${libudisks_UIS_H} ${libudisks_RCC_SRCS}) -add_dependencies(udisks qmmpui) -target_link_libraries(udisks ${QT_LIBRARIES} qmmpui libqmmp) -install(TARGETS udisks DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/udisks/settingsdialog.cpp b/src/plugins/General/udisks/settingsdialog.cpp deleted file mode 100644 index 1d9b792a8..000000000 --- a/src/plugins/General/udisks/settingsdialog.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ -#include -#include - -#include - -#include "settingsdialog.h" - -SettingsDialog::SettingsDialog(QWidget *parent) - : QDialog(parent) -{ - ui.setupUi(this); - QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - settings.beginGroup("UDisks"); - ui.cdGroupBox->setChecked(settings.value("cda", true).toBool()); - ui.addTracksCheckBox->setChecked(settings.value("add_tracks", false).toBool()); - ui.removeTracksCheckBox->setChecked(settings.value("remove_tracks", false).toBool()); - ui.removableGroupBox->setChecked(settings.value("removable", true).toBool()); - ui.addFilesCheckBox->setChecked(settings.value("add_files", false).toBool()); - ui.removeFilesCheckBox->setChecked(settings.value("remove_files", false).toBool()); - settings.endGroup(); -} - - -SettingsDialog::~SettingsDialog() -{} - -void SettingsDialog::accept() -{ - QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - settings.beginGroup("UDisks"); - settings.setValue("cda", ui.cdGroupBox->isChecked()); - settings.setValue("add_tracks", ui.addTracksCheckBox->isChecked()); - settings.setValue("remove_tracks", ui.removeTracksCheckBox->isChecked()); - settings.setValue("removable", ui.removableGroupBox->isChecked()); - settings.setValue("add_files", ui.addFilesCheckBox->isChecked()); - settings.setValue("remove_files", ui.removeFilesCheckBox->isChecked()); - settings.endGroup(); - QDialog::accept(); -} diff --git a/src/plugins/General/udisks/settingsdialog.h b/src/plugins/General/udisks/settingsdialog.h deleted file mode 100644 index 5e7aa64c2..000000000 --- a/src/plugins/General/udisks/settingsdialog.h +++ /dev/null @@ -1,46 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ -#ifndef SETTINGSDIALOG_H -#define SETTINGSDIALOG_H - -#include - -#include "ui_settingsdialog.h" - -/** - @author Ilya Kotov -*/ -class SettingsDialog : public QDialog -{ -Q_OBJECT -public: - SettingsDialog(QWidget *parent = 0); - - ~SettingsDialog(); - - -public slots: - virtual void accept(); - -private: - Ui::SettingsDialog ui; -}; - -#endif diff --git a/src/plugins/General/udisks/settingsdialog.ui b/src/plugins/General/udisks/settingsdialog.ui deleted file mode 100644 index 5b039a88c..000000000 --- a/src/plugins/General/udisks/settingsdialog.ui +++ /dev/null @@ -1,122 +0,0 @@ - - - SettingsDialog - - - - 0 - 0 - 348 - 247 - - - - UDisks Plugin Settings - - - - 6 - - - 6 - - - 6 - - - - - CD Audio Detection - - - true - - - - - - Add tracks to playlist automatically - - - - - - - Remove tracks from playlist automatically - - - - - - - - - - Removable Device Detection - - - true - - - - - - Add files to playlist automatically - - - - - - - Remove files from playlist automatically - - - - - - - - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - SettingsDialog - accept() - - - 199 - 221 - - - 22 - 242 - - - - - buttonBox - rejected() - SettingsDialog - reject() - - - 247 - 225 - - - 273 - 229 - - - - - diff --git a/src/plugins/General/udisks/translations/translations.qrc b/src/plugins/General/udisks/translations/translations.qrc deleted file mode 100644 index 46e648a9a..000000000 --- a/src/plugins/General/udisks/translations/translations.qrc +++ /dev/null @@ -1,32 +0,0 @@ - - - - udisks_plugin_ru.qm - udisks_plugin_uk_UA.qm - udisks_plugin_zh_CN.qm - udisks_plugin_zh_TW.qm - udisks_plugin_tr.qm - udisks_plugin_cs.qm - udisks_plugin_pt_BR.qm - udisks_plugin_pt.qm - udisks_plugin_de.qm - udisks_plugin_pl_PL.qm - udisks_plugin_fr.qm - udisks_plugin_it.qm - udisks_plugin_kk.qm - udisks_plugin_lt.qm - udisks_plugin_hu.qm - udisks_plugin_nl.qm - udisks_plugin_ja.qm - udisks_plugin_sk.qm - udisks_plugin_es.qm - udisks_plugin_he.qm - udisks_plugin_gl_ES.qm - udisks_plugin_sr_BA.qm - udisks_plugin_sr_RS.qm - udisks_plugin_bg.qm - udisks_plugin_el.qm - udisks_plugin_id.qm - udisks_plugin_fi.qm - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_bg.ts b/src/plugins/General/udisks/translations/udisks_plugin_bg.ts deleted file mode 100644 index 8b2eea312..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_bg.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - - - - - CD Audio Detection - - - - - Add tracks to playlist automatically - - - - - Remove tracks from playlist automatically - - - - - Removable Device Detection - - - - - Add files to playlist automatically - - - - - Remove files from playlist automatically - - - - - UDisksFactory - - - UDisks Plugin - - - - - About UDisks Plugin - - - - - Qmmp UDisks Plugin - - - - - This plugin provides removable devices detection using UDisks - - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - - - - - Add Volume "%1" - - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_cs.ts b/src/plugins/General/udisks/translations/udisks_plugin_cs.ts deleted file mode 100644 index 1f96a2cb4..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_cs.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Nastavení modulu UDisks - - - - CD Audio Detection - Detekce zvukových CD - - - - Add tracks to playlist automatically - Automaticky přidat stopy do seznamu skladeb - - - - Remove tracks from playlist automatically - Automaticky odebrat stopy ze seznamu skladeb - - - - Removable Device Detection - Detekce odpojitelných zařízení - - - - Add files to playlist automatically - Automaticky přidat soubory do seznamu skladeb - - - - Remove files from playlist automatically - Automaticky odebrat stopy ze seznamu skladeb - - - - UDisksFactory - - - UDisks Plugin - Modul UDisks - - - - About UDisks Plugin - O modulu UDisks - - - - Qmmp UDisks Plugin - Modul Qmmp UDisks - - - - This plugin provides removable devices detection using UDisks - Tento modul poskytuje detekci výměnných médií pomocí UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - Přidat CD „%1“ - - - - Add Volume "%1" - Přidat svazek „%1“ - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_de.ts b/src/plugins/General/udisks/translations/udisks_plugin_de.ts deleted file mode 100644 index eb44b7a38..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_de.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Einstellungen UDisks-Modul - - - - CD Audio Detection - CD-Audio-Erkennung - - - - Add tracks to playlist automatically - Titel automatisch zur Wiedergabeliste hinzufügen - - - - Remove tracks from playlist automatically - Titel automatisch von der Wiedergabeliste entfernen - - - - Removable Device Detection - Wechsellaufwerkerkennung - - - - Add files to playlist automatically - Dateien automatisch zur Wiedergabeliste hinzufügen - - - - Remove files from playlist automatically - Dateien automatisch von der Wiedergabeliste entfernen - - - - UDisksFactory - - - UDisks Plugin - UDisks-Modul - - - - About UDisks Plugin - Über UDisks-Modul - - - - Qmmp UDisks Plugin - Qmmp UDisks-Modul - - - - This plugin provides removable devices detection using UDisks - Dieses Modul bietet Wechsellaufwerkerkennung unter Verwendung von UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Geschrieben von: Ilya Kotov <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - CD „%1“ hinzufügen - - - - Add Volume "%1" - Datenträger „%1“ hinzufügen - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_el.ts b/src/plugins/General/udisks/translations/udisks_plugin_el.ts deleted file mode 100644 index 1572ba5b2..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_el.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Ρυθμίσεις πρόσθετου UDisks - - - - CD Audio Detection - Ανίχνευση CD ήχου - - - - Add tracks to playlist automatically - Προσθήκη των κομματιών αυτόματα στη λίστα αναπαραγωγής - - - - Remove tracks from playlist automatically - Αφαίρεση των κομματιών αυτόματα από τη λίστα αναπαραγωγής - - - - Removable Device Detection - Ανίχνευση αφαιρούμενης συσκευής - - - - Add files to playlist automatically - Προσθήκη αρχείων αυτόματα στη λίστα αναπαραγωγής - - - - Remove files from playlist automatically - Αφαίρεση των αρχείων από τη λίστα αναπαραγωγής αυτόματα - - - - UDisksFactory - - - UDisks Plugin - Πρόσθετο UDisks - - - - About UDisks Plugin - Σχετικά με το πρόσθετο UDisks - - - - Qmmp UDisks Plugin - Qmmp πρόσθετο UDisks - - - - This plugin provides removable devices detection using UDisks - Αυτό το πρόσθετο παρέχει την ανίχνευση αφαιρούμενων συσκευών μέσω UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> - - - - UDisksPlugin - - - Add CD "%1" - Προσθήκη CD «%1» - - - - Add Volume "%1" - Προσθήκη Έντασης «%1» - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_en.ts b/src/plugins/General/udisks/translations/udisks_plugin_en.ts deleted file mode 100644 index 49a76540e..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_en.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - - - - - CD Audio Detection - - - - - Add tracks to playlist automatically - - - - - Remove tracks from playlist automatically - - - - - Removable Device Detection - - - - - Add files to playlist automatically - - - - - Remove files from playlist automatically - - - - - UDisksFactory - - - UDisks Plugin - - - - - About UDisks Plugin - - - - - Qmmp UDisks Plugin - - - - - This plugin provides removable devices detection using UDisks - - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - - - - - Add Volume "%1" - - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_es.ts b/src/plugins/General/udisks/translations/udisks_plugin_es.ts deleted file mode 100644 index f77c942b4..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_es.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Configuración del módulo UDisks - - - - CD Audio Detection - Detección de audio CD - - - - Add tracks to playlist automatically - Añadir pistas a la lista de reproducción automáticamente - - - - Remove tracks from playlist automatically - Eliminar pistas de la lista de reproducción automáticamente - - - - Removable Device Detection - Detectar dispositivos extraibles - - - - Add files to playlist automatically - Añadir archivos a la lista de reproducción automáticamente - - - - Remove files from playlist automatically - Eliminar archivos de la lista de reproducción automáticamente - - - - UDisksFactory - - - UDisks Plugin - Módulo UDisks - - - - About UDisks Plugin - Acerca del módulo UDisks - - - - Qmmp UDisks Plugin - Módulo UDisks para Qmmp - - - - This plugin provides removable devices detection using UDisks - Este módulo detecta los dispositivos extraibles utilizando UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Escrito por: Ilya Kotov <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - Añadir CD "%1" - - - - Add Volume "%1" - Añadir volumen "%1" - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_fi.ts b/src/plugins/General/udisks/translations/udisks_plugin_fi.ts deleted file mode 100644 index 2ccace62b..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_fi.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - UDisks-liitännäisen asetukset - - - - CD Audio Detection - - - - - Add tracks to playlist automatically - - - - - Remove tracks from playlist automatically - - - - - Removable Device Detection - - - - - Add files to playlist automatically - - - - - Remove files from playlist automatically - - - - - UDisksFactory - - - UDisks Plugin - - - - - About UDisks Plugin - - - - - Qmmp UDisks Plugin - - - - - This plugin provides removable devices detection using UDisks - - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Toteuttanut: Ilya Kotov <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - Lisää CD "%1" - - - - Add Volume "%1" - - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_fr.ts b/src/plugins/General/udisks/translations/udisks_plugin_fr.ts deleted file mode 100644 index ac958df24..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_fr.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Configuration du greffon UDisks - - - - CD Audio Detection - Détection de CD audio - - - - Add tracks to playlist automatically - Ajouter automatiquement les pistes à la liste - - - - Remove tracks from playlist automatically - Enlever automatiquement les pistes de la liste - - - - Removable Device Detection - Détection de périphérique amovible - - - - Add files to playlist automatically - Ajouter automatiquement les fichiers à la liste - - - - Remove files from playlist automatically - Enlever automatiquement les fichiers à la liste - - - - UDisksFactory - - - UDisks Plugin - Greffon UDisks - - - - About UDisks Plugin - À propos du greffon UDisks - - - - Qmmp UDisks Plugin - Greffon UDisks pour Qmmp - - - - This plugin provides removable devices detection using UDisks - Ce greffon fournit une détection de périphériques amovibles en utilisant UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Écrit par : Ilya Kotov <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - Ajouter CD « %1 » - - - - Add Volume "%1" - Ajouter volume « %1 » - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_gl_ES.ts b/src/plugins/General/udisks/translations/udisks_plugin_gl_ES.ts deleted file mode 100644 index 1803d53cf..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_gl_ES.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Preferencias do engadido UDisks - - - - CD Audio Detection - Detección de CD de audio - - - - Add tracks to playlist automatically - Engadir pistas á lista de reprodución automaticamente - - - - Remove tracks from playlist automatically - Eliminar pistas da lista de reprodución automaticamente - - - - Removable Device Detection - Detección de dispositivos extraíbles - - - - Add files to playlist automatically - Engadir ficheiros á lista de reprodución automaticamente - - - - Remove files from playlist automatically - Eliminar ficheiros da lista de reprodución automaticamente - - - - UDisksFactory - - - UDisks Plugin - Engadido UDisks - - - - About UDisks Plugin - Sobre o engadido UDisks - - - - Qmmp UDisks Plugin - Engadido UDisks de Qmmp - - - - This plugin provides removable devices detection using UDisks - Este engadido provén detección de dispositivos extraíbles usando UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - Engadir CD "%1" - - - - Add Volume "%1" - Engadir volume "%1" - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_he.ts b/src/plugins/General/udisks/translations/udisks_plugin_he.ts deleted file mode 100644 index b5b597e45..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_he.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - הגדרות תוסף UDisks - - - - CD Audio Detection - איתור אוטומטי של תקליטור שמע - - - - Add tracks to playlist automatically - הוסף רצועות אוטומטית לתוך רשימת נגינה - - - - Remove tracks from playlist automatically - הסר רצועות אוטומטית מתוך רשימת נגינה - - - - Removable Device Detection - איתור התקנים נשלפים - - - - Add files to playlist automatically - הוסף קבצים אוטומטית לתוך רשימת נגינה - - - - Remove files from playlist automatically - הסר קבצים אוטומטית מתוך רשימת נגינה - - - - UDisksFactory - - - UDisks Plugin - תוסף UDisks - - - - About UDisks Plugin - אודות תוסף UDisks - - - - Qmmp UDisks Plugin - תוסף UDisks של Qmmp - - - - This plugin provides removable devices detection using UDisks - תוסף זה מספק איתור של התקנים נשלפים באמצעות UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - הוסף תקליטור "%1" - - - - Add Volume "%1" - הוסף כרך "%1" - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_hu.ts b/src/plugins/General/udisks/translations/udisks_plugin_hu.ts deleted file mode 100644 index 58d107042..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_hu.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - - - - - CD Audio Detection - - - - - Add tracks to playlist automatically - - - - - Remove tracks from playlist automatically - - - - - Removable Device Detection - - - - - Add files to playlist automatically - - - - - Remove files from playlist automatically - - - - - UDisksFactory - - - UDisks Plugin - - - - - About UDisks Plugin - - - - - Qmmp UDisks Plugin - - - - - This plugin provides removable devices detection using UDisks - - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - - - - - Add Volume "%1" - - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_id.ts b/src/plugins/General/udisks/translations/udisks_plugin_id.ts deleted file mode 100644 index 097294b2f..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_id.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Setelan Plugin UDisks - - - - CD Audio Detection - Deteksi Audio CD - - - - Add tracks to playlist automatically - Tambah track ke daftarmain secara otomatis - - - - Remove tracks from playlist automatically - Buang track dari daftarmain secara otomatis - - - - Removable Device Detection - Deteksi Perangkat Dapat-dilepas - - - - Add files to playlist automatically - Tambah file ke daftarmain secara otomatis - - - - Remove files from playlist automatically - Buang file dari daftarmain secara otomatis - - - - UDisksFactory - - - UDisks Plugin - Plugin UDisks - - - - About UDisks Plugin - Tentang Plugin UDisks - - - - Qmmp UDisks Plugin - Plugin UDisks Qmmp - - - - This plugin provides removable devices detection using UDisks - Plugin ini menyediakan deteksi perangkat dapat-dilepas menggunakan UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - Tambah CD "%1" - - - - Add Volume "%1" - Tambah Volume %1" - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_it.ts b/src/plugins/General/udisks/translations/udisks_plugin_it.ts deleted file mode 100644 index 529fa0a93..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_it.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - - - - - CD Audio Detection - Rilevamento CD Audio - - - - Add tracks to playlist automatically - Aggiungi automaticamente i titoli alla lista dei brani - - - - Remove tracks from playlist automatically - Rimuovi automaticamente i titoli dalla lista dei brani - - - - Removable Device Detection - Rilevamento dispositivi rimovibili - - - - Add files to playlist automatically - Aggiungi brani automaticamente alla lista - - - - Remove files from playlist automatically - Rimuovi automaticamente i brani dalla lista - - - - UDisksFactory - - - UDisks Plugin - - - - - About UDisks Plugin - - - - - Qmmp UDisks Plugin - - - - - This plugin provides removable devices detection using UDisks - - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Autore: Ilya Kotov <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - Aggiungi CD "%1" - - - - Add Volume "%1" - Aggiungi libreria "%1" - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_ja.ts b/src/plugins/General/udisks/translations/udisks_plugin_ja.ts deleted file mode 100644 index 7f39f6d7c..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_ja.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - UDisks プラグイン設定 - - - - CD Audio Detection - 音楽 CD 検知 - - - - Add tracks to playlist automatically - プレイリストにトラックを自動追加 - - - - Remove tracks from playlist automatically - プレイリストからトラックを自動除去 - - - - Removable Device Detection - 着脱可能なデバイスの検知 - - - - Add files to playlist automatically - プレイリストにファイルを自動追加 - - - - Remove files from playlist automatically - プレイリストからファイルを自動除去 - - - - UDisksFactory - - - UDisks Plugin - UDisks プラグイン - - - - About UDisks Plugin - UDisks プラグインについて - - - - Qmmp UDisks Plugin - QMMP UDisks プラグイン - - - - This plugin provides removable devices detection using UDisks - このプラグインは着脱可能なデバイスの検知を UDisks により行ないます - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - CD "%1" を追加 - - - - Add Volume "%1" - 量目 "%1" を追加 - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_kk.ts b/src/plugins/General/udisks/translations/udisks_plugin_kk.ts deleted file mode 100644 index 406d1a997..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_kk.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - - - - - CD Audio Detection - - - - - Add tracks to playlist automatically - - - - - Remove tracks from playlist automatically - - - - - Removable Device Detection - - - - - Add files to playlist automatically - - - - - Remove files from playlist automatically - - - - - UDisksFactory - - - UDisks Plugin - - - - - About UDisks Plugin - - - - - Qmmp UDisks Plugin - - - - - This plugin provides removable devices detection using UDisks - - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - - - - - Add Volume "%1" - - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_lt.ts b/src/plugins/General/udisks/translations/udisks_plugin_lt.ts deleted file mode 100644 index 76611afeb..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_lt.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Udisks įskiepio nustatymai - - - - CD Audio Detection - Audio CD aptikimas - - - - Add tracks to playlist automatically - Įdėti takelius į grojaraštį automatiškai - - - - Remove tracks from playlist automatically - Pašalinti takelius iš grojaraščio automatiškai - - - - Removable Device Detection - Išorinių įrenginių aptikimas - - - - Add files to playlist automatically - Įdėti takelius į grojaratį automatiškai - - - - Remove files from playlist automatically - Pašalinti takelius iš grojaraščio automatiškai - - - - UDisksFactory - - - UDisks Plugin - UDisks įskiepis - - - - About UDisks Plugin - Apie UDisks įskiepį - - - - Qmmp UDisks Plugin - Qmmp UDisks įskiepis - - - - This plugin provides removable devices detection using UDisks - Šis įskiepis suranda išorinius įrenginius - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Sukūrė: Ilya Kotov - - - - UDisksPlugin - - - Add CD "%1" - Pridėti CD "%1" - - - - Add Volume "%1" - Pridėti tomą "%1" - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_nl.ts b/src/plugins/General/udisks/translations/udisks_plugin_nl.ts deleted file mode 100644 index 98f393eec..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_nl.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - UDisks Module Instellingen - - - - CD Audio Detection - CD Audio Detectie - - - - Add tracks to playlist automatically - Voeg nummers automatisch toe aan speellijst - - - - Remove tracks from playlist automatically - Verwijder nummers automatisch uit afspeellijst - - - - Removable Device Detection - Detectie van Verwisselbare Stations - - - - Add files to playlist automatically - Voeg bestanden automatisch toe aan afspeellijst - - - - Remove files from playlist automatically - Verwijder bestanden automatisch uit afspeellijst - - - - UDisksFactory - - - UDisks Plugin - UDisks Module - - - - About UDisks Plugin - Over de Udisks Module - - - - Qmmp UDisks Plugin - UDisks Module voor Qmmp - - - - This plugin provides removable devices detection using UDisks - Deze module faciliteert de automatische detectie van verwisselbare media gebruikmakend van UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Auteur: Ilya Kotov <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - Voeg CD "%1" toe - - - - Add Volume "%1" - Voeg Station "%1" toe - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_pl_PL.ts b/src/plugins/General/udisks/translations/udisks_plugin_pl_PL.ts deleted file mode 100644 index c0488228c..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_pl_PL.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Ustawienia wtyczki UDisks - - - - CD Audio Detection - Detekcja płyt CD Audio - - - - Add tracks to playlist automatically - Automatycznie dodaj utwory do listy - - - - Remove tracks from playlist automatically - Automatycznie usuń utwory z listy - - - - Removable Device Detection - Detekcja urządzeń przenośnych - - - - Add files to playlist automatically - Automatycznie dodaj pliki do listy - - - - Remove files from playlist automatically - Automatycznie usuń pliki z listy - - - - UDisksFactory - - - UDisks Plugin - Wtyczka UDisks - - - - About UDisks Plugin - O wtyczce UDisks - - - - Qmmp UDisks Plugin - Wtyczka UDisks dla Qmmp - - - - This plugin provides removable devices detection using UDisks - Ta wtyczka umożliwia wykrywanie urządzeń przenośnych przy użyciu UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - Dodaj CD "%1" - - - - Add Volume "%1" - Dodaj urządzenie "%1" - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_pt.ts b/src/plugins/General/udisks/translations/udisks_plugin_pt.ts deleted file mode 100644 index fc4569f79..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_pt.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Definições - - - - CD Audio Detection - Deteção de CD áudio - - - - Add tracks to playlist automatically - Adicionar faixas à lista de reprodução - - - - Remove tracks from playlist automatically - Remover faixas da lista de reprodução - - - - Removable Device Detection - Deteção de discos amovíveis - - - - Add files to playlist automatically - Adicionar ficheiros à lista de reprodução - - - - Remove files from playlist automatically - Remover ficheiros da lista de reprodução - - - - UDisksFactory - - - UDisks Plugin - Suplemento UDisks - - - - About UDisks Plugin - Sobre o suplemento UDisks - - - - Qmmp UDisks Plugin - Suplemento Qmmp UDisks - - - - This plugin provides removable devices detection using UDisks - Este suplemento permite a deteção de discos amovíveis através do serviço UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - Adicionar CD %1 - - - - Add Volume "%1" - Adicionar volume %1 - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_pt_BR.ts b/src/plugins/General/udisks/translations/udisks_plugin_pt_BR.ts deleted file mode 100644 index a2dc15d7f..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_pt_BR.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Preferências do plugin UDisks - - - - CD Audio Detection - Detecção de áudio de CD - - - - Add tracks to playlist automatically - Adicionar faixas à lista de reprodução - - - - Remove tracks from playlist automatically - Remover faixas da lista de reprodução - - - - Removable Device Detection - Detecção de dispositivos removíveis - - - - Add files to playlist automatically - Adicionar arquivos à lista de reprodução - - - - Remove files from playlist automatically - Remover arquivos da lista de reprodução - - - - UDisksFactory - - - UDisks Plugin - Plugin UDisks - - - - About UDisks Plugin - Sobre o plugin UDisks - - - - Qmmp UDisks Plugin - Plugin Qmmp UDisks - - - - This plugin provides removable devices detection using UDisks - Este plugin permite a detecção de dispositivos removíveis através do serviço UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - Adicionar CD %1 - - - - Add Volume "%1" - Adicionar volume %1 - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_ru.ts b/src/plugins/General/udisks/translations/udisks_plugin_ru.ts deleted file mode 100644 index 4dd0816e2..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_ru.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Настройки модуля UDisks - - - - CD Audio Detection - Автоопределение аудио-CD - - - - Add tracks to playlist automatically - Автоматически добавлять треки в список - - - - Remove tracks from playlist automatically - Автоматически удалять треки из списка - - - - Removable Device Detection - Автоопределение съёмных устройств - - - - Add files to playlist automatically - Автоматически добавлять треки в список - - - - Remove files from playlist automatically - Автоматически удалять треки из списка - - - - UDisksFactory - - - UDisks Plugin - Модуль UDisks - - - - About UDisks Plugin - О модуле UDisks - - - - Qmmp UDisks Plugin - Модуль UDisks для Qmmp - - - - This plugin provides removable devices detection using UDisks - Этот модуль отслеживает съёмные устройства с помощью UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Разработчик: Илья Котов <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - Добавить CD "%1" - - - - Add Volume "%1" - Добавить том "%1" - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_sk.ts b/src/plugins/General/udisks/translations/udisks_plugin_sk.ts deleted file mode 100644 index 2060957bd..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_sk.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - - - - - CD Audio Detection - - - - - Add tracks to playlist automatically - - - - - Remove tracks from playlist automatically - - - - - Removable Device Detection - - - - - Add files to playlist automatically - - - - - Remove files from playlist automatically - - - - - UDisksFactory - - - UDisks Plugin - - - - - About UDisks Plugin - - - - - Qmmp UDisks Plugin - - - - - This plugin provides removable devices detection using UDisks - - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - - - - - Add Volume "%1" - - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_sr_BA.ts b/src/plugins/General/udisks/translations/udisks_plugin_sr_BA.ts deleted file mode 100644 index eda86012b..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_sr_BA.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Поставке за Удискс - - - - CD Audio Detection - Откривање музичког диска - - - - Add tracks to playlist automatically - Аутоматски додај нумере на листу - - - - Remove tracks from playlist automatically - Аутоматски уклони нумере са листе - - - - Removable Device Detection - Откривање уклоњивих уређаја - - - - Add files to playlist automatically - Аутоматски додај фајлове на листу - - - - Remove files from playlist automatically - Аутоматски уклони фајлове са листе - - - - UDisksFactory - - - UDisks Plugin - Удискс - - - - About UDisks Plugin - О прикључку за UDisks - - - - Qmmp UDisks Plugin - Кумп прикључак за UDisks - - - - This plugin provides removable devices detection using UDisks - Омогућује откривање уклоњивих уређаја користећи UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Аутор: Ilya Kotov <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - Додај диск „%1“ - - - - Add Volume "%1" - Додај складишни простор „%1“ - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_sr_RS.ts b/src/plugins/General/udisks/translations/udisks_plugin_sr_RS.ts deleted file mode 100644 index 2470efdc6..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_sr_RS.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Поставке за Удискс - - - - CD Audio Detection - Откривање музичког диска - - - - Add tracks to playlist automatically - Аутоматски додај нумере на листу - - - - Remove tracks from playlist automatically - Аутоматски уклони нумере са листе - - - - Removable Device Detection - Откривање уклоњивих уређаја - - - - Add files to playlist automatically - Аутоматски додај фајлове на листу - - - - Remove files from playlist automatically - Аутоматски уклони фајлове са листе - - - - UDisksFactory - - - UDisks Plugin - Удискс - - - - About UDisks Plugin - О прикључку за UDisks - - - - Qmmp UDisks Plugin - Кумп прикључак за UDisks - - - - This plugin provides removable devices detection using UDisks - Омогућује откривање уклоњивих уређаја користећи UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Аутор: Ilya Kotov <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - Додај диск „%1“ - - - - Add Volume "%1" - Додај складишни простор „%1“ - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_tr.ts b/src/plugins/General/udisks/translations/udisks_plugin_tr.ts deleted file mode 100644 index 3ae7e71ce..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_tr.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - - - - - CD Audio Detection - CD Ses Algılama - - - - Add tracks to playlist automatically - Parçaları listeye otomatik olarka ekle - - - - Remove tracks from playlist automatically - Parçaları listeden otomatik olarak kaldır - - - - Removable Device Detection - Çıkarılabilir Aygıt Algılama - - - - Add files to playlist automatically - Dosyaları listeye otomatik olarak ekle - - - - Remove files from playlist automatically - Dosyaları listeden otomatik olarak kaldır - - - - UDisksFactory - - - UDisks Plugin - - - - - About UDisks Plugin - - - - - Qmmp UDisks Plugin - - - - - This plugin provides removable devices detection using UDisks - - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Yazan: Ilya Kotov <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - CD "%1" Ekle - - - - Add Volume "%1" - "%1" Aygıtını Ekle - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_uk_UA.ts b/src/plugins/General/udisks/translations/udisks_plugin_uk_UA.ts deleted file mode 100644 index 6de558536..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_uk_UA.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - Налаштування модуля UDisks - - - - CD Audio Detection - Автовизначення аудіо-CD - - - - Add tracks to playlist automatically - Автоматично додавати треки до списку - - - - Remove tracks from playlist automatically - Автоматично видаляти треки зі списку - - - - Removable Device Detection - Виявлення змінних пристроїв - - - - Add files to playlist automatically - Автоматично додавати файли до списку - - - - Remove files from playlist automatically - Автоматично видаляти файли зі списку - - - - UDisksFactory - - - UDisks Plugin - Модуль UDisks - - - - About UDisks Plugin - Про модуль UDisks - - - - Qmmp UDisks Plugin - Модуль UDisks для Qmmp - - - - This plugin provides removable devices detection using UDisks - Цей модуль забезпечує виявлення знімних пристроїв за допомогою UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Розробник: Ілля Котов <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - Додати CD "%1" - - - - Add Volume "%1" - Додати том "%1" - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_zh_CN.ts b/src/plugins/General/udisks/translations/udisks_plugin_zh_CN.ts deleted file mode 100644 index ff3b12673..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_zh_CN.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - UDisks 插件设置 - - - - CD Audio Detection - CD 音频检测 - - - - Add tracks to playlist automatically - 自动添加音轨到播放列表 - - - - Remove tracks from playlist automatically - 自动从播放列表删除音轨 - - - - Removable Device Detection - 可移动设备检测 - - - - Add files to playlist automatically - 自动添加文件到播放列表 - - - - Remove files from playlist automatically - 自动从播放列表删除文件 - - - - UDisksFactory - - - UDisks Plugin - UDisks 插件 - - - - About UDisks Plugin - 关于 UDisks 插件 - - - - Qmmp UDisks Plugin - Qmmp UDisks 插件 - - - - This plugin provides removable devices detection using UDisks - 此插件依据可移动检测使用 UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - UDisksPlugin - - - Add CD "%1" - 添加 CD "%1" - - - - Add Volume "%1" - 添加卷 "%1" - - - diff --git a/src/plugins/General/udisks/translations/udisks_plugin_zh_TW.ts b/src/plugins/General/udisks/translations/udisks_plugin_zh_TW.ts deleted file mode 100644 index be5a34032..000000000 --- a/src/plugins/General/udisks/translations/udisks_plugin_zh_TW.ts +++ /dev/null @@ -1,83 +0,0 @@ - - - - - SettingsDialog - - - UDisks Plugin Settings - UDisks 插件設定 - - - - CD Audio Detection - CD 音頻檢測 - - - - Add tracks to playlist automatically - 自動添加音軌到播放清單 - - - - Remove tracks from playlist automatically - 自動從播放清單刪除音軌 - - - - Removable Device Detection - 可移動設備檢測 - - - - Add files to playlist automatically - 自動添加檔案到播放清單 - - - - Remove files from playlist automatically - 自動從播放清單刪除檔案 - - - - UDisksFactory - - - UDisks Plugin - UDisks 外掛 - - - - About UDisks Plugin - 關於 UDisks 外掛 - - - - Qmmp UDisks Plugin - Qmmp UDisks 外掛 - - - - This plugin provides removable devices detection using UDisks - 此插件基於可移動設備檢測來使用 UDisks - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - 作者：Ilya Kotov <forkotov02@ya.ru> - - - - UDisksPlugin - - - Add CD "%1" - 添加 CD "%1" - - - - Add Volume "%1" - 添加卷 "%1" - - - diff --git a/src/plugins/General/udisks/udisks.pro b/src/plugins/General/udisks/udisks.pro deleted file mode 100644 index e45c95554..000000000 --- a/src/plugins/General/udisks/udisks.pro +++ /dev/null @@ -1,26 +0,0 @@ -include(../../plugins.pri) - -TARGET = $$PLUGINS_PREFIX/General/udisks - -QT += dbus - -HEADERS += udisksfactory.h \ - udisksplugin.h \ - udisksmanager.h \ - udisksdevice.h \ - settingsdialog.h - -SOURCES += udisksfactory.cpp \ - udisksplugin.cpp \ - udisksmanager.cpp \ - udisksdevice.cpp \ - settingsdialog.cpp - -FORMS += settingsdialog.ui - -RESOURCES = translations/translations.qrc - -LIBS += $$QMMPUI_LIB - -target.path = $$LIB_DIR/qmmp/General -INSTALLS += target diff --git a/src/plugins/General/udisks/udisksdevice.cpp b/src/plugins/General/udisks/udisksdevice.cpp deleted file mode 100644 index d6d824e37..000000000 --- a/src/plugins/General/udisks/udisksdevice.cpp +++ /dev/null @@ -1,50 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#include -#include - -#include "udisksdevice.h" - - -UDisksDevice::UDisksDevice(QDBusObjectPath o, QObject *parent) - : QObject(parent) -{ - m_interface = new QDBusInterface("org.freedesktop.UDisks", o.path(), - "org.freedesktop.UDisks.Device", QDBusConnection::systemBus(), this); - m_interface->connection().connect("org.freedesktop.UDisks", o.path(), - "org.freedesktop.UDisks.Device","Changed", - this, SIGNAL(changed())); - m_path = o; -} - -QVariant UDisksDevice::property (const QString &key) -{ - return m_interface->property(key.toLatin1().data()); -} - -UDisksDevice::~UDisksDevice() -{ -} - -QDBusObjectPath UDisksDevice::objectPath() const -{ - return m_path; -} diff --git a/src/plugins/General/udisks/udisksdevice.h b/src/plugins/General/udisks/udisksdevice.h deleted file mode 100644 index f49b3bcc7..000000000 --- a/src/plugins/General/udisks/udisksdevice.h +++ /dev/null @@ -1,54 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ -#ifndef UDISKSDEVICE_H -#define UDISKSDEVICE_H - -#include -#include -#include -#include -#include - -class QDBusInterface; - -/** - @author Ilya Kotov -*/ -class UDisksDevice : public QObject -{ - Q_OBJECT -public: - UDisksDevice(QDBusObjectPath o, QObject *parent = 0); - - ~UDisksDevice(); - - QVariant property (const QString &key); - QDBusObjectPath objectPath() const; - -signals: - void changed(); - - -private: - QDBusInterface *m_interface; - QDBusObjectPath m_path; -}; - -#endif diff --git a/src/plugins/General/udisks/udisksfactory.cpp b/src/plugins/General/udisks/udisksfactory.cpp deleted file mode 100644 index 17684b8dc..000000000 --- a/src/plugins/General/udisks/udisksfactory.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#include -#include -#include -#include -#include "settingsdialog.h" -#include "udisksplugin.h" -#include "udisksfactory.h" - -const GeneralProperties UDisksFactory::properties() const -{ - GeneralProperties properties; - properties.name = tr("UDisks Plugin"); - properties.shortName = "udisks"; - properties.hasAbout = true; - properties.hasSettings = true; - properties.visibilityControl = false; - return properties; -} - -QObject *UDisksFactory::create(QObject *parent) -{ - return new UDisksPlugin(parent); -} - -QDialog *UDisksFactory::createConfigDialog(QWidget *parent) -{ - return new SettingsDialog(parent); -} - -void UDisksFactory::showAbout(QWidget *parent) -{ - QMessageBox::about (parent, tr("About UDisks Plugin"), - tr("Qmmp UDisks Plugin") + "\n" + - tr("This plugin provides removable devices detection using UDisks") + "\n" + - tr("Written by: Ilya Kotov ")); -} - -QTranslator *UDisksFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/udisks_plugin_") + locale); - return translator; -} - -Q_EXPORT_PLUGIN2(udisks, UDisksFactory) diff --git a/src/plugins/General/udisks/udisksfactory.h b/src/plugins/General/udisks/udisksfactory.h deleted file mode 100644 index 9a096f794..000000000 --- a/src/plugins/General/udisks/udisksfactory.h +++ /dev/null @@ -1,45 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ -#ifndef DEVDETECTFACTORY_H -#define DEVDETECTFACTORY_H - -/** - @author Ilya Kotov -*/ -#include -#include - -#include -#include - -class UDisksFactory : public QObject, public GeneralFactory -{ -Q_OBJECT -Q_INTERFACES(GeneralFactory) -public: - const GeneralProperties properties() const; - QObject *create(QObject *parent); - QDialog *createConfigDialog(QWidget *parent); - void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); - -}; - -#endif diff --git a/src/plugins/General/udisks/udisksmanager.cpp b/src/plugins/General/udisks/udisksmanager.cpp deleted file mode 100644 index 53025ed50..000000000 --- a/src/plugins/General/udisks/udisksmanager.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#include -#include -#include - -#include "udisksmanager.h" - -UDisksManager::UDisksManager(QObject *parent) - : QObject(parent) -{ - m_interface = new QDBusInterface("org.freedesktop.UDisks", "/org/freedesktop/UDisks", - "org.freedesktop.UDisks", QDBusConnection::systemBus(), this); - - m_interface->connection().connect("org.freedesktop.UDisks", "/org/freedesktop/UDisks", - "org.freedesktop.UDisks", "DeviceAdded", - this, SIGNAL(deviceAdded(QDBusObjectPath))); - - m_interface->connection().connect("org.freedesktop.UDisks", "/org/freedesktop/UDisks", - "org.freedesktop.UDisks", "DeviceRemoved", - this, SIGNAL(deviceRemoved(QDBusObjectPath))); - - m_interface->connection().connect("org.freedesktop.UDisks", "/org/freedesktop/UDisks", - "org.freedesktop.UDisks", "DeviceChanged", - this, SIGNAL(deviceChanged(QDBusObjectPath))); - -} - - -UDisksManager::~UDisksManager() -{ -} - -QList UDisksManager::findAllDevices() -{ - QDBusReply > reply = m_interface->call("EnumerateDevices"); - if (!reply.isValid()) - { - qWarning("UDisksManager: error: %s", qPrintable(reply.error().name())); - return QList(); - } - return reply.value(); -} diff --git a/src/plugins/General/udisks/udisksmanager.h b/src/plugins/General/udisks/udisksmanager.h deleted file mode 100644 index c109947a6..000000000 --- a/src/plugins/General/udisks/udisksmanager.h +++ /dev/null @@ -1,52 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ -#ifndef UDISKSMANAGER_H -#define UDISKSMANAGER_H - -#include -#include -#include - -class QDBusInterface; - -/** - @author Ilya Kotov -*/ -class UDisksManager : public QObject -{ -Q_OBJECT -public: - UDisksManager(QObject *parent = 0); - - ~UDisksManager(); - - QList findAllDevices(); - -signals: - void deviceAdded(QDBusObjectPath); - void deviceRemoved(QDBusObjectPath); - void deviceChanged(QDBusObjectPath); - -private: - QDBusInterface *m_interface; - -}; - -#endif diff --git a/src/plugins/General/udisks/udisksplugin.cpp b/src/plugins/General/udisks/udisksplugin.cpp deleted file mode 100644 index 22f5b1420..000000000 --- a/src/plugins/General/udisks/udisksplugin.cpp +++ /dev/null @@ -1,269 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010-2014 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "udisksdevice.h" -#include "udisksmanager.h" -#include "udisksplugin.h" - -UDisksPlugin::UDisksPlugin(QObject *parent) : QObject(parent) -{ - m_manager = new UDisksManager(this); - m_actions = new QActionGroup(this); - connect(m_manager,SIGNAL(deviceAdded(QDBusObjectPath)), SLOT(addDevice(QDBusObjectPath))); - connect(m_manager,SIGNAL(deviceChanged(QDBusObjectPath)), SLOT(addDevice(QDBusObjectPath))); - connect(m_manager,SIGNAL(deviceRemoved(QDBusObjectPath)), SLOT(removeDevice(QDBusObjectPath))); - connect(m_actions,SIGNAL(triggered (QAction *)), SLOT(processAction(QAction *))); - //load settings - QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - settings.beginGroup("UDisks"); - m_detectCDA = settings.value("cda", true).toBool(); - m_detectRemovable = settings.value("removable", true).toBool(); - m_addTracks = false; //do not load tracks on startup - m_addFiles = false; - //find existing devices - QList devs = m_manager->findAllDevices(); - foreach(QDBusObjectPath o, devs) - addDevice(o); - //load remaining settings - m_addTracks = settings.value("add_tracks", false).toBool(); - m_removeTracks = settings.value("remove_tracks", false).toBool(); - m_addFiles = settings.value("add_files", false).toBool(); - m_removeFiles = settings.value("remove_files", false).toBool(); - settings.endGroup(); -} - - -UDisksPlugin::~UDisksPlugin() -{ -} - -void UDisksPlugin::removeDevice(QDBusObjectPath o) -{ - foreach(UDisksDevice *device, m_devices) - { - if (device->objectPath() == o) - { - m_devices.removeAll(device); - delete device; - qDebug("UDisksPlugin: device \"%s\" removed", qPrintable(o.path())); - updateActions(); - break; - } - } -} - -void UDisksPlugin::addDevice(QDBusObjectPath o) -{ - foreach(UDisksDevice *device, m_devices) //is it already exists? - { - if (device->objectPath() == o) - return; - } - UDisksDevice *device = new UDisksDevice(o, this); - - //audio cd - if (device->property("DeviceIsOpticalDisc").toBool() && - device->property("OpticalDiscNumAudioTracks").toInt()) - { - if (m_detectCDA) - { - qDebug("UDisksPlugin: device \"%s\" added (cd audio)", qPrintable(o.path())); - m_devices << device; - connect(device, SIGNAL(changed()), SLOT(updateActions())); - updateActions(); - } - else - delete device; - return; - } - - // filter mounted partitions - if ((!device->property("DeviceIsPartition").toBool() || - device->property("DeviceIsSystemInternal").toBool()) && - !device->property("DeviceIsOpticalDisc").toBool()) - { - delete device; - return; - } - if (device->property("PartitionSize").toLongLong() < 40000000000LL && - (device->property("IdType").toString() == "vfat" || - device->property("IdType").toString() == "iso9660" || - device->property("IdType").toString() == "udf" || - device->property("IdType").toString() == "ext2")) - { - if (m_detectRemovable) - { - qDebug("UDisksPlugin: device \"%s\" added (removable)", qPrintable(o.path())); - m_devices << device; - updateActions(); - connect(device, SIGNAL(changed()), SLOT(updateActions())); - } - else - delete device; - return; - } - delete device; -} - -void UDisksPlugin::updateActions() -{ - // add action for cd audio or mounted volume - foreach(UDisksDevice *device, m_devices) - { - QString dev_path; - if (device->property("DeviceIsOpticalDisc").toBool() && - device->property("OpticalDiscNumAudioTracks").toInt()) //cd audio - dev_path = "cdda://" + device->property("DeviceFile").toString(); - else if (device->property("DeviceIsMounted").toBool()) //mounted volume - dev_path = device->property("DeviceMountPaths").toStringList()[0]; - else - continue; - - if (!findAction(dev_path)) - { - QAction *action = new QAction(this); - QString actionText; - if (device->property("DeviceIsOpticalDisc").toBool() - && device->property("OpticalDiscNumAudioTracks").toInt()) - actionText = QString(tr("Add CD \"%1\"")).arg(device->property("DeviceFile").toString()); - else - { - QString name = device->property("IdLabel").toString(); - if (name.isEmpty()) - name = dev_path; - actionText = QString(tr("Add Volume \"%1\"")).arg(name); - } - - if (device->property("DeviceIsOpticalDisc").toBool()) - { - if(device->property("IdType").toString() == "iso9660") - action->setIcon(qApp->style()->standardIcon(QStyle::SP_DriveDVDIcon)); - else - action->setIcon(qApp->style()->standardIcon(QStyle::SP_DriveCDIcon)); - } - else - action->setIcon(qApp->style()->standardIcon(QStyle::SP_DriveHDIcon)); - - action->setText(actionText); - action->setData(dev_path); - m_actions->addAction(action); - UiHelper::instance()->addAction(action, UiHelper::TOOLS_MENU); - addPath(dev_path); - } - } - // remove action if device is unmounted/removed - foreach(QAction *action, m_actions->actions ()) - { - if (!findDevice(action)) - { - m_actions->removeAction(action); - UiHelper::instance()->removeAction(action); - removePath(action->data().toString()); - action->deleteLater(); - } - } -} - -void UDisksPlugin::processAction(QAction *action) -{ - qDebug("UDisksPlugin: action triggered: %s", qPrintable(action->data().toString())); - QString path = action->data().toString(); - MediaPlayer::instance()->playListManager()->selectedPlayList()->add(path); -} - -QAction *UDisksPlugin::findAction(const QString &dev_path) -{ - foreach(QAction *action, m_actions->actions ()) - { - if (action->data().toString() == dev_path) - return action; - } - return 0; -} - -UDisksDevice *UDisksPlugin::findDevice(QAction *action) -{ - foreach(UDisksDevice *device, m_devices) - { - QString dev_path; - if (device->property("DeviceIsOpticalDisc").toBool() && - device->property("OpticalDiscNumAudioTracks").toInt()) - { - dev_path = "cdda://" + device->property("DeviceFile").toString(); - if (dev_path == action->data().toString()) - return device; - } - if (device->property("DeviceIsMounted").toBool()) - { - dev_path = device->property("DeviceMountPaths").toStringList()[0]; - if (dev_path == action->data().toString()) - return device; - } - } - return 0; -} - -void UDisksPlugin::addPath(const QString &path) -{ - PlayListModel *model = PlayListManager::instance()->selectedPlayList(); - - foreach(PlayListItem *item, model->items()) // Is it already exist? - { - if(item->isGroup()) - continue; - if (dynamic_cast(item)->url().startsWith(path)) - return; - } - - if (path.startsWith("cdda://") && m_addTracks) - { - PlayListManager::instance()->selectedPlayList()->add(path); - return; - } - else if (!path.startsWith("cdda://") && m_addFiles) - PlayListManager::instance()->selectedPlayList()->add(path); -} - -void UDisksPlugin::removePath(const QString &path) -{ - if ((path.startsWith("cdda://") && !m_removeTracks) || - (!path.startsWith("cdda://") && !m_removeFiles)) //process settings - return; - - PlayListModel *model = PlayListManager::instance()->selectedPlayList(); - - int i = 0; - while (model->count() > 0 && i < model->count()) - { - if (model->isTrack(i) && model->track(i)->url().startsWith(path)) - model->removeTrack(i); - else - ++i; - } -} diff --git a/src/plugins/General/udisks/udisksplugin.h b/src/plugins/General/udisks/udisksplugin.h deleted file mode 100644 index c463b33fe..000000000 --- a/src/plugins/General/udisks/udisksplugin.h +++ /dev/null @@ -1,65 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ -#ifndef UDISKSPLUGIN_H -#define UDISKSPLUGIN_H - -#include -#include - -class UDisksManager; -class UDisksDevice; -class QActionGroup; -class QAction; - -/** - @author Ilya Kotov -*/ - -class UDisksPlugin : public QObject -{ -Q_OBJECT -public: - UDisksPlugin(QObject *parent = 0); - - ~UDisksPlugin(); - -private slots: - void removeDevice(QDBusObjectPath); - void addDevice(QDBusObjectPath); - void processAction(QAction *action); - void updateActions(); - -private: - QAction *findAction(const QString &dev_path); - UDisksDevice *findDevice(QAction *action); - void addPath(const QString &path); - void removePath(const QString &path); - UDisksManager *m_manager; - QList m_devices; - QActionGroup *m_actions; - bool m_detectCDA; - bool m_addTracks; - bool m_removeTracks; - bool m_detectRemovable; - bool m_addFiles; - bool m_removeFiles; -}; - -#endif diff --git a/src/plugins/General/udisks2/CMakeLists.txt b/src/plugins/General/udisks2/CMakeLists.txt index bb12e48b2..a24c94e5f 100644 --- a/src/plugins/General/udisks2/CMakeLists.txt +++ b/src/plugins/General/udisks2/CMakeLists.txt @@ -1,19 +1,5 @@ project(libudisks2) -SET (QT_USE_QTDBUS 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}) # libqmmpui & libqmmp @@ -31,7 +17,7 @@ SET(libudisks2_SRCS SET(libudisks2_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libudisks2_RCC_SRCS ${libudisks2_RCCS}) +QT5_ADD_RESOURCES(libudisks2_RCC_SRCS ${libudisks2_RCCS}) # user interface @@ -39,12 +25,12 @@ SET(libudisks2_UIS settingsdialog.ui ) -QT4_WRAP_UI(libudisks2_UIS_H ${libudisks2_UIS}) +QT5_WRAP_UI(libudisks2_UIS_H ${libudisks2_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(udisks2 MODULE ${libudisks2_SRCS} ${libudisks2_UIS_H} ${libudisks2_RCC_SRCS}) add_dependencies(udisks2 qmmpui) -target_link_libraries(udisks2 ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(udisks2 Qt5::Widgets Qt5::DBus -lqmmpui -lqmmp) install(TARGETS udisks2 DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_bg.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_bg.ts index a8c9d09c3..765d15a72 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_bg.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_bg.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin - + About UDisks2 Plugin - + Qmmp UDisks2 Plugin - + This plugin provides removable devices detection using UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_cs.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_cs.ts index 44536607b..5654b8831 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_cs.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_cs.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Modul UDisks2 - + About UDisks2 Plugin O modulu UDisks2 - + Qmmp UDisks2 Plugin Modul Qmmp UDisks2 - + This plugin provides removable devices detection using UDisks2 Tento modul poskytuje detekci výměnných médií pomocí UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_de.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_de.ts index cd32c9d11..5e81135a4 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_de.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_de.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin UDisks2-Modul - + About UDisks2 Plugin Über UDisks2-Modul - + Qmmp UDisks2 Plugin Qmmp UDisks2-Modul - + This plugin provides removable devices detection using UDisks2 Dieses Modul bietet Wechsellaufwerkerkennung unter Verwendung von UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_el.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_el.ts index 0d51aee7b..1ae0e648c 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_el.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_el.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Πρόσθετο UDisks2 - + About UDisks2 Plugin Σχετικά με το πρόσθετο UDisks2 - + Qmmp UDisks2 Plugin Qmmp πρόσθετο UDisks2 - + This plugin provides removable devices detection using UDisks2 Αυτό το πρόσθετο παρέχει την ανίχνευση αφαιρούμενων συσκευών μέσω UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_en.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_en.ts index 9561978a9..4a74ace97 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_en.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_en.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin - + About UDisks2 Plugin - + Qmmp UDisks2 Plugin - + This plugin provides removable devices detection using UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_es.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_es.ts index c815dbe06..de68e2ff3 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_es.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_es.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Módulo UDisks2 - + About UDisks2 Plugin Acerca del Módulo UDisks2 - + Qmmp UDisks2 Plugin Módulo UDisks2 de Qmmp - + This plugin provides removable devices detection using UDisks2 Este módulo proporciona detección de dispositivos extraíbles mediante UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_fi.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_fi.ts index c74ffd367..c26a2075b 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_fi.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_fi.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin UDisks2-liitännäinen - + About UDisks2 Plugin - + Qmmp UDisks2 Plugin Qmmp:n UDisks2-liitännäinen - + This plugin provides removable devices detection using UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_fr.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_fr.ts index 77477d25f..67da21e68 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_fr.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_fr.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Greffon UDisks2 - + About UDisks2 Plugin À propos du greffon UDisks2 - + Qmmp UDisks2 Plugin Greffon UDisks2 pour Qmmp - + This plugin provides removable devices detection using UDisks2 Ce greffon fournit une détection de périphériques amovibles en utilisant UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_gl_ES.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_gl_ES.ts index cd506c367..2f1043041 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_gl_ES.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_gl_ES.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Engadido UDisks2 - + About UDisks2 Plugin Sobre o engadido UDisks2 - + Qmmp UDisks2 Plugin Engadido UDisks2 de Qmmp - + This plugin provides removable devices detection using UDisks2 Este engadido provén detección de dispositivos extraíbles usando UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_he.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_he.ts index df0d33f43..177175889 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_he.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_he.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin תוסף UDisks2 - + About UDisks2 Plugin אודות תוסף UDisks2 - + Qmmp UDisks2 Plugin תוסף UDisks2 של Qmmp - + This plugin provides removable devices detection using UDisks2 תוסף זה מספק איתור התקנים ברי הזזה באמצעות UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_hu.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_hu.ts index 6d30fbe49..e705d5801 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_hu.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_hu.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin - + About UDisks2 Plugin - + Qmmp UDisks2 Plugin - + This plugin provides removable devices detection using UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_id.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_id.ts index 988e79fec..d0b6ea52d 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_id.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_id.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Plugin UDisks - + About UDisks2 Plugin Tentang Plugin UDisks - + Qmmp UDisks2 Plugin Plugin UDisks Qmmp - + This plugin provides removable devices detection using UDisks2 Plugin ini menyediakan deteksi perangkat dapat-dilepas menggunakan UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_it.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_it.ts index 7b5b2e7a0..36193fb68 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_it.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_it.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin - + About UDisks2 Plugin - + Qmmp UDisks2 Plugin - + This plugin provides removable devices detection using UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_ja.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_ja.ts index 73598b9ad..46dc98772 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_ja.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_ja.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin UDisks2 プラグイン - + About UDisks2 Plugin UDisks2 プラグインについて - + Qmmp UDisks2 Plugin QMMP UDisks2 プラグイン - + This plugin provides removable devices detection using UDisks2 このプラグインは着脱可能なデバイスの検知を UDisks2 により行ないます - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_kk.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_kk.ts index ec49c5bb4..e4a2d48cc 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_kk.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_kk.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin - + About UDisks2 Plugin - + Qmmp UDisks2 Plugin - + This plugin provides removable devices detection using UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_lt.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_lt.ts index a5e2415a3..8faf69ee3 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_lt.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_lt.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin UDisks2 Įskiepis - + About UDisks2 Plugin Apie UDisks2 Įskiepį - + Qmmp UDisks2 Plugin Qmmp UDisks2 Įskiepis - + This plugin provides removable devices detection using UDisks2 Šis įskiepis aptinka prijungiamus įrenginius naudodamas UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_nl.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_nl.ts index f0bbc2e10..65727b53c 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_nl.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_nl.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin - + About UDisks2 Plugin - + Qmmp UDisks2 Plugin - + This plugin provides removable devices detection using UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_pl_PL.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_pl_PL.ts index 443fa10ee..b70384545 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_pl_PL.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_pl_PL.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Wtyczka UDisks2 - + About UDisks2 Plugin O wtyczce UDisks2 - + Qmmp UDisks2 Plugin Wtyczka UDisks2 dla Qmmp - + This plugin provides removable devices detection using UDisks2 Ta wtyczka pozwala na wykrywanie urządzeń przy użyciu UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_pt.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_pt.ts index 86a790e8a..8b621b9b9 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_pt.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_pt.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Suplemento UDisks2 - + About UDisks2 Plugin Sobre o suplemento UDisks2 - + Qmmp UDisks2 Plugin Suplemento Qmmp UDisks2 - + This plugin provides removable devices detection using UDisks2 Este suplemento permite a deteção de discos amovíveis através do serviço UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_pt_BR.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_pt_BR.ts index a6e07070b..59b82be01 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_pt_BR.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_pt_BR.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Plugin UDisks2 - + About UDisks2 Plugin Sobre o plugin UDisks2 - + Qmmp UDisks2 Plugin Plugin Qmmp UDisks2 - + This plugin provides removable devices detection using UDisks2 Este plugin permite a detecção de dispositivos removíveis através do serviço UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_ru.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_ru.ts index 101935a00..fb63634ac 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_ru.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_ru.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Модуль UDisks2 - + About UDisks2 Plugin О модуле UDisks2 - + Qmmp UDisks2 Plugin Модуль UDisks2 для Qmmp - + This plugin provides removable devices detection using UDisks2 Это модуль отслеживает съёмные устройства с помощью UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_sk.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_sk.ts index 735bd1324..7bb01457c 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_sk.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_sk.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin - + About UDisks2 Plugin - + Qmmp UDisks2 Plugin - + This plugin provides removable devices detection using UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_sr_BA.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_sr_BA.ts index b191e85e6..469b250ec 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_sr_BA.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_sr_BA.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Удискс2 - + About UDisks2 Plugin О прикључку за UDisks2 - + Qmmp UDisks2 Plugin Кумп прикључак за UDisks2 - + This plugin provides removable devices detection using UDisks2 Омогућује откривање уклоњивих уређаја користећи UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_sr_RS.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_sr_RS.ts index 9db721bca..d27eb3dcf 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_sr_RS.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_sr_RS.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Удискс2 - + About UDisks2 Plugin О прикључку за UDisks2 - + Qmmp UDisks2 Plugin Кумп прикључак за UDisks2 - + This plugin provides removable devices detection using UDisks2 Омогућује откривање уклоњивих уређаја користећи UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_tr.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_tr.ts index b6b699647..b484068b6 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_tr.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_tr.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin - + About UDisks2 Plugin - + Qmmp UDisks2 Plugin - + This plugin provides removable devices detection using UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_uk_UA.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_uk_UA.ts index 017c0c0c6..e31253340 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_uk_UA.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_uk_UA.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin Модуль UDisks2 - + About UDisks2 Plugin Про модуль UDisks2 - + Qmmp UDisks2 Plugin Модуль UDisks2 для Qmmp - + This plugin provides removable devices detection using UDisks2 Цей модуль відстежує з'ємні пристрої за допомогою UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_zh_CN.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_zh_CN.ts index 4770b4df4..39651091c 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_zh_CN.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_zh_CN.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin UDisk2插件 - + About UDisks2 Plugin 关于UDisk2插件 - + Qmmp UDisks2 Plugin Qmmp播放器UDisk2插件 - + This plugin provides removable devices detection using UDisks2 本插件使用UDisk2提供对移动设备的探测功能 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_zh_TW.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_zh_TW.ts index 900afb2e2..f434f8fc0 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_zh_TW.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_zh_TW.ts @@ -42,27 +42,27 @@ UDisks2Factory - + UDisks2 Plugin - + About UDisks2 Plugin - + Qmmp UDisks2 Plugin - + This plugin provides removable devices detection using UDisks2 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/General/udisks2/udisks2device.cpp b/src/plugins/General/udisks2/udisks2device.cpp index a6f4499ce..db0e88f85 100644 --- a/src/plugins/General/udisks2/udisks2device.cpp +++ b/src/plugins/General/udisks2/udisks2device.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013 by Ilya Kotov * + * Copyright (C) 2013-2016 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -93,7 +93,10 @@ QStringList UDisks2Device::mountPoints() const foreach (QVariant arg, args) { QByteArrayList list; - arg.value().variant().value() >> list; + QDBusArgument a = arg.value().variant().value(); + if(a.currentType() != QDBusArgument::ArrayType) + continue; + a >> list; foreach (QByteArray p, list) points.append(p); @@ -103,7 +106,7 @@ QStringList UDisks2Device::mountPoints() const QString UDisks2Device::deviceFile() const { - return QString::fromAscii(m_block_interface->property("Device").toByteArray().constData()); + return QString::fromLatin1(m_block_interface->property("Device").toByteArray()); } QDBusObjectPath UDisks2Device::objectPath() const diff --git a/src/plugins/General/udisks2/udisks2factory.cpp b/src/plugins/General/udisks2/udisks2factory.cpp index 3bd3d6d6d..0548b8932 100644 --- a/src/plugins/General/udisks2/udisks2factory.cpp +++ b/src/plugins/General/udisks2/udisks2factory.cpp @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ + #include -#include -#include #include #include "settingsdialog.h" #include "udisks2plugin.h" @@ -62,5 +61,3 @@ QTranslator *UDisks2Factory::createTranslator(QObject *parent) translator->load(QString(":/udisks2_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(udisks2, UDisks2Factory) diff --git a/src/plugins/General/udisks2/udisks2factory.h b/src/plugins/General/udisks2/udisks2factory.h index b12e4722c..e4d1f94ff 100644 --- a/src/plugins/General/udisks2/udisks2factory.h +++ b/src/plugins/General/udisks2/udisks2factory.h @@ -32,6 +32,7 @@ class UDisks2Factory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; diff --git a/src/plugins/Input/CMakeLists.txt b/src/plugins/Input/CMakeLists.txt index 98b8b27b5..9c9dbc64b 100644 --- a/src/plugins/Input/CMakeLists.txt +++ b/src/plugins/Input/CMakeLists.txt @@ -2,7 +2,6 @@ SET(USE_MAD TRUE CACHE BOOL "enable/disable mad plugin") SET(USE_FLAC TRUE CACHE BOOL "enable/disable flac plugin") SET(USE_VORBIS TRUE CACHE BOOL "enable/disable ogg vorbis plugin") SET(USE_FFMPEG TRUE CACHE BOOL "enable/disable ffmpeg plugin") -SET(USE_FFMPEG_LEGACY TRUE CACHE BOOL "enable/disable ffmpeg_legacy plugin") SET(USE_MPC TRUE CACHE BOOL "enable/disable mpc plugin") SET(USE_SNDFILE TRUE CACHE BOOL "enable/disable sndfile plugin") SET(USE_WAVPACK TRUE CACHE BOOL "enable/disable wavpack plugin") @@ -33,10 +32,6 @@ IF(USE_FFMPEG) add_subdirectory(ffmpeg) ENDIF(USE_FFMPEG) -IF(USE_FFMPEG_LEGACY) -add_subdirectory(ffmpeg_legacy) -ENDIF(USE_FFMPEG_LEGACY) - IF(USE_MPC AND TAGLIB_FOUND) add_subdirectory(mpc) ENDIF(USE_MPC AND TAGLIB_FOUND) diff --git a/src/plugins/Input/Input.pro b/src/plugins/Input/Input.pro index a36a0b2e4..eef480670 100644 --- a/src/plugins/Input/Input.pro +++ b/src/plugins/Input/Input.pro @@ -16,38 +16,34 @@ contains(CONFIG, MODPLUG_PLUGIN){ } contains(CONFIG, FFMPEG_PLUGIN){ - contains(CONFIG, FFMPEG_LEGACY){ - SUBDIRS += ffmpeg_legacy - }else{ - SUBDIRS += ffmpeg - } + SUBDIRS += ffmpeg } contains(CONFIG, GME_PLUGIN){ - SUBDIRS += gme + SUBDIRS += gme } contains(CONFIG, OPUS_PLUGIN){ - SUBDIRS += opus + SUBDIRS += opus } contains(CONFIG, CDAUDIO_PLUGIN){ - SUBDIRS += cdaudio + SUBDIRS += cdaudio } contains(CONFIG, SID_PLUGIN){ - SUBDIRS += sid + SUBDIRS += sid } unix{ contains(CONFIG, AAC_PLUGIN){ - SUBDIRS += aac + SUBDIRS += aac } contains(CONFIG, WILDMIDI_PLUGIN){ - SUBDIRS += wildmidi + SUBDIRS += wildmidi } contains(CONFIG, ARCHIVE_PLUGIN){ diff --git a/src/plugins/Input/aac/CMakeLists.txt b/src/plugins/Input/aac/CMakeLists.txt index 5e75c3604..c6f2fd063 100644 --- a/src/plugins/Input/aac/CMakeLists.txt +++ b/src/plugins/Input/aac/CMakeLists.txt @@ -3,21 +3,8 @@ project(libaac) INCLUDE(CheckCXXSourceCompiles) INCLUDE(CheckIncludeFileCXX) -# 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) @@ -71,7 +58,7 @@ SET(libaac_HDRS SET(libaac_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libaac_RCC_SRCS ${libaac_RCCS}) +QT5_ADD_RESOURCES(libaac_RCC_SRCS ${libaac_RCCS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! @@ -80,6 +67,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(FAAD_FOUND) ADD_LIBRARY(aac MODULE ${libaac_SRCS} ${libaac_RCC_SRCS} ${libaac_HDRS}) add_dependencies(aac qmmp) -target_link_libraries(aac ${QT_LIBRARIES} libqmmp -lfaad ${TAGLIB_LDFLAGS}) +target_link_libraries(aac Qt5::Widgets -lqmmp -lfaad ${TAGLIB_LDFLAGS}) install(TARGETS aac DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(FAAD_FOUND) diff --git a/src/plugins/Input/aac/decoderaacfactory.cpp b/src/plugins/Input/aac/decoderaacfactory.cpp index b6fde8432..34afec646 100644 --- a/src/plugins/Input/aac/decoderaacfactory.cpp +++ b/src/plugins/Input/aac/decoderaacfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * + * Copyright (C) 2008-2015 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,10 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include #include #include -#include -#include #include "aacfile.h" #include "aacmetadatamodel.h" #include "decoder_aac.h" @@ -93,5 +92,3 @@ QTranslator *DecoderAACFactory::createTranslator(QObject *parent) translator->load(QString(":/aac_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(aac,DecoderAACFactory) diff --git a/src/plugins/Input/aac/decoderaacfactory.h b/src/plugins/Input/aac/decoderaacfactory.h index b0a2df3c9..54b2a9014 100644 --- a/src/plugins/Input/aac/decoderaacfactory.h +++ b/src/plugins/Input/aac/decoderaacfactory.h @@ -34,6 +34,7 @@ class DecoderAACFactory : public QObject, DecoderFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: diff --git a/src/plugins/Input/aac/translations/aac_plugin_bg.ts b/src/plugins/Input/aac/translations/aac_plugin_bg.ts index 7be3d7802..9c421ae96 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_bg.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_bg.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin - + AAC Files - + About AAC Audio Plugin - + Qmmp AAC Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_cs.ts b/src/plugins/Input/aac/translations/aac_plugin_cs.ts index 810dcb47d..fb13ec5e6 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_cs.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_cs.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin Modul AAC - + AAC Files Soubory AAC - + About AAC Audio Plugin O modulu AAC - + Qmmp AAC Audio Plugin Vstupní modul Qmmp AAC - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_de.ts b/src/plugins/Input/aac/translations/aac_plugin_de.ts index fe46d8c6a..54a68b589 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_de.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_de.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin AAC-Modul - + AAC Files AAC-Dateien - + About AAC Audio Plugin Über AAC-Audiomodul - + Qmmp AAC Audio Plugin Qmmp AAC-Audiomodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_el.ts b/src/plugins/Input/aac/translations/aac_plugin_el.ts index 4fb0ca744..525bd3a14 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_el.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_el.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin Πρόσθετο AAC - + AAC Files Αρχεία AAC - + About AAC Audio Plugin Σχετικά με το πρόσθετο ήχου AAC - + Qmmp AAC Audio Plugin Πρόσθετο ήχου AAC Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_en.ts b/src/plugins/Input/aac/translations/aac_plugin_en.ts index fc38a1d70..3aaf4170c 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_en.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_en.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin - + AAC Files - + About AAC Audio Plugin - + Qmmp AAC Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_es.ts b/src/plugins/Input/aac/translations/aac_plugin_es.ts index 9d7767e1e..2321b7cc9 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_es.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_es.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin Módulo AAC - + AAC Files Archivos AAC - + About AAC Audio Plugin Acerca del módulo de sonido AAC - + Qmmp AAC Audio Plugin Módulo de sonido AAC para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_fi.ts b/src/plugins/Input/aac/translations/aac_plugin_fi.ts index 8ff7fdb52..7e2b69d92 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_fi.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_fi.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin AAC-liitännäinen - + AAC Files AAC-tiedostot - + About AAC Audio Plugin Tietoja - AAC-ääniliitännäinen - + Qmmp AAC Audio Plugin Qmmp:n AAC-ääniliitännäinen - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_fr.ts b/src/plugins/Input/aac/translations/aac_plugin_fr.ts index a6a8a9305..db76a843e 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_fr.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_fr.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin Greffon AAC - + AAC Files Fichiers AAC - + About AAC Audio Plugin À propos du greffon audio AAC - + Qmmp AAC Audio Plugin Greffon audio AAC pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_gl_ES.ts b/src/plugins/Input/aac/translations/aac_plugin_gl_ES.ts index 5e48fc082..f952baa4c 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_gl_ES.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_gl_ES.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin Engadido AAC - + AAC Files Ficheiros AAC - + About AAC Audio Plugin Sobre o engadido Audio AAC - + Qmmp AAC Audio Plugin Engadido de audio AAC de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_he.ts b/src/plugins/Input/aac/translations/aac_plugin_he.ts index cb9836409..ade71ddea 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_he.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_he.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin תוסף AAC - + AAC Files קבצי AAC - + About AAC Audio Plugin אודות תוסף שמע AAC - + Qmmp AAC Audio Plugin תוסף שמע AAC של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_hu.ts b/src/plugins/Input/aac/translations/aac_plugin_hu.ts index 5bd290a32..19a0a168e 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_hu.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_hu.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin - + AAC Files - + About AAC Audio Plugin - + Qmmp AAC Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_id.ts b/src/plugins/Input/aac/translations/aac_plugin_id.ts index 0b144df1f..1a468609f 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_id.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_id.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin Plugin AAC - + AAC Files File AAC - + About AAC Audio Plugin Tentang Plugin Audio AAC - + Qmmp AAC Audio Plugin Plugin Audio AAC Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_it.ts b/src/plugins/Input/aac/translations/aac_plugin_it.ts index d73b8ec3f..111d54044 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_it.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_it.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin Modulo AAC - + AAC Files Brani AAC - + About AAC Audio Plugin Informazioni sul modulo Audio AAC - + Qmmp AAC Audio Plugin Modulo Audio AAC per Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_ja.ts b/src/plugins/Input/aac/translations/aac_plugin_ja.ts index e09b4ff52..eff1ed0a3 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_ja.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_ja.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin AAC プラグイン - + AAC Files AAC ファイル - + About AAC Audio Plugin AAC 音響プラグインについて - + Qmmp AAC Audio Plugin QMMP AAC 音響プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_kk.ts b/src/plugins/Input/aac/translations/aac_plugin_kk.ts index 82991637f..658f0d153 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_kk.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_kk.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin - + AAC Files - + About AAC Audio Plugin - + Qmmp AAC Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_lt.ts b/src/plugins/Input/aac/translations/aac_plugin_lt.ts index 937dbff36..d71439fcd 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_lt.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_lt.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin AAC įskiepis - + AAC Files AAC bylos - + About AAC Audio Plugin Apie AAC išvesties įrenginį - + Qmmp AAC Audio Plugin Qmmp AAC įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_nl.ts b/src/plugins/Input/aac/translations/aac_plugin_nl.ts index f16527dd9..e737c2a99 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_nl.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_nl.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin AAC Module - + AAC Files AAC Bestanden - + About AAC Audio Plugin Over de AAC Audio Module - + Qmmp AAC Audio Plugin AAC Audio Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_pl_PL.ts b/src/plugins/Input/aac/translations/aac_plugin_pl_PL.ts index a080c2d4f..f401ca138 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_pl_PL.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_pl_PL.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin Wtyczka AAC - + AAC Files Pliki AAC - + About AAC Audio Plugin O wtyczce dźwiękowej AAC - + Qmmp AAC Audio Plugin Wtyczka AAC dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_pt.ts b/src/plugins/Input/aac/translations/aac_plugin_pt.ts index 72cc819db..388ebda6f 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_pt.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_pt.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin Suplemento AAC - + AAC Files Ficheiros AAC - + About AAC Audio Plugin Sobre o suplemento AAC Audio - + Qmmp AAC Audio Plugin Suplemento Qmmp AAC Audio - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_pt_BR.ts b/src/plugins/Input/aac/translations/aac_plugin_pt_BR.ts index 40f58e460..7df295758 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_pt_BR.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_pt_BR.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin Plugin AAC - + AAC Files Arquivos AAC - + About AAC Audio Plugin Sobre o plugin de áudio AAC - + Qmmp AAC Audio Plugin Plugin Qmmp AAC Audio - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_ru.ts b/src/plugins/Input/aac/translations/aac_plugin_ru.ts index d13ff2e00..c24f03023 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_ru.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_ru.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin Модуль AAC - + AAC Files Файлы AAC - + About AAC Audio Plugin Об аудио-модуле AAC - + Qmmp AAC Audio Plugin Модуль AAC для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_sk.ts b/src/plugins/Input/aac/translations/aac_plugin_sk.ts index b809fa8a1..cf8942e9b 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_sk.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_sk.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin - + AAC Files - + About AAC Audio Plugin - + Qmmp AAC Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_sr_BA.ts b/src/plugins/Input/aac/translations/aac_plugin_sr_BA.ts index 805745df9..1cca81377 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_sr_BA.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_sr_BA.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin ААЦ прикључак - + AAC Files ААЦ фајлови - + About AAC Audio Plugin О ААЦ прикључку - + Qmmp AAC Audio Plugin Кумп ААЦ прикључак - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_sr_RS.ts b/src/plugins/Input/aac/translations/aac_plugin_sr_RS.ts index 526aca97f..8f6c7297a 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_sr_RS.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_sr_RS.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin ААЦ прикључак - + AAC Files ААЦ фајлови - + About AAC Audio Plugin О ААЦ прикључку - + Qmmp AAC Audio Plugin Кумп ААЦ прикључак - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_tr.ts b/src/plugins/Input/aac/translations/aac_plugin_tr.ts index b61156603..c925e7fec 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_tr.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_tr.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin AAC Eklentisi - + AAC Files AAC Dosyaları - + About AAC Audio Plugin AAC Ses Eklentisi Hakkında - + Qmmp AAC Audio Plugin Qmmp AAC Ses Eklentisi - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_uk_UA.ts b/src/plugins/Input/aac/translations/aac_plugin_uk_UA.ts index 6c81427d3..f8f34c542 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_uk_UA.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_uk_UA.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin Модуль AAC - + AAC Files Файли AAC - + About AAC Audio Plugin Про аудіо-модуль AAC - + Qmmp AAC Audio Plugin Модуль AAC для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_zh_CN.ts b/src/plugins/Input/aac/translations/aac_plugin_zh_CN.ts index a9bf2e8f3..cde1817d7 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_zh_CN.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_zh_CN.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin AAC 插件 - + AAC Files AAC 文件 - + About AAC Audio Plugin 关于 AAC 音频插件 - + Qmmp AAC Audio Plugin Qmmp AAC 音频插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/aac/translations/aac_plugin_zh_TW.ts b/src/plugins/Input/aac/translations/aac_plugin_zh_TW.ts index 319d7c6d9..68f9d76ef 100644 --- a/src/plugins/Input/aac/translations/aac_plugin_zh_TW.ts +++ b/src/plugins/Input/aac/translations/aac_plugin_zh_TW.ts @@ -42,27 +42,27 @@ DecoderAACFactory - + AAC Plugin AAC 外掛 - + AAC Files AAC 檔案 - + About AAC Audio Plugin 關於 AAC 聲訊插件 - + Qmmp AAC Audio Plugin Qmmp AAC 聲訊插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/CMakeLists.txt b/src/plugins/Input/archive/CMakeLists.txt index 07c320cd3..bacc8de2f 100644 --- a/src/plugins/Input/archive/CMakeLists.txt +++ b/src/plugins/Input/archive/CMakeLists.txt @@ -1,20 +1,7 @@ project(libarchive) -# 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) @@ -41,13 +28,13 @@ SET(libarchive_HDRS SET(libarchive_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libarchive_RCC_SRCS ${libarchive_RCCS}) +QT5_ADD_RESOURCES(libarchive_RCC_SRCS ${libarchive_RCCS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(LIBARCHIVE_FOUND) ADD_LIBRARY(archive MODULE ${libarchive_SRCS} ${libarchive_RCC_SRCS} ${libarchive_HDRS}) add_dependencies(archive qmmp) -target_link_libraries(archive ${QT_LIBRARIES} libqmmp ${LIBARCHIVE_LDFLAGS} ${TAGLIB_LDFLAGS}) +target_link_libraries(archive Qt5::Widgets libqmmp ${LIBARCHIVE_LDFLAGS} ${TAGLIB_LDFLAGS}) install(TARGETS archive DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(LIBARCHIVE_FOUND) diff --git a/src/plugins/Input/archive/decoderarchivefactory.cpp b/src/plugins/Input/archive/decoderarchivefactory.cpp index 779026dfe..0badf82f3 100644 --- a/src/plugins/Input/archive/decoderarchivefactory.cpp +++ b/src/plugins/Input/archive/decoderarchivefactory.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include "decoder_archive.h" @@ -151,5 +150,3 @@ QTranslator *DecoderArchiveFactory::createTranslator(QObject *parent) translator->load(QString(":/archive_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(archive, DecoderArchiveFactory) diff --git a/src/plugins/Input/archive/decoderarchivefactory.h b/src/plugins/Input/archive/decoderarchivefactory.h index b2591bb69..8306a38d9 100644 --- a/src/plugins/Input/archive/decoderarchivefactory.h +++ b/src/plugins/Input/archive/decoderarchivefactory.h @@ -35,6 +35,7 @@ class DecoderArchiveFactory : public QObject, DecoderFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: diff --git a/src/plugins/Input/archive/translations/archive_plugin_bg.ts b/src/plugins/Input/archive/translations/archive_plugin_bg.ts index 00106a243..a4a95e92c 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_bg.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_bg.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin - + Archives - + About Archive Reader Plugin - + Qmmp Archive Reader Plugin - + Compiled against %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_cs.ts b/src/plugins/Input/archive/translations/archive_plugin_cs.ts index c9e1c8344..2c1e657cf 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_cs.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_cs.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin - + Archives - + About Archive Reader Plugin - + Qmmp Archive Reader Plugin - + Compiled against %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_de.ts b/src/plugins/Input/archive/translations/archive_plugin_de.ts index 54a50df5e..9201c01c9 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_de.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_de.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin Archiv-Modul - + Archives Archive - + About Archive Reader Plugin Über Archiv-Lesermodul - + Qmmp Archive Reader Plugin Qmmp Archiv-Lesermodul - + Compiled against %1 Kompiliert gegen %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_el.ts b/src/plugins/Input/archive/translations/archive_plugin_el.ts index 6747dddaf..5a5f465b1 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_el.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_el.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin Πρόσθετο αρχειοθηκών - + Archives Αρχειοθήκες - + About Archive Reader Plugin Σχετικά με το πρόσθετο ανάγνωσης αρχειοθηκών - + Qmmp Archive Reader Plugin Πρόσθετο ανάγνωσης αρχειοθηκών Qmmp - + Compiled against %1 Μεταγλωττίστηκε χρησιμοποιώντας %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_en.ts b/src/plugins/Input/archive/translations/archive_plugin_en.ts index 007ad862f..ee41e754e 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_en.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_en.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin - + Archives - + About Archive Reader Plugin - + Qmmp Archive Reader Plugin - + Compiled against %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_es.ts b/src/plugins/Input/archive/translations/archive_plugin_es.ts index 6f664a7d3..5a2232b32 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_es.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_es.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin Módulo de archivo - + Archives Archivos - + About Archive Reader Plugin Acerca del Módulo Lector de Archivo - + Qmmp Archive Reader Plugin Módulo Lector de Archivo de Qmmp - + Compiled against %1 Compilado contra %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_fi.ts b/src/plugins/Input/archive/translations/archive_plugin_fi.ts index 0eb4ec67e..3b8978366 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_fi.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_fi.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin - + Archives - + About Archive Reader Plugin - + Qmmp Archive Reader Plugin - + Compiled against %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_fr.ts b/src/plugins/Input/archive/translations/archive_plugin_fr.ts index c951eb66c..98baece29 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_fr.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_fr.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin Plugin d'archive - + Archives Archives - + About Archive Reader Plugin À propos du plugin de lecture des archives - + Qmmp Archive Reader Plugin Plugin Qmmp de lecture des archives - + Compiled against %1 Compilé avec la mauvaise version %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_gl_ES.ts b/src/plugins/Input/archive/translations/archive_plugin_gl_ES.ts index eeb6b0293..873b1d1b5 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_gl_ES.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_gl_ES.ts @@ -47,34 +47,34 @@ DecoderArchiveFactory - + Archive Plugin Arquivo Plugin - + Archives Arquivos - + About Archive Reader Plugin Acerca do engadido de lector de arquivos - + Qmmp Archive Reader Plugin Qmmp Archive Reader Plugin Engadido lector arquivos Qmmp - + Compiled against %1 Compilado con %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_he.ts b/src/plugins/Input/archive/translations/archive_plugin_he.ts index c960e3c29..e5c10affa 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_he.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_he.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin - + Archives - + About Archive Reader Plugin - + Qmmp Archive Reader Plugin - + Compiled against %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_hu.ts b/src/plugins/Input/archive/translations/archive_plugin_hu.ts index a83581d5b..20dd39c80 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_hu.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_hu.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin - + Archives - + About Archive Reader Plugin - + Qmmp Archive Reader Plugin - + Compiled against %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_id.ts b/src/plugins/Input/archive/translations/archive_plugin_id.ts index 13ad545e3..c5199ccd9 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_id.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_id.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin Plugin Archive - + Archives Archives - + About Archive Reader Plugin Tentang Plugin Archive Reader - + Qmmp Archive Reader Plugin Plugin Archive Reader Qmmp - + Compiled against %1 Dikompilasi terhadap: %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_it.ts b/src/plugins/Input/archive/translations/archive_plugin_it.ts index 24198b680..44a8e5611 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_it.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_it.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin - + Archives - + About Archive Reader Plugin - + Qmmp Archive Reader Plugin - + Compiled against %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_ja.ts b/src/plugins/Input/archive/translations/archive_plugin_ja.ts index b45720bf6..08af70ab8 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_ja.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_ja.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin 書庫プラグイン - + Archives 書庫形式 - + About Archive Reader Plugin 書庫プラグインについて - + Qmmp Archive Reader Plugin QMMP 書庫プラグイン - + Compiled against %1 %1 を使用してコンパイル - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_kk.ts b/src/plugins/Input/archive/translations/archive_plugin_kk.ts index 4261e5f4b..b1ac1c937 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_kk.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_kk.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin - + Archives - + About Archive Reader Plugin - + Qmmp Archive Reader Plugin - + Compiled against %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_lt.ts b/src/plugins/Input/archive/translations/archive_plugin_lt.ts index d0f5d35a2..9b54f1edd 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_lt.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_lt.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin - + Archives - + About Archive Reader Plugin - + Qmmp Archive Reader Plugin - + Compiled against %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_nl.ts b/src/plugins/Input/archive/translations/archive_plugin_nl.ts index 4a32848e7..099b3fdcb 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_nl.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_nl.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin - + Archives - + About Archive Reader Plugin - + Qmmp Archive Reader Plugin - + Compiled against %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_pl_PL.ts b/src/plugins/Input/archive/translations/archive_plugin_pl_PL.ts index c863e7656..a047afe3c 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_pl_PL.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_pl_PL.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin - + Archives - + About Archive Reader Plugin - + Qmmp Archive Reader Plugin - + Compiled against %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_pt.ts b/src/plugins/Input/archive/translations/archive_plugin_pt.ts index dabb7533e..81c9db33a 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_pt.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_pt.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin Suplemento Archive - + Archives Arquivos - + About Archive Reader Plugin Sobre o suplemento Archive Reader - + Qmmp Archive Reader Plugin Suplemento Qmmp Archive Reader - + Compiled against %1 Compilado com %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_pt_BR.ts b/src/plugins/Input/archive/translations/archive_plugin_pt_BR.ts index 264aa9a06..2bab60abc 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_pt_BR.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_pt_BR.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin Plugin Archive - + Archives Arquivos - + About Archive Reader Plugin Sobre o plugin Archive Reader - + Qmmp Archive Reader Plugin Plugin Qmmp Archive Reader - + Compiled against %1 Compilado com %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_ru.ts b/src/plugins/Input/archive/translations/archive_plugin_ru.ts index a1b14505b..2fe30fce3 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_ru.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_ru.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin Модуль архивов - + Archives Архивы - + About Archive Reader Plugin О модуле чтения архивов - + Qmmp Archive Reader Plugin Модуль чтения архивов для Qmmp - + Compiled against %1 Собран с %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_sk.ts b/src/plugins/Input/archive/translations/archive_plugin_sk.ts index ca95dd41e..bc37fcf74 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_sk.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_sk.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin - + Archives - + About Archive Reader Plugin - + Qmmp Archive Reader Plugin - + Compiled against %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_sr_BA.ts b/src/plugins/Input/archive/translations/archive_plugin_sr_BA.ts index c7ecb32fe..8b137adfc 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_sr_BA.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_sr_BA.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin - + Archives - + About Archive Reader Plugin - + Qmmp Archive Reader Plugin - + Compiled against %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_sr_RS.ts b/src/plugins/Input/archive/translations/archive_plugin_sr_RS.ts index 1004d76de..5df9dd6e2 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_sr_RS.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_sr_RS.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin - + Archives - + About Archive Reader Plugin - + Qmmp Archive Reader Plugin - + Compiled against %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_tr.ts b/src/plugins/Input/archive/translations/archive_plugin_tr.ts index 9707c486e..60479e84e 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_tr.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_tr.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin - + Archives - + About Archive Reader Plugin - + Qmmp Archive Reader Plugin - + Compiled against %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_uk_UA.ts b/src/plugins/Input/archive/translations/archive_plugin_uk_UA.ts index 7e4f8a90e..50f592633 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_uk_UA.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_uk_UA.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin Мордуль архівів - + Archives Архіви - + About Archive Reader Plugin Про модуль читання архівів - + Qmmp Archive Reader Plugin Модуль читання архівів для Qmmp - + Compiled against %1 Зібрано з %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_zh_CN.ts b/src/plugins/Input/archive/translations/archive_plugin_zh_CN.ts index 9f32d95f9..f12b21376 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_zh_CN.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_zh_CN.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin 归档插件 - + Archives 归档 - + About Archive Reader Plugin 关于归档读取器插件 - + Qmmp Archive Reader Plugin Qmmp 归档读取器插件 - + Compiled against %1 使用 %1 编译 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/archive/translations/archive_plugin_zh_TW.ts b/src/plugins/Input/archive/translations/archive_plugin_zh_TW.ts index 8ea260d3b..365febd2c 100644 --- a/src/plugins/Input/archive/translations/archive_plugin_zh_TW.ts +++ b/src/plugins/Input/archive/translations/archive_plugin_zh_TW.ts @@ -47,32 +47,32 @@ DecoderArchiveFactory - + Archive Plugin - + Archives - + About Archive Reader Plugin - + Qmmp Archive Reader Plugin - + Compiled against %1 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cdaudio/CMakeLists.txt b/src/plugins/Input/cdaudio/CMakeLists.txt index 6c16db534..d63edffbe 100644 --- a/src/plugins/Input/cdaudio/CMakeLists.txt +++ b/src/plugins/Input/cdaudio/CMakeLists.txt @@ -1,13 +1,5 @@ project(libcdaudio) -# 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}) # libqmmp @@ -33,7 +25,7 @@ SET(libcdaudio_HDRS SET(libcdaudio_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libcdaudio_RCC_SRCS ${libcdaudio_RCCS}) +QT5_ADD_RESOURCES(libcdaudio_RCC_SRCS ${libcdaudio_RCCS}) # user interface @@ -41,7 +33,7 @@ SET(libcdaudio_UIS settingsdialog.ui ) -QT4_WRAP_UI(libcdaudio_UIS_H ${libcdaudio_UIS}) +QT5_WRAP_UI(libcdaudio_UIS_H ${libcdaudio_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -50,6 +42,6 @@ IF(CDIO_FOUND) ADD_LIBRARY(cdaudio MODULE ${libcdaudio_SRCS} ${libcdaudio_UIS_H} ${libcdaudio_RCC_SRCS} ${libcdaudio_HDRS}) add_dependencies(cdaudio qmmp) -target_link_libraries(cdaudio ${QT_LIBRARIES} libqmmp ${CDIO_LDFLAGS}) +target_link_libraries(cdaudio Qt5::Widgets -lqmmp ${CDIO_LDFLAGS}) install(TARGETS cdaudio DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(CDIO_FOUND) diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp index 28878690c..cf83733a6 100644 --- a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp +++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2016 by Ilya Kotov * + * Copyright (C) 2009-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 #include @@ -99,5 +98,3 @@ QTranslator *DecoderCDAudioFactory::createTranslator(QObject *parent) translator->load(QString(":/cdaudio_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(cdaudio, DecoderCDAudioFactory) diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.h b/src/plugins/Input/cdaudio/decodercdaudiofactory.h index db9ff94b9..04a7f2b16 100644 --- a/src/plugins/Input/cdaudio/decodercdaudiofactory.h +++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.h @@ -32,6 +32,7 @@ class DecoderCDAudioFactory : public QObject, DecoderFactory { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: bool canDecode(QIODevice *input) const; diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_bg.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_bg.ts index 12b5dd88b..3cd50fcf9 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_bg.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_bg.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin - + About CD Audio Plugin - + Qmmp CD Audio Plugin - + Compiled against libcdio-%1 and libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_cs.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_cs.ts index 2a905b273..f63633e4b 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_cs.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_cs.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin Modul pro zvuková CD - + About CD Audio Plugin O modulu pro zvuková CD - + Qmmp CD Audio Plugin Modul Qmmp pro zvuková CD - + Compiled against libcdio-%1 and libcddb-%2 Zkompilováno s libcdio-%1 a libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line Použití: otevřete cdda:/// v dialogu Přidat URL nebo z příkazové řádky diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_de.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_de.ts index 7e75c2e9f..8128586a2 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_de.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_de.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin CD-Audio-Modul - + About CD Audio Plugin Über CD-Audio-Modul - + Qmmp CD Audio Plugin Qmmp CD-Audio-Modul - + Compiled against libcdio-%1 and libcddb-%2 Kompiliert mit libcdio-%1 und libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line Verwendung: Geben Sie cdda:/// in den „URL hinzufügen“-Dialog oder in die Befehlszeile ein diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_el.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_el.ts index 8bbd010d2..3c1dbbafa 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_el.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_el.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin Πρόσθετο CD ήχου - + About CD Audio Plugin Σχετικά με το πρόσθετο CD ήχου - + Qmmp CD Audio Plugin Qmmp πρόσθετο CD ήχου - + Compiled against libcdio-%1 and libcddb-%2 Μεταγλωττίστηκε χρησιμοποιώντας τις βιβλιοθήκες libcdio-%1 και libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> - + Usage: open cdda:/// using Add URL dialog or command line Χρήση: ανοίξτε το cdda:/// χρησιμοποιώντας το διάλογο προσθήκης URL ή τη γραμμή εντολών diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_en.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_en.ts index 0c484eb8a..6f2c3c91c 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_en.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_en.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin - + About CD Audio Plugin - + Qmmp CD Audio Plugin - + Compiled against libcdio-%1 and libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_es.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_es.ts index 7566a71e8..4a8b9e781 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_es.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_es.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin Módulo de audio CD - + About CD Audio Plugin Acerca del módulo de audio CD - + Qmmp CD Audio Plugin Módulo de audio CD para Qmmp - + Compiled against libcdio-%1 and libcddb-%2 Compilado con libcdio-%1 y libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line Uso: abrir cdda:// con el diálogo Añadir URL o la línea de comandos diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_fi.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_fi.ts index b586014f9..eec266510 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_fi.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_fi.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin - + About CD Audio Plugin - + Qmmp CD Audio Plugin - + Compiled against libcdio-%1 and libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_fr.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_fr.ts index c6bb8bbae..f98883d92 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_fr.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_fr.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin Greffon CD audio - + About CD Audio Plugin À propos du greffon CD audio - + Qmmp CD Audio Plugin Greffon CD audio pour Qmmp - + Compiled against libcdio-%1 and libcddb-%2 Compilé contre libcdio-%1 et libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line Utilisation : ouvrir cdda:/// avec le dialogue « Ajouter URL » ou en ligne de commande diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_gl_ES.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_gl_ES.ts index 0299b9646..930314de5 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_gl_ES.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_gl_ES.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin Engadido de CD de audio - + About CD Audio Plugin Sobre o engadido de CD de audio - + Qmmp CD Audio Plugin Engadido de CD de audio de Qmmp - + Compiled against libcdio-%1 and libcddb-%2 Compilado usando libcdio-%1 e libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line Uso: open cdda:/// usando diálogo de engadir URL ou liña de comandos diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_he.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_he.ts index 7aeae7651..46603f6c2 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_he.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_he.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin תוסף תקליטור שמע - + About CD Audio Plugin אודות תוסף תקליטור שמע - + Qmmp CD Audio Plugin תוסף תקליטור שמע של Qmmp - + Compiled against libcdio-%1 and libcddb-%2 הודר כנגד libcdio-%1 וגם libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line שימוש: פתח cdda‪:///‬ באמצעות דו שיח הוסף URL או שורת פקודה diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_hu.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_hu.ts index 7c390eead..1393e8ce7 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_hu.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_hu.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin - + About CD Audio Plugin - + Qmmp CD Audio Plugin - + Compiled against libcdio-%1 and libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_id.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_id.ts index 435ede131..6c53bd11f 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_id.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_id.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin Plugin Audio CD - + About CD Audio Plugin Tentang Plugin Audio CD - + Qmmp CD Audio Plugin Plugin Audio CD Qmmp - + Compiled against libcdio-%1 and libcddb-%2 Dikompilasi terhadap libcdio-%1 dan libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line Penggunaan: buka cdda:// menggunakan dialog Tambah URL atau baris perintah diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_it.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_it.ts index b7feb1cf9..681c092a8 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_it.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_it.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin Modulo CD-Audio - + About CD Audio Plugin Informazioni sul modulo CD-Audio - + Qmmp CD Audio Plugin Modulo CD-Audio per Qmmp - + Compiled against libcdio-%1 and libcddb-%2 Compilazione basata su libcdio-%1 e libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line Uso: aprire cdda:// nella finestra di dialgo degli URL, o via linea di comando diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_ja.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_ja.ts index 61f1730b2..07be7a35b 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_ja.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_ja.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin CD 音響プラグイン - + About CD Audio Plugin CD 音響プラグインについて - + Qmmp CD Audio Plugin QMMP CD 音響プラグイン - + Compiled against libcdio-%1 and libcddb-%2 libcdio-%1 と libcddb-%2 を使用してコンパイル - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line 使い方: コマンド入力行もしくは「URL を追加」ダイアログで cdda:/// を開く diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_kk.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_kk.ts index b9f612266..1d1dfc232 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_kk.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_kk.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin - + About CD Audio Plugin - + Qmmp CD Audio Plugin - + Compiled against libcdio-%1 and libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_lt.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_lt.ts index e799853ad..d1bd38bca 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_lt.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_lt.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin CD Audio Įskiepis - + About CD Audio Plugin Apie CD Audio įskiepį - + Qmmp CD Audio Plugin Apie CD Audio Qmmp įskiepį - + Compiled against libcdio-%1 and libcddb-%2 Sukompiliuota su libcdio-%1 ir libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line Naudojimas: atverti cdda:/// naudojant Prideti interneto adresą arba komandinė eilutę diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_nl.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_nl.ts index 30710ab1b..e3a4c638f 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_nl.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_nl.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin Audio CD Module - + About CD Audio Plugin Over de Audio CD Module - + Qmmp CD Audio Plugin Audio CD Module voor Qmmp - + Compiled against libcdio-%1 and libcddb-%2 Gecompileerd tegen libcdio-%1 en libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line Gebruik: Voeg cdda:/// in het "Voeg URL toe" dialoog of als argument op de command prompt diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_pl_PL.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_pl_PL.ts index 72960d6a0..214141a8c 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_pl_PL.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_pl_PL.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin Wtyczka CD Audio - + About CD Audio Plugin O wtyczce CD Audio - + Qmmp CD Audio Plugin Wtyczka CD Audio dla Qmmp - + Compiled against libcdio-%1 and libcddb-%2 Skompilowane przy użyciu libcdio-%1 oraz libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line Instrukcja: otwórz cdda:/// używając Dodaj URL lib z linii poleceń diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_pt.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_pt.ts index 04feeeba8..c307742aa 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_pt.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_pt.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin Suplemento CD Audio - + About CD Audio Plugin Sobre o suplemento CD Audio - + Qmmp CD Audio Plugin Suplemento Qmmp CD Audio - + Compiled against libcdio-%1 and libcddb-%2 Compilado com libcdio-%1 e libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line Utilização: abrir cdda:/// através de Adicionar URL ou com a linha de comandos diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_pt_BR.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_pt_BR.ts index dab84407d..058e6ede4 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_pt_BR.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_pt_BR.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin Plugin CD Audio - + About CD Audio Plugin Sobre o plugin CD Audio - + Qmmp CD Audio Plugin Plugin Qmmp CD Audio - + Compiled against libcdio-%1 and libcddb-%2 Compilado com libcdio-%1 e libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line Utilização: abrir cdda:/// através de Adicionar URL ou com a linha de comandos diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_ru.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_ru.ts index ea891f451..ac09ad179 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_ru.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_ru.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin Модуль CD Audio - + About CD Audio Plugin О Модуле CD Audio - + Qmmp CD Audio Plugin Модуль CD Audio для Qmmp - + Compiled against libcdio-%1 and libcddb-%2 Собрано с libcdio-%1 и libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line Использование: откройте cdda:/// с помощью диалога добавления URL или командной строки diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_sk.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_sk.ts index c0625798a..68cec4148 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_sk.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_sk.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin - + About CD Audio Plugin - + Qmmp CD Audio Plugin - + Compiled against libcdio-%1 and libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_sr_BA.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_sr_BA.ts index 60bd035c4..6060a3547 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_sr_BA.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_sr_BA.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin Музички диск - + About CD Audio Plugin О прикључку за музички диск - + Qmmp CD Audio Plugin Кумп прикључак за музички диск - + Compiled against libcdio-%1 and libcddb-%2 Компилован на libcdio-%1 и libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line Употреба: отворите cdda:/// користећи дијалог за додавање УРЛ-а или командну линију diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_sr_RS.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_sr_RS.ts index 8b2203663..327d91ae7 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_sr_RS.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_sr_RS.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin Музички диск - + About CD Audio Plugin О прикључку за музички диск - + Qmmp CD Audio Plugin Кумп прикључак за музички диск - + Compiled against libcdio-%1 and libcddb-%2 Компилован на libcdio-%1 и libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line Употреба: отворите cdda:/// користећи дијалог за додавање УРЛ-а или командну линију diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_tr.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_tr.ts index 8fe6a416e..305d2a19b 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_tr.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_tr.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin CD Ses Eklentisi - + About CD Audio Plugin CD Ses Eklentisi Hakkında - + Qmmp CD Audio Plugin Qmmp CD Ses Eklentisi - + Compiled against libcdio-%1 and libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line Kullanımı: komut satırından veya URL Ekle diyaloğundan open cdda:/// şeklindedir diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_uk_UA.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_uk_UA.ts index f258a4967..6b1fde95b 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_uk_UA.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_uk_UA.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin Модуль AudioCD - + About CD Audio Plugin Про модуль AudioCD - + Qmmp CD Audio Plugin Модуль AudioCD для Qmmp - + Compiled against libcdio-%1 and libcddb-%2 Зібрано з libcdio-%1 та libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line Використання: відкрийте cdda:/// використовуючи діалог "Додати адресу" чи командний рядок diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_CN.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_CN.ts index 1af1193c3..8e802d424 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_CN.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_CN.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin CD 音频插件 - + About CD Audio Plugin 关于 CD 音频插件 - + Qmmp CD Audio Plugin Qmmp CD 音频插件 - + Compiled against libcdio-%1 and libcddb-%2 编译依赖 libcdio-%1 和 libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line 用法：open cdda:/// 使用添加 URL 对话或命令行 diff --git a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_TW.ts b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_TW.ts index ac3c07011..0cb830de3 100644 --- a/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_TW.ts +++ b/src/plugins/Input/cdaudio/translations/cdaudio_plugin_zh_TW.ts @@ -4,32 +4,32 @@ DecoderCDAudioFactory - + CD Audio Plugin CD 聲訊插件 - + About CD Audio Plugin 關於 CD 聲訊插件 - + Qmmp CD Audio Plugin Qmmp CD 聲訊插件 - + Compiled against libcdio-%1 and libcddb-%2 編譯依賴 libcdio-%1 and libcddb-%2 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> - + Usage: open cdda:/// using Add URL dialog or command line 用法：open cdda:/// 使用添加 URL會話或命令行 diff --git a/src/plugins/Input/cue/CMakeLists.txt b/src/plugins/Input/cue/CMakeLists.txt index 2929e006e..cebcbc18b 100644 --- a/src/plugins/Input/cue/CMakeLists.txt +++ b/src/plugins/Input/cue/CMakeLists.txt @@ -1,20 +1,7 @@ project(libcue) -# 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_BINARY_DIR}/../../../ -) - # libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) @@ -41,7 +28,7 @@ SET(libcue_HDRS SET(libcue_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libcue_RCC_SRCS ${libcue_RCCS}) +QT5_ADD_RESOURCES(libcue_RCC_SRCS ${libcue_RCCS}) # user interface @@ -50,7 +37,7 @@ SET(libcue_UIS settingsdialog.ui ) -QT4_WRAP_UI(libcue_UIS_H ${libcue_UIS}) +QT5_WRAP_UI(libcue_UIS_H ${libcue_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -58,8 +45,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(cue MODULE ${libcue_SRCS} ${libcue_RCC_SRCS} ${libcue_UIS_H} ${libcue_HDRS}) add_dependencies(cue qmmp) IF(USE_ENCA AND ENCA_FOUND) -target_link_libraries(cue ${QT_LIBRARIES} libqmmp ${ENCA_LDFLAGS}) +target_link_libraries(cue Qt5::Widgets -lqmmp ${ENCA_LDFLAGS}) ELSE(USE_ENCA AND ENCA_FOUND) -target_link_libraries(cue ${QT_LIBRARIES} libqmmp) +target_link_libraries(cue Qt5::Widgets -lqmmp) ENDIF(USE_ENCA AND ENCA_FOUND) install(TARGETS cue DESTINATION ${LIB_DIR}/qmmp/Input) diff --git a/src/plugins/Input/cue/decodercuefactory.cpp b/src/plugins/Input/cue/decodercuefactory.cpp index 0e92264b5..f200cf95e 100644 --- a/src/plugins/Input/cue/decodercuefactory.cpp +++ b/src/plugins/Input/cue/decodercuefactory.cpp @@ -20,14 +20,12 @@ #include #include -#include #include "decoder_cue.h" #include "cuemetadatamodel.h" #include "cueparser.h" #include "settingsdialog.h" #include "decodercuefactory.h" - // DecoderCUEFactory bool DecoderCUEFactory::canDecode(QIODevice *) const @@ -102,5 +100,3 @@ QTranslator *DecoderCUEFactory::createTranslator(QObject *parent) translator->load(QString(":/cue_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(cue,DecoderCUEFactory) diff --git a/src/plugins/Input/cue/decodercuefactory.h b/src/plugins/Input/cue/decodercuefactory.h index 60c33c042..54cd712c5 100644 --- a/src/plugins/Input/cue/decodercuefactory.h +++ b/src/plugins/Input/cue/decodercuefactory.h @@ -34,6 +34,7 @@ class DecoderCUEFactory : public QObject, DecoderFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: diff --git a/src/plugins/Input/cue/translations/cue_plugin_bg.ts b/src/plugins/Input/cue/translations/cue_plugin_bg.ts index fe2a250f0..de56b853d 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_bg.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_bg.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin - + CUE Files - + About CUE Audio Plugin - + Qmmp CUE Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_cs.ts b/src/plugins/Input/cue/translations/cue_plugin_cs.ts index 9b966c654..5501dd2c7 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_cs.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_cs.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin Modul CUE - + CUE Files Soubory CUE - + About CUE Audio Plugin O modulu CUE - + Qmmp CUE Audio Plugin Modul Qmmp CUE - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_de.ts b/src/plugins/Input/cue/translations/cue_plugin_de.ts index d5e642f08..3a9eff4d6 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_de.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_de.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin CUE-Modul - + CUE Files CUE-Dateien - + About CUE Audio Plugin Über CUE-Audiomodul - + Qmmp CUE Audio Plugin Qmmp CUE-Audiomodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_el.ts b/src/plugins/Input/cue/translations/cue_plugin_el.ts index d190610bd..4b3ada7af 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_el.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_el.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin Πρόσθετο CUE - + CUE Files Αρχεία CUE - + About CUE Audio Plugin Σχετικά με το πρόσθετο ήχου CUE - + Qmmp CUE Audio Plugin Qmmp πρόσθετο ήχου CUE - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_en.ts b/src/plugins/Input/cue/translations/cue_plugin_en.ts index ddcd7cabf..717462816 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_en.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_en.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin - + CUE Files - + About CUE Audio Plugin - + Qmmp CUE Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_es.ts b/src/plugins/Input/cue/translations/cue_plugin_es.ts index 2c5c2b85f..e8a529508 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_es.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_es.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin Módulo CUE - + CUE Files Archivos CUE - + About CUE Audio Plugin Acerca del módulo de audio CUE - + Qmmp CUE Audio Plugin Módulo de audio CUE para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_fi.ts b/src/plugins/Input/cue/translations/cue_plugin_fi.ts index 35cca9091..760af9907 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_fi.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_fi.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin CUE-liitännäinen - + CUE Files CUE-tiedostot - + About CUE Audio Plugin Tietoja - CUE-ääniliitännäinen - + Qmmp CUE Audio Plugin Qmmp:n CUE-ääniliitännäinen - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_fr.ts b/src/plugins/Input/cue/translations/cue_plugin_fr.ts index eba1bbcdb..1846659fa 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_fr.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_fr.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin Greffon de fichiers .cue - + CUE Files Fichiers .cue - + About CUE Audio Plugin À propos du greffon de fichiers .cue - + Qmmp CUE Audio Plugin Greffon de fichiers .cue pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_gl_ES.ts b/src/plugins/Input/cue/translations/cue_plugin_gl_ES.ts index 23fffdba6..532913331 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_gl_ES.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_gl_ES.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin Engadido CUE - + CUE Files Ficheiros CUE - + About CUE Audio Plugin Sobre o engadido de audio CUE - + Qmmp CUE Audio Plugin Engadido de audio CUE de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_he.ts b/src/plugins/Input/cue/translations/cue_plugin_he.ts index ee12c8bf6..0b5be0f2b 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_he.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_he.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin תוסף CUE - + CUE Files קבצי CUE - + About CUE Audio Plugin אודות תוסף CUE שמע - + Qmmp CUE Audio Plugin תוסף CUE שמע של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_hu.ts b/src/plugins/Input/cue/translations/cue_plugin_hu.ts index 154d69a86..8a37dd7fc 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_hu.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_hu.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin - + CUE Files - + About CUE Audio Plugin - + Qmmp CUE Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_id.ts b/src/plugins/Input/cue/translations/cue_plugin_id.ts index cd71d131d..47a58fbe3 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_id.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_id.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin Plugin CUE - + CUE Files File CUE - + About CUE Audio Plugin Tentang Plugin Audio CUE - + Qmmp CUE Audio Plugin Plugin Audio CUE Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_it.ts b/src/plugins/Input/cue/translations/cue_plugin_it.ts index 684f5e7c0..2d5168ea9 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_it.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_it.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin Modulo CUE - + CUE Files Brani CUE - + About CUE Audio Plugin Informazioni sul Modulo audio CUE - + Qmmp CUE Audio Plugin Modulo audio CUE per Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_ja.ts b/src/plugins/Input/cue/translations/cue_plugin_ja.ts index 6bfaa1995..7f51fbf26 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_ja.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_ja.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin CUE プラグイン - + CUE Files CUE ファイル - + About CUE Audio Plugin CUE 音響プラグインについて - + Qmmp CUE Audio Plugin QMMP CUE 音響プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_kk.ts b/src/plugins/Input/cue/translations/cue_plugin_kk.ts index fab44077f..8f3a51205 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_kk.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_kk.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin - + CUE Files - + About CUE Audio Plugin - + Qmmp CUE Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_lt.ts b/src/plugins/Input/cue/translations/cue_plugin_lt.ts index 5cad727ca..6fb360029 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_lt.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_lt.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin CUE įskiepis - + CUE Files CUE bylos - + About CUE Audio Plugin Apie CUE audio įskiepį - + Qmmp CUE Audio Plugin Qmmp CUE audio įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė:Ilya Kotov diff --git a/src/plugins/Input/cue/translations/cue_plugin_nl.ts b/src/plugins/Input/cue/translations/cue_plugin_nl.ts index f88f72cea..620af1270 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_nl.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_nl.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin CUE Module - + CUE Files CUE Bestanden - + About CUE Audio Plugin Over de CUE Audio Module - + Qmmp CUE Audio Plugin CUE Audio Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_pl_PL.ts b/src/plugins/Input/cue/translations/cue_plugin_pl_PL.ts index 899dadcee..2e16eab11 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_pl_PL.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_pl_PL.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin Wtyczka CUE - + CUE Files Pliki CUE - + About CUE Audio Plugin O wtyczce CUE Audio - + Qmmp CUE Audio Plugin O wtyczce CUE dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_pt.ts b/src/plugins/Input/cue/translations/cue_plugin_pt.ts index 11a85fda1..825d6d625 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_pt.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_pt.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin Suplemento CUE - + CUE Files Ficheiros CUE - + About CUE Audio Plugin Sobre o suplemento CUE Audio - + Qmmp CUE Audio Plugin Suplemento Qmmp CUE Audio - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_pt_BR.ts b/src/plugins/Input/cue/translations/cue_plugin_pt_BR.ts index 77d1838b9..1c290ed17 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_pt_BR.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_pt_BR.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin Plugin CUE - + CUE Files Arquivos CUE - + About CUE Audio Plugin Sobre o pugin CUE Audio - + Qmmp CUE Audio Plugin Plugin Qmmp CUE Audio - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_ru.ts b/src/plugins/Input/cue/translations/cue_plugin_ru.ts index 409750851..08a22b959 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_ru.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_ru.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin Модуль CUE - + CUE Files Файлы CUE - + About CUE Audio Plugin Об аудио-модуле CUE - + Qmmp CUE Audio Plugin Аудио-модуль CUE для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_sk.ts b/src/plugins/Input/cue/translations/cue_plugin_sk.ts index fc5d9cf0d..5768bc4a7 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_sk.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_sk.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin - + CUE Files - + About CUE Audio Plugin - + Qmmp CUE Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_sr_BA.ts b/src/plugins/Input/cue/translations/cue_plugin_sr_BA.ts index e72daf4b8..ba7b35d38 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_sr_BA.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_sr_BA.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin ЦУЕ прикључак - + CUE Files ЦУЕ фајлови - + About CUE Audio Plugin О ЦУЕ прикључку - + Qmmp CUE Audio Plugin Кумп ЦУЕ прикључак - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_sr_RS.ts b/src/plugins/Input/cue/translations/cue_plugin_sr_RS.ts index e51fbeb52..f78a0c2fc 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_sr_RS.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_sr_RS.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin ЦУЕ прикључак - + CUE Files ЦУЕ фајлови - + About CUE Audio Plugin О ЦУЕ прикључку - + Qmmp CUE Audio Plugin Кумп ЦУЕ прикључак - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_tr.ts b/src/plugins/Input/cue/translations/cue_plugin_tr.ts index f27af91b3..a1dcb5cac 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_tr.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_tr.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin CUE Eklentisi - + CUE Files CUE Dosyaları - + About CUE Audio Plugin CUE Ses Eklentisi Hakkında - + Qmmp CUE Audio Plugin Qmmp CUE Ses Eklentisi - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_uk_UA.ts b/src/plugins/Input/cue/translations/cue_plugin_uk_UA.ts index ab03328dd..0827161c5 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_uk_UA.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_uk_UA.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin Модуль CUE - + CUE Files Файли CUE - + About CUE Audio Plugin Про аудіо-модуль CUE - + Qmmp CUE Audio Plugin Аудіо-модуль CUE для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_zh_CN.ts b/src/plugins/Input/cue/translations/cue_plugin_zh_CN.ts index d655f8e92..3e9e5fa2d 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_zh_CN.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_zh_CN.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin CUE 插件 - + CUE Files CUE 文件 - + About CUE Audio Plugin 关于 CUE 音频插件 - + Qmmp CUE Audio Plugin Qmmp CUE 音频插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/cue/translations/cue_plugin_zh_TW.ts b/src/plugins/Input/cue/translations/cue_plugin_zh_TW.ts index 06c046964..b8e016b2c 100644 --- a/src/plugins/Input/cue/translations/cue_plugin_zh_TW.ts +++ b/src/plugins/Input/cue/translations/cue_plugin_zh_TW.ts @@ -4,27 +4,27 @@ DecoderCUEFactory - + CUE Plugin CUE 外掛 - + CUE Files CUE 檔案 - + About CUE Audio Plugin 關於 CUE 聲訊插件 - + Qmmp CUE Audio Plugin Qmmp CUE 聲訊插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/CMakeLists.txt b/src/plugins/Input/ffmpeg/CMakeLists.txt index 0a28fe8e2..39ca86075 100644 --- a/src/plugins/Input/ffmpeg/CMakeLists.txt +++ b/src/plugins/Input/ffmpeg/CMakeLists.txt @@ -1,30 +1,18 @@ project(libffmpeg) -# 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) # fixes ffmpeg defines ADD_DEFINITIONS(-D__STDC_CONSTANT_MACROS) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_BINARY_DIR}/../../../ -) - # libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) # minimal supported versions -# libav-0.8: libavcodec-53.34.0, libavformat-53.20.0, libavutil-51.21.0 -# ffmpeg-0.9: libavcodec-53.42.0, libavformat-53.24.0, libavutil-51.32.0 -pkg_check_modules(FFMPEG libavcodec>=53.34.0 libavformat>=53.20.0 libavutil>=51.21.0) +# libav-0.9: libavcodec-54.35.0, libavformat-54.20.3, libavutil-52.3.0 +# ffmpeg-2.0: libavcodec-55.18.102, libavformat-55.12.100, libavutil-52.38.100 +pkg_check_modules(FFMPEG libavcodec>=54.35.0 libavformat>=54.20.0 libavutil>=52.3.0) include_directories(${FFMPEG_INCLUDE_DIRS}) link_directories(${FFMPEG_LIBRARY_DIRS}) @@ -45,16 +33,15 @@ SET(libffmpeg_HDRS SET(libffmpeg_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libffmpeg_RCC_SRCS ${libffmpeg_RCCS}) +QT5_ADD_RESOURCES(libffmpeg_RCC_SRCS ${libffmpeg_RCCS}) # user interface - SET(libffmpeg_UIS settingsdialog.ui ) -QT4_WRAP_UI(libffmpeg_UIS_H ${libffmpeg_UIS}) +QT5_WRAP_UI(libffmpeg_UIS_H ${libffmpeg_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -63,6 +50,6 @@ IF(FFMPEG_FOUND) ADD_LIBRARY(ffmpeg MODULE ${libffmpeg_SRCS} ${libffmpeg_UIS_H} ${libffmpeg_RCC_SRCS} ${libffmpeg_HDRS}) add_dependencies(ffmpeg qmmp) -target_link_libraries(ffmpeg ${QT_LIBRARIES} libqmmp ${FFMPEG_LDFLAGS}) +target_link_libraries(ffmpeg Qt5::Widgets -lqmmp ${FFMPEG_LDFLAGS}) install(TARGETS ffmpeg DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(FFMPEG_FOUND) diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp index 9a3f088ad..524273d23 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp @@ -270,13 +270,8 @@ bool DecoderFFmpeg::initialize() m_totalTime = input()->isSequential() ? 0 : ic->duration * 1000 / AV_TIME_BASE; -#if (LIBAVCODEC_VERSION_INT >= ((55<<16)+(34<<8)+0)) //libav 10 if(c->codec_id == AV_CODEC_ID_SHORTEN) //ffmpeg bug workaround m_totalTime = 0; -#else - if(c->codec_id == CODEC_ID_SHORTEN) //ffmpeg bug workaround - m_totalTime = 0; -#endif Qmmp::AudioFormat format = Qmmp::PCM_UNKNOWM; @@ -467,11 +462,8 @@ void DecoderFFmpeg::fillBuffer() m_temp_pkt.size = 0; continue; } -#if (LIBAVCODEC_VERSION_INT >= ((55<<16)+(34<<8)+0)) //libav 10 + if(m_seekTime && c->codec_id == AV_CODEC_ID_APE) -#else - if(m_seekTime && c->codec_id == CODEC_ID_APE) -#endif { int64_t rescaledPts = av_rescale(m_pkt.pts, AV_TIME_BASE * (int64_t) @@ -481,11 +473,8 @@ void DecoderFFmpeg::fillBuffer() } m_seekTime = 0; } -#if (LIBAVCODEC_VERSION_INT >= ((55<<16)+(34<<8)+0)) //libav 10 + if(m_skipBytes > 0 && c->codec_id == AV_CODEC_ID_APE) -#else - if(m_skipBytes > 0 && c->codec_id == CODEC_ID_APE) -#endif { while (m_skipBytes > 0) { @@ -524,11 +513,7 @@ void DecoderFFmpeg::fillBuffer() m_output_at = 0; m_temp_pkt.size = 0; -#if (LIBAVCODEC_VERSION_INT >= ((55<<16)+(34<<8)+0)) //libav 10 if(c->codec_id == AV_CODEC_ID_SHORTEN || c->codec_id == AV_CODEC_ID_TWINVQ) -#else - if(c->codec_id == CODEC_ID_SHORTEN || c->codec_id == CODEC_ID_TWINVQ) -#endif { if(m_pkt.data) #if (LIBAVCODEC_VERSION_INT >= ((57<<16)+(24<<8)+102)) //ffmpeg-3.0 diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index 10bb08a2c..4728a8f7f 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -18,11 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include #include #include -#include -#include - extern "C"{ #include #include @@ -92,8 +90,6 @@ const DecoderProperties DecoderFFmpegFactory::properties() const filters << "*.wma" << "*.ape" << "*.tta" << "*.m4a" << "*.aac" << "*.ra" << "*.shn" << "*.vqf" << "*.ac3"; filters = settings.value("FFMPEG/filters", filters).toStringList(); - //remove unsupported filters -#if (LIBAVCODEC_VERSION_INT >= ((54<<16) + (51<<8) + 100)) //libav 10 if(!avcodec_find_decoder(AV_CODEC_ID_WMAV1)) filters.removeAll("*.wma"); if(!avcodec_find_decoder(AV_CODEC_ID_APE)) @@ -118,33 +114,6 @@ const DecoderProperties DecoderFFmpegFactory::properties() const filters.removeAll("*.mka"); if(!avcodec_find_decoder(AV_CODEC_ID_TWINVQ)) filters.removeAll("*.vqf"); -#else - if(!avcodec_find_decoder(CODEC_ID_WMAV1)) - filters.removeAll("*.wma"); - if(!avcodec_find_decoder(CODEC_ID_APE)) - filters.removeAll("*.ape"); - if(!avcodec_find_decoder(CODEC_ID_TTA)) - filters.removeAll("*.tta"); - if(!avcodec_find_decoder(CODEC_ID_AAC)) - filters.removeAll("*.aac"); - if(!avcodec_find_decoder(CODEC_ID_MP3)) - filters.removeAll("*.mp3"); - if(!avcodec_find_decoder(CODEC_ID_AAC) && !avcodec_find_decoder(CODEC_ID_ALAC)) - filters.removeAll("*.m4a"); - if(!avcodec_find_decoder(CODEC_ID_RA_288)) - filters.removeAll("*.ra"); - if(!avcodec_find_decoder(CODEC_ID_SHORTEN)) - filters.removeAll("*.shn"); - if(!avcodec_find_decoder(CODEC_ID_EAC3)) - filters.removeAll("*.ac3"); - if(!avcodec_find_decoder(CODEC_ID_DTS)) - filters.removeAll("*.dts"); - if(!avcodec_find_decoder(CODEC_ID_TRUEHD)) - filters.removeAll("*.mka"); - if(!avcodec_find_decoder(CODEC_ID_TWINVQ)) - filters.removeAll("*.vqf"); -#endif - DecoderProperties properties; properties.name = tr("FFmpeg Plugin"); @@ -281,5 +250,3 @@ QTranslator *DecoderFFmpegFactory::createTranslator(QObject *parent) translator->load(QString(":/ffmpeg_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(ffmpeg,DecoderFFmpegFactory) diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.h b/src/plugins/Input/ffmpeg/decoderffmpegfactory.h index 75eef41b5..74b68fb52 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.h +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.h @@ -34,6 +34,7 @@ class DecoderFFmpegFactory : public QObject, DecoderFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp index 2e4dfbd80..488dd08a5 100644 --- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp +++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp @@ -83,12 +83,7 @@ QPixmap FFmpegMetaDataModel::cover() #else c = m_in->streams[idx]->codec; #endif - -#if (LIBAVCODEC_VERSION_INT >= ((55<<16)+(34<<8)+0)) //libav 10 if (c->codec_type == AVMEDIA_TYPE_VIDEO && c->codec_id == AV_CODEC_ID_MJPEG) -#else - if (c->codec_type == AVMEDIA_TYPE_VIDEO && c->codec_id == CODEC_ID_MJPEG) -#endif break; } if (c) diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_bg.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_bg.ts index 177c1f1cf..a7efaf19d 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_bg.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_bg.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin - + FFmpeg Formats - + About FFmpeg Audio Plugin - + Qmmp FFmpeg Audio Plugin - + Compiled against: - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_cs.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_cs.ts index a089c3fae..197d765c5 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_cs.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_cs.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin Modul FFmpeg - + FFmpeg Formats Formáty FFmpeg - + About FFmpeg Audio Plugin O modulu FFmpeg - + Qmmp FFmpeg Audio Plugin Vstupní modul Qmmp FFmpeg - + Compiled against: Kompilováno s: - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_de.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_de.ts index 83a11c890..a669be247 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_de.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_de.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin FFmpeg-Modul - + FFmpeg Formats FFmpeg-Formate - + About FFmpeg Audio Plugin Über FFmpeg-Audiomodul - + Qmmp FFmpeg Audio Plugin Qmmp FFmpeg-Audiomodul - + Compiled against: Kompiliert gegen: - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_el.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_el.ts index f662f57ce..797c7767a 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_el.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_el.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin Πρόσθετο FFmpeg - + FFmpeg Formats Μορφές FFmpeg - + About FFmpeg Audio Plugin Σχετικά με το πρόσθετο ήχου FFmpeg - + Qmmp FFmpeg Audio Plugin Qmmp πρόσθετο ήχου FFmpeg - + Compiled against: Μεταγλωττίστηκε χρησιμοποιώντας: - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_en.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_en.ts index c11ba21dc..e538ab120 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_en.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_en.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin - + FFmpeg Formats - + About FFmpeg Audio Plugin - + Qmmp FFmpeg Audio Plugin - + Compiled against: - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_es.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_es.ts index f7d554bdf..224c56804 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_es.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_es.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin Módulo FFmpeg - + FFmpeg Formats Formatos FFmpeg - + About FFmpeg Audio Plugin Acerca del módulo de audio FFmpeg - + Qmmp FFmpeg Audio Plugin Módulo de audio FFmpeg para Qmmp - + Compiled against: Compilado contra: - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_fi.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_fi.ts index db3b61ac3..58d991c8d 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_fi.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_fi.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin FFmpeg-liitännäinen - + FFmpeg Formats - + About FFmpeg Audio Plugin - + Qmmp FFmpeg Audio Plugin - + Compiled against: - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_fr.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_fr.ts index 0e8599fb8..76eba9eea 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_fr.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_fr.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin Greffon FFmpeg - + FFmpeg Formats Formats FFmpeg - + About FFmpeg Audio Plugin À propos du greffon audio FFmpeg - + Qmmp FFmpeg Audio Plugin Greffon audio FFmpeg pour Qmmp - + Compiled against: Compilé contre : - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_gl_ES.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_gl_ES.ts index 3aa03e8ae..be293c15a 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_gl_ES.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_gl_ES.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin Engadido FFmpeg - + FFmpeg Formats Formatos ffmpeg - + About FFmpeg Audio Plugin Sobre o engadido ffmpeg - + Qmmp FFmpeg Audio Plugin Engadido de audio ffmpeg de Qmmp - + Compiled against: Compilado usando: - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_he.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_he.ts index d9f75f52f..f941e07d5 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_he.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_he.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin תוסף FFmpeg - + FFmpeg Formats פורמטים של FFmpeg - + About FFmpeg Audio Plugin אודות תוסף שמע FFmpeg - + Qmmp FFmpeg Audio Plugin תוסף שמע FFmpeg של Qmmp - + Compiled against: הודר כנגד: - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_hu.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_hu.ts index 1ac7dc59b..424c43a32 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_hu.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_hu.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin - + FFmpeg Formats - + About FFmpeg Audio Plugin - + Qmmp FFmpeg Audio Plugin - + Compiled against: - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_id.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_id.ts index 1897d8e00..45c15daac 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_id.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_id.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin Plugin FFmpeg - + FFmpeg Formats Format FFmpeg - + About FFmpeg Audio Plugin Tentang Plugin Audio FFmpeg - + Qmmp FFmpeg Audio Plugin Plugin Audio FFmpeg Qmmp - + Compiled against: Dikompilasi terhadap: - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_it.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_it.ts index 99aa0f35a..1b8f57e1a 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_it.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_it.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin Info sul modulo audi FFmpeg - + Qmmp FFmpeg Audio Plugin Modulo audio FFmpeg per Qmmp - + Compiled against: - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> - + FFmpeg Plugin Modulo FFmpeg - + FFmpeg Formats Formati FFmpeg diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ja.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ja.ts index dd1d7cde2..fb82daed4 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ja.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ja.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin FFmpeg プラグイン - + FFmpeg Formats FFmpeg 用の形式 - + About FFmpeg Audio Plugin FFmpeg 音響プラグインについて - + Qmmp FFmpeg Audio Plugin QMMP FFmpeg 音響プラグイン - + Compiled against: コンパイルに使用したライブラリ: - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_kk.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_kk.ts index 2c5db12c4..6d37ccac1 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_kk.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_kk.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin - + FFmpeg Formats - + About FFmpeg Audio Plugin - + Qmmp FFmpeg Audio Plugin - + Compiled against: - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_lt.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_lt.ts index 7c596ee1d..46ffe6da2 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_lt.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_lt.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin Apie FFmpeg įskiepį - + Qmmp FFmpeg Audio Plugin FFmpeg Qmmp audio įskiepis - + Compiled against: Sukompiliuota su: - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> - + FFmpeg Plugin FFmpeg įskiepis - + FFmpeg Formats FFmpeg bylų tipai diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_nl.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_nl.ts index 9d1278c4a..76732654f 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_nl.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_nl.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin Over de FFmpeg Audio Module - + Qmmp FFmpeg Audio Plugin FFmpeg Audio Module voor Qmmp - + Compiled against: - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> - + FFmpeg Plugin FFmpeg Module - + FFmpeg Formats FFmpeg Formaat diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pl_PL.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pl_PL.ts index 8f1dcae6f..08b8932e2 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pl_PL.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pl_PL.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin Wtyczka FFMPEG - + FFmpeg Formats Formaty FFmpeg - + About FFmpeg Audio Plugin O wtyczce FFmpeg Audio - + Qmmp FFmpeg Audio Plugin Wtyczka FFmpeg Audio dla Qmmp - + Compiled against: Skompilowana z biblioteką: - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pt.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pt.ts index 812779a6f..2448c53a2 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pt.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pt.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin Suplemento FFmpeg - + FFmpeg Formats Formatos FFmpeg - + About FFmpeg Audio Plugin Sobre o suplemento FFmpeg - + Qmmp FFmpeg Audio Plugin Suplemento Qmmp FFmpeg Audio - + Compiled against: Compilado com: - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pt_BR.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pt_BR.ts index 0e6370439..2f477e7b0 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pt_BR.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pt_BR.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin Plugin FFmpeg - + FFmpeg Formats Formatos FFmpeg - + About FFmpeg Audio Plugin Sobre o plugin FFmpeg - + Qmmp FFmpeg Audio Plugin Plugin Qmmp FFmpeg Audio - + Compiled against: Compilado com: - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts index 6534c34b5..bfabe3582 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin Модуль FFmpeg - + FFmpeg Formats Форматы FFmpeg - + About FFmpeg Audio Plugin Об аудио-модуле FFmpeg - + Qmmp FFmpeg Audio Plugin Аудио-модуль FFmpeg для Qmmp - + Compiled against: Собрано с библиотеками: - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_sk.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_sk.ts index 2a7c42717..9ae7a69f1 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_sk.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_sk.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin - + FFmpeg Formats - + About FFmpeg Audio Plugin - + Qmmp FFmpeg Audio Plugin - + Compiled against: - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_sr_BA.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_sr_BA.ts index a8f2368fc..cb6eceea4 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_sr_BA.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_sr_BA.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin ФФмпег прикључак - + FFmpeg Formats ФФмпег формати - + About FFmpeg Audio Plugin О ФФмпег прикључку - + Qmmp FFmpeg Audio Plugin Кумп ФФмпег прикључак - + Compiled against: Компилован на: - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_sr_RS.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_sr_RS.ts index a943def15..ae25fcdd0 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_sr_RS.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_sr_RS.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin ФФмпег прикључак - + FFmpeg Formats ФФмпег формати - + About FFmpeg Audio Plugin О ФФмпег прикључку - + Qmmp FFmpeg Audio Plugin Кумп ФФмпег прикључак - + Compiled against: Компилован на: - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_tr.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_tr.ts index 800738586..22003e11c 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_tr.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_tr.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin FFmpeg Eklentisi - + FFmpeg Formats FFmpeg Biçimleri - + About FFmpeg Audio Plugin FFmpeg Ses Eklentisi Hakkında - + Qmmp FFmpeg Audio Plugin Qmmp FFmpeg Ses Eklentisi - + Compiled against: - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts index 55883a886..0fc204bf9 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin Про аудіо-модуль FFmpeg - + Qmmp FFmpeg Audio Plugin Аудіо-модуль FFmpeg для Qmmp - + Compiled against: Зібрано з бібліотеками: - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> - + FFmpeg Plugin Модуль FFmpeg - + FFmpeg Formats Формати FFmpeg diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_CN.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_CN.ts index d6c6c4b5b..31a08c2c7 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_CN.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_CN.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin FFmpeg 插件 - + FFmpeg Formats FFmpeg 格式 - + About FFmpeg Audio Plugin 关于 FFmpeg 音频插件 - + Qmmp FFmpeg Audio Plugin Qmmp FFmpeg 音频插件 - + Compiled against: 在以下文件的基础上进行的编译： - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_TW.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_TW.ts index c06b2d01a..4388fdd1a 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_TW.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_TW.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin FFmpeg 外掛 - + FFmpeg Formats FFmpeg 格式 - + About FFmpeg Audio Plugin 關於 FFmpeg 聲訊插件 - + Qmmp FFmpeg Audio Plugin Qmmp FFmpeg 聲訊插件 - + Compiled against: - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt b/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt deleted file mode 100644 index 8f2a43d6d..000000000 --- a/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt +++ /dev/null @@ -1,72 +0,0 @@ -project(libffmpeg_legacy) - -# 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) -# fixes ffmpeg defines -ADD_DEFINITIONS(-D__STDC_CONSTANT_MACROS) - -include_directories(${CMAKE_CURRENT_BINARY_DIR}) - -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_BINARY_DIR}/../../../ -) - -# libqmmp -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) -link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) - -# minimal supported versions -# ffmpeg-0.6: libavcodec-52.72.2, libavformat-52.64.2, libavutil-50.15.1 -pkg_check_modules(FFMPEG_MIN libavcodec>=52.72.2 libavformat>=52.64.2 libavutil>=50.15.1) - -# maximal supported versions -# libav-0.8: libavcodec-53.34.0, libavformat-53.20.0, libavutil-51.21.0 -# ffmpeg-0.9: libavcodec-53.42.0, libavformat-53.24.0, libavutil-51.32.0 -IF(FFMPEG_MIN_FOUND) -pkg_check_modules(FFMPEG_LEGACY libavcodec<=53.33.0 libavformat<=53.19.0 libavutil<=51.20.0) -ENDIF(FFMPEG_MIN_FOUND) - -include_directories(${FFMPEG_LEGACY_INCLUDE_DIRS}) -link_directories(${FFMPEG_LEGACY_LIBRARY_DIRS}) -ADD_DEFINITIONS(${FFMPEG_LEGACY_CFLAGS}) - -SET(libffmpeg_SRCS - decoder_ffmpeg.cpp - decoderffmpegfactory.cpp - ffmpegmetadatamodel.cpp - settingsdialog.cpp -) - -SET(libffmpeg_HDRS - decoder_ffmpeg.h -) - -SET(libffmpeg_RCCS translations/translations.qrc) - -QT4_ADD_RESOURCES(libffmpeg_RCC_SRCS ${libffmpeg_RCCS}) - -# user interface - - -SET(libffmpeg_UIS - settingsdialog.ui -) - -QT4_WRAP_UI(libffmpeg_UIS_H ${libffmpeg_UIS}) -# Don't forget to include output directory, otherwise -# the UI file won't be wrapped! -include_directories(${CMAKE_CURRENT_BINARY_DIR}) - -IF(FFMPEG_LEGACY_FOUND) -ADD_LIBRARY(ffmpeg_legacy MODULE ${libffmpeg_SRCS} ${libffmpeg_UIS_H} - ${libffmpeg_RCC_SRCS} ${libffmpeg_HDRS}) -add_dependencies(ffmpeg_legacy qmmp) -target_link_libraries(ffmpeg_legacy ${QT_LIBRARIES} libqmmp ${FFMPEG_LEGACY_LDFLAGS}) -install(TARGETS ffmpeg_legacy DESTINATION ${LIB_DIR}/qmmp/Input) -ENDIF(FFMPEG_LEGACY_FOUND) diff --git a/src/plugins/Input/ffmpeg_legacy/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg_legacy/decoder_ffmpeg.cpp deleted file mode 100644 index 52655d9ce..000000000 --- a/src/plugins/Input/ffmpeg_legacy/decoder_ffmpeg.cpp +++ /dev/null @@ -1,404 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2006-2017 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#include -#include -#include "decoder_ffmpeg.h" - -// callbacks - -static int ffmpeg_read(void *data, uint8_t *buf, int size) -{ - DecoderFFmpeg *d = (DecoderFFmpeg*)data; - return (int)d->input()->read((char*)buf, size); -} - -static int64_t ffmpeg_seek(void *data, int64_t offset, int whence) -{ - DecoderFFmpeg *d = (DecoderFFmpeg*)data; - int64_t absolute_pos = 0; - /*if(d->input()->isSequential()) - return -1;*/ - switch( whence ) - { - case AVSEEK_SIZE: - return d->input()->size(); - case SEEK_SET: - absolute_pos = offset; - break; - case SEEK_CUR: - absolute_pos = d->input()->pos() + offset; - break; - case SEEK_END: - absolute_pos = d->input()->size() - offset; - break; - default: - return -1; - } - if(absolute_pos < 0 || absolute_pos > d->input()->size()) - return -1; - return d->input()->seek(absolute_pos); -} - -// Decoder class -//legacy ffmpeg support -DecoderFFmpeg::DecoderFFmpeg(const QString &path, QIODevice *i) - : Decoder(i) -{ - m_bitrate = 0; - m_skip = false; - m_totalTime = 0; - ic = 0; - m_path = path; - m_temp_pkt.size = 0; - m_pkt.size = 0; - m_pkt.data = 0; - m_output_buf = 0; - m_output_at = 0; - m_skipBytes = 0; - m_stream = 0; - c = 0; - wma_idx = 0; - av_init_packet(&m_pkt); - av_init_packet(&m_temp_pkt); -} - - -DecoderFFmpeg::~DecoderFFmpeg() -{ - m_bitrate = 0; - m_temp_pkt.size = 0; - if (ic) - av_close_input_stream(ic); - if(m_pkt.data) - av_free_packet(&m_pkt); - if(m_output_buf) - av_free(m_output_buf); - if(m_stream) - av_free(m_stream); -} - -bool DecoderFFmpeg::initialize() -{ - m_bitrate = 0; - m_skip = false; - m_totalTime = 0; - m_seekTime = -1; - av_register_all(); - - AVProbeData pd; - uint8_t buf[PROBE_BUFFER_SIZE + AVPROBE_PADDING_SIZE]; - pd.filename = m_path.toLocal8Bit().constData(); - pd.buf_size = input()->peek((char*)buf, sizeof(buf) - AVPROBE_PADDING_SIZE); - pd.buf = buf; - if(pd.buf_size < PROBE_BUFFER_SIZE) - { - qWarning("DecoderFFmpeg: too small buffer size: %d bytes", pd.buf_size); - return false; - } - AVInputFormat *fmt = av_probe_input_format(&pd, 1); - if(!fmt) - { - qWarning("DecoderFFmpeg: usupported format"); - return false; - } - qDebug("DecoderFFmpeg: detected format: %s", fmt->long_name); - qDebug("=%s=", fmt->name); - -#if (LIBAVFORMAT_VERSION_INT >= ((52<<16)+(105<<8)+0)) - m_stream = avio_alloc_context(m_input_buf, INPUT_BUFFER_SIZE, 0, this, ffmpeg_read, NULL, ffmpeg_seek); - if(!m_stream) - { - qWarning("DecoderFFmpeg: unable to initialize I/O callbacks"); - return false; - } - m_stream->seekable = !input()->isSequential(); -#else - m_stream = (ByteIOContext *)av_malloc(sizeof(ByteIOContext)); - init_put_byte(m_stream, m_input_buf, INPUT_BUFFER_SIZE, 0, this, ffmpeg_read, NULL, ffmpeg_seek); - m_stream->is_streamed = input()->isSequential(); -#endif - m_stream->max_packet_size = INPUT_BUFFER_SIZE; - - AVFormatParameters ap; - memset(&ap, 0, sizeof(ap)); - - if(av_open_input_stream(&ic, m_stream, m_path.toLocal8Bit(), fmt, &ap) != 0) - { - qDebug("DecoderFFmpeg: av_open_input_stream() failed"); - return false; - } - av_find_stream_info(ic); - if(ic->pb) - ic->pb->eof_reached = 0; - - if (input()->isSequential()) - { - QMap metaData; - AVMetadataTag *album = av_metadata_get(ic->metadata,"album",0,0); - if(!album) - album = av_metadata_get(ic->metadata,"WM/AlbumTitle",0,0); - AVMetadataTag *artist = av_metadata_get(ic->metadata,"artist",0,0); - if(!artist) - artist = av_metadata_get(ic->metadata,"author",0,0); - AVMetadataTag *comment = av_metadata_get(ic->metadata,"comment",0,0); - AVMetadataTag *genre = av_metadata_get(ic->metadata,"genre",0,0); - AVMetadataTag *title = av_metadata_get(ic->metadata,"title",0,0); - AVMetadataTag *year = av_metadata_get(ic->metadata,"WM/Year",0,0); - if(!year) - year = av_metadata_get(ic->metadata,"year",0,0); - if(!year) - year = av_metadata_get(ic->metadata,"date",0,0); - AVMetadataTag *track = av_metadata_get(ic->metadata,"track",0,0); - if(!track) - track = av_metadata_get(ic->metadata,"WM/Track",0,0); - if(!track) - track = av_metadata_get(ic->metadata,"WM/TrackNumber",0,0); - - if(album) - metaData.insert(Qmmp::ALBUM, QString::fromUtf8(album->value).trimmed()); - if(artist) - metaData.insert(Qmmp::ARTIST, QString::fromUtf8(artist->value).trimmed()); - if(comment) - metaData.insert(Qmmp::COMMENT, QString::fromUtf8(comment->value).trimmed()); - if(genre) - metaData.insert(Qmmp::GENRE, QString::fromUtf8(genre->value).trimmed()); - if(title) - metaData.insert(Qmmp::TITLE, QString::fromUtf8(title->value).trimmed()); - if(year) - metaData.insert(Qmmp::YEAR, year->value); - if(track) - metaData.insert(Qmmp::TRACK, track->value); - metaData.insert(Qmmp::URL, m_path); - addMetaData(metaData); - } - - ic->flags |= AVFMT_FLAG_GENPTS; - av_read_play(ic); - for (wma_idx = 0; wma_idx < (int)ic->nb_streams; wma_idx++) - { - c = ic->streams[wma_idx]->codec; -#if LIBAVCODEC_VERSION_MAJOR < 53 - if (c->codec_type == CODEC_TYPE_AUDIO) -#else - if (c->codec_type == AVMEDIA_TYPE_AUDIO) -#endif - break; - } - - if (c->channels > 0) - c->request_channels = qMin(2, c->channels); - else - c->request_channels = 2; - -#if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(101<<8)+0)) - av_dump_format(ic,0,0,0); -#else - dump_format(ic,0,0,0); -#endif - AVCodec *codec = avcodec_find_decoder(c->codec_id); - - if (!codec) - { - qWarning("DecoderFFmpeg: unsupported codec for output stream"); - return false; - } - - if (avcodec_open(c, codec) < 0) - { - qWarning("DecoderFFmpeg: error while opening codec for output stream"); - return false; - } - - m_totalTime = input()->isSequential() ? 0 : ic->duration * 1000 / AV_TIME_BASE; - m_output_buf = (uint8_t *)av_malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE*2); - -#if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(20<<8)+0)) - if(c->codec_id == CODEC_ID_SHORTEN) //ffmpeg bug workaround - m_totalTime = 0; -#endif - -#if (LIBAVUTIL_VERSION_INT >= ((50<<16)+(38<<8)+0)) - if(c->sample_fmt == AV_SAMPLE_FMT_S32) - configure(c->sample_rate, c->request_channels, Qmmp::PCM_S32LE); - else - configure(c->sample_rate, c->request_channels, Qmmp::PCM_S16LE); -#else - if(c->sample_fmt == SAMPLE_FMT_S32) - configure(c->sample_rate, c->request_channels, Qmmp::PCM_S32LE); - else - configure(c->sample_rate, c->request_channels, Qmmp::PCM_S16LE); -#endif - if(ic->bit_rate) - m_bitrate = ic->bit_rate/1000; - if(c->bit_rate) - m_bitrate = c->bit_rate/1000; - qDebug("DecoderFFmpeg: initialize succes"); - return true; -} - - -qint64 DecoderFFmpeg::totalTime() const -{ - return m_totalTime; -} - -int DecoderFFmpeg::bitrate() const -{ - return m_bitrate; -} - -qint64 DecoderFFmpeg::read(unsigned char *audio, qint64 maxSize) -{ - m_skipBytes = 0; - if (m_skip) - { - while(m_temp_pkt.size) - ffmpeg_decode(m_output_buf); - m_output_at = 0; - m_skip = false; - } - if(!m_output_at) - fillBuffer(); - if(!m_output_at) - return 0; - qint64 len = qMin(m_output_at, maxSize); - memcpy(audio, m_output_buf, len); - m_output_at -= len; - memmove(m_output_buf, m_output_buf + len, m_output_at); - return len; -} - -qint64 DecoderFFmpeg::ffmpeg_decode(uint8_t *audio) -{ - int out_size = AVCODEC_MAX_AUDIO_FRAME_SIZE * 2; - if((m_pkt.stream_index == wma_idx)) - { -#if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(23<<8)+0)) - int l = avcodec_decode_audio3(c, (int16_t *)(audio), &out_size, &m_temp_pkt); -#else - int l = avcodec_decode_audio2(c, (int16_t *)(audio), &out_size, m_temp_pkt.data, m_temp_pkt.size); -#endif - if(c->bit_rate) - m_bitrate = c->bit_rate/1000; - if(l < 0) - return l; - m_temp_pkt.data += l; - m_temp_pkt.size -= l; - } - if (!m_temp_pkt.size && m_pkt.data) - av_free_packet(&m_pkt); - - return out_size; -} - -void DecoderFFmpeg::seek(qint64 pos) -{ - int64_t timestamp = int64_t(pos)*AV_TIME_BASE/1000; - if (ic->start_time != (qint64)AV_NOPTS_VALUE) - timestamp += ic->start_time; - m_seekTime = timestamp; - av_seek_frame(ic, -1, timestamp, AVSEEK_FLAG_BACKWARD); - if(m_pkt.size) - m_skip = true; -} - -void DecoderFFmpeg::fillBuffer() -{ - while(!m_output_at) - { - if(!m_temp_pkt.size) - { - if (av_read_frame(ic, &m_pkt) < 0) - { - m_temp_pkt.size = 0; - break; - } - m_temp_pkt.size = m_pkt.size; - m_temp_pkt.data = m_pkt.data; - - if(m_pkt.stream_index != wma_idx) - { - if(m_pkt.data) - av_free_packet(&m_pkt); - m_temp_pkt.size = 0; - continue; - } - if(m_seekTime && c->codec_id == CODEC_ID_APE) - { - int64_t rescaledPts = av_rescale(m_pkt.pts, - AV_TIME_BASE * (int64_t) - ic->streams[m_pkt.stream_index]->time_base.num, - ic->streams[m_pkt.stream_index]->time_base.den); - m_skipBytes = (m_seekTime - rescaledPts) * c->sample_rate * 4 / AV_TIME_BASE; - } - else - m_skipBytes = 0; - m_seekTime = 0; - } - - if(m_skipBytes > 0 && c->codec_id == CODEC_ID_APE) - { - while (m_skipBytes > 0) - { - m_output_at = ffmpeg_decode(m_output_buf); - if(m_output_at < 0) - break; - m_skipBytes -= m_output_at; - } - - if(m_skipBytes < 0) - { - qint64 size = m_output_at; - m_output_at = - m_skipBytes; - m_output_at = m_output_at/4*4; - memmove(m_output_buf, (m_output_buf + size - m_output_at), m_output_at); - m_skipBytes = 0; - } - } - else - m_output_at = ffmpeg_decode(m_output_buf); - - if(m_output_at < 0) - { - m_output_at = 0; - m_temp_pkt.size = 0; - - if(c->codec_id == CODEC_ID_SHORTEN) - { - if(m_pkt.data) - av_free_packet(&m_pkt); - m_pkt.data = 0; - break; - } - continue; - } - else if(m_output_at == 0) - { - if(c->codec_id == CODEC_ID_SHORTEN) - continue; - - if(m_pkt.data) - av_free_packet(&m_pkt); - m_pkt.data = 0; - break; - } - } -} diff --git a/src/plugins/Input/ffmpeg_legacy/decoder_ffmpeg.h b/src/plugins/Input/ffmpeg_legacy/decoder_ffmpeg.h deleted file mode 100644 index 79d0bed53..000000000 --- a/src/plugins/Input/ffmpeg_legacy/decoder_ffmpeg.h +++ /dev/null @@ -1,84 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2006-2016 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#ifndef __decoder_ffmeg_h -#define __decoder_ffmeg_h - -extern "C"{ -#include -#include -#include -#if (LIBAVUTIL_VERSION_INT >= ((51<<16)+(32<<8)+0)) -#include -#endif -} - - -#include - -#define PROBE_BUFFER_SIZE 8192 -#define INPUT_BUFFER_SIZE 16384 - -class DecoderFFmpeg : public Decoder -{ -public: - DecoderFFmpeg(const QString &, QIODevice *i); - virtual ~DecoderFFmpeg(); - - // Standard Decoder API - bool initialize(); - qint64 totalTime() const; - int bitrate() const; - qint64 read(unsigned char *audio, qint64 maxSize); - void seek(qint64 time); - -private: - //helper functions - void fillBuffer(); - - AVFormatContext *ic; - AVCodecContext *c; - - uint wma_st_buff, wma_idx2; - int m_bitrate, wma_idx; - - QString m_path; - qint64 m_totalTime; - AVPacket m_pkt; - AVPacket m_temp_pkt; - qint64 m_output_at; - uchar m_input_buf[INPUT_BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE]; - int64_t m_seekTime; - qint64 m_skipBytes; - - qint64 ffmpeg_decode(uint8_t *audio); - bool m_skip; - -#if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(102<<8)+0)) - AVIOContext *m_stream; -#else - ByteIOContext *m_stream; -#endif - - uint8_t *m_output_buf; -}; - - -#endif // __decoder_ffmpeg_h diff --git a/src/plugins/Input/ffmpeg_legacy/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg_legacy/decoderffmpegfactory.cpp deleted file mode 100644 index f7b7f3efa..000000000 --- a/src/plugins/Input/ffmpeg_legacy/decoderffmpegfactory.cpp +++ /dev/null @@ -1,224 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#include -#include -#include -#include - -extern "C"{ -#include -#include -#if (LIBAVUTIL_VERSION_INT >= ((51<<16)+(32<<8)+0)) -#include -#endif -} - -#include "ffmpegmetadatamodel.h" -#include "settingsdialog.h" -#include "decoder_ffmpeg.h" -#include "decoderffmpegfactory.h" - - -// DecoderFFmpegFactory - -bool DecoderFFmpegFactory::canDecode(QIODevice *i) const -{ - av_register_all(); - QStringList filters = properties().filters; - - AVProbeData pd; - uint8_t buf[PROBE_BUFFER_SIZE + AVPROBE_PADDING_SIZE]; - pd.filename = 0; - pd.buf_size = i->peek((char*)buf, sizeof(buf) - AVPROBE_PADDING_SIZE); - pd.buf = buf; - if(pd.buf_size < PROBE_BUFFER_SIZE) - return false; - AVInputFormat *fmt = av_probe_input_format(&pd, 1); - if(!fmt) - { - return false; - } - if(filters.contains("*.wma") && !memcmp(fmt->name, "asf", 3)) - return true; - else if(filters.contains("*.mp3") && !memcmp(fmt->name, "mp3", 3)) - return true; - else if(filters.contains("*.aac") && !memcmp(fmt->name, "aac", 3)) - return true; - else if(filters.contains("*.ac3") && !memcmp(fmt->name, "eac3", 4)) - return true; - else if(filters.contains("*.dts") && !memcmp(fmt->name, "dts", 3)) - return true; - else if(filters.contains("*.mka") && !memcmp(fmt->name, "mka", 3)) - return true; - else if(filters.contains("*.vqf") && !memcmp(fmt->name, "vqf", 3)) - return true; - else if(filters.contains("*.ape") && !memcmp(fmt->name, "ape", 3)) - return true; - else if(filters.contains("*.tta") && !memcmp(fmt->name, "tta", 3)) - return true; - return false; -} - -const DecoderProperties DecoderFFmpegFactory::properties() const -{ - av_register_all(); - QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - QStringList filters; - filters << "*.wma" << "*.ape"; - filters = settings.value("FFMPEG_legacy/filters", filters).toStringList(); - - if(!avcodec_find_decoder(CODEC_ID_AAC)) - { - filters.removeAll("*.aac"); - filters.removeAll("*.m4a"); - } - DecoderProperties properties; - properties.name = tr("FFmpeg Plugin"); - properties.filters = filters; - properties.description = tr("FFmpeg Formats"); - if(filters.contains("*.wma")) - properties.contentTypes << "audio/x-ms-wma"; - if(filters.contains("*.mp3")) - properties.contentTypes << "audio/mpeg"; - if(filters.contains("*.aac")) - properties.contentTypes << "audio/aac" << "audio/aacp"; - if(filters.contains("*.shn")) - properties.contentTypes << "audio/x-ffmpeg-shorten"; - if(filters.contains("*.m4a")) - { - properties.contentTypes << "audio/3gpp" << "audio/3gpp2" << "audio/mp4"; - properties.contentTypes << "audio/MP4A-LATM" << "audio/mpeg4-generic"; - properties.contentTypes << "audio/m4a"; - } - if(filters.contains("*.ac3")) - properties.contentTypes << "audio/ac3" << "audio/eac3"; - if(filters.contains("*.dts")) - properties.contentTypes << "audio/dts"; - if(filters.contains("*.mka")) - properties.contentTypes << "audio/true-hd" << "audio/x-matroska"; - properties.shortName = "ffmpeg_legacy"; - properties.hasAbout = true; - properties.hasSettings = true; - properties.noInput = false; - properties.priority = 10; - return properties; -} - -Decoder *DecoderFFmpegFactory::create(const QString &path, QIODevice *input) -{ - return new DecoderFFmpeg(path, input); -} - -QList DecoderFFmpegFactory::createPlayList(const QString &fileName, bool useMetaData, QStringList *) -{ - - QList list; - avcodec_init(); - avcodec_register_all(); - av_register_all(); - AVFormatContext *in = 0; - - if (av_open_input_file(&in, fileName.toLocal8Bit(), 0, 0, 0) < 0) - { - qDebug("DecoderFFmpegFactory: unable to open file"); - return list; - } - FileInfo *info = new FileInfo(fileName); - av_find_stream_info(in); - - if (useMetaData) - { - AVMetadataTag *album = av_metadata_get(in->metadata,"album",0,0); - if(!album) - album = av_metadata_get(in->metadata,"WM/AlbumTitle",0,0); - AVMetadataTag *artist = av_metadata_get(in->metadata,"artist",0,0); - if(!artist) - artist = av_metadata_get(in->metadata,"author",0,0); - AVMetadataTag *comment = av_metadata_get(in->metadata,"comment",0,0); - AVMetadataTag *genre = av_metadata_get(in->metadata,"genre",0,0); - AVMetadataTag *title = av_metadata_get(in->metadata,"title",0,0); - AVMetadataTag *year = av_metadata_get(in->metadata,"WM/Year",0,0); - if(!year) - year = av_metadata_get(in->metadata,"year",0,0); - if(!year) - year = av_metadata_get(in->metadata,"date",0,0); - AVMetadataTag *track = av_metadata_get(in->metadata,"track",0,0); - if(!track) - track = av_metadata_get(in->metadata,"WM/Track",0,0); - if(!track) - track = av_metadata_get(in->metadata,"WM/TrackNumber",0,0); - - if(album) - info->setMetaData(Qmmp::ALBUM, QString::fromUtf8(album->value).trimmed()); - if(artist) - info->setMetaData(Qmmp::ARTIST, QString::fromUtf8(artist->value).trimmed()); - if(comment) - info->setMetaData(Qmmp::COMMENT, QString::fromUtf8(comment->value).trimmed()); - if(genre) - info->setMetaData(Qmmp::GENRE, QString::fromUtf8(genre->value).trimmed()); - if(title) - info->setMetaData(Qmmp::TITLE, QString::fromUtf8(title->value).trimmed()); - if(year) - info->setMetaData(Qmmp::YEAR, year->value); - if(track) - info->setMetaData(Qmmp::TRACK, track->value); - } - info->setLength(in->duration/AV_TIME_BASE); - av_close_input_file(in); - list << info; - return list; -} - -MetaDataModel* DecoderFFmpegFactory::createMetaDataModel(const QString &path, QObject *parent) -{ - return new FFmpegMetaDataModel(path,parent); -} - -void DecoderFFmpegFactory::showSettings(QWidget *parent) -{ - SettingsDialog *s = new SettingsDialog(parent); - s->show(); -} - -void DecoderFFmpegFactory::showAbout(QWidget *parent) -{ - QMessageBox::about (parent, tr("About FFmpeg Audio Plugin"), - - tr("Qmmp FFmpeg Audio Plugin")+"\n"+ - QString(tr("Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6")) - .arg(LIBAVFORMAT_VERSION_MAJOR) - .arg(LIBAVFORMAT_VERSION_MINOR) - .arg(LIBAVFORMAT_VERSION_MICRO) - .arg(LIBAVCODEC_VERSION_MAJOR) - .arg(LIBAVCODEC_VERSION_MINOR) - .arg(LIBAVCODEC_VERSION_MICRO)+"\n"+ - tr("Written by: Ilya Kotov ")); -} - -QTranslator *DecoderFFmpegFactory::createTranslator(QObject *parent) -{ - QTranslator *translator = new QTranslator(parent); - QString locale = Qmmp::systemLanguageID(); - translator->load(QString(":/ffmpeg_legacy_plugin_") + locale); - return translator; -} - -Q_EXPORT_PLUGIN2(ffmpeg_legacy,DecoderFFmpegFactory) diff --git a/src/plugins/Input/ffmpeg_legacy/decoderffmpegfactory.h b/src/plugins/Input/ffmpeg_legacy/decoderffmpegfactory.h deleted file mode 100644 index 11dc5d816..000000000 --- a/src/plugins/Input/ffmpeg_legacy/decoderffmpegfactory.h +++ /dev/null @@ -1,50 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2006-2016 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ -#ifndef DECODERFFMPEGFACTORY_H -#define DECODERFFMPEGFACTORY_H - -#include -#include -#include -#include - -#include -#include -#include -#include - -class DecoderFFmpegFactory : public QObject, - DecoderFactory -{ -Q_OBJECT -Q_INTERFACES(DecoderFactory) - -public: - bool canDecode(QIODevice *input) const; - const DecoderProperties properties() const; - Decoder *create(const QString &, QIODevice *); - QList createPlayList(const QString &fileName, bool useMetaData, QStringList *); - MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0); - void showSettings(QWidget *parent); - void showAbout(QWidget *parent); - QTranslator *createTranslator(QObject *parent); -}; - -#endif diff --git a/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro b/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro deleted file mode 100644 index 280dd1246..000000000 --- a/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro +++ /dev/null @@ -1,29 +0,0 @@ -include(../../plugins.pri) - -TARGET = $$PLUGINS_PREFIX/Input/ffmpeg_legacy - -HEADERS += decoderffmpegfactory.h \ - decoder_ffmpeg.h \ - settingsdialog.h \ - ffmpegmetadatamodel.h - -SOURCES += decoder_ffmpeg.cpp \ - decoderffmpegfactory.cpp \ - settingsdialog.cpp \ - ffmpegmetadatamodel.cpp - -FORMS += settingsdialog.ui - -RESOURCES = translations/translations.qrc - -DEFINES += __STDC_CONSTANT_MACROS - -unix { - target.path = $$LIB_DIR/qmmp/Input - INSTALLS += target - PKGCONFIG += libavcodec libavformat libavutil -} - -win32 { - LIBS +=-lavcodec.dll -lavformat.dll -lavutil.dll -} diff --git a/src/plugins/Input/ffmpeg_legacy/ffmpegmetadatamodel.cpp b/src/plugins/Input/ffmpeg_legacy/ffmpegmetadatamodel.cpp deleted file mode 100644 index 93f4acde4..000000000 --- a/src/plugins/Input/ffmpeg_legacy/ffmpegmetadatamodel.cpp +++ /dev/null @@ -1,70 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2009-2017 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#include "ffmpegmetadatamodel.h" - -FFmpegMetaDataModel::FFmpegMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent) -{ - m_in = 0; - avcodec_init(); - avcodec_register_all(); - av_register_all(); - if (av_open_input_file(&m_in, path.toLocal8Bit(), NULL,0, NULL) < 0) - return; - av_find_stream_info(m_in); - av_read_play(m_in); -} - -FFmpegMetaDataModel::~FFmpegMetaDataModel() -{ - if(m_in) - av_close_input_file(m_in); -} - -QHash FFmpegMetaDataModel::audioProperties() -{ - QHash ap; - if(!m_in) - return ap; - QString text = QString("%1").arg(int(m_in->duration/AV_TIME_BASE)/60); - text +=":"+QString("%1").arg(int(m_in->duration/AV_TIME_BASE)%60,2,10,QChar('0')); - ap.insert(tr("Length"), text); - ap.insert(tr("File size"), QString("%1 ").arg(m_in->file_size/1000)+" "+tr("KB")); - ap.insert(tr("Bitrate"), QString("%1 "+tr("kbps")).arg(m_in->bit_rate/1000)); - - AVCodecContext *c = 0; - uint wma_idx; - for (wma_idx = 0; wma_idx < m_in->nb_streams; wma_idx++) - { - c = m_in->streams[wma_idx]->codec; -#if LIBAVCODEC_VERSION_MAJOR < 53 - if (c->codec_type == CODEC_TYPE_AUDIO) -#else - if (c->codec_type == AVMEDIA_TYPE_AUDIO) -#endif - break; - } - if (c) - { - ap.insert(tr("Sample rate"), QString("%1 " + tr("Hz")).arg(c->sample_rate)); - ap.insert(tr("Channels"), QString("%1").arg(c->channels)); - } - return ap; -} diff --git a/src/plugins/Input/ffmpeg_legacy/ffmpegmetadatamodel.h b/src/plugins/Input/ffmpeg_legacy/ffmpegmetadatamodel.h deleted file mode 100644 index 78d6a3cd1..000000000 --- a/src/plugins/Input/ffmpeg_legacy/ffmpegmetadatamodel.h +++ /dev/null @@ -1,46 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2009-2013 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#ifndef FFMPEGMETADATAMODEL_H -#define FFMPEGMETADATAMODEL_H - -extern "C"{ -#include -#include -#if (LIBAVUTIL_VERSION_INT >= ((51<<16)+(32<<8)+0)) -#include -#endif -} - -#include - -class FFmpegMetaDataModel : public MetaDataModel -{ -Q_OBJECT -public: - FFmpegMetaDataModel(const QString &path, QObject *parent); - ~FFmpegMetaDataModel(); - QHash audioProperties(); - -private: - AVFormatContext *m_in; -}; - -#endif // FFMPEGMETADATAMODEL_H diff --git a/src/plugins/Input/ffmpeg_legacy/settingsdialog.cpp b/src/plugins/Input/ffmpeg_legacy/settingsdialog.cpp deleted file mode 100644 index 6032fd092..000000000 --- a/src/plugins/Input/ffmpeg_legacy/settingsdialog.cpp +++ /dev/null @@ -1,112 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2008-2013 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#include -#include - -#include - -extern "C"{ -#include -#include -#if (LIBAVUTIL_VERSION_INT >= ((51<<16)+(32<<8)+0)) -#include -#endif -} -#include "settingsdialog.h" - -SettingsDialog::SettingsDialog(QWidget *parent) - : QDialog(parent) -{ - ui.setupUi(this); - setAttribute(Qt::WA_DeleteOnClose); - QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - QStringList filters; - filters << "*.wma"; - filters << "*.ape"; - filters = settings.value("FFMPEG_legacy/filters", filters).toStringList(); - avcodec_register_all(); - av_register_all(); - ui.wmaCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_WMAV1)); - ui.wmaCheckBox->setChecked(filters.contains("*.wma") && avcodec_find_decoder(CODEC_ID_WMAV1)); - ui.apeCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_APE)); - ui.apeCheckBox->setChecked(filters.contains("*.ape") && avcodec_find_decoder(CODEC_ID_APE)); - ui.ttaCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_TTA)); - ui.ttaCheckBox->setChecked(filters.contains("*.tta") && avcodec_find_decoder(CODEC_ID_TTA)); - ui.aacCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_AAC)); - ui.aacCheckBox->setChecked(filters.contains("*.aac") && avcodec_find_decoder(CODEC_ID_AAC)); - ui.mp3CheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_MP3)); - ui.mp3CheckBox->setChecked(filters.contains("*.mp3") && avcodec_find_decoder(CODEC_ID_MP3)); - ui.mp4CheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_AAC)); - ui.mp4CheckBox->setChecked(filters.contains("*.m4a") && (avcodec_find_decoder(CODEC_ID_AAC) - || avcodec_find_decoder(CODEC_ID_ALAC))); - ui.raCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_RA_288)); - ui.raCheckBox->setChecked(filters.contains("*.ra") && avcodec_find_decoder(CODEC_ID_RA_288)); - ui.shCheckBox->setChecked(filters.contains("*.shn") && avcodec_find_decoder(CODEC_ID_SHORTEN)); - ui.ac3CheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_EAC3)); - ui.ac3CheckBox->setChecked(filters.contains("*.ac3") && avcodec_find_decoder(CODEC_ID_EAC3)); - ui.dtsCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_DTS)); - ui.dtsCheckBox->setChecked(filters.contains("*.dts") && avcodec_find_decoder(CODEC_ID_DTS)); -#if (LIBAVCODEC_VERSION_INT >= ((53<<16)+(42<<8)+4)) - ui.mkaCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_TRUEHD)); - ui.mkaCheckBox->setChecked(filters.contains("*.mka") && avcodec_find_decoder(CODEC_ID_TRUEHD)); - ui.vqfCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_TWINVQ)); - ui.vqfCheckBox->setChecked(filters.contains("*.vqf") && avcodec_find_decoder(CODEC_ID_TWINVQ)); -#else - ui.mkaCheckBox->hide(); - ui.vqfCheckBox->hide(); -#endif -} - -SettingsDialog::~SettingsDialog() -{ -} - -void SettingsDialog::accept() -{ - QStringList filters; - if (ui.mp3CheckBox->isChecked()) - filters << "*.mp3"; - if (ui.wmaCheckBox->isChecked()) - filters << "*.wma"; - if (ui.apeCheckBox->isChecked()) - filters << "*.ape"; - if (ui.ttaCheckBox->isChecked()) - filters << "*.tta"; - if (ui.aacCheckBox->isChecked()) - filters << "*.aac"; - if (ui.mp4CheckBox->isChecked()) - filters << "*.m4a"; - if (ui.raCheckBox->isChecked()) - filters << "*.ra"; - if (ui.shCheckBox->isChecked()) - filters << "*.shn"; - if (ui.ac3CheckBox->isChecked()) - filters << "*.ac3"; - if (ui.dtsCheckBox->isChecked()) - filters << "*.dts"; - if (ui.mkaCheckBox->isChecked()) - filters << "*.mka"; - if (ui.vqfCheckBox->isChecked()) - filters << "*.vqf"; - QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - settings.setValue("FFMPEG_legacy/filters", filters); - QDialog::accept(); -} diff --git a/src/plugins/Input/ffmpeg_legacy/settingsdialog.h b/src/plugins/Input/ffmpeg_legacy/settingsdialog.h deleted file mode 100644 index db63260ed..000000000 --- a/src/plugins/Input/ffmpeg_legacy/settingsdialog.h +++ /dev/null @@ -1,46 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2008-2013 by Ilya Kotov * - * forkotov02@ya.ru * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ -#ifndef SETTINGSDIALOG_H -#define SETTINGSDIALOG_H - -#include - -#include "ui_settingsdialog.h" - -/** - @author Ilya Kotov -*/ -class SettingsDialog : public QDialog -{ - Q_OBJECT -public: - SettingsDialog(QWidget *parent = 0); - - ~SettingsDialog(); - -public slots: - virtual void accept(); - -private: - Ui::SettingsDialog ui; - -}; - -#endif diff --git a/src/plugins/Input/ffmpeg_legacy/settingsdialog.ui b/src/plugins/Input/ffmpeg_legacy/settingsdialog.ui deleted file mode 100644 index cdeac3529..000000000 --- a/src/plugins/Input/ffmpeg_legacy/settingsdialog.ui +++ /dev/null @@ -1,182 +0,0 @@ - - - SettingsDialog - - - - 0 - 0 - 308 - 328 - - - - FFmpeg Plugin Settings - - - - 6 - - - 6 - - - 6 - - - - - Qt::Horizontal - - - - 178 - 20 - - - - - - - - - 0 - 0 - - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - Formats - - - - - - Windows Media Audio - - - - - - - Monkey's Audio (APE) - - - - - - - True Audio - - - - - - - ADTS AAC - - - - - - - MP3 (MPEG audio layer 3) - - - - - - - MPEG-4 AAC/ALAC - - - - - - - RealAudio 1.0/2.0 - - - - - - - Shorten - - - - - - - AC3/EAC - - - - - - - DTS/DTS-Core - - - - - - - Matroska Audio (Dolby TrueHD Lossless) - - - - - - - VQF - - - - - - - - - - - - buttonBox - accepted() - SettingsDialog - accept() - - - 214 - 167 - - - 103 - 160 - - - - - buttonBox - rejected() - SettingsDialog - reject() - - - 269 - 174 - - - 148 - 169 - - - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_bg.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_bg.ts deleted file mode 100644 index c5741886a..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_bg.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - - - - - FFmpeg Formats - - - - - About FFmpeg Audio Plugin - - - - - Qmmp FFmpeg Audio Plugin - - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - FFmpegMetaDataModel - - - Length - - - - - File size - - - - - KB - - - - - Bitrate - - - - - kbps - - - - - Sample rate - - - - - Hz - - - - - Channels - - - - - SettingsDialog - - - FFmpeg Plugin Settings - - - - - Formats - - - - - Windows Media Audio - - - - - Monkey's Audio (APE) - - - - - True Audio - - - - - ADTS AAC - - - - - MP3 (MPEG audio layer 3) - - - - - MPEG-4 AAC/ALAC - - - - - RealAudio 1.0/2.0 - - - - - Shorten - - - - - AC3/EAC - - - - - DTS/DTS-Core - - - - - Matroska Audio (Dolby TrueHD Lossless) - - - - - VQF - - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_cs.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_cs.ts deleted file mode 100644 index 7ad707f10..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_cs.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - Modul FFmpeg - - - - FFmpeg Formats - Formáty FFmpeg - - - - About FFmpeg Audio Plugin - O modulu FFmpeg - - - - Qmmp FFmpeg Audio Plugin - Vstupní modul Qmmp FFmpeg - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - Přeloženo s libavformat-%1.%2.%3 a libavcodec-%4.%5.%6 - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - FFmpegMetaDataModel - - - Length - Délka - - - - File size - Velikost souboru - - - - KB - KiB - - - - Bitrate - Datový tok - - - - kbps - kbps - - - - Sample rate - Vzorkovací frekvence - - - - Hz - Hz - - - - Channels - Počet kanálů - - - - SettingsDialog - - - FFmpeg Plugin Settings - Nastavení modulu FFmpeg - - - - Formats - Formáty - - - - Windows Media Audio - Windows Media Audio - - - - Monkey's Audio (APE) - Monkey's Audio (APE) - - - - True Audio - True Audio - - - - ADTS AAC - ADTS AAC - - - - MP3 (MPEG audio layer 3) - MP3 (MPEG audio layer 3) - - - - MPEG-4 AAC/ALAC - MPEG-4 AAC/ALAC - - - - RealAudio 1.0/2.0 - RealAudio 1.0/2.0 - - - - Shorten - Shorten - - - - AC3/EAC - AC3/EAC - - - - DTS/DTS-Core - DTS/DTS-Core - - - - Matroska Audio (Dolby TrueHD Lossless) - Matroska Audio (Dolby TrueHD Lossless) - - - - VQF - VQF - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_de.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_de.ts deleted file mode 100644 index 84e858a1b..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_de.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - FFmpeg-Modul - - - - FFmpeg Formats - FFmpeg-Formate - - - - About FFmpeg Audio Plugin - Über FFmpeg-Audiomodul - - - - Qmmp FFmpeg Audio Plugin - Qmmp FFmpeg-Audiomodul - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - Kompiliert gegen libavformat-%1.%2.%3 und libavcodec-%4.%5.%6 - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Geschrieben von: Ilya Kotov <forkotov02@ya.ru> - - - - FFmpegMetaDataModel - - - Length - Länge - - - - File size - Dateigröße - - - - KB - KB - - - - Bitrate - Bitrate - - - - kbps - KBit/s - - - - Sample rate - Abtastrate - - - - Hz - Hz - - - - Channels - Kanäle - - - - SettingsDialog - - - FFmpeg Plugin Settings - Einstellungen FFmpeg-Modul - - - - Formats - Formate - - - - Windows Media Audio - Windows Media Audio - - - - Monkey's Audio (APE) - Monkey’s Audio (APE) - - - - True Audio - True Audio - - - - ADTS AAC - ADTS AAC - - - - MP3 (MPEG audio layer 3) - MP3 (MPEG Audio Layer 3) - - - - MPEG-4 AAC/ALAC - MPEG-4 AAC/ALAC - - - - RealAudio 1.0/2.0 - RealAudio 1.0/2.0 - - - - Shorten - Shorten - - - - AC3/EAC - AC3/EAC - - - - DTS/DTS-Core - DTS/DTS-Kern - - - - Matroska Audio (Dolby TrueHD Lossless) - Matroska Audio (Dolby TrueHD, verlustfrei) - - - - VQF - VQF - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_el.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_el.ts deleted file mode 100644 index 8b95aa8d2..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_el.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - Πρόσθετο FFmpeg - - - - FFmpeg Formats - Μορφές FFmpeg - - - - About FFmpeg Audio Plugin - Σχετικά με το πρόσθετο ήχου FFmpeg - - - - Qmmp FFmpeg Audio Plugin - Qmmp πρόσθετο ήχου FFmpeg - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - Μεταγλωττίστηκε χρησιμοποιώντας τις βιβλιοθήκες libavformat-%1.%2.%3 και libavcodec-%4.%5.%6 - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> - - - - FFmpegMetaDataModel - - - Length - Διάρκεια - - - - File size - Μέγεθος αρχείου - - - - KB - KB - - - - Bitrate - Ρυθμός bit - - - - kbps - kbps - - - - Sample rate - Ρυθμός δειγματοληψίας - - - - Hz - Hz - - - - Channels - Κανάλια - - - - SettingsDialog - - - FFmpeg Plugin Settings - Ρυθμίσεις πρόσθετου FFmpeg - - - - Formats - Μορφές - - - - Windows Media Audio - Windows Media Audio - - - - Monkey's Audio (APE) - Monkey's Audio (APE) - - - - True Audio - True Audio - - - - ADTS AAC - ADTS AAC - - - - MP3 (MPEG audio layer 3) - MP3 (MPEG audio layer 3) - - - - MPEG-4 AAC/ALAC - MPEG-4 AAC/ALAC - - - - RealAudio 1.0/2.0 - RealAudio 1.0/2.0 - - - - Shorten - Shorten - - - - AC3/EAC - AC3/EAC - - - - DTS/DTS-Core - DTS/DTS-Core - - - - Matroska Audio (Dolby TrueHD Lossless) - Matroska Audio (Dolby TrueHD Μη απωλεστικό) - - - - VQF - VQF - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_en.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_en.ts deleted file mode 100644 index c5f01b352..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_en.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - - - - - FFmpeg Formats - - - - - About FFmpeg Audio Plugin - - - - - Qmmp FFmpeg Audio Plugin - - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - FFmpegMetaDataModel - - - Length - - - - - File size - - - - - KB - - - - - Bitrate - - - - - kbps - - - - - Sample rate - - - - - Hz - - - - - Channels - - - - - SettingsDialog - - - FFmpeg Plugin Settings - - - - - Formats - - - - - Windows Media Audio - - - - - Monkey's Audio (APE) - - - - - True Audio - - - - - ADTS AAC - - - - - MP3 (MPEG audio layer 3) - - - - - MPEG-4 AAC/ALAC - - - - - RealAudio 1.0/2.0 - - - - - Shorten - - - - - AC3/EAC - - - - - DTS/DTS-Core - - - - - Matroska Audio (Dolby TrueHD Lossless) - - - - - VQF - - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_es.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_es.ts deleted file mode 100644 index c31b7ab00..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_es.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - Módulo FFmpeg - - - - FFmpeg Formats - Formatos FFmpeg - - - - About FFmpeg Audio Plugin - Acerca del módulo de audio FFmpeg - - - - Qmmp FFmpeg Audio Plugin - Módulo de audio FFmpeg para Qmmp - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - Compilado con libavformat-%1.%2.%3 y libavcodec-%4.%5.%6 - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Escrito por: Ilya Kotov <forkotov02@ya.ru> - - - - FFmpegMetaDataModel - - - Length - Duración - - - - File size - Tamaño del archivo - - - - KB - KB - - - - Bitrate - Tasa de bits - - - - kbps - kbps - - - - Sample rate - Frecuencia - - - - Hz - Hz - - - - Channels - Canales - - - - SettingsDialog - - - FFmpeg Plugin Settings - Configuración del módulo FFmpeg - - - - Formats - Formatos - - - - Windows Media Audio - Windows Media Audio - - - - Monkey's Audio (APE) - Monkey's Audio (APE) - - - - True Audio - True Audio - - - - ADTS AAC - ADTS AAC - - - - MP3 (MPEG audio layer 3) - MP3 (MPEG Audio Layer 3) - - - - MPEG-4 AAC/ALAC - MPEG-4 AAC/ALAC - - - - RealAudio 1.0/2.0 - RealAudio 1.0/2.0 - - - - Shorten - Shorten - - - - AC3/EAC - AC3/EAC - - - - DTS/DTS-Core - DTS/DTS-Core - - - - Matroska Audio (Dolby TrueHD Lossless) - Matroska Audio (Dolby TrueHD sin pérdida) - - - - VQF - VQF - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_fi.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_fi.ts deleted file mode 100644 index f23e3aed2..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_fi.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - FFmpeg-liitännäinen - - - - FFmpeg Formats - - - - - About FFmpeg Audio Plugin - - - - - Qmmp FFmpeg Audio Plugin - - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Toteuttanut: Ilya Kotov <forkotov02@ya.ru> - - - - FFmpegMetaDataModel - - - Length - Kesto - - - - File size - Tiedostokoko - - - - KB - kt - - - - Bitrate - Bittinopeus - - - - kbps - kbps - - - - Sample rate - Näytteenottotaajuus - - - - Hz - Hz - - - - Channels - Kanavat - - - - SettingsDialog - - - FFmpeg Plugin Settings - FFmpeg-liitännäisen asetukset - - - - Formats - - - - - Windows Media Audio - Windows Media Audio - - - - Monkey's Audio (APE) - Monkey's Audio (APE) - - - - True Audio - True Audio - - - - ADTS AAC - ADTS AAC - - - - MP3 (MPEG audio layer 3) - MP3 (MPEG audio layer 3) - - - - MPEG-4 AAC/ALAC - MPEG-4 AAC/ALAC - - - - RealAudio 1.0/2.0 - RealAudio 1.0/2.0 - - - - Shorten - - - - - AC3/EAC - AC3/EAC - - - - DTS/DTS-Core - DTS/DTS-Core - - - - Matroska Audio (Dolby TrueHD Lossless) - Matroska Audio (Dolby TrueHD Lossless) - - - - VQF - VQF - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_fr.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_fr.ts deleted file mode 100644 index 30934a46b..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_fr.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - Greffon FFmpeg - - - - FFmpeg Formats - Formats FFmpeg - - - - About FFmpeg Audio Plugin - À propos du greffon audio FFmpeg - - - - Qmmp FFmpeg Audio Plugin - Greffon audio FFmpeg pour Qmmp - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - Compilé contre libavformat-%1.%2.%3 et libavcodec-%4.%5.%6 - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Écrit par : Ilya Kotov <forkotov02@ya.ru> - - - - FFmpegMetaDataModel - - - Length - Longueur - - - - File size - Taille du fichier - - - - KB - Ko - - - - Bitrate - Débit binaire - - - - kbps - kbps - - - - Sample rate - Taux d'échantillonage - - - - Hz - Hz - - - - Channels - Canaux - - - - SettingsDialog - - - FFmpeg Plugin Settings - Configuration du greffon FFmpeg - - - - Formats - Formats - - - - Windows Media Audio - Windows Media Audio - - - - Monkey's Audio (APE) - Monkey's Audio (APE) - - - - True Audio - True Audio - - - - ADTS AAC - ADTS AAC - - - - MP3 (MPEG audio layer 3) - MP3 (MPEG audio layer 3) - - - - MPEG-4 AAC/ALAC - MPEG-4 AAC/ALAC - - - - RealAudio 1.0/2.0 - RealAudio 1.0/2.0 - - - - Shorten - Shorten - - - - AC3/EAC - AC3/EAC - - - - DTS/DTS-Core - DTS/DTS-Core - - - - Matroska Audio (Dolby TrueHD Lossless) - Matroska Audio (Dolby TrueHD Lossless) - - - - VQF - VQF - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_gl_ES.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_gl_ES.ts deleted file mode 100644 index 77c031f5e..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_gl_ES.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - Engadido ffmpeg - - - - FFmpeg Formats - Formatos ffmpeg - - - - About FFmpeg Audio Plugin - Sobre o engadido ffmpeg - - - - Qmmp FFmpeg Audio Plugin - Engadido ffmpeg de Qmmp - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - Compilado con libavformat-%1.%2.%3 e libavcodec-%4.%5.%6 - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - FFmpegMetaDataModel - - - Length - Lonxitude - - - - File size - Tamaño de ficheiro - - - - KB - KB - - - - Bitrate - Taxa de bits - - - - kbps - kbps - - - - Sample rate - Frecuencia de mostra - - - - Hz - Hz - - - - Channels - Canais - - - - SettingsDialog - - - FFmpeg Plugin Settings - Preferencias do engadido ffmpeg - - - - Formats - Formatos - - - - Windows Media Audio - Windows Media Audio - - - - Monkey's Audio (APE) - Monkey's Audio (APE) - - - - True Audio - True Audio - - - - ADTS AAC - ADTS AAC - - - - MP3 (MPEG audio layer 3) - MP3 (MPEG audio layer 3) - - - - MPEG-4 AAC/ALAC - MPEG-4 AAC/ALAC - - - - RealAudio 1.0/2.0 - RealAudio 1.0/2.0 - - - - Shorten - Shorten - - - - AC3/EAC - AC3/EAC - - - - DTS/DTS-Core - DTS/DTS-Core - - - - Matroska Audio (Dolby TrueHD Lossless) - Matroska Audio (Dolby TrueHD Lossless) - - - - VQF - VQF - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_he.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_he.ts deleted file mode 100644 index 076e2502e..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_he.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - תוסף FFmpeg - - - - FFmpeg Formats - פורמטים של FFmpeg - - - - About FFmpeg Audio Plugin - אודות תוסף שמע FFmpeg - - - - Qmmp FFmpeg Audio Plugin - תוסף שמע FFmpeg של Qmmp - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - הודר כנגד libavformat-%1.%2.%3 וגם libavcodec-%4.%5.%6 - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - FFmpegMetaDataModel - - - Length - אריכות - - - - File size - גודל קובץ - - - - KB - ק״ב - - - - Bitrate - שיעור סיביות - - - - kbps - - - - - Sample rate - שיעור דגימה - - - - Hz - הרץ - - - - Channels - ערוצים - - - - SettingsDialog - - - FFmpeg Plugin Settings - הגדרות תוסף FFmpeg - - - - Formats - פורמטים - - - - Windows Media Audio - Windows Media Audio - - - - Monkey's Audio (APE) - Monkey's Audio (APE)‎ - - - - True Audio - שמע אמיתי - - - - ADTS AAC - ADTS AAC - - - - MP3 (MPEG audio layer 3) - MP3 (MPEG audio layer 3)‎ - - - - MPEG-4 AAC/ALAC - MPEG-4 AAC/ALAC - - - - RealAudio 1.0/2.0 - RealAudio 1.0/2.0 - - - - Shorten - מקוצר - - - - AC3/EAC - AC3/EAC - - - - DTS/DTS-Core - ליבת DTS/DTS - - - - Matroska Audio (Dolby TrueHD Lossless) - שמע Matroska ‫(Dolby TrueHD נטול אובדן) - - - - VQF - VQF - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_hu.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_hu.ts deleted file mode 100644 index dbb3becf0..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_hu.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - - - - - FFmpeg Formats - - - - - About FFmpeg Audio Plugin - - - - - Qmmp FFmpeg Audio Plugin - - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - FFmpegMetaDataModel - - - Length - - - - - File size - - - - - KB - - - - - Bitrate - - - - - kbps - - - - - Sample rate - - - - - Hz - - - - - Channels - - - - - SettingsDialog - - - FFmpeg Plugin Settings - - - - - Formats - - - - - Windows Media Audio - - - - - Monkey's Audio (APE) - - - - - True Audio - - - - - ADTS AAC - - - - - MP3 (MPEG audio layer 3) - - - - - MPEG-4 AAC/ALAC - - - - - RealAudio 1.0/2.0 - - - - - Shorten - - - - - AC3/EAC - - - - - DTS/DTS-Core - - - - - Matroska Audio (Dolby TrueHD Lossless) - - - - - VQF - - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_id.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_id.ts deleted file mode 100644 index 2e46dbfea..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_id.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - Plugin FFmpeg - - - - FFmpeg Formats - Format FFmpeg - - - - About FFmpeg Audio Plugin - Tentang Plugin Audio FFmpeg - - - - Qmmp FFmpeg Audio Plugin - Plugin Audio FFmpeg Qmmp - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - Dikompilasi terhadap libavformat-%1.%2.%3 dan libavcodec-%4.%5.%6 - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - FFmpegMetaDataModel - - - Length - Pabjang - - - - File size - Ukuran file - - - - KB - KB - - - - Bitrate - Bitrate - - - - kbps - kbps - - - - Sample rate - Sample rate - - - - Hz - Hz - - - - Channels - Saluran - - - - SettingsDialog - - - FFmpeg Plugin Settings - Setelan Plugin FFmpeg - - - - Formats - Format - - - - Windows Media Audio - Windows Media Audio - - - - Monkey's Audio (APE) - Monkey's Audio (APE) - - - - True Audio - Audio True - - - - ADTS AAC - ADTS AAC - - - - MP3 (MPEG audio layer 3) - MP3 (MPEG audio layer 3) - - - - MPEG-4 AAC/ALAC - MPEG-4 AAC/ALAC - - - - RealAudio 1.0/2.0 - RealAudio 1.0/2.0 - - - - Shorten - Shorten - - - - AC3/EAC - AC3/EAC - - - - DTS/DTS-Core - DTS/DTS-Core - - - - Matroska Audio (Dolby TrueHD Lossless) - Matroska Audio (Dolby TrueHD Lossless) - - - - VQF - VQF - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_it.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_it.ts deleted file mode 100644 index e530fb5a2..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_it.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - About FFmpeg Audio Plugin - Info sul modulo audi FFmpeg - - - - Qmmp FFmpeg Audio Plugin - Modulo audio FFmpeg per Qmmp - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Autore: Ilya Kotov <forkotov02@ya.ru> - - - - FFmpeg Plugin - Modulo FFmpeg - - - - FFmpeg Formats - Formati FFmpeg - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - Compilato con libavformat-%1.%2.%3 e libavcodec-%4.%5.%6 - - - - FFmpegMetaDataModel - - - Length - Durata - - - - File size - Dimensione file - - - - KB - KB - - - - Bitrate - Bit/secondo - - - - kbps - kbps - - - - Sample rate - Campionamento - - - - Hz - Hz - - - - Channels - Canali - - - - SettingsDialog - - - Formats - Formati - - - - Windows Media Audio - Windows Media Audio - - - - True Audio - True Audio - - - - ADTS AAC - ADTS AAC - - - - MPEG-4 AAC/ALAC - - - - - RealAudio 1.0/2.0 - RealAudio 1.0/2.0 - - - - Shorten - - - - - AC3/EAC - - - - - DTS/DTS-Core - - - - - Matroska Audio (Dolby TrueHD Lossless) - - - - - VQF - - - - - FFmpeg Plugin Settings - Impostazioni del modulo FFmpeg - - - - Monkey's Audio (APE) - - - - - MP3 (MPEG audio layer 3) - MP3 (MPEG Audio Layer 3) - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_ja.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_ja.ts deleted file mode 100644 index feb2055a0..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_ja.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - FFmpeg プラグイン - - - - FFmpeg Formats - FFmpeg 用の形式 - - - - About FFmpeg Audio Plugin - FFmpeg 音響プラグインについて - - - - Qmmp FFmpeg Audio Plugin - QMMP FFmpeg 音響プラグイン - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - libavformat-%1.%2.%3 と libavcodec-%4.%5.%6 を使用してコンパイル - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> - - - - FFmpegMetaDataModel - - - Length - 長さ - - - - File size - ファイルの大きさ - - - - KB - KiB - - - - Bitrate - ビットレート - - - - kbps - キロビット毎秒 - - - - Sample rate - サンプルレート - - - - Hz - Hz - - - - Channels - チャンネル - - - - SettingsDialog - - - FFmpeg Plugin Settings - FFmpeg プラグイン設定 - - - - Formats - 形式 - - - - Windows Media Audio - - - - - Monkey's Audio (APE) - - - - - True Audio - - - - - ADTS AAC - - - - - MP3 (MPEG audio layer 3) - MP3 (MPEG オーディオ レイヤー3) - - - - MPEG-4 AAC/ALAC - - - - - RealAudio 1.0/2.0 - RealAudio 1.0/2.0 - - - - Shorten - 短縮 - - - - AC3/EAC - - - - - DTS/DTS-Core - - - - - Matroska Audio (Dolby TrueHD Lossless) - - - - - VQF - - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_kk.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_kk.ts deleted file mode 100644 index 3113c4d9a..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_kk.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - - - - - FFmpeg Formats - - - - - About FFmpeg Audio Plugin - - - - - Qmmp FFmpeg Audio Plugin - - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - FFmpegMetaDataModel - - - Length - - - - - File size - - - - - KB - - - - - Bitrate - - - - - kbps - - - - - Sample rate - - - - - Hz - - - - - Channels - - - - - SettingsDialog - - - FFmpeg Plugin Settings - - - - - Formats - - - - - Windows Media Audio - - - - - Monkey's Audio (APE) - - - - - True Audio - - - - - ADTS AAC - - - - - MP3 (MPEG audio layer 3) - - - - - MPEG-4 AAC/ALAC - - - - - RealAudio 1.0/2.0 - - - - - Shorten - - - - - AC3/EAC - - - - - DTS/DTS-Core - - - - - Matroska Audio (Dolby TrueHD Lossless) - - - - - VQF - - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_lt.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_lt.ts deleted file mode 100644 index accf1ff93..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_lt.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - About FFmpeg Audio Plugin - Apie FFmpeg įskiepį - - - - Qmmp FFmpeg Audio Plugin - FFmpeg Qmmp audio įskiepis - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Sukūrė: Ilya Kotov <forkotov02@ya.ru> - - - - FFmpeg Plugin - FFmpeg įskiepis - - - - FFmpeg Formats - FFmpeg bylų tipai - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - Surinkta iš libavformat-%1.%2.%3 ir libavcodec-%4.%5.%6 - - - - FFmpegMetaDataModel - - - Length - Trukmė - - - - File size - Bylos dydis - - - - KB - КB - - - - Bitrate - Kokybė - - - - kbps - kbps - - - - Sample rate - Dažnis - - - - Hz - Hz - - - - Channels - Kanalai - - - - SettingsDialog - - - Formats - Tipai - - - - Windows Media Audio - Windows Media Audio - - - - True Audio - True Audio - - - - ADTS AAC - ADTS AAC - - - - MPEG-4 AAC/ALAC - MPEG-4 AAC/ALAC - - - - RealAudio 1.0/2.0 - RealAudio 1.0/2.0 - - - - Shorten - Shorten - - - - AC3/EAC - AC3/EAC - - - - DTS/DTS-Core - DTS/DTS-Core - - - - Matroska Audio (Dolby TrueHD Lossless) - Matroska Audio (Dolby TrueHD Lossless) - - - - VQF - VQF - - - - FFmpeg Plugin Settings - FFmpeg įskiepio nustatymai - - - - Monkey's Audio (APE) - Monkey's Audio (APE) - - - - MP3 (MPEG audio layer 3) - MP3 (MPEG audio layer 3) - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_nl.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_nl.ts deleted file mode 100644 index 99ee8af08..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_nl.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - About FFmpeg Audio Plugin - Over de FFmpeg Audio Module - - - - Qmmp FFmpeg Audio Plugin - FFmpeg Audio Module voor Qmmp - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Auteur: Ilya Kotov <forkotov02@ya.ru> - - - - FFmpeg Plugin - FFmpeg Module - - - - FFmpeg Formats - FFmpeg Formaat - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - Gecompileerd tegen libavformat-%1.%2.%3 en libavcodec-%4.%5.%6 - - - - FFmpegMetaDataModel - - - Length - Duur - - - - File size - Bestandsgrootte - - - - KB - - - - - Bitrate - Bitsnelheid - - - - kbps - - - - - Sample rate - Sample frequentie - - - - Hz - - - - - Channels - Kanalen - - - - SettingsDialog - - - Formats - Formaten - - - - Windows Media Audio - - - - - True Audio - - - - - ADTS AAC - - - - - MPEG-4 AAC/ALAC - - - - - RealAudio 1.0/2.0 - - - - - Shorten - - - - - AC3/EAC - - - - - DTS/DTS-Core - - - - - Matroska Audio (Dolby TrueHD Lossless) - - - - - VQF - - - - - FFmpeg Plugin Settings - FFmpeg Module Instellingen - - - - Monkey's Audio (APE) - - - - - MP3 (MPEG audio layer 3) - - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_pl_PL.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_pl_PL.ts deleted file mode 100644 index 3698dec07..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_pl_PL.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - Wtyczka FFMPEG - - - - FFmpeg Formats - Formaty FFmpeg - - - - About FFmpeg Audio Plugin - O wtyczce FFmpeg Audio - - - - Qmmp FFmpeg Audio Plugin - Wtyczka FFmpeg Audio dla Qmmp - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - Skompilowane przy użyciu libavformat-%1.%2.%3 i libavcodec-%4.%5.%6 - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - FFmpegMetaDataModel - - - Length - Długość - - - - File size - Wielkość pliku - - - - KB - KB - - - - Bitrate - Szybkość transmisji - - - - kbps - - - - - Sample rate - Próbkowanie - - - - Hz - Hz - - - - Channels - Kanały - - - - SettingsDialog - - - FFmpeg Plugin Settings - Ustawienia wtyczki FFMPEG - - - - Formats - Formaty - - - - Windows Media Audio - - - - - Monkey's Audio (APE) - - - - - True Audio - - - - - ADTS AAC - - - - - MP3 (MPEG audio layer 3) - - - - - MPEG-4 AAC/ALAC - - - - - RealAudio 1.0/2.0 - - - - - Shorten - Shorten (SHN) - - - - AC3/EAC - - - - - DTS/DTS-Core - - - - - Matroska Audio (Dolby TrueHD Lossless) - Matroska Audio (Dolby TrueHD Bezstratny) - - - - VQF - - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_pt.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_pt.ts deleted file mode 100644 index 7fefb7030..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_pt.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - Suplemento FFmpeg - - - - FFmpeg Formats - Formatos FFmpeg - - - - About FFmpeg Audio Plugin - Sobre o suplemento FFmpeg - - - - Qmmp FFmpeg Audio Plugin - Suplemento Qmmp FFmpeg Audio - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - Compilado com libavformat-%1.%2.%3 e libavcodec-%4.%5.%6 - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> - - - - FFmpegMetaDataModel - - - Length - Duração - - - - File size - Tamanho do ficheiro - - - - KB - KB - - - - Bitrate - Taxa de dados - - - - kbps - kbps - - - - Sample rate - Frequência - - - - Hz - Hz - - - - Channels - Canais - - - - SettingsDialog - - - FFmpeg Plugin Settings - Definições - - - - Formats - Formatos - - - - Windows Media Audio - Windows Media Audio - - - - Monkey's Audio (APE) - Monkey's Audio (APE) - - - - True Audio - True Audio - - - - ADTS AAC - ADTS AAC - - - - MP3 (MPEG audio layer 3) - MP3 (MPEG audio layer 3) - - - - MPEG-4 AAC/ALAC - MPEG-4 AAC/ALAC - - - - RealAudio 1.0/2.0 - RealAudio 1.0/2.0 - - - - Shorten - Shorten - - - - AC3/EAC - AC3/EAC - - - - DTS/DTS-Core - DTS/DTS-Core - - - - Matroska Audio (Dolby TrueHD Lossless) - Matroska Audio (Dolby TrueHD Lossless) - - - - VQF - VQF - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_pt_BR.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_pt_BR.ts deleted file mode 100644 index 27867f7ef..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_pt_BR.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - Plugin FFmpeg - - - - FFmpeg Formats - Formatos FFmpeg - - - - About FFmpeg Audio Plugin - Sobre o plugin FFmpeg - - - - Qmmp FFmpeg Audio Plugin - Plugin Qmmp FFmpeg Audio - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - Compilado com libavformat-%1.%2.%3 e libavcodec-%4.%5.%6 - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - FFmpegMetaDataModel - - - Length - Duração - - - - File size - Tamanho do arquivo - - - - KB - KB - - - - Bitrate - Taxa de dados - - - - kbps - kbps - - - - Sample rate - Frequência - - - - Hz - Hz - - - - Channels - Canais - - - - SettingsDialog - - - FFmpeg Plugin Settings - Preferências do plugin FFmpeg - - - - Formats - Formatos - - - - Windows Media Audio - Windows Media Audio - - - - Monkey's Audio (APE) - Monkey's Audio (APE) - - - - True Audio - True Audio - - - - ADTS AAC - ADTS AAC - - - - MP3 (MPEG audio layer 3) - MP3 (MPEG audio layer 3) - - - - MPEG-4 AAC/ALAC - MPEG-4 AAC/ALAC - - - - RealAudio 1.0/2.0 - RealAudio 1.0/2.0 - - - - Shorten - Shorten - - - - AC3/EAC - AC3/EAC - - - - DTS/DTS-Core - DTS/DTS-Core - - - - Matroska Audio (Dolby TrueHD Lossless) - Matroska Audio (Dolby TrueHD Lossless) - - - - VQF - VQF - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_ru.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_ru.ts deleted file mode 100644 index 4f57f6556..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_ru.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - Модуль FFmpeg - - - - FFmpeg Formats - Форматы FFmpeg - - - - About FFmpeg Audio Plugin - Об аудио-модуле FFmpeg - - - - Qmmp FFmpeg Audio Plugin - Аудио-модуль FFmpeg для Qmmp - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - Собрано с libavformat-%1.%2.%3 и libavcodec-%4.%5.%6 - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Разработчик: Илья Котов <forkotov02@ya.ru> - - - - FFmpegMetaDataModel - - - Length - Длительность - - - - File size - Размер файла - - - - KB - КБ - - - - Bitrate - Битовая частота - - - - kbps - кбит/с - - - - Sample rate - Дискретизация - - - - Hz - Гц - - - - Channels - Каналов - - - - SettingsDialog - - - FFmpeg Plugin Settings - Настройки модуля FFmpeg - - - - Formats - Форматы - - - - Windows Media Audio - Windows Media Audio - - - - Monkey's Audio (APE) - Monkey's Audio (APE) - - - - True Audio - True Audio - - - - ADTS AAC - ADTS AAC - - - - MP3 (MPEG audio layer 3) - MP3 (MPEG audio layer 3) - - - - MPEG-4 AAC/ALAC - MPEG-4 AAC/ALAC - - - - RealAudio 1.0/2.0 - RealAudio 1.0/2.0 - - - - Shorten - Shorten - - - - AC3/EAC - AC3/EAC - - - - DTS/DTS-Core - DTS/DTS-Core - - - - Matroska Audio (Dolby TrueHD Lossless) - Matroska Audio (Dolby TrueHD Lossless) - - - - VQF - VQF - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_sk.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_sk.ts deleted file mode 100644 index 730a72e49..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_sk.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - - - - - FFmpeg Formats - - - - - About FFmpeg Audio Plugin - - - - - Qmmp FFmpeg Audio Plugin - - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - FFmpegMetaDataModel - - - Length - - - - - File size - - - - - KB - - - - - Bitrate - - - - - kbps - - - - - Sample rate - - - - - Hz - - - - - Channels - - - - - SettingsDialog - - - FFmpeg Plugin Settings - - - - - Formats - - - - - Windows Media Audio - - - - - Monkey's Audio (APE) - - - - - True Audio - - - - - ADTS AAC - - - - - MP3 (MPEG audio layer 3) - - - - - MPEG-4 AAC/ALAC - - - - - RealAudio 1.0/2.0 - - - - - Shorten - - - - - AC3/EAC - - - - - DTS/DTS-Core - - - - - Matroska Audio (Dolby TrueHD Lossless) - - - - - VQF - - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_sr_BA.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_sr_BA.ts deleted file mode 100644 index 24120e0f8..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_sr_BA.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - ФФмпег прикључак - - - - FFmpeg Formats - ФФмпег формати - - - - About FFmpeg Audio Plugin - О ФФмпег прикључку - - - - Qmmp FFmpeg Audio Plugin - Кумп ФФмпег прикључак - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - Компилован на libavformat-%1.%2.%3 и libavcodec-%4.%5.%6 - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Аутор: Ilya Kotov <forkotov02@ya.ru> - - - - FFmpegMetaDataModel - - - Length - Дужина - - - - File size - Величина - - - - KB - KB - - - - Bitrate - Битски проток - - - - kbps - kb/s - - - - Sample rate - Узорковање - - - - Hz - Hz - - - - Channels - Канала - - - - SettingsDialog - - - FFmpeg Plugin Settings - Поставке ФФмпег прикључка - - - - Formats - Формати - - - - Windows Media Audio - Виндоуз Медија Аудио - - - - Monkey's Audio (APE) - Манки Аудио (APE) - - - - True Audio - Тру Аудио - - - - ADTS AAC - ADTS AAC - - - - MP3 (MPEG audio layer 3) - MP3 (МПЕГ аудио лејер 3) - - - - MPEG-4 AAC/ALAC - MPEG-4 AAC/ALAC - - - - RealAudio 1.0/2.0 - Реал Аудио 1.0/2.0 - - - - Shorten - Шортен - - - - AC3/EAC - AC3/EAC - - - - DTS/DTS-Core - DTS/DTS-Core - - - - Matroska Audio (Dolby TrueHD Lossless) - Матрошка Аудио (Dolby TrueHD Lossless) - - - - VQF - VQF - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_sr_RS.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_sr_RS.ts deleted file mode 100644 index 8ee1e299a..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_sr_RS.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - ФФмпег прикључак - - - - FFmpeg Formats - ФФмпег формати - - - - About FFmpeg Audio Plugin - О ФФмпег прикључку - - - - Qmmp FFmpeg Audio Plugin - Кумп ФФмпег прикључак - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - Компилован на libavformat-%1.%2.%3 и libavcodec-%4.%5.%6 - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Аутор: Ilya Kotov <forkotov02@ya.ru> - - - - FFmpegMetaDataModel - - - Length - Дужина - - - - File size - Величина - - - - KB - KB - - - - Bitrate - Битски проток - - - - kbps - kb/s - - - - Sample rate - Узорковање - - - - Hz - Hz - - - - Channels - Канала - - - - SettingsDialog - - - FFmpeg Plugin Settings - Поставке ФФмпег прикључка - - - - Formats - Формати - - - - Windows Media Audio - Виндоуз Медија Аудио - - - - Monkey's Audio (APE) - Манки Аудио (APE) - - - - True Audio - Тру Аудио - - - - ADTS AAC - ADTS AAC - - - - MP3 (MPEG audio layer 3) - MP3 (МПЕГ аудио лејер 3) - - - - MPEG-4 AAC/ALAC - MPEG-4 AAC/ALAC - - - - RealAudio 1.0/2.0 - Реал Аудио 1.0/2.0 - - - - Shorten - Шортен - - - - AC3/EAC - AC3/EAC - - - - DTS/DTS-Core - DTS/DTS-Core - - - - Matroska Audio (Dolby TrueHD Lossless) - Матрошка Аудио (Dolby TrueHD Lossless) - - - - VQF - VQF - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_tr.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_tr.ts deleted file mode 100644 index c3c74c6a1..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_tr.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - FFmpeg Eklentisi - - - - FFmpeg Formats - FFmpeg Biçimleri - - - - About FFmpeg Audio Plugin - FFmpeg Ses Eklentisi Hakkında - - - - Qmmp FFmpeg Audio Plugin - Qmmp FFmpeg Ses Eklentisi - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - libavformat-%1.%2.%3 ve libavcodec-%4.%5.%6 ile derlenmiştir - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Yazan: Ilya Kotov <forkotov02@ya.ru> - - - - FFmpegMetaDataModel - - - Length - - - - - File size - - - - - KB - KB - - - - Bitrate - - - - - kbps - kbps - - - - Sample rate - - - - - Hz - Hz - - - - Channels - - - - - SettingsDialog - - - FFmpeg Plugin Settings - FFmpeg Eklenti Ayarları - - - - Formats - Biçimler - - - - Windows Media Audio - Windows Media Audio - - - - Monkey's Audio (APE) - - - - - True Audio - True Audio - - - - ADTS AAC - ADTS AAC - - - - MP3 (MPEG audio layer 3) - MP3 (MPEG audio layer 3) - - - - MPEG-4 AAC/ALAC - - - - - RealAudio 1.0/2.0 - RealAudio 1.0/2.0 - - - - Shorten - - - - - AC3/EAC - - - - - DTS/DTS-Core - - - - - Matroska Audio (Dolby TrueHD Lossless) - - - - - VQF - - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_uk_UA.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_uk_UA.ts deleted file mode 100644 index 35f1b3a61..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_uk_UA.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - About FFmpeg Audio Plugin - Про аудіо-модуль FFmpeg - - - - Qmmp FFmpeg Audio Plugin - Аудіо-модуль FFmpeg для Qmmp - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - Розробник: Ілля Котов <forkotov02@ya.ru> - - - - FFmpeg Plugin - Модуль FFmpeg - - - - FFmpeg Formats - Формати FFmpeg - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - Зібрано з libavformat-%1.%2.%3 та libavcodec-%4.%5.%6 - - - - FFmpegMetaDataModel - - - Length - Тривалість - - - - File size - Розмір файлу - - - - KB - Кб - - - - Bitrate - Бітрейт - - - - kbps - Кб/с - - - - Sample rate - Частота - - - - Hz - Гц - - - - Channels - Канали - - - - SettingsDialog - - - Formats - Формати - - - - Windows Media Audio - - - - - True Audio - - - - - ADTS AAC - - - - - MPEG-4 AAC/ALAC - - - - - RealAudio 1.0/2.0 - - - - - Shorten - - - - - AC3/EAC - - - - - DTS/DTS-Core - - - - - Matroska Audio (Dolby TrueHD Lossless) - - - - - VQF - - - - - FFmpeg Plugin Settings - Налаштування модуля FFmpeg - - - - Monkey's Audio (APE) - - - - - MP3 (MPEG audio layer 3) - - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_zh_CN.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_zh_CN.ts deleted file mode 100644 index 4c112b387..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_zh_CN.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - FFmpeg 插件 - - - - FFmpeg Formats - FFmpeg 格式 - - - - About FFmpeg Audio Plugin - 关于 FFmpeg 音频插件 - - - - Qmmp FFmpeg Audio Plugin - Qmmp FFmpeg 音频插件 - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - 编译依赖 libavformat-%1.%2.%3 和 libavcodec-%4.%5.%6 - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - - - - - FFmpegMetaDataModel - - - Length - 长度 - - - - File size - 文件大小 - - - - KB - 千字节 - - - - Bitrate - 比特率 - - - - kbps - 千比特每秒 - - - - Sample rate - 取样率 - - - - Hz - 赫兹 - - - - Channels - 声音通道 - - - - SettingsDialog - - - FFmpeg Plugin Settings - FFmpeg 插件设置 - - - - Formats - 格式 - - - - Windows Media Audio - Windows媒体音频文件 - - - - Monkey's Audio (APE) - Monkey‘s 音频文件(APE) - - - - True Audio - True音频文件 - - - - ADTS AAC - ADTS AAC音频文件 - - - - MP3 (MPEG audio layer 3) - MP3(MPEG音频层3)音频文件 - - - - MPEG-4 AAC/ALAC - MPEG-4 AAC/ALAC音频文件 - - - - RealAudio 1.0/2.0 - Real1.0/2.0音频文件 - - - - Shorten - Shorten音频文件 - - - - AC3/EAC - AC3/EAC音频文件 - - - - DTS/DTS-Core - DTS/DTS-Core音频文件 - - - - Matroska Audio (Dolby TrueHD Lossless) - Mastroska音频文件(杜比真高清无损) - - - - VQF - VQF音频文件 - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_zh_TW.ts b/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_zh_TW.ts deleted file mode 100644 index 4d3687c48..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/ffmpeg_legacy_plugin_zh_TW.ts +++ /dev/null @@ -1,153 +0,0 @@ - - - - - DecoderFFmpegFactory - - - FFmpeg Plugin - FFmpeg 外掛 - - - - FFmpeg Formats - FFmpeg 格式 - - - - About FFmpeg Audio Plugin - 關於 FFmpeg 聲訊插件 - - - - Qmmp FFmpeg Audio Plugin - Qmmp FFmpeg 聲訊插件 - - - - Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 - 編譯依賴 libavformat-%1.%2.%3 與 libavcodec-%4.%5.%6 - - - - Written by: Ilya Kotov <forkotov02@ya.ru> - 作者：Ilya Kotov <forkotov02@ya.ru> - - - - FFmpegMetaDataModel - - - Length - 長度 - - - - File size - 文件大小 - - - - KB - KB - - - - Bitrate - 比特率 - - - - kbps - kbps - - - - Sample rate - 取樣率 - - - - Hz - Hz - - - - Channels - 聲音通道 - - - - SettingsDialog - - - FFmpeg Plugin Settings - FFmpeg 插件設置 - - - - Formats - 格式 - - - - Windows Media Audio - - - - - Monkey's Audio (APE) - - - - - True Audio - - - - - ADTS AAC - - - - - MP3 (MPEG audio layer 3) - - - - - MPEG-4 AAC/ALAC - - - - - RealAudio 1.0/2.0 - - - - - Shorten - - - - - AC3/EAC - - - - - DTS/DTS-Core - - - - - Matroska Audio (Dolby TrueHD Lossless) - - - - - VQF - - - - diff --git a/src/plugins/Input/ffmpeg_legacy/translations/translations.qrc b/src/plugins/Input/ffmpeg_legacy/translations/translations.qrc deleted file mode 100644 index 340b8acc4..000000000 --- a/src/plugins/Input/ffmpeg_legacy/translations/translations.qrc +++ /dev/null @@ -1,32 +0,0 @@ - - - - ffmpeg_legacy_plugin_ru.qm - ffmpeg_legacy_plugin_uk_UA.qm - ffmpeg_legacy_plugin_zh_CN.qm - ffmpeg_legacy_plugin_zh_TW.qm - ffmpeg_legacy_plugin_tr.qm - ffmpeg_legacy_plugin_cs.qm - ffmpeg_legacy_plugin_pt_BR.qm - ffmpeg_legacy_plugin_pt.qm - ffmpeg_legacy_plugin_de.qm - ffmpeg_legacy_plugin_pl_PL.qm - ffmpeg_legacy_plugin_fr.qm - ffmpeg_legacy_plugin_it.qm - ffmpeg_legacy_plugin_kk.qm - ffmpeg_legacy_plugin_lt.qm - ffmpeg_legacy_plugin_hu.qm - ffmpeg_legacy_plugin_nl.qm - ffmpeg_legacy_plugin_ja.qm - ffmpeg_legacy_plugin_sk.qm - ffmpeg_legacy_plugin_es.qm - ffmpeg_legacy_plugin_he.qm - ffmpeg_legacy_plugin_gl_ES.qm - ffmpeg_legacy_plugin_sr_BA.qm - ffmpeg_legacy_plugin_sr_RS.qm - ffmpeg_legacy_plugin_bg.qm - ffmpeg_legacy_plugin_el.qm - ffmpeg_legacy_plugin_id.qm - ffmpeg_legacy_plugin_fi.qm - - diff --git a/src/plugins/Input/flac/CMakeLists.txt b/src/plugins/Input/flac/CMakeLists.txt index 72fe56422..0d799af15 100644 --- a/src/plugins/Input/flac/CMakeLists.txt +++ b/src/plugins/Input/flac/CMakeLists.txt @@ -1,20 +1,7 @@ project(libflac) -# 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) @@ -47,7 +34,7 @@ SET(libflac_HDRS SET(libflac_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libflac_RCC_SRCS ${libflac_RCCS}) +QT5_ADD_RESOURCES(libflac_RCC_SRCS ${libflac_RCCS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! @@ -56,6 +43,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(FLAC_FOUND) ADD_LIBRARY(flac MODULE ${libflac_SRCS} ${libflac_RCC_SRCS} ${libflac_HDRS}) add_dependencies(flac qmmp) -target_link_libraries(flac ${QT_LIBRARIES} libqmmp ${FLAC_LDFLAGS} ${TAGLIB_LDFLAGS}) +target_link_libraries(flac Qt5::Widgets -lqmmp ${FLAC_LDFLAGS} ${TAGLIB_LDFLAGS}) install(TARGETS flac DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(FLAC_FOUND) diff --git a/src/plugins/Input/flac/decoderflacfactory.cpp b/src/plugins/Input/flac/decoderflacfactory.cpp index d55623ef2..82332d83c 100644 --- a/src/plugins/Input/flac/decoderflacfactory.cpp +++ b/src/plugins/Input/flac/decoderflacfactory.cpp @@ -18,19 +18,16 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include #include -#include +#include #include #include #include #include #include #include -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) #include #include -#endif #include "cueparser.h" #include "decoder_flac.h" #include "flacmetadatamodel.h" @@ -97,27 +94,17 @@ QList DecoderFLACFactory::createPlayList(const QString &fileName, bo return QList() << info; } -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) TagLib::FileStream stream(QStringToFileName(fileName), true); -#endif if(fileName.endsWith(".flac", Qt::CaseInsensitive)) { -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) flacFile = new TagLib::FLAC::File(&stream, TagLib::ID3v2::FrameFactory::instance()); -#else - flacFile = new TagLib::FLAC::File(QStringToFileName(fileName)); -#endif tag = useMetaData ? flacFile->xiphComment() : 0; ap = flacFile->audioProperties(); } else if(fileName.endsWith(".oga", Qt::CaseInsensitive)) { -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) oggFlacFile = new TagLib::Ogg::FLAC::File(&stream); -#else - oggFlacFile = new TagLib::Ogg::FLAC::File(QStringToFileName(fileName)); -#endif tag = useMetaData ? oggFlacFile->tag() : 0; ap = oggFlacFile->audioProperties(); } @@ -208,5 +195,3 @@ QTranslator *DecoderFLACFactory::createTranslator(QObject *parent) translator->load(QString(":/flac_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(flac,DecoderFLACFactory) diff --git a/src/plugins/Input/flac/decoderflacfactory.h b/src/plugins/Input/flac/decoderflacfactory.h index fa2693d7a..9e16e7027 100644 --- a/src/plugins/Input/flac/decoderflacfactory.h +++ b/src/plugins/Input/flac/decoderflacfactory.h @@ -33,6 +33,7 @@ class DecoderFLACFactory : public QObject, DecoderFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: diff --git a/src/plugins/Input/flac/flacmetadatamodel.cpp b/src/plugins/Input/flac/flacmetadatamodel.cpp index 6abb8b9c4..33a37bdfa 100644 --- a/src/plugins/Input/flac/flacmetadatamodel.cpp +++ b/src/plugins/Input/flac/flacmetadatamodel.cpp @@ -26,9 +26,6 @@ #include #include "flacmetadatamodel.h" -#define QStringToTString_qt4(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8) -#define TStringToQString_qt4(s) QString::fromUtf8(s.toCString(true)).trimmed() - FLACMetaDataModel::FLACMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent) { m_file = 0; @@ -147,25 +144,25 @@ const QString VorbisCommentModel::value(Qmmp::MetaData key) switch((int) key) { case Qmmp::TITLE: - return TStringToQString_qt4(m_tag->title()); + return TStringToQString(m_tag->title()); case Qmmp::ARTIST: - return TStringToQString_qt4(m_tag->artist()); + return TStringToQString(m_tag->artist()); case Qmmp::ALBUMARTIST: if(m_tag->fieldListMap()["ALBUMARTIST"].isEmpty()) return QString(); else - return TStringToQString_qt4(m_tag->fieldListMap()["ALBUMARTIST"].front()); + return TStringToQString(m_tag->fieldListMap()["ALBUMARTIST"].front()); case Qmmp::ALBUM: - return TStringToQString_qt4(m_tag->album()); + return TStringToQString(m_tag->album()); case Qmmp::COMMENT: - return TStringToQString_qt4(m_tag->comment()); + return TStringToQString(m_tag->comment()); case Qmmp::GENRE: - return TStringToQString_qt4(m_tag->genre()); + return TStringToQString(m_tag->genre()); case Qmmp::COMPOSER: if(m_tag->fieldListMap()["COMPOSER"].isEmpty()) return QString(); else - return TStringToQString_qt4(m_tag->fieldListMap()["COMPOSER"].front()); + return TStringToQString(m_tag->fieldListMap()["COMPOSER"].front()); case Qmmp::YEAR: return QString::number(m_tag->year()); case Qmmp::TRACK: @@ -174,7 +171,7 @@ const QString VorbisCommentModel::value(Qmmp::MetaData key) if(m_tag->fieldListMap()["DISCNUMBER"].isEmpty()) return QString(); else - return TStringToQString_qt4(m_tag->fieldListMap()["DISCNUMBER"].front()); + return TStringToQString(m_tag->fieldListMap()["DISCNUMBER"].front()); } return QString(); } @@ -184,7 +181,7 @@ void VorbisCommentModel::setValue(Qmmp::MetaData key, const QString &value) if(!m_tag) return; - TagLib::String str = QStringToTString_qt4(value); + TagLib::String str = QStringToTString(value); switch((int) key) { diff --git a/src/plugins/Input/flac/replaygainreader.cpp b/src/plugins/Input/flac/replaygainreader.cpp index 023eaf12e..88d57cd13 100644 --- a/src/plugins/Input/flac/replaygainreader.cpp +++ b/src/plugins/Input/flac/replaygainreader.cpp @@ -23,34 +23,22 @@ #include #include #include -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) #include #include -#endif #include "replaygainreader.h" ReplayGainReader::ReplayGainReader(const QString &path) { -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) TagLib::FileStream stream(QStringToFileName(path), true); -#endif if(path.endsWith(".flac", Qt::CaseInsensitive)) { -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) TagLib::FLAC::File fileRef(&stream, TagLib::ID3v2::FrameFactory::instance()); -#else - TagLib::FLAC::File fileRef(QStringToFileName(path)); -#endif if(fileRef.xiphComment()) readVorbisComment(fileRef.xiphComment()); } else if(path.endsWith(".oga", Qt::CaseInsensitive)) { -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) TagLib::Ogg::FLAC::File fileRef(&stream); -#else - TagLib::Ogg::FLAC::File fileRef(QStringToFileName(path)); -#endif if(fileRef.tag()) readVorbisComment(fileRef.tag()); } diff --git a/src/plugins/Input/flac/translations/flac_plugin_bg.ts b/src/plugins/Input/flac/translations/flac_plugin_bg.ts index 40541d52b..9b8edf292 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_bg.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_bg.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin - + FLAC Files - + About FLAC Audio Plugin - + Qmmp FLAC Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length - + Sample rate - + Hz - + Channels - + Bitrate - + kbps - + File size - + KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_cs.ts b/src/plugins/Input/flac/translations/flac_plugin_cs.ts index 90c04a45b..a91fad91b 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_cs.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_cs.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin Modul FLAC - + FLAC Files Soubory FLAC - + About FLAC Audio Plugin O modulu FLAC - + Qmmp FLAC Audio Plugin Vstupní modul Qmmp FLAC - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length Délka - + Sample rate Vzorkovací frekvence - + Hz Hz - + Channels Počet kanálů - + Bitrate Datový tok - + kbps kbps - + File size Velikost souboru - + KB KiB diff --git a/src/plugins/Input/flac/translations/flac_plugin_de.ts b/src/plugins/Input/flac/translations/flac_plugin_de.ts index cebc831fe..ebc5e0318 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_de.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_de.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin FLAC-Modul - + FLAC Files FLAC-Dateien - + About FLAC Audio Plugin Über FLAC-Audiomodul - + Qmmp FLAC Audio Plugin Qmmp FLAC-Audiomodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length Länge - + Sample rate Abtastrate - + Hz Hz - + Channels Kanäle - + Bitrate Bitrate - + kbps KBit/s - + File size Dateigröße - + KB KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_el.ts b/src/plugins/Input/flac/translations/flac_plugin_el.ts index 4dd647b00..70cb93d2c 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_el.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_el.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin Πρόσθετο FLAC - + FLAC Files Αρχεία FLAC - + About FLAC Audio Plugin Σχετικά με το πρόσθετο ήχου FLAC - + Qmmp FLAC Audio Plugin Qmmp πρόσθετο ήχου FLAC - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length Διάρκεια - + Sample rate Ρυθμός δειγματοληψίας - + Hz Hz - + Channels Κανάλια - + Bitrate Ρυθμός bit - + kbps kbps - + File size Μέγεθος αρχείου - + KB KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_en.ts b/src/plugins/Input/flac/translations/flac_plugin_en.ts index 7642ed71b..df04c0c14 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_en.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_en.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin - + FLAC Files - + About FLAC Audio Plugin - + Qmmp FLAC Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length - + Sample rate - + Hz - + Channels - + Bitrate - + kbps - + File size - + KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_es.ts b/src/plugins/Input/flac/translations/flac_plugin_es.ts index da5fee14e..743a4ee8c 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_es.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_es.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin Módulo FLAC - + FLAC Files Archivos FLAC - + About FLAC Audio Plugin Acerca del módulo de audio FLAC - + Qmmp FLAC Audio Plugin Módulo de audio FLAC para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length Duración - + Sample rate Frecuencia - + Hz Hz - + Channels Canales - + Bitrate Tasa de bits - + kbps kbps - + File size Tamaño del archivo - + KB KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_fi.ts b/src/plugins/Input/flac/translations/flac_plugin_fi.ts index 6ca4765f8..3d9cab792 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_fi.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_fi.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin FLAC-liitännäinen - + FLAC Files FLAC-tiedostot - + About FLAC Audio Plugin Tietoja - FLAC-ääniliitännäinen - + Qmmp FLAC Audio Plugin Qmmp:n FLAC-ääniliitännäinen - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length Kesto - + Sample rate Näytteenottotaajuus - + Hz Hz - + Channels Kanavat - + Bitrate Bittinopeus - + kbps kbps - + File size Tiedostokoko - + KB kt diff --git a/src/plugins/Input/flac/translations/flac_plugin_fr.ts b/src/plugins/Input/flac/translations/flac_plugin_fr.ts index 2871a1b2a..cfd761ad8 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_fr.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_fr.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin Greffon FLAC - + FLAC Files Fichiers FLAC - + About FLAC Audio Plugin À propos du greffon audio FLAC - + Qmmp FLAC Audio Plugin Greffon audio FLAC pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length Longueur - + Sample rate Taux d'échantillonage - + Hz Hz - + Channels Canaux - + Bitrate Débit binaire - + kbps kbps - + File size Taille du fichier - + KB Ko diff --git a/src/plugins/Input/flac/translations/flac_plugin_gl_ES.ts b/src/plugins/Input/flac/translations/flac_plugin_gl_ES.ts index a2d57ab05..73894aeea 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_gl_ES.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_gl_ES.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin Engadido FLAC - + FLAC Files Ficheiros FLAC - + About FLAC Audio Plugin Sobre o engadido FLAC - + Qmmp FLAC Audio Plugin Engadido FLAC de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length Lonxitude - + Sample rate Frecuencia de mostra - + Hz Hz - + Channels Canais - + Bitrate Taxa de bits - + kbps kbps - + File size Tamaño de ficheiro - + KB KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_he.ts b/src/plugins/Input/flac/translations/flac_plugin_he.ts index 83fdf99c1..bb7e34805 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_he.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_he.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin תוסף FLAC - + FLAC Files קבצי FLAC - + About FLAC Audio Plugin אודות תוסף שמע FLAC - + Qmmp FLAC Audio Plugin תוסף שמע FLAC של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length אריכות - + Sample rate שיעור דגימה - + Hz הרץ - + Channels ערוצים - + Bitrate שיעור סיביות - + kbps - + File size גודל קובץ - + KB ק״ב diff --git a/src/plugins/Input/flac/translations/flac_plugin_hu.ts b/src/plugins/Input/flac/translations/flac_plugin_hu.ts index 1bf0bc95c..3585d905b 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_hu.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_hu.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin - + FLAC Files - + About FLAC Audio Plugin - + Qmmp FLAC Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length - + Sample rate - + Hz - + Channels - + Bitrate - + kbps - + File size - + KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_id.ts b/src/plugins/Input/flac/translations/flac_plugin_id.ts index e39eb7bc9..7eb7aa5c5 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_id.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_id.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin Plugin FLAC - + FLAC Files File FLAC - + About FLAC Audio Plugin Tentang Plugin Audio FLAC - + Qmmp FLAC Audio Plugin Plugin Audio FLAC Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length Panjang - + Sample rate Sample rate - + Hz Hz - + Channels Saluran - + Bitrate Bitrate - + kbps kbps - + File size Ukuran file - + KB KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_it.ts b/src/plugins/Input/flac/translations/flac_plugin_it.ts index 4b4d1f34c..239f28f82 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_it.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_it.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin Modulo FLAC - + FLAC Files Brani FLAC - + About FLAC Audio Plugin Info sul modulo audio FLAC - + Qmmp FLAC Audio Plugin Modulo Audio FLAC per Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilja Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length Durata - + Sample rate Campionamento - + Hz Hz - + Channels Canali - + Bitrate bit al secondo - + kbps kbps - + File size Dimensione file - + KB KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_ja.ts b/src/plugins/Input/flac/translations/flac_plugin_ja.ts index 8af046254..74a8d3a29 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_ja.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_ja.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin FLAC プラグイン - + FLAC Files FLAC ファイル - + About FLAC Audio Plugin FLAC 音響プラグインについて - + Qmmp FLAC Audio Plugin QMMP FLAC 音響プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length 長さ - + Sample rate サンプルレート - + Hz Hz - + Channels チャンネル - + Bitrate ビットレート - + kbps キロビット毎秒 - + File size ファイルの大きさ - + KB KiB diff --git a/src/plugins/Input/flac/translations/flac_plugin_kk.ts b/src/plugins/Input/flac/translations/flac_plugin_kk.ts index 6ee5f4647..42d88c19b 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_kk.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_kk.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin - + FLAC Files - + About FLAC Audio Plugin - + Qmmp FLAC Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length - + Sample rate - + Hz - + Channels - + Bitrate - + kbps - + File size - + KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_lt.ts b/src/plugins/Input/flac/translations/flac_plugin_lt.ts index a69cb26b7..b7b463b9b 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_lt.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_lt.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin FLAC įskiepis - + FLAC Files FLAC bylos - + About FLAC Audio Plugin Apie FLAC audio įskiepį - + Qmmp FLAC Audio Plugin Qmmp FLAC audio įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length Trukmė - + Sample rate Dažnis - + Hz Hz - + Channels Kanalai - + Bitrate Kokybė - + kbps kbps - + File size Bylos dydis - + KB KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_nl.ts b/src/plugins/Input/flac/translations/flac_plugin_nl.ts index 33bd6fdca..865df5ed8 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_nl.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_nl.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin FLAC Module - + FLAC Files FLAC Bestanden - + About FLAC Audio Plugin Over de FLAC Audio Module - + Qmmp FLAC Audio Plugin FLAC Audio Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length Duur - + Sample rate Sample frequentie - + Hz - + Channels Kanalen - + Bitrate Bitsnelheid - + kbps - + File size Bestandsgrootte - + KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_pl_PL.ts b/src/plugins/Input/flac/translations/flac_plugin_pl_PL.ts index 1175aa025..1fb0e8a21 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_pl_PL.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_pl_PL.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin Wtyczka FLAC - + FLAC Files Pliki FLAC - + About FLAC Audio Plugin O wtyczce FLAC Audio - + Qmmp FLAC Audio Plugin Wtyczka FLAC Audio dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length Długość - + Sample rate Próbkowanie - + Hz Hz - + Channels Kanały - + Bitrate Szybkość transmisji - + kbps - + File size Wielkość pliku - + KB KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_pt.ts b/src/plugins/Input/flac/translations/flac_plugin_pt.ts index 6680edd69..2c2f09f15 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_pt.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_pt.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin Suplemento FLAC - + FLAC Files Ficheiros FLAC - + About FLAC Audio Plugin Sobre o suplemento FLAC Audio - + Qmmp FLAC Audio Plugin Suplemento Qmmp FLAC Audio - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length Duração - + Sample rate Frequência - + Hz Hz - + Channels Canais - + Bitrate Taxa de dados - + kbps kbps - + File size Tamanho do ficheiro - + KB KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_pt_BR.ts b/src/plugins/Input/flac/translations/flac_plugin_pt_BR.ts index 911836f5c..b8e27e506 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_pt_BR.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_pt_BR.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin Plugin FLAC - + FLAC Files Arquivos FLAC - + About FLAC Audio Plugin Sobre o plugin FLAC Audio - + Qmmp FLAC Audio Plugin Plugin Qmmp FLAC Audio - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length Duração - + Sample rate Frequência - + Hz Hz - + Channels Canais - + Bitrate Taxa de dados - + kbps kbps - + File size Tamanho do arquivo - + KB KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_ru.ts b/src/plugins/Input/flac/translations/flac_plugin_ru.ts index 03e076f15..9fedc74cb 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_ru.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_ru.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin Модуль FLAC - + FLAC Files Файлы FLAC - + About FLAC Audio Plugin Об аудио-модуле FLAC - + Qmmp FLAC Audio Plugin Аудио-модуль FLAC для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length Длительность - + Sample rate Дискретизация - + Hz Гц - + Channels Каналов - + Bitrate Битовая частота - + kbps кбит/с - + File size Размер файла - + KB КБ diff --git a/src/plugins/Input/flac/translations/flac_plugin_sk.ts b/src/plugins/Input/flac/translations/flac_plugin_sk.ts index 2c5c89c48..d2f5ed089 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_sk.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_sk.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin - + FLAC Files - + About FLAC Audio Plugin - + Qmmp FLAC Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length - + Sample rate - + Hz - + Channels - + Bitrate - + kbps - + File size - + KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_sr_BA.ts b/src/plugins/Input/flac/translations/flac_plugin_sr_BA.ts index 90e4dd442..ec3b43d6e 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_sr_BA.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_sr_BA.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin ФЛАЦ прикључак - + FLAC Files ФЛАЦ фајлови - + About FLAC Audio Plugin О ФЛАЦ прикључку - + Qmmp FLAC Audio Plugin Кумп ФЛАЦ прикључак - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length Дужина - + Sample rate Узорковање - + Hz Hz - + Channels Канала - + Bitrate Битски проток - + kbps kb/s - + File size Величина - + KB KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_sr_RS.ts b/src/plugins/Input/flac/translations/flac_plugin_sr_RS.ts index d6ab1a9b0..bac8d9087 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_sr_RS.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_sr_RS.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin ФЛАЦ прикључак - + FLAC Files ФЛАЦ фајлови - + About FLAC Audio Plugin О ФЛАЦ прикључку - + Qmmp FLAC Audio Plugin Кумп ФЛАЦ прикључак - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length Дужина - + Sample rate Узорковање - + Hz Hz - + Channels Канала - + Bitrate Битски проток - + kbps kb/s - + File size Величина - + KB KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_tr.ts b/src/plugins/Input/flac/translations/flac_plugin_tr.ts index 2ceab6ad6..a06f9c317 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_tr.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_tr.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin FLAC Eklentisi - + FLAC Files FLAC Dosyaları - + About FLAC Audio Plugin FLAC Ses Eklentisi Hakkında - + Qmmp FLAC Audio Plugin Qmmp FLAC Ses Eklentisi - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length - + Sample rate - + Hz Hz - + Channels - + Bitrate - + kbps kbps - + File size - + KB KB diff --git a/src/plugins/Input/flac/translations/flac_plugin_uk_UA.ts b/src/plugins/Input/flac/translations/flac_plugin_uk_UA.ts index 36e16ffc1..72ac332fd 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_uk_UA.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_uk_UA.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin Модуль FLAC - + FLAC Files Файли FLAC - + About FLAC Audio Plugin Про аудіо-модуль FLAC - + Qmmp FLAC Audio Plugin Аудіо-модуль FLAC для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length Тривалість - + Sample rate Частота - + Hz Гц - + Channels Канали - + Bitrate Бітрейт - + kbps Кб/с - + File size Розмір файлу - + KB Кб diff --git a/src/plugins/Input/flac/translations/flac_plugin_zh_CN.ts b/src/plugins/Input/flac/translations/flac_plugin_zh_CN.ts index 4a17d94b6..82b7b1257 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_zh_CN.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_zh_CN.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin FLAC 插件 - + FLAC Files FLAC 文件 - + About FLAC Audio Plugin 关于 FLAC 音频插件 - + Qmmp FLAC Audio Plugin Qmmp FLAC 音频插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length 长度 - + Sample rate 取样率 - + Hz 赫兹 - + Channels 声音通道 - + Bitrate 比特率 - + kbps 千比特每秒 - + File size 文件大小 - + KB 千字节 diff --git a/src/plugins/Input/flac/translations/flac_plugin_zh_TW.ts b/src/plugins/Input/flac/translations/flac_plugin_zh_TW.ts index 3eb11398b..5b60850d7 100644 --- a/src/plugins/Input/flac/translations/flac_plugin_zh_TW.ts +++ b/src/plugins/Input/flac/translations/flac_plugin_zh_TW.ts @@ -4,27 +4,27 @@ DecoderFLACFactory - + FLAC Plugin FLAC 外掛 - + FLAC Files FLAC 檔案 - + About FLAC Audio Plugin 關於 FLAC 聲訊插件 - + Qmmp FLAC Audio Plugin Qmmp FLAC 聲訊插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> @@ -32,42 +32,42 @@ FLACMetaDataModel - + Length 長度 - + Sample rate 取樣率 - + Hz Hz - + Channels 聲音通道 - + Bitrate 比特率 - + kbps kbps - + File size 文件大小 - + KB KB diff --git a/src/plugins/Input/gme/CMakeLists.txt b/src/plugins/Input/gme/CMakeLists.txt index f164a28cf..655ee62c8 100644 --- a/src/plugins/Input/gme/CMakeLists.txt +++ b/src/plugins/Input/gme/CMakeLists.txt @@ -2,21 +2,8 @@ project(libgme) INCLUDE(CheckIncludeFileCXX) -# 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) @@ -47,16 +34,15 @@ SET(libgme_HDRS SET(libgme_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libgme_RCC_SRCS ${libgme_RCCS}) +QT5_ADD_RESOURCES(libgme_RCC_SRCS ${libgme_RCCS}) # user interface - SET(libgme_UIS settingsdialog.ui ) -QT4_WRAP_UI(libgme_UIS_H ${libgme_UIS}) +QT5_WRAP_UI(libgme_UIS_H ${libgme_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! @@ -65,6 +51,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(GME_FOUND) ADD_LIBRARY(gme MODULE ${libgme_SRCS} ${libgme_RCC_SRCS} ${libgme_HDRS} ${libgme_UIS_H}) add_dependencies(gme qmmp) -target_link_libraries(gme ${QT_LIBRARIES} libqmmp ${GME_LIB}) +target_link_libraries(gme Qt5::Widgets -lqmmp ${GME_LIB}) install(TARGETS gme DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(GME_FOUND) diff --git a/src/plugins/Input/gme/decodergmefactory.cpp b/src/plugins/Input/gme/decodergmefactory.cpp index 5c5872632..4b9050dee 100644 --- a/src/plugins/Input/gme/decodergmefactory.cpp +++ b/src/plugins/Input/gme/decodergmefactory.cpp @@ -18,10 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include -#include #include -#include +#include +#include #include "settingsdialog.h" #include "gmehelper.h" #include "decoder_gme.h" @@ -117,4 +116,3 @@ QTranslator *DecoderGmeFactory::createTranslator(QObject *parent) translator->load(QString(":/gme_plugin_") + locale); return translator; } -Q_EXPORT_PLUGIN2(gme,DecoderGmeFactory) diff --git a/src/plugins/Input/gme/decodergmefactory.h b/src/plugins/Input/gme/decodergmefactory.h index b35fa7cfc..4da246e70 100644 --- a/src/plugins/Input/gme/decodergmefactory.h +++ b/src/plugins/Input/gme/decodergmefactory.h @@ -36,6 +36,7 @@ class DecoderGmeFactory : public QObject, DecoderFactory { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: diff --git a/src/plugins/Input/gme/translations/gme_plugin_bg.ts b/src/plugins/Input/gme/translations/gme_plugin_bg.ts index 7e640c613..348be8780 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_bg.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_bg.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin - + Game Music Files - + About GME Audio Plugin - + Qmmp GME Audio Plugin - + This plugin uses Game_Music_Emu library to play game music files - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_cs.ts b/src/plugins/Input/gme/translations/gme_plugin_cs.ts index af63043a6..c328867bc 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_cs.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_cs.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin Modul GME - + Game Music Files Soubory s hudbou z her - + About GME Audio Plugin O modulu GME - + Qmmp GME Audio Plugin Modul Qmmp GME - + This plugin uses Game_Music_Emu library to play game music files Tento modul využívá knihovnu Game_Music_Emu pro přehrávání souborů s hudbou z her - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_de.ts b/src/plugins/Input/gme/translations/gme_plugin_de.ts index 25da4b044..1e5fb2c71 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_de.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_de.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin GME-Modul - + Game Music Files Musikdateien aus Spielen (Game Music) - + About GME Audio Plugin Über GME-Audiomodul - + Qmmp GME Audio Plugin Qmmp GME-Audiomodul - + This plugin uses Game_Music_Emu library to play game music files Dieses Modul verwendet die Bibliothek „Game_Music_Emu“, um Musikdateien aus Spielen abzuspielen - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_el.ts b/src/plugins/Input/gme/translations/gme_plugin_el.ts index d0ed78215..ebada90c8 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_el.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_el.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin Πρόσθετο GME - + Game Music Files Αρχεία μουσικής παιγνιδιών - + About GME Audio Plugin Σχετικά με το πρόσθετο ήχου GME - + Qmmp GME Audio Plugin Qmmp πρόσθετο ήχου GME - + This plugin uses Game_Music_Emu library to play game music files Αυτό το πρόσθετο χρησιμοποιεί τη βιβλιοθήκη Game_Music_Emu για την αναπαραγωγή αρχείων μουσικής παιγνιδιών - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_en.ts b/src/plugins/Input/gme/translations/gme_plugin_en.ts index ece6a11e2..a5840aa96 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_en.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_en.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin - + Game Music Files - + About GME Audio Plugin - + Qmmp GME Audio Plugin - + This plugin uses Game_Music_Emu library to play game music files - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_es.ts b/src/plugins/Input/gme/translations/gme_plugin_es.ts index 6725a69fc..221a6a59d 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_es.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_es.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin Módulo GME - + Game Music Files Archivos de Game Music - + About GME Audio Plugin Acerca del Módulo de Audio GME - + Qmmp GME Audio Plugin Módulo de Audio GME de Qmmp - + This plugin uses Game_Music_Emu library to play game music files Este módulo usa la biblioteca Game_Music_Emu para reproducir archivos de música - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_fi.ts b/src/plugins/Input/gme/translations/gme_plugin_fi.ts index acee38825..1af78f27a 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_fi.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_fi.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin GME-liitännäinen - + Game Music Files - + About GME Audio Plugin - + Qmmp GME Audio Plugin - + This plugin uses Game_Music_Emu library to play game music files - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_fr.ts b/src/plugins/Input/gme/translations/gme_plugin_fr.ts index b045f7ce6..be2790e14 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_fr.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_fr.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin Greffon GME - + Game Music Files Fichiers de musiques de jeux - + About GME Audio Plugin À propos du greffon audio GME - + Qmmp GME Audio Plugin Greffon audio GME pour Qmmp - + This plugin uses Game_Music_Emu library to play game music files Ce greffon utilise la bibliothèque Game_Music_Emu pour jouer les fichiers de musiques de jeux - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_gl_ES.ts b/src/plugins/Input/gme/translations/gme_plugin_gl_ES.ts index f7da931b2..4797d9821 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_gl_ES.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_gl_ES.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin Engadido GME - + Game Music Files Game Music Files - + About GME Audio Plugin Sobre o engadido GME - + Qmmp GME Audio Plugin Engadido GME de Qmmp - + This plugin uses Game_Music_Emu library to play game music files Este engadido usa a librería Game_Music_Emu para reproducir ficheiros de xogo de música - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_he.ts b/src/plugins/Input/gme/translations/gme_plugin_he.ts index 8fa398cee..f6e4dc994 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_he.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_he.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin תוסף GME - + Game Music Files קבצי מוזיקה של משחק - + About GME Audio Plugin אודות תוסף שמע GME - + Qmmp GME Audio Plugin תוסף שמע GME של Qmmp - + This plugin uses Game_Music_Emu library to play game music files תוסף זה משתמש בספריית Game_Music_Emu לצורך ניגון קבצי מוזיקה של משחק וידאו - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_hu.ts b/src/plugins/Input/gme/translations/gme_plugin_hu.ts index 369174eba..fe7d19596 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_hu.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_hu.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin - + Game Music Files - + About GME Audio Plugin - + Qmmp GME Audio Plugin - + This plugin uses Game_Music_Emu library to play game music files - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_id.ts b/src/plugins/Input/gme/translations/gme_plugin_id.ts index d5a37fbd7..c9cb4b770 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_id.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_id.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin Plugin GME - + Game Music Files File Musik Game - + About GME Audio Plugin Tentang Plugin Audio GME - + Qmmp GME Audio Plugin Plugin Audio GME Qmmp - + This plugin uses Game_Music_Emu library to play game music files Plugin ini menggunakan pustaka Game_Music_Emu untuk memainkan file musik game - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_it.ts b/src/plugins/Input/gme/translations/gme_plugin_it.ts index 1d6472d9b..2540ecd89 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_it.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_it.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin - + Game Music Files - + About GME Audio Plugin - + Qmmp GME Audio Plugin - + This plugin uses Game_Music_Emu library to play game music files - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_ja.ts b/src/plugins/Input/gme/translations/gme_plugin_ja.ts index e740f4266..ff0d37f78 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_ja.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_ja.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin GME プラグイン - + Game Music Files ゲーム音楽ファイル - + About GME Audio Plugin GME 音響プラグインについて - + Qmmp GME Audio Plugin QMMP 用 GME 音響プラグイン - + This plugin uses Game_Music_Emu library to play game music files このプラグインは Game_Music_Emu ライブラリを用いてゲーム音楽ファイルを再生します。 - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_kk.ts b/src/plugins/Input/gme/translations/gme_plugin_kk.ts index 6c2859cbc..c65e391a3 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_kk.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_kk.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin - + Game Music Files - + About GME Audio Plugin - + Qmmp GME Audio Plugin - + This plugin uses Game_Music_Emu library to play game music files - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_lt.ts b/src/plugins/Input/gme/translations/gme_plugin_lt.ts index 3fbe877c6..26a6bc1ef 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_lt.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_lt.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin GME įskiepis - + Game Music Files Žaidimų muzikos bylos - + About GME Audio Plugin Apie GME Audio įskiepį - + Qmmp GME Audio Plugin Qmmp GME Audio įskiepis - + This plugin uses Game_Music_Emu library to play game music files Šis įskiepis naudoja Game_Music_Emu biblioteką žaidimų muzikos bylų grojimui - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_nl.ts b/src/plugins/Input/gme/translations/gme_plugin_nl.ts index da7e8bc63..5c98a7fcd 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_nl.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_nl.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin GME Module - + Game Music Files Spel Muziek Bestanden - + About GME Audio Plugin Over de GME Audio Module - + Qmmp GME Audio Plugin GME Audio Module voor Qmmp - + This plugin uses Game_Music_Emu library to play game music files Deze module faciliteert in het afspelen van spelmuziek door gebruik van de Game_Music_Emu bibliotheek - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_pl_PL.ts b/src/plugins/Input/gme/translations/gme_plugin_pl_PL.ts index f50118d8d..0f39401e9 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_pl_PL.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_pl_PL.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin Wtyczka GME - + Game Music Files Game Music Files - + About GME Audio Plugin O wtyczce dźwiękowej GME - + Qmmp GME Audio Plugin Wtyczka dźwiękowa GME dla Qmmp - + This plugin uses Game_Music_Emu library to play game music files Ta wtyczka używa biblioteki Game_Music_Emu do odtwarzania plików muzycznych z gier - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_pt.ts b/src/plugins/Input/gme/translations/gme_plugin_pt.ts index c560da307..bd4111fe8 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_pt.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_pt.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin Suplemento GME - + Game Music Files Ficheiros Game Music - + About GME Audio Plugin Sobre o suplemento GME Audio - + Qmmp GME Audio Plugin Suplemento Qmmp GME Audio - + This plugin uses Game_Music_Emu library to play game music files Este suplemento utiliza a biblioteca Game_Music_Emu para a reprodução - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_pt_BR.ts b/src/plugins/Input/gme/translations/gme_plugin_pt_BR.ts index db3c0c0c7..b9c924836 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_pt_BR.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_pt_BR.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin Plugin GME - + Game Music Files Arquivos Game Music - + About GME Audio Plugin Sobre o plugin GME Audio - + Qmmp GME Audio Plugin Plugin Qmmp GME Audio - + This plugin uses Game_Music_Emu library to play game music files Este plugin utiliza a biblioteca Game_Music_Emu para a reprodução - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_ru.ts b/src/plugins/Input/gme/translations/gme_plugin_ru.ts index 16320d1ae..5ade1e0b9 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_ru.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_ru.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin Модуль GME - + Game Music Files Программы звукогенераторов - + About GME Audio Plugin Об аудио-модуле GME - + Qmmp GME Audio Plugin Аудио-модуль GME для Qmmp - + This plugin uses Game_Music_Emu library to play game music files Для воспроизведения используется библиотека Game_Music_Emu - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_sk.ts b/src/plugins/Input/gme/translations/gme_plugin_sk.ts index 1f2f693b1..e867e34bd 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_sk.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_sk.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin - + Game Music Files - + About GME Audio Plugin - + Qmmp GME Audio Plugin - + This plugin uses Game_Music_Emu library to play game music files - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_sr_BA.ts b/src/plugins/Input/gme/translations/gme_plugin_sr_BA.ts index 1bcb2058b..30e6672db 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_sr_BA.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_sr_BA.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin ГМЕ прикључак - + Game Music Files Музички фајлови за игре - + About GME Audio Plugin О ГМЕ прикључку - + Qmmp GME Audio Plugin Кумп ГМЕ прикључак - + This plugin uses Game_Music_Emu library to play game music files Користи „Game_Music_Emu“ библиотеку за пуштање музичких фајлова за игре - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_sr_RS.ts b/src/plugins/Input/gme/translations/gme_plugin_sr_RS.ts index eead24668..0472e8b24 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_sr_RS.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_sr_RS.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin ГМЕ прикључак - + Game Music Files Музички фајлови за игре - + About GME Audio Plugin О ГМЕ прикључку - + Qmmp GME Audio Plugin Кумп ГМЕ прикључак - + This plugin uses Game_Music_Emu library to play game music files Користи „Game_Music_Emu“ библиотеку за пуштање музичких фајлова за игре - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_tr.ts b/src/plugins/Input/gme/translations/gme_plugin_tr.ts index 0a112111f..905c0ce36 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_tr.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_tr.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin - + Game Music Files - + About GME Audio Plugin - + Qmmp GME Audio Plugin - + This plugin uses Game_Music_Emu library to play game music files - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_uk_UA.ts b/src/plugins/Input/gme/translations/gme_plugin_uk_UA.ts index 8b868b170..d905a3c5b 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_uk_UA.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_uk_UA.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin Модуль GME - + Game Music Files Програми звукогенераторів - + About GME Audio Plugin Про аудіо-модуль GME - + Qmmp GME Audio Plugin Аудіо-модуль GME для Qmmp - + This plugin uses Game_Music_Emu library to play game music files Для відтворення використовується бібліотека Game_Music_Emu - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_zh_CN.ts b/src/plugins/Input/gme/translations/gme_plugin_zh_CN.ts index 2a38145f6..b12ff942e 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_zh_CN.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_zh_CN.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin GME 插件 - + Game Music Files Game 音乐文件 - + About GME Audio Plugin 关于 GME 音频插件 - + Qmmp GME Audio Plugin Qmmp GME 音频插件 - + This plugin uses Game_Music_Emu library to play game music files 此插件使用 Game_Music_Emu 库来播放 game 音乐文件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/gme/translations/gme_plugin_zh_TW.ts b/src/plugins/Input/gme/translations/gme_plugin_zh_TW.ts index 76980d05f..d59c3cbec 100644 --- a/src/plugins/Input/gme/translations/gme_plugin_zh_TW.ts +++ b/src/plugins/Input/gme/translations/gme_plugin_zh_TW.ts @@ -4,32 +4,32 @@ DecoderGmeFactory - + GME Plugin GME 外掛 - + Game Music Files Game 音頻文件 - + About GME Audio Plugin 關於 Game 音頻文件 - + Qmmp GME Audio Plugin Qmmp Game 音頻文件 - + This plugin uses Game_Music_Emu library to play game music files 此插件使用 Game_Music_Emu 庫播放 Game 音頻文件 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mad/CMakeLists.txt b/src/plugins/Input/mad/CMakeLists.txt index 65c04ae49..34f13bfb9 100644 --- a/src/plugins/Input/mad/CMakeLists.txt +++ b/src/plugins/Input/mad/CMakeLists.txt @@ -1,20 +1,7 @@ project(libmad) -# 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) @@ -43,7 +30,7 @@ SET(libmad_HDRS SET(libmad_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libmad_RCC_SRCS ${libmad_RCCS}) +QT5_ADD_RESOURCES(libmad_RCC_SRCS ${libmad_RCCS}) # user interface @@ -52,7 +39,7 @@ SET(libmad_UIS settingsdialog.ui ) -QT4_WRAP_UI(libmad_UIS_H ${libmad_UIS}) +QT5_WRAP_UI(libmad_UIS_H ${libmad_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -60,6 +47,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(MAD_FOUND) ADD_LIBRARY(mad MODULE ${libmad_SRCS} ${libmad_UIS_H} ${libmad_RCC_SRCS} ${libmad_HDRS}) add_dependencies(mad qmmp) -target_link_libraries(mad ${QT_LIBRARIES} libqmmp ${MAD_LDFLAGS} ${TAGLIB_LDFLAGS}) +target_link_libraries(mad Qt5::Widgets -lqmmp ${MAD_LDFLAGS} ${TAGLIB_LDFLAGS}) install(TARGETS mad DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(MAD_FOUND) diff --git a/src/plugins/Input/mad/decodermadfactory.cpp b/src/plugins/Input/mad/decodermadfactory.cpp index b003eb9b9..96227bd2f 100644 --- a/src/plugins/Input/mad/decodermadfactory.cpp +++ b/src/plugins/Input/mad/decodermadfactory.cpp @@ -20,11 +20,10 @@ #include #include -#include -#include #include #include -#include +#include +#include #include #include #include @@ -33,9 +32,7 @@ #include #include #include -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) #include -#endif #include "mpegmetadatamodel.h" #include "replaygainreader.h" #include "settingsdialog.h" @@ -142,12 +139,8 @@ QList DecoderMADFactory::createPlayList(const QString &fileName, boo FileInfo *info = new FileInfo(fileName); TagLib::Tag *tag = 0; -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) TagLib::FileStream stream(QStringToFileName(fileName), true); TagLib::MPEG::File fileRef(&stream, TagLib::ID3v2::FrameFactory::instance()); -#else - TagLib::MPEG::File fileRef(QStringToFileName(fileName)); -#endif if (useMetaData) { @@ -293,5 +286,3 @@ QTranslator *DecoderMADFactory::createTranslator(QObject *parent) translator->load(QString(":/mad_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(mad, DecoderMADFactory) diff --git a/src/plugins/Input/mad/decodermadfactory.h b/src/plugins/Input/mad/decodermadfactory.h index 25820d2f0..a3f0139ac 100644 --- a/src/plugins/Input/mad/decodermadfactory.h +++ b/src/plugins/Input/mad/decodermadfactory.h @@ -34,6 +34,7 @@ class DecoderMADFactory : public QObject, DecoderFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: diff --git a/src/plugins/Input/mad/replaygainreader.cpp b/src/plugins/Input/mad/replaygainreader.cpp index d90822b75..e4bb4f56c 100644 --- a/src/plugins/Input/mad/replaygainreader.cpp +++ b/src/plugins/Input/mad/replaygainreader.cpp @@ -25,20 +25,14 @@ #include #include #include -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) #include #include -#endif #include "replaygainreader.h" ReplayGainReader::ReplayGainReader(const QString &path) { -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) TagLib::FileStream stream(QStringToFileName(path), true); TagLib::MPEG::File fileRef(&stream, TagLib::ID3v2::FrameFactory::instance()); -#else - TagLib::MPEG::File fileRef(QStringToFileName(path)); -#endif if(fileRef.ID3v2Tag()) readID3v2(fileRef.ID3v2Tag()); if(m_values.isEmpty() && fileRef.APETag()) diff --git a/src/plugins/Input/mad/translations/mad_plugin_bg.ts b/src/plugins/Input/mad/translations/mad_plugin_bg.ts index 328499f5e..3425ba5a6 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_bg.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_bg.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin - + MPEG Files - + About MPEG Audio Plugin - + Qmmp MPEG Audio Plugin - + Compiled against libmad version: - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects diff --git a/src/plugins/Input/mad/translations/mad_plugin_cs.ts b/src/plugins/Input/mad/translations/mad_plugin_cs.ts index 732d24f4a..a8cab007b 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_cs.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_cs.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin Modul MPEG - + MPEG Files Soubory MPEG - + About MPEG Audio Plugin O modulu MPEG - + Qmmp MPEG Audio Plugin Vstupní modul Qmmp MPEG - + Compiled against libmad version: Zkompilováno s libmad verze: - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects Zdrojový kód je založen na projektech mq3 a madplay diff --git a/src/plugins/Input/mad/translations/mad_plugin_de.ts b/src/plugins/Input/mad/translations/mad_plugin_de.ts index e929565d7..bbbc0f671 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_de.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_de.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin MPEG-Modul - + MPEG Files MPEG-Dateien - + About MPEG Audio Plugin Über MPEG-Audiomodul - + Qmmp MPEG Audio Plugin Qmmp MPEG-Audiomodul - + Compiled against libmad version: Kompiliert gegen libmad-Version: - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects Basiert auf Code von den mq3- und madplay-Projekten diff --git a/src/plugins/Input/mad/translations/mad_plugin_el.ts b/src/plugins/Input/mad/translations/mad_plugin_el.ts index 2fc875a1a..162999bb5 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_el.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_el.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin Πρόσθετο MPEG - + MPEG Files Αρχεία MPEG - + About MPEG Audio Plugin Σχετικά με το πρόσθετο ήχου MPEG - + Qmmp MPEG Audio Plugin Qmmp πρόσθετο ήχου MPEG - + Compiled against libmad version: Μεταγλωττίστηκε χρησιμοποιώντας την έκδοση της βιβλιοθήκης libmad: - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> - + Source code based on mq3 and madplay projects Ο πηγαίος κώδικας έχει βασιστεί στα έργα mq3 και madplay diff --git a/src/plugins/Input/mad/translations/mad_plugin_en.ts b/src/plugins/Input/mad/translations/mad_plugin_en.ts index 926489c14..9614b9bfe 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_en.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_en.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin - + MPEG Files - + About MPEG Audio Plugin - + Qmmp MPEG Audio Plugin - + Compiled against libmad version: - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects diff --git a/src/plugins/Input/mad/translations/mad_plugin_es.ts b/src/plugins/Input/mad/translations/mad_plugin_es.ts index 0d86dd4f8..bd8d4b0eb 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_es.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_es.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin Módulo MPEG - + MPEG Files Archivos MPEG - + About MPEG Audio Plugin Acerca del módulo de audio MPEG - + Qmmp MPEG Audio Plugin Módulo de audio MPEG para Qmmp - + Compiled against libmad version: Compilado con libmad version: - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects Código fuente basado sobre proyectos mq3 y madplay diff --git a/src/plugins/Input/mad/translations/mad_plugin_fi.ts b/src/plugins/Input/mad/translations/mad_plugin_fi.ts index bd561c491..650ff7c2c 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_fi.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_fi.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin MPEG-liitännäinen - + MPEG Files MPEG-tiedostot - + About MPEG Audio Plugin Tietoja - MPEG-ääniliitännäinen - + Qmmp MPEG Audio Plugin Qmmp:n MPEG-ääniliitännäinen - + Compiled against libmad version: Koostettu vasten libmadin versiota: - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects diff --git a/src/plugins/Input/mad/translations/mad_plugin_fr.ts b/src/plugins/Input/mad/translations/mad_plugin_fr.ts index afe03196a..75b564ce6 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_fr.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_fr.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin Greffon MPEG - + MPEG Files Fichiers MPEG - + About MPEG Audio Plugin À propos du greffon audio MPEG - + Qmmp MPEG Audio Plugin Greffon audio MPEG pour Qmmp - + Compiled against libmad version: Compilé contre libmad version : - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects Code source basé sur les projets mq3 et madplay diff --git a/src/plugins/Input/mad/translations/mad_plugin_gl_ES.ts b/src/plugins/Input/mad/translations/mad_plugin_gl_ES.ts index d188424ab..ac07a4377 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_gl_ES.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_gl_ES.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin Engadido MPEG - + MPEG Files Ficheiros MPEG - + About MPEG Audio Plugin Sobre o engadido MPEG - + Qmmp MPEG Audio Plugin Engadido audio MPEG de Qmmp - + Compiled against libmad version: Compilado coa versión libmad: - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects Código fonte baseado nos proxectos mq3 e madplay diff --git a/src/plugins/Input/mad/translations/mad_plugin_he.ts b/src/plugins/Input/mad/translations/mad_plugin_he.ts index 93347b923..5b238f1d1 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_he.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_he.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin תוסף MPEG - + MPEG Files קבצי MPEG - + About MPEG Audio Plugin אודות תוסף שמע MPEG - + Qmmp MPEG Audio Plugin תוסף שמע MPEG של Qmmp - + Compiled against libmad version: הודר כנגדlibmad גירסה: - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects קוד מקור מבוסס על המיזמים mq3 וגם madplay diff --git a/src/plugins/Input/mad/translations/mad_plugin_hu.ts b/src/plugins/Input/mad/translations/mad_plugin_hu.ts index 28e8f79a3..2ab90a740 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_hu.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_hu.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin - + MPEG Files - + About MPEG Audio Plugin - + Qmmp MPEG Audio Plugin - + Compiled against libmad version: - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects diff --git a/src/plugins/Input/mad/translations/mad_plugin_id.ts b/src/plugins/Input/mad/translations/mad_plugin_id.ts index 34b33e649..0f25c2ade 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_id.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_id.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin Plugin MPEG - + MPEG Files File MPEG - + About MPEG Audio Plugin Tentang Plugin Audio MPEG - + Qmmp MPEG Audio Plugin Plugin Audio MPEG Qmmp - + Compiled against libmad version: Dikompilasi terhadap versi libmad: - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects Kode sumber berdasarkan pada mq3 dan proyek madplay diff --git a/src/plugins/Input/mad/translations/mad_plugin_it.ts b/src/plugins/Input/mad/translations/mad_plugin_it.ts index 5e0a44134..be82bfb0a 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_it.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_it.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin Modulo MPEG - + MPEG Files Brani MPEG - + About MPEG Audio Plugin Info sul modulo audio MPEG - + Qmmp MPEG Audio Plugin Modulo audio MPEG per Qmmp - + Compiled against libmad version: Compilato con libmad-Version: - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects diff --git a/src/plugins/Input/mad/translations/mad_plugin_ja.ts b/src/plugins/Input/mad/translations/mad_plugin_ja.ts index f03748ea4..d860a0c4c 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_ja.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_ja.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin MPEG プラグイン - + MPEG Files MPEG ファイル - + About MPEG Audio Plugin MPEG 音響プラグインについて - + Qmmp MPEG Audio Plugin QMMP MPEG 音響プラグイン - + Compiled against libmad version: コンパイル時に使われた libmad の版はつぎのとおり: - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects ソースコードは mq3 と madplay の両プロジェクトから流用 diff --git a/src/plugins/Input/mad/translations/mad_plugin_kk.ts b/src/plugins/Input/mad/translations/mad_plugin_kk.ts index 0c4fc46b6..8a702981c 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_kk.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_kk.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin - + MPEG Files - + About MPEG Audio Plugin - + Qmmp MPEG Audio Plugin - + Compiled against libmad version: - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects diff --git a/src/plugins/Input/mad/translations/mad_plugin_lt.ts b/src/plugins/Input/mad/translations/mad_plugin_lt.ts index de1c0b562..749d83767 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_lt.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_lt.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin MPEG įskiepis - + MPEG Files MPEG bylos - + About MPEG Audio Plugin Apie MPEG audio įskiepį - + Qmmp MPEG Audio Plugin Qmmp MPEG įskiepis - + Compiled against libmad version: Sukurta libmad pagrindu: - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects Kodas sukurtas mq3 ir madplay projektų kodais diff --git a/src/plugins/Input/mad/translations/mad_plugin_nl.ts b/src/plugins/Input/mad/translations/mad_plugin_nl.ts index 4fa8578b9..0f1408d9f 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_nl.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_nl.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin MPEG Module - + MPEG Files MPEG Bestanden - + About MPEG Audio Plugin Over de MPEG Audio Module - + Qmmp MPEG Audio Plugin MPEG Audio Module voor Qmmp - + Compiled against libmad version: Gecompileerd tegen libmad met versie: - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects Broncode gebasseerd op 'mq3' en 'madplay' projecten diff --git a/src/plugins/Input/mad/translations/mad_plugin_pl_PL.ts b/src/plugins/Input/mad/translations/mad_plugin_pl_PL.ts index 51f17314e..223bd6102 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_pl_PL.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_pl_PL.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin Wtyczka MPEG - + MPEG Files Pliki MPEG - + About MPEG Audio Plugin O wtyczce Audio MPEG - + Qmmp MPEG Audio Plugin Wtyczka MPEG Audio dla Qmmp - + Compiled against libmad version: Skompilowane przy użyciu biblioteki libmad w wersji: - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects Kod źródłowy oparty na projektach mq3 oraz madplay diff --git a/src/plugins/Input/mad/translations/mad_plugin_pt.ts b/src/plugins/Input/mad/translations/mad_plugin_pt.ts index 675daa421..0aa2c048d 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_pt.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_pt.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin Suplemento MPEG - + MPEG Files Ficheiros MPEG - + About MPEG Audio Plugin Sobre o suplemento MPEG Audio - + Qmmp MPEG Audio Plugin Suplemento Qmmp MPEG Audio - + Compiled against libmad version: Compilado com a versão libmad: - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects Baseado no código fonte dos projetos mq3 e madplay diff --git a/src/plugins/Input/mad/translations/mad_plugin_pt_BR.ts b/src/plugins/Input/mad/translations/mad_plugin_pt_BR.ts index 16488f2a2..58e4cf0d3 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_pt_BR.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_pt_BR.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin Plugin MPEG - + MPEG Files Arquivos MPEG - + About MPEG Audio Plugin Sobre o plugin MPEG Audio - + Qmmp MPEG Audio Plugin Plugin Qmmp MPEG Audio - + Compiled against libmad version: Compilado com a versão libmad: - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects Baseado no código fonte dos projetos mq3 e madplay diff --git a/src/plugins/Input/mad/translations/mad_plugin_ru.ts b/src/plugins/Input/mad/translations/mad_plugin_ru.ts index 49b4a5d4c..0173fbdee 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_ru.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_ru.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin Модуль MPEG - + MPEG Files Файлы MPEG - + About MPEG Audio Plugin Об аудио-модуле MPEG - + Qmmp MPEG Audio Plugin Аудио-модуль MPEG для Qmmp - + Compiled against libmad version: Собрано с версией libmad: - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects Исходный код снован на проектах mq3 и madplay diff --git a/src/plugins/Input/mad/translations/mad_plugin_sk.ts b/src/plugins/Input/mad/translations/mad_plugin_sk.ts index efbce9004..496c5c812 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_sk.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_sk.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin - + MPEG Files - + About MPEG Audio Plugin - + Qmmp MPEG Audio Plugin - + Compiled against libmad version: - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects diff --git a/src/plugins/Input/mad/translations/mad_plugin_sr_BA.ts b/src/plugins/Input/mad/translations/mad_plugin_sr_BA.ts index 55686229a..9d6f7751a 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_sr_BA.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_sr_BA.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin МПЕГ прикључак - + MPEG Files МПЕГ фајлови - + About MPEG Audio Plugin О МПЕГ прикључку - + Qmmp MPEG Audio Plugin Кумп МПЕГ прикључак - + Compiled against libmad version: Компилован на libmad издању: - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects Заснован на пројектима mq3 и madplay diff --git a/src/plugins/Input/mad/translations/mad_plugin_sr_RS.ts b/src/plugins/Input/mad/translations/mad_plugin_sr_RS.ts index dd8cdf402..1f2a2b712 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_sr_RS.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_sr_RS.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin МПЕГ прикључак - + MPEG Files МПЕГ фајлови - + About MPEG Audio Plugin О МПЕГ прикључку - + Qmmp MPEG Audio Plugin Кумп МПЕГ прикључак - + Compiled against libmad version: Компилован на libmad издању: - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects Заснован на пројектима mq3 и madplay diff --git a/src/plugins/Input/mad/translations/mad_plugin_tr.ts b/src/plugins/Input/mad/translations/mad_plugin_tr.ts index 6da3f51dd..beff9ad80 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_tr.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_tr.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin MPEG Eklentisi - + MPEG Files MPEG Dosyaları - + About MPEG Audio Plugin MPEG Ses Eklentisi Hakkında - + Qmmp MPEG Audio Plugin Qmmp MPEG Ses Eklentisi - + Compiled against libmad version: Derlendiği libmad sürümü: - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects diff --git a/src/plugins/Input/mad/translations/mad_plugin_uk_UA.ts b/src/plugins/Input/mad/translations/mad_plugin_uk_UA.ts index bca23cb57..b533d0630 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_uk_UA.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_uk_UA.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin Модуль MPEG - + MPEG Files Файли MPEG - + About MPEG Audio Plugin Про аудіо-модуль MPEG - + Qmmp MPEG Audio Plugin Аудіо-модуль MPEG для Qmmp - + Compiled against libmad version: Зібрано з версією libmad: - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects Вихідні коди базуються на проектах mq3 та madplay diff --git a/src/plugins/Input/mad/translations/mad_plugin_zh_CN.ts b/src/plugins/Input/mad/translations/mad_plugin_zh_CN.ts index c531ae832..40ffa5f37 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_zh_CN.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_zh_CN.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin MPEG 插件 - + MPEG Files MPEG 文件 - + About MPEG Audio Plugin 关于 MPEG 音频插件 - + Qmmp MPEG Audio Plugin Qmmp MPEG 音频插件 - + Compiled against libmad version: 编译基于 libmad 版本： - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects 源代码基于mq3及madplay项目 diff --git a/src/plugins/Input/mad/translations/mad_plugin_zh_TW.ts b/src/plugins/Input/mad/translations/mad_plugin_zh_TW.ts index cf7f68e9c..e6546e0c3 100644 --- a/src/plugins/Input/mad/translations/mad_plugin_zh_TW.ts +++ b/src/plugins/Input/mad/translations/mad_plugin_zh_TW.ts @@ -4,37 +4,37 @@ DecoderMADFactory - + MPEG Plugin MPEG 外掛 - + MPEG Files MPEG 檔案 - + About MPEG Audio Plugin 關於 MPEG 聲訊插件 - + Qmmp MPEG Audio Plugin Qmmp MPEG 聲訊插件 - + Compiled against libmad version: 編譯基於 libmad 的版本： - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 and madplay projects diff --git a/src/plugins/Input/modplug/CMakeLists.txt b/src/plugins/Input/modplug/CMakeLists.txt index 8ee06b906..716a0c8aa 100644 --- a/src/plugins/Input/modplug/CMakeLists.txt +++ b/src/plugins/Input/modplug/CMakeLists.txt @@ -2,21 +2,8 @@ project(libmodplug) 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) @@ -54,7 +41,7 @@ SET(libmodplug_HDRS SET(libmodplug_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libmodplug_RCC_SRCS ${libmodplug_RCCS}) +QT5_ADD_RESOURCES(libmodplug_RCC_SRCS ${libmodplug_RCCS}) # user interface @@ -62,7 +49,7 @@ SET(libmodplug_UIS settingsdialog.ui ) -QT4_WRAP_UI(libmodplug_UIS_H ${libmodplug_UIS}) +QT5_WRAP_UI(libmodplug_UIS_H ${libmodplug_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -71,7 +58,7 @@ IF(MODPLUG_FOUND) ADD_LIBRARY(modplug MODULE ${libmodplug_SRCS} ${libmodplug_UIS_H} ${libmodplug_RCC_SRCS} ${libmodplug_HDRS}) add_dependencies(modplug qmmp) -target_link_libraries(modplug ${QT_LIBRARIES} libqmmp ${MODPLUG_LDFLAGS}) +target_link_libraries(modplug Qt5::Widgets -lqmmp ${MODPLUG_LDFLAGS}) install(TARGETS modplug DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(MODPLUG_FOUND) diff --git a/src/plugins/Input/modplug/decodermodplugfactory.cpp b/src/plugins/Input/modplug/decodermodplugfactory.cpp index 400a7334d..d52718133 100644 --- a/src/plugins/Input/modplug/decodermodplugfactory.cpp +++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * + * Copyright (C) 2008-2015 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,13 +18,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include #include #include #include @@ -134,5 +133,3 @@ QTranslator *DecoderModPlugFactory::createTranslator(QObject *parent) translator->load(QString(":/modplug_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(modplug,DecoderModPlugFactory) diff --git a/src/plugins/Input/modplug/decodermodplugfactory.h b/src/plugins/Input/modplug/decodermodplugfactory.h index f49c2a1d3..6cb255903 100644 --- a/src/plugins/Input/modplug/decodermodplugfactory.h +++ b/src/plugins/Input/modplug/decodermodplugfactory.h @@ -35,6 +35,7 @@ class DecoderModPlugFactory : public QObject, DecoderFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_bg.ts b/src/plugins/Input/modplug/translations/modplug_plugin_bg.ts index 1fc8a8976..05f38e807 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_bg.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_bg.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin - + ModPlug Files - + About ModPlug Audio Plugin - + Qmmp ModPlug Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms - + Modplug Plugin developers: - + Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_cs.ts b/src/plugins/Input/modplug/translations/modplug_plugin_cs.ts index b07b312f8..73d6c438d 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_cs.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_cs.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin Modul ModPlug - + ModPlug Files Soubory ModPlug - + About ModPlug Audio Plugin O modulu ModPlug - + Qmmp ModPlug Audio Plugin Vstupní modul Qmmp ModPlug - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms Založeno na modulu Modplug pro XMMS - + Modplug Plugin developers: Vývojáři modulu ModPlug: - + Olivier Lapicque <olivierl@jps.net> Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_de.ts b/src/plugins/Input/modplug/translations/modplug_plugin_de.ts index ddeadd0f4..81dcdc813 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_de.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_de.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin ModPlug-Modul - + ModPlug Files ModPlug-Dateien - + About ModPlug Audio Plugin Über ModPlug-Audiomodul - + Qmmp ModPlug Audio Plugin Qmmp ModPlug-Audiomodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms Basiert auf dem Modplug-Modul für Xmms - + Modplug Plugin developers: Entwickler des Modplug-Moduls: - + Olivier Lapicque <olivierl@jps.net> Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_el.ts b/src/plugins/Input/modplug/translations/modplug_plugin_el.ts index 7e4724599..5f911bc05 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_el.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_el.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin Πρόσθετο ModPlug - + ModPlug Files Αρχεία ModPlug - + About ModPlug Audio Plugin Σχετικά με το πρόσθετο ήχου ModPlug - + Qmmp ModPlug Audio Plugin Qmmp πρόσθετο ήχου ModPlug - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> - + Based on the Modplug Plugin for Xmms Βασισμένο στο πρόσθετο Modplug για το Xmms - + Modplug Plugin developers: Οι προγραμματιστές του Modplug: - + Olivier Lapicque <olivierl@jps.net> Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_en.ts b/src/plugins/Input/modplug/translations/modplug_plugin_en.ts index 762df04d4..2a36edbe2 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_en.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_en.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin - + ModPlug Files - + About ModPlug Audio Plugin - + Qmmp ModPlug Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms - + Modplug Plugin developers: - + Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_es.ts b/src/plugins/Input/modplug/translations/modplug_plugin_es.ts index 179bea0b9..f041afd30 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_es.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_es.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin Módulo ModPlug - + ModPlug Files Archivos ModPlug - + About ModPlug Audio Plugin Acerca del módulo de audio ModPlug - + Qmmp ModPlug Audio Plugin Módulo de audio ModPlug para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms Basado en el módulo Modplug para Xmms - + Modplug Plugin developers: Desarrolladores del módulo Modplug: - + Olivier Lapicque <olivierl@jps.net> Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_fi.ts b/src/plugins/Input/modplug/translations/modplug_plugin_fi.ts index 4aa6bb961..258ba8ea3 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_fi.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_fi.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin ModPlug-liitännäinen - + ModPlug Files ModPlug-tiedostot - + About ModPlug Audio Plugin - + Qmmp ModPlug Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms - + Modplug Plugin developers: Modplug-liitännäisen kehittäjät: - + Olivier Lapicque <olivierl@jps.net> Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_fr.ts b/src/plugins/Input/modplug/translations/modplug_plugin_fr.ts index df444935a..00b8eb18d 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_fr.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_fr.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin Plugin ModPLug - + ModPlug Files Fichiers ModPLug - + About ModPlug Audio Plugin A propos du plugin audio ModPLug - + Qmmp ModPlug Audio Plugin Plugin audio ModPlug Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms Basé sur le plugin ModPlug pour Xmms - + Modplug Plugin developers: Plugin modplug pour développeurs - + Olivier Lapicque <olivierl@jps.net> Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_gl_ES.ts b/src/plugins/Input/modplug/translations/modplug_plugin_gl_ES.ts index f774483b8..1cf6b21e4 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_gl_ES.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_gl_ES.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin Engadido ModPlug - + ModPlug Files Ficheiros ModPlug - + About ModPlug Audio Plugin Sobre o engadido ModPlug - + Qmmp ModPlug Audio Plugin Engadido ModPlug de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms Baseado no engadido ModPlug para Xmms - + Modplug Plugin developers: Desenvolvedores do engadido ModPlug: - + Olivier Lapicque <olivierl@jps.net> Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_he.ts b/src/plugins/Input/modplug/translations/modplug_plugin_he.ts index 30da736b4..79ab0a6ac 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_he.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_he.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin תוסף ModPlug - + ModPlug Files קבצי ModPlug - + About ModPlug Audio Plugin אודות תוסף שמע ModPlug - + Qmmp ModPlug Audio Plugin תוסף שמע ModPlug של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms מבוסס על התוסף Modplug עבור Xmms - + Modplug Plugin developers: מפתחי תוסף Modplug: - + Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_hu.ts b/src/plugins/Input/modplug/translations/modplug_plugin_hu.ts index b10083b88..5f76abdd9 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_hu.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_hu.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin - + ModPlug Files - + About ModPlug Audio Plugin - + Qmmp ModPlug Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms - + Modplug Plugin developers: - + Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_id.ts b/src/plugins/Input/modplug/translations/modplug_plugin_id.ts index 8f388aedf..13cdb5a54 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_id.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_id.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin Plugin ModPlug - + ModPlug Files File ModPlug - + About ModPlug Audio Plugin Tentang Plugin Audio ModPlug - + Qmmp ModPlug Audio Plugin Plugin Audio ModPlug Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms Berdasarkan pada Plugin Modplug untuk Xmms - + Modplug Plugin developers: Pengembang Plugin Modplug: - + Olivier Lapicque <olivierl@jps.net> Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_it.ts b/src/plugins/Input/modplug/translations/modplug_plugin_it.ts index c7f7011d2..2557141ae 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_it.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_it.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin Modulo ModPlug - + ModPlug Files Brani ModPlug - + About ModPlug Audio Plugin Info sul modulo audio ModPlug - + Qmmp ModPlug Audio Plugin Modulo audio ModPlug per Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms Basato sul Modulo Modplug per Xmms - + Modplug Plugin developers: Sviluppatori del modulo Modplug: - + Olivier Lapicque <olivierl@jps.net> Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_ja.ts b/src/plugins/Input/modplug/translations/modplug_plugin_ja.ts index b894c6ff0..96e8f4bca 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_ja.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_ja.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin ModPlug プラグイン - + ModPlug Files ModPlug ファイル - + About ModPlug Audio Plugin ModPlug 音響プラグインについて - + Qmmp ModPlug Audio Plugin QMMP ModPlug 音響プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms XMMS 用 ModPlug プラグインを基に作成 - + Modplug Plugin developers: ModPlug プラグインの開発者: - + Olivier Lapicque <olivierl@jps.net> Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_kk.ts b/src/plugins/Input/modplug/translations/modplug_plugin_kk.ts index 8c7156d9a..0f5e493cb 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_kk.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_kk.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin - + ModPlug Files - + About ModPlug Audio Plugin - + Qmmp ModPlug Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms - + Modplug Plugin developers: - + Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_lt.ts b/src/plugins/Input/modplug/translations/modplug_plugin_lt.ts index 5901eb44c..5f2c1c2f6 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_lt.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_lt.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin ModPlug Įskiepis - + ModPlug Files ModPlug bylos - + About ModPlug Audio Plugin Apie ModPlug audio įskiepį - + Qmmp ModPlug Audio Plugin Qmmp ModPlug audio įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms Sukurta Xmms Modplug įskiepio pagrindu - + Modplug Plugin developers: Modplug įskiepio kūrėjai: - + Olivier Lapicque <olivierl@jps.net> Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_nl.ts b/src/plugins/Input/modplug/translations/modplug_plugin_nl.ts index 647a9a3a8..0ef8431a7 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_nl.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_nl.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin ModPlug Module - + ModPlug Files ModPlug Bestanden - + About ModPlug Audio Plugin Over de ModPlug Audio Module - + Qmmp ModPlug Audio Plugin Modplug Audio Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms Gebasseerd op de Modplug Module voor Xmms - + Modplug Plugin developers: Modplug Module ontwikkelaars: - + Olivier Lapicque <olivierl@jps.net> Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_pl_PL.ts b/src/plugins/Input/modplug/translations/modplug_plugin_pl_PL.ts index 5512673ef..64e8f4974 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_pl_PL.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_pl_PL.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin Wtyczka ModPlug - + ModPlug Files Pliki ModPlug - + About ModPlug Audio Plugin O wtyczce ModPlug Audio - + Qmmp ModPlug Audio Plugin Wtyczka ModPlug Audio dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms Oparty na wtyczce Modplug dla Xmms - + Modplug Plugin developers: Twórcy wtyczki Modplug: - + Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_pt.ts b/src/plugins/Input/modplug/translations/modplug_plugin_pt.ts index c12f49984..93256d1c1 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_pt.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_pt.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin Suplemento ModPlug - + ModPlug Files Ficheiros ModPlug - + About ModPlug Audio Plugin Sobre o suplemento ModPlug Audio - + Qmmp ModPlug Audio Plugin Suplemento Qmmp ModPlug Audio - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms Baseado no Modplug Plugin for Xmms - + Modplug Plugin developers: Programadores ModPlug: - + Olivier Lapicque <olivierl@jps.net> Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_pt_BR.ts b/src/plugins/Input/modplug/translations/modplug_plugin_pt_BR.ts index 2242a6e00..e13a0d853 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_pt_BR.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_pt_BR.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin Plugin ModPlug - + ModPlug Files Arquivos ModPlug - + About ModPlug Audio Plugin Sobre o plugin ModPlug Audio - + Qmmp ModPlug Audio Plugin Plugin Qmmp ModPlug Audio - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms Baseado no Modplug Plugin for Xmms - + Modplug Plugin developers: Programadores ModPlug: - + Olivier Lapicque <olivierl@jps.net> Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_ru.ts b/src/plugins/Input/modplug/translations/modplug_plugin_ru.ts index fda8d544a..199f92242 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_ru.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_ru.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin Модуль ModPlug - + ModPlug Files Файлы ModPlug - + About ModPlug Audio Plugin Об аудио-модуле ModPlug - + Qmmp ModPlug Audio Plugin Аудио-модуль ModPlug для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms Основан на базе модуля Modplug для Xmms - + Modplug Plugin developers: Разработчики модуля Modplug: - + Olivier Lapicque <olivierl@jps.net> Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_sk.ts b/src/plugins/Input/modplug/translations/modplug_plugin_sk.ts index d125a2d59..d0f1afead 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_sk.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_sk.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin - + ModPlug Files - + About ModPlug Audio Plugin - + Qmmp ModPlug Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms - + Modplug Plugin developers: - + Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_sr_BA.ts b/src/plugins/Input/modplug/translations/modplug_plugin_sr_BA.ts index ec7688295..1b9c27b5e 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_sr_BA.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_sr_BA.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin МодПлуг прикључак - + ModPlug Files МодПлуг фајлови - + About ModPlug Audio Plugin О МодПлуг прикључку - + Qmmp ModPlug Audio Plugin Кумп МодПлуг прикључак - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms Заснован на МодПлуг прикључку за ИксММС - + Modplug Plugin developers: Програмери МодПлуг прикључка: - + Olivier Lapicque <olivierl@jps.net> Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_sr_RS.ts b/src/plugins/Input/modplug/translations/modplug_plugin_sr_RS.ts index ce82a41ab..efc11c484 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_sr_RS.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_sr_RS.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin МодПлуг прикључак - + ModPlug Files МодПлуг фајлови - + About ModPlug Audio Plugin О МодПлуг прикључку - + Qmmp ModPlug Audio Plugin Кумп МодПлуг прикључак - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms Заснован на МодПлуг прикључку за ИксММС - + Modplug Plugin developers: Програмери МодПлуг прикључка: - + Olivier Lapicque <olivierl@jps.net> Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_tr.ts b/src/plugins/Input/modplug/translations/modplug_plugin_tr.ts index be3a100e6..51adefe09 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_tr.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_tr.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin ModPlug Eklentisi - + ModPlug Files ModPlug Dosyaları - + About ModPlug Audio Plugin ModPlug Ses Eklentisi Hakkında - + Qmmp ModPlug Audio Plugin Qmmp ModPlug Ses Eklentisi - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms Xmms için yazılan Modplug eklentisi temellidir - + Modplug Plugin developers: - + Olivier Lapicque <olivierl@jps.net> Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_uk_UA.ts b/src/plugins/Input/modplug/translations/modplug_plugin_uk_UA.ts index cc533b6f8..e7679331d 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_uk_UA.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_uk_UA.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin Модуль ModPlug - + ModPlug Files Файли ModPlug - + About ModPlug Audio Plugin Про аудіо-модуль ModPlug - + Qmmp ModPlug Audio Plugin Аудіо-модуль для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms На базі модуля Modplug для Xmms - + Modplug Plugin developers: Розробники модуля ModPlug: - + Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_zh_CN.ts b/src/plugins/Input/modplug/translations/modplug_plugin_zh_CN.ts index bdcf3b1a2..bf10bdf24 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_zh_CN.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_zh_CN.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin ModPlug 插件 - + ModPlug Files ModPlug 文件 - + About ModPlug Audio Plugin 关于 ModPlug 音频插件 - + Qmmp ModPlug Audio Plugin Qmmp ModPlug 音频插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms 基于 Modplug 的 Xmms 插件 - + Modplug Plugin developers: ModPlug 插件开发者： - + Olivier Lapicque <olivierl@jps.net> Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_zh_TW.ts b/src/plugins/Input/modplug/translations/modplug_plugin_zh_TW.ts index abbcb2bc9..eada7a6ad 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_zh_TW.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_zh_TW.ts @@ -4,52 +4,52 @@ DecoderModPlugFactory - + ModPlug Plugin ModPlug 外掛 - + ModPlug Files ModPlug 檔案 - + About ModPlug Audio Plugin 關於 ModPlug 聲訊插件 - + Qmmp ModPlug Audio Plugin Qmmp ModPlug 聲訊插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> - + Based on the Modplug Plugin for Xmms 基於 Modplug 的 Xmms 外掛 - + Modplug Plugin developers: ModPlug 插件開發： - + Olivier Lapicque <olivierl@jps.net> Olivier Lapicque <olivierl@jps.net> - + Kenton Varda <temporal@gauge3d.org> Kenton Varda <temporal@gauge3d.org> - + Konstanty Bialkowski <konstanty@ieee.org> Konstanty Bialkowski <konstanty@ieee.org> diff --git a/src/plugins/Input/mpc/CMakeLists.txt b/src/plugins/Input/mpc/CMakeLists.txt index 73afe1b7f..3790a874b 100644 --- a/src/plugins/Input/mpc/CMakeLists.txt +++ b/src/plugins/Input/mpc/CMakeLists.txt @@ -2,21 +2,8 @@ project(libmpc) INCLUDE(CheckIncludeFileCXX) -# 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) @@ -53,13 +40,13 @@ SET(libmpc_HDRS SET(libmpc_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libmpc_RCC_SRCS ${libmpc_RCCS}) +QT5_ADD_RESOURCES(libmpc_RCC_SRCS ${libmpc_RCCS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(MPC_FOUND) ADD_LIBRARY(mpc MODULE ${libmpc_SRCS} ${libmpc_RCC_SRCS} ${libmpc_HDRS}) add_dependencies(mpc qmmp) -target_link_libraries(mpc ${QT_LIBRARIES} libqmmp ${MPC_LIB} ${TAGLIB_LDFLAGS}) +target_link_libraries(mpc Qt5::Widgets -lqmmp ${MPC_LIB} ${TAGLIB_LDFLAGS}) install(TARGETS mpc DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(MPC_FOUND) diff --git a/src/plugins/Input/mpc/decodermpcfactory.cpp b/src/plugins/Input/mpc/decodermpcfactory.cpp index f877e995c..56c83a2ff 100644 --- a/src/plugins/Input/mpc/decodermpcfactory.cpp +++ b/src/plugins/Input/mpc/decodermpcfactory.cpp @@ -18,16 +18,13 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include #include -#include +#include #include #include #include #include -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) #include -#endif #include "mpcmetadatamodel.h" #include "decoder_mpc.h" #include "decodermpcfactory.h" @@ -72,13 +69,8 @@ QList DecoderMPCFactory::createPlayList(const QString &fileName, boo { FileInfo *info = new FileInfo(fileName); -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) TagLib::FileStream stream(QStringToFileName(fileName), true); TagLib::MPC::File fileRef(&stream); -#else - TagLib::MPC::File fileRef(QStringToFileName(fileName)); -#endif - TagLib::APE::Tag *tag = useMetaData ? fileRef.APETag() : 0; if (tag && !tag->isEmpty()) { @@ -136,5 +128,3 @@ QTranslator *DecoderMPCFactory::createTranslator(QObject *parent) translator->load(QString(":/mpc_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(mpc,DecoderMPCFactory) diff --git a/src/plugins/Input/mpc/decodermpcfactory.h b/src/plugins/Input/mpc/decodermpcfactory.h index bb66004e9..f2d86789d 100644 --- a/src/plugins/Input/mpc/decodermpcfactory.h +++ b/src/plugins/Input/mpc/decodermpcfactory.h @@ -37,6 +37,7 @@ class DecoderMPCFactory : public QObject, DecoderFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_bg.ts b/src/plugins/Input/mpc/translations/mpc_plugin_bg.ts index 8c9bf2764..0f6182ba6 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_bg.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_bg.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin - + Musepack Files - + About Musepack Audio Plugin - + Qmmp Musepack Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_cs.ts b/src/plugins/Input/mpc/translations/mpc_plugin_cs.ts index 2e2c4e6f8..e08b83ce5 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_cs.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_cs.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin Modul Musepack - + Musepack Files Soubory Musepack - + About Musepack Audio Plugin O modulu Musepack - + Qmmp Musepack Audio Plugin Vstupní modul Qmmp Musepack - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_de.ts b/src/plugins/Input/mpc/translations/mpc_plugin_de.ts index 0a6599065..db95263e3 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_de.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_de.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin Musepack-Modul - + Musepack Files Musepack-Dateien - + About Musepack Audio Plugin Über Musepack-Audiomodul - + Qmmp Musepack Audio Plugin Qmmp Musepack-Audiomodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_el.ts b/src/plugins/Input/mpc/translations/mpc_plugin_el.ts index 5d3548be8..4144df6fe 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_el.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_el.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin Πρόσθετο Musepack - + Musepack Files Αρχεία Musepack - + About Musepack Audio Plugin Σχετικά με το πρόσθετο ήχου Musepack - + Qmmp Musepack Audio Plugin Qmmp πρόσθετο ήχου Musepack - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_en.ts b/src/plugins/Input/mpc/translations/mpc_plugin_en.ts index a51ec5a8e..9e2fdbe21 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_en.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_en.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin - + Musepack Files - + About Musepack Audio Plugin - + Qmmp Musepack Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_es.ts b/src/plugins/Input/mpc/translations/mpc_plugin_es.ts index 97e3f5928..6deb12c8f 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_es.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_es.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin Módulo Musepack - + Musepack Files Archivos Musepack - + About Musepack Audio Plugin Acerca del módulo de audio Musepack - + Qmmp Musepack Audio Plugin Módulo de audio Musepack para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_fi.ts b/src/plugins/Input/mpc/translations/mpc_plugin_fi.ts index c7303181f..21153506a 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_fi.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_fi.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin Musepack-liitännäinen - + Musepack Files Musepack-tiedosto - + About Musepack Audio Plugin Tietoja - Musepack-ääniliitännäinen - + Qmmp Musepack Audio Plugin Qmmp:n Musepack-ääniliitännäinen - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_fr.ts b/src/plugins/Input/mpc/translations/mpc_plugin_fr.ts index e1c2a8180..77e3c0770 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_fr.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_fr.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin Greffon Musepack - + Musepack Files Fichiers Musepack - + About Musepack Audio Plugin À propos du greffon audio Musepack - + Qmmp Musepack Audio Plugin Greffon audio Musepack pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_gl_ES.ts b/src/plugins/Input/mpc/translations/mpc_plugin_gl_ES.ts index bf33108a6..52ea2b8f5 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_gl_ES.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_gl_ES.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin Engadido Musepack - + Musepack Files Ficheiros Musepack - + About Musepack Audio Plugin Sobre o engadido Musepack - + Qmmp Musepack Audio Plugin Engadido Musepack de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_he.ts b/src/plugins/Input/mpc/translations/mpc_plugin_he.ts index 959f0b3aa..1230fcd8d 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_he.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_he.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin תוסף Musepack - + Musepack Files קבצי Musepack - + About Musepack Audio Plugin אודות תוסף שמע Musepack - + Qmmp Musepack Audio Plugin תוסף שמע Musepack של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_hu.ts b/src/plugins/Input/mpc/translations/mpc_plugin_hu.ts index 34cb1b938..4679e2f58 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_hu.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_hu.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin - + Musepack Files - + About Musepack Audio Plugin - + Qmmp Musepack Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_id.ts b/src/plugins/Input/mpc/translations/mpc_plugin_id.ts index 29b4c6b1d..0e3f6e525 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_id.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_id.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin Plugin Musepack - + Musepack Files File Musepack - + About Musepack Audio Plugin Tentang Plugin Audio Musepack - + Qmmp Musepack Audio Plugin Plugin Audio Musepack Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_it.ts b/src/plugins/Input/mpc/translations/mpc_plugin_it.ts index b823a7893..524926675 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_it.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_it.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin Modulo Musepack - + Musepack Files Brani Musepack - + About Musepack Audio Plugin Info sul modulo audio Musepack - + Qmmp Musepack Audio Plugin Modulo audio Musepack per Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_ja.ts b/src/plugins/Input/mpc/translations/mpc_plugin_ja.ts index 01e3e9181..cc86c15ac 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_ja.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_ja.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin Musepack プラグイン - + Musepack Files Musepack ファイル - + About Musepack Audio Plugin Musepack 音響プラグインについて - + Qmmp Musepack Audio Plugin QMMP Musepack 音響プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_kk.ts b/src/plugins/Input/mpc/translations/mpc_plugin_kk.ts index bae0f08e6..c578222e9 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_kk.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_kk.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin - + Musepack Files - + About Musepack Audio Plugin - + Qmmp Musepack Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_lt.ts b/src/plugins/Input/mpc/translations/mpc_plugin_lt.ts index 27aeba082..675192cfc 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_lt.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_lt.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin Musepack įskiepis - + Musepack Files Musepack bylos - + About Musepack Audio Plugin Apie Qmmp Musepack įskiepį - + Qmmp Musepack Audio Plugin Qmmp Musepack įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_nl.ts b/src/plugins/Input/mpc/translations/mpc_plugin_nl.ts index abb8a010f..a259fadb1 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_nl.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_nl.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin Musepack Module - + Musepack Files Musepack Bestanden - + About Musepack Audio Plugin Over de Musepack Audio Module - + Qmmp Musepack Audio Plugin Musepack Audio Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_pl_PL.ts b/src/plugins/Input/mpc/translations/mpc_plugin_pl_PL.ts index 797836e40..3d5f94fe4 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_pl_PL.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_pl_PL.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin Wtyczka Musepack - + Musepack Files Pliki Musepack - + About Musepack Audio Plugin O wtyczce Musepack Audio - + Qmmp Musepack Audio Plugin Wtyczka Musepack Audio dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_pt.ts b/src/plugins/Input/mpc/translations/mpc_plugin_pt.ts index 425ba5fda..2579669b5 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_pt.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_pt.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin Suplemento Musepack - + Musepack Files Ficheiros Musepack - + About Musepack Audio Plugin Sobre o suplemento Musepack Audio - + Qmmp Musepack Audio Plugin Suplemento Qmmp Musepack Audio - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_pt_BR.ts b/src/plugins/Input/mpc/translations/mpc_plugin_pt_BR.ts index 0f3ce4ccf..88defd324 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_pt_BR.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_pt_BR.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin Plugin Musepack - + Musepack Files Arquivos Musepack - + About Musepack Audio Plugin Sobre o plugin Musepack Audio - + Qmmp Musepack Audio Plugin Arquivo Qmmp Musepack Audio - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_ru.ts b/src/plugins/Input/mpc/translations/mpc_plugin_ru.ts index d874b3ccf..52dd6c849 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_ru.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_ru.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin Модуль Musepack - + Musepack Files Файлы Musepack - + About Musepack Audio Plugin Об аудио-модуле Musepack - + Qmmp Musepack Audio Plugin Аудио-модуль Musepack для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_sk.ts b/src/plugins/Input/mpc/translations/mpc_plugin_sk.ts index 09e2279ef..c4c228c05 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_sk.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_sk.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin - + Musepack Files - + About Musepack Audio Plugin - + Qmmp Musepack Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_sr_BA.ts b/src/plugins/Input/mpc/translations/mpc_plugin_sr_BA.ts index 40dfd02b0..9beab2706 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_sr_BA.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_sr_BA.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin Музпак прикључак - + Musepack Files Музпак фајлови - + About Musepack Audio Plugin О Музпак прикључку - + Qmmp Musepack Audio Plugin Кумп Музпак прикључак - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_sr_RS.ts b/src/plugins/Input/mpc/translations/mpc_plugin_sr_RS.ts index fecfc5e85..6661db46a 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_sr_RS.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_sr_RS.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin Музпак прикључак - + Musepack Files Музпак фајлови - + About Musepack Audio Plugin О Музпак прикључку - + Qmmp Musepack Audio Plugin Кумп Музпак прикључак - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_tr.ts b/src/plugins/Input/mpc/translations/mpc_plugin_tr.ts index dc9fe6876..32a3c7bc1 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_tr.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_tr.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin Musepack Eklentisi - + Musepack Files Musepack Dosyaları - + About Musepack Audio Plugin Musepack Ses Eklentisi Hakkında - + Qmmp Musepack Audio Plugin Qmmp Musepack Ses Eklentisi - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_uk_UA.ts b/src/plugins/Input/mpc/translations/mpc_plugin_uk_UA.ts index aca9fb24e..530f27dc9 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_uk_UA.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_uk_UA.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin Модуль Musepack - + Musepack Files Файли Musepack - + About Musepack Audio Plugin Про аудіо-модуль Musepack - + Qmmp Musepack Audio Plugin Аудіо-модуль Musepack для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_zh_CN.ts b/src/plugins/Input/mpc/translations/mpc_plugin_zh_CN.ts index 642a0d928..07246c3f2 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_zh_CN.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_zh_CN.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin Musepack 插件 - + Musepack Files Musepack 文件 - + About Musepack Audio Plugin 关于 Musepack 音频插件 - + Qmmp Musepack Audio Plugin Qmmp Musepack 音频插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/mpc/translations/mpc_plugin_zh_TW.ts b/src/plugins/Input/mpc/translations/mpc_plugin_zh_TW.ts index 7a7301f0a..fb13a4755 100644 --- a/src/plugins/Input/mpc/translations/mpc_plugin_zh_TW.ts +++ b/src/plugins/Input/mpc/translations/mpc_plugin_zh_TW.ts @@ -4,27 +4,27 @@ DecoderMPCFactory - + Musepack Plugin Musepack 外掛 - + Musepack Files Musepack 檔案 - + About Musepack Audio Plugin 關於 Musepack 聲訊插件 - + Qmmp Musepack Audio Plugin Qmmp Musepack 聲訊插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/opus/CMakeLists.txt b/src/plugins/Input/opus/CMakeLists.txt index b6f5f1219..f443ef901 100644 --- a/src/plugins/Input/opus/CMakeLists.txt +++ b/src/plugins/Input/opus/CMakeLists.txt @@ -1,20 +1,7 @@ project(libopus) -# 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) @@ -31,26 +18,20 @@ SET(libopus_SRCS decoderopusfactory.cpp opusmetadatamodel.cpp replaygainreader.cpp - opusfile.cpp - opusproperties.cpp - tdebug.cpp ) SET(libopus_HDRS decoder_opus.h replaygainreader.h - opusfile.h - opusproperties.h - tdebug.h ) SET(libopus_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libopus_RCC_SRCS ${libopus_RCCS}) +QT5_ADD_RESOURCES(libopus_RCC_SRCS ${libopus_RCCS}) # user interface -QT4_WRAP_UI(libopus_UIS_H ${libopus_UIS}) +QT5_WRAP_UI(libopus_UIS_H ${libopus_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -58,6 +39,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(OPUS_FOUND) ADD_LIBRARY(opus MODULE ${libopus_SRCS} ${libopus_RCC_SRCS} ${libopus_HDRS}) add_dependencies(opus qmmp) -target_link_libraries(opus ${QT_LIBRARIES} libqmmp ${OPUS_LDFLAGS} ${TAGLIB_LDFLAGS}) +target_link_libraries(opus Qt5::Widgets -lqmmp ${OPUS_LDFLAGS} ${TAGLIB_LDFLAGS}) install(TARGETS opus DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(OPUS_FOUND) diff --git a/src/plugins/Input/opus/decoderopusfactory.cpp b/src/plugins/Input/opus/decoderopusfactory.cpp index d52d76cec..6a0444751 100644 --- a/src/plugins/Input/opus/decoderopusfactory.cpp +++ b/src/plugins/Input/opus/decoderopusfactory.cpp @@ -20,10 +20,9 @@ #include #include -#include #include #include -#include "opusfile.h" +#include #include "replaygainreader.h" #include "decoder_opus.h" #include "opusmetadatamodel.h" @@ -121,8 +120,7 @@ void DecoderOpusFactory::showAbout(QWidget *parent) { QMessageBox::about (parent, tr("About Opus Audio Plugin"), tr("Qmmp Opus Audio Plugin")+"\n"+ - tr("Written by: Ilya Kotov ")+"\n"+ - tr("This plugin includes code from TagLib library")); + tr("Written by: Ilya Kotov ")); } QTranslator *DecoderOpusFactory::createTranslator(QObject *parent) @@ -132,5 +130,3 @@ QTranslator *DecoderOpusFactory::createTranslator(QObject *parent) translator->load(QString(":/opus_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(opus,DecoderOpusFactory) diff --git a/src/plugins/Input/opus/decoderopusfactory.h b/src/plugins/Input/opus/decoderopusfactory.h index 17ff8e9d5..efee2f2dd 100644 --- a/src/plugins/Input/opus/decoderopusfactory.h +++ b/src/plugins/Input/opus/decoderopusfactory.h @@ -36,6 +36,7 @@ class DecoderOpusFactory : public QObject, DecoderFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: diff --git a/src/plugins/Input/opus/opus.pro b/src/plugins/Input/opus/opus.pro index f55764ca3..5cd5f321f 100644 --- a/src/plugins/Input/opus/opus.pro +++ b/src/plugins/Input/opus/opus.pro @@ -5,19 +5,12 @@ TARGET = $$PLUGINS_PREFIX/Input/opus HEADERS += decoderopusfactory.h \ decoder_opus.h \ opusmetadatamodel.h \ - replaygainreader.h \ - opusproperties.h \ - opusfile.h \ - tdebug.h + replaygainreader.h SOURCES += decoder_opus.cpp \ decoderopusfactory.cpp \ opusmetadatamodel.cpp \ - replaygainreader.cpp \ - opusproperties.cpp \ - opusfile.cpp \ - tdebug.cpp - + replaygainreader.cpp RESOURCES = translations/translations.qrc diff --git a/src/plugins/Input/opus/opusfile.cpp b/src/plugins/Input/opus/opusfile.cpp deleted file mode 100644 index eaf2d3afe..000000000 --- a/src/plugins/Input/opus/opusfile.cpp +++ /dev/null @@ -1,126 +0,0 @@ -/*************************************************************************** - copyright : (C) 2012 by Lukáš Lalinský - email : lalinsky@gmail.com - - copyright : (C) 2002 - 2008 by Scott Wheeler - email : wheeler@kde.org - (original Vorbis implementation) - ***************************************************************************/ - -/*************************************************************************** - * This library is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Lesser General Public License version * - * 2.1 as published by the Free Software Foundation. * - * * - * This library is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this library; if not, write to the Free Software * - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * - * 02110-1301 USA * - * * - * Alternatively, this file is available under the Mozilla Public * - * License Version 1.1. You may obtain a copy of the License at * - * http://www.mozilla.org/MPL/ * - ***************************************************************************/ - -/* - Changes against original code: - - removed constructor File(IOStream *stream, bool readProperties, Properties::ReadStyle propertiesStyle); - - removed function PropertyMap File::properties() const; - - removed function PropertyMap File::setProperties(const PropertyMap &properties). -*/ - -#include - -#include -#include "tdebug.h" - -#include "opusfile.h" - -using namespace TagLib; -using namespace TagLib::Ogg; - -class Opus::File::FilePrivate -{ -public: - FilePrivate() : - comment(0), - properties(0) {} - - ~FilePrivate() - { - delete comment; - delete properties; - } - - Ogg::XiphComment *comment; - Properties *properties; -}; - -//////////////////////////////////////////////////////////////////////////////// -// public members -//////////////////////////////////////////////////////////////////////////////// - -Opus::File::File(FileName file, bool readProperties, - Properties::ReadStyle propertiesStyle) : Ogg::File(file) -{ - d = new FilePrivate; - read(readProperties, propertiesStyle); -} - -Opus::File::~File() -{ - delete d; -} - -Ogg::XiphComment *Opus::File::tag() const -{ - return d->comment; -} - -Opus::Properties *Opus::File::audioProperties() const -{ - return d->properties; -} - -bool Opus::File::save() -{ - if(!d->comment) - d->comment = new Ogg::XiphComment; - - setPacket(1, ByteVector("OpusTags", 8) + d->comment->render(false)); - - return Ogg::File::save(); -} - -//////////////////////////////////////////////////////////////////////////////// -// private members -//////////////////////////////////////////////////////////////////////////////// - -void Opus::File::read(bool readProperties, Properties::ReadStyle propertiesStyle) -{ - ByteVector opusHeaderData = packet(0); - - if(!opusHeaderData.startsWith("OpusHead")) { - setValid(false); - debug("Opus::File::read() -- invalid Opus identification header"); - return; - } - - ByteVector commentHeaderData = packet(1); - - if(!commentHeaderData.startsWith("OpusTags")) { - setValid(false); - debug("Opus::File::read() -- invalid Opus tags header"); - return; - } - - d->comment = new Ogg::XiphComment(commentHeaderData.mid(8)); - - if(readProperties) - d->properties = new Properties(this, propertiesStyle); -} diff --git a/src/plugins/Input/opus/opusfile.h b/src/plugins/Input/opus/opusfile.h deleted file mode 100644 index dc80c4fdf..000000000 --- a/src/plugins/Input/opus/opusfile.h +++ /dev/null @@ -1,106 +0,0 @@ -/*************************************************************************** - copyright : (C) 2012 by Lukáš Lalinský - email : lalinsky@gmail.com - - copyright : (C) 2002 - 2008 by Scott Wheeler - email : wheeler@kde.org - (original Vorbis implementation) -***************************************************************************/ - -/*************************************************************************** - * This library is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Lesser General Public License version * - * 2.1 as published by the Free Software Foundation. * - * * - * This library is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this library; if not, write to the Free Software * - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * - * 02110-1301 USA * - * * - * Alternatively, this file is available under the Mozilla Public * - * License Version 1.1. You may obtain a copy of the License at * - * http://www.mozilla.org/MPL/ * - ***************************************************************************/ - -/* - Changes against original code: - - removed constructor File(IOStream *stream, bool readProperties, Properties::ReadStyle propertiesStyle); - - removed function PropertyMap File::properties() const; - - removed function PropertyMap File::setProperties(const PropertyMap &properties). -*/ - -#ifndef TAGLIB_OPUSFILE_H -#define TAGLIB_OPUSFILE_H - -#include -#include - -#include "opusproperties.h" - -namespace TagLib { - - namespace Ogg { - - //! A namespace containing classes for Opus metadata - - namespace Opus { - - //! An implementation of Ogg::File with Opus specific methods - - /*! - * This is the central class in the Ogg Opus metadata processing collection - * of classes. It's built upon Ogg::File which handles processing of the Ogg - * logical bitstream and breaking it down into pages which are handled by - * the codec implementations, in this case Opus specifically. - */ - - class File : public Ogg::File - { - public: - /*! - * Contructs a Opus file from \a file. If \a readProperties is true the - * file's audio properties will also be read using \a propertiesStyle. If - * false, \a propertiesStyle is ignored. - */ - File(FileName file, bool readProperties = true, - Properties::ReadStyle propertiesStyle = Properties::Average); - - /*! - * Destroys this instance of the File. - */ - virtual ~File(); - - /*! - * Returns the XiphComment for this file. XiphComment implements the tag - * interface, so this serves as the reimplementation of - * TagLib::File::tag(). - */ - virtual Ogg::XiphComment *tag() const; - - /*! - * Returns the Opus::Properties for this file. If no audio properties - * were read then this will return a null pointer. - */ - virtual Properties *audioProperties() const; - - virtual bool save(); - - private: - File(const File &); - File &operator=(const File &); - - void read(bool readProperties, Properties::ReadStyle propertiesStyle); - - class FilePrivate; - FilePrivate *d; - }; - } - } -} - -#endif diff --git a/src/plugins/Input/opus/opusmetadatamodel.cpp b/src/plugins/Input/opus/opusmetadatamodel.cpp index 2f79dfb6b..cd0f2be5f 100644 --- a/src/plugins/Input/opus/opusmetadatamodel.cpp +++ b/src/plugins/Input/opus/opusmetadatamodel.cpp @@ -18,13 +18,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include #include +#include +#include +#include #include #include "opusmetadatamodel.h" -#define QStringToTString_qt4(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8) -#define TStringToQString_qt4(s) QString::fromUtf8(s.toCString(true)).trimmed() - OpusMetaDataModel::OpusMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent) { m_path = path; @@ -79,7 +80,7 @@ QPixmap OpusMetaDataModel::cover() for(uint i = 0; i < list.size(); ++i) { TagLib::String value = list[i]; - QByteArray block = QByteArray::fromBase64(TStringToQString_qt4(value).toLatin1()); + QByteArray block = QByteArray::fromBase64(TStringToQString(value).toLatin1()); if(block.size() < 32) continue; qint64 pos = 0; @@ -135,25 +136,25 @@ const QString VorbisCommentModel::value(Qmmp::MetaData key) switch((int) key) { case Qmmp::TITLE: - return TStringToQString_qt4(m_tag->title()); + return TStringToQString(m_tag->title()); case Qmmp::ARTIST: - return TStringToQString_qt4(m_tag->artist()); + return TStringToQString(m_tag->artist()); case Qmmp::ALBUMARTIST: if(m_tag->fieldListMap()["ALBUMARTIST"].isEmpty()) return QString(); else - return TStringToQString_qt4(m_tag->fieldListMap()["ALBUMARTIST"].front()); + return TStringToQString(m_tag->fieldListMap()["ALBUMARTIST"].front()); case Qmmp::ALBUM: - return TStringToQString_qt4(m_tag->album()); + return TStringToQString(m_tag->album()); case Qmmp::COMMENT: - return TStringToQString_qt4(m_tag->comment()); + return TStringToQString(m_tag->comment()); case Qmmp::GENRE: - return TStringToQString_qt4(m_tag->genre()); + return TStringToQString(m_tag->genre()); case Qmmp::COMPOSER: if(m_tag->fieldListMap()["COMPOSER"].isEmpty()) return QString(); else - return TStringToQString_qt4(m_tag->fieldListMap()["COMPOSER"].front()); + return TStringToQString(m_tag->fieldListMap()["COMPOSER"].front()); case Qmmp::YEAR: return QString::number(m_tag->year()); case Qmmp::TRACK: @@ -162,7 +163,7 @@ const QString VorbisCommentModel::value(Qmmp::MetaData key) if(m_tag->fieldListMap()["DISCNUMBER"].isEmpty()) return QString(); else - return TStringToQString_qt4(m_tag->fieldListMap()["DISCNUMBER"].front()); + return TStringToQString(m_tag->fieldListMap()["DISCNUMBER"].front()); } return QString(); } @@ -172,7 +173,7 @@ void VorbisCommentModel::setValue(Qmmp::MetaData key, const QString &value) if(!m_tag) return; - TagLib::String str = QStringToTString_qt4(value); + TagLib::String str = QStringToTString(value); switch((int) key) { diff --git a/src/plugins/Input/opus/opusmetadatamodel.h b/src/plugins/Input/opus/opusmetadatamodel.h index a5d52490d..2d2a7a917 100644 --- a/src/plugins/Input/opus/opusmetadatamodel.h +++ b/src/plugins/Input/opus/opusmetadatamodel.h @@ -21,7 +21,7 @@ #ifndef OPUSMETADATAMODEL_H #define OPUSMETADATAMODEL_H -#include "opusfile.h" +#include #include #include diff --git a/src/plugins/Input/opus/opusproperties.cpp b/src/plugins/Input/opus/opusproperties.cpp deleted file mode 100644 index 89ede973d..000000000 --- a/src/plugins/Input/opus/opusproperties.cpp +++ /dev/null @@ -1,161 +0,0 @@ -/*************************************************************************** - copyright : (C) 2012 by Lukáš Lalinský - email : lalinsky@gmail.com - - copyright : (C) 2002 - 2008 by Scott Wheeler - email : wheeler@kde.org - (original Vorbis implementation) - ***************************************************************************/ - -/*************************************************************************** - * This library is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Lesser General Public License version * - * 2.1 as published by the Free Software Foundation. * - * * - * This library is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this library; if not, write to the Free Software * - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * - * 02110-1301 USA * - * * - * Alternatively, this file is available under the Mozilla Public * - * License Version 1.1. You may obtain a copy of the License at * - * http://www.mozilla.org/MPL/ * - ***************************************************************************/ - -#include -#include "tdebug.h" - -#include - -#include "opusproperties.h" -#include "opusfile.h" - -using namespace TagLib; -using namespace TagLib::Ogg; - -class Opus::Properties::PropertiesPrivate -{ -public: - PropertiesPrivate(File *f, ReadStyle s) : - file(f), - style(s), - length(0), - inputSampleRate(0), - channels(0), - opusVersion(0) {} - - File *file; - ReadStyle style; - int length; - int inputSampleRate; - int channels; - int opusVersion; -}; - -//////////////////////////////////////////////////////////////////////////////// -// public members -//////////////////////////////////////////////////////////////////////////////// - -Opus::Properties::Properties(File *file, ReadStyle style) : AudioProperties(style) -{ - d = new PropertiesPrivate(file, style); - read(); -} - -Opus::Properties::~Properties() -{ - delete d; -} - -int Opus::Properties::length() const -{ - return d->length; -} - -int Opus::Properties::bitrate() const -{ - return 0; -} - -int Opus::Properties::sampleRate() const -{ - // Opus can decode any stream at a sample rate of 8, 12, 16, 24, or 48 kHz, - // so there is no single sample rate. Let's assume it's the highest - // possible. - return 48000; -} - -int Opus::Properties::channels() const -{ - return d->channels; -} - -int Opus::Properties::inputSampleRate() const -{ - return d->inputSampleRate; -} - -int Opus::Properties::opusVersion() const -{ - return d->opusVersion; -} - -//////////////////////////////////////////////////////////////////////////////// -// private members -//////////////////////////////////////////////////////////////////////////////// - -void Opus::Properties::read() -{ - // Get the identification header from the Ogg implementation. - - // http://tools.ietf.org/html/draft-terriberry-oggopus-01#section-5.1 - - ByteVector data = d->file->packet(0); - - // *Magic Signature* - int pos = 8; - - // *Version* (8 bits, unsigned) - d->opusVersion = uchar(data.at(pos)); - pos += 1; - - // *Output Channel Count* 'C' (8 bits, unsigned) - d->channels = uchar(data.at(pos)); - pos += 1; - - // *Pre-skip* (16 bits, unsigned, little endian) - ushort preSkip = data.mid(pos, 2).toUShort(false); - pos += 2; - - // *Input Sample Rate* (32 bits, unsigned, little endian) - d->inputSampleRate = data.mid(pos, 4).toUInt(false); - pos += 4; - - // *Output Gain* (16 bits, signed, little endian) - pos += 2; - - // *Channel Mapping Family* (8 bits, unsigned) - pos += 1; - - const Ogg::PageHeader *first = d->file->firstPageHeader(); - const Ogg::PageHeader *last = d->file->lastPageHeader(); - - if(first && last) { - long long start = first->absoluteGranularPosition(); - long long end = last->absoluteGranularPosition(); - - if(start >= 0 && end >= 0) - d->length = (int) ((end - start - preSkip) / 48000); - else { - debug("Opus::Properties::read() -- The PCM values for the start or " - "end of this file was incorrect."); - } - } - else - debug("Opus::Properties::read() -- Could not find valid first and last Ogg pages."); -} diff --git a/src/plugins/Input/opus/opusproperties.h b/src/plugins/Input/opus/opusproperties.h deleted file mode 100644 index 013fd0bb4..000000000 --- a/src/plugins/Input/opus/opusproperties.h +++ /dev/null @@ -1,96 +0,0 @@ -/*************************************************************************** - copyright : (C) 2012 by Lukáš Lalinský - email : lalinsky@gmail.com - - copyright : (C) 2002 - 2008 by Scott Wheeler - email : wheeler@kde.org - (original Vorbis implementation) -***************************************************************************/ - -/*************************************************************************** - * This library is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Lesser General Public License version * - * 2.1 as published by the Free Software Foundation. * - * * - * This library is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this library; if not, write to the Free Software * - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * - * 02110-1301 USA * - * * - * Alternatively, this file is available under the Mozilla Public * - * License Version 1.1. You may obtain a copy of the License at * - * http://www.mozilla.org/MPL/ * - ***************************************************************************/ - -#ifndef TAGLIB_OPUSPROPERTIES_H -#define TAGLIB_OPUSPROPERTIES_H - -#include - -namespace TagLib { - - namespace Ogg { - - namespace Opus { - - class File; - - //! An implementation of audio property reading for Ogg Opus - - /*! - * This reads the data from an Ogg Opus stream found in the AudioProperties - * API. - */ - - class Properties : public AudioProperties - { - public: - /*! - * Create an instance of Opus::Properties with the data read from the - * Opus::File \a file. - */ - Properties(File *file, ReadStyle style = Average); - - /*! - * Destroys this Opus::Properties instance. - */ - virtual ~Properties(); - - // Reimplementations. - - virtual int length() const; - virtual int bitrate() const; - virtual int sampleRate() const; - virtual int channels() const; - - /*! - * The Opus codec supports decoding at multiple sample rates, there is no - * single sample rate of the encoded stream. This returns the sample rate - * of the original audio stream. - */ - int inputSampleRate() const; - - /*! - * Returns the Opus version, currently "0" (as specified by the spec). - */ - int opusVersion() const; - - private: - Properties(const Properties &); - Properties &operator=(const Properties &); - - void read(); - - class PropertiesPrivate; - PropertiesPrivate *d; - }; - } - } -} - -#endif diff --git a/src/plugins/Input/opus/replaygainreader.cpp b/src/plugins/Input/opus/replaygainreader.cpp index 5a8d1d21d..e125764d7 100644 --- a/src/plugins/Input/opus/replaygainreader.cpp +++ b/src/plugins/Input/opus/replaygainreader.cpp @@ -21,12 +21,14 @@ #include #include #include -#include "opusfile.h" +#include +#include #include "replaygainreader.h" ReplayGainReader::ReplayGainReader(const QString &path) { - TagLib::Ogg::Opus::File fileRef(QStringToFileName(path)); + TagLib::FileStream stream(QStringToFileName(path), true); + TagLib::Ogg::Opus::File fileRef(&stream); if(fileRef.tag()) readVorbisComment(fileRef.tag()); } diff --git a/src/plugins/Input/opus/tdebug.cpp b/src/plugins/Input/opus/tdebug.cpp deleted file mode 100644 index 5a7be431d..000000000 --- a/src/plugins/Input/opus/tdebug.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/*************************************************************************** - copyright : (C) 2002 - 2008 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * This library is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Lesser General Public License version * - * 2.1 as published by the Free Software Foundation. * - * * - * This library is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this library; if not, write to the Free Software * - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * - * 02110-1301 USA * - * * - * Alternatively, this file is available under the Mozilla Public * - * License Version 1.1. You may obtain a copy of the License at * - * http://www.mozilla.org/MPL/ * - ***************************************************************************/ - -#ifndef NDEBUG -#include -#include - -#include "tdebug.h" -#include - -using namespace TagLib; - -void TagLib::debug(const String &s) -{ - std::cerr << "TagLib: " << s << std::endl; -} - -void TagLib::debugData(const ByteVector &v) -{ - for(uint i = 0; i < v.size(); i++) { - - std::cout << "*** [" << i << "] - '" << char(v[i]) << "' - int " << int(v[i]) - << std::endl; - - std::bitset<8> b(v[i]); - - for(int j = 0; j < 8; j++) - std::cout << i << ":" << j << " " << b.test(j) << std::endl; - - std::cout << std::endl; - } -} -#endif diff --git a/src/plugins/Input/opus/tdebug.h b/src/plugins/Input/opus/tdebug.h deleted file mode 100644 index 5204fe707..000000000 --- a/src/plugins/Input/opus/tdebug.h +++ /dev/null @@ -1,71 +0,0 @@ -/*************************************************************************** - copyright : (C) 2002 - 2008 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * This library is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Lesser General Public License version * - * 2.1 as published by the Free Software Foundation. * - * * - * This library is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this library; if not, write to the Free Software * - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * - * 02110-1301 USA * - * * - * Alternatively, this file is available under the Mozilla Public * - * License Version 1.1. You may obtain a copy of the License at * - * http://www.mozilla.org/MPL/ * - ***************************************************************************/ - -#ifndef TAGLIB_DEBUG_H -#define TAGLIB_DEBUG_H - -namespace TagLib { - - class String; - class ByteVector; - -#ifndef DO_NOT_DOCUMENT -#ifndef NDEBUG - - /*! - * A simple function that prints debugging output to cerr if debugging is - * not disabled. - * - * \warning Do not use this outside of TagLib, it could lead to undefined - * symbols in your build if TagLib is built with NDEBUG defined and your - * application is not. - * - * \internal - */ - void debug(const String &s); - - /*! - * For debugging binary data. - * - * \warning Do not use this outside of TagLib, it could lead to undefined - * symbols in your build if TagLib is built with NDEBUG defined and your - * application is not. - * - * \internal - */ - void debugData(const ByteVector &v); - -#else - - // Define these to an empty statement if debugging is disabled. - -#define debug(x) -#define debugData(x) - -#endif -#endif -} - -#endif diff --git a/src/plugins/Input/opus/translations/opus_plugin_bg.ts b/src/plugins/Input/opus/translations/opus_plugin_bg.ts index 3c6fe2d22..3112f9103 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_bg.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_bg.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin - + Ogg Opus Files - + About Opus Audio Plugin - + Qmmp Opus Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - - OpusMetaDataModel - + Length - + Sample rate - + Hz - + Channels - + Bitrate - + kbps - + File size - + KB diff --git a/src/plugins/Input/opus/translations/opus_plugin_cs.ts b/src/plugins/Input/opus/translations/opus_plugin_cs.ts index 8c3f6517f..e7aeaa604 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_cs.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_cs.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin Modul Opus - + Ogg Opus Files Soubory Ogg Opus - + About Opus Audio Plugin O modulu Opus - + Qmmp Opus Audio Plugin Modul Qmmp Opus - + Written by: Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - Tento modul zahrnuje kód z knihovny TagLib - OpusMetaDataModel - + Length Délka - + Sample rate Vzorkovací frekvence - + Hz Hz - + Channels Počet kanálů - + Bitrate Datový tok - + kbps kbps - + File size Velikost souboru - + KB KiB diff --git a/src/plugins/Input/opus/translations/opus_plugin_de.ts b/src/plugins/Input/opus/translations/opus_plugin_de.ts index 86ded6035..6daba4c32 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_de.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_de.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin Opus-Modul - + Ogg Opus Files Ogg-Opus-Dateien - + About Opus Audio Plugin Über Opus-Audiomodul - + Qmmp Opus Audio Plugin Qmmp Opus-Audiomodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - Dieses Modul enthält Code aus der TagLib-Bibliothek - OpusMetaDataModel - + Length Länge - + Sample rate Abtastrate - + Hz Hz - + Channels Kanäle - + Bitrate Bitrate - + kbps KBit/s - + File size Dateigröße - + KB KB diff --git a/src/plugins/Input/opus/translations/opus_plugin_el.ts b/src/plugins/Input/opus/translations/opus_plugin_el.ts index cff76ae3e..ae55a7bea 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_el.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_el.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin Πρόσθετο Opus - + Ogg Opus Files Αρχεία Ogg Opus - + About Opus Audio Plugin Σχετικά με το πρόσθετο ήχου Opus - + Qmmp Opus Audio Plugin Qmmp πρόσθετο ήχου Opus - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> - - - This plugin includes code from TagLib library - Αυτό το πρόσθετο περιέχει κώδικα από τη βιβλιοθήκη TagLib - OpusMetaDataModel - + Length Διάρκεια - + Sample rate Ρυθμός δειγματοληψίας - + Hz Hz - + Channels Κανάλια - + Bitrate Ρυθμός bit - + kbps kbps - + File size Μέγεθος αρχείου - + KB KB diff --git a/src/plugins/Input/opus/translations/opus_plugin_en.ts b/src/plugins/Input/opus/translations/opus_plugin_en.ts index 7ed2df0c0..5a729a0a7 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_en.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_en.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin - + Ogg Opus Files - + About Opus Audio Plugin - + Qmmp Opus Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - - OpusMetaDataModel - + Length - + Sample rate - + Hz - + Channels - + Bitrate - + kbps - + File size - + KB diff --git a/src/plugins/Input/opus/translations/opus_plugin_es.ts b/src/plugins/Input/opus/translations/opus_plugin_es.ts index 61a5f84b2..9e5d589d4 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_es.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_es.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin Módulo Opus - + Ogg Opus Files Archivos Ogg Opus - + About Opus Audio Plugin Acerca del Módulo de Audio Opus - + Qmmp Opus Audio Plugin Módulo de Audio Opus de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - Este módulo incluye código proveniente de la biblioteca TagLib - OpusMetaDataModel - + Length Duración - + Sample rate Frecuencia - + Hz Hz - + Channels Canales - + Bitrate Tasa de bits - + kbps kbps - + File size Tamaño del archivo - + KB KB diff --git a/src/plugins/Input/opus/translations/opus_plugin_fi.ts b/src/plugins/Input/opus/translations/opus_plugin_fi.ts index 91f916d2e..aa97a2e4a 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_fi.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_fi.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin Opus-liitännäinen - + Ogg Opus Files Ogg Opus -tiedostot - + About Opus Audio Plugin Tietoja - Opus-ääniliitännäinen - + Qmmp Opus Audio Plugin Qmmp:n Opus-ääniliitännäinen - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - Tämä liitännäinen sisältää koodia TagLib-kirjastosta - OpusMetaDataModel - + Length Kesto - + Sample rate Näytteenottotaajuus - + Hz Hz - + Channels Kanavat - + Bitrate Bittinopeus - + kbps kbps - + File size Tiedostokoko - + KB kt diff --git a/src/plugins/Input/opus/translations/opus_plugin_fr.ts b/src/plugins/Input/opus/translations/opus_plugin_fr.ts index 13489a5a3..90dca3c38 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_fr.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_fr.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin Greffon Opus - + Ogg Opus Files Fichiers Opus - + About Opus Audio Plugin À propos du greffon audio Opus - + Qmmp Opus Audio Plugin Greffon audio Opus pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - Ce greffon comprend du code de la bibliothèque TagLib - OpusMetaDataModel - + Length Longueur - + Sample rate Taux d'échantillonage - + Hz Hz - + Channels Canaux - + Bitrate Débit binaire - + kbps kbps - + File size Taille du fichier - + KB Ko diff --git a/src/plugins/Input/opus/translations/opus_plugin_gl_ES.ts b/src/plugins/Input/opus/translations/opus_plugin_gl_ES.ts index 6d0a54153..ab1df61bd 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_gl_ES.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_gl_ES.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin Engadido Opus - + Ogg Opus Files Ficheiros Opus Ogg - + About Opus Audio Plugin Sobre o endagido Opus - + Qmmp Opus Audio Plugin Engadido Opus de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - Este engadido inclúe código da libraría TagLig - OpusMetaDataModel - + Length Lonxitude - + Sample rate Taxa de mostra - + Hz Hz - + Channels Canais - + Bitrate Taxa de bits - + kbps kbps - + File size Tamaño de ficheiro - + KB KB diff --git a/src/plugins/Input/opus/translations/opus_plugin_he.ts b/src/plugins/Input/opus/translations/opus_plugin_he.ts index f215d22b9..4154aaa9a 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_he.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_he.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin תוסף Opus - + Ogg Opus Files תוסף Ogg Opus - + About Opus Audio Plugin אודות תוסף שמע Opus - + Qmmp Opus Audio Plugin תוסף שמע Opus של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - תוסף זו כולל קוד מתוך הספרייה TagLib - OpusMetaDataModel - + Length אריכות - + Sample rate שיעור דגימה - + Hz הרץ - + Channels ערוצים - + Bitrate שיעור סיביות - + kbps - + File size גודל קובץ - + KB ק״ב diff --git a/src/plugins/Input/opus/translations/opus_plugin_hu.ts b/src/plugins/Input/opus/translations/opus_plugin_hu.ts index 4bc700957..569af6df3 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_hu.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_hu.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin - + Ogg Opus Files - + About Opus Audio Plugin - + Qmmp Opus Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - - OpusMetaDataModel - + Length - + Sample rate - + Hz - + Channels - + Bitrate - + kbps - + File size - + KB diff --git a/src/plugins/Input/opus/translations/opus_plugin_id.ts b/src/plugins/Input/opus/translations/opus_plugin_id.ts index ecc7d5f42..9bbe01695 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_id.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_id.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin Plugin Opus - + Ogg Opus Files File Opus Ogg - + About Opus Audio Plugin Tentang Plugin Audio Opus - + Qmmp Opus Audio Plugin Plugin Audio Opus Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - Plugin ini mencakup kode dari pustaka TagLib - OpusMetaDataModel - + Length Panjang - + Sample rate Sample rate - + Hz Hz - + Channels Saluran - + Bitrate Bitrate - + kbps kbps - + File size Ukuran file - + KB KB diff --git a/src/plugins/Input/opus/translations/opus_plugin_it.ts b/src/plugins/Input/opus/translations/opus_plugin_it.ts index 239720d73..3612b782c 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_it.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_it.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin - + Ogg Opus Files - + About Opus Audio Plugin - + Qmmp Opus Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - - OpusMetaDataModel - + Length Durata - + Sample rate Campionamento - + Hz Hz - + Channels Canali - + Bitrate bit al secondo - + kbps kbps - + File size Dimensione file - + KB KB diff --git a/src/plugins/Input/opus/translations/opus_plugin_ja.ts b/src/plugins/Input/opus/translations/opus_plugin_ja.ts index 2f37b774a..6f9ceb54d 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_ja.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_ja.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin Opus プラグイン - + Ogg Opus Files Ogg Opus ファイル - + About Opus Audio Plugin Opus 音響プラグインについて - + Qmmp Opus Audio Plugin QMMP Opus 音響プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - このプラグインは TagLib ライブラリーのコードを流用しています。 - OpusMetaDataModel - + Length 演奏時間 - + Sample rate サンプルレート - + Hz Hz - + Channels チャンネル - + Bitrate ビットレート - + kbps キロビット毎秒 - + File size ファイルの大きさ - + KB KiB diff --git a/src/plugins/Input/opus/translations/opus_plugin_kk.ts b/src/plugins/Input/opus/translations/opus_plugin_kk.ts index 5ab14ec3f..a2b9b403d 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_kk.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_kk.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin - + Ogg Opus Files - + About Opus Audio Plugin - + Qmmp Opus Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - - OpusMetaDataModel - + Length - + Sample rate - + Hz - + Channels - + Bitrate - + kbps - + File size - + KB diff --git a/src/plugins/Input/opus/translations/opus_plugin_lt.ts b/src/plugins/Input/opus/translations/opus_plugin_lt.ts index 2957ae20d..7f4329935 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_lt.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_lt.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin Opus Įskiepis - + Ogg Opus Files Ogg Opus Bylos - + About Opus Audio Plugin Apie Opus Audio Įskiepį - + Qmmp Opus Audio Plugin Qmmp Opus Audio Įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - Įskiepyje yra kodo iš TagLib bibliotekos - OpusMetaDataModel - + Length Trukmė - + Sample rate Dažnis - + Hz Hz - + Channels Kanalai - + Bitrate Kokybė - + kbps kbps - + File size Bylos dydis - + KB KB diff --git a/src/plugins/Input/opus/translations/opus_plugin_nl.ts b/src/plugins/Input/opus/translations/opus_plugin_nl.ts index 9a85b7aee..2b8bb497e 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_nl.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_nl.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin - + Ogg Opus Files - + About Opus Audio Plugin - + Qmmp Opus Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - - OpusMetaDataModel - + Length Duur - + Sample rate Sample frequentie - + Hz - + Channels Kanalen - + Bitrate Bitsnelheid - + kbps - + File size Bestandsnaam - + KB diff --git a/src/plugins/Input/opus/translations/opus_plugin_pl_PL.ts b/src/plugins/Input/opus/translations/opus_plugin_pl_PL.ts index 0571653e8..cace44dae 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_pl_PL.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_pl_PL.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin Wtyczka Opus - + Ogg Opus Files Pliki Ogg Opus - + About Opus Audio Plugin O wtyczce Opus Audio - + Qmmp Opus Audio Plugin Wtyczka Opus Audio dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - Ta wtyczka używa kodu z biblioteki TagLib - OpusMetaDataModel - + Length Długość - + Sample rate Próbkowanie - + Hz Hz - + Channels Kanały - + Bitrate Szybkość transmisji - + kbps - + File size Wielkość pliku - + KB KB diff --git a/src/plugins/Input/opus/translations/opus_plugin_pt.ts b/src/plugins/Input/opus/translations/opus_plugin_pt.ts index 037584d4c..d8c3e1010 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_pt.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_pt.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin Suplemento Opus - + Ogg Opus Files Ficheiros Ogg Opus - + About Opus Audio Plugin Sobre o suplemento Opus - + Qmmp Opus Audio Plugin Suplemento Qmmp Opus Audio - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - Este suplemento possui código da biblioteca TagLib - OpusMetaDataModel - + Length Duração - + Sample rate Frequência - + Hz Hz - + Channels Canais - + Bitrate Taxa de dados - + kbps kbps - + File size Tamanho do ficheiro - + KB KB diff --git a/src/plugins/Input/opus/translations/opus_plugin_pt_BR.ts b/src/plugins/Input/opus/translations/opus_plugin_pt_BR.ts index 703b71ba0..0b6cc9edd 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_pt_BR.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_pt_BR.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin Plugin Opus - + Ogg Opus Files Arquivos Ogg Opus - + About Opus Audio Plugin Sobre o plugin Opus - + Qmmp Opus Audio Plugin Plugin Qmmp Opus Audio - + Written by: Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - Este plugin inclui código da biblioteca TagLib - OpusMetaDataModel - + Length Duração - + Sample rate Frequência - + Hz Hz - + Channels Canais - + Bitrate Taxa de dados - + kbps kbps - + File size Tamanho do arquivo - + KB KB diff --git a/src/plugins/Input/opus/translations/opus_plugin_ru.ts b/src/plugins/Input/opus/translations/opus_plugin_ru.ts index 3219de7e4..775780544 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_ru.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_ru.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin Модуль Opus - + Ogg Opus Files Файлы Ogg Opus - + About Opus Audio Plugin Об аудио-модуле Opus - + Qmmp Opus Audio Plugin Модуль Opus для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - В данном модуле задействован код из библиотеки TagLib - OpusMetaDataModel - + Length Длительность - + Sample rate Дискретизация - + Hz Гц - + Channels Каналов - + Bitrate Битовая частота - + kbps кбит/с - + File size Размер файла - + KB КБ diff --git a/src/plugins/Input/opus/translations/opus_plugin_sk.ts b/src/plugins/Input/opus/translations/opus_plugin_sk.ts index 84424f7e4..277ecff2a 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_sk.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_sk.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin - + Ogg Opus Files - + About Opus Audio Plugin - + Qmmp Opus Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - - OpusMetaDataModel - + Length - + Sample rate - + Hz - + Channels - + Bitrate - + kbps - + File size - + KB diff --git a/src/plugins/Input/opus/translations/opus_plugin_sr_BA.ts b/src/plugins/Input/opus/translations/opus_plugin_sr_BA.ts index 450e69802..c4448adb9 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_sr_BA.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_sr_BA.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin Опус прикључак - + Ogg Opus Files Огг Опус фајлови - + About Opus Audio Plugin О Опус прикључку - + Qmmp Opus Audio Plugin Кумп Опус прикључак - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - Овај прикључак користи кôд из TagLib библиотеке - OpusMetaDataModel - + Length Дужина - + Sample rate Узорковање - + Hz Hz - + Channels Канала - + Bitrate Битски проток - + kbps kb/s - + File size Величина - + KB KB diff --git a/src/plugins/Input/opus/translations/opus_plugin_sr_RS.ts b/src/plugins/Input/opus/translations/opus_plugin_sr_RS.ts index 025b447c4..6351cdbbb 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_sr_RS.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_sr_RS.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin Опус прикључак - + Ogg Opus Files Огг Опус фајлови - + About Opus Audio Plugin О Опус прикључку - + Qmmp Opus Audio Plugin Кумп Опус прикључак - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - Овај прикључак користи кôд из TagLib библиотеке - OpusMetaDataModel - + Length Дужина - + Sample rate Узорковање - + Hz Hz - + Channels Канала - + Bitrate Битски проток - + kbps kb/s - + File size Величина - + KB KB diff --git a/src/plugins/Input/opus/translations/opus_plugin_tr.ts b/src/plugins/Input/opus/translations/opus_plugin_tr.ts index 6eedc2153..be5ed3709 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_tr.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_tr.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin - + Ogg Opus Files - + About Opus Audio Plugin - + Qmmp Opus Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - - OpusMetaDataModel - + Length - + Sample rate - + Hz Hz - + Channels - + Bitrate - + kbps kbps - + File size - + KB KB diff --git a/src/plugins/Input/opus/translations/opus_plugin_uk_UA.ts b/src/plugins/Input/opus/translations/opus_plugin_uk_UA.ts index 3b89b25e2..f3d1b564e 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_uk_UA.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_uk_UA.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin Модуль Opus - + Ogg Opus Files Файли Ogg Opus - + About Opus Audio Plugin Про модуль аудіо Opus - + Qmmp Opus Audio Plugin Модуль Opus для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - В даному модулі задіяно код з бібліотеки TagLib - OpusMetaDataModel - + Length Тривалість - + Sample rate Частота - + Hz Гц - + Channels Канали - + Bitrate Бітрейт - + kbps Кб/с - + File size Розмір файлу - + KB Кб diff --git a/src/plugins/Input/opus/translations/opus_plugin_zh_CN.ts b/src/plugins/Input/opus/translations/opus_plugin_zh_CN.ts index ad97b966f..528f19e79 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_zh_CN.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_zh_CN.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin Opus插件 - + Ogg Opus Files Ogg Opus 文件 - + About Opus Audio Plugin 关于Opus音频 - + Qmmp Opus Audio Plugin Qmmp Opus音频文件插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - 此插件中含有TagLib文件库中的代码 - OpusMetaDataModel - + Length 长度 - + Sample rate 采样率 - + Hz 赫兹 - + Channels 频道 - + Bitrate 比特率 - + kbps 千比特每秒 - + File size 文件大小 - + KB 千字节 diff --git a/src/plugins/Input/opus/translations/opus_plugin_zh_TW.ts b/src/plugins/Input/opus/translations/opus_plugin_zh_TW.ts index 400980a76..45baf07c6 100644 --- a/src/plugins/Input/opus/translations/opus_plugin_zh_TW.ts +++ b/src/plugins/Input/opus/translations/opus_plugin_zh_TW.ts @@ -4,75 +4,70 @@ DecoderOpusFactory - + Opus Plugin - + Ogg Opus Files - + About Opus Audio Plugin - + Qmmp Opus Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> - - - This plugin includes code from TagLib library - - OpusMetaDataModel - + Length 長度 - + Sample rate 取樣率 - + Hz Hz - + Channels 音頻通道 - + Bitrate 比特率 - + kbps kbps - + File size 文件大小 - + KB KB diff --git a/src/plugins/Input/sid/CMakeLists.txt b/src/plugins/Input/sid/CMakeLists.txt index 82ed9ac3e..3f578b021 100644 --- a/src/plugins/Input/sid/CMakeLists.txt +++ b/src/plugins/Input/sid/CMakeLists.txt @@ -2,21 +2,8 @@ project(libsid) 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) @@ -42,7 +29,7 @@ SET(libsid_HDRS SET(libsid_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libsid_RCC_SRCS ${libsid_RCCS}) +QT5_ADD_RESOURCES(libsid_RCC_SRCS ${libsid_RCCS}) # user interface @@ -50,7 +37,7 @@ SET(libsid_UIS settingsdialog.ui ) -QT4_WRAP_UI(libsid_UIS_H ${libsid_UIS}) +QT5_WRAP_UI(libsid_UIS_H ${libsid_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -59,6 +46,6 @@ IF(SIDPLAYFP_FOUND) ADD_LIBRARY(sid MODULE ${libsid_SRCS} ${libsid_UIS_H} ${libsid_RCC_SRCS} ${libsid_HDRS}) add_dependencies(sid qmmp) -target_link_libraries(sid ${QT_LIBRARIES} libqmmp ${SIDPLAYFP_LDFLAGS}) +target_link_libraries(sid Qt5::Widgets -lqmmp ${SIDPLAYFP_LDFLAGS}) install(TARGETS sid DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(SIDPLAYFP_FOUND) diff --git a/src/plugins/Input/sid/decodersidfactory.cpp b/src/plugins/Input/sid/decodersidfactory.cpp index a3364f328..bf1579669 100644 --- a/src/plugins/Input/sid/decodersidfactory.cpp +++ b/src/plugins/Input/sid/decodersidfactory.cpp @@ -18,11 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include +#include #include -#include #include -#include +#include #include #include #include @@ -126,4 +125,3 @@ QTranslator *DecoderSIDFactory::createTranslator(QObject *parent) translator->load(QString(":/sid_plugin_") + locale); return translator; } -Q_EXPORT_PLUGIN2(sid,DecoderSIDFactory) diff --git a/src/plugins/Input/sid/decodersidfactory.h b/src/plugins/Input/sid/decodersidfactory.h index f44e9270e..bf8b03ebe 100644 --- a/src/plugins/Input/sid/decodersidfactory.h +++ b/src/plugins/Input/sid/decodersidfactory.h @@ -36,6 +36,7 @@ class DecoderSIDFactory : public QObject, DecoderFactory { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: diff --git a/src/plugins/Input/sid/translations/sid_plugin_bg.ts b/src/plugins/Input/sid/translations/sid_plugin_bg.ts index d4e92c734..866e4bfa7 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_bg.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_bg.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin - + SID Files - + About SID Audio Plugin - + Qmmp SID Audio Plugin - + This plugin plays Commodore 64 music files using libsidplayfp library - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_cs.ts b/src/plugins/Input/sid/translations/sid_plugin_cs.ts index 628fd7fb5..b76b86371 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_cs.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_cs.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin Modul SID - + SID Files - + About SID Audio Plugin - + Qmmp SID Audio Plugin Qmmp modul SID - + This plugin plays Commodore 64 music files using libsidplayfp library - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_de.ts b/src/plugins/Input/sid/translations/sid_plugin_de.ts index 760511208..1828d1d1d 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_de.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_de.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin SID-Modul - + SID Files SID-Dateien - + About SID Audio Plugin Über SID-Audiomodul - + Qmmp SID Audio Plugin Qmmp SID-Audiomodul - + This plugin plays Commodore 64 music files using libsidplayfp library Dieses Modul spielt Commodore-64-Musikdateien unter Verwendung der Bibliothek libsidplayfp ab - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_el.ts b/src/plugins/Input/sid/translations/sid_plugin_el.ts index bf0a27e58..2bf481881 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_el.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_el.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin Πρόσθετο SID - + SID Files Αρχεία SID - + About SID Audio Plugin Σχετικά με το πρόσθετο ήχου SID - + Qmmp SID Audio Plugin Qmmp πρόσθετο ήχου SID - + This plugin plays Commodore 64 music files using libsidplayfp library Αυτό το πρόσθετο εκτελεί αρχεία μουσικής Commodore 64 χρησιμοποιώντας τη βιβλιοθήκη libsidplayfp - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_en.ts b/src/plugins/Input/sid/translations/sid_plugin_en.ts index 523f3d164..f5fafc885 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_en.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_en.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin - + SID Files - + About SID Audio Plugin - + Qmmp SID Audio Plugin - + This plugin plays Commodore 64 music files using libsidplayfp library - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_es.ts b/src/plugins/Input/sid/translations/sid_plugin_es.ts index 613daf049..18fec7aa8 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_es.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_es.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin Módulo SID - + SID Files Archivos SID - + About SID Audio Plugin Acerca del Módulo de Audio SID - + Qmmp SID Audio Plugin Módulo de Audio SID de Qmmp - + This plugin plays Commodore 64 music files using libsidplayfp library Este módulo reproduce archivos de música Comodore 64 usando la biblioteca libsidplayfp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_fi.ts b/src/plugins/Input/sid/translations/sid_plugin_fi.ts index d8c8f663c..bd628cd71 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_fi.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_fi.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin SID-liitännäinen - + SID Files SID-tiedostot - + About SID Audio Plugin Tietoja - SID-ääniliitännäinen - + Qmmp SID Audio Plugin Qmmp:n SID-ääniliitännäinen - + This plugin plays Commodore 64 music files using libsidplayfp library Tämä liitännäinen toistaa Commodore 64 -musiikkitiedostoja libsidplayfp-kirjastoa käyttäen - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_fr.ts b/src/plugins/Input/sid/translations/sid_plugin_fr.ts index bdf9bcef0..33e10b778 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_fr.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_fr.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin Greffon SID - + SID Files Fichiers SID - + About SID Audio Plugin À propos du greffon audio SID - + Qmmp SID Audio Plugin Greffon audio SID pour Qmmp - + This plugin plays Commodore 64 music files using libsidplayfp library Ce greffon permet de jouer les fichiers de musiques Commodore 64 en utilisant la bibliothèque libsidplayfp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_gl_ES.ts b/src/plugins/Input/sid/translations/sid_plugin_gl_ES.ts index 7a2f9771a..dfea806ea 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_gl_ES.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_gl_ES.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin Plugin SID - + SID Files Arquivos SID - + About SID Audio Plugin Acerca do plugin SID Audio - + Qmmp SID Audio Plugin Plugin Qmmp SID Audio - + This plugin plays Commodore 64 music files using libsidplayfp library Este plugin reproduce os arquivos de música da Commodore 64 usando a biblioteca libsidplayfp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_he.ts b/src/plugins/Input/sid/translations/sid_plugin_he.ts index 8a4db4749..7d69b061c 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_he.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_he.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin תוסף SID - + SID Files קבצי SID - + About SID Audio Plugin אודות תוסף שמע SID - + Qmmp SID Audio Plugin אודות תוסף שמע SID של Qmmp - + This plugin plays Commodore 64 music files using libsidplayfp library תוסף זה מנגן קבצי מוזיקה של Commodore 64 באמצעות ספריית libsidplayfp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_hu.ts b/src/plugins/Input/sid/translations/sid_plugin_hu.ts index b911d5843..4f84d2819 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_hu.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_hu.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin - + SID Files - + About SID Audio Plugin - + Qmmp SID Audio Plugin - + This plugin plays Commodore 64 music files using libsidplayfp library - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_id.ts b/src/plugins/Input/sid/translations/sid_plugin_id.ts index be18b8b12..acc6f0b16 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_id.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_id.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin Plugin SID - + SID Files File SID - + About SID Audio Plugin Tentang Plugin Audio SID - + Qmmp SID Audio Plugin Plugin Audio SID Qmmp - + This plugin plays Commodore 64 music files using libsidplayfp library Plugin ini memutar file-file musik Commodore 64 menggunakan pustaka libsidplayfp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_it.ts b/src/plugins/Input/sid/translations/sid_plugin_it.ts index 9dba93535..487e1c1de 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_it.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_it.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin - + SID Files - + About SID Audio Plugin - + Qmmp SID Audio Plugin - + This plugin plays Commodore 64 music files using libsidplayfp library - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_ja.ts b/src/plugins/Input/sid/translations/sid_plugin_ja.ts index 07047c44b..e440c1129 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_ja.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_ja.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin SID プラグイン - + SID Files SID ファイル - + About SID Audio Plugin SID 音響プラグインについて - + Qmmp SID Audio Plugin QMMP SID 音響プラグイン - + This plugin plays Commodore 64 music files using libsidplayfp library このプラグインは libsidplayfp ライブラリーを用いて Commodore 64 形式音楽ファイルを再生します - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_kk.ts b/src/plugins/Input/sid/translations/sid_plugin_kk.ts index 3427d7547..317ac23e4 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_kk.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_kk.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin - + SID Files - + About SID Audio Plugin - + Qmmp SID Audio Plugin - + This plugin plays Commodore 64 music files using libsidplayfp library - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_lt.ts b/src/plugins/Input/sid/translations/sid_plugin_lt.ts index d214108e2..68c2d66ff 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_lt.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_lt.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin SID įskiepis - + SID Files SID bylos - + About SID Audio Plugin Apie SID Audio įskiepį - + Qmmp SID Audio Plugin Qmmp SID audio įskiepis - + This plugin plays Commodore 64 music files using libsidplayfp library Šis įskiepis groja Commodore 64 muzikos bylas, naudojant libsidplayfp biblioteką. - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_nl.ts b/src/plugins/Input/sid/translations/sid_plugin_nl.ts index 01a452736..d2309480c 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_nl.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_nl.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin - + SID Files - + About SID Audio Plugin - + Qmmp SID Audio Plugin - + This plugin plays Commodore 64 music files using libsidplayfp library - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_pl_PL.ts b/src/plugins/Input/sid/translations/sid_plugin_pl_PL.ts index eda6f6152..03a2275ac 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_pl_PL.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_pl_PL.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin Wtyczka SID - + SID Files Pliki SID - + About SID Audio Plugin O wtyczce SID Audio - + Qmmp SID Audio Plugin Wtyczka SID Audio dla Qmmp - + This plugin plays Commodore 64 music files using libsidplayfp library Ta wtyczka umożliwia odtwarzanie plików muzycznych z Commodore 64 poprzez bibliotekę libsidplayfp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_pt.ts b/src/plugins/Input/sid/translations/sid_plugin_pt.ts index ecac4ecdd..175ad2d9f 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_pt.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_pt.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin Suplemento SID - + SID Files Ficheiros SID - + About SID Audio Plugin Sobre o suplemento SID Audio - + Qmmp SID Audio Plugin Suplemento Qmmp SID Audio - + This plugin plays Commodore 64 music files using libsidplayfp library Este suplemento reproduz os ficheiros de som Commodore 64 com a biblioteca libsidplayfp - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_pt_BR.ts b/src/plugins/Input/sid/translations/sid_plugin_pt_BR.ts index ed3d5ec5d..241a4d0e6 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_pt_BR.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_pt_BR.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin Plugin SID - + SID Files Arquivos SID - + About SID Audio Plugin Sobre o plugin SID Audio - + Qmmp SID Audio Plugin Plugin Qmmp SID Audio - + This plugin plays Commodore 64 music files using libsidplayfp library Este plugin reproduz os arquivos de som Commodore 64 com a biblioteca libsidplayfp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_ru.ts b/src/plugins/Input/sid/translations/sid_plugin_ru.ts index 36bcf65ee..f9b933534 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_ru.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_ru.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin Модуль SID - + SID Files Файлы SID - + About SID Audio Plugin Об аудио-модуле SID - + Qmmp SID Audio Plugin Аудио-модуль SID для Qmmp - + This plugin plays Commodore 64 music files using libsidplayfp library Данный модуль проигрывает музыкальные файлы Commodore 64 с помощью библиотеки libsidplayfp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_sk.ts b/src/plugins/Input/sid/translations/sid_plugin_sk.ts index 99e5613b4..5e7f2b850 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_sk.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_sk.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin - + SID Files - + About SID Audio Plugin - + Qmmp SID Audio Plugin - + This plugin plays Commodore 64 music files using libsidplayfp library - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_sr_BA.ts b/src/plugins/Input/sid/translations/sid_plugin_sr_BA.ts index 8929ad050..68fc96f9a 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_sr_BA.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_sr_BA.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin СИД прикључак - + SID Files СИД фајлови - + About SID Audio Plugin О СИД прикључку - + Qmmp SID Audio Plugin Кумп СИД прикључак - + This plugin plays Commodore 64 music files using libsidplayfp library Користи libsidplayfp библиотеку за пуштање музичких фајлова за Комодоре 64 - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_sr_RS.ts b/src/plugins/Input/sid/translations/sid_plugin_sr_RS.ts index 137b94e25..6f9e056e9 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_sr_RS.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_sr_RS.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin СИД прикључак - + SID Files СИД фајлови - + About SID Audio Plugin О СИД прикључку - + Qmmp SID Audio Plugin Кумп СИД прикључак - + This plugin plays Commodore 64 music files using libsidplayfp library Користи libsidplayfp библиотеку за пуштање музичких фајлова за Комодоре 64 - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_tr.ts b/src/plugins/Input/sid/translations/sid_plugin_tr.ts index 9992a1946..76aad9741 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_tr.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_tr.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin - + SID Files - + About SID Audio Plugin - + Qmmp SID Audio Plugin - + This plugin plays Commodore 64 music files using libsidplayfp library - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_uk_UA.ts b/src/plugins/Input/sid/translations/sid_plugin_uk_UA.ts index 620abd9ed..f4919ab06 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_uk_UA.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_uk_UA.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin Модуль SID - + SID Files Файли SID - + About SID Audio Plugin Про модуль звуку SID - + Qmmp SID Audio Plugin Модуль звуку SID для Qmmp - + This plugin plays Commodore 64 music files using libsidplayfp library Цей модуль відтворює музичні файли Commodore 64 з використанням бібліотеки libsidplayfp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_zh_CN.ts b/src/plugins/Input/sid/translations/sid_plugin_zh_CN.ts index 9a0693ac5..f9c165458 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_zh_CN.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_zh_CN.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin SID插件 - + SID Files SID文件 - + About SID Audio Plugin 关于SID音频插件 - + Qmmp SID Audio Plugin Qmmp播放器SID音频插件 - + This plugin plays Commodore 64 music files using libsidplayfp library 本插件使用libsidplayfp文件库播放科莫多64音乐文件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sid/translations/sid_plugin_zh_TW.ts b/src/plugins/Input/sid/translations/sid_plugin_zh_TW.ts index b82abe262..7cc96f803 100644 --- a/src/plugins/Input/sid/translations/sid_plugin_zh_TW.ts +++ b/src/plugins/Input/sid/translations/sid_plugin_zh_TW.ts @@ -4,32 +4,32 @@ DecoderSIDFactory - + SID Plugin - + SID Files - + About SID Audio Plugin - + Qmmp SID Audio Plugin - + This plugin plays Commodore 64 music files using libsidplayfp library - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/sndfile/CMakeLists.txt b/src/plugins/Input/sndfile/CMakeLists.txt index 9517d8d5b..c17dd02e9 100644 --- a/src/plugins/Input/sndfile/CMakeLists.txt +++ b/src/plugins/Input/sndfile/CMakeLists.txt @@ -1,26 +1,13 @@ project(libsndfile) -# 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) # libsndfile -pkg_search_module(SNDFILE sndfile) +pkg_search_module(SNDFILE sndfile >= 1.0.21) include_directories(${SNDFILE_INCLUDE_DIRS}) link_directories(${SNDFILE_LIBRARY_DIRS}) @@ -37,7 +24,7 @@ SET(libsndfile_HDRS SET(libsndfile_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libsndfile_RCC_SRCS ${libsndfile_RCCS}) +QT5_ADD_RESOURCES(libsndfile_RCC_SRCS ${libsndfile_RCCS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! @@ -47,7 +34,7 @@ IF(SNDFILE_FOUND) ADD_LIBRARY(sndfile MODULE ${libsndfile_SRCS} ${libsndfile_UIS_H} ${libsndfile_RCC_SRCS} ${libsndfile_HDRS}) add_dependencies(sndfile qmmp) -target_link_libraries(sndfile ${QT_LIBRARIES} libqmmp ${SNDFILE_LDFLAGS}) +target_link_libraries(sndfile Qt5::Widgets -lqmmp ${SNDFILE_LDFLAGS}) install(TARGETS sndfile DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(SNDFILE_FOUND) diff --git a/src/plugins/Input/sndfile/decodersndfilefactory.cpp b/src/plugins/Input/sndfile/decodersndfilefactory.cpp index 59adeeede..c1235d068 100644 --- a/src/plugins/Input/sndfile/decodersndfilefactory.cpp +++ b/src/plugins/Input/sndfile/decodersndfilefactory.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 * @@ -17,10 +17,10 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include + #include #include -#include +#include #ifdef Q_OS_WIN #include #define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1 @@ -165,5 +165,3 @@ QTranslator *DecoderSndFileFactory::createTranslator(QObject *parent) translator->load(QString(":/sndfile_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(sndfile, DecoderSndFileFactory) diff --git a/src/plugins/Input/sndfile/decodersndfilefactory.h b/src/plugins/Input/sndfile/decodersndfilefactory.h index 07e4ae28c..95931e428 100644 --- a/src/plugins/Input/sndfile/decodersndfilefactory.h +++ b/src/plugins/Input/sndfile/decodersndfilefactory.h @@ -34,6 +34,7 @@ class DecoderSndFileFactory : public QObject, DecoderFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: diff --git a/src/plugins/Input/vorbis/CMakeLists.txt b/src/plugins/Input/vorbis/CMakeLists.txt index 6aea0e3c1..f1088961d 100644 --- a/src/plugins/Input/vorbis/CMakeLists.txt +++ b/src/plugins/Input/vorbis/CMakeLists.txt @@ -1,20 +1,7 @@ project(libvorbis) -# 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) @@ -40,11 +27,11 @@ SET(libvorbis_HDRS SET(libvorbis_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libvorbis_RCC_SRCS ${libvorbis_RCCS}) +QT5_ADD_RESOURCES(libvorbis_RCC_SRCS ${libvorbis_RCCS}) # user interface -QT4_WRAP_UI(libvorbis_UIS_H ${libvorbis_UIS}) +QT5_WRAP_UI(libvorbis_UIS_H ${libvorbis_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -52,6 +39,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(VORBIS_FOUND) ADD_LIBRARY(vorbis MODULE ${libvorbis_SRCS} ${libvorbis_RCC_SRCS} ${libvorbis_HDRS}) add_dependencies(vorbis qmmp) -target_link_libraries(vorbis ${QT_LIBRARIES} libqmmp ${VORBIS_LDFLAGS} ${TAGLIB_LDFLAGS}) +target_link_libraries(vorbis Qt5::Widgets -lqmmp ${VORBIS_LDFLAGS} ${TAGLIB_LDFLAGS}) install(TARGETS vorbis DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(VORBIS_FOUND) diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.cpp b/src/plugins/Input/vorbis/decodervorbisfactory.cpp index f921c451e..717be4795 100644 --- a/src/plugins/Input/vorbis/decodervorbisfactory.cpp +++ b/src/plugins/Input/vorbis/decodervorbisfactory.cpp @@ -20,13 +20,10 @@ #include #include -#include #include #include #include -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) #include -#endif #include "replaygainreader.h" #include "decoder_vorbis.h" #include "vorbismetadatamodel.h" @@ -77,12 +74,8 @@ QList DecoderVorbisFactory::createPlayList(const QString &fileName, { FileInfo *info = new FileInfo(fileName); -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) TagLib::FileStream stream(QStringToFileName(fileName), true); TagLib::Ogg::Vorbis::File fileRef(&stream); -#else - TagLib::Ogg::Vorbis::File fileRef(QStringToFileName(fileName)); -#endif TagLib::Ogg::XiphComment *tag = useMetaData ? fileRef.tag() : 0; if (tag && !tag->isEmpty()) @@ -142,5 +135,3 @@ QTranslator *DecoderVorbisFactory::createTranslator(QObject *parent) translator->load(QString(":/vorbis_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(vorbis,DecoderVorbisFactory) diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.h b/src/plugins/Input/vorbis/decodervorbisfactory.h index f574e9a9d..e79b0642d 100644 --- a/src/plugins/Input/vorbis/decodervorbisfactory.h +++ b/src/plugins/Input/vorbis/decodervorbisfactory.h @@ -38,6 +38,7 @@ class DecoderVorbisFactory : public QObject, DecoderFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: diff --git a/src/plugins/Input/vorbis/replaygainreader.cpp b/src/plugins/Input/vorbis/replaygainreader.cpp index e0c509344..276848d80 100644 --- a/src/plugins/Input/vorbis/replaygainreader.cpp +++ b/src/plugins/Input/vorbis/replaygainreader.cpp @@ -22,20 +22,14 @@ #include #include #include -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) #include #include -#endif #include "replaygainreader.h" ReplayGainReader::ReplayGainReader(const QString &path) { -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) TagLib::FileStream stream(QStringToFileName(path), true); TagLib::Ogg::Vorbis::File fileRef(&stream); -#else - TagLib::Ogg::Vorbis::File fileRef(QStringToFileName(path)); -#endif if(fileRef.tag()) readVorbisComment(fileRef.tag()); diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_bg.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_bg.ts index fe2ebbcc5..a5ddb5aa8 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_bg.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_bg.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin - + Ogg Vorbis Files - + About Ogg Vorbis Audio Plugin - + Qmmp Ogg Vorbis Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length - + Sample rate - + Hz - + Channels - + Bitrate - + kbps - + File size - + KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_cs.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_cs.ts index 88418154a..50772f92b 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_cs.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_cs.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Modul Ogg-Vorbis - + Ogg Vorbis Files Soubory Ogg-Vorbis - + About Ogg Vorbis Audio Plugin O modulu Ogg-Vorbis - + Qmmp Ogg Vorbis Audio Plugin Vstupní modul Qmmp Ogg-Vorbis - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Zdrojový kód je založen na projektu mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Délka - + Sample rate Vzorkovací frekvence - + Hz Hz - + Channels Počet kanálů - + Bitrate Datový tok - + kbps kbps - + File size Velikost souboru - + KB KiB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_de.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_de.ts index 0f8e28385..e0d266ec4 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_de.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_de.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Ogg-Vorbis-Modul - + Ogg Vorbis Files Ogg-Vorbis-Dateien - + About Ogg Vorbis Audio Plugin Über Ogg-Vorbis-Audiomodul - + Qmmp Ogg Vorbis Audio Plugin Qmmp Ogg-Vorbis-Audiomodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Quellcode basiert auf dem mq3-Projekt @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Länge - + Sample rate Abtastrate - + Hz Hz - + Channels Kanäle - + Bitrate Bitrate - + kbps KBit/s - + File size Dateigröße - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_el.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_el.ts index 1f91eafb1..ba1b11868 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_el.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_el.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Πρόσθετο Ogg Vorbis - + Ogg Vorbis Files Αρχεία Ogg Vorbis - + About Ogg Vorbis Audio Plugin Σχετικά με το πρόσθετο ήχου Ogg Vorbis - + Qmmp Ogg Vorbis Audio Plugin Qmmp πρόσθετο ήχου Ogg Vorbis - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> - + Source code based on mq3 project Ο πηγαίος κώδικας έχει βασιστεί στο έργο mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Διάρκεια - + Sample rate Ρυθμός δειγματοληψίας - + Hz Hz - + Channels Κανάλια - + Bitrate Ρυθμός bit - + kbps kbps - + File size Μέγεθος αρχείου - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_en.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_en.ts index 6d3e939ea..98ee44e9b 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_en.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_en.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin - + Ogg Vorbis Files - + About Ogg Vorbis Audio Plugin - + Qmmp Ogg Vorbis Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length - + Sample rate - + Hz - + Channels - + Bitrate - + kbps - + File size - + KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_es.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_es.ts index 9745ec12f..a97e450cd 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_es.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_es.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Módulo Ogg Vorbis - + Ogg Vorbis Files Archivos Ogg Vorbis - + About Ogg Vorbis Audio Plugin Acerca del módulo de sonido Ogg Vorbis - + Qmmp Ogg Vorbis Audio Plugin Módulo de sonido Ogg Vorbis para Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Código basado en el proyecto mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Duración - + Sample rate Frecuencia - + Hz Hz - + Channels Canales - + Bitrate Tasa de bits - + kbps kbps - + File size Tamaño del archivo - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_fi.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_fi.ts index 76daaa0b2..1ccf8adb3 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_fi.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_fi.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Ogg Vorbis -liitännäinen - + Ogg Vorbis Files Ogg Vorbis -tiedostot - + About Ogg Vorbis Audio Plugin Tietoja - Ogg Vorbis -ääniliitännäinen - + Qmmp Ogg Vorbis Audio Plugin Qmmp:n Ogg Vorbis -ääniliitännäinen - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Lähdekoodi perustuu mq3-projektiin @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Kesto - + Sample rate Näytteenottotaajuus - + Hz Hz - + Channels Kanavat - + Bitrate Bittinopeus - + kbps kbps - + File size Tiedostokoko - + KB kt diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_fr.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_fr.ts index d7838b409..af3d129c2 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_fr.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_fr.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Greffon Ogg Vorbis - + Ogg Vorbis Files Fichiers Ogg Vorbis - + About Ogg Vorbis Audio Plugin À propos du greffon audio Ogg Vorbis - + Qmmp Ogg Vorbis Audio Plugin Greffon audio Ogg Vorbis pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Code source basé sur le projet mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Longueur - + Sample rate Taux d'échantillonage - + Hz Hz - + Channels Canaux - + Bitrate Débit binaire - + kbps kbps - + File size Taille du fichier - + KB Ko diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_gl_ES.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_gl_ES.ts index af0c50bf4..5cb5f73da 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_gl_ES.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_gl_ES.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Engadido Ogg Vorbis - + Ogg Vorbis Files Ficheiros Ogg Vorbis - + About Ogg Vorbis Audio Plugin Sobre o engadido Ogg Vorbis - + Qmmp Ogg Vorbis Audio Plugin Engadido Ogg Vorbis de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Código fonte baseado no proxecto mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Lonxitude - + Sample rate Taxa de mostra - + Hz Hz - + Channels Canais - + Bitrate Taxa de bits - + kbps kbps - + File size Tamaño do ficheiro - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_he.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_he.ts index 2df620204..a7d99b8ec 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_he.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_he.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin תוסף Ogg Vorbis - + Ogg Vorbis Files קבצי Ogg Vorbis - + About Ogg Vorbis Audio Plugin אודות תוסף שמע Ogg Vorbis - + Qmmp Ogg Vorbis Audio Plugin תוסף שמע Ogg Vorbis של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project קוד מקוד מבוסס על פרויקט mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length אריכות - + Sample rate שיעור דגימה - + Hz הרץ - + Channels ערוצים - + Bitrate שיעור סיביות - + kbps - + File size גודל קובץ - + KB ק״ב diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_hu.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_hu.ts index 51453db19..0b0820046 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_hu.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_hu.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin - + Ogg Vorbis Files - + About Ogg Vorbis Audio Plugin - + Qmmp Ogg Vorbis Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length - + Sample rate - + Hz - + Channels - + Bitrate - + kbps - + File size - + KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_id.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_id.ts index e8e8c4e4d..334f1522f 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_id.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_id.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Plugin Vorbis Ogg - + Ogg Vorbis Files File Vorbis Ogg - + About Ogg Vorbis Audio Plugin Tentang Plugin Audio Vorbis Ogg - + Qmmp Ogg Vorbis Audio Plugin Plugin Audio Vorbis Ogg Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Kode sumber berdasarkan pada proyek mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Panjang - + Sample rate Sample rate - + Hz Hz - + Channels Saluran - + Bitrate Bitrate - + kbps kbps - + File size Ukuran file - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_it.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_it.ts index 89e003116..f5d788238 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_it.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_it.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Modulo Ogg Vorbis - + Ogg Vorbis Files Brani Ogg Vorbis - + About Ogg Vorbis Audio Plugin Info sul modulo audio Ogg Vorbis - + Qmmp Ogg Vorbis Audio Plugin Modulo audio Ogg Vorbis per Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Codice sorgente basato sul Progetto mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Durata - + Sample rate Campionamento - + Hz Hz - + Channels Canali - + Bitrate bit al secondo - + kbps kbps - + File size Dimensione file - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_ja.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_ja.ts index e034561e1..c95fdb6cf 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_ja.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_ja.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Ogg Vorbis プラグイン - + Ogg Vorbis Files Ogg Vorbis ファイル - + About Ogg Vorbis Audio Plugin Ogg Vorbis 音響プラグインについて - + Qmmp Ogg Vorbis Audio Plugin QMMP Ogg Vorbis 音響プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> - + Source code based on mq3 project ソースコードは mq3 プロジェクトから流用 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length 長さ - + Sample rate サンプルレート - + Hz Hz - + Channels チャンネル - + Bitrate ビットレート - + kbps キロビット毎秒 - + File size ファイルの大きさ - + KB KiB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_kk.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_kk.ts index 5ef43cc9d..1a26a2b63 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_kk.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_kk.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin - + Ogg Vorbis Files - + About Ogg Vorbis Audio Plugin - + Qmmp Ogg Vorbis Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length - + Sample rate - + Hz - + Channels - + Bitrate - + kbps - + File size - + KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_lt.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_lt.ts index a0ec697d4..1df433db1 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_lt.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_lt.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Ogg Vorbis įskiepis - + Ogg Vorbis Files Ogg Vorbis bylos - + About Ogg Vorbis Audio Plugin Apie Ogg Vorbis audio įskiepį - + Qmmp Ogg Vorbis Audio Plugin Qmmp Ogg Vorbis audio įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Išvesties kodas sukurtas mq3 pagrindu @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Trukmė - + Sample rate Dažnis - + Hz Hz - + Channels Kanalai - + Bitrate Kokybė - + kbps kbps - + File size Bylos dydis - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_nl.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_nl.ts index 065c68831..62f839032 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_nl.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_nl.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Ogg Vorbis Module - + Ogg Vorbis Files Ogg Vorbis Bestanden - + About Ogg Vorbis Audio Plugin Over de Ogg Vorbis Audio Module - + Qmmp Ogg Vorbis Audio Plugin Ogg Vorbis Audio Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Broncode gebasseerd op het 'mq3 project' @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Duur - + Sample rate Sample frequentie - + Hz - + Channels Kanalen - + Bitrate Bitsnelheid - + kbps - + File size Bestandsnaam - + KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_pl_PL.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_pl_PL.ts index 9ded30dc2..469501ea7 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_pl_PL.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_pl_PL.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Wtyczka Ogg Vorbis - + Ogg Vorbis Files Pliki Ogg Vorbis - + About Ogg Vorbis Audio Plugin O wtyczce Ogg Vorbis Audio - + Qmmp Ogg Vorbis Audio Plugin Wtyczka Ogg Vorbis dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Kod źródłowy oparty jest na projekcie mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Długość - + Sample rate Próbkowanie - + Hz Hz - + Channels Kanały - + Bitrate Szybkość transmisji - + kbps - + File size Wielkość pliku - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_pt.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_pt.ts index c1d1e5b49..572bdeea1 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_pt.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_pt.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Suplemento Ogg Vorbis - + Ogg Vorbis Files Ficheiros Ogg Vorbis - + About Ogg Vorbis Audio Plugin Sobre o suplemento Ogg Vorbis - + Qmmp Ogg Vorbis Audio Plugin Suplemento Qmmp Ogg Vorbis - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Baseado no código fonte do projeto mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Duração - + Sample rate Frequência - + Hz Hz - + Channels Canais - + Bitrate Taxa de dados - + kbps kbps - + File size Tamanho do ficheiro - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_pt_BR.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_pt_BR.ts index 2d79d969d..e235cef46 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_pt_BR.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_pt_BR.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Plugin Ogg Vorbis - + Ogg Vorbis Files Arquivos Ogg Vorbis - + About Ogg Vorbis Audio Plugin Sobre o plugin Ogg Vorbis - + Qmmp Ogg Vorbis Audio Plugin Plugin Qmmp Ogg Vorbis - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Baseado no código fonte do projeto mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Duração - + Sample rate Frequência - + Hz Hz - + Channels Canais - + Bitrate Taxa de dados - + kbps kbps - + File size Tamanho do arquivo - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_ru.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_ru.ts index 81ceb118a..fc6589422 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_ru.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_ru.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Модуль Ogg Vorbis - + Ogg Vorbis Files Файлы Ogg Vorbis - + About Ogg Vorbis Audio Plugin Об аудио-модуле Ogg Vorbis - + Qmmp Ogg Vorbis Audio Plugin Аудио-модуль Ogg Vorbis для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> - + Source code based on mq3 project Исходный код основан на проекте mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Длительность - + Sample rate Дискретизация - + Hz Гц - + Channels Каналов - + Bitrate Битовая частота - + kbps кбит/с - + File size Размер файла - + KB КБ diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_sk.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_sk.ts index ca458e783..e1191a1f1 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_sk.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_sk.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin - + Ogg Vorbis Files - + About Ogg Vorbis Audio Plugin - + Qmmp Ogg Vorbis Audio Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length - + Sample rate - + Hz - + Channels - + Bitrate - + kbps - + File size - + KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_sr_BA.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_sr_BA.ts index 2ca985cef..db163d841 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_sr_BA.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_sr_BA.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Огг Ворбис прикључак - + Ogg Vorbis Files Огг Ворбис фајлови - + About Ogg Vorbis Audio Plugin О Огг Ворбис прикључку - + Qmmp Ogg Vorbis Audio Plugin Кумп Огг Ворбис прикључак - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Заснован на mq3 пројекту @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Дужина - + Sample rate Узорковање - + Hz Hz - + Channels Канала - + Bitrate Битски проток - + kbps kb/s - + File size Величина - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_sr_RS.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_sr_RS.ts index 295c55447..6477c8179 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_sr_RS.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_sr_RS.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Огг Ворбис прикључак - + Ogg Vorbis Files Огг Ворбис фајлови - + About Ogg Vorbis Audio Plugin О Огг Ворбис прикључку - + Qmmp Ogg Vorbis Audio Plugin Кумп Огг Ворбис прикључак - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Заснован на mq3 пројекту @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Дужина - + Sample rate Узорковање - + Hz Hz - + Channels Канала - + Bitrate Битски проток - + kbps kb/s - + File size Величина - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_tr.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_tr.ts index 96a015aff..78353b439 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_tr.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_tr.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Ogg Vorbis Eklentisi - + Ogg Vorbis Files Ogg Vorbis Dosyaları - + About Ogg Vorbis Audio Plugin Ogg Vorbis Ses Eklentisi Hakkında - + Qmmp Ogg Vorbis Audio Plugin Qmmp Ogg Vorbis Ses Eklentisi - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project Kaynak kodu mq3 projesi temellidir @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length - + Sample rate - + Hz Hz - + Channels - + Bitrate - + kbps kbps - + File size - + KB KB diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_uk_UA.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_uk_UA.ts index 58ae297e3..f14b31081 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_uk_UA.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_uk_UA.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Модуль Ogg Vorbis - + Ogg Vorbis Files Файли Ogg Vorbis - + About Ogg Vorbis Audio Plugin Про аудіо-модуль Ogg Vorbis - + Qmmp Ogg Vorbis Audio Plugin Аудіо-модуль Ogg Vorbis для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> - + Source code based on mq3 project Вихідний код базується на проекті mq3 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length Тривалість - + Sample rate Частота - + Hz Гц - + Channels Канали - + Bitrate Бітрейт - + kbps Кб/с - + File size Розмір файлу - + KB Кб diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_zh_CN.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_zh_CN.ts index 343d7027b..c22dc674c 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_zh_CN.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_zh_CN.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Ogg Vorbis 插件 - + Ogg Vorbis Files Ogg Vorbis 文件 - + About Ogg Vorbis Audio Plugin 关于 Ogg Vorbis 音频插件 - + Qmmp Ogg Vorbis Audio Plugin Qmmp Ogg Vorbis 音频插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project 源代码基于 mq3 项目 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length 长度 - + Sample rate 取样率 - + Hz 赫兹 - + Channels 声音通道 - + Bitrate 比特率 - + kbps 千比特每秒 - + File size 文件大小 - + KB 千字节 diff --git a/src/plugins/Input/vorbis/translations/vorbis_plugin_zh_TW.ts b/src/plugins/Input/vorbis/translations/vorbis_plugin_zh_TW.ts index 1872f4ba5..bdd72656e 100644 --- a/src/plugins/Input/vorbis/translations/vorbis_plugin_zh_TW.ts +++ b/src/plugins/Input/vorbis/translations/vorbis_plugin_zh_TW.ts @@ -4,32 +4,32 @@ DecoderVorbisFactory - + Ogg Vorbis Plugin Ogg Vorbis 外掛 - + Ogg Vorbis Files Ogg Vorbis 檔案 - + About Ogg Vorbis Audio Plugin 關於 Ogg Vorbis 聲訊插件 - + Qmmp Ogg Vorbis Audio Plugin Qmmp Ogg Vorbis 聲訊插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> - + Source code based on mq3 project 源碼基於 mq3 項目 @@ -37,42 +37,42 @@ VorbisMetaDataModel - + Length 長度 - + Sample rate 取樣率 - + Hz Hz - + Channels 聲音通道 - + Bitrate 比特率 - + kbps kbps - + File size 文件大小 - + KB KB diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp index 8f95c8976..b00ad9bd7 100644 --- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp +++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp @@ -18,6 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include #include #include #include @@ -25,9 +26,6 @@ #include #include "vorbismetadatamodel.h" -#define QStringToTString_qt4(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8) -#define TStringToQString_qt4(s) QString::fromUtf8(s.toCString(true)).trimmed() - VorbisMetaDataModel::VorbisMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent) { m_path = path; @@ -79,7 +77,7 @@ QPixmap VorbisMetaDataModel::cover() for(uint i = 0; i < list.size(); ++i) { TagLib::String value = list[i]; - QByteArray block = QByteArray::fromBase64(TStringToQString_qt4(value).toLatin1()); + QByteArray block = QByteArray::fromBase64(TStringToQString(value).toLatin1()); if(block.size() < 32) continue; qint64 pos = 0; @@ -136,25 +134,25 @@ const QString VorbisCommentModel::value(Qmmp::MetaData key) switch((int) key) { case Qmmp::TITLE: - return TStringToQString_qt4(tag->title()); + return TStringToQString(tag->title()); case Qmmp::ARTIST: - return TStringToQString_qt4(tag->artist()); + return TStringToQString(tag->artist()); case Qmmp::ALBUMARTIST: if(tag->fieldListMap()["ALBUMARTIST"].isEmpty()) return QString(); else - return TStringToQString_qt4(tag->fieldListMap()["ALBUMARTIST"].front()); + return TStringToQString(tag->fieldListMap()["ALBUMARTIST"].front()); case Qmmp::ALBUM: - return TStringToQString_qt4(tag->album()); + return TStringToQString(tag->album()); case Qmmp::COMMENT: - return TStringToQString_qt4(tag->comment()); + return TStringToQString(tag->comment()); case Qmmp::GENRE: - return TStringToQString_qt4(tag->genre()); + return TStringToQString(tag->genre()); case Qmmp::COMPOSER: if(tag->fieldListMap()["COMPOSER"].isEmpty()) return QString(); else - return TStringToQString_qt4(tag->fieldListMap()["COMPOSER"].front()); + return TStringToQString(tag->fieldListMap()["COMPOSER"].front()); case Qmmp::YEAR: return QString::number(tag->year()); case Qmmp::TRACK: @@ -163,7 +161,7 @@ const QString VorbisCommentModel::value(Qmmp::MetaData key) if(tag->fieldListMap()["DISCNUMBER"].isEmpty()) return QString(); else - return TStringToQString_qt4(tag->fieldListMap()["DISCNUMBER"].front()); + return TStringToQString(tag->fieldListMap()["DISCNUMBER"].front()); } return QString(); } @@ -175,7 +173,7 @@ void VorbisCommentModel::setValue(Qmmp::MetaData key, const QString &value) TagLib::Ogg::XiphComment *tag = m_model->m_tag; - TagLib::String str = QStringToTString_qt4(value); + TagLib::String str = QStringToTString(value); switch((int) key) { diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.h b/src/plugins/Input/vorbis/vorbismetadatamodel.h index 15f476908..a21d3d503 100644 --- a/src/plugins/Input/vorbis/vorbismetadatamodel.h +++ b/src/plugins/Input/vorbis/vorbismetadatamodel.h @@ -21,9 +21,9 @@ #ifndef VORBISMETADATAMODEL_H #define VORBISMETADATAMODEL_H +#include #include #include -#include class VorbisCommentModel; diff --git a/src/plugins/Input/wavpack/CMakeLists.txt b/src/plugins/Input/wavpack/CMakeLists.txt index ccc75313e..25c09832b 100644 --- a/src/plugins/Input/wavpack/CMakeLists.txt +++ b/src/plugins/Input/wavpack/CMakeLists.txt @@ -1,20 +1,7 @@ project(libwavpack) -# 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) @@ -42,14 +29,14 @@ SET(libwavpack_HDRS SET(libwavpack_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libwavpack_RCC_SRCS ${libwavpack_RCCS}) +QT5_ADD_RESOURCES(libwavpack_RCC_SRCS ${libwavpack_RCCS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(WAVPACK_FOUND) ADD_LIBRARY(wavpack MODULE ${libwavpack_SRCS} ${libwavpack_RCC_SRCS} ${libwavpack_HDRS}) add_dependencies(wavpack qmmp) -target_link_libraries(wavpack ${QT_LIBRARIES} libqmmp ${WAVPACK_LDFLAGS}) +target_link_libraries(wavpack Qt5::Widgets -lqmmp ${WAVPACK_LDFLAGS}) install(TARGETS wavpack DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(WAVPACK_FOUND) diff --git a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp index b0b475095..4f730232f 100644 --- a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp +++ b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include #include -#include +#include #include "wavpackmetadatamodel.h" #include "decoder_wavpack.h" #include "decoderwavpackfactory.h" @@ -165,5 +164,3 @@ QTranslator *DecoderWavPackFactory::createTranslator(QObject *parent) translator->load(QString(":/wavpack_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(wavpack,DecoderWavPackFactory) diff --git a/src/plugins/Input/wavpack/decoderwavpackfactory.h b/src/plugins/Input/wavpack/decoderwavpackfactory.h index 3b3fc546e..96974ee18 100644 --- a/src/plugins/Input/wavpack/decoderwavpackfactory.h +++ b/src/plugins/Input/wavpack/decoderwavpackfactory.h @@ -35,6 +35,7 @@ class DecoderWavPackFactory : public QObject, DecoderFactory { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_bg.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_bg.ts index d89596935..e673d8476 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_bg.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_bg.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin - + WavPack Files - + About WavPack Audio Plugin - + Qmmp WavPack Audio Plugin - + WavPack library version: - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_cs.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_cs.ts index b6ca55218..aa5a4b4e6 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_cs.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_cs.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin Modul WavPack - + WavPack Files Soubory WavPack - + About WavPack Audio Plugin O modulu WavPack - + Qmmp WavPack Audio Plugin Vstupní modul Qmmp WavPack - + WavPack library version: Verze knihovny WavPack: - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_de.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_de.ts index 03531f117..2597b31df 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_de.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_de.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin WavPack-Modul - + WavPack Files WavPack-Dateien - + About WavPack Audio Plugin Über WavPack-Audiomodul - + Qmmp WavPack Audio Plugin Qmmp WavPack-Audiomodul - + WavPack library version: WavPack-Bibliotheksversion: - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_el.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_el.ts index e95f08bec..4a0e77d2b 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_el.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_el.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin Πρόσθετο WavPack - + WavPack Files Αρχεία WavPack - + About WavPack Audio Plugin Σχετικά με το πρόσθετο ήχου WavPack - + Qmmp WavPack Audio Plugin Qmmp πρόσθετο ήχου WavPack - + WavPack library version: Έκδοση βιβλιοθήκης WavPack: - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_en.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_en.ts index 5abd2d635..abbcda75d 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_en.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_en.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin - + WavPack Files - + About WavPack Audio Plugin - + Qmmp WavPack Audio Plugin - + WavPack library version: - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_es.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_es.ts index 15c35c807..0f11f9712 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_es.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_es.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin Módulo WavPack - + WavPack Files Archivos WavPack - + About WavPack Audio Plugin Acerca del módulo de sonido WavPack - + Qmmp WavPack Audio Plugin Módulo de sonido WavPack para Qmmp - + WavPack library version: Versión de la librería WavPack: - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_fi.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_fi.ts index ce9f39c28..adb165f36 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_fi.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_fi.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin WavPack-liitännäinen - + WavPack Files WavPack-tiedostot - + About WavPack Audio Plugin Tietoja - WavPack-ääniliitännäinen - + Qmmp WavPack Audio Plugin Qmmp:n WavPack-ääniliitännäinen - + WavPack library version: WavPack-kirjaston versio: - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_fr.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_fr.ts index 7ab11125a..63710feb1 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_fr.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_fr.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin Greffon WavPack - + WavPack Files Fichiers WavPack - + About WavPack Audio Plugin À propos du greffon audio WavPack - + Qmmp WavPack Audio Plugin Greffon audio WavPack pour Qmmp - + WavPack library version: Version de la bibliothèque WavPack : - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_gl_ES.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_gl_ES.ts index 7c5e2eca3..4c879e286 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_gl_ES.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_gl_ES.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin Engadido WavPack - + WavPack Files Ficheiros WavPack - + About WavPack Audio Plugin Sobre o engadido WavPack - + Qmmp WavPack Audio Plugin Engadido WavPack do Qmmp - + WavPack library version: Versión da libraría WavPack: - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_he.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_he.ts index 3687adad0..5e3e74cc6 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_he.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_he.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin תוסף WavPack - + WavPack Files קבצי WavPack - + About WavPack Audio Plugin אודות תוסף שמע WavPack - + Qmmp WavPack Audio Plugin תוסף שמע WavPack של Qmmp - + WavPack library version: גירסת ספריית WavPack: - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_hu.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_hu.ts index 974843591..35de9b888 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_hu.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_hu.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin - + WavPack Files - + About WavPack Audio Plugin - + Qmmp WavPack Audio Plugin - + WavPack library version: - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_id.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_id.ts index b10ff1859..e70882b0e 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_id.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_id.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin Plugin WavPack - + WavPack Files File WavPack - + About WavPack Audio Plugin Tentang Plugin Audio WavPack - + Qmmp WavPack Audio Plugin Plugin Audio WavPack Qmmp - + WavPack library version: Versi pustaka WavPack: - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_it.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_it.ts index fcb8e76fb..85be67e0a 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_it.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_it.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin Modulo WavPack - + About WavPack Audio Plugin Info sul modulo audio WavPack - + Qmmp WavPack Audio Plugin Modulo audio WavPack per Qmmp - + WavPack library version: Versione libreria per WavPack: - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> - + WavPack Files Brani WavPack diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_ja.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_ja.ts index c3472a6c2..710201c27 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_ja.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_ja.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin WavPack プラグイン - + WavPack Files WavPack ファイル - + About WavPack Audio Plugin WavPack 音響プラグインについて - + Qmmp WavPack Audio Plugin QMMP WavPack 音響プラグイン - + WavPack library version: WavPack ライブラリのバージョン: - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_kk.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_kk.ts index 15dcce3d6..3a092a473 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_kk.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_kk.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin - + WavPack Files - + About WavPack Audio Plugin - + Qmmp WavPack Audio Plugin - + WavPack library version: - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_lt.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_lt.ts index 546306a1c..d519df26b 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_lt.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_lt.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin WavPack įskiepis - + WavPack Files WavPack bylos - + About WavPack Audio Plugin Apie WavPack audio įskiepį - + Qmmp WavPack Audio Plugin Qmmp WavPack audio įskiepis - + WavPack library version: WavPack bibliotekos versija: - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukurta: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_nl.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_nl.ts index 70c3b23dc..0f177c69b 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_nl.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_nl.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin WavPack Module - + About WavPack Audio Plugin Over de WavPack Audio Module - + Qmmp WavPack Audio Plugin WavPack Audio Module voor Qmmp - + WavPack library version: WavPack bibliotheek versie: - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> - + WavPack Files WavPack Bestanden diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_pl_PL.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_pl_PL.ts index 5c01f6f51..2c5840375 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_pl_PL.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_pl_PL.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin Wtyczka WavPack - + WavPack Files Pliki WavPack - + About WavPack Audio Plugin O wtyczce WavPack Audio - + Qmmp WavPack Audio Plugin Wtyczka WavPack dla Qmmp - + WavPack library version: Wersja biblioteki WavPack: - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_pt.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_pt.ts index 7d6301e2c..3d36b0d4a 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_pt.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_pt.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin Suplemento WavPack - + WavPack Files Ficheiros WavPack - + About WavPack Audio Plugin Sobre o suplemento WavPack Audio - + Qmmp WavPack Audio Plugin Suplemento Qmmp WavPack Audio - + WavPack library version: Versão da biblioteca WavPack: - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_pt_BR.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_pt_BR.ts index c880a8f0e..326cf5960 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_pt_BR.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_pt_BR.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin Plugin WavPack - + WavPack Files Arquivos WavPack - + About WavPack Audio Plugin Sobre o plugin WavPack Audio - + Qmmp WavPack Audio Plugin Plugin Qmmp WavPack Audio - + WavPack library version: Versão da biblioteca WavPack: - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_ru.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_ru.ts index 28ea866eb..f48812322 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_ru.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_ru.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin Модуль WavPack - + WavPack Files Файлы WavPack - + About WavPack Audio Plugin Об аудио-модуле WavPack - + Qmmp WavPack Audio Plugin Аудио-модуль WavPack для Qmmp - + WavPack library version: Версия библиотеки WavPack: - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_sk.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_sk.ts index 024a31892..39b412e47 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_sk.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_sk.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin - + WavPack Files - + About WavPack Audio Plugin - + Qmmp WavPack Audio Plugin - + WavPack library version: - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_sr_BA.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_sr_BA.ts index b3d374050..460dc7d82 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_sr_BA.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_sr_BA.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin Вавпак прикључак - + WavPack Files Вавпак фајлови - + About WavPack Audio Plugin О Вавпак прикључку - + Qmmp WavPack Audio Plugin Кумп Вавпак прикључак - + WavPack library version: Издање Вавпак библиотеке: - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_sr_RS.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_sr_RS.ts index 1cebfba4f..9a2c873ce 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_sr_RS.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_sr_RS.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin Вавпак прикључак - + WavPack Files Вавпак фајлови - + About WavPack Audio Plugin О Вавпак прикључку - + Qmmp WavPack Audio Plugin Кумп Вавпак прикључак - + WavPack library version: Издање Вавпак библиотеке: - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_tr.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_tr.ts index ab8c9921e..866626fcf 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_tr.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_tr.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin WavPack Eklentisi - + WavPack Files WavPack Dosyaları - + About WavPack Audio Plugin WavPack Ses Eklentisi Hakkında - + Qmmp WavPack Audio Plugin Qmmp WavPack Ses Eklentisi - + WavPack library version: WavPack kitaplık sürümü: - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_uk_UA.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_uk_UA.ts index 0552a4a52..c4786aa78 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_uk_UA.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_uk_UA.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin Модуль WavPack - + WavPack Files Файли WavPack - + About WavPack Audio Plugin Про аудіо-модуль WavPack - + Qmmp WavPack Audio Plugin Аудіо-модуль WavPack для Qmmp - + WavPack library version: Версія бібліотеки WavPack: - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_zh_CN.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_zh_CN.ts index 69c686ad3..ff3514844 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_zh_CN.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_zh_CN.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin WavPack 插件 - + WavPack Files WavPack 文件 - + About WavPack Audio Plugin 关于 WavPack 音频插件 - + Qmmp WavPack Audio Plugin Qmmp WavPack 音频插件 - + WavPack library version: WavPack 库版本： - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wavpack/translations/wavpack_plugin_zh_TW.ts b/src/plugins/Input/wavpack/translations/wavpack_plugin_zh_TW.ts index eaed45f2a..ce2882afe 100644 --- a/src/plugins/Input/wavpack/translations/wavpack_plugin_zh_TW.ts +++ b/src/plugins/Input/wavpack/translations/wavpack_plugin_zh_TW.ts @@ -4,32 +4,32 @@ DecoderWavPackFactory - + WavPack Plugin WavPack 外掛 - + WavPack Files WavPack 檔案 - + About WavPack Audio Plugin 關於 WavPack 聲訊插件 - + Qmmp WavPack Audio Plugin Qmmp WavPack 聲訊插件 - + WavPack library version: WavPack 程式庫版本： - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/CMakeLists.txt b/src/plugins/Input/wildmidi/CMakeLists.txt index 7979334a7..1e4d010ee 100644 --- a/src/plugins/Input/wildmidi/CMakeLists.txt +++ b/src/plugins/Input/wildmidi/CMakeLists.txt @@ -2,21 +2,8 @@ project(libwildmidi) 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) @@ -46,16 +33,14 @@ ENDIF(WILDMIDI_HEADER_FOUND AND (NOT WILDMIDI_LIB MATCHES "^.*-NOTFOUND")) SET(libwildmidi_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libwildmidi_RCC_SRCS ${libwildmidi_RCCS}) +QT5_ADD_RESOURCES(libwildmidi_RCC_SRCS ${libwildmidi_RCCS}) # user interface - - SET(libwildmidi_UIS settingsdialog.ui ) -QT4_WRAP_UI(libwildmidi_UIS_H ${libwildmidi_UIS}) +QT5_WRAP_UI(libwildmidi_UIS_H ${libwildmidi_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -64,6 +49,6 @@ IF(WILDMIDI_FOUND) ADD_LIBRARY(wildmidi MODULE ${libwildmidi_SRCS} ${libwildmidi_UIS_H} ${libwildmidi_RCC_SRCS} ${libwildmidi_HDRS}) add_dependencies(wildmidi qmmp) -target_link_libraries(wildmidi ${QT_LIBRARIES} libqmmp ${WILDMIDI_LIB}) +target_link_libraries(wildmidi Qt5::Widgets -lqmmp ${WILDMIDI_LIB}) install(TARGETS wildmidi DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(WILDMIDI_FOUND) diff --git a/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp b/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp index 42b2c0646..8be56bee6 100644 --- a/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp +++ b/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * + * Copyright (C) 2008-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 "wildmidihelper.h" #include "decoder_wildmidi.h" #include "settingsdialog.h" @@ -120,4 +119,3 @@ QTranslator *DecoderWildMidiFactory::createTranslator(QObject *parent) translator->load(QString(":/wildmidi_plugin_") + locale); return translator; } -Q_EXPORT_PLUGIN2(wildmidi,DecoderWildMidiFactory) diff --git a/src/plugins/Input/wildmidi/decoderwildmidifactory.h b/src/plugins/Input/wildmidi/decoderwildmidifactory.h index eebae7e16..3ddc0c401 100644 --- a/src/plugins/Input/wildmidi/decoderwildmidifactory.h +++ b/src/plugins/Input/wildmidi/decoderwildmidifactory.h @@ -32,6 +32,7 @@ class DecoderWildMidiFactory : public QObject, DecoderFactory { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0") Q_INTERFACES(DecoderFactory) public: diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_bg.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_bg.ts index 6cdd9604e..1a1b26860 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_bg.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_bg.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin - + Midi Files - + About WildMidi Audio Plugin - + Qmmp WildMidi Audio Plugin - + This plugin uses WildMidi library to play midi files - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_cs.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_cs.ts index c4cec5a58..b1b638982 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_cs.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_cs.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin Modul WildMidi - + Midi Files Soubory Midi - + About WildMidi Audio Plugin O modulu WildMidi - + Qmmp WildMidi Audio Plugin Modul Qmmp WildMidi - + This plugin uses WildMidi library to play midi files Tento modul využívá knihovnu WildMidi pro přehrávání Midi souborů - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_de.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_de.ts index 06c4fdb68..e9b86621c 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_de.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_de.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin WildMidi-Modul - + Midi Files Midi-Dateien - + About WildMidi Audio Plugin Über WildMidi-Audiomodul - + Qmmp WildMidi Audio Plugin Qmmp WildMidi-Audiomodul - + This plugin uses WildMidi library to play midi files Dieses Modul nutzt die WildMidi-Bibliothek, um Midi-Dateien abzuspielen - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_el.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_el.ts index b29588d25..3456272c5 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_el.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_el.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin Πρόσθετο WildMidi - + Midi Files Αρχεία Midi - + About WildMidi Audio Plugin Σχετικά με το πρόσθετο ήχου WildMidi - + Qmmp WildMidi Audio Plugin Qmmp πρόσθετο ήχου WildMidi - + This plugin uses WildMidi library to play midi files Αυτό το πρόσθετο χρησιμοποιεί τη βιβλιοθήκη WildMidi για την αναπαραγωγή αρχείων midi - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_en.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_en.ts index e734d918b..34e469754 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_en.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_en.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin - + Midi Files - + About WildMidi Audio Plugin - + Qmmp WildMidi Audio Plugin - + This plugin uses WildMidi library to play midi files - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_es.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_es.ts index 86d610908..4dc0771e6 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_es.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_es.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin Módulo WildMidi - + Midi Files Archivos Midi - + About WildMidi Audio Plugin Acerca del módulo Audio de WildMidi - + Qmmp WildMidi Audio Plugin Módulo Audio de WildMidi de Qmmp - + This plugin uses WildMidi library to play midi files Este módulo usa la biblioteca WildMidi para reproducir archivos midi - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_fi.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_fi.ts index 6389670bd..bede9365e 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_fi.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_fi.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin WildMidi-liitännäinen - + Midi Files Midi-tiedostot - + About WildMidi Audio Plugin Tietoja - WildMidi-ääniliitännäinen - + Qmmp WildMidi Audio Plugin Qmmp:n WildMidi-ääniliitännäinen - + This plugin uses WildMidi library to play midi files Tämä liitännäinen käyttää WildMidi-kirjastoa midi-tiedostojen toistamiseksi - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_fr.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_fr.ts index 46ab6646b..7ceaf4678 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_fr.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_fr.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin Greffon WildMidi - + Midi Files Fichiers Midi - + About WildMidi Audio Plugin À propos du greffon audio WildMidi - + Qmmp WildMidi Audio Plugin Greffon audio WildMidi pour Qmmp - + This plugin uses WildMidi library to play midi files Ce greffon utilise WildMidi pour jouer les fichiers Midi. - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_gl_ES.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_gl_ES.ts index 371898e83..22e5a4752 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_gl_ES.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_gl_ES.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin Engadido WildMidi - + Midi Files Ficheiros Midi - + About WildMidi Audio Plugin Sobre o engadido WildMidi - + Qmmp WildMidi Audio Plugin Engadido WildMidi do Qmmp - + This plugin uses WildMidi library to play midi files Este engadido usa a libraría WildMidi para reproducir ficheiros midi - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_he.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_he.ts index 776ccbbfd..95eae1840 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_he.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_he.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin תוסף WildMidi - + Midi Files קבצי Midi - + About WildMidi Audio Plugin אודות תוסף שמע WildMidi - + Qmmp WildMidi Audio Plugin תוסף שמע WildMidi של Qmmp - + This plugin uses WildMidi library to play midi files תוסף זה משתמש בספריית WildMidi לצורך ניגון קבצי midi - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_hu.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_hu.ts index f37b403c6..e9a20d9cd 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_hu.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_hu.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin - + Midi Files - + About WildMidi Audio Plugin - + Qmmp WildMidi Audio Plugin - + This plugin uses WildMidi library to play midi files - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_id.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_id.ts index 251681f5b..35265d94a 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_id.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_id.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin Plugin WildMidi - + Midi Files File Midi - + About WildMidi Audio Plugin Tentang Plugin Audio WildMidi - + Qmmp WildMidi Audio Plugin Plugin Audio WildMidi Qmmp - + This plugin uses WildMidi library to play midi files Plugin ini menggunakan pustaka WildMidi untuk memainkan file midi - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_it.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_it.ts index 534a0d1c1..9bd121224 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_it.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_it.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin - + Midi Files - + About WildMidi Audio Plugin - + Qmmp WildMidi Audio Plugin - + This plugin uses WildMidi library to play midi files - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_ja.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_ja.ts index 82f42023c..eadcfff02 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_ja.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_ja.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin WildMidi プラグイン - + Midi Files MIDI ファイル - + About WildMidi Audio Plugin WildMidi 音響プラグインについて - + Qmmp WildMidi Audio Plugin QMMP WildMidi 音響プラグイン - + This plugin uses WildMidi library to play midi files このプラグインは MIDI ファイルの再生に WildMidi ライブラリを利用します - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_kk.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_kk.ts index e070a1807..ab2439847 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_kk.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_kk.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin - + Midi Files - + About WildMidi Audio Plugin - + Qmmp WildMidi Audio Plugin - + This plugin uses WildMidi library to play midi files - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_lt.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_lt.ts index c78e9592b..99d9344f9 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_lt.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_lt.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin WildMidi įskiepis - + Midi Files Midi bylos - + About WildMidi Audio Plugin Apie WildMidi Audio įskiepį - + Qmmp WildMidi Audio Plugin Qmmp WildMidi Audio įskiepis - + This plugin uses WildMidi library to play midi files Šis įskiepis naudoja WildMidi biblioteką midi bylų grojimui - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_nl.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_nl.ts index 87ad2d101..09d4dbd36 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_nl.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_nl.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin WildMidi Module - + Midi Files Midi Bestanden - + About WildMidi Audio Plugin Over de WildMidi Audio Module - + Qmmp WildMidi Audio Plugin WildMidi Audio Module voor Qmmp - + This plugin uses WildMidi library to play midi files Deze plugin faciliteert in het afspelen van midi bestanden, gebruikmakend van de WildMidi bibliotheek - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_pl_PL.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_pl_PL.ts index 8f5a76eec..30ed81dbc 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_pl_PL.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_pl_PL.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin Wtyczka WildMidi - + Midi Files Pliki Midi - + About WildMidi Audio Plugin O wtyczce WildMidi - + Qmmp WildMidi Audio Plugin Wtyczka WildMidi dla Qmmp - + This plugin uses WildMidi library to play midi files Ta wtyczka używa biblioteki WildMidi do odtwarzania plików midi - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_pt.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_pt.ts index e4eb63be9..75acfe147 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_pt.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_pt.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin Suplemento WildMidi - + Midi Files Ficheiros Midi - + About WildMidi Audio Plugin Sobre o suplemento WildMidi Audio - + Qmmp WildMidi Audio Plugin Suplemento Qmmp WildMidi Audio - + This plugin uses WildMidi library to play midi files Este suplemento utiliza a biblioteca WildMidi para a reprodução - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_pt_BR.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_pt_BR.ts index c141858a1..a28707eab 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_pt_BR.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_pt_BR.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin Plugin WildMidi - + Midi Files Arquivos Midi - + About WildMidi Audio Plugin Sobre o plugin WildMidi Audio - + Qmmp WildMidi Audio Plugin Plugin Qmmp WildMidi Audio - + This plugin uses WildMidi library to play midi files Este plugin utiliza a biblioteca WildMidi para a reprodução - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_ru.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_ru.ts index 356bc027c..c7e66d276 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_ru.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_ru.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin Модуль WildMidi - + Midi Files Файлы midi - + About WildMidi Audio Plugin Об аудио-модуле WildMdi - + Qmmp WildMidi Audio Plugin Модуль WildMidi для Qmmp - + This plugin uses WildMidi library to play midi files Для воспроизведения midi-файлов используется библиотека WildMidi - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_sk.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_sk.ts index a79bb5d20..c563185b9 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_sk.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_sk.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin - + Midi Files - + About WildMidi Audio Plugin - + Qmmp WildMidi Audio Plugin - + This plugin uses WildMidi library to play midi files - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_sr_BA.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_sr_BA.ts index 9c84a8a70..a16fdd626 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_sr_BA.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_sr_BA.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin ВајлдМиди прикључак - + Midi Files Миди фајлови - + About WildMidi Audio Plugin О ВајлдМиди прикључку - + Qmmp WildMidi Audio Plugin Кумп ВајлдМиди прикључак - + This plugin uses WildMidi library to play midi files Користи WildMidi библиотеку за пуштање миди фајлова - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_sr_RS.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_sr_RS.ts index e474eaca1..896bee771 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_sr_RS.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_sr_RS.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin ВајлдМиди прикључак - + Midi Files Миди фајлови - + About WildMidi Audio Plugin О ВајлдМиди прикључку - + Qmmp WildMidi Audio Plugin Кумп ВајлдМиди прикључак - + This plugin uses WildMidi library to play midi files Користи WildMidi библиотеку за пуштање миди фајлова - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_tr.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_tr.ts index 3f9a83320..4b5f47daa 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_tr.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_tr.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin - + Midi Files - + About WildMidi Audio Plugin - + Qmmp WildMidi Audio Plugin - + This plugin uses WildMidi library to play midi files - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_uk_UA.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_uk_UA.ts index 42ce78b7f..93c7a2b16 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_uk_UA.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_uk_UA.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin Модуль WildMidi - + Midi Files Файли Midi - + About WildMidi Audio Plugin Про аудіо модуль WildMidi - + Qmmp WildMidi Audio Plugin Аудіо-модуль WildMidi для Qmmp - + This plugin uses WildMidi library to play midi files Цей модуль використовує бібліотеку WildMidi для програвання файлів midi - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_zh_CN.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_zh_CN.ts index 7f921a311..b012b30d0 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_zh_CN.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_zh_CN.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin WildMidi 插件 - + Midi Files Midi 文件 - + About WildMidi Audio Plugin 关于 WildMidi 音频插件 - + Qmmp WildMidi Audio Plugin Qmmp WildMidi 音频插件 - + This plugin uses WildMidi library to play midi files 此插件使用 WildMidi 库来播放 midi 文件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_zh_TW.ts b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_zh_TW.ts index b88fff374..efac902be 100644 --- a/src/plugins/Input/wildmidi/translations/wildmidi_plugin_zh_TW.ts +++ b/src/plugins/Input/wildmidi/translations/wildmidi_plugin_zh_TW.ts @@ -4,32 +4,32 @@ DecoderWildMidiFactory - + WildMidi Plugin WildMidi 外掛 - + Midi Files Midi 文件 - + About WildMidi Audio Plugin 關於 WildMidi 外掛 - + Qmmp WildMidi Audio Plugin Qmmp WildMidi 外掛 - + This plugin uses WildMidi library to play midi files 此插件使用 WildMidi 庫來播放 Midi 文件 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> 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 播放器 diff --git a/src/plugins/PlayListFormats/m3u/CMakeLists.txt b/src/plugins/PlayListFormats/m3u/CMakeLists.txt index a96c2df62..d3e7b577d 100644 --- a/src/plugins/PlayListFormats/m3u/CMakeLists.txt +++ b/src/plugins/PlayListFormats/m3u/CMakeLists.txt @@ -1,20 +1,7 @@ project(libm3uplaylistformat) -# 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}/../../../ -) - # libqmmpui include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -23,7 +10,7 @@ SET(libm3uplaylistformat_SRCS m3uplaylistformat.cpp ) -QT4_ADD_RESOURCES(libm3uplaylistformat_RCC_SRCS ${libm3uplaylistformat_RCCS}) +QT5_ADD_RESOURCES(libm3uplaylistformat_RCC_SRCS ${libm3uplaylistformat_RCCS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! @@ -31,5 +18,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(m3uplaylistformat MODULE ${libm3uplaylistformat_SRCS}) add_dependencies(m3uplaylistformat qmmpui) -target_link_libraries(m3uplaylistformat ${QT_LIBRARIES} qmmpui) +target_link_libraries(m3uplaylistformat Qt5::Widgets -lqmmpui) install(TARGETS m3uplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlayListFormats) diff --git a/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp b/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp index dd2ee0cd5..feb31fa19 100644 --- a/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp +++ b/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp @@ -35,7 +35,7 @@ const PlayListFormatProperties M3UPlaylistFormat::properties() const QList M3UPlaylistFormat::decode(const QByteArray &contents) { QList out; - QStringList splitted = QString::fromUtf8(contents.constData()).split("\n"); + QStringList splitted = QString::fromUtf8(contents).split("\n"); if(splitted.isEmpty()) return out; @@ -100,5 +100,3 @@ QByteArray M3UPlaylistFormat::encode(const QList &contents, cons } return out.join("\n").toUtf8(); } - -Q_EXPORT_PLUGIN2(m3uplaylistformat,M3UPlaylistFormat) diff --git a/src/plugins/PlayListFormats/m3u/m3uplaylistformat.h b/src/plugins/PlayListFormats/m3u/m3uplaylistformat.h index d1188d553..c22bab1c8 100644 --- a/src/plugins/PlayListFormats/m3u/m3uplaylistformat.h +++ b/src/plugins/PlayListFormats/m3u/m3uplaylistformat.h @@ -33,6 +33,7 @@ class M3UPlaylistFormat : public QObject, public PlayListFormat { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.PlayListFormatInterface.1.0") Q_INTERFACES(PlayListFormat) public: const PlayListFormatProperties properties() const; diff --git a/src/plugins/PlayListFormats/pls/CMakeLists.txt b/src/plugins/PlayListFormats/pls/CMakeLists.txt index 4666e2951..9a19d064c 100644 --- a/src/plugins/PlayListFormats/pls/CMakeLists.txt +++ b/src/plugins/PlayListFormats/pls/CMakeLists.txt @@ -1,20 +1,7 @@ project(libplsplaylistformat) -# 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}/../../../ -) - # libqmmpui include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -23,7 +10,7 @@ SET(libplsplaylistformat_SRCS plsplaylistformat.cpp ) -QT4_ADD_RESOURCES(libplsplaylistformat_RCC_SRCS ${libplsplaylistformat_RCCS}) +QT5_ADD_RESOURCES(libplsplaylistformat_RCC_SRCS ${libplsplaylistformat_RCCS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! @@ -31,5 +18,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(plsplaylistformat MODULE ${libplsplaylistformat_SRCS}) add_dependencies(plsplaylistformat qmmpui) -target_link_libraries(plsplaylistformat ${QT_LIBRARIES} qmmpui) +target_link_libraries(plsplaylistformat Qt5::Widgets -lqmmpui) install(TARGETS plsplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlayListFormats) diff --git a/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp b/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp index 9ee2fdd70..1e96077dc 100644 --- a/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp +++ b/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp @@ -35,7 +35,7 @@ const PlayListFormatProperties PLSPlaylistFormat::properties() const QList PLSPlaylistFormat::decode(const QByteArray &contents) { QList out; - QStringList splitted = QString::fromUtf8(contents.constData()).split("\n"); + QStringList splitted = QString::fromUtf8(contents).split("\n"); if(splitted.isEmpty()) { @@ -138,5 +138,3 @@ QByteArray PLSPlaylistFormat::encode(const QList &contents, con out << "Version=2"; return out.join("\n").toUtf8(); } - -Q_EXPORT_PLUGIN2(plsplaylistformat, PLSPlaylistFormat) diff --git a/src/plugins/PlayListFormats/pls/plsplaylistformat.h b/src/plugins/PlayListFormats/pls/plsplaylistformat.h index ba5d355d5..96dcf225b 100644 --- a/src/plugins/PlayListFormats/pls/plsplaylistformat.h +++ b/src/plugins/PlayListFormats/pls/plsplaylistformat.h @@ -33,6 +33,7 @@ class PLSPlaylistFormat : public QObject, public PlayListFormat { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.PlayListFormatInterface.1.0") Q_INTERFACES(PlayListFormat) public: const PlayListFormatProperties properties() const; diff --git a/src/plugins/PlayListFormats/xspf/CMakeLists.txt b/src/plugins/PlayListFormats/xspf/CMakeLists.txt index 128fb39d1..a18935cab 100644 --- a/src/plugins/PlayListFormats/xspf/CMakeLists.txt +++ b/src/plugins/PlayListFormats/xspf/CMakeLists.txt @@ -1,20 +1,7 @@ project(libxspfplaylistformat) -# 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}/../../../ -) - # libqmmpui include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -24,7 +11,7 @@ SET(libxspfplaylistformat_SRCS xspfplaylistformat.cpp ) -QT4_ADD_RESOURCES(libxspfplaylistformat_RCC_SRCS ${libxspfplaylistformat_RCCS}) +QT5_ADD_RESOURCES(libxspfplaylistformat_RCC_SRCS ${libxspfplaylistformat_RCCS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! @@ -32,5 +19,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(xspfplaylistformat MODULE ${libxspfplaylistformat_SRCS}) add_dependencies(xspfplaylistformat qmmpui) -target_link_libraries(xspfplaylistformat ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(xspfplaylistformat Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS xspfplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlayListFormats) diff --git a/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp b/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp index 562b8d154..f20c83903 100644 --- a/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp +++ b/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp @@ -41,7 +41,7 @@ QList XSPFPlaylistFormat::decode(const QByteArray &contents) { QList out; QString currentTag; - QString contents_copy = QString::fromUtf8(contents.constData()); + QString contents_copy = QString::fromUtf8(contents); //remove control symbols to avoid xml errors for(int i = 0; i < contents_copy.size(); ++i) @@ -168,5 +168,3 @@ QByteArray XSPFPlaylistFormat::encode(const QList &files, const xml.writeEndDocument(); return out; } - -Q_EXPORT_PLUGIN2(xspfplaylistformat,XSPFPlaylistFormat) diff --git a/src/plugins/PlayListFormats/xspf/xspfplaylistformat.h b/src/plugins/PlayListFormats/xspf/xspfplaylistformat.h index 3b729883a..fca9fff6a 100644 --- a/src/plugins/PlayListFormats/xspf/xspfplaylistformat.h +++ b/src/plugins/PlayListFormats/xspf/xspfplaylistformat.h @@ -33,6 +33,7 @@ class XSPFPlaylistFormat : public QObject, public PlayListFormat { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.PlayListFormatInterface.1.0") Q_INTERFACES(PlayListFormat) public: const PlayListFormatProperties properties() const; diff --git a/src/plugins/Transports/http/CMakeLists.txt b/src/plugins/Transports/http/CMakeLists.txt index efd40d1e4..5ca267c5e 100644 --- a/src/plugins/Transports/http/CMakeLists.txt +++ b/src/plugins/Transports/http/CMakeLists.txt @@ -1,20 +1,7 @@ project(libhttp) -# 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_BINARY_DIR}/../../../ -) - # libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) @@ -41,13 +28,13 @@ SET(libhttp_SRCS # resources SET(libhttp_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libhttp_RCC_SRCS ${libhttp_RCCS}) +QT5_ADD_RESOURCES(libhttp_RCC_SRCS ${libhttp_RCCS}) # user interface SET(libhttp_UIS settingsdialog.ui ) -QT4_WRAP_UI(libhttp_UIS_H ${libhttp_UIS}) +QT5_WRAP_UI(libhttp_UIS_H ${libhttp_UIS}) # Don't forget to include output directory, otherwise @@ -58,9 +45,9 @@ IF(CURL_FOUND) ADD_LIBRARY(http MODULE ${libhttp_SRCS} ${libhttp_UIS_H} ${libhttp_RCC_SRCS}) IF(USE_ENCA AND ENCA_FOUND) -target_link_libraries(http ${QT_LIBRARIES} libqmmp ${CURL_LDFLAGS} ${CURL_CFLAGS} ${ENCA_LDFLAGS} ${ENCA_CFLAGS}) +target_link_libraries(http Qt5::Widgets -lqmmp ${CURL_LDFLAGS} ${CURL_CFLAGS} ${ENCA_LDFLAGS} ${ENCA_CFLAGS}) ELSE(USE_ENCA AND ENCA_FOUND) -target_link_libraries(http ${QT_LIBRARIES} libqmmp ${CURL_LDFLAGS}) +target_link_libraries(http Qt5::Widgets -lqmmp ${CURL_LDFLAGS}) ENDIF(USE_ENCA AND ENCA_FOUND) add_dependencies(http qmmp) diff --git a/src/plugins/Transports/http/httpinputfactory.cpp b/src/plugins/Transports/http/httpinputfactory.cpp index f9a3fc1d4..daedaf9f7 100644 --- a/src/plugins/Transports/http/httpinputfactory.cpp +++ b/src/plugins/Transports/http/httpinputfactory.cpp @@ -64,4 +64,3 @@ QTranslator *HTTPInputFactory::createTranslator(QObject *parent) translator->load(QString(":/http_plugin_") + locale); return translator; } -Q_EXPORT_PLUGIN2(http, HTTPInputFactory) diff --git a/src/plugins/Transports/http/httpinputfactory.h b/src/plugins/Transports/http/httpinputfactory.h index a2c8b910f..9aea98f09 100644 --- a/src/plugins/Transports/http/httpinputfactory.h +++ b/src/plugins/Transports/http/httpinputfactory.h @@ -33,6 +33,7 @@ class QTranslator; class HTTPInputFactory : public QObject, InputSourceFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.InputSourceFactoryInterface.1.0") Q_INTERFACES(InputSourceFactory) public: const InputSourceProperties properties() const; diff --git a/src/plugins/Transports/http/httpstreamreader.cpp b/src/plugins/Transports/http/httpstreamreader.cpp index 861c17735..be051a89b 100644 --- a/src/plugins/Transports/http/httpstreamreader.cpp +++ b/src/plugins/Transports/http/httpstreamreader.cpp @@ -75,7 +75,7 @@ static size_t curl_header(void *data, size_t size, size_t nmemb, } else { - QString key = QString::fromLatin1(header.left(header.indexOf(":")).trimmed().toLower().constData()); + QString key = QString::fromLatin1(header.left(header.indexOf(":")).trimmed().toLower()); QByteArray value = header.right(header.size() - header.indexOf(":") - 1).trimmed(); dl->stream()->header.insert(key, value); qDebug("HttpStreamReader: key=%s, value=%s",qPrintable(key), value.constData()); diff --git a/src/plugins/Transports/mms/CMakeLists.txt b/src/plugins/Transports/mms/CMakeLists.txt index 106c2f796..2bcf19141 100644 --- a/src/plugins/Transports/mms/CMakeLists.txt +++ b/src/plugins/Transports/mms/CMakeLists.txt @@ -1,20 +1,7 @@ project(libmms) -# 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_BINARY_DIR}/../../../ -) - # libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) @@ -35,13 +22,13 @@ SET(libmms_SRCS # resources SET(libmms_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libmms_RCC_SRCS ${libmms_RCCS}) +QT5_ADD_RESOURCES(libmms_RCC_SRCS ${libmms_RCCS}) # user interface SET(libmms_UIS settingsdialog.ui ) -QT4_WRAP_UI(libmms_UIS_H ${libmms_UIS}) +QT5_WRAP_UI(libmms_UIS_H ${libmms_UIS}) # Don't forget to include output directory, otherwise @@ -49,7 +36,7 @@ QT4_WRAP_UI(libmms_UIS_H ${libmms_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(MMS_FOUND) ADD_LIBRARY(mms MODULE ${libmms_SRCS} ${libmms_UIS_H} ${libmms_RCC_SRCS}) -target_link_libraries(mms ${QT_LIBRARIES} libqmmp ${MMS_LDFLAGS}) +target_link_libraries(mms Qt5::Widgets -lqmmp ${MMS_LDFLAGS}) add_dependencies(mms qmmp) install(TARGETS mms DESTINATION ${LIB_DIR}/qmmp/Transports) ENDIF(MMS_FOUND) diff --git a/src/plugins/Transports/mms/mmsinputfactory.cpp b/src/plugins/Transports/mms/mmsinputfactory.cpp index d51eee4d6..2dc0c84bf 100644 --- a/src/plugins/Transports/mms/mmsinputfactory.cpp +++ b/src/plugins/Transports/mms/mmsinputfactory.cpp @@ -62,4 +62,3 @@ QTranslator *MMSInputFactory::createTranslator(QObject *parent) translator->load(QString(":/mms_plugin_") + locale); return translator; } -Q_EXPORT_PLUGIN2(mms, MMSInputFactory) diff --git a/src/plugins/Transports/mms/mmsinputfactory.h b/src/plugins/Transports/mms/mmsinputfactory.h index 25a1fe070..3b6e8576c 100644 --- a/src/plugins/Transports/mms/mmsinputfactory.h +++ b/src/plugins/Transports/mms/mmsinputfactory.h @@ -33,6 +33,7 @@ class QTranslator; class MMSInputFactory : public QObject, InputSourceFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.InputSourceFactoryInterface.1.0") Q_INTERFACES(InputSourceFactory) public: const InputSourceProperties properties() const; diff --git a/src/plugins/Ui/CMakeLists.txt b/src/plugins/Ui/CMakeLists.txt index 7670cdb56..ca25b54c9 100644 --- a/src/plugins/Ui/CMakeLists.txt +++ b/src/plugins/Ui/CMakeLists.txt @@ -1,9 +1,9 @@ SET(USE_SKINNED TRUE CACHE BOOL "enable/disable skinned user interface") SET(USE_QSUI TRUE CACHE BOOL "enable/disable simple user interface (qsui)") -IF(USE_SKINNED) +IF(USE_SKINNED AND Qt5X11Extras_FOUND) add_subdirectory(skinned) -ENDIF(USE_SKINNED) +ENDIF(USE_SKINNED AND Qt5X11Extras_FOUND) IF(USE_QSUI) add_subdirectory(qsui) diff --git a/src/plugins/Ui/qsui/CMakeLists.txt b/src/plugins/Ui/qsui/CMakeLists.txt index a0a3c9bd7..ab302dda4 100644 --- a/src/plugins/Ui/qsui/CMakeLists.txt +++ b/src/plugins/Ui/qsui/CMakeLists.txt @@ -1,14 +1,4 @@ -project(libqsui) - -# 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_SOURCE_DIR}) +project(qsui) # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) @@ -60,7 +50,7 @@ SET(libqsui_HDRS SET(libqsui_RCCS translations/translations.qrc txt/qsui_txt.qrc resources/qsui_resources.qrc) -QT4_ADD_RESOURCES(libqsui_RCC_SRCS ${libqsui_RCCS}) +QT5_ADD_RESOURCES(libqsui_RCC_SRCS ${libqsui_RCCS}) # user interface @@ -74,12 +64,12 @@ SET(libqsui_UIS forms/hotkeyeditor.ui ) -QT4_WRAP_UI(libqsui_UIS_H ${libqsui_UIS}) +QT5_WRAP_UI(libqsui_UIS_H ${libqsui_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(qsui MODULE ${libqsui_SRCS} ${libqsui_UIS_H} ${libqsui_RCC_SRCS} ${libqsui_HDRS}) add_dependencies(qsui qmmpui libqmmp) -target_link_libraries(qsui ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(qsui Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS qsui DESTINATION ${LIB_DIR}/qmmp/Ui) diff --git a/src/plugins/Ui/qsui/filesystembrowser.cpp b/src/plugins/Ui/qsui/filesystembrowser.cpp index 3d43f1e08..fa017bb17 100644 --- a/src/plugins/Ui/qsui/filesystembrowser.cpp +++ b/src/plugins/Ui/qsui/filesystembrowser.cpp @@ -79,11 +79,7 @@ FileSystemBrowser::FileSystemBrowser(QWidget *parent) : m_fileSystemModel = new QFileSystemModel(this); m_fileSystemModel->setReadOnly(true); m_fileSystemModel->setNameFilterDisables(false); -#if QT_VERSION >= 0x040700 m_fileSystemModel->setFilter(QDir::AllDirs | QDir::Files | QDir::NoDot); -#else - m_fileSystemModel->setFilter(QDir::AllDirs | QDir::Files); -#endif m_proxyModel = new FileSystemFilterProxyModel(this); m_proxyModel->setDynamicSortFilter(true); diff --git a/src/plugins/Ui/qsui/listwidget.cpp b/src/plugins/Ui/qsui/listwidget.cpp index 365239cca..5f231fb53 100644 --- a/src/plugins/Ui/qsui/listwidget.cpp +++ b/src/plugins/Ui/qsui/listwidget.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -196,9 +197,7 @@ void ListWidget::paintEvent(QPaintEvent *) { QPainter painter(this); m_drawer.fillBackground(&painter, width(), height()); -#if QT_VERSION >= 0x040700 painter.setLayoutDirection(Qt::LayoutDirectionAuto); -#endif bool rtl = (layoutDirection() == Qt::RightToLeft); int scroll_bar_width = m_scrollBar->isVisibleTo(this) ? m_scrollBar->sizeHint().width() : 0; diff --git a/src/plugins/Ui/qsui/logo.cpp b/src/plugins/Ui/qsui/logo.cpp index f8fe7cf80..c413dfbb3 100644 --- a/src/plugins/Ui/qsui/logo.cpp +++ b/src/plugins/Ui/qsui/logo.cpp @@ -184,7 +184,7 @@ void Logo::processPreset2() void Logo::processPreset3() { m_lines.clear(); - QString str = QString("...%1...").arg(Qmmp::strVersion().left(6)); + QString str = QString("...%1...").arg(Qmmp::strVersion().left(5)); int at = m_value % str.size(); foreach(QString line, m_source_lines) diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp index bdc7b81c8..3cf109e5e 100644 --- a/src/plugins/Ui/qsui/mainwindow.cpp +++ b/src/plugins/Ui/qsui/mainwindow.cpp @@ -132,6 +132,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) m_ui.statusbar->addPermanentWidget(m_timeLabel, 1); m_ui.statusbar->setMinimumWidth(2); m_statusLabel->setMinimumWidth(2); + m_ui.statusbar->setStyleSheet("QStatusBar::item { border: 0px solid black };"); //volume m_volumeSlider = new VolumeSlider(this); m_volumeSlider->setFocusPolicy(Qt::NoFocus); diff --git a/src/plugins/Ui/qsui/qsuifactory.cpp b/src/plugins/Ui/qsui/qsuifactory.cpp index 014b1aabf..ccf2401dd 100644 --- a/src/plugins/Ui/qsui/qsuifactory.cpp +++ b/src/plugins/Ui/qsui/qsuifactory.cpp @@ -53,5 +53,3 @@ QTranslator *QSUIFactory::createTranslator(QObject *parent) translator->load(QString(":/qsui_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(qsui, QSUIFactory) diff --git a/src/plugins/Ui/qsui/qsuifactory.h b/src/plugins/Ui/qsui/qsuifactory.h index b95931751..138807308 100644 --- a/src/plugins/Ui/qsui/qsuifactory.h +++ b/src/plugins/Ui/qsui/qsuifactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2011-2012 by Ilya Kotov * + * Copyright (C) 2011-2015 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -30,6 +30,7 @@ class QSUIFactory : public QObject, public UiFactory { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.UiFactoryInterface.1.0") Q_INTERFACES(UiFactory) public: const UiProperties properties() const; diff --git a/src/plugins/Ui/qsui/qsuiquicksearch.cpp b/src/plugins/Ui/qsui/qsuiquicksearch.cpp index 2b82fa3a4..19509c9c6 100644 --- a/src/plugins/Ui/qsui/qsuiquicksearch.cpp +++ b/src/plugins/Ui/qsui/qsuiquicksearch.cpp @@ -41,21 +41,8 @@ QSUIQuickSearch::QSUIQuickSearch(ListWidget *listWidget, QWidget *parent) : setLayout(layout); layout->addWidget(m_lineEdit); m_lineEdit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); + m_lineEdit->setClearButtonEnabled(true); connect(m_lineEdit, SIGNAL(textEdited(QString)), m_listWidget, SLOT(setFilterString(QString))); - connect(m_lineEdit, SIGNAL(textChanged(QString)), SLOT(onTextChanged(QString))); connect(m_manager, SIGNAL(selectedPlayListChanged(PlayListModel*,PlayListModel*)), m_lineEdit, SLOT(clear())); connect(m_listWidget, SIGNAL(doubleClicked()), m_lineEdit, SLOT(clear())); - - m_clearButton = new QToolButton(this); - m_clearButton->setVisible(false); - m_clearButton->setAutoRaise(true); - m_clearButton->setIcon(QIcon::fromTheme("edit-clear")); - layout->addWidget(m_clearButton); - connect(m_clearButton, SIGNAL(clicked()), m_lineEdit, SLOT(clear())); - connect(m_clearButton, SIGNAL(clicked()), m_listWidget, SLOT(setFilterString())); -} - -void QSUIQuickSearch::onTextChanged(const QString &str) -{ - m_clearButton->setVisible(!str.isEmpty()); } diff --git a/src/plugins/Ui/qsui/qsuiquicksearch.h b/src/plugins/Ui/qsui/qsuiquicksearch.h index 2e51c6388..96e96cd29 100644 --- a/src/plugins/Ui/qsui/qsuiquicksearch.h +++ b/src/plugins/Ui/qsui/qsuiquicksearch.h @@ -27,7 +27,6 @@ class QLineEdit; class PlayListManager; class ListWidget; -class QToolButton; /** @author Ilya Kotov @@ -38,14 +37,10 @@ class QSUIQuickSearch : public QWidget public: explicit QSUIQuickSearch(ListWidget *listWidget, QWidget *parent = 0); -private slots: - void onTextChanged(const QString &str); - private: QLineEdit *m_lineEdit; PlayListManager *m_manager; ListWidget *m_listWidget; - QToolButton *m_clearButton; }; diff --git a/src/plugins/Ui/qsui/shortcutitem.cpp b/src/plugins/Ui/qsui/shortcutitem.cpp index 8e3412e10..2502b8bd0 100644 --- a/src/plugins/Ui/qsui/shortcutitem.cpp +++ b/src/plugins/Ui/qsui/shortcutitem.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 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 * @@ -24,7 +24,7 @@ ShortcutItem::ShortcutItem(QTreeWidgetItem *parent, int type) : QTreeWidgetItem(parent, QStringList() << ActionManager::instance()->action(type)->text().remove("&") - << ActionManager::instance()->action(type)->shortcut()) + << ActionManager::instance()->action(type)->shortcut().toString()) { m_action = ActionManager::instance()->action(type); setIcon(0, m_action->icon()); diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_bg.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_bg.ts index 52f8c68ec..da1eaf5e6 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_bg.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_bg.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist - + Change Directory - + Quick Search - + Select Directory @@ -663,7 +663,7 @@ MainWindow - + Qmmp @@ -809,189 +809,189 @@ - + Rename Playlist - + Volume - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| - + Paused - + <b>%1</b>|tracks: %2|total time: %3| - + Stopped - + Playlist name: - + Appearance - + Shortcuts - + Playing - + Ctrl+0 - + P - + Position - + Quick Search - + Edit Toolbars - + Sort List - - + + By Title - - + + By Album - - + + By Artist - - + + By Album Artist - - + + By Filename - - + + By Path + Filename - - + + By Date - - + + By Track Number - - + + By Disc Number - - + + By File Creation Date - - + + By File Modification Date - + By Group - + Sort Selection - + Randomize List - + Reverse List - - + + Actions - + Add new playlist - + Show all tabs - + Buffering: %1% diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_cs.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_cs.ts index d097b455f..2d10cc62d 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_cs.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_cs.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist - + Change Directory - + Quick Search - + Select Directory @@ -663,7 +663,7 @@ MainWindow - + Qmmp Qmmp @@ -809,189 +809,189 @@ - + Rename Playlist Přejmenovat seznam skladeb - + Volume Hlasitost - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| - + Paused Pozastaveno - + <b>%1</b>|tracks: %2|total time: %3| - + Stopped Zastaveno - + Playlist name: Název seznamu skladeb: - + Appearance Vzhled - + Shortcuts Zkratky - + Playing Přehrává se - + Ctrl+0 - + P P - + Position Umístění - + Quick Search - + Edit Toolbars - + Sort List Seřadit seznam - - + + By Title Podle názvu skladby - - + + By Album Podle alba - - + + By Artist Podle umělce - - + + By Album Artist - - + + By Filename Podle názvu souboru - - + + By Path + Filename Podle cesty a názvu souboru - - + + By Date Podle data - - + + By Track Number Podle čísla skladby - - + + By Disc Number Podle čísla disku - - + + By File Creation Date Podle data vytvoření souboru - - + + By File Modification Date - + By Group - + Sort Selection Seřadit výběr - + Randomize List Zamíchat seznam - + Reverse List Obrátit pořadí seznamu - - + + Actions Činnosti - + Add new playlist - + Show all tabs - + Buffering: %1% Načítám: %1 % diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_de.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_de.ts index 14950f6d4..a36d3e2ef 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_de.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_de.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist Zur Wiedergabeliste hinzufügen - + Change Directory Verzeichnis wechseln - + Quick Search Schnellsuche - + Select Directory Verzeichnis auswählen @@ -663,7 +663,7 @@ MainWindow - + Qmmp Qmmp @@ -809,189 +809,189 @@ - + Rename Playlist Wiedergabeliste umbenennen - + Volume Lautstärke - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| <b>%1</b>|%2 Bit|%3 Kan.|%4 Hz|Titel: %5|Gesamtzeit: %6|%7 kbit/s| - + Paused Pausiert - + <b>%1</b>|tracks: %2|total time: %3| <b>%1</b>|Titel: %2|Gesamtzeit: %3| - + Stopped Gestoppt - + Playlist name: Wiedergabelistenname: - + Appearance Erscheinungsbild - + Shortcuts Kurzbefehle - + Playing Wiedergabe - + Ctrl+0 Strg+0 - + P P - + Position Position - + Quick Search Schnellsuche - + Edit Toolbars Werkzeugleisten bearbeiten - + Sort List Wiedergabeliste sortieren - - + + By Title Nach Titel - - + + By Album Nach Album - - + + By Artist Nach Interpret - - + + By Album Artist Nach Albuminterpret - - + + By Filename Nach Dateinamen - - + + By Path + Filename Nach Pfad & Dateinamen - - + + By Date Nach Datum - - + + By Track Number Nach Titelnummer - - + + By Disc Number Nach Disc-Nummer - - + + By File Creation Date Nach Dateierstellungsdatum - - + + By File Modification Date Nach Dateiänderungsdatum - + By Group Nach Gruppe - + Sort Selection Auswahl sortieren - + Randomize List Wiedergabeliste mischen - + Reverse List Wiedergabeliste umkehren - - + + Actions Aktionen - + Add new playlist Neue Wiedergabeliste hinzufügen - + Show all tabs Alle Reiter anzeigen - + Buffering: %1% Pufferung: %1 % diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_el.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_el.ts index c5707b310..684c328dc 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_el.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_el.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist Προσθήκη στη Λίστα Αναπαραγωγής - + Change Directory Αλλαγή καταλόγου - + Quick Search Γρήγορη αναζήτηση - + Select Directory Επιλογή καταλόγου @@ -663,7 +663,7 @@ MainWindow - + Qmmp Qmmp @@ -809,189 +809,189 @@ - + Rename Playlist Μετονομασία της λίστας αναπαραγωγής - + Volume Ένταση - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| <b>%1</b>|%2 bit|%3 καν|%4 Hz|κομμάτια: %5|συνολικός χρόνος: %6|%7 kbps| - + Paused Σε παύση - + <b>%1</b>|tracks: %2|total time: %3| <b>%1</b>|κομμάτια: %2|συνολικός χρόνος: %3| - + Stopped Σταματημένο - + Playlist name: Όνομα λίστας αναπαραγωγής: - + Appearance Εμφάνιση - + Shortcuts Συντομεύσεις - + Playing Εκτελείται - + Ctrl+0 Ctrl+0 - + P P - + Position Θέση - + Quick Search Γρήγορη αναζήτηση - + Edit Toolbars Επεξεργασία γραμμών εργαλείων - + Sort List Ταξινόμηση λίστας - - + + By Title Ανά τίτλο - - + + By Album Ανά άλμπουμ - - + + By Artist Ανά καλλιτέχνη - - + + By Album Artist Ανά καλλιτέχνη άλμπουμ - - + + By Filename Ανά όνομα αρχείου - - + + By Path + Filename Ανά διαδρομή + όνομα αρχείου - - + + By Date Ανά ημερομηνία - - + + By Track Number Ανά αριθμό κομματιού - - + + By Disc Number Ανά αριθμό δίσκου - - + + By File Creation Date Ανά ημερομηνία δημιουργίας του αρχείου - - + + By File Modification Date Ανά ημερομηνία τροποποίησης του αρχείου - + By Group Ανά ομάδα - + Sort Selection Ταξινόμηση επιλογής - + Randomize List Τυχαία ταξινόμηση της λίστας - + Reverse List Αντιστροφή ταξινόμησης της λίστας - - + + Actions Ενέργειες - + Add new playlist Προσθήκη νέας λίστας αναπαραγωγής - + Show all tabs Εμφάνιση όλων των καρτελών - + Buffering: %1% Πλήρωση ενδιάμεσης μνήμης: %1% diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_en.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_en.ts index 6125885e1..66c995ff3 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_en.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_en.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist - + Change Directory - + Quick Search - + Select Directory @@ -663,7 +663,7 @@ MainWindow - + Qmmp @@ -809,189 +809,189 @@ - + Rename Playlist - + Volume - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| - + Paused - + <b>%1</b>|tracks: %2|total time: %3| - + Stopped - + Playlist name: - + Appearance - + Shortcuts - + Playing - + Ctrl+0 - + P - + Position - + Quick Search - + Edit Toolbars - + Sort List - - + + By Title - - + + By Album - - + + By Artist - - + + By Album Artist - - + + By Filename - - + + By Path + Filename - - + + By Date - - + + By Track Number - - + + By Disc Number - - + + By File Creation Date - - + + By File Modification Date - + By Group - + Sort Selection - + Randomize List - + Reverse List - - + + Actions - + Add new playlist - + Show all tabs - + Buffering: %1% diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_es.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_es.ts index aa474b799..bad982f31 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_es.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_es.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist Añadir a la lista de reproducción - + Change Directory Cambiar Directorio - + Quick Search Búsqueda Rápida - + Select Directory Seleccionar Directorio @@ -663,7 +663,7 @@ MainWindow - + Qmmp Qmmp @@ -809,189 +809,189 @@ - + Rename Playlist Renombrar lista - + Volume Volumen - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| <b>%1</b>|%2 bit|%3 ch|%4 Hz|pistas: %5|tiempo total: %6|%7 kbps| - + Paused Pausado - + <b>%1</b>|tracks: %2|total time: %3| <b>%1</b>|pistas: %2|tiempo total: %3| - + Stopped Detenido - + Playlist name: Nombre de la lista: - + Appearance Apariencia - + Shortcuts Atajos - + Playing Reproduciendo - + Ctrl+0 Ctrl+0 - + P P - + Position Posición - + Quick Search Búsqueda Rápida - + Edit Toolbars Editar Barras de Herramientas - + Sort List Ordenar la lista - - + + By Title Por título - - + + By Album Por álbum - - + + By Artist Por intérprete - - + + By Album Artist Por Artista del Álbum - - + + By Filename Por nombre de archivo - - + + By Path + Filename Por ruta + nombre - - + + By Date Por fecha - - + + By Track Number Por número de pista - - + + By Disc Number Por Número de Disco - - + + By File Creation Date Por Fecha de Creación de Archivo - - + + By File Modification Date Por Fecha de Modificación de Archivo - + By Group Por Grupo - + Sort Selection Ordenar la selección - + Randomize List Lista aleatoria - + Reverse List Invertir la lista - - + + Actions Acciones - + Add new playlist Añadir nueva lista de reproducción - + Show all tabs Mostrar todas las pestañas - + Buffering: %1% Cargando: %1% diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_fi.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_fi.ts index 06b376045..df6780a2a 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_fi.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_fi.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist Lisää soittolistaan - + Change Directory Vaihda kansio - + Quick Search Pikahaku - + Select Directory Valitse kansio @@ -663,7 +663,7 @@ MainWindow - + Qmmp Qmmp @@ -809,189 +809,189 @@ - + Rename Playlist Nimeä soittolista uudelleen - + Volume Äänenvoimakkuus - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| - + Paused Keskeytetty - + <b>%1</b>|tracks: %2|total time: %3| - + Stopped Pysäytetty - + Playlist name: Soittolistan nimi: - + Appearance Ulkoasu - + Shortcuts Pikanäppäimet - + Playing - + Ctrl+0 Ctrl+0 - + P P - + Position Sijainti - + Quick Search Pikahaku - + Edit Toolbars Muokkaa työkalupalkkeja - + Sort List - - + + By Title - - + + By Album - - + + By Artist - - + + By Album Artist - - + + By Filename - - + + By Path + Filename - - + + By Date - - + + By Track Number - - + + By Disc Number - - + + By File Creation Date - - + + By File Modification Date - + By Group - + Sort Selection - + Randomize List - + Reverse List Käänteinen lista - - + + Actions Toiminnot - + Add new playlist Lisää uusi soittolista - + Show all tabs - + Buffering: %1% Puskuroidaan: %1 % diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_fr.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_fr.ts index e3c47972e..2c754b042 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_fr.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_fr.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist Ajouter à la liste - + Change Directory Changer le répertoire - + Quick Search Recherche rapide - + Select Directory Sélectionner le répertoire @@ -663,7 +663,7 @@ MainWindow - + Qmmp Qmmp @@ -809,189 +809,189 @@ - + Rename Playlist Renommer la liste - + Volume Volume - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| <b>%1</b>|%2 bit|%3 ch|%4 Hz|pistes : %5|durée totale : %6|%7 kbps| - + Paused En pause - + <b>%1</b>|tracks: %2|total time: %3| <b>%1</b>|pistes : %2|durée totale : %3| - + Stopped Arrêté - + Playlist name: Nom de la liste : - + Appearance Apparence - + Shortcuts Raccourcis - + Playing En cours - + Ctrl+0 Ctrl+0 - + P P - + Position Position - + Quick Search Recherche rapideR - + Edit Toolbars Editer la barre des outils - + Sort List Trier la liste - - + + By Title par titre - - + + By Album par album - - + + By Artist par artiste - - + + By Album Artist par artiste d'album - - + + By Filename par no mde fichier - - + + By Path + Filename par chemin et nom de fichier - - + + By Date par date - - + + By Track Number par numéro de piste - - + + By Disc Number par numéro de disque - - + + By File Creation Date par date de création du fichier - - + + By File Modification Date par date de modification du fichier - + By Group par groupe - + Sort Selection trier la sélection - + Randomize List Mélanger la liste - + Reverse List Inverser la lsite - - + + Actions Actions - + Add new playlist Ajouter une nouvelle liste - + Show all tabs Montrer tous les onglets - + Buffering: %1% Mise en tampon : %1 % diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_gl_ES.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_gl_ES.ts index d809aae90..5dea37eed 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_gl_ES.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_gl_ES.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist Engadir á lista de producción - + Change Directory Mudar directorio - + Quick Search - + Select Directory Seleccionar directorio @@ -663,7 +663,7 @@ MainWindow - + Qmmp Qmmp @@ -809,189 +809,189 @@ - + Rename Playlist Renomear lista de reprodución - + Volume Volume - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| <b>%1</b>|%2 bit|%3 ch|%4 Hz|pistas: %5|tempo total: %6|%7 kbps| - + Paused Pausado - + <b>%1</b>|tracks: %2|total time: %3| <b>%1</b>|pistas: %2|tempo total: %3| - + Stopped Detido - + Playlist name: Nome da lista de reprodución: - + Appearance Apariencia - + Shortcuts Accesos rápidos - + Playing Reproducindo - + Ctrl+0 Ctrl+0 - + P P - + Position Posición - + Quick Search - + Edit Toolbars Editar barras de ferramentas - + Sort List Ordear lista - - + + By Title Por título - - + + By Album Por álbume - - + + By Artist Por artista - - + + By Album Artist Por Artista do álbum - - + + By Filename Por nome de ficheiro - - + + By Path + Filename Por ruta + nome de ficheiro - - + + By Date Por data - - + + By Track Number Por número de pista - - + + By Disc Number Por número de disco - - + + By File Creation Date Por data de creación do ficheiro - - + + By File Modification Date Por data de modificación do arquivo - + By Group Por grupo - + Sort Selection Ordear selección - + Randomize List Lista aleatoria - + Reverse List Reverter lista - - + + Actions Accións - + Add new playlist Engadir nova lista de reproducción - + Show all tabs Amosar tódalas lapelas - + Buffering: %1% Buffering: %1% diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_he.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_he.ts index eac6cd6c0..c52f2547c 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_he.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_he.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist הוסף אל רשימת נגינה - + Change Directory שנה מדור - + Quick Search - + Select Directory בחר מדור @@ -663,7 +663,7 @@ MainWindow - + Qmmp Qmmp @@ -809,189 +809,189 @@ - + Rename Playlist שנה שם רשימת נגינה - + Volume עוצמת קול - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| - + Paused השהה - + <b>%1</b>|tracks: %2|total time: %3| - + Stopped הופסקה - + Playlist name: שם רשימת נגינה: - + Appearance הופעה - + Shortcuts קיצורי דרך - + Playing מנגן - + Ctrl+0 Ctrl+0 - + P P - + Position מיקום - + Quick Search - + Edit Toolbars ערוך סרגלי כלים - + Sort List מיין רשימה - - + + By Title לפי כותרת - - + + By Album לפי אלבום - - + + By Artist לפי אמן - - + + By Album Artist לפי אלבום אמן - - + + By Filename לפי שם קובץ - - + + By Path + Filename לפי נתיב + שם קובץ - - + + By Date לפי תאריך - - + + By Track Number לפי מספר רצועה - - + + By Disc Number לפי מספר תקליטור - - + + By File Creation Date לפי תאריך יצירת קובץ - - + + By File Modification Date לפי תאריך שינוי קובץ - + By Group לפי קבוצה - + Sort Selection מיין נבחרות - + Randomize List הפוך רשימה לאקראית - + Reverse List הפוך רשימה - - + + Actions פעולות - + Add new playlist הוסף רשימת נגינה חדשה - + Show all tabs הצג את כל הכרטיסיות - + Buffering: %1% אוגר כעת: %1% diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_hu.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_hu.ts index 635246949..fa35f39c9 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_hu.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_hu.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist - + Quick Search - + Select Directory - + Change Directory @@ -662,190 +662,190 @@ MainWindow - + Volume - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| - + Paused - + <b>%1</b>|tracks: %2|total time: %3| - + Stopped - + Playlist name: - + Appearance Megjelenés - + Shortcuts - + Playing - + Ctrl+0 - + P - + Position - + Quick Search - + Edit Toolbars - + Sort List Lista rendezése - - + + By Title Cím szerint - - + + By Album Album szerint - - + + By Artist Előadó szerint - - + + By Album Artist - - + + By Filename Fájlnév szerint - - + + By Path + Filename Elérési út és fájlnév szerint - - + + By Date Dátum szerint - - + + By Track Number Zene sorszáma szerint - - + + By Disc Number - - + + By File Creation Date - - + + By File Modification Date - + By Group - + Sort Selection Jelöltek rendezése - + Randomize List Lista összekeverése - + Reverse List Fordított lista - - + + Actions Tevékenységek - + Add new playlist - + Show all tabs - + Buffering: %1% - + Qmmp @@ -991,7 +991,7 @@ - + Rename Playlist Lista átnevezése diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_id.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_id.ts index 53c6b663f..51fd31d26 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_id.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_id.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist Tambah ke Daftarmain - + Change Directory Ubah Direktori - + Quick Search - + Select Directory Pilih Direktori @@ -663,7 +663,7 @@ MainWindow - + Qmmp Qmmp @@ -809,189 +809,189 @@ - + Rename Playlist Ubah-nama Daftarmain - + Volume Volume - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| <b>%1</b>|%2 bit|%3 ch|%4 Hz|track: %5|total waktu: %6|%7 kbps| - + Paused Dijeda - + <b>%1</b>|tracks: %2|total time: %3| <b>%1</b>|track: %2|total waktu: %3| - + Stopped Dihentikan - + Playlist name: Nama daftarmain: - + Appearance Tampilan - + Shortcuts Pintasan - + Playing Memainkan - + Ctrl+0 Ctrl+0 - + P P - + Position Posisi - + Quick Search - + Edit Toolbars Edit Bilah-alat - + Sort List Daftar Surtir - - + + By Title Menurut Judul - - + + By Album Menurut Album - - + + By Artist Menurut Artist - - + + By Album Artist Menurut Album Artist - - + + By Filename Menurut Filename - - + + By Path + Filename Menurut Alur + Filename - - + + By Date Menurut Tanggal - - + + By Track Number Menurut Nomor Trek - - + + By Disc Number Menurut Nomor Cakram - - + + By File Creation Date Menurut Tanggal Penciptaan File - - + + By File Modification Date Menurut Tanggal Modifikasi File - + By Group Menurut Kelompok - + Sort Selection Pilihan Surtir - + Randomize List Daftar Acakan - + Reverse List Daftar Mundur - - + + Actions Tindakan - + Add new playlist Tambah daftarmain baru - + Show all tabs Tampakkan semua tab - + Buffering: %1% Buffering: %1% diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_it.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_it.ts index 26cfda917..5705399c8 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_it.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_it.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist - + Quick Search - + Select Directory - + Change Directory @@ -662,190 +662,190 @@ MainWindow - + Volume - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| - + Paused - + <b>%1</b>|tracks: %2|total time: %3| - + Stopped - + Playlist name: - + Appearance Aspetto - + Shortcuts - + Playing - + Ctrl+0 - + P - + Position - + Quick Search - + Edit Toolbars - + Sort List Riordina la lista - - + + By Title Per titolo - - + + By Album Per album - - + + By Artist PEr interprete - - + + By Album Artist - - + + By Filename Per titolo del brano - - + + By Path + Filename per percorso più titolo del brano - - + + By Date Per data - - + + By Track Number Per numero di traccia - - + + By Disc Number - - + + By File Creation Date - - + + By File Modification Date - + By Group - + Sort Selection Riordina la selezione - + Randomize List Mescola i brnai della lista - + Reverse List Inverti la lista - - + + Actions Azioni - + Add new playlist - + Show all tabs - + Buffering: %1% - + Qmmp @@ -991,7 +991,7 @@ - + Rename Playlist Rinomina lista brani diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_ja.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_ja.ts index 020271d49..46c6e309b 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_ja.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_ja.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist プレイリストに追加 - + Quick Search 絞り込み検索 - + Select Directory ディレクトリーを選択 - + Change Directory ディレクトリーを変更 @@ -662,190 +662,190 @@ MainWindow - + Volume 音量 - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| <b>%1</b>|%2 bit|%3 ch|%4 Hz|全 %5 曲|総演奏時間: %6|%7 kbps| - + Paused 一時停止中断 - + <b>%1</b>|tracks: %2|total time: %3| <b>%1</b>|全 %2 曲|総演奏時間: %3| - + Stopped 終演 - + Playlist name: プレイリスト名: - + Appearance 外観 - + Shortcuts ショートカット - + Playing 演奏中 - + Ctrl+0 Ctrl+0 - + P P - + Position 配置 - + Quick Search 絞り込み検索 - + Edit Toolbars ツールバーを変更 - + Sort List リストを並べ換え - - + + By Title タイトル名順に - - + + By Album アルバム名順に - - + + By Artist アーティスト名順に - - + + By Album Artist アルバムのアーティスト名順に - - + + By Filename ファイル名順に - - + + By Path + Filename パスとファイル名の順に - - + + By Date 日付順に - - + + By Track Number トラック番号順に - - + + By Disc Number ディスク番号順に - - + + By File Creation Date ファイルの作成日順に - - + + By File Modification Date ファイルの加工日時順に - + By Group グループ名順に - + Sort Selection 選択範囲内で並び換え - + Randomize List リストを順不同に - + Reverse List リストを逆順に - - + + Actions 動作 - + Add new playlist 新しいプレイリストを追加 - + Show all tabs すべてのタブを表示 - + Buffering: %1% バッファーへ先読み: %1% - + Qmmp QMMP @@ -991,7 +991,7 @@ - + Rename Playlist プレイリスト名を変更 diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_kk.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_kk.ts index 1f93d2906..45f1334a7 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_kk.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_kk.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist - + Quick Search - + Select Directory - + Change Directory @@ -663,7 +663,7 @@ MainWindow - + Qmmp @@ -809,189 +809,189 @@ - + Rename Playlist - + Volume Даусы - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| - + Paused - + <b>%1</b>|tracks: %2|total time: %3| - + Stopped - + Playlist name: - + Appearance Сыртқы түрі - + Shortcuts - + Playing - + Ctrl+0 - + P - + Position - + Quick Search - + Edit Toolbars - + Sort List Сұрыптау - - + + By Title Аты бойынша - - + + By Album - - + + By Artist - - + + By Album Artist - - + + By Filename Файл аты бойынша - - + + By Path + Filename Жолы мен файл аты бойынша - - + + By Date Уақыты бойынша - - + + By Track Number Трек нөмірі бойынша - - + + By Disc Number - - + + By File Creation Date - - + + By File Modification Date - + By Group - + Sort Selection Таңдалғанды сұрыптау - + Randomize List Тізімді араластыру - + Reverse List Тізімді кері айналдыру - - + + Actions Әрекеттер - + Add new playlist - + Show all tabs - + Buffering: %1% diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_lt.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_lt.ts index 8eff0a4d8..2069b99c4 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_lt.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_lt.ts @@ -582,22 +582,22 @@ FileSystemBrowser - + Add to Playlist Įkelti į grojąraštį - + Quick Search - + Select Directory Pasirinkti aplanką - + Change Directory Pakeisti aplanką @@ -663,190 +663,190 @@ MainWindow - + Volume Garsumas - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| - + Paused Pristabdyta - + <b>%1</b>|tracks: %2|total time: %3| - + Stopped Sustabdyta - + Playlist name: Grojąraščio pavadinimas: - + Appearance Išvaizda - + Shortcuts Trumpiniai - + Playing Grojama - + Ctrl+0 Ctrl+0 - + P P - + Position - + Quick Search - + Edit Toolbars - + Sort List Rūšiuoti sąrašą - - + + By Title Pagal dainos pavadinimą - - + + By Album Pagal albumą - - + + By Artist Pagal atlikėją - - + + By Album Artist - - + + By Filename Pagal bylos pavadinimą - - + + By Path + Filename Pagal kelią iki bylos ir pavadinimą - - + + By Date Pagal datą - - + + By Track Number Pagal takelio numerį - - + + By Disc Number Pagal disko numerį - - + + By File Creation Date Pagal bylos sukūrimo laiką - - + + By File Modification Date - + By Group Pagal grupę - + Sort Selection Rūšiuoti pasirinktus - + Randomize List Sumaišyti sąrašą - + Reverse List Apversti - - + + Actions Veiksmai - + Add new playlist Pridėti naują grojąraštį - + Show all tabs Rodyti visas korteles - + Buffering: %1% Buferis: %1% - + Qmmp Qmmp @@ -992,7 +992,7 @@ - + Rename Playlist Pervadinti grojaraštį diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_nl.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_nl.ts index f462da0df..ed7380775 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_nl.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_nl.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist - + Quick Search - + Select Directory - + Change Directory @@ -663,190 +663,190 @@ Afspeellijst MainWindow - + Volume - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| - + Paused Gepauzeerd - + <b>%1</b>|tracks: %2|total time: %3| - + Stopped Gestopt - + Playlist name: - + Appearance Vertoning - + Shortcuts Sneltoetsen - + Playing Spelen - + Ctrl+0 - + P - + Position - + Quick Search - + Edit Toolbars - + Sort List Sorteer Lijst - - + + By Title Op Titel - - + + By Album Op Album - - + + By Artist Op Artiest - - + + By Album Artist - - + + By Filename Op Bestandsnaam - - + + By Path + Filename Op Pad + Bestandsnaam - - + + By Date Op Datum - - + + By Track Number Op Lied Nummer - - + + By Disc Number Op CD Nummer - - + + By File Creation Date - - + + By File Modification Date - + By Group - + Sort Selection Sorteer Selectie - + Randomize List Schud Lijst - + Reverse List Draai Lijst Om - - + + Actions Acties - + Add new playlist - + Show all tabs - + Buffering: %1% Bufferen: %1% - + Qmmp Qmmp @@ -993,7 +993,7 @@ Instellingen - + Rename Playlist Hernoem Afspeellijst diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_pl_PL.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_pl_PL.ts index 0cedda077..644b35641 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_pl_PL.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_pl_PL.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist Dodaj do listy odtwarzania - + Change Directory Zmień Katalog - + Quick Search - + Select Directory Wybierz Katalog @@ -663,7 +663,7 @@ MainWindow - + Qmmp @@ -809,189 +809,189 @@ - + Rename Playlist Zmień nazwę listy - + Volume Głośność - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| - + Paused Wstrzymane - + <b>%1</b>|tracks: %2|total time: %3| - + Stopped Zatrzymane - + Playlist name: Nazwa listy odtwarzania: - + Appearance Wygląd - + Shortcuts Skróty klawiszowe - + Playing Odtwarzanie - + Ctrl+0 - + P - + Position Pozycja - + Quick Search - + Edit Toolbars - + Sort List Sortuj listę - - + + By Title Według nazwy - - + + By Album Według nazwy albumu - - + + By Artist Według artysty - - + + By Album Artist - - + + By Filename Według nazwy pliku - - + + By Path + Filename Według Ścieżki + Nazwy pliku - - + + By Date Wg Daty - - + + By Track Number Wg numeru utworu - - + + By Disc Number Wg Numeru płyty - - + + By File Creation Date Wg Daty Utworzenia pliku - - + + By File Modification Date - + By Group Wg Grupy - + Sort Selection Sortuj zaznaczone - + Randomize List Tasuj listę - + Reverse List Odwróć listę - - + + Actions Akcje - + Add new playlist Dodaj nową listę odtwarzania - + Show all tabs Pokaż wszystkie karty - + Buffering: %1% Buforowanie: %1% diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_pt.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_pt.ts index 41aa89f09..6ba7c0221 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_pt.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_pt.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist Adicionar à lista de reprodução - + Change Directory Mudar diretório - + Quick Search Procura rápida - + Select Directory Selecionar diretório @@ -663,7 +663,7 @@ MainWindow - + Qmmp Qmmp @@ -809,189 +809,189 @@ - + Rename Playlist Renomear lista de reprodução - + Volume Volume - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| <b>%1</b>|%2 bit|%3 ca|%4 Hz|faixas: %5|duração total: %6|%7 kbps| - + Paused Pausa - + <b>%1</b>|tracks: %2|total time: %3| <b>%1</b>|faixas: %2|duração total: %3| - + Stopped Parado - + Playlist name: Nome da lista de reprodução: - + Appearance Aparência - + Shortcuts Atalhos - + Playing Reprodução - + Ctrl+0 Ctrl+0 - + P P - + Position Posição - + Quick Search Procura rápida - + Edit Toolbars Editar barras de ferramentas - + Sort List Organizar lista - - + + By Title Por título - - + + By Album Por álbum - - + + By Artist Por artista - - + + By Album Artist Por artista do álbum - - + + By Filename Por nome de ficheiro - - + + By Path + Filename Por caminho e nome de ficheiro - - + + By Date Por data - - + + By Track Number Por número de faixa - - + + By Disc Number Por número de disco - - + + By File Creation Date Por data de criação do ficheiro - - + + By File Modification Date Por data de modificação do ficheiro - + By Group Por grupo - + Sort Selection Organizar seleção - + Randomize List Lista aleatória - + Reverse List Inverter lista - - + + Actions Ações - + Add new playlist Adicionar nova lista de reprodução - + Show all tabs Mostrar todos os separadores - + Buffering: %1% Processamento: %1% diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_pt_BR.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_pt_BR.ts index 3c463822c..cd4fb1950 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_pt_BR.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_pt_BR.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist Adicionar à lista de reprodução - + Change Directory Mudar pasta - + Quick Search - + Select Directory Selecionar pasta @@ -663,7 +663,7 @@ MainWindow - + Qmmp Qmmp @@ -809,189 +809,189 @@ - + Rename Playlist Renomear lista de reprodução - + Volume Volume - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| <b>%1</b>|%2 bit|%3 ca|%4 Hz|faixas: %5|duração total: %6|%7 kbps| - + Paused Pausado - + <b>%1</b>|tracks: %2|total time: %3| <b>%1</b>|faixas: %2|duração total: %3| - + Stopped Parado - + Playlist name: Nome da lista de reprodução: - + Appearance Aparência - + Shortcuts Atalhos - + Playing Reprodução - + Ctrl+0 Ctrl+0 - + P P - + Position Posição - + Quick Search - + Edit Toolbars Editar barras de ferramentas - + Sort List Organizar lista - - + + By Title Por título - - + + By Album Por álbum - - + + By Artist Por artista - - + + By Album Artist Por artista do álbum - - + + By Filename Por nome de arquivo - - + + By Path + Filename Por caminho e nome de arquivo - - + + By Date Por data - - + + By Track Number Por número de faixa - - + + By Disc Number Por número de disco - - + + By File Creation Date Por data de criação do arquivo - - + + By File Modification Date Por data de modificação do arquivo - + By Group Por grupo - + Sort Selection Organizar seleção - + Randomize List Lista aleatória - + Reverse List Inverter lista - - + + Actions Ações - + Add new playlist Adicionar nova lista de reprodução - + Show all tabs Mostrar todos as abas - + Buffering: %1% Processamento: %1% diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_ru.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_ru.ts index 774dc2414..4b3f0e619 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_ru.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_ru.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist Добавить к списку воспроизведения - + Change Directory Сменить директорию - + Quick Search Быстрый поиск - + Select Directory Выберите директорию @@ -663,7 +663,7 @@ MainWindow - + Qmmp Qmmp @@ -809,189 +809,189 @@ - + Rename Playlist Переименовать список - + Volume Громкость - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| <b>%1</b>|%2 бит|%3 к.|%4 Гц|треков: %5|общее время: %6|%7 кбит/с| - + Paused Пауза - + <b>%1</b>|tracks: %2|total time: %3| <b>%1</b>|треков: %2|общее время: %3| - + Stopped Стоп - + Playlist name: Имя списка: - + Appearance Внешний вид - + Shortcuts Сочетания клавиш - + Playing Воспр. - + Ctrl+0 Ctrl+0 - + P P - + Position Позиция - + Quick Search Быстрый поиск - + Edit Toolbars Изменить панели инструментов - + Sort List Сортировать - - + + By Title По названию - - + + By Album По альбому - - + + By Artist По исполнителю - - + + By Album Artist По исполнителю альбома - - + + By Filename По имени файла - - + + By Path + Filename По пути и файлу - - + + By Date По дате - - + + By Track Number По номеру трека - - + + By Disc Number По номеру диска - - + + By File Creation Date По дате создания файла - - + + By File Modification Date По дате изменения файла - + By Group По группе - + Sort Selection Сортировать выделенное - + Randomize List Перемешать - + Reverse List Перевернуть - - + + Actions Действия - + Add new playlist Добавить новый список воспроизведения - + Show all tabs Показать все вкладки - + Buffering: %1% Буферизация: %1% diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_sk.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_sk.ts index 53ca77454..ae0e7d51c 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_sk.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_sk.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist - + Quick Search - + Select Directory - + Change Directory @@ -662,190 +662,190 @@ MainWindow - + Volume - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| - + Paused - + <b>%1</b>|tracks: %2|total time: %3| - + Stopped - + Playlist name: - + Appearance Vzhľad - + Shortcuts - + Playing - + Ctrl+0 - + P - + Position - + Quick Search - + Edit Toolbars - + Sort List Triediť zoznam - - + + By Title Podľa názvu - - + + By Album Podľa albumu - - + + By Artist Podľa interpréta - - + + By Album Artist - - + + By Filename Podľa názvu súboru - - + + By Path + Filename Podľa cesty a názvu súboru - - + + By Date Podľa dátumu - - + + By Track Number Podľa čísla skladby - - + + By Disc Number - - + + By File Creation Date - - + + By File Modification Date - + By Group - + Sort Selection Potriediť výber - + Randomize List Zamiešať zoznam - + Reverse List Otočiť zoznam - - + + Actions Činnosti - + Add new playlist - + Show all tabs - + Buffering: %1% - + Qmmp @@ -991,7 +991,7 @@ - + Rename Playlist Premenovať playlist diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_sr_BA.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_sr_BA.ts index fc7804a72..1be40d2f8 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_sr_BA.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_sr_BA.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist Додај на листу - + Change Directory Промијени фасциклу - + Quick Search - + Select Directory Избор фасцикле @@ -663,7 +663,7 @@ MainWindow - + Qmmp Кумп @@ -809,189 +809,189 @@ - + Rename Playlist Преименуј листу нумера - + Volume Јачина - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| - + Paused Паузирано - + <b>%1</b>|tracks: %2|total time: %3| - + Stopped Заустављено - + Playlist name: Име листе нумера: - + Appearance Изглед - + Shortcuts Пречице - + Playing Пуштање - + Ctrl+0 Ctrl+0 - + P P - + Position - + Quick Search - + Edit Toolbars - + Sort List Поређај - - + + By Title по наслову - - + + By Album по албуму - - + + By Artist по извођачу - - + + By Album Artist - - + + By Filename по имену фајла - - + + By Path + Filename по путањи и имену - - + + By Date по датуму - - + + By Track Number по броју нумере - - + + By Disc Number по броју диска - - + + By File Creation Date по датуму фајла - - + + By File Modification Date - + By Group по групи - + Sort Selection Поређај избор - + Randomize List Претумбај - + Reverse List Обрни - - + + Actions Радње - + Add new playlist Додај нову листу - + Show all tabs Прикажи све језичке - + Buffering: %1% Баферујем: %1% diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_sr_RS.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_sr_RS.ts index d088c4938..9e9cbec61 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_sr_RS.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_sr_RS.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist Додај на листу - + Change Directory Промени фасциклу - + Quick Search - + Select Directory Избор фасцикле @@ -663,7 +663,7 @@ MainWindow - + Qmmp Кумп @@ -809,189 +809,189 @@ - + Rename Playlist Преименуј листу нумера - + Volume Јачина - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| - + Paused Паузирано - + <b>%1</b>|tracks: %2|total time: %3| - + Stopped Заустављено - + Playlist name: Име листе нумера: - + Appearance Изглед - + Shortcuts Пречице - + Playing Пуштање - + Ctrl+0 Ctrl+0 - + P P - + Position - + Quick Search - + Edit Toolbars - + Sort List Поређај - - + + By Title по наслову - - + + By Album по албуму - - + + By Artist по извођачу - - + + By Album Artist - - + + By Filename по имену фајла - - + + By Path + Filename по путањи и имену - - + + By Date по датуму - - + + By Track Number по броју нумере - - + + By Disc Number по броју диска - - + + By File Creation Date по датуму фајла - - + + By File Modification Date - + By Group по групи - + Sort Selection Поређај избор - + Randomize List Претумбај - + Reverse List Обрни - - + + Actions Радње - + Add new playlist Додај нову листу - + Show all tabs Прикажи све језичке - + Buffering: %1% Баферујем: %1% diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_tr.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_tr.ts index af4fd111e..a6fad1113 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_tr.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_tr.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist - + Quick Search - + Select Directory - + Change Directory @@ -662,190 +662,190 @@ MainWindow - + Volume - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| - + Paused - + <b>%1</b>|tracks: %2|total time: %3| - + Stopped - + Playlist name: - + Appearance Görünüm - + Shortcuts - + Playing - + Ctrl+0 - + P - + Position - + Quick Search - + Edit Toolbars - + Sort List Listeyi Sınıflandır - - + + By Title Başlığa Göre - - + + By Album - - + + By Artist - - + + By Album Artist - - + + By Filename Dosya Adına Göre - - + + By Path + Filename Dosya Yolu + Dosya Adına Göre - - + + By Date Tarihe Göre - - + + By Track Number Parça Numarasına Göre - - + + By Disc Number - - + + By File Creation Date - - + + By File Modification Date - + By Group - + Sort Selection Seçilenleri Sınıflandır - + Randomize List Rastgele Listele - + Reverse List Listeyi Ters Çevir - - + + Actions Eylemler - + Add new playlist - + Show all tabs - + Buffering: %1% - + Qmmp @@ -991,7 +991,7 @@ - + Rename Playlist diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_uk_UA.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_uk_UA.ts index b91996f22..87e4b5a05 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_uk_UA.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_uk_UA.ts @@ -582,22 +582,22 @@ FileSystemBrowser - + Add to Playlist Додати до списку відтворення - + Quick Search Швидкий пошук - + Select Directory Виберіть теку - + Change Directory Змінити теку @@ -663,190 +663,190 @@ MainWindow - + Volume Гучність - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| <b>%1</b>|%2 біт|%3 к.|%4 Гц|треків: %5|загальний час: %6|%7 кбіт/с| - + Paused Призупинено - + <b>%1</b>|tracks: %2|total time: %3| <b>%1</b>|треків: %2|загальний час: %3| - + Stopped Зупинено - + Playlist name: Назва списку: - + Appearance Зовнішній вигляд - + Shortcuts Комбінації клавіш - + Playing Відтворюється - + Ctrl+0 - + P - + Position Позиція - + Quick Search Швидкий пошук - + Edit Toolbars Редагувати панель інструментів - + Sort List Сортувати - - + + By Title За назвою - - + + By Album За альбомом - - + + By Artist За виконавцем - - + + By Album Artist За альбомом виконавця - - + + By Filename За ім'ям файлу - - + + By Path + Filename За шляхом та файлом - - + + By Date За датою - - + + By Track Number За номером треку - - + + By Disc Number За номером диску - - + + By File Creation Date За датою створення файлу - - + + By File Modification Date За датою модифікації файлу - + By Group За групою - + Sort Selection Сортувати вибране - + Randomize List Перемішати - + Reverse List Перевернути - - + + Actions Дії - + Add new playlist Додати новий список - + Show all tabs Показати всі вкладки - + Buffering: %1% Буферизація: %1% - + Qmmp @@ -992,7 +992,7 @@ - + Rename Playlist Переіменувати список diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_zh_CN.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_zh_CN.ts index 98c8b0dd5..d9dc1def2 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_zh_CN.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_zh_CN.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist 添加到播放列表中 - + Change Directory 更改文件夹 - + Quick Search - + Select Directory 选择文件夹 @@ -663,7 +663,7 @@ MainWindow - + Qmmp Qmmp @@ -809,189 +809,189 @@ - + Rename Playlist 重命名播放列表 - + Volume 音量 - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| <b>%1</b?|%2 比特|%3频道|%4赫兹|曲目：%5|总计时间：%6|%7前比特每秒| - + Paused 被暂停 - + <b>%1</b>|tracks: %2|total time: %3| <b>%1</b>|曲目：%2|总计时间：%3| - + Stopped 被停止 - + Playlist name: 播放列表名称： - + Appearance 外观 - + Shortcuts 热键 - + Playing 播放中 - + Ctrl+0 Ctrl+0 - + P P - + Position 位置 - + Quick Search - + Edit Toolbars 编辑工具栏 - + Sort List 清单排序 - - + + By Title 按标题 - - + + By Album 按专辑 - - + + By Artist 按艺术家 - - + + By Album Artist 按专辑 艺术家 - - + + By Filename 按文件名称 - - + + By Path + Filename 按路径+文件名称 - - + + By Date 按日期 - - + + By Track Number 按单曲号 - - + + By Disc Number 按光盘号 - - + + By File Creation Date 按文件的创建日期 - - + + By File Modification Date 按文件的修改日期 - + By Group 按组 - + Sort Selection 排序选择 - + Randomize List 随机列表 - + Reverse List 反序列表 - - + + Actions 行动 - + Add new playlist 添加新播放列表 - + Show all tabs 显示所有的分页标签 - + Buffering: %1% 缓冲中：%1% diff --git a/src/plugins/Ui/qsui/translations/qsui_plugin_zh_TW.ts b/src/plugins/Ui/qsui/translations/qsui_plugin_zh_TW.ts index c27319cae..81dc71433 100644 --- a/src/plugins/Ui/qsui/translations/qsui_plugin_zh_TW.ts +++ b/src/plugins/Ui/qsui/translations/qsui_plugin_zh_TW.ts @@ -581,22 +581,22 @@ FileSystemBrowser - + Add to Playlist - + Change Directory - + Quick Search - + Select Directory @@ -663,7 +663,7 @@ MainWindow - + Qmmp @@ -809,189 +809,189 @@ - + Rename Playlist - + Volume 音量 - + <b>%1</b>|%2 bit|%3 ch|%4 Hz|tracks: %5|total time: %6|%7 kbps| - + Paused - + <b>%1</b>|tracks: %2|total time: %3| - + Stopped - + Playlist name: - + Appearance 外觀 - + Shortcuts - + Playing - + Ctrl+0 - + P P - + Position 位置 - + Quick Search - + Edit Toolbars - + Sort List 清單排序 - - + + By Title 按標題 - - + + By Album - - + + By Artist - - + + By Album Artist - - + + By Filename 按檔名 - - + + By Path + Filename 按路徑+檔名 - - + + By Date 按日期 - - + + By Track Number 按音軌 - - + + By Disc Number - - + + By File Creation Date - - + + By File Modification Date - + By Group - + Sort Selection 選取排序 - + Randomize List 隨機產生清單 - + Reverse List 逆串列表 - - + + Actions 動作 - + Add new playlist - + Show all tabs - + Buffering: %1% diff --git a/src/plugins/Ui/skinned/CMakeLists.txt b/src/plugins/Ui/skinned/CMakeLists.txt index 23ff393a3..68a15b9ce 100644 --- a/src/plugins/Ui/skinned/CMakeLists.txt +++ b/src/plugins/Ui/skinned/CMakeLists.txt @@ -1,21 +1,5 @@ project(skinned) -# 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}/../../../ -) - - # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -93,7 +77,7 @@ SET(skinned_HDRS SET(skinned_RCCS glare/glare.qrc resources/resources.qrc translations/translations.qrc) -QT4_ADD_RESOURCES(skinned_RCC_SRCS ${skinned_RCCS}) +QT5_ADD_RESOURCES(skinned_RCC_SRCS ${skinned_RCCS}) # user interface @@ -106,14 +90,14 @@ SET(skinned_UIS forms/hotkeyeditor.ui ) -QT4_WRAP_UI(skinned_UIS_H ${skinned_UIS}) +QT5_WRAP_UI(skinned_UIS_H ${skinned_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(X11_FOUND) ADD_LIBRARY(skinned MODULE ${skinned_SRCS} ${skinned_UIS_H} ${skinned_RCC_SRCS} ${skinned_HDRS}) -target_link_libraries(skinned ${QT_LIBRARIES} libqmmp qmmpui ${X11_LDFLAGS}) add_dependencies(skinned qmmpui libqmmp) +target_link_libraries(skinned Qt5::Widgets Qt5::X11Extras -lqmmpui -lqmmp ${X11_LDFLAGS}) install(TARGETS skinned DESTINATION ${LIB_DIR}/qmmp/Ui) ENDIF(X11_FOUND) diff --git a/src/plugins/Ui/skinned/eqwidget.cpp b/src/plugins/Ui/skinned/eqwidget.cpp index a1ed49c82..76bbcf2bf 100644 --- a/src/plugins/Ui/skinned/eqwidget.cpp +++ b/src/plugins/Ui/skinned/eqwidget.cpp @@ -75,7 +75,7 @@ EqWidget::EqWidget (QWidget *parent) createActions(); updatePositions(); updateMask(); -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 QString wm_name = WindowSystem::netWindowManagerName(); if(wm_name.contains("metacity", Qt::CaseInsensitive) || wm_name.contains("openbox", Qt::CaseInsensitive)) @@ -403,12 +403,12 @@ void EqWidget::importWinampEQF() QFile file(path); file.open(QIODevice::ReadOnly); file.read (header, 31); - if (QString::fromAscii(header).contains("Winamp EQ library file v1.1")) + if (QString::fromLatin1(header).contains("Winamp EQ library file v1.1")) { while (file.read (name, 257)) { EQPreset* preset = new EQPreset; - preset->setText(QString::fromAscii(name)); + preset->setText(QString::fromLatin1(name)); file.read(bands,11); @@ -431,10 +431,13 @@ void EqWidget::keyPressEvent (QKeyEvent *ke) QApplication::sendEvent(qobject_cast(parent())->playlist(), &event); } -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 bool EqWidget::event (QEvent *event) { - if(event->type() == QEvent::WinIdChange || event->type() == QEvent::Show) + if(event->type() == QEvent::WinIdChange || + event->type() == QEvent::WindowActivate || + event->type() == QEvent::Show || + event->type() == QEvent::ShowToParent) { WindowSystem::ghostWindow(winId()); WindowSystem::setWinHint(winId(), "equalizer", "Qmmp"); diff --git a/src/plugins/Ui/skinned/eqwidget.h b/src/plugins/Ui/skinned/eqwidget.h index e6d888732..43783df6a 100644 --- a/src/plugins/Ui/skinned/eqwidget.h +++ b/src/plugins/Ui/skinned/eqwidget.h @@ -80,7 +80,7 @@ private: void keyPressEvent (QKeyEvent *); void changeEvent(QEvent*); void closeEvent(QCloseEvent*); -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 bool event (QEvent *event); #endif diff --git a/src/plugins/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp index 616067be0..e415aae71 100644 --- a/src/plugins/Ui/skinned/listwidget.cpp +++ b/src/plugins/Ui/skinned/listwidget.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -149,9 +150,7 @@ void ListWidget::paintEvent(QPaintEvent *) { QPainter painter(this); m_drawer.fillBackground(&painter, width(), height()); -#if QT_VERSION >= 0x040700 painter.setLayoutDirection(Qt::LayoutDirectionAuto); -#endif bool rtl = (layoutDirection() == Qt::RightToLeft); painter.setClipRect(5,0,width() - 9, height()); diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp index 2cdb4cb94..5108d71e9 100644 --- a/src/plugins/Ui/skinned/mainwindow.cpp +++ b/src/plugins/Ui/skinned/mainwindow.cpp @@ -17,11 +17,13 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ + #include #include #include #include #include +#include #include #include #include @@ -54,13 +56,26 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) { -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 qDebug("MainWindow: detected wm: %s", qPrintable(WindowSystem::netWindowManagerName())); #endif m_vis = 0; m_update = false; - setWindowFlags(Qt::Window | Qt::FramelessWindowHint | - Qt::WindowCloseButtonHint | Qt::WindowMinMaxButtonsHint | Qt::WindowSystemMenuHint); + +#ifdef QMMP_WS_X11 + QString wm_name = WindowSystem::netWindowManagerName(); + if(wm_name.contains("Marco", Qt::CaseInsensitive) || + wm_name.contains("Metacity", Qt::CaseInsensitive) || + wm_name.contains("Mutter", Qt::CaseInsensitive) || + wm_name.contains("GNOME", Qt::CaseInsensitive)) + { + setWindowFlags(Qt::Window | Qt::FramelessWindowHint | + Qt::WindowCloseButtonHint | Qt::WindowSystemMenuHint); + } + else +#endif + setWindowFlags(Qt::Window | Qt::FramelessWindowHint | + Qt::WindowCloseButtonHint | Qt::WindowMinMaxButtonsHint | Qt::WindowSystemMenuHint); restoreWindowTitle(); @@ -76,17 +91,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) //user interface m_skin = new Skin(this); -#ifdef Q_WS_X11 - QString wm_name = WindowSystem::netWindowManagerName(); - if(wm_name.contains("metacity", Qt::CaseInsensitive) || - wm_name.contains("marko", Qt::CaseInsensitive) || - wm_name.contains("mutter", Qt::CaseInsensitive) || - wm_name.contains("gnome", Qt::CaseInsensitive) || - wm_name.contains("fvwm", Qt::CaseInsensitive)) - resize(275 * m_skin->ratio(),116 * m_skin->ratio()); - else -#endif - setFixedSize(275 * m_skin->ratio(),116 * m_skin->ratio()); + setFixedSize(275 * m_skin->ratio(),116 * m_skin->ratio()); Dock *dock = new Dock(this); dock->setMainWidget(this); @@ -309,7 +314,7 @@ void MainWindow::readSettings() ACTION(ActionManager::NO_PL_ADVANCE)->setChecked(m_ui_settings->isNoPlayListAdvance()); m_update = true; } -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 WindowSystem::changeWinSticky(winId(), ACTION(ActionManager::WM_STICKY)->isChecked()); WindowSystem::setWinHint(winId(), "player", "Qmmp"); #endif @@ -369,7 +374,7 @@ void MainWindow::toggleVisibility() activateWindow(); m_playlist->setVisible(m_display->isPlaylistVisible()); m_equalizer->setVisible(m_display->isEqualizerVisible()); -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 if(WindowSystem::netWindowManagerName() == "Metacity") { m_playlist->activateWindow(); @@ -382,7 +387,7 @@ void MainWindow::toggleVisibility() { showNormal(); } -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 WindowSystem::changeWinSticky(winId(), ACTION(ActionManager::WM_STICKY)->isChecked()); WindowSystem::setWinHint(winId(), "player", "Qmmp"); raise(); diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp index f27c95312..6830207cb 100644 --- a/src/plugins/Ui/skinned/playlist.cpp +++ b/src/plugins/Ui/skinned/playlist.cpp @@ -64,7 +64,7 @@ PlayList::PlayList (PlayListManager *manager, QWidget *parent) m_pl_browser = 0; m_pl_selector = 0; -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 QString wm_name = WindowSystem::netWindowManagerName(); m_compiz = wm_name.contains("compiz", Qt::CaseInsensitive); if(wm_name.contains("metacity", Qt::CaseInsensitive) || @@ -74,7 +74,7 @@ PlayList::PlayList (PlayListManager *manager, QWidget *parent) #endif setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint); -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 if(m_compiz) { setFixedSize(275*m_ratio, 116*m_ratio); @@ -422,37 +422,28 @@ void PlayList::mouseMoveEvent (QMouseEvent *e) { if (m_resize) { -#ifdef Q_WS_X11 - if(m_compiz) -#endif - { - int dx = m_ratio * 25; - int dy = m_ratio * 29; + int dx = m_ratio * 25; + int dy = m_ratio * 29; - int sx = ((e->x() - 275 * m_ratio) + 14) / dx; - int sy = ((e->y() - 116 * m_ratio) + 14) / dy; + int sx = ((e->x() - 275 * m_ratio) + 14) / dx; + int sy = ((e->y() - 116 * m_ratio) + 14) / dy; - sx = qMax(sx, 0); - sy = qMax(sy, 0); + sx = qMax(sx, 0); + sy = qMax(sy, 0); -#ifdef Q_OS_WIN - resize(275 * m_ratio + dx * sx, 116 * m_ratio + dy * sy); -#else +#ifdef QMMP_WS_X11 + if(m_compiz) setFixedSize(275 * m_ratio + dx * sx, 116 * m_ratio + dy * sy); -#endif - } -#ifdef Q_WS_X11 else - resize (e->x() +25, e->y() +25); #endif + resize(275 * m_ratio + dx * sx, 116 * m_ratio + dy * sy); -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 //avoid right corner moving during resize if(layoutDirection() == Qt::RightToLeft) WindowSystem::revertGravity(winId()); #endif - } } @@ -517,10 +508,13 @@ void PlayList::readSettings() } } -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 bool PlayList::event (QEvent *event) { - if(event->type() == QEvent::WinIdChange || event->type() == QEvent::Show) + if(event->type() == QEvent::WinIdChange || + event->type() == QEvent::WindowActivate || + event->type() == QEvent::Show || + event->type() == QEvent::ShowToParent) { WindowSystem::ghostWindow(winId()); WindowSystem::setWinHint(winId(), "playlist", "Qmmp"); @@ -536,7 +530,7 @@ void PlayList::writeSettings() settings.setValue ("Skinned/pl_pos", this->pos()); } -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 bool PlayList::useCompiz() const { return m_compiz; @@ -686,7 +680,7 @@ void PlayList::setMinimalMode(bool b) m_height = height(); m_shaded = b; -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 if(m_compiz) { if(m_shaded) diff --git a/src/plugins/Ui/skinned/playlist.h b/src/plugins/Ui/skinned/playlist.h index 3bd2e0787..d960255c7 100644 --- a/src/plugins/Ui/skinned/playlist.h +++ b/src/plugins/Ui/skinned/playlist.h @@ -56,7 +56,7 @@ class PlayList : public QWidget void setMinimalMode(bool b = true); void writeSettings(); -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 bool useCompiz() const; #endif @@ -102,7 +102,7 @@ class PlayList : public QWidget void changeEvent (QEvent*); void closeEvent (QCloseEvent*); void keyPressEvent (QKeyEvent*); -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 bool event (QEvent *event); #endif QMenu *m_addMenu; @@ -134,7 +134,7 @@ class PlayList : public QWidget KeyboardManager* m_keyboardManager; QPointer m_pl_browser; PlayListSelector *m_pl_selector; -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 bool m_compiz; #endif }; diff --git a/src/plugins/Ui/skinned/playlisttitlebar.cpp b/src/plugins/Ui/skinned/playlisttitlebar.cpp index a31966b34..1c4b3d98f 100644 --- a/src/plugins/Ui/skinned/playlisttitlebar.cpp +++ b/src/plugins/Ui/skinned/playlisttitlebar.cpp @@ -59,7 +59,7 @@ PlayListTitleBar::PlayListTitleBar(QWidget *parent) readSettings(); QSettings settings (Qmmp::configFile(), QSettings::IniFormat); -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 if(m_pl->useCompiz()) m_pl->setFixedSize(settings.value ("Skinned/pl_size", QSize (m_ratio*275, m_ratio*116)).toSize()); else @@ -189,7 +189,7 @@ void PlayListTitleBar::mouseMoveEvent(QMouseEvent* event) QPoint npos = event->globalPos()-pos; if (m_shaded && m_resize) { -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 //avoid right corner moving during resize if(layoutDirection() == Qt::RightToLeft) WindowSystem::revertGravity(m_pl->winId()); @@ -200,7 +200,7 @@ void PlayListTitleBar::mouseMoveEvent(QMouseEvent* event) sx = qMax(sx, 0); resize(275 * m_ratio + dx * sx, height()); -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 if(m_pl->useCompiz()) m_pl->setFixedSize(275 * m_ratio + dx * sx, m_pl->height()); diff --git a/src/plugins/Ui/skinned/popupsettings.cpp b/src/plugins/Ui/skinned/popupsettings.cpp index 95c6c4c1b..e57e3624a 100644 --- a/src/plugins/Ui/skinned/popupsettings.cpp +++ b/src/plugins/Ui/skinned/popupsettings.cpp @@ -39,6 +39,7 @@ PopupSettings::PopupSettings(QWidget *parent) createMenu(); } + PopupSettings::~PopupSettings() {} diff --git a/src/plugins/Ui/skinned/shortcutitem.cpp b/src/plugins/Ui/skinned/shortcutitem.cpp index 8e3412e10..0af929a85 100644 --- a/src/plugins/Ui/skinned/shortcutitem.cpp +++ b/src/plugins/Ui/skinned/shortcutitem.cpp @@ -24,7 +24,7 @@ ShortcutItem::ShortcutItem(QTreeWidgetItem *parent, int type) : QTreeWidgetItem(parent, QStringList() << ActionManager::instance()->action(type)->text().remove("&") - << ActionManager::instance()->action(type)->shortcut()) + << ActionManager::instance()->action(type)->shortcut().toString()) { m_action = ActionManager::instance()->action(type); setIcon(0, m_action->icon()); diff --git a/src/plugins/Ui/skinned/skin.cpp b/src/plugins/Ui/skinned/skin.cpp index ed7edf89e..2dd078037 100644 --- a/src/plugins/Ui/skinned/skin.cpp +++ b/src/plugins/Ui/skinned/skin.cpp @@ -566,7 +566,7 @@ void Skin::loadVisColor() { j++; QByteArray line = file.readLine (); - QString tmp = QString::fromLatin1(line.constData()); + QString tmp = QString::fromLatin1(line); tmp = tmp.trimmed (); tmp.remove("\""); int i = tmp.indexOf ("//"); diff --git a/src/plugins/Ui/skinned/skinned.pro b/src/plugins/Ui/skinned/skinned.pro index 77fa36dd0..9e55ab2d0 100644 --- a/src/plugins/Ui/skinned/skinned.pro +++ b/src/plugins/Ui/skinned/skinned.pro @@ -122,7 +122,9 @@ RESOURCES = resources/resources.qrc \ LIBS += $$QMMPUI_LIB unix { - target.path = $$LIB_DIR/qmmp/Ui - INSTALLS += target - PKGCONFIG += x11 + target.path = $$LIB_DIR/qmmp/Ui + INSTALLS += target + PKGCONFIG += x11 + DEFINES += QMMP_WS_X11 + QT += x11extras } diff --git a/src/plugins/Ui/skinned/skinnedfactory.cpp b/src/plugins/Ui/skinned/skinnedfactory.cpp index 35115986b..064a0ffc5 100644 --- a/src/plugins/Ui/skinned/skinnedfactory.cpp +++ b/src/plugins/Ui/skinned/skinnedfactory.cpp @@ -60,5 +60,3 @@ QTranslator *SkinnedFactory::createTranslator(QObject *parent) translator->load(QString(":/skinned_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(skinned, SkinnedFactory) diff --git a/src/plugins/Ui/skinned/skinnedfactory.h b/src/plugins/Ui/skinned/skinnedfactory.h index 8f9b7c28f..2c8859e6d 100644 --- a/src/plugins/Ui/skinned/skinnedfactory.h +++ b/src/plugins/Ui/skinned/skinnedfactory.h @@ -31,6 +31,7 @@ class SkinnedFactory : public QObject, public UiFactory { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.UiFactoryInterface.1.0") Q_INTERFACES(UiFactory) public: const UiProperties properties() const; diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_bg.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_bg.ts index 5f42638c7..db614e81d 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_bg.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_bg.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance - + Shortcuts - + View - + Playlist - + Audio - + Tools - + Qmmp @@ -929,17 +929,17 @@ - + Rename Playlist - + Playlist name: - + &New PlayList diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts index e43399697..b3c8e7161 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance Vzhled - + Shortcuts Zkratky - + View Zobrazení - + Playlist Seznam skladeb - + Audio Zvuk - + Tools Nástroje - + Qmmp Qmmp @@ -929,17 +929,17 @@ Činnosti - + Rename Playlist Přejmenovat seznam skladeb - + Playlist name: Název seznamu skladeb: - + &New PlayList &Nový seznam skladeb diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts index 3d9961910..16569dff2 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance Erscheinungsbild - + Shortcuts Kurzbefehle - + View Ansicht - + Playlist Wiedergabeliste - + Audio Audio - + Tools Werkzeuge - + Qmmp Qmmp @@ -929,17 +929,17 @@ Aktionen - + Rename Playlist Wiedergabeliste umbenennen - + Playlist name: Wiedergabelistenname: - + &New PlayList &Neue Wiedergabeliste diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_el.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_el.ts index 10d6bff44..c52fedb4b 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_el.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_el.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance Εμφάνιση - + Shortcuts Συντομεύσεις - + View Προβολή - + Playlist Λίστα αναπαραγωγής - + Audio Ήχος - + Tools Εργαλεία - + Qmmp Qmmp @@ -929,17 +929,17 @@ Ενέργειες - + Rename Playlist Μετονομασία της λίστας αναπαραγωγής - + Playlist name: Όνομα λίστας αναπαραγωγής: - + &New PlayList &Νέα λίστα αναπαραγωγής diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_en.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_en.ts index 7892b2358..56f82222d 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_en.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_en.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance - + Shortcuts - + View - + Playlist - + Audio - + Tools - + Qmmp @@ -929,17 +929,17 @@ - + Rename Playlist - + Playlist name: - + &New PlayList diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts index ac7dedd24..a396c8ed9 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance Apariencia - + Shortcuts Atajos - + View Ver - + Playlist Lista de reproducción - + Audio Sonido - + Tools Herramientas - + Qmmp Qmmp @@ -929,17 +929,17 @@ Acciones - + Rename Playlist Renombrar lista - + Playlist name: Nombre de la lista: - + &New PlayList &Lista nueva diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_fi.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_fi.ts index 0ba34efd6..93585c49e 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_fi.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_fi.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance Ulkoasu - + Shortcuts Pikanäppäimet - + View - + Playlist Soittolista - + Audio Ääni - + Tools Työkalut - + Qmmp Qmmp @@ -929,17 +929,17 @@ Toiminnot - + Rename Playlist Nimeä soittolista uudelleen - + Playlist name: Soittolistan nimi: - + &New PlayList &Uusi soittolista diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_fr.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_fr.ts index 062f9d9e2..37cd662a3 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_fr.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_fr.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance Apparence - + Shortcuts Raccourcis - + View Vue - + Playlist Liste - + Audio Audio - + Tools Outils - + Qmmp Qmmp @@ -929,17 +929,17 @@ Actions - + Rename Playlist Renommer la liste - + Playlist name: Nom de la liste : - + &New PlayList &Nouvelle liste diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_gl_ES.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_gl_ES.ts index 6107c3f53..b8af41fd6 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_gl_ES.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_gl_ES.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance Apariencia - + Shortcuts Accesos rápidos - + View Vista - + Playlist Lista de reprodución - + Audio Audio - + Tools Ferramentas - + Qmmp Qmmp @@ -929,17 +929,17 @@ Accións - + Rename Playlist Renomear lista de reprodución - + Playlist name: Nome da lista de reprodución: - + &New PlayList &Nova lista de reprodución diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_he.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_he.ts index 16b8158bb..cc2fb0fc4 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_he.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_he.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance הופעה - + Shortcuts קיצורי דרך - + View תצוגה - + Playlist רשימת נגינה - + Audio שמע - + Tools כלים - + Qmmp Qmmp @@ -929,17 +929,17 @@ פעולות - + Rename Playlist שנה שם רשימת נגינה - + Playlist name: שם רשימת נגינה: - + &New PlayList רשימת נגינה &חדשה diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts index 8b8fd1445..d8401f893 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts @@ -785,37 +785,37 @@ MainWindow - + Playlist Lejátszási lista - + Appearance Megjelenés - + Shortcuts - + View Megnéz - + Audio - + Tools Eszközök - + Qmmp @@ -924,17 +924,17 @@ Tevékenységek - + Rename Playlist Lista átnevezése - + Playlist name: Lista neve: - + &New PlayList diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_id.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_id.ts index a4db5f6ee..fdfcbba06 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_id.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_id.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance Tampilan - + Shortcuts Pintasan - + View Tinjau - + Playlist Daftarmain - + Audio Audio - + Tools Alat - + Qmmp Qmmp @@ -929,17 +929,17 @@ Tindakan - + Rename Playlist Ubah-nama Daftarmain - + Playlist name: Nama daftarmain: - + &New PlayList &Daftarmain Baru diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts index db0922951..d909f772e 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance Aspetto - + Shortcuts - + View - + Playlist Lista brani - + Audio - + Tools Strumenti - + Qmmp @@ -913,17 +913,17 @@ Inverti la lista - + Rename Playlist Rinomina lista brani - + Playlist name: Nome della lista brani: - + &New PlayList diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts index bf08420a3..966731509 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts @@ -786,37 +786,37 @@ MainWindow - + Playlist プレイリスト - + Appearance 外観 - + Shortcuts ショートカット - + View 観容 - + Audio 音響 - + Tools ツール - + Qmmp @@ -930,17 +930,17 @@ 動作 - + Rename Playlist プレイリスト名を変更 - + Playlist name: プレイリスト名: - + &New PlayList 新しいプレイリスト(&N) diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_kk.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_kk.ts index 4868e72ac..68cd60083 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_kk.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_kk.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance Сыртқы түрі - + Shortcuts - + View - + Playlist Тізім - + Audio - + Tools Қызмет - + Qmmp @@ -918,17 +918,17 @@ Тізімді кері айналдыру - + Rename Playlist - + Playlist name: - + &New PlayList diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts index fe9b04633..49068ba21 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts @@ -786,37 +786,37 @@ MainWindow - + Appearance Išvaizda - + Shortcuts Trumpiniai - + View Rodyti - + Playlist Grojaraštis - + Audio Audio - + Tools Įrankiai - + Qmmp @@ -914,17 +914,17 @@ Apversti - + Rename Playlist Pervadinti grojaraštį - + Playlist name: Grojaraščio pavadinimas: - + &New PlayList &Naujas grojaraštis diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts index 2c3eed93c..102776c3f 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance Vertoning - + Shortcuts Sneltoetsen - + View Weergave - + Playlist Afspeellijst - + Audio - + Tools Gereedschappen - + Qmmp @@ -908,17 +908,17 @@ Draai Lijst Om - + Rename Playlist Hernoem Afspeellijst - + Playlist name: Naam van de Afspeellijst: - + &New PlayList &Nieuwe Afspeellijst diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts index 59eac4862..5061eec8f 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance Wygląd - + Shortcuts Skróty klawiszowe - + View Wygląd - + Playlist Lista odtwarzania - + Audio Dźwięk - + Tools Narzędzia - + Qmmp @@ -929,17 +929,17 @@ Akcje - + Rename Playlist Zmień nazwę listy - + Playlist name: Nazwa listy odtwarzania: - + &New PlayList &Nowa lista odtwarzania diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_pt.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_pt.ts index b1a574237..15b1070fe 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_pt.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_pt.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance Aparência - + Shortcuts Atalhos - + View Ver - + Playlist Lista de reprodução - + Audio Áudio - + Tools Ferramentas - + Qmmp Qmmp @@ -929,17 +929,17 @@ Ações - + Rename Playlist Renomear lista de reprodução - + Playlist name: Nome da lista de reprodução: - + &New PlayList &Nova lista de reprodução diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts index 480dadc11..238598b77 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance Aparência - + Shortcuts Atalhos - + View Ver - + Playlist Lista de reprodução - + Audio Áudio - + Tools Ferramentas - + Qmmp Qmmp @@ -929,17 +929,17 @@ Ações - + Rename Playlist Renomear lista de reprodução - + Playlist name: Nome da lista de reprodução: - + &New PlayList &Nova lista de reprodução diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts index 6c20a57b3..f66bcef4d 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance Внешний вид - + Shortcuts Сочетания клавиш - + View Вид - + Playlist Список - + Audio Звук - + Tools Сервис - + Qmmp Qmmp @@ -929,17 +929,17 @@ Действия - + Rename Playlist Переименовать список - + Playlist name: Имя списка: - + &New PlayList &Новый список diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts index bf78a9a88..3e1bcdcda 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance Vzhľad - + Shortcuts Skratky - + View Zobraziť - + Playlist Playlist - + Audio - + Tools Nástroje - + Qmmp @@ -908,17 +908,17 @@ Otočiť zoznam - + Rename Playlist Premenovať playlist - + Playlist name: Název playlistu: - + &New PlayList &Nový playlist diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_sr_BA.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_sr_BA.ts index ca522ba09..994e740b8 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_sr_BA.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_sr_BA.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance Изглед - + Shortcuts Пречице - + View Приказ - + Playlist Листа нумера - + Audio Звук - + Tools Алатке - + Qmmp @@ -929,17 +929,17 @@ Радње - + Rename Playlist Преименовање листе - + Playlist name: Име листе: - + &New PlayList &нову листу diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_sr_RS.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_sr_RS.ts index d74235964..61a5cae6c 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_sr_RS.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_sr_RS.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance Изглед - + Shortcuts Пречице - + View Приказ - + Playlist Листа нумера - + Audio Звук - + Tools Алатке - + Qmmp @@ -929,17 +929,17 @@ Радње - + Rename Playlist Преименовање листе - + Playlist name: Име листе: - + &New PlayList &нову листу diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts index bd141fc02..7300fc961 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance Görünüm - + Shortcuts - + View - + Playlist Çalma Listesi - + Audio - + Tools Araçlar - + Qmmp @@ -913,17 +913,17 @@ Listeyi Ters Çevir - + Rename Playlist - + Playlist name: - + &New PlayList diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts index 4cb9ab7d3..e65d6be55 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance Зовнішній вигляд - + Shortcuts Комбінації клавіш - + View Вигляд - + Playlist Список - + Audio Звук - + Tools Утиліти - + Qmmp @@ -913,17 +913,17 @@ Перевернути - + Rename Playlist Переіменувати список - + Playlist name: Ім'я списка: - + &New PlayList &Новий список diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts index 94d93daf0..6022b55d7 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance 外观 - + Shortcuts 热键 - + View 视图 - + Playlist 播放列表 - + Audio 音频 - + Tools 工具 - + Qmmp Qmmp @@ -929,17 +929,17 @@ 动作 - + Rename Playlist 重命名播放列表 - + Playlist name: 播放列表名称： - + &New PlayList &新播放列表 diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts index 3020c9afe..b5f9aa158 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts @@ -785,37 +785,37 @@ MainWindow - + Appearance 外觀 - + Shortcuts - + View - + Playlist 播放清單 - + Audio 聲訊 - + Tools 工具 - + Qmmp @@ -929,17 +929,17 @@ 動作 - + Rename Playlist - + Playlist name: - + &New PlayList diff --git a/src/plugins/Ui/skinned/windowsystem.cpp b/src/plugins/Ui/skinned/windowsystem.cpp index e4489a250..acad483f2 100644 --- a/src/plugins/Ui/skinned/windowsystem.cpp +++ b/src/plugins/Ui/skinned/windowsystem.cpp @@ -21,7 +21,7 @@ #include "windowsystem.h" #include -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 #include #include #include @@ -29,7 +29,7 @@ #include #endif -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 void WindowSystem::ghostWindow(WId win) { Display* dsp = QX11Info::display(); diff --git a/src/plugins/Ui/skinned/windowsystem.h b/src/plugins/Ui/skinned/windowsystem.h index b5cc76626..6c3cd8b45 100644 --- a/src/plugins/Ui/skinned/windowsystem.h +++ b/src/plugins/Ui/skinned/windowsystem.h @@ -27,7 +27,7 @@ class WindowSystem { public: -#ifdef Q_WS_X11 +#ifdef QMMP_WS_X11 static void ghostWindow(WId id); static QString netWindowManagerName(); static void changeWinSticky(WId win, bool stick); diff --git a/src/plugins/Visual/analyzer/CMakeLists.txt b/src/plugins/Visual/analyzer/CMakeLists.txt index dcf21a5ed..cb08ec0a3 100644 --- a/src/plugins/Visual/analyzer/CMakeLists.txt +++ b/src/plugins/Visual/analyzer/CMakeLists.txt @@ -1,20 +1,7 @@ project(libanalyzer) -# 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_SOURCE_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,7 +21,7 @@ SET(libanalyzer_HDRS SET(libanalyzer_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libanalyzer_RCC_SRCS ${libanalyzer_RCCS}) +QT5_ADD_RESOURCES(libanalyzer_RCC_SRCS ${libanalyzer_RCCS}) # user interface @@ -43,7 +30,7 @@ SET(libanalyzer_UIS settingsdialog.ui ) -QT4_WRAP_UI(libanalyzer_UIS_H ${libanalyzer_UIS}) +QT5_WRAP_UI(libanalyzer_UIS_H ${libanalyzer_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -51,5 +38,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(analyzer MODULE ${libanalyzer_SRCS} ${libanalyzer_UIS_H} ${libanalyzer_RCC_SRCS} ${libanalyzer_HDRS}) add_dependencies(analyzer qmmp) -target_link_libraries(analyzer ${QT_LIBRARIES} libqmmp) +target_link_libraries(analyzer Qt5::Widgets -lqmmp) install(TARGETS analyzer DESTINATION ${LIB_DIR}/qmmp/Visual) diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_bg.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_bg.ts index 6399d6a22..d6634a08e 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_bg.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_bg.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin - + About Analyzer Visual Plugin - + Qmmp Analyzer Visual Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_cs.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_cs.ts index 80830bd45..dd175c398 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_cs.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_cs.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin Modul frekvenčního analyzátoru - + About Analyzer Visual Plugin O modulu frekvenčního analyzátoru - + Qmmp Analyzer Visual Plugin Modul frekvenčního analyzátoru pro Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_de.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_de.ts index be8f12898..f67ef76b8 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_de.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_de.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin Analysatormodul - + About Analyzer Visual Plugin Über Analysator-Visualisierungsmodul - + Qmmp Analyzer Visual Plugin Qmmp Analysator-Visualisierungsmodul - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_el.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_el.ts index f76f0d07f..689010390 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_el.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_el.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin Πρόσθετο αναλυτή - + About Analyzer Visual Plugin Σχετικά με το πρόσθετο οπτικού αναλυτή - + Qmmp Analyzer Visual Plugin Πρόσθετο Qmmp οπτικού αναλυτή - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_en.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_en.ts index 415d6a3e0..e1d4b769d 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_en.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_en.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin - + About Analyzer Visual Plugin - + Qmmp Analyzer Visual Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_es.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_es.ts index 22138affd..86af36bf9 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_es.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_es.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin Módulo Analizador - + About Analyzer Visual Plugin Acerca del Módulo Analizador Visual - + Qmmp Analyzer Visual Plugin Módulo Analizador Visual de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_fi.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_fi.ts index 0ab41f3d4..1100bc446 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_fi.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_fi.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin - + About Analyzer Visual Plugin - + Qmmp Analyzer Visual Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_fr.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_fr.ts index 750a8e011..442e9d9af 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_fr.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_fr.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin Greffon d'analyse - + About Analyzer Visual Plugin À propos du greffon visuel d'analyse - + Qmmp Analyzer Visual Plugin Greffon visuel d'analyse pour Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_gl_ES.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_gl_ES.ts index ad714a4f0..063437506 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_gl_ES.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_gl_ES.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin Engadido Analizador - + About Analyzer Visual Plugin Sobre o engadido Analizador - + Qmmp Analyzer Visual Plugin Engadido de Analizador de Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_he.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_he.ts index edb6e19fb..e6d51af97 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_he.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_he.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin תוסף מאבחן - + About Analyzer Visual Plugin אודות תוסף מאבחן חזותי - + Qmmp Analyzer Visual Plugin תוסף מאבחן חזותי של Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_hu.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_hu.ts index b526af1a5..e1940447b 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_hu.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_hu.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin - + About Analyzer Visual Plugin - + Qmmp Analyzer Visual Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_id.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_id.ts index c09bbf173..8a01d5a34 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_id.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_id.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin Plugin Analyzer - + About Analyzer Visual Plugin Tentang Plugin Visual Analyzer - + Qmmp Analyzer Visual Plugin Plugin Visual Analyzer Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_it.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_it.ts index dcf56620a..106c0a22d 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_it.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_it.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin Modulo analizzatore - + About Analyzer Visual Plugin Info sul modulo Analizzatore visivo - + Qmmp Analyzer Visual Plugin Modulo Analizzatore visivo Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_ja.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_ja.ts index 0e52f43bf..1cdc38788 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_ja.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_ja.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin アナライザープラグイン - + About Analyzer Visual Plugin アナライザー視覚効果プラグインについて - + Qmmp Analyzer Visual Plugin QMMP アナライザー視覚効果プラグイン - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_kk.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_kk.ts index 90cae5feb..1272c3aa0 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_kk.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_kk.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin - + About Analyzer Visual Plugin - + Qmmp Analyzer Visual Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_lt.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_lt.ts index 5011817f6..bc0b407a4 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_lt.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_lt.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin Analizatoriaus įskiepis - + About Analyzer Visual Plugin Apie analizatoriaus įskiepį - + Qmmp Analyzer Visual Plugin Qmmp analizatoriaus įskiepis - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_nl.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_nl.ts index f425576e8..c46e7280a 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_nl.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_nl.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin Analysator Module - + About Analyzer Visual Plugin Over de Visuele Analysator Module - + Qmmp Analyzer Visual Plugin Visuele Analysator Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_pl_PL.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_pl_PL.ts index 79d942f32..14f37002f 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_pl_PL.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_pl_PL.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin Wtyczka Analizator - + About Analyzer Visual Plugin O wtyczce Analizator - + Qmmp Analyzer Visual Plugin Wtyczka wizualna Analizator dla Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_pt.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_pt.ts index da54b4685..b834cdac3 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_pt.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_pt.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin Suplemento Analyzer - + About Analyzer Visual Plugin Sobre o suplemento Analyzer - + Qmmp Analyzer Visual Plugin Suplemento Qmmp Analyzer - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_pt_BR.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_pt_BR.ts index ba647a3cd..e226eb4be 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_pt_BR.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_pt_BR.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin Plugin de visualizações - + About Analyzer Visual Plugin Sobre o plugin Analyzer Visual - + Qmmp Analyzer Visual Plugin Plugin Qmmp Analyzer Visual - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_ru.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_ru.ts index 83d0fe40f..48bf06385 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_ru.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_ru.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin Анализатор - + About Analyzer Visual Plugin Об анализаторе (модуле визуализации) - + Qmmp Analyzer Visual Plugin Модуль анализатора для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_sk.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_sk.ts index f9cc32835..b5ce79400 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_sk.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_sk.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin - + About Analyzer Visual Plugin - + Qmmp Analyzer Visual Plugin - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_sr_BA.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_sr_BA.ts index 8f7e25f58..768449717 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_sr_BA.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_sr_BA.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin Анализатор - + About Analyzer Visual Plugin О визуелном анализатору - + Qmmp Analyzer Visual Plugin Кумп визелни анализатор - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_sr_RS.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_sr_RS.ts index 8f80fd80a..875433aa4 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_sr_RS.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_sr_RS.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin Анализатор - + About Analyzer Visual Plugin О визуелном анализатору - + Qmmp Analyzer Visual Plugin Кумп визелни анализатор - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_tr.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_tr.ts index 109ebf5e2..aefb3d220 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_tr.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_tr.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin Çözümleyici Eklentisi - + About Analyzer Visual Plugin Çözümleyici Görsel Eklentisi Hakkında - + Qmmp Analyzer Visual Plugin Qmmp Çözümleyici Görsel Eklentisi - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_uk_UA.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_uk_UA.ts index b1234aad3..69cc5ec1e 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_uk_UA.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_uk_UA.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin Модуль аналізатора - + About Analyzer Visual Plugin Про модуль аналізатора - + Qmmp Analyzer Visual Plugin Модуль аналізатора для Qmmp - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_zh_CN.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_zh_CN.ts index f31dc170f..8f0f3573d 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_zh_CN.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_zh_CN.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin 可视化分析器插件 - + About Analyzer Visual Plugin 关于可视化分析器插件 - + Qmmp Analyzer Visual Plugin Qmmp 可视化分析器插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/translations/analyzer_plugin_zh_TW.ts b/src/plugins/Visual/analyzer/translations/analyzer_plugin_zh_TW.ts index 47d70a60b..704619174 100644 --- a/src/plugins/Visual/analyzer/translations/analyzer_plugin_zh_TW.ts +++ b/src/plugins/Visual/analyzer/translations/analyzer_plugin_zh_TW.ts @@ -148,22 +148,22 @@ VisualAnalyzerFactory - + Analyzer Plugin 可視化解析器插件 - + About Analyzer Visual Plugin 關於可視化解析器外掛 - + Qmmp Analyzer Visual Plugin Qmmp 可視化解析器插件 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> diff --git a/src/plugins/Visual/analyzer/visualanalyzerfactory.cpp b/src/plugins/Visual/analyzer/visualanalyzerfactory.cpp index b9867ecca..a41eb89f1 100644 --- a/src/plugins/Visual/analyzer/visualanalyzerfactory.cpp +++ b/src/plugins/Visual/analyzer/visualanalyzerfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * + * Copyright (C) 2008-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 "visualanalyzerfactory.h" @@ -60,5 +59,3 @@ QTranslator *VisualAnalyzerFactory::createTranslator(QObject *parent) translator->load(QString(":/analyzer_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(analyzer,VisualAnalyzerFactory) diff --git a/src/plugins/Visual/analyzer/visualanalyzerfactory.h b/src/plugins/Visual/analyzer/visualanalyzerfactory.h index f5f14d96a..4e49c7836 100644 --- a/src/plugins/Visual/analyzer/visualanalyzerfactory.h +++ b/src/plugins/Visual/analyzer/visualanalyzerfactory.h @@ -27,11 +27,12 @@ #include /** - @author Ilya Kotov + @author Ilya Kotov */ class VisualAnalyzerFactory : public QObject, public VisualFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.VisualFactoryInterface.1.0") Q_INTERFACES(VisualFactory) public: diff --git a/src/plugins/Visual/projectm/CMakeLists.txt b/src/plugins/Visual/projectm/CMakeLists.txt index a5acb247e..7f73c38db 100644 --- a/src/plugins/Visual/projectm/CMakeLists.txt +++ b/src/plugins/Visual/projectm/CMakeLists.txt @@ -1,36 +1,19 @@ project(libprojectm) -SET (QT_USE_QTOPENGL 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_SOURCE_DIR}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - # libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) # projectM -pkg_search_module(PROJECTM libprojectM) -pkg_search_module(PROJECTM_20 libprojectM>=2.0.0) -ADD_DEFINITIONS(${PROJECTM_CFLAGS}) - -IF(PROJECTM_20_FOUND) -ADD_DEFINITIONS(-DPROJECTM_20) -ENDIF(PROJECTM_20_FOUND) +MESSAGE(STATUS "Found OpenGL implementation: ${Qt5Gui_OPENGL_IMPLEMENTATION}") +IF(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GL) + pkg_search_module(PROJECTM libprojectM>=2.0.0) + ADD_DEFINITIONS(${PROJECTM_CFLAGS}) +ELSE(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GL) + MESSAGE(WARNING "Unsuppoted OpenGL implementation, projectM disabled") +ENDIF(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GL) find_file(PROJECTM_CONFIG config.inp PATHS "/usr/share/projectM/" "/usr/local/share/projectM/") @@ -49,15 +32,15 @@ SET(libprojectm_SRCS SET(libprojectm_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libprojectm_RCC_SRCS ${libprojectm_RCCS}) +QT5_ADD_RESOURCES(libprojectm_RCC_SRCS ${libprojectm_RCCS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(PROJECTM_FOUND) ADD_LIBRARY(projectm MODULE ${libprojectm_SRCS} ${libprojectm_RCC_SRCS}) -SET_TARGET_PROPERTIES(projectm PROPERTIES COMPILE_DEFINITIONS "${libprojectm_DEFINES}") +target_compile_definitions(projectm PRIVATE ${libprojectm_DEFINES}) add_dependencies(projectm qmmp) -target_link_libraries(projectm ${QT_LIBRARIES} libqmmp ${PROJECTM_LDFLAGS} -lGL) +target_link_libraries(projectm Qt5::Widgets -lqmmp ${PROJECTM_LDFLAGS} -lGL) install(TARGETS projectm DESTINATION ${LIB_DIR}/qmmp/Visual) ENDIF(PROJECTM_FOUND) diff --git a/src/plugins/Visual/projectm/projectm.pro b/src/plugins/Visual/projectm/projectm.pro index 59af466cc..5ee0c5f4f 100644 --- a/src/plugins/Visual/projectm/projectm.pro +++ b/src/plugins/Visual/projectm/projectm.pro @@ -2,8 +2,6 @@ include(../../plugins.pri) TARGET = $$PLUGINS_PREFIX/Visual/projectm -QT += opengl - HEADERS += projectmwidget.h \ visualprojectmfactory.h \ projectmplugin.h \ @@ -15,10 +13,6 @@ SOURCES += projectmplugin.cpp \ RESOURCES = translations/translations.qrc -contains(CONFIG, WITH_PROJECTM20){ - DEFINES += PROJECTM_20 -} - unix { PKGCONFIG += libprojectM target.path = $$LIB_DIR/qmmp/Visual diff --git a/src/plugins/Visual/projectm/projectmplugin.cpp b/src/plugins/Visual/projectm/projectmplugin.cpp index 7b0935949..dd44872e6 100644 --- a/src/plugins/Visual/projectm/projectmplugin.cpp +++ b/src/plugins/Visual/projectm/projectmplugin.cpp @@ -99,7 +99,7 @@ void ProjectMPlugin::onTimeout() m_projectMWidget->projectMInstance()->pcm()->addPCM16(m_buf); } - m_projectMWidget->updateGL(); + m_projectMWidget->update(); } void ProjectMPlugin::setFullScreen(bool yes) diff --git a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp index af1074c1b..7f7fcc447 100644 --- a/src/plugins/Visual/projectm/projectmwidget.cpp +++ b/src/plugins/Visual/projectm/projectmwidget.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include "projectmwrapper.h" @@ -37,22 +38,16 @@ #endif ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent) - : QGLWidget(parent) + : QOpenGLWidget(parent) { setMouseTracking(true); m_listWidget = listWidget; m_projectM = 0; m_menu = new QMenu(this); connect(SoundCore::instance(), SIGNAL(metaDataChanged()), SLOT(updateTitle())); -#if QT_VERSION >= 0x040700 - qDebug("ProjectMWidget: opengl version: %d.%d", - context()->format().majorVersion(), - context()->format().minorVersion()); createActions(); -#endif } - ProjectMWidget::~ProjectMWidget() {} @@ -113,18 +108,13 @@ void ProjectMWidget::initializeGL() QStringList filters; filters << "*.prjm" << "*.milk"; QFileInfoList l = presetDir.entryInfoList(filters); -#ifdef PROJECTM_20 + RatingList list; list.push_back(3); list.push_back(3); -#endif foreach (QFileInfo info, l) { -#ifdef PROJECTM_20 m_projectM->addPresetURL (info.absoluteFilePath().toStdString(), info.fileName().toStdString(), list); -#else - m_projectM->addPresetURL (info.absoluteFilePath().toStdString(), info.fileName().toStdString(), 1); -#endif m_listWidget->addItem(info.fileName()); m_listWidget->setCurrentRow(0,QItemSelectionModel::Select); } diff --git a/src/plugins/Visual/projectm/projectmwidget.h b/src/plugins/Visual/projectm/projectmwidget.h index 4c4788ce1..561aa1658 100644 --- a/src/plugins/Visual/projectm/projectmwidget.h +++ b/src/plugins/Visual/projectm/projectmwidget.h @@ -20,7 +20,7 @@ #ifndef PROJECTMWIDGET_H #define PROJECTMWIDGET_H -#include +#include class QMenu; class QTimer; @@ -31,7 +31,7 @@ class projectM; /** @author Ilya Kotov */ -class ProjectMWidget : public QGLWidget +class ProjectMWidget : public QOpenGLWidget { Q_OBJECT public: diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_bg.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_bg.ts index f4d1b8cc1..01142b3bd 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_bg.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_bg.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help - + F1 - + &Show Song Title - + F2 - + &Show Preset Name - + F3 - + &Show Menu - + M - + &Next Preset - + N - + &Previous Preset - + P - + &Random Preset - + R - + &Lock Preset - + L - + &Fullscreen - + F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM - + About ProjectM Visual Plugin - + Qmmp ProjectM Visual Plugin - + This plugin adds projectM visualization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_cs.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_cs.ts index 87e12720f..6961728a1 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_cs.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_cs.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help &Nápověda - + F1 F1 - + &Show Song Title &Zobrazit název skladby - + F2 F2 - + &Show Preset Name Zobrazit název &předvoleb - + F3 F3 - + &Show Menu - + M - + &Next Preset &Další předvolby - + N N - + &Previous Preset Př&edchozí předvolby - + P P - + &Random Preset Ná&hodné předvolby - + R R - + &Lock Preset U&zamknout předvolby - + L L - + &Fullscreen &Celá obrazovka - + F F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM ProjectM - + About ProjectM Visual Plugin O vizualizačním modulu ProjectM - + Qmmp ProjectM Visual Plugin Vizualizační modul Qmmp ProjectM - + This plugin adds projectM visualization Tento modul přidává vizualizaci ProjectM - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library Založeno na knihovně libprojectM-qt diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_de.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_de.ts index b2ee4fc42..63138572e 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_de.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_de.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help &Hilfe - + F1 F1 - + &Show Song Title Liedna&me anzeigen - + F2 F2 - + &Show Preset Name N&ame der Voreinstellung anzeigen - + F3 F3 - + &Show Menu Menü an&zeigen - + M M - + &Next Preset &Nächste Voreinstellung - + N N - + &Previous Preset Vor&herige Voreinstellung - + P H - + &Random Preset &Zufällige Voreinstellung - + R Z - + &Lock Preset V&oreinstellung sperren - + L O - + &Fullscreen &Vollbild - + F V @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM ProjectM - + About ProjectM Visual Plugin Über ProjectM-Visualisierungsmodul - + Qmmp ProjectM Visual Plugin Qmmp ProjectM-Visualisierungsmodul - + This plugin adds projectM visualization Dieses Modul fügt ProjectM-Visualisierungen hinzu - + Written by: Ilya Kotov <forkotov02@ya.ru> Geschrieben von: Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library Basiert auf der libprojectM-Qt-Bibliothek diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_el.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_el.ts index f93069164..1ef6c3f1f 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_el.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_el.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help &Βοήθεια - + F1 F1 - + &Show Song Title &Εμφάνιση του τίτλου του τραγουδιού - + F2 F2 - + &Show Preset Name Εμφάνιση του ονόματος της προρύθμισης - + F3 F3 - + &Show Menu &Εμφάνιση του μενού - + M M - + &Next Preset &Επόμενη προρύθμιση - + N N - + &Previous Preset &Προηγούμενη προρύθμιση - + P P - + &Random Preset &Τυχαία προρύθμιση - + R R - + &Lock Preset &Κλείδωμα προρύθμισης - + L L - + &Fullscreen &Πλήρης οθόνη - + F F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM ProjectM - + About ProjectM Visual Plugin Σχετικά με το πρόσθετο οπτικοποίησης ProjectM - + Qmmp ProjectM Visual Plugin Qmmp πρόσθετο οπτικοποίησης ProjectM - + This plugin adds projectM visualization Αυτό το πρόσθετο προσθέτει οπτικοποίηση projectM - + Written by: Ilya Kotov <forkotov02@ya.ru> Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru> - + Based on libprojectM-qt library Βασισμένο στη βιβλιοθήκη libprojectM-qt diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_en.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_en.ts index 52f2b9d84..69a9b8238 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_en.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_en.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help - + F1 - + &Show Song Title - + F2 - + &Show Preset Name - + F3 - + &Show Menu - + M - + &Next Preset - + N - + &Previous Preset - + P - + &Random Preset - + R - + &Lock Preset - + L - + &Fullscreen - + F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM - + About ProjectM Visual Plugin - + Qmmp ProjectM Visual Plugin - + This plugin adds projectM visualization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_es.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_es.ts index 686184edb..09085df28 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_es.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_es.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help &Ayuda - + F1 F1 - + &Show Song Title &Mostrar el título de la canción - + F2 F2 - + &Show Preset Name &Mostrar nombre preprogramado - + F3 F3 - + &Show Menu &Mostrar menú - + M M - + &Next Preset &Preprogramado siguiente - + N N - + &Previous Preset &Preprogramado anterior - + P P - + &Random Preset &Preprogramado aleatorio - + R R - + &Lock Preset &Bloquear preprogramado - + L L - + &Fullscreen &Pantalla completa - + F F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM ProjectM - + About ProjectM Visual Plugin Acerca del módulo visual ProjectM - + Qmmp ProjectM Visual Plugin Módulo visual Projectm para Qmmp - + This plugin adds projectM visualization Este módulo añade visualización projectM - + Written by: Ilya Kotov <forkotov02@ya.ru> Escrito por: Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library Basado en la librería libprojectM-qt diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_fi.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_fi.ts index 484172047..c0484fbd5 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_fi.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_fi.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help &Ohje - + F1 F1 - + &Show Song Title - + F2 F2 - + &Show Preset Name - + F3 F3 - + &Show Menu &Näytä valikko - + M M - + &Next Preset - + N - + &Previous Preset - + P P - + &Random Preset - + R R - + &Lock Preset - + L L - + &Fullscreen &Koko näyttö - + F F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM ProjectM - + About ProjectM Visual Plugin - + Qmmp ProjectM Visual Plugin - + This plugin adds projectM visualization - + Written by: Ilya Kotov <forkotov02@ya.ru> Toteuttanut: Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_fr.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_fr.ts index 61920fc4a..3986e5de7 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_fr.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_fr.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help &Aide - + F1 F1 - + &Show Song Title &Montrer le titre du morceau - + F2 F2 - + &Show Preset Name &Montrer le nom du réglage - + F3 F3 - + &Show Menu &Montrer le menu - + M M - + &Next Preset &Réglage suivant - + N N - + &Previous Preset &Réglage précédent - + P P - + &Random Preset &Réglage aléatoire - + R R - + &Lock Preset &Verrouiller le réglage - + L L - + &Fullscreen &Plein écran - + F F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM ProjectM - + About ProjectM Visual Plugin À propos du greffon visuel ProjectM - + Qmmp ProjectM Visual Plugin Greffon visuel ProjectM pour Qmmp - + This plugin adds projectM visualization Ce greffon ajoute une visualisation ProjectM - + Written by: Ilya Kotov <forkotov02@ya.ru> Écrit par : Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library Basé sur la bibliothèque libprojectM-qt diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_gl_ES.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_gl_ES.ts index 4b9aff748..dd7c2b817 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_gl_ES.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_gl_ES.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help &Axuda - + F1 F1 - + &Show Song Title &Amosar título de canción - + F2 F2 - + &Show Preset Name &Amosar nome de perfil - + F3 F3 - + &Show Menu Amosar menú - + M M - + &Next Preset &Perfil seguinte - + N N - + &Previous Preset &Perfil anterior - + P P - + &Random Preset &Perfil aleatorio - + R R - + &Lock Preset &Bloquear perfil - + L L - + &Fullscreen &Pantalla completa - + F F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM ProjectM - + About ProjectM Visual Plugin Sobre o engadido visual ProjectM - + Qmmp ProjectM Visual Plugin Engadido ProjectM de Qmmp - + This plugin adds projectM visualization Este engadido provén visualización ProjectM - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library Baseado na libraría libprojectM-qt diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_he.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_he.ts index b5886db98..994b87595 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_he.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_he.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help &עזרה - + F1 F1 - + &Show Song Title הצג &כותרת שיר - + F2 F2 - + &Show Preset Name הצג &שם קביעה - + F3 F3 - + &Show Menu הצג &תפריט - + M M - + &Next Preset קביעה &באה - + N N - + &Previous Preset קביעה &קודמת - + P P - + &Random Preset קביעה &אקריאת - + R R - + &Lock Preset &נעל קביעה - + L L - + &Fullscreen &מסך מלא - + F F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM ProjectM - + About ProjectM Visual Plugin אודות תוסף חיזוי ProjectM - + Qmmp ProjectM Visual Plugin תוסף חיזוי ProjectM של Qmmp - + This plugin adds projectM visualization תוסף זה מוסיף חיזוי ProjectM - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library מבוססת על ספריית libprojectM-qt diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_hu.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_hu.ts index fb75cf29a..15f58286c 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_hu.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_hu.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help - + F1 - + &Show Song Title - + F2 - + &Show Preset Name - + F3 - + &Show Menu - + M - + &Next Preset - + N - + &Previous Preset - + P - + &Random Preset - + R - + &Lock Preset - + L - + &Fullscreen - + F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM - + About ProjectM Visual Plugin - + Qmmp ProjectM Visual Plugin - + This plugin adds projectM visualization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_id.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_id.ts index 5c76a7cf2..992437f19 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_id.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_id.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help &Bantuan - + F1 F1 - + &Show Song Title &Tampakkan Judul Lagu - + F2 F2 - + &Show Preset Name &Tampakkan Nama Preset - + F3 F3 - + &Show Menu &Tampakkan Menu - + M M - + &Next Preset &Preset Selanjutnya - + N N - + &Previous Preset &Preset Sebelumnya - + P P - + &Random Preset &Preset Acak - + R R - + &Lock Preset &Kunci Preset - + L L - + &Fullscreen &Layarpenuh - + F F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM ProjectM - + About ProjectM Visual Plugin Tentang Plugin Visual ProjectM - + Qmmp ProjectM Visual Plugin Plugin Visual ProjectM Qmmp - + This plugin adds projectM visualization Plugin ini menambahkan visualisasi projectM - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library Berdasarkan pada pustaka projectM-qt diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_it.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_it.ts index 4ae461bc0..93eb2eafb 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_it.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_it.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help Aiuto - + F1 F1 - + &Show Song Title Mostra il titolo del brano - + F2 F2 - + &Show Preset Name Mostra nome del brano programmato - + F3 F3 - + &Show Menu - + M - + &Next Preset Brano programmato successivo - + N N - + &Previous Preset >Brano programmato precedente - + P P - + &Random Preset Brano programmato casuale - + R R - + &Lock Preset Blocca programmazione - + L L - + &Fullscreen &Schermo intero - + F F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM Visualizzatore musicale ProjectM - + About ProjectM Visual Plugin Informazioni sul visualizzatore musicale ProjectM - + Qmmp ProjectM Visual Plugin Modulo Visulaizzatore Projectm per Qmmp - + This plugin adds projectM visualization Questo modulo aggiunge visualizzazione musicale dei brani grazie a projectM - + Written by: Ilya Kotov <forkotov02@ya.ru> Autore by: Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library Basato sulla libreria libprojectM-qt diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_ja.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_ja.ts index 8ad116e4f..a7eb715d8 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_ja.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_ja.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help ヘルプ(&H) - + F1 F1 - + &Show Song Title 曲名を表示(&S) - + F2 F2 - + &Show Preset Name プリセット名を表示(&H) - + F3 F3 - + &Show Menu メニューを表示(&S) - + M M - + &Next Preset 次のプリセット(&N) - + N N - + &Previous Preset 前のプリセット(&P) - + P P - + &Random Preset プリセットを無作為に(&R) - + R R - + &Lock Preset プリセットをロック(&L) - + L L - + &Fullscreen フルスクリーン(&F) - + F F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM ProjectM - + About ProjectM Visual Plugin ProjectM 視覚効果プラグインについて - + Qmmp ProjectM Visual Plugin QMMP ProjectM 視覚効果プラグイン - + This plugin adds projectM visualization このプラグインは ProjectM 視覚効果を加えます - + Written by: Ilya Kotov <forkotov02@ya.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru> - + Based on libprojectM-qt library libprojectM ライブラリを基に作成 diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_kk.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_kk.ts index 3478511c1..cf33bc8ac 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_kk.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_kk.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help - + F1 - + &Show Song Title - + F2 - + &Show Preset Name - + F3 - + &Show Menu - + M - + &Next Preset - + N - + &Previous Preset - + P - + &Random Preset - + R - + &Lock Preset - + L - + &Fullscreen - + F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM - + About ProjectM Visual Plugin - + Qmmp ProjectM Visual Plugin - + This plugin adds projectM visualization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_lt.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_lt.ts index 4c2d97126..2616a62e8 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_lt.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_lt.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help &Pagalba - + F1 F1 - + &Show Song Title &Rodyti dainos pavadinimą - + F2 F2 - + &Show Preset Name &Rodyti vizualizacijos pavadinimą - + F3 F3 - + &Show Menu &Rodyti Meniu - + M M - + &Next Preset &Sekanti - + N N - + &Previous Preset &Atgal - + P P - + &Random Preset &Atsitiktinė - + R R - + &Lock Preset &Užrakinti - + L L - + &Fullscreen &Visas ekranas - + F F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM ProjectM - + About ProjectM Visual Plugin Apie Qmmp vizualizacijos įskiepį - + Qmmp ProjectM Visual Plugin Qmmp ProjectM vizualizacijos įskiepis - + This plugin adds projectM visualization Šis įskiepis leidžia naudoti projectM vizualizacijas - + Written by: Ilya Kotov <forkotov02@ya.ru> Sukūrė: Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library Sukurta libprojectM-qt pagrindu diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_nl.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_nl.ts index 67495d9aa..49c19f811 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_nl.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_nl.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help &Hulp - + F1 - + &Show Song Title &Weergeef Titel van Nummer - + F2 - + &Show Preset Name &Weergeef Naam van Voorinstellingen - + F3 - + &Show Menu - + M - + &Next Preset &Volgende Instelling - + N - + &Previous Preset &Vorige Instelling - + P - + &Random Preset &Willekeurige Instelling - + R - + &Lock Preset &Zet Instelling Vast - + L - + &Fullscreen &Volledig scherm - + F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM ProjectM - + About ProjectM Visual Plugin Over de ProjectM Visuele Module - + Qmmp ProjectM Visual Plugin ProjectM Visuele Module voor Qmmp - + This plugin adds projectM visualization Deze plugin voegt projectM visualisatie toe - + Written by: Ilya Kotov <forkotov02@ya.ru> Auteur: Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library Gebasseerd op de libprojectM-qt bibliotheek diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_pl_PL.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_pl_PL.ts index 8b85d127b..3c534ebb6 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_pl_PL.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_pl_PL.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help &Pomoc - + F1 - + &Show Song Title Pokaż &tytuł utworu - + F2 - + &Show Preset Name Pokaż nazwę &Wizualizacji - + F3 - + &Show Menu Pokaż &Menu - + M - + &Next Preset &Następna animacja - + N - + &Previous Preset &Poprzednia animacja - + P - + &Random Preset &Losowa animacja - + R R - + &Lock Preset &Zablokuj animację - + L L - + &Fullscreen P&ełny ekran - + F F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM - + About ProjectM Visual Plugin O Wtyczce ProjectM - + Qmmp ProjectM Visual Plugin Wtyczka ProjectM dla Qmmp - + This plugin adds projectM visualization Ta wtyczka dodaje obsługę wizualizacji projectM - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library Oparta na bibliotece libprojectM-qt diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_pt.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_pt.ts index 86a38e298..64616823d 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_pt.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_pt.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help Aj&uda - + F1 F1 - + &Show Song Title Mo&strar título da faixa - + F2 F2 - + &Show Preset Name M&ostrar nome do pré-ajuste - + F3 F3 - + &Show Menu &Mostrar menu - + M M - + &Next Preset Pré-ajuste segui&nte - + N N - + &Previous Preset &Pré-ajuste anterior - + P P - + &Random Preset P&ré-ajuste aleatório - + R R - + &Lock Preset B&loquear pré-ajuste - + L L - + &Fullscreen &Ecrã completo - + F F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM ProjectM - + About ProjectM Visual Plugin Sobre o suplemento ProjectM - + Qmmp ProjectM Visual Plugin Suplemento Qmmp ProjectM - + This plugin adds projectM visualization Este suplemento disponibiliza as visualizações ProjectM - + Written by: Ilya Kotov <forkotov02@ya.ru> Desenvolvido por: Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library Baseado na biblioteca libprojectM-qt diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_pt_BR.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_pt_BR.ts index 4b6e6f9df..d863feec5 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_pt_BR.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_pt_BR.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help Aj&uda - + F1 F1 - + &Show Song Title Mo&strar título da faixa - + F2 F2 - + &Show Preset Name M&ostrar nome do pré-ajuste - + F3 F3 - + &Show Menu &Mostrar menu - + M M - + &Next Preset Pré-ajuste segui&nte - + N N - + &Previous Preset &Pré-ajuste anterior - + P P - + &Random Preset P&ré-ajuste aleatório - + R R - + &Lock Preset B&loquear pré-ajuste - + L L - + &Fullscreen &Ecrã completo - + F F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM ProjectM - + About ProjectM Visual Plugin Sobre o plugin ProjectM - + Qmmp ProjectM Visual Plugin Plugin Qmmp ProjectM - + This plugin adds projectM visualization Este plugin disponibiliza as visualizações ProjectM - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library Baseado na biblioteca libprojectM-qt diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_ru.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_ru.ts index a0e7f7fd9..127eb0d14 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_ru.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_ru.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help &Справка - + F1 F1 - + &Show Song Title &Показать название песни - + F2 F2 - + &Show Preset Name &Показать имя предустановки - + F3 F3 - + &Show Menu &Показать меню - + M M - + &Next Preset &Следующая предустановка - + N N - + &Previous Preset &Предыдущая предустановка - + P P - + &Random Preset &Случайная предустановка - + R R - + &Lock Preset &Заблокировать предустановку - + L L - + &Fullscreen &Полноэкранный режим - + F F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM ProjectM - + About ProjectM Visual Plugin О модуле ProjectM для Qmmp - + Qmmp ProjectM Visual Plugin Модуль projectM для Qmmp - + This plugin adds projectM visualization Этот модуль добавляет визуализацию projectM - + Written by: Ilya Kotov <forkotov02@ya.ru> Разработчик: Илья Котов <forkotov02@ya.ru> - + Based on libprojectM-qt library Основан на базе библиотеки libprojectM-qt diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_sk.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_sk.ts index cf1199942..92c24f018 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_sk.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_sk.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help - + F1 - + &Show Song Title - + F2 - + &Show Preset Name - + F3 - + &Show Menu - + M - + &Next Preset - + N - + &Previous Preset - + P - + &Random Preset - + R - + &Lock Preset - + L - + &Fullscreen - + F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM - + About ProjectM Visual Plugin - + Qmmp ProjectM Visual Plugin - + This plugin adds projectM visualization - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_sr_BA.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_sr_BA.ts index 58238eec8..b30a7da8d 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_sr_BA.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_sr_BA.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help &Помоћ - + F1 F1 - + &Show Song Title Прикажи &наслов нумере - + F2 F2 - + &Show Preset Name Прикажи &име поставке - + F3 F3 - + &Show Menu Прикажи &мени - + M М - + &Next Preset &Сљедећа поставка - + N Н - + &Previous Preset П&ретходна поставка - + P П - + &Random Preset Н&асумична поставка - + R Р - + &Lock Preset &Закључај поставку - + L Л - + &Fullscreen &Цио екран - + F Ф @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM ПројектМ - + About ProjectM Visual Plugin О ПројектМ визуелизатору - + Qmmp ProjectM Visual Plugin Кумп ПројектМ визуелни прикључак - + This plugin adds projectM visualization Подршка за ПројектМ визуелизације - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library Заснован на libprojectM-qt библиотеци diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_sr_RS.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_sr_RS.ts index 583896188..186285b33 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_sr_RS.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_sr_RS.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help &Помоћ - + F1 F1 - + &Show Song Title Прикажи &наслов нумере - + F2 F2 - + &Show Preset Name Прикажи &име поставке - + F3 F3 - + &Show Menu Прикажи &мени - + M М - + &Next Preset &Следећа поставка - + N Н - + &Previous Preset П&ретходна поставка - + P П - + &Random Preset Н&асумична поставка - + R Р - + &Lock Preset &Закључај поставку - + L Л - + &Fullscreen &Цео екран - + F Ф @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM ПројектМ - + About ProjectM Visual Plugin О ПројектМ визуелизатору - + Qmmp ProjectM Visual Plugin Кумп ПројектМ визуелни прикључак - + This plugin adds projectM visualization Подршка за ПројектМ визуелизације - + Written by: Ilya Kotov <forkotov02@ya.ru> Аутор: Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library Заснован на libprojectM-qt библиотеци diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_tr.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_tr.ts index bbdb87157..cac434248 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_tr.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_tr.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help &Yardım - + F1 F1 - + &Show Song Title &Şarkı Başlığını Göster - + F2 F2 - + &Show Preset Name &Preset Adını Göster - + F3 F3 - + &Show Menu - + M - + &Next Preset &Sonraki Preset - + N N - + &Previous Preset &Önceki Preset - + P P - + &Random Preset &Rastgele Preset - + R R - + &Lock Preset Preset &Kilitle - + L L - + &Fullscreen &Tam Ekran - + F F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM ProjectM - + About ProjectM Visual Plugin ProjectM Görsel Eklenti Hakkında - + Qmmp ProjectM Visual Plugin Qmmp ProjectM Görsel Eklentisi - + This plugin adds projectM visualization Bu eklenti projectM görselliğini ekler - + Written by: Ilya Kotov <forkotov02@ya.ru> Yazan: Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library librojectM qt kitaplığı temellidir diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_uk_UA.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_uk_UA.ts index 1bb803eae..f9710b745 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_uk_UA.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_uk_UA.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help &Довідка - + F1 - + &Show Song Title &Показати назву пісні - + F2 - + &Show Preset Name &Показати ім'я предустановки - + F3 - + &Show Menu &Показати меню - + M - + &Next Preset &Наступна предустановка - + N - + &Previous Preset &Попередня предустановка - + P - + &Random Preset &Випадкова предустановка - + R - + &Lock Preset &Заблокувати предустановку - + L - + &Fullscreen &Повноекранний режим - + F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM - + About ProjectM Visual Plugin Про модуль ProjectM для Qmmp - + Qmmp ProjectM Visual Plugin Модуль projectM для Qmmp - + This plugin adds projectM visualization Цей модуль додає візуалізацію projectM - + Written by: Ilya Kotov <forkotov02@ya.ru> Розробник: Ілля Котов <forkotov02@ya.ru> - + Based on libprojectM-qt library Базується на бібліотеці libprojectM-qt diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_zh_CN.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_zh_CN.ts index 366d2d8cd..7f4d8ea26 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_zh_CN.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_zh_CN.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help 帮助(&H) - + F1 F1 - + &Show Song Title 显示歌曲标题(&S) - + F2 F2 - + &Show Preset Name 显示边框形式名称(&S) - + F3 F3 - + &Show Menu 显示菜单(&S) - + M M - + &Next Preset 下一边框形式(&N) - + N N - + &Previous Preset 上一边框形式(&P) - + P P - + &Random Preset 随意边框形式(&R) - + R R - + &Lock Preset 锁定边框形式(&L) - + L L - + &Fullscreen 全屏(&F) - + F F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM projectM - + About ProjectM Visual Plugin 关于 ProjectM 可视化插件 - + Qmmp ProjectM Visual Plugin Qmmp ProjectM 可视化插件 - + This plugin adds projectM visualization 此插件添加 projectM 可视化 - + Written by: Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library 基于 libprojectM-qt 库 diff --git a/src/plugins/Visual/projectm/translations/projectm_plugin_zh_TW.ts b/src/plugins/Visual/projectm/translations/projectm_plugin_zh_TW.ts index a6bb06fdf..ade77a7b8 100644 --- a/src/plugins/Visual/projectm/translations/projectm_plugin_zh_TW.ts +++ b/src/plugins/Visual/projectm/translations/projectm_plugin_zh_TW.ts @@ -12,92 +12,92 @@ ProjectMWidget - + &Help 幫助(&H) - + F1 F1 - + &Show Song Title 顯示曲目標題(&S) - + F2 F2 - + &Show Preset Name 顯示邊框形式名稱(&S) - + F3 F3 - + &Show Menu - + M - + &Next Preset 下一邊框形式(&N) - + N N - + &Previous Preset 上一邊框形式(&P) - + P P - + &Random Preset 隨意邊框形式(&R) - + R R - + &Lock Preset 鎖定邊框形式(&L) - + L L - + &Fullscreen 全屏(&F) - + F F @@ -105,32 +105,32 @@ VisualProjectMFactory - + ProjectM ProjectM - + About ProjectM Visual Plugin 關於 ProjectM 可視化插件 - + Qmmp ProjectM Visual Plugin Qmmp ProjectM 可視化插件 - + This plugin adds projectM visualization 此插件添加 ProjectM 可視化 - + Written by: Ilya Kotov <forkotov02@ya.ru> 作者：Ilya Kotov <forkotov02@ya.ru> - + Based on libprojectM-qt library 基於 libprojectM-qt 程式庫 diff --git a/src/plugins/Visual/projectm/visualprojectmfactory.cpp b/src/plugins/Visual/projectm/visualprojectmfactory.cpp index d7e411136..a66531f0b 100644 --- a/src/plugins/Visual/projectm/visualprojectmfactory.cpp +++ b/src/plugins/Visual/projectm/visualprojectmfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2016 by Ilya Kotov * + * Copyright (C) 2009-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 "visualprojectmfactory.h" #include "projectmplugin.h" @@ -62,5 +61,3 @@ QTranslator *VisualProjectMFactory::createTranslator(QObject *parent) translator->load(QString(":/projectm_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(projectm,VisualProjectMFactory) diff --git a/src/plugins/Visual/projectm/visualprojectmfactory.h b/src/plugins/Visual/projectm/visualprojectmfactory.h index a4963c137..ffede2f93 100644 --- a/src/plugins/Visual/projectm/visualprojectmfactory.h +++ b/src/plugins/Visual/projectm/visualprojectmfactory.h @@ -25,11 +25,12 @@ #include /** - @author Ilya Kotov + @author Ilya Kotov */ class VisualProjectMFactory : public QObject, public VisualFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.VisualFactoryInterface.1.0") Q_INTERFACES(VisualFactory) public: diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri index a2b0f2ff5..f56e33e64 100644 --- a/src/plugins/plugins.pri +++ b/src/plugins/plugins.pri @@ -18,5 +18,6 @@ unix { QMMPUI_LIB = -lqmmpui } + CONFIG += warn_on plugin lib thread link_pkgconfig hide_symbols TEMPLATE = lib -- cgit v1.2.3-13-gbd6f