author | simon <simon> | 2002-12-02 20:09:10 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-02 20:09:10 (UTC) |
commit | e1ef407b16b652755f9c8eefce0f617ec3996998 (patch) (side-by-side diff) | |
tree | 6db64108908f1eee41955caa0e9d7f1d7878e5a8 /noncore/multimedia/opieplayer2/mediaplayer.h | |
parent | acfbc79f2acf59fa5e4494dde4ea1c4ea5e429b7 (diff) | |
download | opie-e1ef407b16b652755f9c8eefce0f617ec3996998.zip opie-e1ef407b16b652755f9c8eefce0f617ec3996998.tar.gz opie-e1ef407b16b652755f9c8eefce0f617ec3996998.tar.bz2 |
- MediaPlayer no more uses the MediaPlayerState instance as singleton
Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayer.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.h b/noncore/multimedia/opieplayer2/mediaplayer.h index de3886e..6aeac7c 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.h +++ b/noncore/multimedia/opieplayer2/mediaplayer.h @@ -1,75 +1,77 @@ /* This file is part of the Opie Project Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> Copyright (c) 2002 LJP <> Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> =. .=l. .>+-= _;:, .> :=|. This program is free software; you can .> <`_, > . <= redistribute it and/or modify it under :`=1 )Y*s>-.-- : the terms of the GNU General Public .="- .-=="i, .._ License as published by the Free Software - . .-<_> .<> Foundation; either version 2 of the License, ._= =} : or (at your option) any later version. .%`+i> _;_. .i_,=:_. -<s. This program is distributed in the hope that + . -:. = it will be useful, but WITHOUT ANY WARRANTY; : .. .:, . . . without even the implied warranty of =_ + =;=|` MERCHANTABILITY or FITNESS FOR A _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU ..}^=.= = ; Library General Public License for more ++= -. .` .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef MEDIA_PLAYER_H #define MEDIA_PLAYER_H #include <qmainwindow.h> #include <qframe.h> #include "xinecontrol.h" class DocLnk; class VolumeControl; +class MediaPlayerState; class MediaPlayer : public QObject { Q_OBJECT public: - MediaPlayer( QObject *parent, const char *name ); + MediaPlayer( MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name ); ~MediaPlayer(); private slots: void setPlaying( bool ); void pauseCheck( bool ); void play(); void next(); void prev(); void startIncreasingVolume(); void startDecreasingVolume(); void stopChangingVolume(); void cleanUp(); void blank( bool ); protected: void timerEvent( QTimerEvent *e ); void keyReleaseEvent( QKeyEvent *e); private: bool isBlanked, l, r; int fd, fl; int volumeDirection; XineControl *xineControl; VolumeControl *volControl; + MediaPlayerState &mediaPlayerState; }; #endif // MEDIA_PLAYER_H |