summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Collapse)AuthorAgeFilesLines
* QAudioInput: possible change of state without emitting stateChange()Kurt Korbatits2010-04-062-2/+1
| | | | | | | | Removed state change from close() function, should be set by caller depending on context. Task-number:QTBUG-9357 Reviewed-by:Dmytro Poplavskiy
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-241-2/+2
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Calculate period size correctly.
| * Calculate period size correctly.Justin McPherson2010-03-241-2/+2
| | | | | | | | Reviewed-by:Dmytro Poplavskiy
* | Symbian QAudioOutput::suspend() was resetting processedUSecs() to zeroGareth Stockwell2010-03-241-1/+2
|/ | | | | | | | | | | | | Because of the logic in the Symbian implementations of suspend() and processedUSecs(), the behaviour prior to this patch was as follows: - after calling suspend(), processedUSecs() reported zero - when resume() is called, the amount of silent padding data inserted into the output stream is equal to the amount of data played prior to suspend() The patch corrects the above defect, but introduces a new one, which is described in QTBUG-9322 Reviewed-by: trustme
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-163-30/+52
|\ | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Use AudioConverter when not preferred format. Handle values passed to setNotifyInterval more robustly. Make sure to check for a valid audioformat before open.
| * Use AudioConverter when not preferred format.Justin McPherson2010-03-162-26/+34
| | | | | | | | Reviewed-by:Dmytro Poplavskiy
| * Handle values passed to setNotifyInterval more robustly.Justin McPherson2010-03-162-2/+16
| | | | | | | | Reviewed-by:Dmytro Poplavskiy
| * Make sure to check for a valid audioformat before open.Justin McPherson2010-03-162-2/+2
| | | | | | | | Reviewed-by:Dmytro Poplavskiy
* | Moved Symbian audio backend into QtMultimedia.dllGareth Stockwell2010-03-1210-6/+2571
|/ | | | | | | | | Changed backend from being a plugin, to being statically compiled into QtMultimedia.dll. This is to achieve consistency with the backends for other plugins, and to allow the plugin API to be modified. Task-number: QTBUG-8994 Reviewed-by: trustme
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-03-112-1/+2
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Justin McPherson2010-03-111-1/+5
| |\ | | | | | | | | | into 4.6
| * | Ensure audio converter member is initialized.Justin McPherson2010-03-111-0/+1
| | | | | | | | | | | | Reviewed-by:Dmytro Poplavskiy
| * | Documentation fix.Justin McPherson2010-03-111-1/+1
| | | | | | | | | | | | Reviewed-by:Dmytro Poplavskiy
* | | QAudioInput sometimes not writing to QIODeviceKurt Korbatits2010-03-111-0/+20
| |/ |/| | | | | | | | | | | Handle error recovery better. Task-number:QTBUG-8893 Reviewed-by:Derick Hawcroft
* | QAudioInput::processedUSecs() incorrectKurt Korbatits2010-03-111-1/+5
|/ | | | | | | | Bug introduced by change 04532ba052559b265b1bc85dc143d8aeeb02149f Was calculating time assuming totalTimeValue was in frames but it is stored as bytes in alsa input case. Reviewed-by:Dmytro Poplavskiy
* SIGSEGV after QAudioOutput closed.Kurt Korbatits2010-03-101-0/+3
| | | | | Task-number:QTBUG-8755 Reviewed-by:Derick Hawcroft
* Fixed deadlock introduced by changeKurt Korbatits2010-03-101-1/+2
| | | | | | | 83e73a69d5a1c6b94c5c83f91141f35d65d27f36. alsa callback was deadlocking with QEventDispatcherGlib. Reviewed-by:Dmytro Poplavskiy
* Fixed invokeMethod in alsa implementation.Kurt Korbatits2010-03-101-1/+1
| | | | Reviewed-by:Dmytro Poplavskiy
* Linux QAudioOutput playback stutteringKurt Korbatits2010-03-041-1/+43
| | | | | | | | Adjust buffer and period sizes if system cannot work with defaults (alsa). Task-number:QTBUG-8339 Reviewed-by:Derick Hawcroft
* Fix namespace issues.Justin McPherson2010-03-024-13/+13
| | | | Reviewed-by: Kurt Korbatits
* Fix Audio input on OSX 10.6.Justin McPherson2010-03-021-1/+3
| | | | | Task-number: QTBUG-5741 Reviewed-by: Kurt Korbatits
* win32 backend for low-level audio doesn't pass new unit testsKurt Korbatits2010-02-232-26/+78
| | | | | | | | | | | | | New unit tests have identified issues with awin32 backend. These issues need to be resolved before new unit tests are added. * stateChanged() signal should only be emitted on change of state currently signals can be emitted multiple times. * for output data is being lost when input can be read from QIODevice but cannot be written to audio sub system. Task-number:QTBUG-8441 Reviewed-by:Dmytro Poplavskiy
* alsa backend for low-level audio doesn't pass new unit testsKurt Korbatits2010-02-232-118/+67
| | | | | | | | | | | | | | | | New unit tests have identified issues with alsa backend. These issues need to be resolved before new unit tests are added. * stateChanged() signal should only be emitted on change of state currently signals can be emitted multiple times. * elapsedUSecs() currently uses alsa to provide this value but this is not reliable enough and this time is reset when suspend/resuming. This is not correct operation. * for output data is being lost when input cant be read from QIODevice but cannot be written to audio sub system. Task-number:QTBUG-8440 Reviewed-by:Dmytro Poplavskiy
* Updates to low-level audio documentation.Kurt Korbatits2010-02-232-86/+66
| | | | | | | Detail state changes and error states in QAudioInput and QAudioOutput documentation. Reviewed-by: Derick Hawcroft
* Doc: remove \preliminary tag from public multimedia classesVolker Hilsheimer2010-02-124-4/+0
|
* Revert "Frequency to SampleRate and channels to channelCount."Kurt Korbatits2010-01-1412-96/+49
| | | | | | | | | | | | | | | | | | | | 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-148-34/+19
| | | | | | | | | | | | | | | | | | | | 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-multimedia-team into ↵Qt Continuous Integration System2010-01-131-1/+1
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: Fix example in QAudioOutput/QAudioInput docs
| * Fix example in QAudioOutput/QAudioInput docsKurt Korbatits2010-01-132-2/+2
| | | | | | | | | | | | Fixed error in doc comments. Reviewed-by:Justin McPherson
* | Fix code exampleBernhard Rosenkraenzer2010-01-111-1/+1
| | | | | | | | | | | | | | | | | | The example given for QAudioOutput doesn't actually compile: QAudioOutput::start takes a pointer to a QIODevice, but it's passed a QFile (not the pointer). Merge-request: 418 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-0816-69/+131
|\ \ | |/ | | | | | | Conflicts: src/multimedia/audio/qaudioformat.cpp
| * QAudioInput loses data on Maemo5/other linux platforms.Kurt Korbatits2010-01-071-1/+1
| | | | | | | | | | | | | | | | The alsa backend was calculating sample timer on resume using buffer_time instead of period_time. Task-number:QTBUG-7044 Reviewed-by:Justin McPherson
| * Frequency to SampleRate and channels to channelCount.Kurt Korbatits2010-01-0616-60/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | -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-068-9/+19
| | | | | | | | | | | | | | Added setChannelCount() and updated docs/examples/tests to use it instead of setChannels(). Reviewed-by:Justin McPherson
* | Doc: Added the QAudio namespace to the multimedia module documentation.David Boddie2010-01-071-0/+2
| | | | | | | | | | | | Also added it to the multimedia group. Reviewed-by: Trust Me
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-0750-50/+50
|\ \
| * | Update copyright year to 2010Jason McDonald2010-01-0650-50/+50
| |/ | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-063-13/+38
|\ \ | |/
| * The "audioinput" multimedia example locks up the audio input/outputKurt Korbatits2009-12-182-13/+33
| | | | | | | | | | Task-number:QTBUG-5633 Reviewed-by:Justin McPherson
| * no audiodevices found using QAudioDeviceInfo::availableDevices on UbuntuKurt Korbatits2009-12-181-0/+5
| | | | | | | | | | Task-number:QTBUG-6866 Reviewed-by:Justin McPherson
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2009-12-184-4/+45
|\ \ | |/
| * Fix up documentation examples for low-level audio.Kurt Korbatits2009-12-092-4/+26
| | | | | | | | | | | | | | | | | | QTBUG-6548 QAudioOutput::start() crashes when the QIODevice is destructed Made documentation clearer. Task-number:QTBUG-6548 Reviewed-by:Justin McPherson
| * Add -audio-backend and -no-audio-backend configure option.Kurt Korbatits2009-12-092-0/+19
| | | | | | | | | | | | Allow better control over audio backend used. Reviewed-by:Justin McPherson
* | Doc: Made corrections to documentation style and clarified some points.David Boddie2009-12-181-7/+7
|/ | | | Reviewed-by: Trust Me
* No audio devices found for Ubuntu with QAudio classesKurt Korbatits2009-11-164-29/+66
| | | | | | | Changed alsa implementation to present audio devices from alsa. Task-number:QTBUG-5723 Reviewed-by:Justin McPherson
* Fixed runtime error in QAudioInput::bytesReady() functionKurt Korbatits2009-11-101-0/+3
| | | | | | | | If bytesReady() was called before start(), Div by Zero. Added check for this condition. Task-number:QTBUG-5300 Reviewed-by:Justin McPherson
* Changes to low-level audio API.Kurt Korbatits2009-11-1033-212/+227
| | | | | | | | | | | | | 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-1033-230/+212
| | | | | | | | | | | | | | | 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
* Merge branch '4.6' of ../qt into 4.6Kurt Korbatits2009-11-101-1/+1
|\
| * API review: Rename functions numColors(), setNumColors() and numBytes()Marius Storm-Olsen2009-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | QPaintDevice and QImage used the functions numColors(), setNumColors(), and numBytes(). However, this is not consistent with the rest of the Qt API which uses *Count() and set*Count(). Removed all usage of these functions inside Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
generated by cgit v0.12 at 2025-02-23 11:11:33 (GMT)