added tags update

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

12 files changed, 17 insertions, 12 deletions

diff --git a/lib/decoderfactory.h b/lib/decoderfactory.h
index cfd0e5166..d67d1b564 100644
--- a/lib/decoderfactory.h
+++ b/lib/decoderfactory.h
@@ -53,7 +53,7 @@ public:
     virtual const DecoderProperties properties() const = 0;
     virtual Decoder *create(QObject *, QIODevice *, Output *) = 0; 
     virtual FileTag *createTag(const QString &source) = 0;
-    virtual void showDetails(QWidget *parent, const QString &path) = 0;
+    virtual QObject* showDetails(QWidget *parent, const QString &path) = 0;
     virtual void showSettings(QWidget *parent) = 0;
     virtual void showAbout(QWidget *parent) = 0;
     virtual QTranslator *createTranslator(QObject *parent) = 0;
diff --git a/lib/qmmp/Input/ffmpeg/decoderffmpegfactory.cpp b/lib/qmmp/Input/ffmpeg/decoderffmpegfactory.cpp
index 09d878990..789635a15 100644
--- a/lib/qmmp/Input/ffmpeg/decoderffmpegfactory.cpp
+++ b/lib/qmmp/Input/ffmpeg/decoderffmpegfactory.cpp
@@ -64,10 +64,11 @@ FileTag *DecoderFFmpegFactory::createTag(const QString &source)
     return ftag;
 }
 
-void DecoderFFmpegFactory::showDetails(QWidget *parent, const QString &path)
+QObject* DecoderFFmpegFactory::showDetails(QWidget *parent, const QString &path)
 {
     DetailsDialog *d = new DetailsDialog(parent, path);
     d -> show();
+    return d;
 }
 
 void DecoderFFmpegFactory::showSettings(QWidget *)
diff --git a/lib/qmmp/Input/ffmpeg/decoderffmpegfactory.h b/lib/qmmp/Input/ffmpeg/decoderffmpegfactory.h
index 7acc9f204..16b6de1dd 100644
--- a/lib/qmmp/Input/ffmpeg/decoderffmpegfactory.h
+++ b/lib/qmmp/Input/ffmpeg/decoderffmpegfactory.h
@@ -45,7 +45,7 @@ public:
     const DecoderProperties properties() const;
     Decoder *create(QObject *, QIODevice *, Output *);
     FileTag *createTag(const QString &source);
-    void showDetails(QWidget *parent, const QString &path);
+    QObject* showDetails(QWidget *parent, const QString &path);
     void showSettings(QWidget *parent);
     void showAbout(QWidget *parent);
     QTranslator *createTranslator(QObject *parent);
diff --git a/lib/qmmp/Input/flac/decoderflacfactory.cpp b/lib/qmmp/Input/flac/decoderflacfactory.cpp
index cf8643ce4..5abb60b39 100644
--- a/lib/qmmp/Input/flac/decoderflacfactory.cpp
+++ b/lib/qmmp/Input/flac/decoderflacfactory.cpp
@@ -67,10 +67,11 @@ FileTag *DecoderFLACFactory::createTag(const QString &source)
     return ftag;
 }
 
-void DecoderFLACFactory::showDetails(QWidget *parent, const QString &path)
+QObject* DecoderFLACFactory::showDetails(QWidget *parent, const QString &path)
 {
     DetailsDialog *d = new DetailsDialog(parent, path);
     d -> show();
+    return d;
 }
 
 void DecoderFLACFactory::showSettings(QWidget *)
diff --git a/lib/qmmp/Input/flac/decoderflacfactory.h b/lib/qmmp/Input/flac/decoderflacfactory.h
index 59b6a8656..586bc3b33 100644
--- a/lib/qmmp/Input/flac/decoderflacfactory.h
+++ b/lib/qmmp/Input/flac/decoderflacfactory.h
@@ -45,7 +45,7 @@ public:
     const DecoderProperties properties() const;
     Decoder *create(QObject *, QIODevice *, Output *);
     FileTag *createTag(const QString &source);
-    void showDetails(QWidget *parent, const QString &path);
+    QObject* showDetails(QWidget *parent, const QString &path);
     void showSettings(QWidget *parent);
     void showAbout(QWidget *parent);
     QTranslator *createTranslator(QObject *parent);
diff --git a/lib/qmmp/Input/mad/decodermadfactory.cpp b/lib/qmmp/Input/mad/decodermadfactory.cpp
index f86f6972b..1c863d6e0 100644
--- a/lib/qmmp/Input/mad/decodermadfactory.cpp
+++ b/lib/qmmp/Input/mad/decodermadfactory.cpp
@@ -155,10 +155,11 @@ FileTag *DecoderMADFactory::createTag(const QString &source)
     return ftag;
 }
 
-void DecoderMADFactory::showDetails(QWidget *parent, const QString &path)
+QObject* DecoderMADFactory::showDetails(QWidget *parent, const QString &path)
 {
     DetailsDialog *d = new DetailsDialog(parent, path);
     d -> show();
+    return d;
 }
 
 void DecoderMADFactory::showSettings(QWidget *parent)
diff --git a/lib/qmmp/Input/mad/decodermadfactory.h b/lib/qmmp/Input/mad/decodermadfactory.h
index fa1e7972f..2c7da8e47 100644
--- a/lib/qmmp/Input/mad/decodermadfactory.h
+++ b/lib/qmmp/Input/mad/decodermadfactory.h
@@ -44,7 +44,7 @@ public:
     const DecoderProperties properties() const;
     Decoder *create(QObject *, QIODevice *, Output *);
     FileTag *createTag(const QString &source);
-    void showDetails(QWidget *parent, const QString &path);
+    QObject* showDetails(QWidget *parent, const QString &path);
     void showSettings(QWidget *parent);
     void showAbout(QWidget *parent);
     QTranslator *createTranslator(QObject *parent);
diff --git a/lib/qmmp/Input/mad/detailsdialog.cpp b/lib/qmmp/Input/mad/detailsdialog.cpp
index 21ebf2524..8e28dda66 100644
--- a/lib/qmmp/Input/mad/detailsdialog.cpp
+++ b/lib/qmmp/Input/mad/detailsdialog.cpp
@@ -187,7 +187,7 @@ void DetailsDialog::saveID3v1Tag()
     f.ID3v1Tag(TRUE)->setTitle(TagLib::String(m_codec_v1->fromUnicode(ui.titleLineEdit_v1->text()).constData(), type));
     f.ID3v1Tag()->setArtist(TagLib::String(m_codec_v1->fromUnicode(ui.artistLineEdit_v1->text()).constData(), type));
     f.ID3v1Tag()->setAlbum(TagLib::String(m_codec_v1->fromUnicode(ui.albumLineEdit_v1->text()).constData(), type));
-    f.ID3v1Tag()->setComment(TagLib::String(m_codec_v1->fromUnicode(ui.commentLineEdit_v2->text()).constData(), type));
+    f.ID3v1Tag()->setComment(TagLib::String(m_codec_v1->fromUnicode(ui.commentLineEdit_v1->text()).constData(), type));
     f.ID3v1Tag()->setGenre(TagLib::String(m_codec_v1->fromUnicode(ui.genreLineEdit_v1->text()).constData(), type));
     f.ID3v1Tag()->setYear(ui.yearLineEdit_v1->text().toUInt());
     f.ID3v1Tag()->setTrack(ui.trackLineEdit_v1->text().toUInt());
diff --git a/lib/qmmp/Input/mpc/decodermpcfactory.cpp b/lib/qmmp/Input/mpc/decodermpcfactory.cpp
index 7e15174e5..f2874a08d 100644
--- a/lib/qmmp/Input/mpc/decodermpcfactory.cpp
+++ b/lib/qmmp/Input/mpc/decodermpcfactory.cpp
@@ -67,10 +67,11 @@ FileTag *DecoderMPCFactory::createTag(const QString &source)
     return ftag;
 }
 
-void DecoderMPCFactory::showDetails(QWidget *parent, const QString &path)
+QObject* DecoderMPCFactory::showDetails(QWidget *parent, const QString &path)
 {
     DetailsDialog *d = new DetailsDialog(parent, path);
     d -> show();
+    return d;
 }
 
 void DecoderMPCFactory::showSettings(QWidget *)
diff --git a/lib/qmmp/Input/mpc/decodermpcfactory.h b/lib/qmmp/Input/mpc/decodermpcfactory.h
index eb8858cdf..0f8dda55f 100644
--- a/lib/qmmp/Input/mpc/decodermpcfactory.h
+++ b/lib/qmmp/Input/mpc/decodermpcfactory.h
@@ -45,7 +45,7 @@ public:
     const DecoderProperties properties() const;
     Decoder *create(QObject *, QIODevice *, Output *);
     FileTag *createTag(const QString &source);
-    void showDetails(QWidget *parent, const QString &path);
+    QObject* showDetails(QWidget *parent, const QString &path);
     void showSettings(QWidget *parent);
     void showAbout(QWidget *parent);
     QTranslator *createTranslator(QObject *parent);
diff --git a/lib/qmmp/Input/vorbis/decodervorbisfactory.cpp b/lib/qmmp/Input/vorbis/decodervorbisfactory.cpp
index d09154d61..c3b31ec52 100644
--- a/lib/qmmp/Input/vorbis/decodervorbisfactory.cpp
+++ b/lib/qmmp/Input/vorbis/decodervorbisfactory.cpp
@@ -72,10 +72,11 @@ FileTag *DecoderVorbisFactory::createTag(const QString &source)
     return ftag;
 }
 
-void DecoderVorbisFactory::showDetails(QWidget *parent, const QString &path)
+QObject* DecoderVorbisFactory::showDetails(QWidget *parent, const QString &path)
 {
     DetailsDialog *d = new DetailsDialog(parent, path);
     d -> show();
+    return d;
 }
 
 void DecoderVorbisFactory::showSettings(QWidget *)
diff --git a/lib/qmmp/Input/vorbis/decodervorbisfactory.h b/lib/qmmp/Input/vorbis/decodervorbisfactory.h
index f4d3eb9c6..6830fc102 100644
--- a/lib/qmmp/Input/vorbis/decodervorbisfactory.h
+++ b/lib/qmmp/Input/vorbis/decodervorbisfactory.h
@@ -45,7 +45,7 @@ public:
     const DecoderProperties properties() const;
     Decoder *create(QObject *, QIODevice *, Output *);
     FileTag *createTag(const QString &source);
-    void showDetails(QWidget *parent, const QString &path);
+    QObject* showDetails(QWidget *parent, const QString &path);
     void showSettings(QWidget *parent);
     void showAbout(QWidget *parent);
     QTranslator *createTranslator(QObject *parent);