From 2111b82728e37a649539076ee4e9fc83103f196b Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 21 Jul 2018 17:30:35 +0000 Subject: changed translation api again git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8200 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Output/alsa/outputalsafactory.cpp | 10 +++++++--- src/plugins/Output/alsa/outputalsafactory.h | 4 ++-- src/plugins/Output/directsound/outputdirectsoundfactory.cpp | 2 +- src/plugins/Output/directsound/outputdirectsoundfactory.h | 2 +- src/plugins/Output/jack/outputjackfactory.cpp | 8 ++++++-- src/plugins/Output/jack/outputjackfactory.h | 3 ++- src/plugins/Output/null/outputnullfactory.cpp | 10 +++++++--- src/plugins/Output/null/outputnullfactory.h | 3 ++- src/plugins/Output/oss/outputossfactory.cpp | 10 +++++++--- src/plugins/Output/oss/outputossfactory.h | 3 ++- src/plugins/Output/oss4/outputoss4factory.cpp | 2 +- src/plugins/Output/oss4/outputoss4factory.h | 2 +- src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp | 10 +++++++--- src/plugins/Output/pulseaudio/outputpulseaudiofactory.h | 3 ++- src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp | 10 +++++++--- src/plugins/Output/qtmultimedia/outputqtmultimediafactory.h | 3 ++- src/plugins/Output/shout/outputshoutfactory.cpp | 8 ++++++-- src/plugins/Output/shout/outputshoutfactory.h | 3 ++- src/plugins/Output/wasapi/outputwasapifactory.cpp | 2 +- src/plugins/Output/wasapi/outputwasapifactory.h | 2 +- src/plugins/Output/waveout/outputwaveoutfactory.cpp | 2 +- src/plugins/Output/waveout/outputwaveoutfactory.h | 2 +- 22 files changed, 69 insertions(+), 35 deletions(-) (limited to 'src/plugins/Output') diff --git a/src/plugins/Output/alsa/outputalsafactory.cpp b/src/plugins/Output/alsa/outputalsafactory.cpp index d5529101b..82a50d7dd 100644 --- a/src/plugins/Output/alsa/outputalsafactory.cpp +++ b/src/plugins/Output/alsa/outputalsafactory.cpp @@ -25,12 +25,11 @@ #include "outputalsafactory.h" -const OutputProperties OutputALSAFactory::properties() const +OutputProperties OutputALSAFactory::properties() const { OutputProperties properties; properties.name = tr("ALSA Plugin"); properties.shortName = "alsa"; - properties.translation = QLatin1String(":/alsa_plugin_"); properties.hasAbout = true; properties.hasSettings = true; return properties; @@ -54,7 +53,12 @@ void OutputALSAFactory::showSettings(QWidget* parent) void OutputALSAFactory::showAbout(QWidget *parent) { - QMessageBox::about (parent, tr("About ALSA Output Plugin"), + QMessageBox::about (parent, tr("About ALSA Output Plugin"), tr("Qmmp ALSA Output Plugin")+"\n"+ tr("Written by: Ilya Kotov ")); } + +QString OutputALSAFactory::translation() const +{ + return QLatin1String(":/alsa_plugin_"); +} diff --git a/src/plugins/Output/alsa/outputalsafactory.h b/src/plugins/Output/alsa/outputalsafactory.h index 873474687..5a942c06a 100644 --- a/src/plugins/Output/alsa/outputalsafactory.h +++ b/src/plugins/Output/alsa/outputalsafactory.h @@ -24,7 +24,6 @@ #include #include #include - #include #include @@ -37,11 +36,12 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: - const OutputProperties properties() const; + OutputProperties properties() const; Output* create(); Volume *createVolume(); void showSettings(QWidget* parent); void showAbout(QWidget *parent); + QString translation() const; }; #endif diff --git a/src/plugins/Output/directsound/outputdirectsoundfactory.cpp b/src/plugins/Output/directsound/outputdirectsoundfactory.cpp index a05a9f3aa..81acc8426 100644 --- a/src/plugins/Output/directsound/outputdirectsoundfactory.cpp +++ b/src/plugins/Output/directsound/outputdirectsoundfactory.cpp @@ -22,7 +22,7 @@ #include "outputdirectsound.h" #include "outputdirectsoundfactory.h" -const OutputProperties OutputDirectSoundFactory::properties() const +OutputProperties OutputDirectSoundFactory::properties() const { OutputProperties properties; properties.name = tr("DirectSound Plugin"); diff --git a/src/plugins/Output/directsound/outputdirectsoundfactory.h b/src/plugins/Output/directsound/outputdirectsoundfactory.h index 4e34d191c..72090c4e5 100644 --- a/src/plugins/Output/directsound/outputdirectsoundfactory.h +++ b/src/plugins/Output/directsound/outputdirectsoundfactory.h @@ -34,7 +34,7 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: - const OutputProperties properties() const; + OutputProperties properties() const; Output* create(); Volume *createVolume(); void showSettings(QWidget* parent); diff --git a/src/plugins/Output/jack/outputjackfactory.cpp b/src/plugins/Output/jack/outputjackfactory.cpp index 1ef4f48fd..2995e4290 100644 --- a/src/plugins/Output/jack/outputjackfactory.cpp +++ b/src/plugins/Output/jack/outputjackfactory.cpp @@ -24,14 +24,13 @@ #include "outputjackfactory.h" -const OutputProperties OutputJACKFactory::properties() const +OutputProperties OutputJACKFactory::properties() const { OutputProperties properties; properties.name = tr("JACK Plugin"); properties.hasAbout = true; properties.hasSettings = false; properties.shortName = "jack"; - properties.translation = QLatin1String(":/jack_plugin_"); return properties; } @@ -55,3 +54,8 @@ void OutputJACKFactory::showAbout(QWidget *parent) tr("Qmmp Jack Output Plugin")+"\n"+ tr("Written by: Yuriy Zhuravlev ")); } + +QString OutputJACKFactory::translation() const +{ + return QLatin1String(":/jack_plugin_"); +} diff --git a/src/plugins/Output/jack/outputjackfactory.h b/src/plugins/Output/jack/outputjackfactory.h index 8deb7dbf5..b004dbbc6 100644 --- a/src/plugins/Output/jack/outputjackfactory.h +++ b/src/plugins/Output/jack/outputjackfactory.h @@ -37,11 +37,12 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: - const OutputProperties properties() const; + OutputProperties properties() const; Output* create(); Volume *createVolume(); void showSettings(QWidget* parent); void showAbout(QWidget *parent); + QString translation() const; }; #endif diff --git a/src/plugins/Output/null/outputnullfactory.cpp b/src/plugins/Output/null/outputnullfactory.cpp index 590a9dfc9..b7a96921b 100644 --- a/src/plugins/Output/null/outputnullfactory.cpp +++ b/src/plugins/Output/null/outputnullfactory.cpp @@ -24,14 +24,13 @@ #include "outputnullfactory.h" -const OutputProperties OutputNullFactory::properties() const +OutputProperties OutputNullFactory::properties() const { OutputProperties properties; properties.name = tr("Null Plugin"); properties.hasAbout = true; properties.hasSettings = false; properties.shortName = "null"; - properties.translation = QLatin1String(":/null_plugin_"); return properties; } @@ -54,5 +53,10 @@ void OutputNullFactory::showAbout(QWidget *parent) { QMessageBox::about (parent, tr("About Null Output Plugin"), tr("Qmmp Null Output Plugin")+"\n"+ - tr("Written by: Ilya Kotov ")); + tr("Written by: Ilya Kotov ")); +} + +QString OutputNullFactory::translation() const +{ + return QLatin1String(":/null_plugin_"); } diff --git a/src/plugins/Output/null/outputnullfactory.h b/src/plugins/Output/null/outputnullfactory.h index 931c0f6a3..543f20846 100644 --- a/src/plugins/Output/null/outputnullfactory.h +++ b/src/plugins/Output/null/outputnullfactory.h @@ -37,11 +37,12 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: - const OutputProperties properties() const; + OutputProperties properties() const; Output* create(); Volume *createVolume(); void showSettings(QWidget* parent); void showAbout(QWidget *parent); + QString translation() const; }; #endif diff --git a/src/plugins/Output/oss/outputossfactory.cpp b/src/plugins/Output/oss/outputossfactory.cpp index 6686d86c6..fa83130f8 100644 --- a/src/plugins/Output/oss/outputossfactory.cpp +++ b/src/plugins/Output/oss/outputossfactory.cpp @@ -30,12 +30,11 @@ Output* OutputOSSFactory::create() return new OutputOSS(); } -const OutputProperties OutputOSSFactory::properties() const +OutputProperties OutputOSSFactory::properties() const { OutputProperties properties; properties.name = tr("OSS Plugin"); properties.shortName = "oss"; - properties.translation = QLatin1String(":/oss_plugin_"); properties.hasAbout = true; properties.hasSettings = true; return properties; @@ -57,5 +56,10 @@ void OutputOSSFactory::showAbout(QWidget *parent) QMessageBox::about (parent, tr("About OSS Output Plugin"), tr("Qmmp OSS Output Plugin")+"\n"+ tr("Written by: Yuriy Zhuravlev ")+"\n"+ - tr("Based on code by: Brad Hughes ")); + tr("Based on code by: Brad Hughes ")); +} + +QString OutputOSSFactory::translation() const +{ + return QLatin1String(":/oss_plugin_"); } diff --git a/src/plugins/Output/oss/outputossfactory.h b/src/plugins/Output/oss/outputossfactory.h index 1a9ff7e36..fa18c136e 100644 --- a/src/plugins/Output/oss/outputossfactory.h +++ b/src/plugins/Output/oss/outputossfactory.h @@ -37,11 +37,12 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: - const OutputProperties properties() const; + OutputProperties properties() const; Output* create(); Volume *createVolume(); void showSettings(QWidget* parent); void showAbout(QWidget *parent); + QString translation() const; }; #endif diff --git a/src/plugins/Output/oss4/outputoss4factory.cpp b/src/plugins/Output/oss4/outputoss4factory.cpp index d8a183f64..c7f9eb97a 100644 --- a/src/plugins/Output/oss4/outputoss4factory.cpp +++ b/src/plugins/Output/oss4/outputoss4factory.cpp @@ -30,7 +30,7 @@ Output* OutputOSS4Factory::create() return new OutputOSS4(); } -const OutputProperties OutputOSS4Factory::properties() const +OutputProperties OutputOSS4Factory::properties() const { OutputProperties properties; properties.name = tr("OSS4 Plugin"); diff --git a/src/plugins/Output/oss4/outputoss4factory.h b/src/plugins/Output/oss4/outputoss4factory.h index 56fa4fd2f..f73d992a6 100644 --- a/src/plugins/Output/oss4/outputoss4factory.h +++ b/src/plugins/Output/oss4/outputoss4factory.h @@ -36,7 +36,7 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: - const OutputProperties properties() const; + OutputProperties properties() const; Output* create(); Volume *createVolume(); void showSettings(QWidget* parent); diff --git a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp index da8d8f2d1..049bc110a 100644 --- a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp +++ b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp @@ -24,14 +24,13 @@ #include "outputpulseaudiofactory.h" -const OutputProperties OutputPulseAudioFactory::properties() const +OutputProperties OutputPulseAudioFactory::properties() const { OutputProperties properties; properties.name = tr("PulseAudio Plugin"); properties.hasAbout = true; properties.hasSettings = false; properties.shortName = "pulse"; - properties.translation = QLatin1String(":/pulseaudio_plugin_"); return properties; } @@ -54,5 +53,10 @@ void OutputPulseAudioFactory::showAbout(QWidget *parent) { QMessageBox::about (parent, tr("About PulseAudio Output Plugin"), tr("Qmmp PulseAudio Output Plugin")+"\n"+ - tr("Written by: Ilya Kotov ")); + tr("Written by: Ilya Kotov ")); +} + +QString OutputPulseAudioFactory::translation() const +{ + return QLatin1String(":/pulseaudio_plugin_"); } diff --git a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h index bfd4b07e9..3628b2f2b 100644 --- a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h +++ b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h @@ -38,11 +38,12 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: - const OutputProperties properties() const; + OutputProperties properties() const; Output* create(); Volume *createVolume(); void showSettings(QWidget* parent); void showAbout(QWidget *parent); + QString translation() const; }; #endif diff --git a/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp b/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp index 070bd5f23..6bf8676a1 100644 --- a/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp +++ b/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.cpp @@ -26,14 +26,13 @@ #include "outputqtmultimedia.h" -const OutputProperties OutputQtMultimediaFactory::properties() const +OutputProperties OutputQtMultimediaFactory::properties() const { OutputProperties properties; properties.name = tr("Qt Multimedia Plugin"); properties.hasAbout = true; properties.hasSettings = true; properties.shortName = "qtmultimedia"; - properties.translation = QLatin1String(":/qtmultimedia_plugin_"); return properties; } @@ -57,5 +56,10 @@ void OutputQtMultimediaFactory::showAbout(QWidget *parent) { QMessageBox::about (parent, tr("About Qt Multimedia Output Plugin"), tr("Qmmp Qt Multimedia Output Plugin")+"\n"+ - tr("Written by: Ivan Ponomarev ")); + tr("Written by: Ivan Ponomarev ")); +} + +QString OutputQtMultimediaFactory::translation() const +{ + return QLatin1String(":/qtmultimedia_plugin_"); } diff --git a/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.h b/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.h index ae109db28..08c077c95 100644 --- a/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.h +++ b/src/plugins/Output/qtmultimedia/outputqtmultimediafactory.h @@ -37,11 +37,12 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: - virtual const OutputProperties properties() const; + virtual OutputProperties properties() const; virtual Output* create(); virtual Volume *createVolume(); virtual void showSettings(QWidget* parent); virtual void showAbout(QWidget *parent); + virtual QString translation() const; }; #endif diff --git a/src/plugins/Output/shout/outputshoutfactory.cpp b/src/plugins/Output/shout/outputshoutfactory.cpp index 80e875ec6..47937a7a9 100644 --- a/src/plugins/Output/shout/outputshoutfactory.cpp +++ b/src/plugins/Output/shout/outputshoutfactory.cpp @@ -33,14 +33,13 @@ OutputShoutFactory::OutputShoutFactory() m_connection = new ShoutClient(qApp); } -const OutputProperties OutputShoutFactory::properties() const +OutputProperties OutputShoutFactory::properties() const { OutputProperties properties; properties.name = tr("Icecast Plugin"); properties.hasAbout = true; properties.hasSettings = true; properties.shortName = "shout"; - properties.translation = QLatin1String(":/shout_plugin_"); return properties; } @@ -67,3 +66,8 @@ void OutputShoutFactory::showAbout(QWidget *parent) tr("Compiled against libshout-%1").arg(shout_version(0,0,0))+"\n"+ tr("Written by: Ilya Kotov ")); } + +QString OutputShoutFactory::translation() const +{ + return QLatin1String(":/shout_plugin_"); +} diff --git a/src/plugins/Output/shout/outputshoutfactory.h b/src/plugins/Output/shout/outputshoutfactory.h index f1288cd4a..174d42807 100644 --- a/src/plugins/Output/shout/outputshoutfactory.h +++ b/src/plugins/Output/shout/outputshoutfactory.h @@ -37,11 +37,12 @@ Q_INTERFACES(OutputFactory) public: OutputShoutFactory(); - const OutputProperties properties() const; + OutputProperties properties() const; Output* create(); Volume *createVolume(); void showSettings(QWidget* parent); void showAbout(QWidget *parent); + QString translation() const; private: ShoutClient *m_connection; diff --git a/src/plugins/Output/wasapi/outputwasapifactory.cpp b/src/plugins/Output/wasapi/outputwasapifactory.cpp index e3516ce72..b4297e669 100644 --- a/src/plugins/Output/wasapi/outputwasapifactory.cpp +++ b/src/plugins/Output/wasapi/outputwasapifactory.cpp @@ -23,7 +23,7 @@ #include "outputwasapi.h" #include "outputwasapifactory.h" -const OutputProperties OutputWASAPIFactory::properties() const +OutputProperties OutputWASAPIFactory::properties() const { OutputProperties properties; properties.name = tr("WASAPI Plugin"); diff --git a/src/plugins/Output/wasapi/outputwasapifactory.h b/src/plugins/Output/wasapi/outputwasapifactory.h index 23a77eb50..5ff92b910 100644 --- a/src/plugins/Output/wasapi/outputwasapifactory.h +++ b/src/plugins/Output/wasapi/outputwasapifactory.h @@ -34,7 +34,7 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: - const OutputProperties properties() const; + OutputProperties properties() const; Output* create(); Volume *createVolume(); void showSettings(QWidget* parent); diff --git a/src/plugins/Output/waveout/outputwaveoutfactory.cpp b/src/plugins/Output/waveout/outputwaveoutfactory.cpp index 85a94e615..14140c428 100644 --- a/src/plugins/Output/waveout/outputwaveoutfactory.cpp +++ b/src/plugins/Output/waveout/outputwaveoutfactory.cpp @@ -23,7 +23,7 @@ #include "outputwaveoutfactory.h" -const OutputProperties OutputWaveOutFactory::properties() const +OutputProperties OutputWaveOutFactory::properties() const { OutputProperties properties; properties.name = tr("WaveOut Plugin"); diff --git a/src/plugins/Output/waveout/outputwaveoutfactory.h b/src/plugins/Output/waveout/outputwaveoutfactory.h index c8b992408..8867cf151 100644 --- a/src/plugins/Output/waveout/outputwaveoutfactory.h +++ b/src/plugins/Output/waveout/outputwaveoutfactory.h @@ -35,7 +35,7 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.OutputFactoryInterface.1.0") Q_INTERFACES(OutputFactory) public: - const OutputProperties properties() const; + OutputProperties properties() const; Output* create(); Volume *createVolume(); void showSettings(QWidget* parent); -- cgit v1.2.3-13-gbd6f