diff -r 2b40d63a9c3d -r 90517678cc4f qtmobility/src/multimedia/qmediaplayer.cpp --- a/qtmobility/src/multimedia/qmediaplayer.cpp Fri Apr 16 15:51:22 2010 +0300 +++ b/qtmobility/src/multimedia/qmediaplayer.cpp Mon May 03 13:18:40 2010 +0300 @@ -46,16 +46,16 @@ #include -#include +#include "qmediaplayer.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include "qmediaobject_p.h" +#include "qmediaservice.h" +#include "qmediaplayercontrol.h" +#include "qmediaserviceprovider.h" +#include "qmediaplaylist.h" +#include "qmediaplaylistcontrol.h" +#include "qvideowidget.h" +#include "qgraphicsvideoitem.h" QTM_BEGIN_NAMESPACE @@ -240,10 +240,17 @@ static QMediaService *playerService(QMediaPlayer::Flags flags, QMediaServiceProvider *provider) { - if (flags && QMediaPlayer::LowLatency) + if (flags) { + QMediaServiceProviderHint::Features features = 0; + if (flags & QMediaPlayer::LowLatency) + features |= QMediaServiceProviderHint::LowLatencyPlayback; + + if (flags & QMediaPlayer::StreamPlayback) + features |= QMediaServiceProviderHint::StreamPlayback; + return provider->requestService(Q_MEDIASERVICE_MEDIAPLAYER, - QMediaServiceProviderHint(QMediaServiceProviderHint::LowLatencyPlayback)); - else + QMediaServiceProviderHint(features)); + } else return provider->requestService(Q_MEDIASERVICE_MEDIAPLAYER); } @@ -942,6 +949,11 @@ The player is expected to be used with simple audio formats, but playback should start without significant delay. Such playback service can be used for beeps, ringtones, etc. + + \value StreamPlayback + The player is expected to play QIODevice based streams. + If passed to QMediaPlayer constructor, the service supporting + streams playback will be choosen. */ #include "moc_qmediaplayer.cpp"