diff options
Diffstat (limited to 'src/plugins/Output/shout')
| -rw-r--r-- | src/plugins/Output/shout/outputshoutfactory.h | 12 | ||||
| -rw-r--r-- | src/plugins/Output/shout/settingsdialog.h | 2 | ||||
| -rw-r--r-- | src/plugins/Output/shout/shoutoutput.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/Output/shout/shoutoutput.h | 12 |
4 files changed, 16 insertions, 16 deletions
diff --git a/src/plugins/Output/shout/outputshoutfactory.h b/src/plugins/Output/shout/outputshoutfactory.h index 174d42807..966e97ffd 100644 --- a/src/plugins/Output/shout/outputshoutfactory.h +++ b/src/plugins/Output/shout/outputshoutfactory.h @@ -37,12 +37,12 @@ Q_INTERFACES(OutputFactory) public: OutputShoutFactory(); - OutputProperties properties() const; - Output* create(); - Volume *createVolume(); - void showSettings(QWidget* parent); - void showAbout(QWidget *parent); - QString translation() const; + OutputProperties properties() const override; + Output* create() override; + Volume *createVolume() override; + void showSettings(QWidget* parent) override; + void showAbout(QWidget *parent) override; + QString translation() const override; private: ShoutClient *m_connection; diff --git a/src/plugins/Output/shout/settingsdialog.h b/src/plugins/Output/shout/settingsdialog.h index 4e44cfd2a..070d67e38 100644 --- a/src/plugins/Output/shout/settingsdialog.h +++ b/src/plugins/Output/shout/settingsdialog.h @@ -36,7 +36,7 @@ public: ~SettingsDialog(); public slots: - void accept(); + void accept() override; private: Ui::SettingsDialog *m_ui; diff --git a/src/plugins/Output/shout/shoutoutput.cpp b/src/plugins/Output/shout/shoutoutput.cpp index 90a4b0b49..5e65f963f 100644 --- a/src/plugins/Output/shout/shoutoutput.cpp +++ b/src/plugins/Output/shout/shoutoutput.cpp @@ -205,7 +205,7 @@ void ShoutOutput::drain() void ShoutOutput::reset() {} -void ShoutOutput::setTrackInfo(const QMap<Qmmp::MetaData, QString> &metaData) +void ShoutOutput::setTrackInfo(const TrackInfo &info) { vorbis_comment_clear(&m_vc); @@ -229,8 +229,8 @@ void ShoutOutput::setTrackInfo(const QMap<Qmmp::MetaData, QString> &metaData) int i = 0; while(tag_map[i].key != Qmmp::UNKNOWN) { - if(!metaData[tag_map[i].key].isEmpty()) - vorbis_comment_add_tag(&m_vc, tag_map[i].tag, metaData[tag_map[i].key].toUtf8().constData()); + if(!info.value(tag_map[i].key).isEmpty()) + vorbis_comment_add_tag(&m_vc, tag_map[i].tag, info.value(tag_map[i].key).toUtf8().constData()); i++; } sendHeader(); diff --git a/src/plugins/Output/shout/shoutoutput.h b/src/plugins/Output/shout/shoutoutput.h index 5c0bc6d2c..6536f0a60 100644 --- a/src/plugins/Output/shout/shoutoutput.h +++ b/src/plugins/Output/shout/shoutoutput.h @@ -32,12 +32,12 @@ public: ShoutOutput(ShoutClient *m); ~ShoutOutput(); - bool initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat); - qint64 latency(); - qint64 writeAudio(unsigned char *data, qint64 maxSize); - void drain(); - void reset(); - void setTrackInfo(const QMap<Qmmp::MetaData, QString> &metaData); + bool initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat) override; + qint64 latency() override; + qint64 writeAudio(unsigned char *data, qint64 maxSize) override; + void drain() override; + void reset() override; + void setTrackInfo(const TrackInfo &info) override; private: void sendHeader(); |
