added visual plugin support

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

20 files changed, 579 insertions, 55 deletions

diff --git a/lib/lib.pro b/lib/lib.pro
index 54e3f0363..5c52041a2 100644
--- a/lib/lib.pro
+++ b/lib/lib.pro
@@ -17,7 +17,8 @@ HEADERS += recycler.h \
            soundcore.h \
            streamreader.h \
            downloader.h \
- visual.h
+           visual.h \
+           visualfactory.h
 SOURCES += recycler.cpp \
            decoder.cpp \
            output.cpp \
@@ -28,7 +29,7 @@ SOURCES += recycler.cpp \
            streamreader.cpp \
            downloader.cpp \
            filetag.cpp \
- visual.cpp
+           visual.cpp
 
 TARGET = qmmp
 CONFIG += release \
@@ -53,7 +54,7 @@ unix {
     system($$LINE2)
     system($$LINE3)
     system($$LINE4)
-    QMAKE_CLEAN += ./config.h
+    QMAKE_CLEAN = ./config.h
 }
 
 target.path = $$LIB_DIR
diff --git a/lib/output.cpp b/lib/output.cpp
index fbbe1c0e4..94b68aa36 100644
--- a/lib/output.cpp
+++ b/lib/output.cpp
@@ -62,7 +62,7 @@ Output *Output::create ( QObject *parent )
     Output *output = 0;
 
     checkFactories();
-    if ( factories->isEmpty () )
+    if (factories->isEmpty ())
     {
         qDebug("Output: unable to find output plugins");
         return output;
@@ -76,28 +76,28 @@ Output *Output::create ( QObject *parent )
         if (files.at(i).section('/',-1) == pluginFileName)
             j = i;
     }
-    OutputFactory *fact = factories->at ( j );
+    OutputFactory *fact = factories->at (j);
     if ( fact )
     {
-        output = fact->create ( parent );
+        output = fact->create (parent);
     }
     switch ((int) output->volumeControl())
     {
     case Output::Standard:
-        {
-            break;
-        }
+    {
+        break;
+    }
     case Output::Custom:
-        {
-            timer = new QTimer(output);
-            connect(timer, SIGNAL(timeout()), output, SLOT(checkVolume()));
-            timer->start(125);
-            break;
-        }
+    {
+        timer = new QTimer(output);
+        connect(timer, SIGNAL(timeout()), output, SLOT(checkVolume()));
+        timer->start(125);
+        break;
+    }
     case Output::Disabled:
-        {
-            break;
-        }
+    {
+        break;
+    }
     }
     return output;
 }
