added visual plugin support

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

1 files changed, 9 insertions, 6 deletions

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;
 };