summaryrefslogtreecommitdiffstats
path: root/examples/multimedia
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-174-290/+439
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro mkspecs/features/resources.prf mkspecs/features/uic.prf src/corelib/io/qurl.cpp src/corelib/tools/qlocale_symbian.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicswidget_p.cpp src/gui/graphicsview/qgraphicswidget_p.h src/gui/util/qsystemtrayicon_win.cpp src/multimedia/audio/qaudioinput.cpp tests/auto/qhostinfo/qhostinfo.pro
| * Modified audiodevices example to list all supported formatsGareth Stockwell2010-05-074-290/+439
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Divided the UI into two tabs: - One which lists all formats supported by the device, in a table. This table is populated dynamically when the user presses a button, rather than at application startup - for some backends such as ALSA, isFormatSupported() is a time-consuming operation. - One which allows the user to specify a particular format, and then test whether it is supported. If the format is not supported, the nearest supported format is displayed. Changing mode causes test result to be cleared. Call showFullScreen() on small-screen devices. Reviewed-by: Kurt Korbatits
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-291-235/+282
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | All EGL-related changes from 4.6 were discarded. Conflicts: src/gui/egl/egl.pri src/gui/egl/qegl.cpp src/gui/egl/qegl_p.h src/gui/egl/qegl_stub.cpp src/gui/egl/qeglproperties_p.h src/gui/egl/qeglproperties_stub.cpp src/gui/gui.pro src/multimedia/multimedia/audio/qaudioinput_win32_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * Adjusted layout of audiodevice example to use scrollbar.Kurt Korbatits2010-04-271-235/+282
| | | | | | | | Reviewed-by:Justin McPherson
* | 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-182-2/+3
| | | | 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
* Changed function names in audio output example to clarify meaningGareth Stockwell2010-02-162-23/+20
| | | | Reviewed-by: trustme
* Cleaned up implementation of audio output exampleGareth Stockwell2010-02-161-17/+10
| | | | Reviewed-by: trustme
* Tidied up debug output in audio output exampleGareth Stockwell2010-02-162-7/+9
| | | | Reviewed-by: trustme
* Removed redundant strings from audio output exampleGareth Stockwell2010-02-162-13/+24
| | | | Reviewed-by: trustme
* Cleaned up memory management in audio output exampleGareth Stockwell2010-02-162-38/+61
| | | | Reviewed-by: trustme
* Changed variable names in audio output example to match Qt code styleGareth Stockwell2010-02-162-92/+92
| | | | | | | | Also changed some names to better convey their meanings, e.g. button -> m_modeButton button2 -> m_suspendResumeButton Reviewed-by: trustme
* Made data generation in audio output example work for all formatsGareth Stockwell2010-02-162-72/+75
| | | | | | | | | | | The previous code only worked correctly for mono PCM16 formats. This meant that: a) If the device did not support mono, but did support stereo PCM16, the tone would be played at the wrong pitch. b) If the device did not support little-endian PCM16 at all (admittedly unlikely), the example would not run. Reviewed-by: trustme
* Update suspend/resume button label in audio output exampleGareth Stockwell2010-02-161-0/+2
| | | | | | | | When the mode is toggled, playback is always started, even if the audio output device was previously suspended. The label on the suspend/resume button must therefore be updated. Reviewed-by: trustme
* Added missing override in audio output exampleGareth Stockwell2010-02-162-0/+6
| | | | | | | Because the QIODevice-derived class Generator owns its own internal buffer, it must override bytesAvailable(). Reviewed-by: trustme
* [CRASH] audioinput and audiooutput examples crash when no devices areKurt Korbatits2010-02-072-0/+6
| | | | | | | available. Task-number:QTBUG-7783 Reviewed-by:Justin McPherson
* Revert "Frequency to SampleRate and channels to channelCount."Kurt Korbatits2010-01-141-6/+6
| | | | | | | | | | | | | | | | | | | | This reverts commit 80d4a4945d3273a4b2ce91e34597533f661af320. 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
* Revert "Added setChannelCount() to QAudioFormat."Kurt Korbatits2010-01-143-6/+6
| | | | | | | | | | | | | | | | | | | | 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-083-16/+16
|\ | | | | | | | | Conflicts: src/multimedia/audio/qaudioformat.cpp
| * Merge branch '4.6' of ../../4.6 into 4.6Justin McPherson2010-01-074-65/+80
| |\ | | | | | | | | | | | | Conflicts: examples/multimedia/audiodevices/audiodevices.cpp
| * | Frequency to SampleRate and channels to channelCount.Kurt Korbatits2010-01-063-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -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-063-4/+4
| | | | | | | | | | | | | | | | | | | | | 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-0721-21/+21
|\ \ \
| * | | Update copyright year to 2010Jason McDonald2010-01-0621-21/+21
| | |/ | |/| | | | | | | Reviewed-by: Trust Me
* | | Doc: Made coding style changes to the Audio Input and Output examples.David Boddie2010-01-063-66/+70
|/ / | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-174-69/+84
|\ \ | |/ |/|
| * Doc: Modified the coding style of the Audio Devices example.David Boddie2009-12-154-69/+84
| | | | | | | | | | | | This commit will be a duplicate of the same change applied elsewhere. Reviewed-by: Kurt Korbatits
* | audioinput and audiooutput examples not using isFormatSupportedKurt Korbatits2009-12-072-1/+23
|/ | | | | | | | | 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-103-12/+12
| | | | | | | | | | | | | 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-103-12/+12
| | | | | | | | | | | | | | | 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-053-12/+12
| | | | | | | | | | | | | 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
* QVideoFrame API review changes.Andrew den Exter2009-11-042-3/+3
| | | | | | | | Rename equivalentImageFormat() to imageFormatFromPixelFormat(). Rename equivalentPixelFormat() to pixelFormatFromImageFormat(). Rename numBytes() to mappedBytes(). Reviewed-by: Justin McPherson
* QAbstractVideoSurface API review changes.Andrew den Exter2009-11-044-6/+4
| | | | | | | | | Rename isStarted() and startedChanged() to is active() and activeChanged(). Remove the the similar format argument from isFormatSupported() and add a new nearestFormat() function which provides the same functionality. Reviewed-by: Justin McPherson
* Fixed clock() function return values in audio class's.Kurt Korbatits2009-10-222-2/+2
| | | | | | | 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-1629-18/+1400
| | | | | | | | | 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
* Demos and applications have a nice Qt logo when installed on SymbianEspen Riskedal2009-10-023-3/+3
| | | | | | | | | | Added a line to the symbianpkgrules.pri files which includes an ICON if the TARGET.UID3 is defined. We should fix the application_icon.prf to handle ICON without UID3 situations more gracefully, but for now I reordered existing UID3s to be specified before the symbianpkgrules.pri includes. Reviewed-by: Aleksandar Babic
* AudioServices; Nicer examples.Justin McPherson2009-09-244-192/+82
| | | | Reviewed-by: Bill King
* AudioService API changes; QString->const QString&, remove QAudioDeviceId use ↵Justin McPherson2009-09-246-32/+21
| | | | | | QAudioDeviceInfo. Reviewed-by: Bill King
generated by cgit v0.12 at 2024-09-18 00:08:33 (GMT)