Changeset 769 for trunk/examples/multimedia/audioinput/audioinput.h

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• examples/multimedia/audioinput/audioinput.h (modified) (6 diffs)

trunk/examples/multimedia/audioinput/audioinput.h

@@ -46 +46 @@
 #include <QPushButton>
 #include <QComboBox>
+
 
 #include <qaudioinput.h>
@@ -53 +54 @@
     Q_OBJECT
 public:
-    AudioInfo(QObject *parent, QAudioInput *device);
+    AudioInfo();
     ~AudioInfo();
 
@@ -59 +60 @@
     void stop();
 
-    int LinearMax();
+    
 
     qint64 readData(char *data, qint64 maxlen);
     qint64 writeData(const char *data, qint64 len);
 
-    QAudioInput *input;
-
 private:
-    int m_maxValue;
+    const QAudioFormat m_format;
+    quint16 m_maxAmplitude;
+    qreal m_level; // 0.0 <= m_level <= 1.0
 
 signals:
@@ -81 +82 @@
     RenderArea(QWidget *parent = 0);
 
-    void setLevel(int value);
+    void setLevel( value);
 
 protected:
@@ -87 +88 @@
 
 private:
-    int level;
-    QPixmap pixmap;
+    level;
+    QPixmap pixmap;
 };
 
@@ -98 +99 @@
     ~InputTest();
 
+
+
+
+
+
 private slots:
     void refreshDisplay();
-    void status();
+    void ();
     void readMore();
     void toggleMode();
     void toggleSuspend();
-    void state(QAudio::State s);
-    void deviceChanged(int idx);
+    void state);
+    void deviceChanged(int ix);
 
 private:
-    AudioInfo *audioinfo;
-    QAudioDeviceInfo device;
-    QAudioFormat format;
-    QAudioInput *audioInput;
-    QIODevice *input;
-    RenderArea *canvas;
+    // Owned by layout
+    RenderArea *m_canvas;
+    QPushButton *m_modeButton;
+    QPushButton *m_suspendResumeButton;
+    QComboBox *m_deviceBox;
 
-    bool pullMode;
+    QAudioDeviceInfo m_device;
+    AudioInfo *m_audioInfo;
+    QAudioFormat m_format;
+    QAudioInput *m_audioInput;
+    QIODevice *m_input;
+    bool m_pullMode;
+    QByteArray m_buffer;
 
-    QPushButton *button;
-    QPushButton *button2;
-    QComboBox *deviceBox;
-
-    char *buffer;
+    static const QString PushModeLabel;
+    static const QString PullModeLabel;
+    static const QString SuspendLabel;
+    static const QString ResumeLabel;
 };