summaryrefslogtreecommitdiffstats
path: root/examples/multimedia
Commit message (Expand)AuthorAgeFilesLines
* Update copyright year to 2011.Jason McDonald2011-01-1021-21/+21
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-10-253-0/+14
|\
| * Add header guards to audio example headers.Justin McPherson2010-10-083-0/+14
* | Fix audio glitches in the audiooutput example.Andrew den Exter2010-09-221-2/+2
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-211-0/+2
|\ \
| * | Fix example compile and runtime warnings, webkit examples not built.Friedemann Kleint2010-06-181-0/+2
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-161-0/+5
|\ \ \ | |/ / |/| / | |/
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-06-162-2/+28
| |\
| * | AudioInput example; disconnect from the built-in device when changing mode.Justin McPherson2010-06-161-0/+5
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-162-2/+28
|\ \ \ | | |/ | |/|
| * | VideoWidget exampleKurt Korbatits2010-06-162-2/+28
| |/
* | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1921-577/+556
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-174-290/+439
|\ \ | |/
| * Modified audiodevices example to list all supported formatsGareth Stockwell2010-05-074-290/+439
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-291-235/+282
|\ \ | |/
| * Adjusted layout of audiodevice example to use scrollbar.Kurt Korbatits2010-04-271-235/+282
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-251-0/+1
|\ \ | |/
| * Added Symbian UserEnvironment capability to audioinput exampleGareth Stockwell2010-03-231-0/+1
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-061-1/+1
|\ \ | |/
| * Fix warnings in AudioInput example.Justin McPherson2010-03-022-1/+3
* | Fixa few warnings on mingwThierry Bastian2010-03-051-0/+6
|/
* Pass QAudioDeviceInfo when creating audio input/output in examplesGareth Stockwell2010-02-182-2/+3
* Changed function names in audio input example to clarify meaningGareth Stockwell2010-02-162-6/+7
* Tidied up debug output in audio input exampleGareth Stockwell2010-02-161-3/+5
* Removed redundant strings from audio input exampleGareth Stockwell2010-02-162-8/+18
* Cleaned up memory management in audio input exampleGareth Stockwell2010-02-162-36/+54
* Changed variable names in audio input example to match Qt code styleGareth Stockwell2010-02-162-93/+93
* Made level calculation in audio input example work for all formatsGareth Stockwell2010-02-162-42/+80
* Removed unused variable from audio input exampleGareth Stockwell2010-02-162-7/+3
* Update suspend/resume button label in audio input exampleGareth Stockwell2010-02-161-0/+2
* Changed function names in audio output example to clarify meaningGareth Stockwell2010-02-162-23/+20
* Cleaned up implementation of audio output exampleGareth Stockwell2010-02-161-17/+10
* Tidied up debug output in audio output exampleGareth Stockwell2010-02-162-7/+9
* Removed redundant strings from audio output exampleGareth Stockwell2010-02-162-13/+24
* Cleaned up memory management in audio output exampleGareth Stockwell2010-02-162-38/+61
* Changed variable names in audio output example to match Qt code styleGareth Stockwell2010-02-162-92/+92
* Made data generation in audio output example work for all formatsGareth Stockwell2010-02-162-72/+75
* Update suspend/resume button label in audio output exampleGareth Stockwell2010-02-161-0/+2
* Added missing override in audio output exampleGareth Stockwell2010-02-162-0/+6
* [CRASH] audioinput and audiooutput examples crash when no devices areKurt Korbatits2010-02-072-0/+6
* Revert "Frequency to SampleRate and channels to channelCount."Kurt Korbatits2010-01-141-6/+6
* Revert "Added setChannelCount() to QAudioFormat."Kurt Korbatits2010-01-143-6/+6
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-083-16/+16
|\
| * Merge branch '4.6' of ../../4.6 into 4.6Justin McPherson2010-01-074-65/+80
| |\
| * | Frequency to SampleRate and channels to channelCount.Kurt Korbatits2010-01-063-8/+8
| * | Added setChannelCount() to QAudioFormat.Kurt Korbatits2010-01-063-4/+4
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-0721-21/+21
|\ \ \
| * | | Update copyright year to 2010Jason McDonald2010-01-0621-21/+21
| | |/ | |/|
* | | Doc: Made coding style changes to the Audio Input and Output examples.David Boddie2010-01-063-66/+70
|/ /
* | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-174-69/+84
|\ \ | |/ |/|