@@ -122,7 +122,15 @@ Output::Output ( QObject* parent, VolumeType vt) : QThread (parent), r (stackSiz
 
 
 Output::~Output()
-{}
+{
+    qDebug("Output::~Output()");
+    Visual *visual = 0;
+    foreach(visual, m_vis_map.values ())
+    {
+        visual->close();
+    }
+    //m_vis_map.clear();
+}
 
 void Output::error ( const QString &e )
 {
@@ -135,6 +143,8 @@ void Output::addVisual ( Visual *v )
     if (visuals.indexOf (v) == -1)
     {
         visuals.append (v);
+        v->setOutput(this);
+        qDebug("Output: added external visualization");
     }
 }
 
@@ -142,6 +152,39 @@ void Output::addVisual ( Visual *v )
 void Output::removeVisual (Visual *v)
 {
     visuals.removeAll (v);
+    if (m_vis_map.key(v))
+    {
+        VisualFactory *factory = m_vis_map.key(v);
+        m_vis_map.remove(factory);
+        //Visual::setEnabled(factory, FALSE);
+    }
+}
+
+void Output::addVisual(VisualFactory *factory, QWidget *parent)
+{
+    if (m_vis_map.value(factory))
+        return;
+    Visual::setEnabled(factory, TRUE);
+    Visual* visual = factory->create(parent);
+    visual->setWindowFlags(Qt::Window);
+    if (visual)
+    {
+        visual->setOutput(this);
+        qDebug("Output: added visual factory: %s",
+               qPrintable(factory->properties().name));
+        m_vis_map.insert (factory, visual);
+        visual->show();
+    }
+}
+
+void Output::removeVisual(VisualFactory *factory)
+{
+    if (m_vis_map.value(factory))
+    {
+        m_vis_map.value(factory)->close();
+        m_vis_map.remove (factory);
+    }
+    Visual::setEnabled(factory, FALSE);
 }
 
 void Output::dispatchVisual ( Buffer *buffer, unsigned long written,
@@ -150,7 +193,13 @@ void Output::dispatchVisual ( Buffer *buffer, unsigned long written,
     if ( ! buffer || !visuals.size())
         return;
     Visual* visual = 0;
-    foreach (visual , visuals);
+    foreach (visual , visuals)  //external
+    {
+        visual->mutex()->lock ();
+        visual->add ( buffer, written, chan, prec );
+        visual->mutex()->unlock();
+    }
+    foreach (visual , m_vis_map.values ())  //internal
     {
         visual->mutex()->lock ();
         visual->add ( buffer, written, chan, prec );
@@ -162,7 +211,13 @@ void Output::dispatchVisual ( Buffer *buffer, unsigned long written,
 void Output::clearVisuals()
 {
     Visual *visual = 0;
-    foreach (visual, visuals );
+    foreach (visual, visuals )
+    {
+        visual->mutex()->lock ();
+        visual->clear();
+        visual->mutex()->unlock();
+    }
+    foreach(visual, m_vis_map.values ())
     {
         visual->mutex()->lock ();
         visual->clear();
@@ -172,7 +227,7 @@ void Output::clearVisuals()
 
 void Output::dispatch(OutputState::Type st)
 {
-    if(st == OutputState::Stopped)
+    if (st == OutputState::Stopped)
         clearVisuals();
     emit stateChanged ( OutputState(st) );
 }
@@ -184,7 +239,7 @@ void Output::dispatch(long s, unsigned long w, int b, int f, int p, int c)
 
 void Output::dispatch ( const OutputState &st )
 {
-    if(st.type() == OutputState::Stopped)
+    if (st.type() == OutputState::Stopped)
         clearVisuals();
     emit stateChanged ( st );
 }
diff --git a/lib/output.h b/lib/output.h
index c87bd2420..24bc9d3fb 100644
--- a/lib/output.h
+++ b/lib/output.h
@@ -17,13 +17,12 @@ class Output;
 #include <QIODevice>
 #include "visual.h"
 #include "outputfactory.h"
+#include "visualfactory.h"
 
 #include "recycler.h"
 
 class QTimer;
 
-class Visualization;
-
 
 class OutputState
 {
@@ -154,9 +153,6 @@ public:
         return &r;
     }
 
-    void addVisual(Visual*);
-    void removeVisual(Visual*);
-
     QMutex *mutex()
     {
         return &mtx;
@@ -167,6 +163,12 @@ public:
         return m_vol;
     };
 
+    //visualization
+    void addVisual(Visual*);
+    void removeVisual(Visual*);
+    void addVisual(VisualFactory *factory, QWidget *parent);
+    void removeVisual(VisualFactory *factory);
+
     // abstract
     virtual bool isInitialized() const = 0;
     virtual bool initialize() = 0;
@@ -204,7 +206,8 @@ protected:
 private:
     QMutex mtx;
     Recycler r;
-    QList<Visual*> visuals;
+    QList<Visual*> visuals; //external visualization
+    QMap<VisualFactory*, Visual*> m_vis_map; //internal visualization
     VolumeType m_vol;
 };
 
diff --git a/lib/soundcore.cpp b/lib/soundcore.cpp
index d5aa0435d..05ab4b7bd 100644
--- a/lib/soundcore.cpp
+++ b/lib/soundcore.cpp
@@ -28,9 +28,13 @@
 
 #include "soundcore.h"
 
+
+SoundCore *SoundCore::m_instance = 0;
+
 SoundCore::SoundCore(QObject *parent)
         : QObject(parent)
 {
+    m_instance = this;
     m_decoder = 0;
     m_output = 0;
     m_input = 0;
@@ -40,6 +44,7 @@ SoundCore::SoundCore(QObject *parent)
     m_block = FALSE;
     m_preamp = 0;
     m_vis = 0;
+    m_parentWidget = 0;
     for (int i = 1; i < 10; ++i)
         m_bands[i] = 0;
     m_error = NoError;
@@ -101,11 +106,17 @@ bool SoundCore::play(const QString &source)
 
     m_error = DecoderError;
 
-    if (m_vis)
+    Visual *visual = 0;
+    foreach(visual, m_visuals)
+        m_output->addVisual(visual);
+
+    VisualFactory* factory;
+    foreach(factory, *Visual::visualFactories())
     {
-        m_vis->setOutput(m_output);
-        m_output->addVisual(m_vis);
+        if(Visual::isEnabled(factory))
+            m_output->addVisual(factory, m_parentWidget);
     }
+
     m_source = source;
     if (source.left(4) != "http")
         return decode();
@@ -182,6 +193,12 @@ void SoundCore::stop()
         {
             qWarning("SoundCore: unable to create output");
         }
+        VisualFactory* factory;
+        foreach(factory, *Visual::visualFactories())
+        {
+            if(Visual::isEnabled(factory))
+                m_output->addVisual(factory, m_parentWidget);
+        }
         connect(m_output, SIGNAL(stateChanged(const OutputState&)),
                 SIGNAL(outputStateChanged(const OutputState&)));
     }
@@ -291,7 +308,12 @@ void SoundCore::updateConfig()
 
 void SoundCore::addVisualization(Visual *visual)
 {
-    m_vis = visual;
+    if (m_visuals.indexOf (visual) == -1)
+    {
+        m_visuals.append(visual);
+        if(m_output)
+            m_output->addVisual(visual);
+    }
 }
 
 bool SoundCore::decode()
@@ -331,3 +353,40 @@ bool SoundCore::decode()
     m_block = FALSE;
     return FALSE;
 }
+
+void SoundCore::showVisualization(QWidget *parent)
+{
+    if (!m_parentWidget)
+    {
+        m_parentWidget = parent;
+        if(!m_output)
+            return;
+        VisualFactory* factory;
+        foreach(factory, *Visual::visualFactories())
+        {
+            if(Visual::isEnabled(factory))
+                m_output->addVisual(factory, m_parentWidget);
+        }
+    }
+}
+
+void SoundCore::addVisual(VisualFactory *factory, QWidget *parent)
+{
+    if(m_output)
+        m_output->addVisual(factory, parent);
+    else
+        Visual::setEnabled(factory, TRUE);
+}
+
+void SoundCore::removeVisual(VisualFactory *factory)
+{
+    if(m_output)
+        m_output->removeVisual(factory);
+    else
+        Visual::setEnabled(factory, FALSE);
+}
+
+SoundCore* SoundCore::instance()
+{
+    return m_instance;
+}
diff --git a/lib/soundcore.h b/lib/soundcore.h
index 13e8b97c6..e2e8dd566 100644
--- a/lib/soundcore.h
+++ b/lib/soundcore.h
@@ -138,6 +138,23 @@ public:
     */
     void addVisualization(Visual *visual);
 
+    /*!
+    * shows enabled visualization with parent widget \b parent
+    */
+    void showVisualization(QWidget *parent);
+
+    /*!
+    * adds visualization by factory \b factory
+    */
+    void addVisual(VisualFactory *factory, QWidget *parent);
+
+    /*!
+    * removes visualization by factory \b factory
+    */
+    void removeVisual(VisualFactory *factory);
+
+    static SoundCore* instance();
+
 signals:
 
     /*!
@@ -175,7 +192,10 @@ private:
     int m_preamp;
     int m_bands[10];
     Visual *m_vis;
+    QList <Visual*> m_visuals;
     QString m_source;
+    QWidget *m_parentWidget;
+    static SoundCore* m_instance;
 };
 
 #endif
diff --git a/lib/visual.cpp b/lib/visual.cpp
index 8c03bd65d..ce5e8a982 100644
--- a/lib/visual.cpp
+++ b/lib/visual.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   Copyright (C) 2007 by Ilya Kotov                                      *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,14 +18,63 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <QtGui>
+#include <QObject>
+#include <QList>
+#include <QApplication>
+
+#include "visualfactory.h"
+#include "constants.h"
+#include "output.h"
+
 #include "visual.h"
 
 
-Visual::Visual()
-{}
+static QList<VisualFactory*> *factories = 0;
+static QStringList files;
+
+static void checkFactories()
+{
+    if (! factories)
+    {
+        files.clear();
+        factories = new QList<VisualFactory *>;
+
+        QDir pluginsDir (qApp->applicationDirPath());
+        pluginsDir.cdUp();
+        pluginsDir.cd("./"LIB_DIR"/qmmp/Visual");
+        foreach (QString fileName, pluginsDir.entryList(QDir::Files))
+        {
+            QPluginLoader loader(pluginsDir.absoluteFilePath(fileName));
+            QObject *plugin = loader.instance();
+            if (loader.isLoaded())
+            {
+                qDebug("Visual: plugin loaded - %s", qPrintable(fileName));
+            }
+            VisualFactory *factory = 0;
+            if (plugin)
+                factory = qobject_cast<VisualFactory *>(plugin);
+
+            if (factory)
+            {
+                factories->append(factory);
+                files << pluginsDir.absoluteFilePath(fileName);
+            }
+        }
+    }
+}
+
+
+Visual::Visual(QWidget *parent) : QWidget(parent)
+{
+    setAttribute(Qt::WA_DeleteOnClose, TRUE);
+    setAttribute(Qt::WA_QuitOnClose, FALSE);
+}
 
 Visual::~Visual()
-{}
+{
+    qDebug("Visual::~Visual()");
+}
 
 Decoder *Visual::decoder() const
 {
@@ -51,3 +100,52 @@ QMutex *Visual::mutex()
 {
     return &m_mutex;
 }
+
+QList<VisualFactory*> *Visual::visualFactories()
+{
+    checkFactories();
+    return factories;
+}
+
+QStringList Visual::visualFiles()
+{
+    checkFactories();
+    return files;
+}
+
+void Visual::setEnabled(VisualFactory* factory, bool enable)
+{
+    checkFactories();
+    if(!factories->contains(factory))
+        return;
+
+    QString name = files.at(factories->indexOf(factory)).section('/',-1);
+    QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat );
+    QStringList visList = settings.value("Visualization/plugin_files").toStringList();
+
+    if(enable)
+    {
+        if (!visList.contains(name))
+            visList << name;
+    }
+    else
+        visList.removeAll(name);
+    settings.setValue("Visualization/plugin_files", visList);
+}
+
+bool Visual::isEnabled(VisualFactory* factory)
+{
+    checkFactories();
+    if(!factories->contains(factory))
+        return FALSE;
+    QString name = files.at(factories->indexOf(factory)).section('/',-1);
+    QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat );
+    QStringList visList = settings.value("Visualization/plugin_files").toStringList();
+    return visList.contains(name);
+}
+
+void Visual::closeEvent (QCloseEvent *event)
+{
+    m_output->removeVisual(this);
+    QWidget::closeEvent(event);
+}
diff --git a/lib/visual.h b/lib/visual.h
index cc28efb34..ef663bb37 100644
--- a/lib/visual.h
+++ b/lib/visual.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   Copyright (C) 2007 by Ilya Kotov                                      *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -25,15 +25,20 @@
 */
 
 #include <QMutex>
+#include <QStringList>
+#include <QWidget>
+#include <QMap>
 
 class Buffer;
 class Decoder;
 class Output;
+class VisualFactory;
 
-class Visual
+class Visual : public QWidget
 {
+    Q_OBJECT
 public:
-    Visual();
+    Visual(QWidget *parent);
 
     virtual ~Visual();
 
@@ -46,11 +51,19 @@ public:
     void setOutput(Output *output);
     QMutex *mutex();
 
+    //static methods
+    static QList<VisualFactory*> *visualFactories();
+    static QStringList visualFiles();
+    static void setEnabled(VisualFactory* factory, bool enable = TRUE);
+    static bool isEnabled(VisualFactory* factory);
+
+protected:
+    virtual void closeEvent (QCloseEvent *);
+
 private:
     Decoder *m_decoder;
     Output *m_output;
     QMutex m_mutex;
-
 };
 
 #endif
diff --git a/lib/visualfactory.h b/lib/visualfactory.h
new file mode 100644
index 000000000..6862032bb
--- /dev/null
+++ b/lib/visualfactory.h
@@ -0,0 +1,50 @@
+/***************************************************************************
+ *   Copyright (C) 2007 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef VISUALFACTORY_H
+#define VISUALFACTORY_H
+
+class QObject;
+class QWidget;
+class QTranslator;
+
+class Visual;
+
+struct VisualProperties
+{
+    QString name;
+    bool hasAbout;
+    bool hasSettings;
+};
+
+class VisualFactory
+{
+public:
+    virtual ~VisualFactory() {}
+    virtual const VisualProperties properties() const = 0;
+    virtual Visual *create(QWidget *parent) = 0;
+    virtual void showSettings(QWidget *parent) = 0;
+    virtual void showAbout(QWidget *parent) = 0;
+    virtual QTranslator *createTranslator(QObject *parent) = 0;
+};
+
+Q_DECLARE_INTERFACE(VisualFactory, "VisualFactory/1.0");
+
+#endif
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index f4833cc87..0005b1847 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   Copyright (C) 2007 by Ilya Kotov                                      *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -30,6 +30,7 @@
 #include <output.h>
 #include <decoderfactory.h>
 #include <outputfactory.h>
+#include <visualfactory.h>
 
 #include "skin.h"
 #include "filedialog.h"
@@ -42,6 +43,7 @@ ConfigDialog::ConfigDialog ( QWidget *parent )
 {
     ui.setupUi ( this );
     setAttribute(Qt::WA_QuitOnClose, FALSE);
+    setAttribute(Qt::WA_DeleteOnClose, FALSE);
     connect ( ui. contentsWidget,
               SIGNAL ( currentItemChanged ( QListWidgetItem *, QListWidgetItem * ) ),
               this, SLOT ( changePage ( QListWidgetItem *, QListWidgetItem* ) ) );
@@ -68,6 +70,8 @@ ConfigDialog::~ConfigDialog()
         delete m_outputPluginItems.takeFirst();
     while (!m_inputPluginItems.isEmpty())
         delete m_outputPluginItems.takeFirst();
+    while (!m_visualPluginItems.isEmpty())
+        delete m_visualPluginItems.takeFirst();
 }
 
 void ConfigDialog::readSettings()
@@ -226,8 +230,38 @@ void ConfigDialog::loadPluginsInfo()
     ui.outputPluginTable->resizeColumnToContents ( 0 );
     ui.outputPluginTable->resizeColumnToContents ( 1 );
     ui.outputPluginTable->resizeRowsToContents ();
+    /*
+        load visual plugin information
+    */
+    QList <VisualFactory *> *visuals = 0;
+    visuals = Visual::visualFactories();
+    files = Visual::visualFiles();
+    ui.visualPluginTable->setColumnCount ( 3 );
+    ui.visualPluginTable->verticalHeader()->hide();
+    ui.visualPluginTable->setHorizontalHeaderLabels ( QStringList()
+            << tr ( "Enabled" ) << tr ( "Description" ) << tr ( "Filename" ) );
+    ui.visualPluginTable->setRowCount ( visuals->count () );
+
+    for ( int i = 0; i < visuals->count (); ++i )
+    {
+        VisualPluginItem *item = new VisualPluginItem(this,visuals->at(i),files.at(i));
+        m_visualPluginItems.append(item);
+        QCheckBox* button = new QCheckBox (ui.visualPluginTable);
+        connect(button, SIGNAL(clicked (bool)), item, SLOT(select(bool)));
+        button->setChecked (item->isSelected());
+        ui.visualPluginTable->setCellWidget ( i, 0, button );
+        ui.visualPluginTable->setItem (i,1,
+                            new QTableWidgetItem (item->factory()->properties().name));
+        ui.visualPluginTable->setItem (i,2, new QTableWidgetItem (files.at(i)));
+    }
+
+    ui.visualPluginTable->resizeColumnToContents ( 0 );
+    ui.visualPluginTable->resizeColumnToContents ( 1 );
+    ui.visualPluginTable->resizeRowsToContents ();
+
 }
 
+
 void ConfigDialog::loadFonts()
 {
     QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat );
@@ -293,6 +327,14 @@ void ConfigDialog::showPluginSettings()
         m_outputPluginItems.at(row)->factory()->showSettings ( this );
         break;
     }
+    case 2:
+    {
+        int row = ui.visualPluginTable->currentRow ();
+        if ( m_visualPluginItems.isEmpty() || row < 0 )
+            return;
+        m_visualPluginItems.at(row)->factory()->showSettings ( this );
+        break;
+    }
     }
 }
 
@@ -319,6 +361,14 @@ void ConfigDialog::showPluginInfo()
         m_outputPluginItems.at(row)->factory()->showAbout ( this );
         break;
     }
