decoder api changes: removed StateHandler usage

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2354 90c681e8-e032-0410-971d-27865f9a5e38

8 files changed, 11 insertions, 12 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;
     }
 }