| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|\
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team:
Fix example in QAudioOutput/QAudioInput docs
|
| |
| |
| |
| |
| |
| | |
Fixed error in doc comments.
Reviewed-by:Justin McPherson
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/multimedia/audio/qaudioformat.cpp
|
| |
| |
| |
| |
| |
| |
| |
| | |
The alsa backend was calculating sample timer on resume using buffer_time
instead of period_time.
Task-number:QTBUG-7044
Reviewed-by:Justin McPherson
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
-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() and updated docs/examples/tests to use it
instead of setChannels().
Reviewed-by:Justin McPherson
|
| |
| |
| |
| |
| |
| | |
Also added it to the multimedia group.
Reviewed-by: Trust Me
|
|\ \ |
|
| |/
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/ |
|
| |
| |
| |
| |
| | |
Task-number:QTBUG-5633
Reviewed-by:Justin McPherson
|
| |
| |
| |
| |
| | |
Task-number:QTBUG-6866
Reviewed-by:Justin McPherson
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QTBUG-6548
QAudioOutput::start() crashes when the QIODevice is destructed
Made documentation clearer.
Task-number:QTBUG-6548
Reviewed-by:Justin McPherson
|
| |
| |
| |
| |
| |
| | |
Allow better control over audio backend used.
Reviewed-by:Justin McPherson
|
|/
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
| |
Changed alsa implementation to present audio devices from alsa.
Task-number:QTBUG-5723
Reviewed-by:Justin McPherson
|
|
|
|
|
|
|
|
| |
If bytesReady() was called before start(), Div by Zero.
Added check for this condition.
Task-number:QTBUG-5300
Reviewed-by:Justin McPherson
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| | |
If bytesReady() was called before start(), Div by Zero.
Added check for this condition.
Task-number:QTBUG-5300
Reviewed-by:Justin McPherson
|
|/
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
Rename equivalentImageFormat() to imageFormatFromPixelFormat().
Rename equivalentPixelFormat() to pixelFormatFromImageFormat().
Rename numBytes() to mappedBytes().
Reviewed-by: Justin McPherson
|
|
|
|
|
|
|
|
| |
Rename YuvColorSpace enum and related functions to YCbCrColorSpace.
Remove ViewportMode enum and make setFrameSize() always reset the
viewport to fill the frame.
Reviewed-by: Justin McPherson
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
clock() function should return microseconds, fixed example, alsa backend
and win32 backend.
Reviewed-by:Justin McPherson
|
|
|
|
|
|
| |
Support pre 1.0.14 alsa version.
Reviewed-by:Justin McPherson
|
|
|
|
|
|
|
|
|
| |
While a rational number is a common way to represent a frame rate,
QPair<int, int> isn't a proper numeric type meaning it can't be used as
anything more than an identifer for an exact frame rate without being
converted to a real, or extending it to a proper rational type.
Rev by: Justin McPherson
|
|
|
|
|
|
|
| |
-Was not closing the WaveOut on cleanup, fixed.
-Was emitting signal in critical section, fixed.
Reviewed-by:Bill King
|
|
|
|
|
|
|
|
|
|
| |
If an audio device only supported Input or Output, it would not be added
to the list of devices. Only devices that returned IOID == NULL would be
added. Also, _m was not being used, and io was unneccessarily being cast
to a QString.
Merge-request: 1664
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
|
|
|
|
|
|
|
| |
- clock() should return valid value except in stop state, return 0.
- Added clock() function testing to unit tests.
Reviewed-by:Justin McPherson
|
|
|
|
|
|
|
|
| |
QAudioOutput.
-The notify() signal was not firing the correct number of times.
-The totalTime() on wince was incorrect (unit test).
Reviewed-by:Justin McPherson
|
|
|
|
|
|
|
| |
Internal strings don't need translations, changed to use fromLatin1
instead.
Reviewed-by:TrustMe
|
| |
|
|
|
|
|
|
| |
stateChanged and notify signals are inherited from base class.
Reviewed-by:Bill King
|
|
|
|
|
|
| |
QAudioDeviceInfo.
Reviewed-by: Bill King
|
|
|
|
| |
Reviewed-by: Bill King
|
|
|
|
| |
Reviewed-by: Bill King
|
| |
|
|
|
|
|
|
|
|
|
|
| |
-put example audiodevices in layout.
-added more checking to testSettings() in win32 implementation.
-disabled objects in example audiodevices that are not editable.
-added more checking to alsa implementation for preferredFormat().
-changed internal strings from tr to QLatin1String.
Reviewed-by:Justin Mcpherson
|
|
|
|
|
|
|
|
|
|
|
| |
-waveOut callback was calling into class during destruction.
Changed to wait until close of waveOut/waveIn before returning from
destructor.
-Reduced default buffer on wince implementation.
-Added error checking on buffer allocation.
Task-number:261049, 261053
Reviewed-by:Bill King
|
|\ |
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|/
|
|
|
| |
Task-number: 241223
Reviewed-by: TrustMe
|
|
|
|
|
|
|
|
|
| |
device.
The default was being added even when no audio devices were available.
Change so that the default device is only added if there is at least
one audio device.
Reviewed-by:Bill King
|