| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
| |
Change-Id: I96513e8b6f09e76998a18edb5411ae06f52cba7c
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
| |
|
|
|
|
|
| |
Also fixing some left overs from 8de152a9e1deb533070663cccf6a98e0d374b1d6
Change-Id: I28a91ca233dd835e6e53efbbd7ebd649461f5c04
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
| |
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: Ie3b9224b2b6a32b417fa0b6643350d45046381e6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
| |
|
|
|
|
| |
Looks like a merge problem.
Reviewed-by: Dmytro Poplavskiy
|
| |
|
|
|
|
|
|
|
| |
For whatever reason using QStackedLayout was resulting in the menu bar
being hidden. Putting the status information in a status bar instead
removes the need for that stacked layout.
Task-number: MOBILITY-2076
Reviewed-by: Dmytro Poplavskiy
|
| |
|
|
|
|
| |
Task-number: MOBILITY-1599
Reviewed-by: Alexander Abramov
(cherry picked from commit 4910fb9c6178165c38cc531b9718000bee31bfb6)
|
| |\
| |
| |
| |
| | |
Conflicts:
plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Use QMainWindow instead of a custom layout to layout the UI for the
slideshow as QMainWindow allows better integration with native menu
systems.
Task-number: MOBILITY-782
Reviewed-by: Dmytro Poplavskiy
|
| |/
|
|
| |
This mimics the same function from QMediaPlayer.
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
config.tests/lbt/lbt.pro
configure
configure.bat
dist/changes-1.0.0
doc/src/installation.qdoc
examples/player/player.cpp
plugins/declarative/declarative.pro
plugins/multimedia/symbian/mmf/mmf.pro
plugins/multimedia/symbian/openmaxal/mediarecorder/mediarecorder.pro
src/multimedia/multimedia.pro
src/multimedia/qvideooutputcontrol.cpp
src/multimedia/video/qimagevideobuffer.cpp
tests/auto/qaudiooutput/wavheader.h
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
config.tests/tunerlib_s60/main.cpp
configure.bat
doc/src/examples/sfw-notes.qdoc
doc/src/snippets/multimedia-snippets/player.cpp
examples/audiodevices/main.cpp
examples/audiorecorder/audiorecorder.cpp
examples/player/player.cpp
examples/servicenotesmanager/sfw-notes/main.cpp
examples/servicenotesmanager/sfw-notes/sfwnotes.h
examples/videowidget/main.cpp
features/mobility.prf.template
plugins/declarative/multimedia/multimedia.cpp
plugins/declarative/multimedia/multimedia.pro
plugins/declarative/multimedia/qdeclarativeaudio.cpp
plugins/declarative/multimedia/qdeclarativeaudio_p.h
plugins/declarative/multimedia/qdeclarativemediabase.cpp
plugins/declarative/multimedia/qdeclarativemediabase_p.h
plugins/declarative/multimedia/qdeclarativevideo.cpp
plugins/declarative/multimedia/qdeclarativevideo_p.h
plugins/declarative/multimedia/qmetadatacontrolmetaobject.cpp
plugins/declarative/multimedia/qmetadatacontrolmetaobject_p.h
plugins/multimedia/audiocapture/audioencodercontrol.cpp
plugins/multimedia/directshow/directshow.pro
plugins/multimedia/directshow/player/directshowmetadatacontrol.cpp
plugins/multimedia/directshow/player/directshowmetadatacontrol.h
plugins/multimedia/gstreamer/gstreamer.pro
plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.cpp
plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.h
plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.cpp
plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.h
plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamermediacontainercontrol_maemo.h
plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.cpp
plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp
plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h
plugins/multimedia/gstreamer/mediacapture/qgstreamercaptureservice.cpp
plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.cpp
plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.h
plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.cpp
plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.h
plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp
plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.h
plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp
plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.h
plugins/multimedia/m3u/m3u.pro
plugins/multimedia/qt7/qt7.pro
plugins/multimedia/qt7/qt7movierenderer.mm
plugins/multimedia/qt7/qt7playermetadata.h
plugins/multimedia/qt7/qt7playermetadata.mm
plugins/multimedia/qt7/qt7videooutput.h
plugins/multimedia/symbian/audiosource/s60audiocaptureservice.h
plugins/multimedia/symbian/audiosource/s60audioencodercontrol.h
plugins/multimedia/symbian/audiosource/s60audioendpointselector.h
plugins/multimedia/symbian/audiosource/s60audiomediarecordercontrol.h
plugins/multimedia/symbian/mediaplayer/s60videorenderer.h
plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.h
plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.h
plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp
plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.h
plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp
plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h
plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp
plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.h
plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp
plugins/multimedia/symbian/mmf/mediaplayer/s60videosurface.cpp
plugins/multimedia/symbian/mmf/mmf.pro
plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.cpp
plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.h
plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.cpp
plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.h
plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.h
plugins/multimedia/symbian/mmf/s60mediaserviceplugin.h
plugins/multimedia/symbian/openmaxal/mediarecorder/mediarecorder.pro
plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioencodercontrol.h
plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioendpointselector.h
plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioendpointselector.h~51509540960f75b3081a288526da21cbf198e9b5
plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediacontainercontrol.cpp
plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaservice.cpp
plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaservice.h
plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.cpp
plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.h
plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordsession.cpp
plugins/multimedia/symbian/s60mediaserviceplugin.h
plugins/multimedia/symbian/s60videooutputcontrol.cpp
plugins/multimedia/symbian/s60videooutputcontrol.h
plugins/multimedia/v4l/radio/v4lradiocontrol.cpp
plugins/multimedia/v4l/radio/v4lradiocontrol.h
plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.cpp
plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.h
plugins/multimedia/wmp/qwmpmetadata.cpp
plugins/multimedia/wmp/qwmpmetadata.h
plugins/multimedia/wmp/qwmpplayerservice.h
plugins/sensors/maemo6/maemo6accelerometer.h
plugins/sensors/maemo6/maemo6compass.h
plugins/sensors/maemo6/maemo6magnetometer.cpp
plugins/sensors/maemo6/maemo6rotationsensor.h
plugins/sensors/maemo6/maemo6sensorbase.h
plugins/sensors/s60_sensor_api/qs60sensorapicommon.h
src/contacts/qcontactactiondescriptor.h
src/contacts/qcontactactionfactory.h
src/multimedia/audio/qaudioformat.h
src/multimedia/effects/qsoundeffect.cpp
src/multimedia/effects/qsoundeffect.h
src/multimedia/effects/qsoundeffect_pulse_p.cpp
src/multimedia/effects/qsoundeffect_pulse_p.h
src/multimedia/effects/qsoundeffect_qsound_p.cpp
src/multimedia/effects/wavedecoder_p.h
src/multimedia/multimedia.pro
src/multimedia/qaudiocapturesource.cpp
src/multimedia/qaudiocapturesource.h
src/multimedia/qaudioendpointselector.h
src/multimedia/qgraphicsvideoitem.cpp
src/multimedia/qgraphicsvideoitem.h
src/multimedia/qgraphicsvideoitem_maemo5.cpp
src/multimedia/qmediaencodersettings.cpp
src/multimedia/qmediaencodersettings.h
src/multimedia/qmediaimageviewer.cpp
src/multimedia/qmediaimageviewerservice.cpp
src/multimedia/qmediaimageviewerservice_p.h
src/multimedia/qmediaobject.cpp
src/multimedia/qmediaobject.h
src/multimedia/qmediaplayer.cpp
src/multimedia/qmediaplayer.h
src/multimedia/qmediaplaylist.h
src/multimedia/qmediarecorder.cpp
src/multimedia/qmediarecorder.h
src/multimedia/qmediaserviceprovider.cpp
src/multimedia/qmediaserviceprovider.h
src/multimedia/qmediaserviceproviderplugin.h
src/multimedia/qmediastreamscontrol.cpp
src/multimedia/qmediastreamscontrol.h
src/multimedia/qmetadatareadercontrol.h
src/multimedia/qmetadatawritercontrol.cpp
src/multimedia/qmetadatawritercontrol.h
src/multimedia/qpaintervideosurface.cpp
src/multimedia/qpaintervideosurface_mac_p.h
src/multimedia/qpaintervideosurface_p.h
src/multimedia/qradiotuner.cpp
src/multimedia/qradiotuner.h
src/multimedia/qradiotunercontrol.cpp
src/multimedia/qradiotunercontrol.h
src/multimedia/qtmedianamespace.h
src/multimedia/qtmedianamespace.qdoc
src/multimedia/qvideooutputcontrol.cpp
src/multimedia/qvideowidget.cpp
src/multimedia/qvideowidget_p.h
src/multimedia/video/qabstractvideobuffer.h
src/multimedia/video/qabstractvideosurface.h
src/multimedia/video/qimagevideobuffer.cpp
src/s60installs/s60installs.pro
src/systeminfo/symbian/chargingstatus_s60.h
tests/auto/qaudiooutput/wavheader.h
tests/auto/qcontactactions/sendemailaction/sendemailaction_p.h
tests/auto/qmediaimageviewer/tst_qmediaimageviewer.cpp
tests/auto/qmediaobject/tst_qmediaobject.cpp
tests/auto/qmediaplayer/tst_qmediaplayer.cpp
tests/auto/qmediarecorder/tst_qmediarecorder.cpp
tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp
tests/auto/qradiotuner/tst_qradiotuner.cpp
tests/auto/qsensor/test_sensor.h
tests/auto/qvideowidget/tst_qvideowidget.cpp
tests/auto/symbian/qmediaobject_s60/tst_qmediaobject_s60.cpp
tests/auto/symbian/qmediarecorder_s60/tst_qmediarecorder_s60.cpp
tests/auto/symbian/qmediarecorder_xa/tst_qmediarecorder_xa.cpp
tests/auto/symbian/qmediarecorder_xa/tst_qmediarecorder_xa_aac.cpp
tests/auto/symbian/qmediarecorder_xa/tst_qmediarecorder_xa_amr.cpp
tests/auto/symbian/qmediarecorder_xa/tst_qmediarecorder_xa_macros.h
tests/auto/symbian/qmediarecorder_xa/tst_qmediarecorder_xa_main.cpp
tests/auto/symbian/qmediarecorder_xa/tst_qmediarecorder_xa_wav.cpp
tests/playerex_s60/main.cpp
tests/playerex_s60/videowidget.cpp
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| | |
Display the number of images in a slide show when no image is current,
and status messages between valid images.
Task-number: MOBILITY-589
|
| | | |
|
| |/
|
|
|
|
|
|
|
|
| |
with QMediaObject::bind()/unbind()
QMediaPlayer *player;
QVideoWidget *videoWidget;
videoWidget->setMediaObject(player)
becomes
player->addVideoOutput(videoWidget)
|
| |
|
|
| |
And removed QMediaObject from QMediaPlaylist constructor.
|
| |\ |
|
| | |
| |
| |
| |
| |
| | |
API review.
Is used instead of passing the media object in the constructor.
|
| |/
|
|
|
|
|
|
| |
API review, changed:
append->add
size->mediaCount
position->index
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
TODO.txt
doc/html/index.html
doc/html/multimedia-library.dcf
doc/html/multimedia-library.index
doc/html/qabstractmediaobject.html
doc/html/qabstractmediaservice.html
doc/html/qaudiocapturesource-members.html
doc/html/qaudioencodercontrol.html
doc/html/qaudioformat.html
doc/html/qaudiosource.html
doc/html/qcameracontrol.html
doc/html/qimageprocessingcontrol.html
doc/html/qmediacontrol-members.html
doc/html/qmediacontrol.html
doc/html/qmediaobject-members.html
doc/html/qmediaplayer.html
doc/html/qmediaplayercontrol.html
doc/html/qmediaplaylist.html
doc/html/qmediaplaylistcontrol.html
doc/html/qmediaservice-members.html
doc/html/qmediaslideshow-members.html
doc/html/qmediaslideshow.html
doc/html/qmediasource-members.html
doc/html/qmediasource.html
doc/html/qmetadatacontrol-members.html
doc/html/qmetadatacontrol.html
doc/html/qradioplayer.html
doc/html/qradioplayercontrol.html
doc/html/qradiotuner-members.html
doc/html/qradiotunercontrol-members.html
doc/html/qvideowidget.html
doc/src/index.qdoc
examples/audiorecorder/audiorecorder.pro
examples/cameracapture/cameracapture.cpp
examples/cameracapture/cameracapture.pro
examples/examples.pro
examples/player/player.cpp
examples/player/player.pro
examples/recorder/recorder.cpp
examples/recorder/recorder.pro
examples/slideshow/slideshow.cpp
examples/slideshow/slideshow.h
multimedia/qabstractmediaobject.cpp
multimedia/qabstractmediaservice.cpp
multimedia/qabstractmediaservice.h
multimedia/qaudiodevicecontrol.h
multimedia/qaudioencodercontrol.cpp
multimedia/qaudioencodercontrol.h
multimedia/qaudiorecorderservice.cpp
multimedia/qaudiorecorderservice.h
multimedia/qaudiosource.cpp
multimedia/qaudiosource.h
multimedia/qaudiosourceservice.cpp
multimedia/qaudiosourceservice.h
multimedia/qcamera.cpp
multimedia/qcamera.h
multimedia/qcameracontrol.cpp
multimedia/qcameracontrol.h
multimedia/qcameraexposurecontrol.cpp
multimedia/qcameraexposurecontrol.h
multimedia/qcamerafocuscontrol.cpp
multimedia/qcamerafocuscontrol.h
multimedia/qcameraservice.cpp
multimedia/qcameraservice.h
multimedia/qimagecapturecontrol.h
multimedia/qimageencodercontrol.h
multimedia/qimageprocessingcontrol.cpp
multimedia/qimageprocessingcontrol.h
multimedia/qlocalmediaplaylistprovider.cpp
multimedia/qmediacontrol.cpp
multimedia/qmediaformatcontrol.h
multimedia/qmediaobject.h
multimedia/qmediaobject_p.h
multimedia/qmediaplayer.cpp
multimedia/qmediaplayer.h
multimedia/qmediaplayercontrol.cpp
multimedia/qmediaplayercontrol.h
multimedia/qmediaplayerservice.h
multimedia/qmediaplaylist.cpp
multimedia/qmediaplaylist.h
multimedia/qmediaplaylistcontrol.cpp
multimedia/qmediaplaylistcontrol.h
multimedia/qmediaplaylistioplugin.h
multimedia/qmediaplaylistprovider.h
multimedia/qmediaproviderfactory.cpp
multimedia/qmediarecorder.cpp
multimedia/qmediarecorder.h
multimedia/qmediarecordercontrol.h
multimedia/qmediarecorderservice.cpp
multimedia/qmediarecorderservice.h
multimedia/qmediaserviceprovider.cpp
multimedia/qmediaserviceprovider.h
multimedia/qmediaserviceproviderplugin.h
multimedia/qmediaslideshow.cpp
multimedia/qmediaslideshow.h
multimedia/qmediaslideshowservice.cpp
multimedia/qmediaslideshowservice_p.h
multimedia/qmediasource.cpp
multimedia/qmediasource.h
multimedia/qmediastreamscontrol.cpp
multimedia/qmetadatacontrol.cpp
multimedia/qmetadatacontrol.h
multimedia/qradioplayer.cpp
multimedia/qradioplayercontrol.cpp
multimedia/qradioservice.cpp
multimedia/qradiotuner.h
multimedia/qradiotunercontrol.h
multimedia/qvideodevicecontrol.h
multimedia/qvideoencodercontrol.h
multimedia/qvideooutputcontrol.h
multimedia/qvideorenderercontrol.cpp
multimedia/qvideorenderercontrol.h
multimedia/qvideowidget.cpp
multimedia/qvideowidgetcontrol.cpp
multimedia/qvideowidgetcontrol.h
multimedia/qvideowindowcontrol.h
plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h
plugins/gstreamer/mediacapture/qgstreamercaptureservice.h
plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h
plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h
plugins/gstreamer/mediaplayer/qgstreamerplayersession.h
plugins/phonon/qphononmetadataprovider.h
plugins/phonon/qphononplayerservice.h
plugins/plugins.pro
plugins/v4l/camera/v4lvideobuffer.h
plugins/v4l/v4l.pro
plugins/wmp/qwmpmetadata.cpp
plugins/wmp/qwmpmetadata.h
plugins/wmp/qwmpplayerservice.h
tests/auto/auto.pro
tests/auto/qabstractmediaobject/qabstractmediaobject.pro
tests/auto/qabstractmediaservice/qabstractmediaservice.pro
tests/auto/qabstractmediaservice/tst_qabstractmediaservice.cpp
tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp
tests/auto/qcamera/tst_qcamera.cpp
tests/auto/qmediacontent/qmediacontent.pro
tests/auto/qmediaobject/tst_qmediaobject.cpp
tests/auto/qmediaplayer/tst_qmediaplayer.cpp
tests/auto/qmediarecorder/tst_qmediarecorder.cpp
tests/auto/qmediaservice/qmediaservice.pro
tests/auto/qmediasource/tst_qmediasource.cpp
tests/auto/qradioplayer/tst_qradioplayer.cpp
tests/auto/qradiotuner/qradiotuner.pro
tests/auto/qvideowidget/tst_qvideowidget.cpp
|
| | |
| |
| |
| | |
Reviewed-by: Trust Me
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |/ |
|
| | |
|
|
|
Loads images from a playlist at regular intervals.
Should display the cover art for music, or poster for videos if the
playlist can supply a URI.
All I/O through QNetworkAccessManager so it's not limited to the local
file system.
Playlist API is a bit at odds with QMediaPlayer.
No outputs. Images currently displayed by listening to a signal emitted
by the service.
Doesn't adequately respond to changes in playlist contents.
Timeout starts from when image is requested not after it's loaded so the
display time may be a bit short.
|