+    case 2:
+    {
+        int row = ui.visualPluginTable->currentRow ();
+        if ( m_visualPluginItems.isEmpty() || row < 0 )
+            return;
+        m_visualPluginItems.at(row)->factory()->showAbout ( this );
+        break;
+    }
     }
 }
 
diff --git a/src/configdialog.h b/src/configdialog.h
index 879034d26..e694f6a8d 100644
--- a/src/configdialog.h
+++ b/src/configdialog.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   Copyright (C) 2007 by Ilya Kotov                                      *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -34,6 +34,7 @@ class QFileInfo;
 class Skin;
 class InputPluginItem;
 class OutputPluginItem;
+class VisualPluginItem;
 
 class ConfigDialog : public QDialog
 {
@@ -69,6 +70,7 @@ private:
 
     QList <InputPluginItem*> m_inputPluginItems;
     QList <OutputPluginItem*> m_outputPluginItems;
+    QList <VisualPluginItem*> m_visualPluginItems;
 };
 
 #endif
diff --git a/src/configdialog.ui b/src/configdialog.ui
index 3d1c462ea..4b68c84c6 100644
--- a/src/configdialog.ui
+++ b/src/configdialog.ui
@@ -238,7 +238,7 @@
                <string>Player:</string>
               </property>
               <property name="alignment" >
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
@@ -254,7 +254,7 @@
                <string>Playlist:</string>
               </property>
               <property name="alignment" >
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
               </property>
              </widget>
             </item>
