StelVideoMgr.hpp   StelVideoMgr.hpp 
skipping to change at line 22 skipping to change at line 22
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/ */
#ifndef _STELVIDEOMGR_HPP_ #ifndef _STELVIDEOMGR_HPP_
#define _STELVIDEOMGR_HPP_ #define _STELVIDEOMGR_HPP_
#ifdef HAVE_QT_PHONON
#include <phonon/videoplayer.h>
#include <phonon/videowidget.h>
#include <phonon/mediaobject.h>
#endif
#include <QObject> #include <QObject>
#include <QMap> #include <QMap>
#include <QString> #include <QString>
#include <QGraphicsProxyWidget>
class StelVideoMgr : public QObject class StelVideoMgr : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
StelVideoMgr(); StelVideoMgr();
~StelVideoMgr(); ~StelVideoMgr();
public slots: public slots:
skipping to change at line 54 skipping to change at line 47
void pauseVideo(const QString& id); void pauseVideo(const QString& id);
void stopVideo(const QString& id); void stopVideo(const QString& id);
void dropVideo(const QString& id); void dropVideo(const QString& id);
void seekVideo(const QString& id, qint64 ms); void seekVideo(const QString& id, qint64 ms);
void setVideoXY(const QString& id, float x, float y); void setVideoXY(const QString& id, float x, float y);
void setVideoAlpha(const QString& id, float alpha); void setVideoAlpha(const QString& id, float alpha);
void resizeVideo(const QString& id, float w, float h); void resizeVideo(const QString& id, float w, float h);
void showVideo(const QString& id, bool show); void showVideo(const QString& id, bool show);
private: private:
#ifdef HAVE_QT_PHONON #if 0
typedef struct { typedef struct {
QWidget *widget; QWidget *widget;
Phonon::VideoPlayer *player; Phonon::VideoPlayer *player;
QGraphicsProxyWidget *pWidget; QGraphicsProxyWidget *pWidget;
} VideoPlayer; } VideoPlayer;
QMap<QString, VideoPlayer*> videoObjects; QMap<QString, VideoPlayer*> videoObjects;
#endif #endif
}; };
 End of changes. 3 change blocks. 
8 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/