copy 1.2 branch to trunk

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

1 files changed, 19 insertions, 0 deletions

diff --git a/src/plugins/Output/qtmultimedia/outputqtmultimedia.h b/src/plugins/Output/qtmultimedia/outputqtmultimedia.h
index ea69b9b3f..f09a4307b 100644
--- a/src/plugins/Output/qtmultimedia/outputqtmultimedia.h
+++ b/src/plugins/Output/qtmultimedia/outputqtmultimedia.h
@@ -23,12 +23,14 @@
 
 #include <qmmp/output.h>
 #include <QScopedPointer>
+#include <QObject>
 
 /**
     @author Ivan Ponomarev ivantrue@gmail.com
 */
 class QAudioOutput;
 class QIODevice;
+class OutputControl;
 
 class OutputQtMultimedia : public Output
 {
@@ -46,9 +48,26 @@ public:
 
 private:
     QScopedPointer<QAudioOutput> m_output;
+    QScopedPointer<OutputControl> m_control;
     QIODevice *m_buffer;
     qint64 m_bytes_per_second;
 };
 
+class OutputControl : public QObject
+{
+    Q_OBJECT
+
+public:
+    OutputControl(QAudioOutput *o);
+
+public slots:
+    void suspend();
+    void resume();
+
+private:
+    QAudioOutput *m_output;
+
+};
+
 
 #endif // OUTPUTQTMULTIMEDIA_H