summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon/ds9
Commit message (Collapse)AuthorAgeFilesLines
* Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-191-8/+8
|\
| * Ran the script utils/normalizeOlivier Goffart2009-11-181-8/+8
| | | | | | | | Over src/ tools/ examples/ and demos/
| * Phonon; Integrate changes to .desktop fileJustin McPherson2009-11-121-0/+42
| | | | | | | | Reviewed-by: TrustMe
| * Phonon; Integrate changes to cmake files.Justin McPherson2009-11-121-2/+3
| | | | | | | | Reviewed-by: TrustMe
* | Fix compilation of Phonon DS9 backend when Qt is built statically.Andrew den Exter2009-11-123-6/+7
| | | | | | | | | | | | | | | | | | qt_plugin_instance() isn't defined in a static build. Assign a pointer the shared mutex to static member variable in the backend constructor, rather than returning it from a static member function. Task-number: QTBUG-5207 Reviewed-by: Justin McPherson
* | Fix assert on windows when deleting phonon nodes from a running graph.Andrew den Exter2009-11-121-1/+18
| | | | | | | | | | | | | | | | If removing a filter from the direct show graph fails because it is running, stop the graph and try again. Task-number: QTBUG-5011 Reviewed-by: Justin McPherson
* | Phonon; Integrate changes to .desktop fileJustin McPherson2009-11-111-0/+42
| | | | | | Reviewed-by: TrustMe
* | Phonon; Integrate changes to cmake files.Justin McPherson2009-11-111-2/+3
|/ | | Reviewed-by: TrustMe
* Fix Phonon's video renderer on windows with openglThierry Bastian2009-11-061-1/+6
| | | | | | Now we use opengl 2. Reviewed-by: Samuel
* Phonon: allows to stream wave files from QIODeviceThierry Bastian2009-10-231-4/+7
| | | | Reviewed-by: trust Me
* build fix for winceThierry Bastian2009-09-021-0/+2
|
* Compile fix for mingwThierry Bastian2009-08-262-3/+1
|
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-241-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt configure demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h dist/README dist/changes-3.0.0 dist/changes-3.0.0-beta1 dist/changes-4.3.0 doc/src/desktop-integration.qdoc doc/src/development/designer-manual.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/index.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/porting/porting4.qdoc doc/src/porting4-obsoletedmechanism.qdocinc doc/src/qt-webpages.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/snippets/code/src_corelib_tools_qregexp.cpp doc/src/snippets/code/src_qt3support_network_q3ftp.cpp doc/src/snippets/qstring/main.cpp doc/src/snippets/textdocument-blocks/xmlwriter.cpp doc/src/snippets/textdocument-frames/xmlwriter.cpp doc/src/snippets/textdocument-tables/xmlwriter.cpp doc/src/tech-preview/known-issues.html doc/src/topics.qdoc doc/src/xml-processing/xml-processing.qdoc examples/xml/saxbookmarks/jennifer.xbel src/3rdparty/phonon/ds9/mediaobject.cpp src/3rdparty/phonon/ds9/mediaobject.h src/corelib/io/qurl.cpp src/corelib/tools/qdumper.cpp src/corelib/xml/qxmlstream.h 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/image/qpixmapcache.cpp src/gui/kernel/qmotifdnd_x11.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/painting/qwindowsurface_d3d.cpp src/gui/styles/qmacstyle_mac.mm src/gui/text/qtextformat.cpp src/gui/text/qtextobject_p.h src/network/access/qhttp.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/plugins/codecs/kr/qeuckrcodec.cpp src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/qt3support/network/q3http.cpp src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp 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 src/sql/drivers/sqlite/qsql_sqlite.cpp src/svg/qsvghandler.cpp src/svg/qsvgstyle.cpp src/xmlpatterns/expr/qcastingplatform_p.h src/xmlpatterns/iterators/qcachingiterator_p.h src/xmlpatterns/parser/qquerytransformparser_p.h tests/auto/q3uridrag/tst_q3uridrag.cpp tests/auto/qcombobox/tst_qcombobox.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tests/auto/qmainwindow/tst_qmainwindow.cpp tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp tests/auto/qsslsocket/tst_qsslsocket.cpp tests/auto/qurl/tst_qurl.cpp tests/auto/qvariant/tst_qvariant.cpp tests/auto/qwidget/tst_qwidget.cpp tests/auto/uic/baseline/batchtranslation.ui tests/auto/uic/baseline/batchtranslation.ui.h tests/auto/uic/baseline/config.ui tests/auto/uic/baseline/config.ui.h tests/auto/uic/baseline/finddialog.ui tests/auto/uic/baseline/finddialog.ui.h tests/auto/uic/baseline/formwindowsettings.ui tests/auto/uic/baseline/formwindowsettings.ui.h tests/auto/uic/baseline/helpdialog.ui tests/auto/uic/baseline/helpdialog.ui.h tests/auto/uic/baseline/listwidgeteditor.ui tests/auto/uic/baseline/listwidgeteditor.ui.h tests/auto/uic/baseline/mainwindowbase.ui tests/auto/uic/baseline/mainwindowbase.ui.h tests/auto/uic/baseline/newactiondialog.ui tests/auto/uic/baseline/newactiondialog.ui.h tests/auto/uic/baseline/newform.ui tests/auto/uic/baseline/newform.ui.h tests/auto/uic/baseline/orderdialog.ui tests/auto/uic/baseline/orderdialog.ui.h tests/auto/uic/baseline/paletteeditor.ui tests/auto/uic/baseline/paletteeditor.ui.h tests/auto/uic/baseline/paletteeditoradvancedbase.ui tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h tests/auto/uic/baseline/phrasebookbox.ui tests/auto/uic/baseline/phrasebookbox.ui.h tests/auto/uic/baseline/plugindialog.ui tests/auto/uic/baseline/plugindialog.ui.h tests/auto/uic/baseline/previewwidget.ui tests/auto/uic/baseline/previewwidget.ui.h tests/auto/uic/baseline/previewwidgetbase.ui tests/auto/uic/baseline/previewwidgetbase.ui.h tests/auto/uic/baseline/qfiledialog.ui tests/auto/uic/baseline/qfiledialog.ui.h tests/auto/uic/baseline/qtgradientdialog.ui tests/auto/uic/baseline/qtgradientdialog.ui.h tests/auto/uic/baseline/qtgradientviewdialog.ui tests/auto/uic/baseline/qtgradientviewdialog.ui.h tests/auto/uic/baseline/saveformastemplate.ui tests/auto/uic/baseline/saveformastemplate.ui.h tests/auto/uic/baseline/statistics.ui tests/auto/uic/baseline/statistics.ui.h tests/auto/uic/baseline/stringlisteditor.ui tests/auto/uic/baseline/stringlisteditor.ui.h tests/auto/uic/baseline/tabbedbrowser.ui tests/auto/uic/baseline/tabbedbrowser.ui.h tests/auto/uic/baseline/tablewidgeteditor.ui tests/auto/uic/baseline/tablewidgeteditor.ui.h tests/auto/uic/baseline/translatedialog.ui tests/auto/uic/baseline/translatedialog.ui.h tests/auto/uic/baseline/treewidgeteditor.ui tests/auto/uic/baseline/treewidgeteditor.ui.h tests/auto/uic/baseline/trpreviewtool.ui tests/auto/uic/baseline/trpreviewtool.ui.h tests/auto/uic3/baseline/previewwidget.ui tests/auto/uic3/baseline/previewwidget.ui.4 tests/auto/uic3/baseline/previewwidgetbase.ui tests/auto/uic3/baseline/previewwidgetbase.ui.4 tests/auto/uic3/baseline/qactivexselect.ui tests/auto/uic3/baseline/qactivexselect.ui.4 tests/auto/uiloader/baseline/batchtranslation.ui tests/auto/uiloader/baseline/config.ui tests/auto/uiloader/baseline/finddialog.ui tests/auto/uiloader/baseline/formwindowsettings.ui tests/auto/uiloader/baseline/helpdialog.ui tests/auto/uiloader/baseline/listwidgeteditor.ui tests/auto/uiloader/baseline/mainwindowbase.ui tests/auto/uiloader/baseline/newactiondialog.ui tests/auto/uiloader/baseline/newform.ui tests/auto/uiloader/baseline/orderdialog.ui tests/auto/uiloader/baseline/paletteeditor.ui tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui tests/auto/uiloader/baseline/phrasebookbox.ui tests/auto/uiloader/baseline/plugindialog.ui tests/auto/uiloader/baseline/previewwidget.ui tests/auto/uiloader/baseline/previewwidgetbase.ui tests/auto/uiloader/baseline/qfiledialog.ui tests/auto/uiloader/baseline/qtgradientdialog.ui tests/auto/uiloader/baseline/qtgradienteditor.ui tests/auto/uiloader/baseline/qtgradientviewdialog.ui tests/auto/uiloader/baseline/saveformastemplate.ui tests/auto/uiloader/baseline/statistics.ui tests/auto/uiloader/baseline/stringlisteditor.ui tests/auto/uiloader/baseline/tabbedbrowser.ui tests/auto/uiloader/baseline/tablewidgeteditor.ui tests/auto/uiloader/baseline/translatedialog.ui tests/auto/uiloader/baseline/treewidgeteditor.ui tests/auto/uiloader/baseline/trpreviewtool.ui tests/auto/windowsmobile/test/test.pro tests/auto/xmlpatternsdiagnosticsts/test/tst_xmlpatternsdiagnosticsts.cpp tools/doxygen/config/header.html tools/doxygen/config/phonon.doxyfile tools/installer/nsis/opensource.ini tools/linguist/phrasebooks/polish.qph tools/linguist/shared/cpp.cpp tools/linguist/shared/ts.dtd tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-inc.qdocconf tools/qdoc3/test/qt.qdocconf tools/qvfb/qtopiakeysym.h tools/qvfb/qvfbx11view.cpp tools/qvfb/qvfbx11view.h tools/qvfb/x11keyfaker.cpp tools/xmlpatterns/main.cpp tools/xmlpatterns/main.h tools/xmlpatterns/qcoloringmessagehandler_p.h tools/xmlpatterns/qcoloroutput.cpp tools/xmlpatterns/qcoloroutput_p.h translations/assistant_de.ts translations/qt_ar.ts translations/qt_da.ts translations/qt_de.ts translations/qt_fr.ts translations/qt_ja_JP.ts translations/qt_ru.ts translations/qt_uk.ts translations/qt_zh_CN.ts util/qlalr/compress.cpp util/qlalr/cppgenerator.cpp util/qlalr/dotgraph.cpp util/qlalr/grammar.cpp util/qlalr/lalr.cpp util/qlalr/main.cpp util/qlalr/parsetable.cpp util/qlalr/recognizer.cpp
| * Phonon: improve locking to make it safer to load a sourceThierry Bastian2009-08-112-17/+25
| | | | | | | | Task-number: 259482
| * Update URL for Qt web site.Jason McDonald2009-08-111-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * Fixed an assert that could happen when the mediaSource is deletedThierry Bastian2009-08-102-28/+15
| | | | | | | | | | | | | | | | | | | | | | | | When using streaming, it could happen that the last reference to the MediaSource is in another thread. So the objects are destroyed from another thread. In which case we would delete QObject (ioDevice) in another thread. That is fixed by calling deleteLater which will ensure that they are deleted in their own thread. Note: there was a nother assert that could happen due to a race condition in the worker thread. That is also fixed with this patch. Reviewed-by: jbache
| * Phonon: fixed a big memory leak on WindowsThierry Bastian2009-07-162-2/+4
| | | | | | | | | | | | | | If you had deleted a VideoWidget, it could not free the memory taken because we still had a reference on it. Task-number: 258202
* | Phonon/ds9: fix a potential dead-lock found by userThierry Bastian2009-08-244-1/+12
| | | | | | | | | | | | This is following merge request 878. A customer was able to get a dead- lock when calling at the same time RenderFile and enumerating the audio devices. We now have a global mutex for that.
* | Phonon/ds9: refactor to prepare some improvements in the usage of mutexThierry Bastian2009-08-246-86/+35
| |
* | Phonon compile fix for mingwThierry Bastian2009-08-215-12/+12
| |
* | Phonon on windows: fixeda possible dead-lock when using QFileThierry Bastian2009-08-219-152/+90
| | | | | | | | | | | | | | | | | | the msdn was not correct and IAsyncReader::WaitForNext should not return an error when the pin is currently flushing. I took the opportunity to clean the way the mutex is locked on the pin. Task-number: 258830
* | Phonon on Windows: improve performance when loading lots of sourcesThierry Bastian2009-08-213-72/+53
| | | | | | | | The lock is made more local.
* | QVariant: more work on avoinding conversion between float and doublesThierry Bastian2009-08-141-2/+1
| | | | | | | | we call QVariant::toReal instead of toDouble when needed
* | Phonon: On windows, cross fading was brokenThierry Bastian2009-08-121-1/+2
| |
* | Phonon: avoids assert when switching sourceThierry Bastian2009-08-111-0/+2
| | | | | | | | | | The problem was that when switching source, the previous one was still running. So we now explicitly stop it.
* | Phonon::VideoWidget still flickeringThierry Bastian2009-08-111-0/+2
| | | | | | | | | | | | | | small patch to make sure even the native events of the pending ones won't trigger anything in the paintevent Task-number: 251776
* | Phonon: Video widget on Windows flickers when going to next videoThierry Bastian2009-08-111-1/+14
| | | | | | | | | | | | | | Now we just disable the updates during a short amount of time. This should give enough time to the video to start. Task-number: 251776
* | Phonon: improve locking to make it safer to load a sourceThierry Bastian2009-08-112-13/+22
| | | | | | | | Task-number: 259482
* | Fixed an assert that could happen when the mediaSource is deletedThierry Bastian2009-08-102-38/+18
| | | | | | | | | | | | | | | | | | | | | | | | When using streaming, it could happen that the last reference to the MediaSource is in another thread. So the objects are destroyed from another thread. In which case we would delete QObject (ioDevice) in another thread. That is fixed by calling deleteLater which will ensure that they are deleted in their own thread. Note: there was a nother assert that could happen due to a race condition in the worker thread. That is also fixed with this patch. Reviewed-by: jbache
* | Fixed warnings on phonon/ds9 with mingw (gcc 4)Thierry Bastian2009-08-039-23/+28
| | | | | | | | Reviewed-by: Trustme
* | Fixed another memory leak in Phonon on windowsThierry Bastian2009-07-171-3/+1
| | | | | | | | | | This would happen if you we didn't free the memory allocator when disconnecting the fake source from a sink (eg. video renderer)
* | Documentation and whitespace fixes in phononDavid Faure2009-07-163-32/+30
| | | | | | | | | | | | | | | | | | - fix wrong copy/pasted comments (including the whole docs for isSeekable) - make docs of Notifier more generic (there are 3 signals, not just one) - untabify Merge-request: 875 Reviewed-by: Leonardo Sobral Cunha <leo.cunha@nokia.com>
* | Phonon: fixed a big memory leak on WindowsThierry Bastian2009-07-162-2/+4
| | | | | | | | | | | | | | If you had deleted a VideoWidget, it could not free the memory taken because we still had a reference on it. Task-number: 258202
* | Phonon videos on windows would not show with video acceleration disabledThierry Bastian2009-07-101-1/+1
| | | | | | | | Task-number: 257805
* | Phonon: Fixed a possible race conditionThierry Bastian2009-07-081-7/+13
| | | | | | | | Task-number: 257495
* | Phonon: Fixed a possible race conditionThierry Bastian2009-07-081-1/+1
| | | | | | | | Task-number: 257495
* | Phonon: take advantage of more modern compiler to initialize structThierry Bastian2009-07-064-80/+27
| | | | | | | | This was not supported before by MSVC6 and MSVC2002
* | Phonon: Some work done on binary sizeThierry Bastian2009-07-063-40/+14
| | | | | | | | removing foreach seems to help on Windows
* | src/3rdparty/phonon: Remove QT_WA and non-Unicode code paths, dropping Win9x ↵miniak2009-07-011-4/+1
|/ | | | | | | and NT support Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* Fixed aspect ratio on WindowsThierry Bastian2009-06-022-0/+3
| | | | | | - When changing the aspect ratio, the video wouldn't update. - The VMR9 can in some cases try to manage the aspect ratio itself and then fights our system. This is now disabled.
* Fixed a flicker when switching current source in Phonon::MediaObjectThierry Bastian2009-04-211-18/+9
| | | | Task-number: 251776
* Long live Qt 4.5!Lars Knoll2009-03-2343-0/+10606