@@ -544,6 +544,23 @@
              </item>
             </layout>
            </widget>
+           <widget class="QWidget" name="tab" >
+            <attribute name="title" >
+             <string>Visualization</string>
+            </attribute>
+            <layout class="QHBoxLayout" >
+             <item>
+              <widget class="QTableWidget" name="visualPluginTable" >
+               <property name="selectionMode" >
+                <enum>QAbstractItemView::SingleSelection</enum>
+               </property>
+               <property name="selectionBehavior" >
+                <enum>QAbstractItemView::SelectRows</enum>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
            <widget class="QWidget" name="fileDialogTab" >
             <attribute name="title" >
              <string>File Dialog</string>
diff --git a/src/mainvisual.cpp b/src/mainvisual.cpp
index 65bd287a1..cbd30a6dc 100644
--- a/src/mainvisual.cpp
+++ b/src/mainvisual.cpp
@@ -45,7 +45,7 @@ MainVisual *MainVisual::getPointer()
 }
 
 MainVisual::MainVisual (QWidget *parent)
-        : QWidget (parent), m_vis (0), m_playing (FALSE)
+        : Visual (parent), m_vis (0), m_playing (FALSE)
 {
     m_draw = TRUE;
     m_skin = Skin::getPointer();
@@ -72,6 +72,8 @@ MainVisual::~MainVisual()
     else
         settings.setValue("Visualization/type", "None");
     settings.setValue("Visualization/rate", 1000/m_timer->interval());
+    while (!m_nodes.isEmpty())
+        delete m_nodes.takeFirst();
 }
 
 void MainVisual::setVisual (VisualBase *newvis)
