Commit e81481d2 authored by Thierry Bastian's avatar Thierry Bastian
Browse files

-video player had getters as slots

-objectdescriptionmodel: fixed build issue on MSVC2002
-videowidget: workatround for compiz fullscreen mode
parent d9484e4e
......@@ -365,7 +365,7 @@ QStringList ObjectDescriptionModelData::mimeTypes(ObjectDescriptionType type) co
return QStringList(QLatin1String("application/x-phonon-objectdescription") + QString::number(static_cast<int>(type)));
}
#if !defined(Q_CC_MSVC) || _MSC_VER >= 1300 || defined(Q_CC_INTEL)
#if !defined(Q_CC_MSVC) || _MSC_VER > 1300 || defined(Q_CC_INTEL)
#define INSTANTIATE_META_FUNCTIONS(type) \
template PHONON_EXPORT const QMetaObject *ObjectDescriptionModel<type>::metaObject() const; \
template void *ObjectDescriptionModel<type>::qt_metacast(const char *)
......
......@@ -102,6 +102,21 @@ class PHONON_EXPORT VideoPlayer : public QWidget
*/
bool isPaused() const;
/**
* getter for the MediaObject.
*/
MediaObject *mediaObject() const;
/**
* getter for the AudioOutput.
*/
AudioOutput *audioOutput() const;
/**
* getter for the VideoWidget.
*/
VideoWidget *videoWidget() const;
public Q_SLOTS:
/**
* Starts preloading the media data and fill audiobuffers in the
......@@ -158,22 +173,6 @@ class PHONON_EXPORT VideoPlayer : public QWidget
*/
void setVolume(float volume);
/**
* getter for the MediaObject.
*/
MediaObject *mediaObject() const;
/**
* getter for the AudioOutput.
*/
AudioOutput *audioOutput() const;
/**
* getter for the VideoWidget.
*/
VideoWidget *videoWidget() const;
Q_SIGNALS:
/**
* This signal is emitted when the playback finished.
......
......@@ -107,8 +107,16 @@ void VideoWidget::setFullScreen(bool newFullScreen)
flags |= Qt::Window;
flags ^= Qt::SubWindow;
setWindowFlags(flags);
#ifdef Q_WS_X11
// This works around a bug with Compiz
// as the window must be visible before we can set the state
show();
raise();
setWindowState( windowState() | Qt::WindowFullScreen ); // set
#else
setWindowState( windowState() | Qt::WindowFullScreen ); // set
show();
#endif
}
} else if (isFullScreen()) {
flags ^= (Qt::Window | Qt::SubWindow); //clear the flags...
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment