summaryrefslogtreecommitdiffstats
path: root/demos/qmediaplayer/mediaplayer.h
Commit message (Collapse)AuthorAgeFilesLines
* Change to commercial license headers in preparation for release.Jason McDonald2010-09-071-13/+13
| | | | Reviewed-by: Trust Me
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-091-10/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits) Reverted two commits that were pushed to the wrong branch. Use the new QTextCodec api in the QXmlStreamWriter. Added new functions to QTextCodec that accept ConversionFlags. Fix passing of arguments to syncqt doc: Fixed typos. Fixes: Fix spinbox with NoButton style in QGtkStyle doc: Explained parameter value defaults where appropriate. Cocoa: Fix painting errors on QGLWidget resizing. Fix broken QGLWidget::renderPixmap on Mac/Carbon Fixes: Setting any style sheet breaks checkbox positioning Fixes: MenuItem size fixes and missing separator with Gtk+ Autotest: add a test for QNAM's HTTP cache handling code QNAM HTTP: just use the expirationDate in the code that validates the cache QNAM HTTP: change the caching semantics to match documentation QNAM HTTP: fix the caching algorithm from RFC 2616 Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner improve readability a bit more fix styling; improve readability make it possible to retrieve name of the user who owns the file Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d ) ...
| * Use the lowercase/shortname.h headers for Phonon includesThiago Macieira2010-01-061-9/+9
| | | | | | | | | | Task-number: QTBUG-4685 Reviewed-by: TrustMe
| * Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Mediaplayer: enqueue all entries from .ram file before starting playbackGareth Stockwell2009-12-081-0/+1
|/ | | | | | | | This ensures that Phonon::MediaObject::setNextSource is called before the first clip finishes playback, and therefore that the next clip is played once the first finishes. Reviewed-by: Frans Englich
* Merge branch '4.6' into mmfphononFrans Englich2009-11-201-0/+1
|\ | | | | | | | | Conflicts: demos/qmediaplayer/mediaplayer.cpp
| * Add support for opening Real Media RAM files.Frans Englich2009-11-201-0/+1
| | | | | | | | | | | | | | | | Requested by Nokia Dallas/Helix team. Patch supplied by Fu Liz EXT-DextraTech/Dallas, minor changes by me. Task-number: QTBUG-4882 Reviewed-by: Gareth Stockwell
* | Added 'fullscreen video' menu option to media playerGareth Stockwell2009-11-191-5/+38
| | | | | | | | | | Task-number: QTBUG-5586 Reviewed-by: Frans Englich
* | qmediaplayer: pausing behavior for dialog inconvenient.Frans Englich2009-11-161-1/+1
|/ | | | | | | | | | qmediaplayer when popping up dialogs shouldn't: * play when it's paused * pause when playing only audio Task-number: QTBUG-5851 Reviewed-by: Gareth Stockwell
* Pause playback on small screens when popping up dialogs.Frans Englich2009-11-121-0/+2
| | | | | | | Only done for small screens. Patch simplified by Gareth. Task-number: QTBUG-5307 Reviewed-by: Gareth Stockwell
* Fix build caused by merge error.Frans Englich2009-10-231-1/+0
|
* Listen to hasVideoChanged() signal instead, such that we're more robust.Frans Englich2009-10-231-0/+1
| | | | | | | | This covers cases where the backend knows about video capability in a state other than the LoadingState. Patch by Adookkattil Saleem, slightly modified. Reviewed-by: Gareth Stockwell
* Listen on hasVideoChanged() instead of only checking hasVideo().Frans Englich2009-10-211-0/+1
| | | | | | | | | | This means that when the backend's knowledge about the content's video capability changes outside the LoadingState, it still work. This apparently matters for the Helix backend. Patch supplied by Adookkattil Saleem (Nokia-D/Dallas). Reviewed-by: Gareth Stockwell Reviewed-by: Frans Englich
* Symbian fix: rename examples ftp and musicplayer to start with q.Frans Englich2009-10-091-0/+139
Symbian already has the executables musicplayer.exe, mediaplayer.exe and ftp.exe, with the result that we overwrite them with Qt. We solve this by renaming the examples, and do it not only on Symbian, such that Qt remains consistent across platforms. This was previously partly done for mediaplayer. The folder name needs to be consistent with the executable, for qtdemo to work. Done jointly with Alessandro. Task-number: QTBUG-4743 Reviewed-by: Alessandro Portale Reviewed-by: Frans Englich
generated by cgit v0.12 at 2024-11-23 20:05:28 (GMT)