equal
deleted
inserted
replaced
20 #include "audioplayer.h" |
20 #include "audioplayer.h" |
21 #include "defs.h" |
21 #include "defs.h" |
22 #include "dummyplayer.h" |
22 #include "dummyplayer.h" |
23 #include "utils.h" |
23 #include "utils.h" |
24 #include "utils.h" |
24 #include "utils.h" |
25 #include "mmf_videoplayer.h" |
25 |
|
26 #ifdef PHONON_MMF_VIDEO_SURFACES |
|
27 #include "videoplayer_surface.h" |
|
28 #else |
|
29 #include "videoplayer_dsa.h" |
|
30 #endif |
|
31 |
26 #include "videowidget.h" |
32 #include "videowidget.h" |
27 |
33 |
28 #include "mediaobject.h" |
34 #include "mediaobject.h" |
29 |
35 |
30 #include <QDir> |
36 #include <QDir> |
291 case MediaTypeAudio: |
297 case MediaTypeAudio: |
292 newPlayer = new AudioPlayer(this, oldPlayer); |
298 newPlayer = new AudioPlayer(this, oldPlayer); |
293 break; |
299 break; |
294 |
300 |
295 case MediaTypeVideo: |
301 case MediaTypeVideo: |
296 newPlayer = new VideoPlayer(this, oldPlayer); |
302 #ifdef PHONON_MMF_VIDEO_SURFACES |
|
303 newPlayer = SurfaceVideoPlayer::create(this, oldPlayer); |
|
304 #else |
|
305 newPlayer = DsaVideoPlayer::create(this, oldPlayer); |
|
306 #endif |
297 break; |
307 break; |
298 } |
308 } |
299 |
309 |
300 if (oldPlayer) |
310 if (oldPlayer) |
301 emit abstractPlayerChanged(0); |
311 emit abstractPlayerChanged(0); |
381 |
391 |
382 //----------------------------------------------------------------------------- |
392 //----------------------------------------------------------------------------- |
383 // Video output |
393 // Video output |
384 //----------------------------------------------------------------------------- |
394 //----------------------------------------------------------------------------- |
385 |
395 |
386 void MMF::MediaObject::setVideoOutput(VideoOutput* videoOutput) |
396 void MMF::MediaObject::setVideoOutput(AbstractVideoOutput* videoOutput) |
387 { |
397 { |
388 m_player->setVideoOutput(videoOutput); |
398 m_player->setVideoOutput(videoOutput); |
389 } |
399 } |
390 |
400 |
391 |
401 |