author | simon <simon> | 2002-12-11 14:25:49 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-11 14:25:49 (UTC) |
commit | 7a17954c26add31f28b69989f54e0f28a17c8949 (patch) (side-by-side diff) | |
tree | 8603026771be07c996f49a29375fda64c8cd0e67 /noncore/multimedia/opieplayer2/mediaplayer.h | |
parent | 16138f0cdf46994d20ade71b5621b82fb9386933 (diff) | |
download | opie-7a17954c26add31f28b69989f54e0f28a17c8949.zip opie-7a17954c26add31f28b69989f54e0f28a17c8949.tar.gz opie-7a17954c26add31f28b69989f54e0f28a17c8949.tar.bz2 |
- roll back the threaded xine initialization, the mediaplayer initialization
state and the PlayButton change set
- instead load the audio-/video widget and the xine control on-demand. much
faster and much simpler for startup
Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayer.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.h b/noncore/multimedia/opieplayer2/mediaplayer.h index 6b316f6..5975731 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.h +++ b/noncore/multimedia/opieplayer2/mediaplayer.h @@ -51,13 +51,12 @@ class MediaPlayer : public QObject { Q_OBJECT public: MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name ); ~MediaPlayer(); public slots: - void recreateAudioAndVideoWidgets(); void reloadSkins(); private slots: void setPlaying( bool ); void pauseCheck( bool ); void play(); @@ -69,22 +68,29 @@ private slots: void cleanUp(); void blank( bool ); protected: void timerEvent( QTimerEvent *e ); void keyReleaseEvent( QKeyEvent *e); + private: + AudioWidget *audioUI() const; + VideoWidget *videoUI() const; + XineControl *xineControl() const; bool isBlanked, l, r; int fd, fl; int volumeDirection; - XineControl *xineControl; VolumeControl *volControl; MediaPlayerState &mediaPlayerState; PlayListWidget &playList; - AudioWidget *audioUI; - VideoWidget *videoUI; + + void recreateAudioAndVideoWidgets() const; + + mutable XineControl *m_xineControl; + mutable AudioWidget *m_audioUI; + mutable VideoWidget *m_videoUI; }; #endif // MEDIA_PLAYER_H |