diff options
author | Yann Bodson <yann.bodson@nokia.com> | 2010-11-12 00:23:27 (GMT) |
---|---|---|
committer | Yann Bodson <yann.bodson@nokia.com> | 2010-11-12 00:23:27 (GMT) |
commit | 6e49bbc11a0cbe2f596f26066256154b0a5b23be (patch) | |
tree | 2d7cb412d212187c9b07a9f6d9fcd2b461a70936 /demos/spectrum/app/mainwidget.h | |
parent | 1d228b5d532dc158d1c9ac3347168cdc11378779 (diff) | |
parent | 7a81735272b5ee065f499a492cca4b4a703e0659 (diff) | |
download | Qt-6e49bbc11a0cbe2f596f26066256154b0a5b23be.zip Qt-6e49bbc11a0cbe2f596f26066256154b0a5b23be.tar.gz Qt-6e49bbc11a0cbe2f596f26066256154b0a5b23be.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Diffstat (limited to 'demos/spectrum/app/mainwidget.h')
-rw-r--r-- | demos/spectrum/app/mainwidget.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/demos/spectrum/app/mainwidget.h b/demos/spectrum/app/mainwidget.h index ddab8b7..13131c0 100644 --- a/demos/spectrum/app/mainwidget.h +++ b/demos/spectrum/app/mainwidget.h @@ -80,21 +80,21 @@ public slots: const FrequencySpectrum &spectrum); void infoMessage(const QString &message, int timeoutMs); void errorMessage(const QString &heading, const QString &detail); - void positionChanged(qint64 position); - void bufferDurationChanged(qint64 duration); + void audioPositionChanged(qint64 position); + void bufferLengthChanged(qint64 length); private slots: void showFileDialog(); void showSettingsDialog(); void showToneGeneratorDialog(); void initializeRecord(); - void dataDurationChanged(qint64 duration); + void updateModeMenu(); + void updateButtonStates(); private: void createUi(); void createMenus(); void connectUi(); - void updateButtonStates(); void reset(); enum Mode { @@ -111,7 +111,9 @@ private: Engine* m_engine; +#ifndef DISABLE_WAVEFORM Waveform* m_waveform; +#endif ProgressBar* m_progressBar; Spectrograph* m_spectrograph; LevelMeter* m_levelMeter; |