diff --git a/src/mainvisual.h b/src/mainvisual.h
index d31b1c73a..6f4b1907a 100644
--- a/src/mainvisual.h
+++ b/src/mainvisual.h
@@ -68,7 +68,7 @@ public:
 
 class Skin;
 
-class MainVisual : public QWidget, public Visual
+class MainVisual : public Visual
 {
     Q_OBJECT
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 2a6902e2c..324c8521b 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -44,6 +44,7 @@
 #include <addurldialog.h>
 #include "filedialog.h"
 #include "listwidget.h"
+#include "visualmenu.h"
 
 #define KEY_OFFSET 10
 
@@ -124,7 +125,8 @@ MainWindow::MainWindow(const QStringList& args, QWidget *parent)
     m_vis = MainVisual::getPointer();
 
     m_core = new SoundCore(this);
-    m_core -> addVisualization(m_vis);
+    m_core->addVisualization(m_vis);
+    m_core->showVisualization(this);
 
     connect(m_core, SIGNAL(outputStateChanged(const OutputState&)),
             SLOT(showOutputState(const OutputState&)));
@@ -459,7 +461,7 @@ void MainWindow::endSeek()
     seeking = FALSE;
 }
 
-void MainWindow::changeEvent ( QEvent * event )
+void MainWindow::changeEvent (QEvent * event)
 {
     if (event->type() == QEvent::ActivationChange)
     {
@@ -538,6 +540,7 @@ void MainWindow::showSettings()
         m_playlist->readSettings();
         TextScroller::getPointer()->readSettings();
         m_core->updateConfig();
+        m_visMenu->updateActions();
     }
     delete m_confDialog;
 }
