summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Collapse)AuthorAgeFilesLines
* Fixed thread lockup in win32 backend for QAudioOutput.Kurt Korbatits2009-10-061-3/+4
| | | | | | | -Was not closing the WaveOut on cleanup, fixed. -Was emitting signal in critical section, fixed. Reviewed-by:Bill King
* Fixed QAudioDeviceInfoInternal::deviceList(QAudio::Mode mode) filteringMartin Banky2009-10-051-17/+9
| | | | | | | | | | 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>
* Fixed logic in clock() function of audio class's.Kurt Korbatits2009-10-026-4/+10
| | | | | | | - clock() should return valid value except in stop state, return 0. - Added clock() function testing to unit tests. Reviewed-by:Justin McPherson
* Fixed error in notify() signal and totalTime() in QAudioInput andKurt Korbatits2009-09-308-11/+62
| | | | | | | | QAudioOutput. -The notify() signal was not firing the correct number of times. -The totalTime() on wince was incorrect (unit test). Reviewed-by:Justin McPherson
* Changed internal tr()'s to be QString::fromLatin1() in alsa builtin.Kurt Korbatits2009-09-292-22/+22
| | | | | | | Internal strings don't need translations, changed to use fromLatin1 instead. Reviewed-by:TrustMe
* doc: Fixed three /sa that should be \saThorbjørn Lindeijer2009-09-282-2/+2
|
* Removed stateChanged and notify signals from win32 qaudiooutput builtin.Kurt Korbatits2009-09-271-4/+0
| | | | | | stateChanged and notify signals are inherited from base class. Reviewed-by:Bill King
* AudioService API changes; QString->const QString&, remove QAudioDeviceId use ↵Justin McPherson2009-09-2420-524/+274
| | | | | | QAudioDeviceInfo. Reviewed-by: Bill King
* Mac audio; emit stateChanged on start, don't flush in push mode.Justin McPherson2009-09-242-0/+9
| | | | Reviewed-by: Bill King
* Mac audio; Remove signal re-decleration.Justin McPherson2009-09-242-8/+0
| | | | Reviewed-by: Bill King
* Doc: Added some snippets to the multimedia audio docs.Geir Vattekar2009-09-154-5/+18
|
* AudioDevices demo doesn't do anything on WindowsKurt Korbatits2009-09-146-42/+81
| | | | | | | | | | -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
* Crash in audiooutput demo when switching outputKurt Korbatits2009-09-094-12/+70
| | | | | | | | | | | -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
* Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-0953-212/+212
|\
| * Update license headers again.Jason McDonald2009-09-0953-212/+212
| | | | | | | | Reviewed-by: Trust Me
* | Fixed 'illegal empty declaration' warning reported by Nokia X86 compilerJanne Anttila2009-09-082-2/+2
|/ | | | | Task-number: 241223 Reviewed-by: TrustMe
* QAudioDeviceInfo::deviceList() wasn't working correctly if no audioKurt Korbatits2009-09-081-2/+3
| | | | | | | | | 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
* Added missing TARGET.UID3 definitions to various components.Miikka Heikkinen2009-09-031-0/+2
| | | | | | | Every non-test binary built for Symbian needs explicitly assigned UID3, so added TARGET.UID3 for components that were missing it. Reviewed-by: Janne Anttila
* Copy ctor and assignment operator for QAudioFormatPrivate (QSharedData ↵Justin McPherson2009-09-021-1/+23
| | | | | | derived class). Reviewed-by: bill king
* Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-3149-637/+637
| | | | Reviewed-by: Trust Me
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-314-52/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
* compile fix with namespaceshjk2009-08-2613-1/+48
| | | | 13 pairs missing...
* Merge commit 'origin/master' into 4.6Jason Barron2009-08-252-4/+4
|\
| * Removed some 'illegal empty declaration' warnings from Symbian buildJanne Anttila2009-08-242-4/+4
| | | | | | | | Reviewed-by: TrustMe
* | Integrate QAbstractVideoSurface API.Andrew den Exter2009-08-2416-6/+3064
|/ | | | | | | | | | This introduces a QAbstractVideoSurface interface for implementing arbitrary video outputs, and a QVideoFrame type. Also included is the QVideoSurfaceFormat class which is used to configure the input to a video surface, and the QAbstractVideoBuffer class which allows QVideoFrames to be constructed from non-native frame types. Reviewed-by: Dmytro Poplavskiy
* Use LIBS_PRIVATE on Mac and X11.Thiago Macieira2009-08-171-2/+2
| | | | | | | | | | | | | | | | On the Mac, it means "-framework ApplicationServices -framework Carbon -framework AppKit" are no longer part of the default LIBS in Qt applications. This required a lot of fixes where we used Mac-specific code in Qt. On X11, it was very straightforward, because we apparently use very little of X11 outside QtGui. I haven't changed the Windows-specific LIBS paths, because I don't know how Windows behaves. Windows has DLLs, but it links to static "import" libraries. So is it static linking or dynamic linking? Reviewed-By: Marius Storm-Olsen
* Update contact URL in license headers.Jason McDonald2009-08-1239-39/+39
| | | | Reviewed-by: Trust Me
* multimedia: fix warnings on mingwThierry Bastian2009-08-064-4/+3
| | | | | moved static CRITICAL_SECTIONs to cpp files. In header they would be declared more than once depending on what file includes those headers.
* Merge AudioServices into mainline.Justin McPherson2009-08-0541-0/+10144
generated by cgit v0.12 at 2024-12-28 15:15:51 (GMT)