diff options
35 files changed, 592 insertions, 525 deletions
diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp index 017bbfe2e..02cc8f356 100644 --- a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp +++ b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp @@ -404,7 +404,7 @@ bool DecoderCDAudio::initialize() m_first_sector = tracks[track_at].first_sector; m_current_sector = tracks[track_at].first_sector; m_last_sector = tracks[track_at].last_sector; - StateHandler::instance()->dispatch(tracks[track_at].info.metaData()); //send metadata + addMetaData(tracks[track_at].info.metaData()); //send metadata qDebug("DecoderCDAudio: initialize succes"); return true; } diff --git a/src/plugins/Input/cue/decoder_cue.cpp b/src/plugins/Input/cue/decoder_cue.cpp index 0f61bf732..398db08d7 100644 --- a/src/plugins/Input/cue/decoder_cue.cpp +++ b/src/plugins/Input/cue/decoder_cue.cpp @@ -110,7 +110,7 @@ bool DecoderCUE::initialize() m_sz = audioParameters().sampleSize(); - StateHandler::instance()->dispatch(m_parser->info(m_track)->metaData()); + addMetaData(m_parser->info(m_track)->metaData()); return true; } @@ -194,7 +194,7 @@ void DecoderCUE::next() length_in_bytes = audioParameters().sampleRate() * audioParameters().channels() * audioParameters().sampleSize() * m_length/1000; - StateHandler::instance()->dispatch(m_parser->info(m_track)->metaData()); + addMetaData(m_parser->info(m_track)->metaData()); m_totalBytes = 0; } } diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp index a7d22e9cf..743b9456a 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp @@ -187,7 +187,7 @@ bool DecoderFFmpeg::initialize() if(track) metaData.insert(Qmmp::TRACK, track->value); metaData.insert(Qmmp::URL, m_path); - StateHandler::instance()->dispatch(metaData); + addMetaData(metaData); } ic->flags |= AVFMT_FLAG_GENPTS; diff --git a/src/plugins/Input/flac/decoder_flac.cpp b/src/plugins/Input/flac/decoder_flac.cpp index 29087e1ae..00b0636aa 100644 --- a/src/plugins/Input/flac/decoder_flac.cpp +++ b/src/plugins/Input/flac/decoder_flac.cpp @@ -301,7 +301,7 @@ bool DecoderFLAC::initialize() data()->input = new QFile(p); data()->input->open(QIODevice::ReadOnly); QMap<Qmmp::MetaData, QString> metaData = m_parser->info(m_track)->metaData(); - StateHandler::instance()->dispatch(metaData); //send metadata + addMetaData(metaData); //send metadata ReplayGainReader rg(p); setReplayGainInfo(rg.replayGainInfo()); } @@ -541,7 +541,7 @@ void DecoderFLAC::next() length_in_bytes = audioParameters().sampleRate() * audioParameters().channels() * audioParameters().sampleSize() * m_length/1000; - StateHandler::instance()->dispatch(m_parser->info(m_track)->metaData()); + addMetaData(m_parser->info(m_track)->metaData()); m_totalBytes = 0; } } diff --git a/src/plugins/Input/gme/decoder_gme.cpp b/src/plugins/Input/gme/decoder_gme.cpp index 81d9cb718..5204d24c5 100644 --- a/src/plugins/Input/gme/decoder_gme.cpp +++ b/src/plugins/Input/gme/decoder_gme.cpp @@ -65,7 +65,7 @@ bool DecoderGme::initialize() metadata.insert(Qmmp::COMMENT, track_info->comment); metadata.insert(Qmmp::TRACK, QString("%1").arg(track)); metadata.insert(Qmmp::URL, m_path); - StateHandler::instance()->dispatch(metadata); + addMetaData(metadata); m_totalTime = track_info->length; gme_free_info(track_info); configure(44100, 2); diff --git a/src/plugins/Input/mad/decoder_mad.cpp b/src/plugins/Input/mad/decoder_mad.cpp index 42f7873ae..00239e0e7 100644 --- a/src/plugins/Input/mad/decoder_mad.cpp +++ b/src/plugins/Input/mad/decoder_mad.cpp @@ -79,7 +79,7 @@ bool DecoderMAD::initialize() { TagExtractor extractor(input()); if(!extractor.id3v2tag().isEmpty()) - StateHandler::instance()->dispatch(extractor.id3v2tag()); + addMetaData(extractor.id3v2tag()); } mad_stream_init(&stream); diff --git a/src/plugins/Input/vorbis/decoder_vorbis.cpp b/src/plugins/Input/vorbis/decoder_vorbis.cpp index 7c87822e3..d1bddb0c9 100644 --- a/src/plugins/Input/vorbis/decoder_vorbis.cpp +++ b/src/plugins/Input/vorbis/decoder_vorbis.cpp @@ -23,7 +23,6 @@ static size_t oggread (void *buf, size_t size, size_t nmemb, void *src) return len / size; } - static int oggseek(void *src, int64_t offset, int whence) { DecoderVorbis *dogg = (DecoderVorbis *) src; @@ -215,7 +214,7 @@ void DecoderVorbis::updateTags() + strlen ("discnumber=")))); } metaData.insert(Qmmp::URL, m_url); - StateHandler::instance()->dispatch(metaData); + addMetaData(metaData); } void DecoderVorbis::seek(qint64 time) diff --git a/src/plugins/Input/wavpack/decoder_wavpack.cpp b/src/plugins/Input/wavpack/decoder_wavpack.cpp index 0c1b2a396..3f410b6f7 100644 --- a/src/plugins/Input/wavpack/decoder_wavpack.cpp +++ b/src/plugins/Input/wavpack/decoder_wavpack.cpp @@ -89,7 +89,7 @@ bool DecoderWavPack::initialize() m_path = p; //send metadata QMap<Qmmp::MetaData, QString> metaData = m_parser->info(m_track)->metaData(); - StateHandler::instance()->dispatch(metaData); + addMetaData(metaData); } } else @@ -240,7 +240,7 @@ void DecoderWavPack::next() length_in_bytes = audioParameters().sampleRate() * audioParameters().channels() * audioParameters().sampleSize() * m_length/1000; - StateHandler::instance()->dispatch(m_parser->info(m_track)->metaData()); + addMetaData(m_parser->info(m_track)->metaData()); m_totalBytes = 0; } } diff --git a/src/plugins/Transports/http/httpstreamreader.cpp b/src/plugins/Transports/http/httpstreamreader.cpp index 3df0c432c..b40f5b09f 100644 --- a/src/plugins/Transports/http/httpstreamreader.cpp +++ b/src/plugins/Transports/http/httpstreamreader.cpp @@ -27,6 +27,7 @@ #include <qmmp/qmmpsettings.h> #include <qmmp/qmmp.h> #include <qmmp/statehandler.h> +#include <qmmp/inputsource.h> #include "httpstreamreader.h" //curl callbacks @@ -370,7 +371,7 @@ void HttpStreamReader::checkBuffer() metaData.insert(Qmmp::GENRE, m_stream.header.value("icy-genre")); } metaData.insert(Qmmp::URL, m_url); - StateHandler::instance()->dispatch(metaData); + (qobject_cast<InputSource *>(parent()))->addMetaData(metaData); } emit ready(); } @@ -447,7 +448,7 @@ void HttpStreamReader::parseICYMetaData(char *data, qint64 size) metaData.insert(Qmmp::TITLE, m_stream.header.value("icy-name")); metaData.insert(Qmmp::GENRE, m_stream.header.value("icy-genre")); metaData.insert(Qmmp::URL, m_url); - StateHandler::instance()->dispatch(metaData); + (qobject_cast<InputSource *>(parent()))->addMetaData(metaData); m_meta_sent = true; break; } diff --git a/src/plugins/Transports/mms/mmsstreamreader.cpp b/src/plugins/Transports/mms/mmsstreamreader.cpp index b50450a83..34199f551 100644 --- a/src/plugins/Transports/mms/mmsstreamreader.cpp +++ b/src/plugins/Transports/mms/mmsstreamreader.cpp @@ -23,6 +23,7 @@ #include <stdlib.h> #include <qmmp/qmmp.h> #include <qmmp/statehandler.h> +#include <qmmp/inputsource.h> #include "mmsstreamreader.h" MMSStreamReader::MMSStreamReader(const QString &url, QObject *parent) @@ -196,7 +197,7 @@ void MMSStreamReader::checkBuffer() qDebug("MMSStreamReader: ready"); QMap<Qmmp::MetaData, QString> metaData; metaData.insert(Qmmp::URL, m_url); - StateHandler::instance()->dispatch(metaData); + (qobject_cast<InputSource *>(parent()))->addMetaData(metaData); emit ready(); } else if (!m_ready) diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts index 7929afb0d..347ddc5a0 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts @@ -585,132 +585,132 @@ <context> <name>MainVisual</name> <message> - <location filename="../mainvisual.cpp" line="281"/> + <location filename="../mainvisual.cpp" line="282"/> <source>Visualization Mode</source> <translation>Režim vizualizace</translation> </message> <message> - <location filename="../mainvisual.cpp" line="284"/> + <location filename="../mainvisual.cpp" line="285"/> <source>Analyzer</source> <translation>Frekvenční analýza</translation> </message> <message> - <location filename="../mainvisual.cpp" line="285"/> + <location filename="../mainvisual.cpp" line="286"/> <source>Scope</source> <translation>Osciloskop</translation> </message> <message> - <location filename="../mainvisual.cpp" line="286"/> + <location filename="../mainvisual.cpp" line="287"/> <source>Off</source> <translation>Vypnuto</translation> </message> <message> - <location filename="../mainvisual.cpp" line="293"/> + <location filename="../mainvisual.cpp" line="294"/> <source>Analyzer Mode</source> <translation>Režim analýzy</translation> </message> <message> - <location filename="../mainvisual.cpp" line="296"/> + <location filename="../mainvisual.cpp" line="297"/> <source>Normal</source> <translation>Normální</translation> </message> <message> - <location filename="../mainvisual.cpp" line="297"/> + <location filename="../mainvisual.cpp" line="298"/> <source>Fire</source> <translation>Oheň</translation> </message> <message> - <location filename="../mainvisual.cpp" line="298"/> + <location filename="../mainvisual.cpp" line="299"/> <source>Vertical Lines</source> <translation>Sloupce</translation> </message> <message> - <location filename="../mainvisual.cpp" line="299"/> + <location filename="../mainvisual.cpp" line="300"/> <source>Lines</source> <translation>Úzké</translation> </message> <message> - <location filename="../mainvisual.cpp" line="300"/> + <location filename="../mainvisual.cpp" line="301"/> <source>Bars</source> <translation>Široké</translation> </message> <message> - <location filename="../mainvisual.cpp" line="313"/> + <location filename="../mainvisual.cpp" line="314"/> <source>Peaks</source> <translation>Špičky</translation> </message> <message> - <location filename="../mainvisual.cpp" line="317"/> + <location filename="../mainvisual.cpp" line="318"/> <source>Refresh Rate</source> <translation>Obnovovací frekvence</translation> </message> <message> - <location filename="../mainvisual.cpp" line="320"/> + <location filename="../mainvisual.cpp" line="321"/> <source>50 fps</source> <translation>50 Hz</translation> </message> <message> - <location filename="../mainvisual.cpp" line="321"/> + <location filename="../mainvisual.cpp" line="322"/> <source>25 fps</source> <translation>25 Hz</translation> </message> <message> - <location filename="../mainvisual.cpp" line="322"/> + <location filename="../mainvisual.cpp" line="323"/> <source>10 fps</source> <translation>10 Hz</translation> </message> <message> - <location filename="../mainvisual.cpp" line="323"/> + <location filename="../mainvisual.cpp" line="324"/> <source>5 fps</source> <translation>5 Hz</translation> </message> <message> - <location filename="../mainvisual.cpp" line="330"/> + <location filename="../mainvisual.cpp" line="331"/> <source>Analyzer Falloff</source> <translation>Pokles analyzátoru</translation> </message> <message> - <location filename="../mainvisual.cpp" line="333"/> - <location filename="../mainvisual.cpp" line="347"/> + <location filename="../mainvisual.cpp" line="334"/> + <location filename="../mainvisual.cpp" line="348"/> <source>Slowest</source> <translation>Nejpomalejší</translation> </message> <message> - <location filename="../mainvisual.cpp" line="334"/> - <location filename="../mainvisual.cpp" line="348"/> + <location filename="../mainvisual.cpp" line="335"/> + <location filename="../mainvisual.cpp" line="349"/> <source>Slow</source> <translation>Pomalý</translation> </message> <message> - <location filename="../mainvisual.cpp" line="335"/> - <location filename="../mainvisual.cpp" line="349"/> + <location filename="../mainvisual.cpp" line="336"/> + <location filename="../mainvisual.cpp" line="350"/> <source>Medium</source> <translation>Střední</translation> </message> <message> - <location filename="../mainvisual.cpp" line="336"/> - <location filename="../mainvisual.cpp" line="350"/> + <location filename="../mainvisual.cpp" line="337"/> + <location filename="../mainvisual.cpp" line="351"/> <source>Fast</source> <translation>Rychlý</translation> </message> <message> - <location filename="../mainvisual.cpp" line="337"/> - <location filename="../mainvisual.cpp" line="351"/> + <location filename="../mainvisual.cpp" line="338"/> + <location filename="../mainvisual.cpp" line="352"/> <source>Fastest</source> <translation>Nejrychlejší</translation> </message> <message> - <location filename="../mainvisual.cpp" line="344"/> + <location filename="../mainvisual.cpp" line="345"/> <source>Peaks Falloff</source> <translation>Pokles špiček</translation> </message> <message> - <location filename="../mainvisual.cpp" line="357"/> + <location filename="../mainvisual.cpp" line="358"/> <source>Background</source> <translation>Pozadí</translation> </message> <message> - <location filename="../mainvisual.cpp" line="358"/> + <location filename="../mainvisual.cpp" line="359"/> <source>Transparent</source> <translation>Průhledné</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts index 5f336053e..1fc2e2513 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts @@ -585,132 +585,132 @@ <context> <name>MainVisual</name> <message> - <location filename="../mainvisual.cpp" line="281"/> + <location filename="../mainvisual.cpp" line="282"/> <source>Visualization Mode</source> <translation>Visualisierungsmodus</translation> </message> <message> - <location filename="../mainvisual.cpp" line="284"/> + <location filename="../mainvisual.cpp" line="285"/> <source>Analyzer</source> <translation>Analyzer</translation> </message> <message> - <location filename="../mainvisual.cpp" line="285"/> + <location filename="../mainvisual.cpp" line="286"/> <source>Scope</source> <translation>Oszilloskop</translation> </message> <message> - <location filename="../mainvisual.cpp" line="286"/> + <location filename="../mainvisual.cpp" line="287"/> <source>Off</source> <translation>Aus</translation> </message> <message> - <location filename="../mainvisual.cpp" line="293"/> + <location filename="../mainvisual.cpp" line="294"/> <source>Analyzer Mode</source> <translation>Analyzer-Modus</translation> </message> <message> - <location filename="../mainvisual.cpp" line="296"/> + <location filename="../mainvisual.cpp" line="297"/> <source>Normal</source> <translation>Normal</translation> </message> <message> - <location filename="../mainvisual.cpp" line="297"/> + <location filename="../mainvisual.cpp" line="298"/> <source>Fire</source> <translation>Feuer</translation> </message> <message> - <location filename="../mainvisual.cpp" line="298"/> + <location filename="../mainvisual.cpp" line="299"/> <source>Vertical Lines</source> <translation>Vertikale Linien</translation> </message> <message> - <location filename="../mainvisual.cpp" line="299"/> + <location filename="../mainvisual.cpp" line="300"/> <source>Lines</source> <translation>Linien</translation> </message> <message> - <location filename="../mainvisual.cpp" line="300"/> + <location filename="../mainvisual.cpp" line="301"/> <source>Bars</source> <translation>Balken</translation> </message> <message> - <location filename="../mainvisual.cpp" line="313"/> + <location filename="../mainvisual.cpp" line="314"/> <source>Peaks</source> <translation>Spitzen</translation> </message> <message> - <location filename="../mainvisual.cpp" line="317"/> + <location filename="../mainvisual.cpp" line="318"/> <source>Refresh Rate</source> <translation>Wiederholfrequenz</translation> </message> <message> - <location filename="../mainvisual.cpp" line="320"/> + <location filename="../mainvisual.cpp" line="321"/> <source>50 fps</source> <translation>50 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="321"/> + <location filename="../mainvisual.cpp" line="322"/> <source>25 fps</source> <translation>25 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="322"/> + <location filename="../mainvisual.cpp" line="323"/> <source>10 fps</source> <translation>10 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="323"/> + <location filename="../mainvisual.cpp" line="324"/> <source>5 fps</source> <translation>5 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="330"/> + <location filename="../mainvisual.cpp" line="331"/> <source>Analyzer Falloff</source> <translation>Analyzer-Abfall</translation> </message> <message> - <location filename="../mainvisual.cpp" line="333"/> - <location filename="../mainvisual.cpp" line="347"/> + <location filename="../mainvisual.cpp" line="334"/> + <location filename="../mainvisual.cpp" line="348"/> <source>Slowest</source> <translation>Sehr langsam</translation> </message> <message> - <location filename="../mainvisual.cpp" line="334"/> - <location filename="../mainvisual.cpp" line="348"/> + <location filename="../mainvisual.cpp" line="335"/> + <location filename="../mainvisual.cpp" line="349"/> <source>Slow</source> <translation>Langsam</translation> </message> <message> - <location filename="../mainvisual.cpp" line="335"/> - <location filename="../mainvisual.cpp" line="349"/> + <location filename="../mainvisual.cpp" line="336"/> + <location filename="../mainvisual.cpp" line="350"/> <source>Medium</source> <translation>Mittel</translation> </message> <message> - <location filename="../mainvisual.cpp" line="336"/> - <location filename="../mainvisual.cpp" line="350"/> + <location filename="../mainvisual.cpp" line="337"/> + <location filename="../mainvisual.cpp" line="351"/> <source>Fast</source> <translation>Schnell</translation> </message> <message> - <location filename="../mainvisual.cpp" line="337"/> - <location filename="../mainvisual.cpp" line="351"/> + <location filename="../mainvisual.cpp" line="338"/> + <location filename="../mainvisual.cpp" line="352"/> <source>Fastest</source> <translation>Sehr schnell</translation> </message> <message> - <location filename="../mainvisual.cpp" line="344"/> + <location filename="../mainvisual.cpp" line="345"/> <source>Peaks Falloff</source> <translation>Abfallen der Spitzen</translation> </message> <message> - <location filename="../mainvisual.cpp" line="357"/> + <location filename="../mainvisual.cpp" line="358"/> <source>Background</source> <translation>Hintergrund</translation> </message> <message> - <location filename="../mainvisual.cpp" line="358"/> + <location filename="../mainvisual.cpp" line="359"/> <source>Transparent</source> <translation>Transparent</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts index 733e18fab..106d87059 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts @@ -585,132 +585,132 @@ <context> <name>MainVisual</name> <message> - <location filename="../mainvisual.cpp" line="281"/> + <location filename="../mainvisual.cpp" line="282"/> <source>Visualization Mode</source> <translation>Modo de visualización</translation> </message> <message> - <location filename="../mainvisual.cpp" line="284"/> + <location filename="../mainvisual.cpp" line="285"/> <source>Analyzer</source> <translation>Analizador</translation> </message> <message> - <location filename="../mainvisual.cpp" line="285"/> + <location filename="../mainvisual.cpp" line="286"/> <source>Scope</source> <translation>Osciloscopio</translation> </message> <message> - <location filename="../mainvisual.cpp" line="286"/> + <location filename="../mainvisual.cpp" line="287"/> <source>Off</source> <translation>Apagado</translation> </message> <message> - <location filename="../mainvisual.cpp" line="293"/> + <location filename="../mainvisual.cpp" line="294"/> <source>Analyzer Mode</source> <translation>Modo del analizador</translation> </message> <message> - <location filename="../mainvisual.cpp" line="296"/> + <location filename="../mainvisual.cpp" line="297"/> <source>Normal</source> <translation>Normal</translation> </message> <message> - <location filename="../mainvisual.cpp" line="297"/> + <location filename="../mainvisual.cpp" line="298"/> <source>Fire</source> <translation>Fuego</translation> </message> <message> - <location filename="../mainvisual.cpp" line="298"/> + <location filename="../mainvisual.cpp" line="299"/> <source>Vertical Lines</source> <translation>Líneas verticales</translation> </message> <message> - <location filename="../mainvisual.cpp" line="299"/> + <location filename="../mainvisual.cpp" line="300"/> <source>Lines</source> <translation>Líneas</translation> </message> <message> - <location filename="../mainvisual.cpp" line="300"/> + <location filename="../mainvisual.cpp" line="301"/> <source>Bars</source> <translation>Barras</translation> </message> <message> - <location filename="../mainvisual.cpp" line="313"/> + <location filename="../mainvisual.cpp" line="314"/> <source>Peaks</source> <translation>Picos</translation> </message> <message> - <location filename="../mainvisual.cpp" line="317"/> + <location filename="../mainvisual.cpp" line="318"/> <source>Refresh Rate</source> <translation>Velocidad de actualización</translation> </message> <message> - <location filename="../mainvisual.cpp" line="320"/> + <location filename="../mainvisual.cpp" line="321"/> <source>50 fps</source> <translation>50 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="321"/> + <location filename="../mainvisual.cpp" line="322"/> <source>25 fps</source> <translation>25 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="322"/> + <location filename="../mainvisual.cpp" line="323"/> <source>10 fps</source> <translation>10 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="323"/> + <location filename="../mainvisual.cpp" line="324"/> <source>5 fps</source> <translation>5 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="330"/> + <location filename="../mainvisual.cpp" line="331"/> <source>Analyzer Falloff</source> <translation>Caída del analizador</translation> </message> <message> - <location filename="../mainvisual.cpp" line="333"/> - <location filename="../mainvisual.cpp" line="347"/> + <location filename="../mainvisual.cpp" line="334"/> + <location filename="../mainvisual.cpp" line="348"/> <source>Slowest</source> <translation>Muy lenta</translation> </message> <message> - <location filename="../mainvisual.cpp" line="334"/> - <location filename="../mainvisual.cpp" line="348"/> + <location filename="../mainvisual.cpp" line="335"/> + <location filename="../mainvisual.cpp" line="349"/> <source>Slow</source> <translation>Lenta</translation> </message> <message> - <location filename="../mainvisual.cpp" line="335"/> - <location filename="../mainvisual.cpp" line="349"/> + <location filename="../mainvisual.cpp" line="336"/> + <location filename="../mainvisual.cpp" line="350"/> <source>Medium</source> <translation>Media</translation> </message> <message> - <location filename="../mainvisual.cpp" line="336"/> - <location filename="../mainvisual.cpp" line="350"/> + <location filename="../mainvisual.cpp" line="337"/> + <location filename="../mainvisual.cpp" line="351"/> <source>Fast</source> <translation>Rápida</translation> </message> <message> - <location filename="../mainvisual.cpp" line="337"/> - <location filename="../mainvisual.cpp" line="351"/> + <location filename="../mainvisual.cpp" line="338"/> + <location filename="../mainvisual.cpp" line="352"/> <source>Fastest</source> <translation>Muy rápida</translation> </message> <message> - <location filename="../mainvisual.cpp" line="344"/> + <location filename="../mainvisual.cpp" line="345"/> <source>Peaks Falloff</source> <translation>Caída de picos</translation> </message> <message> - <location filename="../mainvisual.cpp" line="357"/> + <location filename="../mainvisual.cpp" line="358"/> <source>Background</source> <translation>Fondo</translation> </message> <message> - <location filename="../mainvisual.cpp" line="358"/> + <location filename="../mainvisual.cpp" line="359"/> <source>Transparent</source> <translation>Transparente</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts index 26e367453..f7d5935a3 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts @@ -585,132 +585,132 @@ <context> <name>MainVisual</name> <message> - <location filename="../mainvisual.cpp" line="281"/> + <location filename="../mainvisual.cpp" line="282"/> <source>Visualization Mode</source> <translation>Vizualizációs mód</translation> </message> <message> - <location filename="../mainvisual.cpp" line="284"/> + <location filename="../mainvisual.cpp" line="285"/> <source>Analyzer</source> <translation>Analyzer</translation> </message> <message> - <location filename="../mainvisual.cpp" line="285"/> + <location filename="../mainvisual.cpp" line="286"/> <source>Scope</source> <translation>Scope</translation> </message> <message> - <location filename="../mainvisual.cpp" line="286"/> + <location filename="../mainvisual.cpp" line="287"/> <source>Off</source> <translation>Ki</translation> </message> <message> - <location filename="../mainvisual.cpp" line="293"/> + <location filename="../mainvisual.cpp" line="294"/> <source>Analyzer Mode</source> <translation>Analyzer mód</translation> </message> <message> - <location filename="../mainvisual.cpp" line="296"/> + <location filename="../mainvisual.cpp" line="297"/> <source>Normal</source> <translation>Hagyományos</translation> </message> <message> - <location filename="../mainvisual.cpp" line="297"/> + <location filename="../mainvisual.cpp" line="298"/> <source>Fire</source> <translation>Tűz</translation> </message> <message> - <location filename="../mainvisual.cpp" line="298"/> + <location filename="../mainvisual.cpp" line="299"/> <source>Vertical Lines</source> <translation>Függőleges vonalak</translation> </message> <message> - <location filename="../mainvisual.cpp" line="299"/> + <location filename="../mainvisual.cpp" line="300"/> <source>Lines</source> <translation>Vonalak</translation> </message> <message> - <location filename="../mainvisual.cpp" line="300"/> + <location filename="../mainvisual.cpp" line="301"/> <source>Bars</source> <translation>Csíkok</translation> </message> <message> - <location filename="../mainvisual.cpp" line="313"/> + <location filename="../mainvisual.cpp" line="314"/> <source>Peaks</source> <translation>Csúcsok</translation> </message> <message> - <location filename="../mainvisual.cpp" line="317"/> + <location filename="../mainvisual.cpp" line="318"/> <source>Refresh Rate</source> <translation>Ráta frissítése</translation> </message> <message> - <location filename="../mainvisual.cpp" line="320"/> + <location filename="../mainvisual.cpp" line="321"/> <source>50 fps</source> <translation>50 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="321"/> + <location filename="../mainvisual.cpp" line="322"/> <source>25 fps</source> <translation>25 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="322"/> + <location filename="../mainvisual.cpp" line="323"/> <source>10 fps</source> <translation>10 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="323"/> + <location filename="../mainvisual.cpp" line="324"/> <source>5 fps</source> <translation>5 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="330"/> + <location filename="../mainvisual.cpp" line="331"/> <source>Analyzer Falloff</source> <translation>Analízer esése</translation> </message> <message> - <location filename="../mainvisual.cpp" line="333"/> - <location filename="../mainvisual.cpp" line="347"/> + <location filename="../mainvisual.cpp" line="334"/> + <location filename="../mainvisual.cpp" line="348"/> <source>Slowest</source> <translation>Lassabb</translation> </message> <message> - <location filename="../mainvisual.cpp" line="334"/> - <location filename="../mainvisual.cpp" line="348"/> + <location filename="../mainvisual.cpp" line="335"/> + <location filename="../mainvisual.cpp" line="349"/> <source>Slow</source> <translation>Lassú</translation> </message> <message> - <location filename="../mainvisual.cpp" line="335"/> - <location filename="../mainvisual.cpp" line="349"/> + <location filename="../mainvisual.cpp" line="336"/> + <location filename="../mainvisual.cpp" line="350"/> <source>Medium</source> <translation>Közepes</translation> </message> <message> - <location filename="../mainvisual.cpp" line="336"/> - <location filename="../mainvisual.cpp" line="350"/> + <location filename="../mainvisual.cpp" line="337"/> + <location filename="../mainvisual.cpp" line="351"/> <source>Fast</source> <translation>Gyors</translation> </message> <message> - <location filename="../mainvisual.cpp" line="337"/> - <location filename="../mainvisual.cpp" line="351"/> + <location filename="../mainvisual.cpp" line="338"/> + <location filename="../mainvisual.cpp" line="352"/> <source>Fastest</source> <translation>Gyorsabb</translation> </message> <message> - <location filename="../mainvisual.cpp" line="344"/> + <location filename="../mainvisual.cpp" line="345"/> <source>Peaks Falloff</source> <translation>Csúcsok esése</translation> </message> <message> - <location filename="../mainvisual.cpp" line="357"/> + <location filename="../mainvisual.cpp" line="358"/> <source>Background</source> <translation>Háttér</translation> </message> <message> - <location filename="../mainvisual.cpp" line="358"/> + <location filename="../mainvisual.cpp" line="359"/> <source>Transparent</source> <translation>Átlátszóság</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts index 712309264..b4cdc23fc 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts @@ -585,132 +585,132 @@ <context> <name>MainVisual</name> <message> - <location filename="../mainvisual.cpp" line="281"/> + <location filename="../mainvisual.cpp" line="282"/> <source>Visualization Mode</source> <translation>Modo visualizzazione</translation> </message> <message> - <location filename="../mainvisual.cpp" line="284"/> + <location filename="../mainvisual.cpp" line="285"/> <source>Analyzer</source> <translation>Analizzatore</translation> </message> <message> - <location filename="../mainvisual.cpp" line="285"/> + <location filename="../mainvisual.cpp" line="286"/> <source>Scope</source> <translation>Oscilloscopio</translation> </message> <message> - <location filename="../mainvisual.cpp" line="286"/> + <location filename="../mainvisual.cpp" line="287"/> <source>Off</source> <translation>Chiudi</translation> </message> <message> - <location filename="../mainvisual.cpp" line="293"/> + <location filename="../mainvisual.cpp" line="294"/> <source>Analyzer Mode</source> <translation>Modo analizzatore</translation> </message> <message> - <location filename="../mainvisual.cpp" line="296"/> + <location filename="../mainvisual.cpp" line="297"/> <source>Normal</source> <translation>Normale</translation> </message> <message> - <location filename="../mainvisual.cpp" line="297"/> + <location filename="../mainvisual.cpp" line="298"/> <source>Fire</source> <translation>Fuoco</translation> </message> <message> - <location filename="../mainvisual.cpp" line="298"/> + <location filename="../mainvisual.cpp" line="299"/> <source>Vertical Lines</source> <translation>Linee verticali</translation> </message> <message> - <location filename="../mainvisual.cpp" line="299"/> + <location filename="../mainvisual.cpp" line="300"/> <source>Lines</source> <translation>Linee</translation> </message> <message> - <location filename="../mainvisual.cpp" line="300"/> + <location filename="../mainvisual.cpp" line="301"/> <source>Bars</source> <translation>Barre</translation> </message> <message> - <location filename="../mainvisual.cpp" line="313"/> + <location filename="../mainvisual.cpp" line="314"/> <source>Peaks</source> <translation>Picchi</translation> </message> <message> - <location filename="../mainvisual.cpp" line="317"/> + <location filename="../mainvisual.cpp" line="318"/> <source>Refresh Rate</source> <translation>Velocità di aggiornamento</translation> </message> <message> - <location filename="../mainvisual.cpp" line="320"/> + <location filename="../mainvisual.cpp" line="321"/> <source>50 fps</source> <translation>50 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="321"/> + <location filename="../mainvisual.cpp" line="322"/> <source>25 fps</source> <translation>25 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="322"/> + <location filename="../mainvisual.cpp" line="323"/> <source>10 fps</source> <translation>10 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="323"/> + <location filename="../mainvisual.cpp" line="324"/> <source>5 fps</source> <translation>5 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="330"/> + <location filename="../mainvisual.cpp" line="331"/> <source>Analyzer Falloff</source> <translation>Ricaduta analizzatore</translation> </message> <message> - <location filename="../mainvisual.cpp" line="333"/> - <location filename="../mainvisual.cpp" line="347"/> + <location filename="../mainvisual.cpp" line="334"/> + <location filename="../mainvisual.cpp" line="348"/> <source>Slowest</source> <translation>Molto lenta</translation> </message> <message> - <location filename="../mainvisual.cpp" line="334"/> - <location filename="../mainvisual.cpp" line="348"/> + <location filename="../mainvisual.cpp" line="335"/> + <location filename="../mainvisual.cpp" line="349"/> <source>Slow</source> <translation>Lenta</translation> </message> <message> - <location filename="../mainvisual.cpp" line="335"/> - <location filename="../mainvisual.cpp" line="349"/> + <location filename="../mainvisual.cpp" line="336"/> + <location filename="../mainvisual.cpp" line="350"/> <source>Medium</source> <translation>Media</translation> </message> <message> - <location filename="../mainvisual.cpp" line="336"/> - <location filename="../mainvisual.cpp" line="350"/> + <location filename="../mainvisual.cpp" line="337"/> + <location filename="../mainvisual.cpp" line="351"/> <source>Fast</source> <translation>Rapida</translation> </message> <message> - <location filename="../mainvisual.cpp" line="337"/> - <location filename="../mainvisual.cpp" line="351"/> + <location filename="../mainvisual.cpp" line="338"/> + <location filename="../mainvisual.cpp" line="352"/> <source>Fastest</source> <translation>Molto veloce</translation> </message> <message> - <location filename="../mainvisual.cpp" line="344"/> + <location filename="../mainvisual.cpp" line="345"/> <source>Peaks Falloff</source> <translation>Ricadua picchi</translation> </message> <message> - <location filename="../mainvisual.cpp" line="357"/> + <location filename="../mainvisual.cpp" line="358"/> <source>Background</source> <translation>Sfondo</translation> </message> <message> - <location filename="../mainvisual.cpp" line="358"/> + <location filename="../mainvisual.cpp" line="359"/> <source>Transparent</source> <translation>Transparente</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts index e957780d3..da1b5d6d7 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts @@ -585,132 +585,132 @@ <context> <name>MainVisual</name> <message> - <location filename="../mainvisual.cpp" line="281"/> + <location filename="../mainvisual.cpp" line="282"/> <source>Visualization Mode</source> <translation>視覚効果モード</translation> </message> <message> - <location filename="../mainvisual.cpp" line="284"/> + <location filename="../mainvisual.cpp" line="285"/> <source>Analyzer</source> <translation>スペクトルアナライザ</translation> </message> <message> - <location filename="../mainvisual.cpp" line="285"/> + <location filename="../mainvisual.cpp" line="286"/> <source>Scope</source> <translation>オシロスコープ</translation> </message> <message> - <location filename="../mainvisual.cpp" line="286"/> + <location filename="../mainvisual.cpp" line="287"/> <source>Off</source> <translation>使わない</translation> </message> <message> - <location filename="../mainvisual.cpp" line="293"/> + <location filename="../mainvisual.cpp" line="294"/> <source>Analyzer Mode</source> <translation>アナライザモード</translation> </message> <message> - <location filename="../mainvisual.cpp" line="296"/> + <location filename="../mainvisual.cpp" line="297"/> <source>Normal</source> <translation>通常</translation> </message> <message> - <location filename="../mainvisual.cpp" line="297"/> + <location filename="../mainvisual.cpp" line="298"/> <source>Fire</source> <translation>炎</translation> </message> <message> - <location filename="../mainvisual.cpp" line="298"/> + <location filename="../mainvisual.cpp" line="299"/> <source>Vertical Lines</source> <translation>線</translation> </message> <message> - <location filename="../mainvisual.cpp" line="299"/> + <location filename="../mainvisual.cpp" line="300"/> <source>Lines</source> <translation>線</translation> </message> <message> - <location filename="../mainvisual.cpp" line="300"/> + <location filename="../mainvisual.cpp" line="301"/> <source>Bars</source> <translation>点</translation> </message> <message> - <location filename="../mainvisual.cpp" line="313"/> + <location filename="../mainvisual.cpp" line="314"/> <source>Peaks</source> <translation>ピーク表示</translation> </message> <message> - <location filename="../mainvisual.cpp" line="317"/> + <location filename="../mainvisual.cpp" line="318"/> <source>Refresh Rate</source> <translation>再描画の頻度</translation> </message> <message> - <location filename="../mainvisual.cpp" line="320"/> + <location filename="../mainvisual.cpp" line="321"/> <source>50 fps</source> <translation>50 フレーム毎秒</translation> </message> <message> - <location filename="../mainvisual.cpp" line="321"/> + <location filename="../mainvisual.cpp" line="322"/> <source>25 fps</source> <translation>25 フレーム毎秒</translation> </message> <message> - <location filename="../mainvisual.cpp" line="322"/> + <location filename="../mainvisual.cpp" line="323"/> <source>10 fps</source> <translation>10 フレーム毎秒</translation> </message> <message> - <location filename="../mainvisual.cpp" line="323"/> + <location filename="../mainvisual.cpp" line="324"/> <source>5 fps</source> <translation>5 フレーム毎秒</translation> </message> <message> - <location filename="../mainvisual.cpp" line="330"/> + <location filename="../mainvisual.cpp" line="331"/> <source>Analyzer Falloff</source> <translation>アナライザ減衰速度</translation> </message> <message> - <location filename="../mainvisual.cpp" line="333"/> - <location filename="../mainvisual.cpp" line="347"/> + <location filename="../mainvisual.cpp" line="334"/> + <location filename="../mainvisual.cpp" line="348"/> <source>Slowest</source> <translation>さらに遅く</translation> </message> <message> - <location filename="../mainvisual.cpp" line="334"/> - <location filename="../mainvisual.cpp" line="348"/> + <location filename="../mainvisual.cpp" line="335"/> + <location filename="../mainvisual.cpp" line="349"/> <source>Slow</source> <translation>遅く</translation> </message> <message> - <location filename="../mainvisual.cpp" line="335"/> - <location filename="../mainvisual.cpp" line="349"/> + <location filename="../mainvisual.cpp" line="336"/> + <location filename="../mainvisual.cpp" line="350"/> <source>Medium</source> <translation>適度</translation> </message> <message> - <location filename="../mainvisual.cpp" line="336"/> - <location filename="../mainvisual.cpp" line="350"/> + <location filename="../mainvisual.cpp" line="337"/> + <location filename="../mainvisual.cpp" line="351"/> <source>Fast</source> <translation>速く</translation> </message> <message> - <location filename="../mainvisual.cpp" line="337"/> - <location filename="../mainvisual.cpp" line="351"/> + <location filename="../mainvisual.cpp" line="338"/> + <location filename="../mainvisual.cpp" line="352"/> <source>Fastest</source> <translation>さらに速く</translation> </message> <message> - <location filename="../mainvisual.cpp" line="344"/> + <location filename="../mainvisual.cpp" line="345"/> <source>Peaks Falloff</source> <translation>ピーク減衰速度</translation> </message> <message> - <location filename="../mainvisual.cpp" line="357"/> + <location filename="../mainvisual.cpp" line="358"/> <source>Background</source> <translation>背景</translation> </message> <message> - <location filename="../mainvisual.cpp" line="358"/> + <location filename="../mainvisual.cpp" line="359"/> <source>Transparent</source> <translation>透過させる</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts index 45788ee26..24e8e2f8e 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts @@ -586,132 +586,132 @@ <context> <name>MainVisual</name> <message> - <location filename="../mainvisual.cpp" line="281"/> + <location filename="../mainvisual.cpp" line="282"/> <source>Visualization Mode</source> <translation>Vizualizacijos metodas</translation> </message> <message> - <location filename="../mainvisual.cpp" line="284"/> + <location filename="../mainvisual.cpp" line="285"/> <source>Analyzer</source> <translation>Analizatorius</translation> </message> <message> - <location filename="../mainvisual.cpp" line="285"/> + <location filename="../mainvisual.cpp" line="286"/> <source>Scope</source> <translation>Scope</translation> </message> <message> - <location filename="../mainvisual.cpp" line="286"/> + <location filename="../mainvisual.cpp" line="287"/> <source>Off</source> <translation>Išjungta</translation> </message> <message> - <location filename="../mainvisual.cpp" line="293"/> + <location filename="../mainvisual.cpp" line="294"/> <source>Analyzer Mode</source> <translation>Analizatoriaus metodas</translation> </message> <message> - <location filename="../mainvisual.cpp" line="296"/> + <location filename="../mainvisual.cpp" line="297"/> <source>Normal</source> <translation>Įprastinis</translation> </message> <message> - <location filename="../mainvisual.cpp" line="297"/> + <location filename="../mainvisual.cpp" line="298"/> <source>Fire</source> <translation>Ugnis</translation> </message> <message> - <location filename="../mainvisual.cpp" line="298"/> + <location filename="../mainvisual.cpp" line="299"/> <source>Vertical Lines</source> <translation>Vertikalios linijos</translation> </message> <message> - <location filename="../mainvisual.cpp" line="299"/> + <location filename="../mainvisual.cpp" line="300"/> <source>Lines</source> <translation>Linijos</translation> </message> <message> - <location filename="../mainvisual.cpp" line="300"/> + <location filename="../mainvisual.cpp" line="301"/> <source>Bars</source> <translation>Bangos</translation> </message> <message> - <location filename="../mainvisual.cpp" line="313"/> + <location filename="../mainvisual.cpp" line="314"/> <source>Peaks</source> <translation>Pikai</translation> </message> <message> - <location filename="../mainvisual.cpp" line="317"/> + <location filename="../mainvisual.cpp" line="318"/> <source>Refresh Rate</source> <translation>Atnaujinimo dažnumas</translation> </message> <message> - <location filename="../mainvisual.cpp" line="320"/> + <location filename="../mainvisual.cpp" line="321"/> <source>50 fps</source> <translation>50 kps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="321"/> + <location filename="../mainvisual.cpp" line="322"/> <source>25 fps</source> <translation>25 kps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="322"/> + <location filename="../mainvisual.cpp" line="323"/> <source>10 fps</source> <translation>10 kps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="323"/> + <location filename="../mainvisual.cpp" line="324"/> <source>5 fps</source> <translation>5 kps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="330"/> + <location filename="../mainvisual.cpp" line="331"/> <source>Analyzer Falloff</source> <translation>Analyzer Falloff</translation> </message> <message> - <location filename="../mainvisual.cpp" line="333"/> - <location filename="../mainvisual.cpp" line="347"/> + <location filename="../mainvisual.cpp" line="334"/> + <location filename="../mainvisual.cpp" line="348"/> <source>Slowest</source> <translation>Lėčiausias</translation> </message> <message> - <location filename="../mainvisual.cpp" line="334"/> - <location filename="../mainvisual.cpp" line="348"/> + <location filename="../mainvisual.cpp" line="335"/> + <location filename="../mainvisual.cpp" line="349"/> <source>Slow</source> <translation>Lėtas</translation> </message> <message> - <location filename="../mainvisual.cpp" line="335"/> - <location filename="../mainvisual.cpp" line="349"/> + <location filename="../mainvisual.cpp" line="336"/> + <location filename="../mainvisual.cpp" line="350"/> <source>Medium</source> <translation>Vidutinis</translation> </message> <message> - <location filename="../mainvisual.cpp" line="336"/> - <location filename="../mainvisual.cpp" line="350"/> + <location filename="../mainvisual.cpp" line="337"/> + <location filename="../mainvisual.cpp" line="351"/> <source>Fast</source> <translation>Greitas</translation> </message> <message> - <location filename="../mainvisual.cpp" line="337"/> - <location filename="../mainvisual.cpp" line="351"/> + <location filename="../mainvisual.cpp" line="338"/> + <location filename="../mainvisual.cpp" line="352"/> <source>Fastest</source> <translation>Greičiausias</translation> </message> <message> - <location filename="../mainvisual.cpp" line="344"/> + <location filename="../mainvisual.cpp" line="345"/> <source>Peaks Falloff</source> <translation>Peaks Falloff</translation> </message> <message> - <location filename="../mainvisual.cpp" line="357"/> + <location filename="../mainvisual.cpp" line="358"/> <source>Background</source> <translation>Fonas</translation> </message> <message> - <location filename="../mainvisual.cpp" line="358"/> + <location filename="../mainvisual.cpp" line="359"/> <source>Transparent</source> <translation>Permatomumas</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts index 046c8fd2f..9d2177733 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts @@ -585,132 +585,132 @@ <context> <name>MainVisual</name> <message> - <location filename="../mainvisual.cpp" line="281"/> + <location filename="../mainvisual.cpp" line="282"/> <source>Visualization Mode</source> <translation>Visualisatiestand</translation> </message> <message> - <location filename="../mainvisual.cpp" line="284"/> + <location filename="../mainvisual.cpp" line="285"/> <source>Analyzer</source> <translation>Analysator</translation> </message> <message> - <location filename="../mainvisual.cpp" line="285"/> + <location filename="../mainvisual.cpp" line="286"/> <source>Scope</source> <translation>Scoop</translation> </message> <message> - <location filename="../mainvisual.cpp" line="286"/> + <location filename="../mainvisual.cpp" line="287"/> <source>Off</source> <translation>Uit</translation> </message> <message> - <location filename="../mainvisual.cpp" line="293"/> + <location filename="../mainvisual.cpp" line="294"/> <source>Analyzer Mode</source> <translation>Analysatorstand</translation> </message> <message> - <location filename="../mainvisual.cpp" line="296"/> + <location filename="../mainvisual.cpp" line="297"/> <source>Normal</source> <translation>Normaal</translation> </message> <message> - <location filename="../mainvisual.cpp" line="297"/> + <location filename="../mainvisual.cpp" line="298"/> <source>Fire</source> <translation>Vuur</translation> </message> <message> - <location filename="../mainvisual.cpp" line="298"/> + <location filename="../mainvisual.cpp" line="299"/> <source>Vertical Lines</source> <translation>Verticale Lijnen</translation> </message> <message> - <location filename="../mainvisual.cpp" line="299"/> + <location filename="../mainvisual.cpp" line="300"/> <source>Lines</source> <translation>Lijnen</translation> </message> <message> - <location filename="../mainvisual.cpp" line="300"/> + <location filename="../mainvisual.cpp" line="301"/> <source>Bars</source> <translation>Strepen</translation> </message> <message> - <location filename="../mainvisual.cpp" line="313"/> + <location filename="../mainvisual.cpp" line="314"/> <source>Peaks</source> <translation>Toppen</translation> </message> <message> - <location filename="../mainvisual.cpp" line="317"/> + <location filename="../mainvisual.cpp" line="318"/> <source>Refresh Rate</source> <translation>Vernieuw Frequentie</translation> </message> <message> - <location filename="../mainvisual.cpp" line="320"/> + <location filename="../mainvisual.cpp" line="321"/> <source>50 fps</source> <translation>50 Hz</translation> </message> <message> - <location filename="../mainvisual.cpp" line="321"/> + <location filename="../mainvisual.cpp" line="322"/> <source>25 fps</source> <translation>25 Hz</translation> </message> <message> - <location filename="../mainvisual.cpp" line="322"/> + <location filename="../mainvisual.cpp" line="323"/> <source>10 fps</source> <translation>10 Hz</translation> </message> <message> - <location filename="../mainvisual.cpp" line="323"/> + <location filename="../mainvisual.cpp" line="324"/> <source>5 fps</source> <translation>5 Hz</translation> </message> <message> - <location filename="../mainvisual.cpp" line="330"/> + <location filename="../mainvisual.cpp" line="331"/> <source>Analyzer Falloff</source> <translation>Analysator Uitval</translation> </message> <message> - <location filename="../mainvisual.cpp" line="333"/> - <location filename="../mainvisual.cpp" line="347"/> + <location filename="../mainvisual.cpp" line="334"/> + <location filename="../mainvisual.cpp" line="348"/> <source>Slowest</source> <translation>Traagst</translation> </message> <message> - <location filename="../mainvisual.cpp" line="334"/> - <location filename="../mainvisual.cpp" line="348"/> + <location filename="../mainvisual.cpp" line="335"/> + <location filename="../mainvisual.cpp" line="349"/> <source>Slow</source> <translation>Traag</translation> </message> <message> - <location filename="../mainvisual.cpp" line="335"/> - <location filename="../mainvisual.cpp" line="349"/> + <location filename="../mainvisual.cpp" line="336"/> + <location filename="../mainvisual.cpp" line="350"/> <source>Medium</source> <translation>Normaal</translation> </message> <message> - <location filename="../mainvisual.cpp" line="336"/> - <location filename="../mainvisual.cpp" line="350"/> + <location filename="../mainvisual.cpp" line="337"/> + <location filename="../mainvisual.cpp" line="351"/> <source>Fast</source> <translation>Snel</translation> </message> <message> - <location filename="../mainvisual.cpp" line="337"/> - <location filename="../mainvisual.cpp" line="351"/> + <location filename="../mainvisual.cpp" line="338"/> + <location filename="../mainvisual.cpp" line="352"/> <source>Fastest</source> <translation>Snelst</translation> </message> <message> - <location filename="../mainvisual.cpp" line="344"/> + <location filename="../mainvisual.cpp" line="345"/> <source>Peaks Falloff</source> <translation>Toppen Uitval</translation> </message> <message> - <location filename="../mainvisual.cpp" line="357"/> + <location filename="../mainvisual.cpp" line="358"/> <source>Background</source> <translation>Achtergrond</translation> </message> <message> - <location filename="../mainvisual.cpp" line="358"/> + <location filename="../mainvisual.cpp" line="359"/> <source>Transparent</source> <translation>Transparantie</translation> </message> 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 20706b8dc..66eeeeac3 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts @@ -585,132 +585,132 @@ <context> <name>MainVisual</name> <message> - <location filename="../mainvisual.cpp" line="281"/> + <location filename="../mainvisual.cpp" line="282"/> <source>Visualization Mode</source> <translation>Tryb wizualizacji</translation> </message> <message> - <location filename="../mainvisual.cpp" line="284"/> + <location filename="../mainvisual.cpp" line="285"/> <source>Analyzer</source> <translation>Analizator</translation> </message> <message> - <location filename="../mainvisual.cpp" line="285"/> + <location filename="../mainvisual.cpp" line="286"/> <source>Scope</source> <translation></translation> </message> <message> - <location filename="../mainvisual.cpp" line="286"/> + <location filename="../mainvisual.cpp" line="287"/> <source>Off</source> <translation>Wyłączone</translation> </message> <message> - <location filename="../mainvisual.cpp" line="293"/> + <location filename="../mainvisual.cpp" line="294"/> <source>Analyzer Mode</source> <translation>Tryb Analizatora</translation> </message> <message> - <location filename="../mainvisual.cpp" line="296"/> + <location filename="../mainvisual.cpp" line="297"/> <source>Normal</source> <translation>Normalny</translation> </message> <message> - <location filename="../mainvisual.cpp" line="297"/> + <location filename="../mainvisual.cpp" line="298"/> <source>Fire</source> <translation>Ogień</translation> </message> <message> - <location filename="../mainvisual.cpp" line="298"/> + <location filename="../mainvisual.cpp" line="299"/> <source>Vertical Lines</source> <translation>Pionowe Linie</translation> </message> <message> - <location filename="../mainvisual.cpp" line="299"/> + <location filename="../mainvisual.cpp" line="300"/> <source>Lines</source> <translation>Linie</translation> </message> <message> - <location filename="../mainvisual.cpp" line="300"/> + <location filename="../mainvisual.cpp" line="301"/> <source>Bars</source> <translation>Słupki</translation> </message> <message> - <location filename="../mainvisual.cpp" line="313"/> + <location filename="../mainvisual.cpp" line="314"/> <source>Peaks</source> <translation>Piki</translation> </message> <message> - <location filename="../mainvisual.cpp" line="317"/> + <location filename="../mainvisual.cpp" line="318"/> <source>Refresh Rate</source> <translation>Odświeżanie</translation> </message> <message> - <location filename="../mainvisual.cpp" line="320"/> + <location filename="../mainvisual.cpp" line="321"/> <source>50 fps</source> <translation></translation> </message> <message> - <location filename="../mainvisual.cpp" line="321"/> + <location filename="../mainvisual.cpp" line="322"/> <source>25 fps</source> <translation></translation> </message> <message> - <location filename="../mainvisual.cpp" line="322"/> + <location filename="../mainvisual.cpp" line="323"/> <source>10 fps</source> <translation></translation> </message> <message> - <location filename="../mainvisual.cpp" line="323"/> + <location filename="../mainvisual.cpp" line="324"/> <source>5 fps</source> <translation></translation> </message> <message> - <location filename="../mainvisual.cpp" line="330"/> + <location filename="../mainvisual.cpp" line="331"/> <source>Analyzer Falloff</source> <translation>Prędkość Analizatora</translation> </message> <message> - <location filename="../mainvisual.cpp" line="333"/> - <location filename="../mainvisual.cpp" line="347"/> + <location filename="../mainvisual.cpp" line="334"/> + <location filename="../mainvisual.cpp" line="348"/> <source>Slowest</source> <translation>Najwolniej</translation> </message> <message> - <location filename="../mainvisual.cpp" line="334"/> - <location filename="../mainvisual.cpp" line="348"/> + <location filename="../mainvisual.cpp" line="335"/> + <location filename="../mainvisual.cpp" line="349"/> <source>Slow</source> <translation>Wolno</translation> </message> <message> - <location filename="../mainvisual.cpp" line="335"/> - <location filename="../mainvisual.cpp" line="349"/> + <location filename="../mainvisual.cpp" line="336"/> + <location filename="../mainvisual.cpp" line="350"/> <source>Medium</source> <translation>Średnio</translation> </message> <message> - <location filename="../mainvisual.cpp" line="336"/> - <location filename="../mainvisual.cpp" line="350"/> + <location filename="../mainvisual.cpp" line="337"/> + <location filename="../mainvisual.cpp" line="351"/> <source>Fast</source> <translation>Szybko</translation> </message> <message> - <location filename="../mainvisual.cpp" line="337"/> - <location filename="../mainvisual.cpp" line="351"/> + <location filename="../mainvisual.cpp" line="338"/> + <location filename="../mainvisual.cpp" line="352"/> <source>Fastest</source> <translation>Najszybciej</translation> </message> <message> - <location filename="../mainvisual.cpp" line="344"/> + <location filename="../mainvisual.cpp" line="345"/> <source>Peaks Falloff</source> <translation>Opadanie Pików</translation> </message> <message> - <location filename="../mainvisual.cpp" line="357"/> + <location filename="../mainvisual.cpp" line="358"/> <source>Background</source> <translation>Tło</translation> </message> <message> - <location filename="../mainvisual.cpp" line="358"/> + <location filename="../mainvisual.cpp" line="359"/> <source>Transparent</source> <translation>Przezroczystość</translation> </message> 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 9c0d44483..151558b08 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts @@ -585,132 +585,132 @@ <context> <name>MainVisual</name> <message> - <location filename="../mainvisual.cpp" line="281"/> + <location filename="../mainvisual.cpp" line="282"/> <source>Visualization Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="284"/> + <location filename="../mainvisual.cpp" line="285"/> <source>Analyzer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="285"/> + <location filename="../mainvisual.cpp" line="286"/> <source>Scope</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="286"/> + <location filename="../mainvisual.cpp" line="287"/> <source>Off</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="293"/> + <location filename="../mainvisual.cpp" line="294"/> <source>Analyzer Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="296"/> + <location filename="../mainvisual.cpp" line="297"/> <source>Normal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="297"/> + <location filename="../mainvisual.cpp" line="298"/> <source>Fire</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="298"/> + <location filename="../mainvisual.cpp" line="299"/> <source>Vertical Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="299"/> + <location filename="../mainvisual.cpp" line="300"/> <source>Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="300"/> + <location filename="../mainvisual.cpp" line="301"/> <source>Bars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="313"/> + <location filename="../mainvisual.cpp" line="314"/> <source>Peaks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="317"/> + <location filename="../mainvisual.cpp" line="318"/> <source>Refresh Rate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="320"/> + <location filename="../mainvisual.cpp" line="321"/> <source>50 fps</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="321"/> + <location filename="../mainvisual.cpp" line="322"/> <source>25 fps</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="322"/> + <location filename="../mainvisual.cpp" line="323"/> <source>10 fps</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="323"/> + <location filename="../mainvisual.cpp" line="324"/> <source>5 fps</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="330"/> + <location filename="../mainvisual.cpp" line="331"/> <source>Analyzer Falloff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="333"/> - <location filename="../mainvisual.cpp" line="347"/> - <source>Slowest</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../mainvisual.cpp" line="334"/> <location filename="../mainvisual.cpp" line="348"/> - <source>Slow</source> + <source>Slowest</source> <translation type="unfinished"></translation> </message> <message> <location filename="../mainvisual.cpp" line="335"/> <location filename="../mainvisual.cpp" line="349"/> - <source>Medium</source> + <source>Slow</source> <translation type="unfinished"></translation> </message> <message> <location filename="../mainvisual.cpp" line="336"/> <location filename="../mainvisual.cpp" line="350"/> - <source>Fast</source> + <source>Medium</source> <translation type="unfinished"></translation> </message> <message> <location filename="../mainvisual.cpp" line="337"/> <location filename="../mainvisual.cpp" line="351"/> + <source>Fast</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../mainvisual.cpp" line="338"/> + <location filename="../mainvisual.cpp" line="352"/> <source>Fastest</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="344"/> + <location filename="../mainvisual.cpp" line="345"/> <source>Peaks Falloff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="357"/> + <location filename="../mainvisual.cpp" line="358"/> <source>Background</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="358"/> + <location filename="../mainvisual.cpp" line="359"/> <source>Transparent</source> <translation type="unfinished"></translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts index ff749eb56..7e28d95c6 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts @@ -585,132 +585,132 @@ <context> <name>MainVisual</name> <message> - <location filename="../mainvisual.cpp" line="281"/> + <location filename="../mainvisual.cpp" line="282"/> <source>Visualization Mode</source> <translation>Режим визуализации</translation> </message> <message> - <location filename="../mainvisual.cpp" line="284"/> + <location filename="../mainvisual.cpp" line="285"/> <source>Analyzer</source> <translation>Анализатор</translation> </message> <message> - <location filename="../mainvisual.cpp" line="285"/> + <location filename="../mainvisual.cpp" line="286"/> <source>Scope</source> <translation>Осциллограф</translation> </message> <message> - <location filename="../mainvisual.cpp" line="286"/> + <location filename="../mainvisual.cpp" line="287"/> <source>Off</source> <translation>Выключено</translation> </message> <message> - <location filename="../mainvisual.cpp" line="293"/> + <location filename="../mainvisual.cpp" line="294"/> <source>Analyzer Mode</source> <translation>Режим анализатора</translation> </message> <message> - <location filename="../mainvisual.cpp" line="296"/> + <location filename="../mainvisual.cpp" line="297"/> <source>Normal</source> <translation>Обычный</translation> </message> <message> - <location filename="../mainvisual.cpp" line="297"/> + <location filename="../mainvisual.cpp" line="298"/> <source>Fire</source> <translation>Огонь</translation> </message> <message> - <location filename="../mainvisual.cpp" line="298"/> + <location filename="../mainvisual.cpp" line="299"/> <source>Vertical Lines</source> <translation>Вертикальные линии</translation> </message> <message> - <location filename="../mainvisual.cpp" line="299"/> + <location filename="../mainvisual.cpp" line="300"/> <source>Lines</source> <translation>Линии</translation> </message> <message> - <location filename="../mainvisual.cpp" line="300"/> + <location filename="../mainvisual.cpp" line="301"/> <source>Bars</source> <translation>Полоски</translation> </message> <message> - <location filename="../mainvisual.cpp" line="313"/> + <location filename="../mainvisual.cpp" line="314"/> <source>Peaks</source> <translation>Пики</translation> </message> <message> - <location filename="../mainvisual.cpp" line="317"/> + <location filename="../mainvisual.cpp" line="318"/> <source>Refresh Rate</source> <translation>Частота обновления</translation> </message> <message> - <location filename="../mainvisual.cpp" line="320"/> + <location filename="../mainvisual.cpp" line="321"/> <source>50 fps</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="321"/> + <location filename="../mainvisual.cpp" line="322"/> <source>25 fps</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="322"/> + <location filename="../mainvisual.cpp" line="323"/> <source>10 fps</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="323"/> + <location filename="../mainvisual.cpp" line="324"/> <source>5 fps</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mainvisual.cpp" line="330"/> + <location filename="../mainvisual.cpp" line="331"/> <source>Analyzer Falloff</source> <translation>Падение анализатора</translation> </message> <message> - <location filename="../mainvisual.cpp" line="333"/> - <location filename="../mainvisual.cpp" line="347"/> + <location filename="../mainvisual.cpp" line="334"/> + <location filename="../mainvisual.cpp" line="348"/> <source>Slowest</source> <translation>Самое медленное</translation> </message> <message> - <location filename="../mainvisual.cpp" line="334"/> - <location filename="../mainvisual.cpp" line="348"/> + <location filename="../mainvisual.cpp" line="335"/> + <location filename="../mainvisual.cpp" line="349"/> <source>Slow</source> <translation>Медленное</translation> </message> <message> - <location filename="../mainvisual.cpp" line="335"/> - <location filename="../mainvisual.cpp" line="349"/> + <location filename="../mainvisual.cpp" line="336"/> + <location filename="../mainvisual.cpp" line="350"/> <source>Medium</source> <translation>Среднее</translation> </message> <message> - <location filename="../mainvisual.cpp" line="336"/> - <location filename="../mainvisual.cpp" line="350"/> + <location filename="../mainvisual.cpp" line="337"/> + <location filename="../mainvisual.cpp" line="351"/> <source>Fast</source> <translation>Быстрое</translation> </message> <message> - <location filename="../mainvisual.cpp" line="337"/> - <location filename="../mainvisual.cpp" line="351"/> + <location filename="../mainvisual.cpp" line="338"/> + <location filename="../mainvisual.cpp" line="352"/> <source>Fastest</source> <translation>Самое быстрое</translation> </message> <message> - <location filename="../mainvisual.cpp" line="344"/> + <location filename="../mainvisual.cpp" line="345"/> <source>Peaks Falloff</source> <translation>Падение пиков</translation> </message> <message> - <location filename="../mainvisual.cpp" line="357"/> + <location filename="../mainvisual.cpp" line="358"/> <source>Background</source> <translation>Фон</translation> </message> <message> - <location filename="../mainvisual.cpp" line="358"/> + <location filename="../mainvisual.cpp" line="359"/> <source>Transparent</source> <translation>Прозрачность</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts index 97e8b228b..2f453f2a9 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts @@ -585,132 +585,132 @@ <context> <name>MainVisual</name> <message> - <location filename="../mainvisual.cpp" line="281"/> + <location filename="../mainvisual.cpp" line="282"/> <source>Visualization Mode</source> <translation>Režim vizualizácií</translation> </message> <message> - <location filename="../mainvisual.cpp" line="284"/> + <location filename="../mainvisual.cpp" line="285"/> <source>Analyzer</source> <translation>Analyzér</translation> </message> <message> - <location filename="../mainvisual.cpp" line="285"/> + <location filename="../mainvisual.cpp" line="286"/> <source>Scope</source> <translation>Osciloskop</translation> </message> <message> - <location filename="../mainvisual.cpp" line="286"/> + <location filename="../mainvisual.cpp" line="287"/> <source>Off</source> <translation>Vypnuté</translation> </message> <message> - <location filename="../mainvisual.cpp" line="293"/> + <location filename="../mainvisual.cpp" line="294"/> <source>Analyzer Mode</source> <translation>Režim analyzéra</translation> </message> <message> - <location filename="../mainvisual.cpp" line="296"/> + <location filename="../mainvisual.cpp" line="297"/> <source>Normal</source> <translation>Normálny</translation> </message> <message> - <location filename="../mainvisual.cpp" line="297"/> + <location filename="../mainvisual.cpp" line="298"/> <source>Fire</source> <translation>Oheň</translation> </message> <message> - <location filename="../mainvisual.cpp" line="298"/> + <location filename="../mainvisual.cpp" line="299"/> <source>Vertical Lines</source> <translation>Stĺpce</translation> </message> <message> - <location filename="../mainvisual.cpp" line="299"/> + <location filename="../mainvisual.cpp" line="300"/> <source>Lines</source> <translation>Čiary</translation> </message> <message> - <location filename="../mainvisual.cpp" line="300"/> + <location filename="../mainvisual.cpp" line="301"/> <source>Bars</source> <translation>Prúžky</translation> </message> <message> - <location filename="../mainvisual.cpp" line="313"/> + <location filename="../mainvisual.cpp" line="314"/> <source>Peaks</source> <translation>Špičky</translation> </message> <message> - <location filename="../mainvisual.cpp" line="317"/> + <location filename="../mainvisual.cpp" line="318"/> <source>Refresh Rate</source> <translation>Obnovovacia frekvencia</translation> </message> <message> - <location filename="../mainvisual.cpp" line="320"/> + <location filename="../mainvisual.cpp" line="321"/> <source>50 fps</source> <translation>50 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="321"/> + <location filename="../mainvisual.cpp" line="322"/> <source>25 fps</source> <translation>25 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="322"/> + <location filename="../mainvisual.cpp" line="323"/> <source>10 fps</source> <translation>10 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="323"/> + <location filename="../mainvisual.cpp" line="324"/> <source>5 fps</source> <translation>5 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="330"/> + <location filename="../mainvisual.cpp" line="331"/> <source>Analyzer Falloff</source> <translation>Pokles analyzéra</translation> </message> <message> - <location filename="../mainvisual.cpp" line="333"/> - <location filename="../mainvisual.cpp" line="347"/> + <location filename="../mainvisual.cpp" line="334"/> + <location filename="../mainvisual.cpp" line="348"/> <source>Slowest</source> <translation>Najpomaljšie</translation> </message> <message> - <location filename="../mainvisual.cpp" line="334"/> - <location filename="../mainvisual.cpp" line="348"/> + <location filename="../mainvisual.cpp" line="335"/> + <location filename="../mainvisual.cpp" line="349"/> <source>Slow</source> <translation>Pomaly</translation> </message> <message> - <location filename="../mainvisual.cpp" line="335"/> - <location filename="../mainvisual.cpp" line="349"/> + <location filename="../mainvisual.cpp" line="336"/> + <location filename="../mainvisual.cpp" line="350"/> <source>Medium</source> <translation>Stredne</translation> </message> <message> - <location filename="../mainvisual.cpp" line="336"/> - <location filename="../mainvisual.cpp" line="350"/> + <location filename="../mainvisual.cpp" line="337"/> + <location filename="../mainvisual.cpp" line="351"/> <source>Fast</source> <translation>Rýchlo</translation> </message> <message> - <location filename="../mainvisual.cpp" line="337"/> - <location filename="../mainvisual.cpp" line="351"/> + <location filename="../mainvisual.cpp" line="338"/> + <location filename="../mainvisual.cpp" line="352"/> <source>Fastest</source> <translation>Najrýchlejšie</translation> </message> <message> - <location filename="../mainvisual.cpp" line="344"/> + <location filename="../mainvisual.cpp" line="345"/> <source>Peaks Falloff</source> <translation>Pokles špičiek</translation> </message> <message> - <location filename="../mainvisual.cpp" line="357"/> + <location filename="../mainvisual.cpp" line="358"/> <source>Background</source> <translation>Pozadie</translation> </message> <message> - <location filename="../mainvisual.cpp" line="358"/> + <location filename="../mainvisual.cpp" line="359"/> <source>Transparent</source> <translation>Priehľadné</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts index 2024a561a..65559dbee 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts @@ -585,132 +585,132 @@ <context> <name>MainVisual</name> <message> - <location filename="../mainvisual.cpp" line="281"/> + <location filename="../mainvisual.cpp" line="282"/> <source>Visualization Mode</source> <translation>Görselleştirme Modu</translation> </message> <message> - <location filename="../mainvisual.cpp" line="284"/> + <location filename="../mainvisual.cpp" line="285"/> <source>Analyzer</source> <translation>Çözümleyici</translation> </message> <message> - <location filename="../mainvisual.cpp" line="285"/> + <location filename="../mainvisual.cpp" line="286"/> <source>Scope</source> <translation>Kapsam</translation> </message> <message> - <location filename="../mainvisual.cpp" line="286"/> + <location filename="../mainvisual.cpp" line="287"/> <source>Off</source> <translation>Kapat</translation> </message> <message> - <location filename="../mainvisual.cpp" line="293"/> + <location filename="../mainvisual.cpp" line="294"/> <source>Analyzer Mode</source> <translation>Çözümleyici Modu</translation> </message> <message> - <location filename="../mainvisual.cpp" line="296"/> + <location filename="../mainvisual.cpp" line="297"/> <source>Normal</source> <translation>Normal</translation> </message> <message> - <location filename="../mainvisual.cpp" line="297"/> + <location filename="../mainvisual.cpp" line="298"/> <source>Fire</source> <translation>Ateş</translation> </message> <message> - <location filename="../mainvisual.cpp" line="298"/> + <location filename="../mainvisual.cpp" line="299"/> <source>Vertical Lines</source> <translation>Dikey Satırlar</translation> </message> <message> - <location filename="../mainvisual.cpp" line="299"/> + <location filename="../mainvisual.cpp" line="300"/> <source>Lines</source> <translation>Satırlar</translation> </message> <message> - <location filename="../mainvisual.cpp" line="300"/> + <location filename="../mainvisual.cpp" line="301"/> <source>Bars</source> <translation>Çubuklar</translation> </message> <message> - <location filename="../mainvisual.cpp" line="313"/> + <location filename="../mainvisual.cpp" line="314"/> <source>Peaks</source> <translation>Tepeler</translation> </message> <message> - <location filename="../mainvisual.cpp" line="317"/> + <location filename="../mainvisual.cpp" line="318"/> <source>Refresh Rate</source> <translation>Tazeleme Oranı</translation> </message> <message> - <location filename="../mainvisual.cpp" line="320"/> + <location filename="../mainvisual.cpp" line="321"/> <source>50 fps</source> <translation>50 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="321"/> + <location filename="../mainvisual.cpp" line="322"/> <source>25 fps</source> <translation>25 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="322"/> + <location filename="../mainvisual.cpp" line="323"/> <source>10 fps</source> <translation>10 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="323"/> + <location filename="../mainvisual.cpp" line="324"/> <source>5 fps</source> <translation>5 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="330"/> + <location filename="../mainvisual.cpp" line="331"/> <source>Analyzer Falloff</source> <translation>Çözümleyici Düşüşü</translation> </message> <message> - <location filename="../mainvisual.cpp" line="333"/> - <location filename="../mainvisual.cpp" line="347"/> + <location filename="../mainvisual.cpp" line="334"/> + <location filename="../mainvisual.cpp" line="348"/> <source>Slowest</source> <translation>En yavaş</translation> </message> <message> - <location filename="../mainvisual.cpp" line="334"/> - <location filename="../mainvisual.cpp" line="348"/> + <location filename="../mainvisual.cpp" line="335"/> + <location filename="../mainvisual.cpp" line="349"/> <source>Slow</source> <translation>Yavaş</translation> </message> <message> - <location filename="../mainvisual.cpp" line="335"/> - <location filename="../mainvisual.cpp" line="349"/> + <location filename="../mainvisual.cpp" line="336"/> + <location filename="../mainvisual.cpp" line="350"/> <source>Medium</source> <translation>Orta</translation> </message> <message> - <location filename="../mainvisual.cpp" line="336"/> - <location filename="../mainvisual.cpp" line="350"/> + <location filename="../mainvisual.cpp" line="337"/> + <location filename="../mainvisual.cpp" line="351"/> <source>Fast</source> <translation>Hızlı</translation> </message> <message> - <location filename="../mainvisual.cpp" line="337"/> - <location filename="../mainvisual.cpp" line="351"/> + <location filename="../mainvisual.cpp" line="338"/> + <location filename="../mainvisual.cpp" line="352"/> <source>Fastest</source> <translation>En hızlı</translation> </message> <message> - <location filename="../mainvisual.cpp" line="344"/> + <location filename="../mainvisual.cpp" line="345"/> <source>Peaks Falloff</source> <translation>Tepe Düşüşü</translation> </message> <message> - <location filename="../mainvisual.cpp" line="357"/> + <location filename="../mainvisual.cpp" line="358"/> <source>Background</source> <translation>Arkaplan</translation> </message> <message> - <location filename="../mainvisual.cpp" line="358"/> + <location filename="../mainvisual.cpp" line="359"/> <source>Transparent</source> <translation>Transparan</translation> </message> 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 673ef3853..1bef14bd6 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts @@ -585,132 +585,132 @@ <context> <name>MainVisual</name> <message> - <location filename="../mainvisual.cpp" line="281"/> + <location filename="../mainvisual.cpp" line="282"/> <source>Visualization Mode</source> <translation>Режим візуалізації</translation> </message> <message> - <location filename="../mainvisual.cpp" line="284"/> + <location filename="../mainvisual.cpp" line="285"/> <source>Analyzer</source> <translation>Аналізатор</translation> </message> <message> - <location filename="../mainvisual.cpp" line="285"/> + <location filename="../mainvisual.cpp" line="286"/> <source>Scope</source> <translation>Осцилограф</translation> </message> <message> - <location filename="../mainvisual.cpp" line="286"/> + <location filename="../mainvisual.cpp" line="287"/> <source>Off</source> <translation>Вимкнено</translation> </message> <message> - <location filename="../mainvisual.cpp" line="293"/> + <location filename="../mainvisual.cpp" line="294"/> <source>Analyzer Mode</source> <translation>Режим аналізатора</translation> </message> <message> - <location filename="../mainvisual.cpp" line="296"/> + <location filename="../mainvisual.cpp" line="297"/> <source>Normal</source> <translation>Звичайний</translation> </message> <message> - <location filename="../mainvisual.cpp" line="297"/> + <location filename="../mainvisual.cpp" line="298"/> <source>Fire</source> <translation>Вогонь</translation> </message> <message> - <location filename="../mainvisual.cpp" line="298"/> + <location filename="../mainvisual.cpp" line="299"/> <source>Vertical Lines</source> <translation>Вертикальні лінії</translation> </message> <message> - <location filename="../mainvisual.cpp" line="299"/> + <location filename="../mainvisual.cpp" line="300"/> <source>Lines</source> <translation>Лінії</translation> </message> <message> - <location filename="../mainvisual.cpp" line="300"/> + <location filename="../mainvisual.cpp" line="301"/> <source>Bars</source> <translation>Смужки</translation> </message> <message> - <location filename="../mainvisual.cpp" line="313"/> + <location filename="../mainvisual.cpp" line="314"/> <source>Peaks</source> <translation>Піки</translation> </message> <message> - <location filename="../mainvisual.cpp" line="317"/> + <location filename="../mainvisual.cpp" line="318"/> <source>Refresh Rate</source> <translation>Частота оновлення</translation> </message> <message> - <location filename="../mainvisual.cpp" line="320"/> + <location filename="../mainvisual.cpp" line="321"/> <source>50 fps</source> <translation>50 ф/с</translation> </message> <message> - <location filename="../mainvisual.cpp" line="321"/> + <location filename="../mainvisual.cpp" line="322"/> <source>25 fps</source> <translation>25 ф/с</translation> </message> <message> - <location filename="../mainvisual.cpp" line="322"/> + <location filename="../mainvisual.cpp" line="323"/> <source>10 fps</source> <translation>10 ф/с</translation> </message> <message> - <location filename="../mainvisual.cpp" line="323"/> + <location filename="../mainvisual.cpp" line="324"/> <source>5 fps</source> <translation>5 ф/с</translation> </message> <message> - <location filename="../mainvisual.cpp" line="330"/> + <location filename="../mainvisual.cpp" line="331"/> <source>Analyzer Falloff</source> <translation>Падіння аналізатора</translation> </message> <message> - <location filename="../mainvisual.cpp" line="333"/> - <location filename="../mainvisual.cpp" line="347"/> + <location filename="../mainvisual.cpp" line="334"/> + <location filename="../mainvisual.cpp" line="348"/> <source>Slowest</source> <translation>Найповільніше</translation> </message> <message> - <location filename="../mainvisual.cpp" line="334"/> - <location filename="../mainvisual.cpp" line="348"/> + <location filename="../mainvisual.cpp" line="335"/> + <location filename="../mainvisual.cpp" line="349"/> <source>Slow</source> <translation>Повільне</translation> </message> <message> - <location filename="../mainvisual.cpp" line="335"/> - <location filename="../mainvisual.cpp" line="349"/> + <location filename="../mainvisual.cpp" line="336"/> + <location filename="../mainvisual.cpp" line="350"/> <source>Medium</source> <translation>Середнє</translation> </message> <message> - <location filename="../mainvisual.cpp" line="336"/> - <location filename="../mainvisual.cpp" line="350"/> + <location filename="../mainvisual.cpp" line="337"/> + <location filename="../mainvisual.cpp" line="351"/> <source>Fast</source> <translation>Швидке</translation> </message> <message> - <location filename="../mainvisual.cpp" line="337"/> - <location filename="../mainvisual.cpp" line="351"/> + <location filename="../mainvisual.cpp" line="338"/> + <location filename="../mainvisual.cpp" line="352"/> <source>Fastest</source> <translation>Найшвидше</translation> </message> <message> - <location filename="../mainvisual.cpp" line="344"/> + <location filename="../mainvisual.cpp" line="345"/> <source>Peaks Falloff</source> <translation>Падіння піків</translation> </message> <message> - <location filename="../mainvisual.cpp" line="357"/> + <location filename="../mainvisual.cpp" line="358"/> <source>Background</source> <translation>Тло</translation> </message> <message> - <location filename="../mainvisual.cpp" line="358"/> + <location filename="../mainvisual.cpp" line="359"/> <source>Transparent</source> <translation>Прозорість</translation> </message> 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 0c5b8f8ad..e538523ff 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts @@ -585,132 +585,132 @@ <context> <name>MainVisual</name> <message> - <location filename="../mainvisual.cpp" line="281"/> + <location filename="../mainvisual.cpp" line="282"/> <source>Visualization Mode</source> <translation>可视化模式</translation> </message> <message> - <location filename="../mainvisual.cpp" line="284"/> + <location filename="../mainvisual.cpp" line="285"/> <source>Analyzer</source> <translation>分析器</translation> </message> <message> - <location filename="../mainvisual.cpp" line="285"/> + <location filename="../mainvisual.cpp" line="286"/> <source>Scope</source> <translation>示波器</translation> </message> <message> - <location filename="../mainvisual.cpp" line="286"/> + <location filename="../mainvisual.cpp" line="287"/> <source>Off</source> <translation>关闭</translation> </message> <message> - <location filename="../mainvisual.cpp" line="293"/> + <location filename="../mainvisual.cpp" line="294"/> <source>Analyzer Mode</source> <translation>分析模式</translation> </message> <message> - <location filename="../mainvisual.cpp" line="296"/> + <location filename="../mainvisual.cpp" line="297"/> <source>Normal</source> <translation>标准</translation> </message> <message> - <location filename="../mainvisual.cpp" line="297"/> + <location filename="../mainvisual.cpp" line="298"/> <source>Fire</source> <translation>火花</translation> </message> <message> - <location filename="../mainvisual.cpp" line="298"/> + <location filename="../mainvisual.cpp" line="299"/> <source>Vertical Lines</source> <translation>垂直线</translation> </message> <message> - <location filename="../mainvisual.cpp" line="299"/> + <location filename="../mainvisual.cpp" line="300"/> <source>Lines</source> <translation>线形</translation> </message> <message> - <location filename="../mainvisual.cpp" line="300"/> + <location filename="../mainvisual.cpp" line="301"/> <source>Bars</source> <translation>条形</translation> </message> <message> - <location filename="../mainvisual.cpp" line="313"/> + <location filename="../mainvisual.cpp" line="314"/> <source>Peaks</source> <translation>峰值</translation> </message> <message> - <location filename="../mainvisual.cpp" line="317"/> + <location filename="../mainvisual.cpp" line="318"/> <source>Refresh Rate</source> <translation>刷新率</translation> </message> <message> - <location filename="../mainvisual.cpp" line="320"/> + <location filename="../mainvisual.cpp" line="321"/> <source>50 fps</source> <translation>50 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="321"/> + <location filename="../mainvisual.cpp" line="322"/> <source>25 fps</source> <translation>25 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="322"/> + <location filename="../mainvisual.cpp" line="323"/> <source>10 fps</source> <translation>10 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="323"/> + <location filename="../mainvisual.cpp" line="324"/> <source>5 fps</source> <translation>5 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="330"/> + <location filename="../mainvisual.cpp" line="331"/> <source>Analyzer Falloff</source> <translation>分析器下降速度</translation> </message> <message> - <location filename="../mainvisual.cpp" line="333"/> - <location filename="../mainvisual.cpp" line="347"/> + <location filename="../mainvisual.cpp" line="334"/> + <location filename="../mainvisual.cpp" line="348"/> <source>Slowest</source> <translation>最慢</translation> </message> <message> - <location filename="../mainvisual.cpp" line="334"/> - <location filename="../mainvisual.cpp" line="348"/> + <location filename="../mainvisual.cpp" line="335"/> + <location filename="../mainvisual.cpp" line="349"/> <source>Slow</source> <translation>慢</translation> </message> <message> - <location filename="../mainvisual.cpp" line="335"/> - <location filename="../mainvisual.cpp" line="349"/> + <location filename="../mainvisual.cpp" line="336"/> + <location filename="../mainvisual.cpp" line="350"/> <source>Medium</source> <translation>中</translation> </message> <message> - <location filename="../mainvisual.cpp" line="336"/> - <location filename="../mainvisual.cpp" line="350"/> + <location filename="../mainvisual.cpp" line="337"/> + <location filename="../mainvisual.cpp" line="351"/> <source>Fast</source> <translation>快</translation> </message> <message> - <location filename="../mainvisual.cpp" line="337"/> - <location filename="../mainvisual.cpp" line="351"/> + <location filename="../mainvisual.cpp" line="338"/> + <location filename="../mainvisual.cpp" line="352"/> <source>Fastest</source> <translation>最快</translation> </message> <message> - <location filename="../mainvisual.cpp" line="344"/> + <location filename="../mainvisual.cpp" line="345"/> <source>Peaks Falloff</source> <translation>峰值下降速度</translation> </message> <message> - <location filename="../mainvisual.cpp" line="357"/> + <location filename="../mainvisual.cpp" line="358"/> <source>Background</source> <translation>背景</translation> </message> <message> - <location filename="../mainvisual.cpp" line="358"/> + <location filename="../mainvisual.cpp" line="359"/> <source>Transparent</source> <translation>透明</translation> </message> 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 742bfae96..cc1221064 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts @@ -585,132 +585,132 @@ <context> <name>MainVisual</name> <message> - <location filename="../mainvisual.cpp" line="281"/> + <location filename="../mainvisual.cpp" line="282"/> <source>Visualization Mode</source> <translation>可視化型態</translation> </message> <message> - <location filename="../mainvisual.cpp" line="284"/> + <location filename="../mainvisual.cpp" line="285"/> <source>Analyzer</source> <translation>解析器</translation> </message> <message> - <location filename="../mainvisual.cpp" line="285"/> + <location filename="../mainvisual.cpp" line="286"/> <source>Scope</source> <translation>示波器</translation> </message> <message> - <location filename="../mainvisual.cpp" line="286"/> + <location filename="../mainvisual.cpp" line="287"/> <source>Off</source> <translation>關閉</translation> </message> <message> - <location filename="../mainvisual.cpp" line="293"/> + <location filename="../mainvisual.cpp" line="294"/> <source>Analyzer Mode</source> <translation>解析型態</translation> </message> <message> - <location filename="../mainvisual.cpp" line="296"/> + <location filename="../mainvisual.cpp" line="297"/> <source>Normal</source> <translation>標準</translation> </message> <message> - <location filename="../mainvisual.cpp" line="297"/> + <location filename="../mainvisual.cpp" line="298"/> <source>Fire</source> <translation>火花</translation> </message> <message> - <location filename="../mainvisual.cpp" line="298"/> + <location filename="../mainvisual.cpp" line="299"/> <source>Vertical Lines</source> <translation>垂直線</translation> </message> <message> - <location filename="../mainvisual.cpp" line="299"/> + <location filename="../mainvisual.cpp" line="300"/> <source>Lines</source> <translation>線形</translation> </message> <message> - <location filename="../mainvisual.cpp" line="300"/> + <location filename="../mainvisual.cpp" line="301"/> <source>Bars</source> <translation>條形</translation> </message> <message> - <location filename="../mainvisual.cpp" line="313"/> + <location filename="../mainvisual.cpp" line="314"/> <source>Peaks</source> <translation>峰值</translation> </message> <message> - <location filename="../mainvisual.cpp" line="317"/> + <location filename="../mainvisual.cpp" line="318"/> <source>Refresh Rate</source> <translation>刷新率</translation> </message> <message> - <location filename="../mainvisual.cpp" line="320"/> + <location filename="../mainvisual.cpp" line="321"/> <source>50 fps</source> <translation>50 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="321"/> + <location filename="../mainvisual.cpp" line="322"/> <source>25 fps</source> <translation>25 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="322"/> + <location filename="../mainvisual.cpp" line="323"/> <source>10 fps</source> <translation>10 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="323"/> + <location filename="../mainvisual.cpp" line="324"/> <source>5 fps</source> <translation>5 fps</translation> </message> <message> - <location filename="../mainvisual.cpp" line="330"/> + <location filename="../mainvisual.cpp" line="331"/> <source>Analyzer Falloff</source> <translation>解析器下降速度</translation> </message> <message> - <location filename="../mainvisual.cpp" line="333"/> - <location filename="../mainvisual.cpp" line="347"/> + <location filename="../mainvisual.cpp" line="334"/> + <location filename="../mainvisual.cpp" line="348"/> <source>Slowest</source> <translation>最慢</translation> </message> <message> - <location filename="../mainvisual.cpp" line="334"/> - <location filename="../mainvisual.cpp" line="348"/> + <location filename="../mainvisual.cpp" line="335"/> + <location filename="../mainvisual.cpp" line="349"/> <source>Slow</source> <translation>慢</translation> </message> <message> - <location filename="../mainvisual.cpp" line="335"/> - <location filename="../mainvisual.cpp" line="349"/> + <location filename="../mainvisual.cpp" line="336"/> + <location filename="../mainvisual.cpp" line="350"/> <source>Medium</source> <translation>中</translation> </message> <message> - <location filename="../mainvisual.cpp" line="336"/> - <location filename="../mainvisual.cpp" line="350"/> + <location filename="../mainvisual.cpp" line="337"/> + <location filename="../mainvisual.cpp" line="351"/> <source>Fast</source> <translation>快</translation> </message> <message> - <location filename="../mainvisual.cpp" line="337"/> - <location filename="../mainvisual.cpp" line="351"/> + <location filename="../mainvisual.cpp" line="338"/> + <location filename="../mainvisual.cpp" line="352"/> <source>Fastest</source> <translation>最快</translation> </message> <message> - <location filename="../mainvisual.cpp" line="344"/> + <location filename="../mainvisual.cpp" line="345"/> <source>Peaks Falloff</source> <translation>峰值下降速度</translation> </message> <message> - <location filename="../mainvisual.cpp" line="357"/> + <location filename="../mainvisual.cpp" line="358"/> <source>Background</source> <translation>背景</translation> </message> <message> - <location filename="../mainvisual.cpp" line="358"/> + <location filename="../mainvisual.cpp" line="359"/> <source>Transparent</source> <translation>透明</translation> </message> diff --git a/src/qmmp/abstractengine.cpp b/src/qmmp/abstractengine.cpp index bf452756e..b5691ac2e 100644 --- a/src/qmmp/abstractengine.cpp +++ b/src/qmmp/abstractengine.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009 by Ilya Kotov * + * Copyright (C) 2009-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -24,6 +24,7 @@ #include <QApplication> #include "enginefactory.h" #include "qmmpaudioengine_p.h" +#include "statehandler.h" #include "qmmp.h" #include "abstractengine.h" @@ -36,11 +37,6 @@ QMutex *AbstractEngine::mutex() return &m_mutex; } -/*QWaitCondition *AbstractEngine::cond() -{ - return &m_waitCondition; -}*/ - // static methods QList<EngineFactory*> *AbstractEngine::m_factories = 0; QList<EngineFactory*> *AbstractEngine::m_disabledFactories = 0; diff --git a/src/qmmp/abstractengine.h b/src/qmmp/abstractengine.h index a08a0c62d..7c81d0048 100644 --- a/src/qmmp/abstractengine.h +++ b/src/qmmp/abstractengine.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2010 by Ilya Kotov * + * Copyright (C) 2009-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -76,10 +76,6 @@ public: */ QMutex *mutex(); /*! - * Returns wait condition pointer. - */ - //QWaitCondition *cond(); - /*! * Creates Engine object. * @param s InputSource object. * @param parent Parent object. @@ -115,16 +111,8 @@ public: */ static QStringList protocols(); -signals: - /*! - * Emitted when the decoder has finished playback. - */ - //void playbackFinished(); - private: QMutex m_mutex; - //QWaitCondition m_waitCondition; - static void checkFactories(); static QList<EngineFactory*> *m_factories; static QList<EngineFactory*> *m_disabledFactories; diff --git a/src/qmmp/decoder.cpp b/src/qmmp/decoder.cpp index 81960a0e7..54dfbc20c 100644 --- a/src/qmmp/decoder.cpp +++ b/src/qmmp/decoder.cpp @@ -27,7 +27,9 @@ extern "C" #include "decoder.h" Decoder::Decoder(QIODevice *input) : m_input(input) -{} +{ + m_hasMetaData = false; +} Decoder::~Decoder() {} @@ -60,11 +62,28 @@ QMap<Qmmp::ReplayGainKey, double> Decoder::replayGainInfo() const return m_rg; } +void Decoder::addMetaData(const QMap<Qmmp::MetaData, QString> &metaData) +{ + m_metaData = metaData; + m_hasMetaData = true; +} + QIODevice *Decoder::input() { return m_input; } +bool Decoder::hasMetaData() const +{ + return m_hasMetaData; +} + +QMap<Qmmp::MetaData, QString> Decoder::takeMetaData() +{ + m_hasMetaData = false; + return m_metaData; +} + // static methods QList<DecoderFactory*> *Decoder::m_factories = 0; QList<DecoderFactory*> *Decoder::m_disabledFactories = 0; diff --git a/src/qmmp/decoder.h b/src/qmmp/decoder.h index 13f78913c..729580ebf 100644 --- a/src/qmmp/decoder.h +++ b/src/qmmp/decoder.h @@ -92,6 +92,21 @@ public: */ QIODevice *input(); /*! + * Informs decoder about new received metadata. + * Call of this function is required for all non-local streams/files + * @param metaData Metadata map. + */ + void addMetaData(const QMap<Qmmp::MetaData, QString> &metaData); + /*! + * Returns \b true when new metadata has received, otherwise returns \b false. + */ + bool hasMetaData() const; + /*! + * Takes metadata out of decoder and returns it. + * Attention: hasMetaData() should return \b true before use of this fuction. + */ + QMap<Qmmp::MetaData, QString> takeMetaData(); + /*! * Returns DecoderFactory pointer which supports file \b path or 0 if file \b path is unsupported */ static DecoderFactory *findByPath(const QString &path); @@ -150,6 +165,8 @@ private: static QStringList m_files; AudioParameters m_parameters; QIODevice *m_input; + bool m_hasMetaData; + QMap<Qmmp::MetaData, QString> m_metaData; QMap <Qmmp::ReplayGainKey, double> m_rg; //replay gain information }; diff --git a/src/qmmp/inputsource.cpp b/src/qmmp/inputsource.cpp index 8d1a93a08..2baa0ac32 100644 --- a/src/qmmp/inputsource.cpp +++ b/src/qmmp/inputsource.cpp @@ -31,6 +31,7 @@ InputSource::InputSource(const QString &source, QObject *parent) : QObject(paren { m_url = source; m_offset = -1; + m_hasMetaData = false; } QString InputSource::contentType() const @@ -52,6 +53,23 @@ void InputSource::setOffset(qint64 offset) m_offset = offset; } +bool InputSource::hasMetaData() const +{ + return m_hasMetaData; +} + +QMap<Qmmp::MetaData, QString> InputSource::takeMetaData() +{ + m_hasMetaData = false; + return m_metaData; +} + +void InputSource::addMetaData(const QMap<Qmmp::MetaData, QString> &metaData) +{ + m_metaData = metaData; + m_hasMetaData = true; +} + // static methods QList<InputSourceFactory*> *InputSource::m_factories = 0; QStringList InputSource::m_files; diff --git a/src/qmmp/inputsource.h b/src/qmmp/inputsource.h index efd50a5ae..583bb9ded 100644 --- a/src/qmmp/inputsource.h +++ b/src/qmmp/inputsource.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2010 by Ilya Kotov * + * Copyright (C) 2009-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -25,6 +25,8 @@ #include <QString> #include <QStringList> #include <QIODevice> +#include <QMap> +#include "qmmp.h" #include "inputsourcefactory.h" /*! @brief The InputSource class provides the base interface class of transports. @@ -71,6 +73,21 @@ public: */ void setOffset(qint64 offset); /*! + * Informs input source object about new received metadata. + * Call of this function is required for all non-local streams/files + * @param metaData Metadata map. + */ + void addMetaData(const QMap<Qmmp::MetaData, QString> &metaData); + /*! + * Returns \b true when new metadata has received, otherwise returns \b false. + */ + bool hasMetaData() const; + /*! + * Takes metadata out of decoder and returns it. + * Attention: hasMetaData() should return \b true before use of this fuction. + */ + QMap<Qmmp::MetaData, QString> takeMetaData(); + /*! * Creates InputSource object. * @param url Input source path or url. * @param parent Parent object. @@ -103,6 +120,8 @@ signals: private: QString m_url; qint64 m_offset; + QMap<Qmmp::MetaData, QString> m_metaData; + bool m_hasMetaData; static void checkFactories(); static QList<InputSourceFactory*> *m_factories; static QStringList m_files; diff --git a/src/qmmp/qmmpaudioengine.cpp b/src/qmmp/qmmpaudioengine.cpp index 7c1b6042b..abce71842 100644 --- a/src/qmmp/qmmpaudioengine.cpp +++ b/src/qmmp/qmmpaudioengine.cpp @@ -324,13 +324,13 @@ void QmmpAudioEngine::run() m_replayGain->setReplayGainInfo(m_decoder->replayGainInfo()); mutex()->unlock(); m_output->start(); + StateHandler::instance()->dispatch(Qmmp::Playing); sendMetaData(); while (! m_done && ! m_finish) { mutex()->lock (); - // decode - + //seek if (m_seekTime >= 0) { m_decoder->seek(m_seekTime); @@ -340,7 +340,12 @@ void QmmpAudioEngine::run() m_output->recycler()->mutex()->unlock (); m_output_at = 0; } - + //metadata + if(m_decoder->hasMetaData()) + StateHandler::instance()->dispatch(m_decoder->takeMetaData()); + if(m_inputs[m_decoder]->hasMetaData()) + StateHandler::instance()->dispatch(m_inputs[m_decoder]->takeMetaData()); + // decode len = m_decoder->read((char *)(m_output_buf + m_output_at), m_output_size - m_output_at); if (len > 0) @@ -403,6 +408,7 @@ void QmmpAudioEngine::run() if(m_output) { m_output->start(); + StateHandler::instance()->dispatch(Qmmp::Playing); sendMetaData(); addOffset(); //offset continue; diff --git a/src/qmmp/statehandler.cpp b/src/qmmp/statehandler.cpp index fca37893b..aaaeee2d3 100644 --- a/src/qmmp/statehandler.cpp +++ b/src/qmmp/statehandler.cpp @@ -108,8 +108,14 @@ void StateHandler::dispatch(const QMap<Qmmp::MetaData, QString> &metaData) m_mutex.unlock(); return; } - if (m_state == Qmmp::Playing && - (m_metaData.isEmpty() || m_metaData.value(Qmmp::URL) == metaData.value(Qmmp::URL))) + if(m_state != Qmmp::Playing && m_state != Qmmp::Paused) + { + qWarning("StateHandler: metadata is ignored"); + m_mutex.unlock(); + return; + } + + if(m_metaData.isEmpty() || m_metaData.value(Qmmp::URL) == metaData.value(Qmmp::URL)) { if (m_metaData != tmp) { @@ -117,8 +123,6 @@ void StateHandler::dispatch(const QMap<Qmmp::MetaData, QString> &metaData) qApp->postEvent(parent(), new MetaDataChangedEvent(m_metaData)); } } - else - m_cachedMetaData = tmp; m_mutex.unlock(); } @@ -148,13 +152,13 @@ void StateHandler::dispatch(Qmmp::State state) m_state = state; qApp->postEvent(parent(), new StateChangedEvent(m_state, prevState)); - if(m_state == Qmmp::Playing && !m_cachedMetaData.isEmpty()) + /*if(m_state == Qmmp::Playing && !m_cachedMetaData.isEmpty()) { m_mutex.unlock(); dispatch(m_cachedMetaData); m_mutex.lock(); m_cachedMetaData.clear(); - } + }*/ } m_mutex.unlock(); } diff --git a/src/qmmp/statehandler.h b/src/qmmp/statehandler.h index 9c8d2fd89..c54dcf80e 100644 --- a/src/qmmp/statehandler.h +++ b/src/qmmp/statehandler.h @@ -142,7 +142,6 @@ private: int m_bitrate, m_precision, m_channels; static StateHandler* m_instance; QMap <Qmmp::MetaData, QString> m_metaData; - QMap <Qmmp::MetaData, QString> m_cachedMetaData; Qmmp::State m_state; QMutex m_mutex; }; |