@@ -587,6 +590,10 @@ void MainWindow::createActions()
     m_mainMenu->addSeparator();
     m_mainMenu->addAction(tr("&Jump To File"),this, SLOT(jumpToFile()), tr("J"));
     m_mainMenu->addSeparator();
+    m_visMenu = new VisualMenu(this);
+    m_mainMenu->addMenu(m_visMenu);
+
+    m_mainMenu->addSeparator();
     m_mainMenu->addAction(tr("&Settings"),this, SLOT(showSettings()), tr("Ctrl+P"));
     m_mainMenu->addSeparator();
     m_mainMenu->addAction(tr("&About"),this, SLOT(about()));
@@ -808,5 +815,3 @@ void MainWindow::addUrl( )
 {
     AddUrlDialog::popup(this,m_playListModel);
 }
-
-
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 7faf06ef3..97caed52a 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -41,6 +41,7 @@ class MainVisual;
 class Skin;
 class SoundCore;
 class JumpToTrackDialog;
+class VisualMenu;
 
 class QMenu;
 class QKeyEvent;
@@ -133,6 +134,7 @@ private:
     JumpToTrackDialog* m_jumpDialog;
     bool m_hide_on_titlebar_close;
     int m_elapsed;
+    VisualMenu *m_visMenu;
 };
 
 #endif
