summaryrefslogtreecommitdiffstats
path: root/examples/multimedia/audioinput
Commit message (Collapse)AuthorAgeFilesLines
* Update contact information in license headers.Sergio Ahumada2012-08-013-6/+6
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-113-3/+3
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-283-0/+18
| | | | (4.7-generated-declarative branch).
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-173-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-103-3/+3
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-251-0/+5
|\ \ | |/
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-10-251-0/+5
| |\ | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qcryptographichash.cpp src/opengl/qgl_p.h
| | * Add header guards to audio example headers.Justin McPherson2010-10-081-0/+5
| | | | | | | | | | | | | | | Task-number: QTBUG-13413 Reviewed-by: Andrew den Exter
* | | Remove the use of deprecated qVariant*Olivier Goffart2010-08-061-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test directory untouched. This just apply those regexp: git grep -O"sed -i 's/qVariantValue</qvariant_cast</'" qVariantValue git grep -O"sed -i 's/qVariantSetValue(\([^&*\(),]*\), */\\1.setValue(/'" qVariantSetValue git grep -O"sed -i 's/qVariantSetValue *<\([^>]*\)> *(\([^&*\(),]*\), */\\2.setValue<\\1>(/'" qVariantSetValue git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*([^&*\(),]*)\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantFromValue\( *[(<]\)/QVariant::fromValue\\1/'" qVariantFromValue git checkout src/corelib/kernal/qvariant* Rev-by: dev mailing list
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-161-0/+5
|\ \ | |/ | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog
| * AudioInput example; disconnect from the built-in device when changing mode.Justin McPherson2010-06-161-0/+5
| | | | | | | | Reviewed-by:Dmytro Poplavskiy
* | Doc: Updated example license to three clause BSD license.David Boddie2010-05-193-83/+80
| | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-251-0/+1
|\ \ | |/ | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
| * Added Symbian UserEnvironment capability to audioinput exampleGareth Stockwell2010-03-231-0/+1
| | | | | | | | | | | | | | | | Symbian applications which use QAudioInput must have this Platform Security capability. Without it, the Symbian audio subsystem will not allow the application to record audio. Reviewed-by: trustme
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-061-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/multimedia/audioinput/audioinput.cpp src/corelib/io/qfsfileengine.cpp src/gui/egl/qegl_wince.cpp src/gui/egl/qeglproperties.cpp src/gui/egl/qeglproperties_p.h src/gui/embedded/directfb.pri src/gui/kernel/qapplication_win.cpp src/gui/painting/qdrawutil.cpp src/opengl/qgl_p.h src/sql/drivers/odbc/qsql_odbc.cpp src/sql/drivers/odbc/qsql_odbc.h tests/auto/auto.pro tests/auto/qgl/tst_qgl.cpp translations/assistant_adp_ru.ts
| * Fix warnings in AudioInput example.Justin McPherson2010-03-022-1/+3
| | | | | | | | Reviewed-by: Kurt Korbatits
* | Fixa few warnings on mingwThierry Bastian2010-03-051-0/+6
|/
* Pass QAudioDeviceInfo when creating audio input/output in examplesGareth Stockwell2010-02-181-1/+1
| | | | Reviewed-by: trustme
* Changed function names in audio input example to clarify meaningGareth Stockwell2010-02-162-6/+7
| | | | Reviewed-by: trustme
* Tidied up debug output in audio input exampleGareth Stockwell2010-02-161-3/+5
| | | | Reviewed-by: trustme
* Removed redundant strings from audio input exampleGareth Stockwell2010-02-162-8/+18
| | | | Reviewed-by: trustme
* Cleaned up memory management in audio input exampleGareth Stockwell2010-02-162-36/+54
| | | | Reviewed-by: trustme
* Changed variable names in audio input example to match Qt code styleGareth Stockwell2010-02-162-93/+93
| | | | | | | | Also changed some names to better convey their meanings, e.g. button -> m_modeButton button2 -> m_suspendResumeButton Reviewed-by: trustme
* Made level calculation in audio input example work for all formatsGareth Stockwell2010-02-162-42/+80
| | | | | | | | The previous code only worked correctly for little-endian PCM16 formats. If the audio input device does not support such a format, the example previously would not run. Reviewed-by: trustme
* Removed unused variable from audio input exampleGareth Stockwell2010-02-162-7/+3
| | | | Reviewed-by: trustme
* Update suspend/resume button label in audio input exampleGareth Stockwell2010-02-161-0/+2
| | | | | | | | When the mode is toggled, playback is always started, even if the audio input device was previously suspended. The label on the suspend/resume button must therefore be updated. Reviewed-by: trustme
* [CRASH] audioinput and audiooutput examples crash when no devices areKurt Korbatits2010-02-071-0/+3
| | | | | | | available. Task-number:QTBUG-7783 Reviewed-by:Justin McPherson
* Revert "Added setChannelCount() to QAudioFormat."Kurt Korbatits2010-01-141-2/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit f124538ef4840c3d24b4c7e9e7221adb52bdee2c. Conflicts: examples/multimedia/audioinput/audioinput.cpp examples/multimedia/audiooutput/audiooutput.cpp src/multimedia/audio/qaudio_mac.cpp src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.h src/multimedia/audio/qaudioinput.cpp src/multimedia/audio/qaudiooutput.cpp tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp tests/auto/qaudioformat/tst_qaudioformat.cpp tests/auto/qaudioinput/tst_qaudioinput.cpp tests/auto/qaudiooutput/tst_qaudiooutput.cpp
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-081-2/+2
|\ | | | | | | | | Conflicts: src/multimedia/audio/qaudioformat.cpp
| * Frequency to SampleRate and channels to channelCount.Kurt Korbatits2010-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | -Added channelCount(), changed everything to use this instead of channels() in QAudioFormat class. -Added setSampleRate() and sampleRate(), changed everthing to use these instead of setFrequency() and frequency() in QAudioFormat class. -Added supportedSampleRates() and supportedChannelCounts(), changed everything to use these instead of supportedFrequencies() and supportedChannels() in QAudioDeviceInfo class. Reviewed-by:Justin McPherson
| * Added setChannelCount() to QAudioFormat.Kurt Korbatits2010-01-061-1/+1
| | | | | | | | | | | | | | Added setChannelCount() and updated docs/examples/tests to use it instead of setChannels(). Reviewed-by:Justin McPherson
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-073-3/+3
|\ \
| * | Update copyright year to 2010Jason McDonald2010-01-063-3/+3
| |/ | | | | | | Reviewed-by: Trust Me
* | Doc: Made coding style changes to the Audio Input and Output examples.David Boddie2010-01-062-53/+57
|/ | | | Reviewed-by: Trust Me
* audioinput and audiooutput examples not using isFormatSupportedKurt Korbatits2009-12-071-1/+11
| | | | | | | | | function. The examples failed to easy, added check to test and get if required a format to use from the backend. Increases the chance of examples working on various platforms like n900. Reviewed-by:Justin McPherson
* Changes to low-level audio API.Kurt Korbatits2009-11-101-5/+5
| | | | | | | | | | | | | QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic) QAudio::SuspendState -> QAudio::SuspendedState QAudio::StopState -> QAudio::StoppedState QAudioDeviceInfo::deviceList() -> QAudioDeviceInfo::availableDevices() clock() -> elapsedUSecs() totalTime() -> processedUSecs() QIODevice* start(QIODevice*) -> void start(QIODevice*), QIODevice* start() Reviewed-by:Justin McPherson
* Changes to low-level audio API.Kurt Korbatits2009-11-101-5/+5
| | | | | | | | | | | | | | | QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic) QAudio::SuspendState -> QAudio::SuspendedState QAudio::StopState -> QAudio::StoppedState QAudioDeviceInfo::deviceList() -> QAudioDeviceInfo::availableDevices() clock() -> elapsedUSecs() totalTime() -> processedUSecs() QIODevice* start(QIODevice*) -> void start(QIODevice*), QIODevice* start() Reviewed-by:Justin McPherson
* Changes to low-level audio API.Kurt Korbatits2009-11-051-5/+5
| | | | | | | | | | | | | QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic) QAudio::SuspendState -> QAudio::SuspendedState QAudio::StopState -> QAudio::StoppedState QAudioDeviceInfo::deviceList() -> QAudioDeviceInfo::availableDevices() clock() -> elapsedUSecs() totalTime() -> processedUSecs() QIODevice* start(QIODevice*) -> void start(QIODevice*), QIODevice* start() Reviewed-by:Justin McPherson
* Fixed clock() function return values in audio class's.Kurt Korbatits2009-10-221-1/+1
| | | | | | | clock() function should return microseconds, fixed example, alsa backend and win32 backend. Reviewed-by:Justin McPherson
* Move audio and video examples into the common multimedia directory.Andrew den Exter2009-10-164-0/+491
Brings the video examples into multimedia directory, and removes the audio sub-directory so the directory structure is in line with the other example categories. Task-number: QT-667 Reviewed-by: Kurt Korbatits