Port away from deprecated Phonon API

frameworks
Martin T. H. Sandsmark 10 years ago
parent fc09e52fc3
commit d8fdb14941
  1. 2
      ui/snapshottaker.cpp
  2. 2
      ui/snapshottaker.h
  3. 6
      ui/videowidget.cpp

@ -14,7 +14,7 @@
#include <QtGui/QImage> #include <QtGui/QImage>
SnapshotTaker::SnapshotTaker( const QString &url, QObject *parent ) SnapshotTaker::SnapshotTaker(const QUrl &url, QObject *parent )
: QObject( parent ) : QObject( parent )
, m_player( new Phonon::VideoPlayer( Phonon::NoCategory, 0 ) ) , m_player( new Phonon::VideoPlayer( Phonon::NoCategory, 0 ) )
{ {

@ -21,7 +21,7 @@ class SnapshotTaker : public QObject
Q_OBJECT Q_OBJECT
public: public:
SnapshotTaker( const QString &url, QObject *parent = Q_NULLPTR ); SnapshotTaker( const QUrl &url, QObject *parent = Q_NULLPTR );
~SnapshotTaker(); ~SnapshotTaker();
Q_SIGNALS: Q_SIGNALS:

@ -119,7 +119,7 @@ void VideoWidget::Private::load()
newurl = QUrl::fromLocalFile(url); newurl = QUrl::fromLocalFile(url);
} }
if ( newurl.isLocalFile() ) if ( newurl.isLocalFile() )
player->load( newurl.toLocalFile() ); player->load( newurl );
else else
player->load( newurl ); player->load( newurl );
@ -159,9 +159,9 @@ void VideoWidget::Private::takeSnapshot()
SnapshotTaker *taker = 0; SnapshotTaker *taker = 0;
if ( newurl.isLocalFile() ) if ( newurl.isLocalFile() )
taker = new SnapshotTaker( newurl.toLocalFile(), q ); taker = new SnapshotTaker( newurl, q );
else else
taker = new SnapshotTaker( newurl.url(), q ); taker = new SnapshotTaker( newurl, q );
q->connect( taker, SIGNAL( finished( const QImage& ) ), q, SLOT( setPosterImage( const QImage& ) ) ); q->connect( taker, SIGNAL( finished( const QImage& ) ), q, SLOT( setPosterImage( const QImage& ) ) );
} }

Loading…
Cancel
Save