diff --git a/src/pluginitem.cpp b/src/pluginitem.cpp
index a0498df34..391f75148 100644
--- a/src/pluginitem.cpp
+++ b/src/pluginitem.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   Copyright (C) 2007 by Ilya Kotov                                      *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -23,6 +23,8 @@
 
 #include <decoderfactory.h>
 #include <outputfactory.h>
+#include <visualfactory.h>
+#include <soundcore.h>
 
 #include "pluginitem.h"
 
@@ -89,3 +91,33 @@ OutputFactory *OutputPluginItem::factory()
 {
    return m_factory;
 }
+
+/*Visual*/
+VisualPluginItem::VisualPluginItem(QObject *parent, VisualFactory *fact,
+                                   const QString &filePath): QObject(parent)
+{
+    m_fileName = filePath.section('/',-1);
+    m_factory = fact;
+}
+
+
+VisualPluginItem::~VisualPluginItem()
+{}
+
+void VisualPluginItem::select(bool on)
+{
+    if(on)
+        SoundCore::instance()->addVisual(m_factory, 0);
+    else
+        SoundCore::instance()->removeVisual(m_factory);
+}
+
+bool VisualPluginItem::isSelected()
+{
+    return Visual::isEnabled(m_factory);
+}
+
+VisualFactory *VisualPluginItem::factory()
+{
+   return m_factory;
+}
diff --git a/src/pluginitem.h b/src/pluginitem.h
index a8877e61c..4a54f0e9d 100644
--- a/src/pluginitem.h
+++ b/src/pluginitem.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   Copyright (C) 2007 by Ilya Kotov                                      *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -28,6 +28,7 @@
 
 class DecoderFactory;
 class OutputFactory;
+class VisualFactory;
 
 class InputPluginItem : public QObject
 {
@@ -69,4 +70,23 @@ private:
 
 };
 
+class VisualPluginItem : public QObject
+{
+    Q_OBJECT
+public:
+    VisualPluginItem(QObject *parent, VisualFactory *fact, const QString &filePath);
+
+    ~VisualPluginItem();
+
+    bool isSelected();
+    VisualFactory * factory();
+
+public slots:
+    void select(bool);
+
+private:
+    QString m_fileName;
+    VisualFactory *m_factory;
+};
+
 #endif
diff --git a/src/src.pro b/src/src.pro
index 9355db692..26e584144 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -138,7 +138,9 @@ target.path = /bin
 INSTALLS += target
 
 HEADERS += addurldialog.h \
- skinreader.h
+ skinreader.h \
+ visualmenu.h
 SOURCES += addurldialog.cpp \
- skinreader.cpp
+ skinreader.cpp \
+ visualmenu.cpp
 FORMS += addurldialog.ui
diff --git a/src/visualmenu.cpp b/src/visualmenu.cpp
new file mode 100644
index 000000000..2b0ad6797
--- /dev/null
+++ b/src/visualmenu.cpp
@@ -0,0 +1,53 @@
+/***************************************************************************
+ *   Copyright (C) 2007 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include <QAction>
+
+#include <visual.h>
+#include <visualfactory.h>
+
+#include "pluginitem.h"
+#include "visualmenu.h"
+
+VisualMenu::VisualMenu(QWidget *parent)
+ : QMenu(tr("Visualization"), parent)
+{
+    VisualFactory *factory = 0;
+    foreach(factory, *Visual::visualFactories())
+    {
+        QAction *act = this->addAction(factory->properties().name);
+        act->setCheckable (TRUE);
+        act->setChecked (Visual::isEnabled(factory));
+        VisualPluginItem *vi = new VisualPluginItem(this,factory, "");
+        connect(act, SIGNAL(toggled(bool)), vi, SLOT(select(bool)));
+    }
+}
+
+VisualMenu::~VisualMenu()
+{
+}
+
+void VisualMenu::updateActions()
+{
+    for(int i = 0; i < Visual::visualFactories()->size(); ++i)
+    {
+        actions()[i]->setChecked(Visual::isEnabled(Visual::visualFactories()->at(i)));
+    }
+}
diff --git a/src/visualmenu.h b/src/visualmenu.h
new file mode 100644
index 000000000..9202a8a7d
--- /dev/null
+++ b/src/visualmenu.h
@@ -0,0 +1,40 @@
+/***************************************************************************
+ *   Copyright (C) 2007 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef VISUALMENU_H
+#define VISUALMENU_H
+
+#include <QMenu>
+
+/**
+	@author Ilya Kotov <forkotov02@hotmail.ru>
+*/
+class VisualMenu : public QMenu
+{
+Q_OBJECT
+public:
+    VisualMenu(QWidget *parent = 0);
+
+    ~VisualMenu();
+
+void updateActions();
+
+};
+
+#endif