author | simon <simon> | 2002-12-02 20:01:57 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-02 20:01:57 (UTC) |
commit | acfbc79f2acf59fa5e4494dde4ea1c4ea5e429b7 (patch) (unidiff) | |
tree | 0589832714da4838a678b2e40e431816087efc39 | |
parent | 262f335a055e189130a3c0dd7028388ab103504e (diff) | |
download | opie-acfbc79f2acf59fa5e4494dde4ea1c4ea5e429b7.zip opie-acfbc79f2acf59fa5e4494dde4ea1c4ea5e429b7.tar.gz opie-acfbc79f2acf59fa5e4494dde4ea1c4ea5e429b7.tar.bz2 |
- less header inclusions
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.h b/noncore/multimedia/opieplayer2/mediaplayer.h index 1e34c88..de3886e 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.h +++ b/noncore/multimedia/opieplayer2/mediaplayer.h | |||
@@ -15,50 +15,48 @@ | |||
15 | ._= =} : or (at your option) any later version. | 15 | ._= =} : or (at your option) any later version. |
16 | .%`+i> _;_. | 16 | .%`+i> _;_. |
17 | .i_,=:_. -<s. This program is distributed in the hope that | 17 | .i_,=:_. -<s. This program is distributed in the hope that |
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 19 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 22 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #ifndef MEDIA_PLAYER_H | 34 | #ifndef MEDIA_PLAYER_H |
35 | #define MEDIA_PLAYER_H | 35 | #define MEDIA_PLAYER_H |
36 | 36 | ||
37 | #include <qmainwindow.h> | 37 | #include <qmainwindow.h> |
38 | #include <qframe.h> | 38 | #include <qframe.h> |
39 | #include <qpe/qlibrary.h> | ||
40 | #include <qpe/mediaplayerplugininterface.h> | ||
41 | 39 | ||
42 | #include "xinecontrol.h" | 40 | #include "xinecontrol.h" |
43 | 41 | ||
44 | class DocLnk; | 42 | class DocLnk; |
45 | class VolumeControl; | 43 | class VolumeControl; |
46 | 44 | ||
47 | class MediaPlayer : public QObject { | 45 | class MediaPlayer : public QObject { |
48 | Q_OBJECT | 46 | Q_OBJECT |
49 | public: | 47 | public: |
50 | MediaPlayer( QObject *parent, const char *name ); | 48 | MediaPlayer( QObject *parent, const char *name ); |
51 | ~MediaPlayer(); | 49 | ~MediaPlayer(); |
52 | private slots: | 50 | private slots: |
53 | void setPlaying( bool ); | 51 | void setPlaying( bool ); |
54 | void pauseCheck( bool ); | 52 | void pauseCheck( bool ); |
55 | void play(); | 53 | void play(); |
56 | void next(); | 54 | void next(); |
57 | void prev(); | 55 | void prev(); |
58 | void startIncreasingVolume(); | 56 | void startIncreasingVolume(); |
59 | void startDecreasingVolume(); | 57 | void startDecreasingVolume(); |
60 | void stopChangingVolume(); | 58 | void stopChangingVolume(); |
61 | void cleanUp(); | 59 | void cleanUp(); |
62 | void blank( bool ); | 60 | void blank( bool ); |
63 | 61 | ||
64 | protected: | 62 | protected: |
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 888fcf4..e0ca243 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -12,49 +12,48 @@ | |||
12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
13 | .="- .-=="i, .._ License as published by the Free Software | 13 | .="- .-=="i, .._ License as published by the Free Software |
14 | - . .-<_> .<> Foundation; either version 2 of the License, | 14 | - . .-<_> .<> Foundation; either version 2 of the License, |
15 | ._= =} : or (at your option) any later version. | 15 | ._= =} : or (at your option) any later version. |
16 | .%`+i> _;_. | 16 | .%`+i> _;_. |
17 | .i_,=:_. -<s. This program is distributed in the hope that | 17 | .i_,=:_. -<s. This program is distributed in the hope that |
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 19 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 22 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include <qpe/qpeapplication.h> | 34 | #include <qpe/qpeapplication.h> |
35 | #include <qpe/resource.h> | 35 | #include <qpe/resource.h> |
36 | #include <qpe/mediaplayerplugininterface.h> | ||
37 | #include <qpe/config.h> | 36 | #include <qpe/config.h> |
38 | 37 | ||
39 | 38 | ||
40 | #include <qwidget.h> | 39 | #include <qwidget.h> |
41 | #include <qpainter.h> | 40 | #include <qpainter.h> |
42 | #include <qpixmap.h> | 41 | #include <qpixmap.h> |
43 | #include <qslider.h> | 42 | #include <qslider.h> |
44 | #include <qdrawutil.h> | 43 | #include <qdrawutil.h> |
45 | #include "videowidget.h" | 44 | #include "videowidget.h" |
46 | #include "mediaplayerstate.h" | 45 | #include "mediaplayerstate.h" |
47 | #include "playlistwidget.h" | 46 | #include "playlistwidget.h" |
48 | 47 | ||
49 | 48 | ||
50 | #ifdef Q_WS_QWS | 49 | #ifdef Q_WS_QWS |
51 | # define USE_DIRECT_PAINTER | 50 | # define USE_DIRECT_PAINTER |
52 | # include <qdirectpainter_qws.h> | 51 | # include <qdirectpainter_qws.h> |
53 | # include <qgfxraster_qws.h> | 52 | # include <qgfxraster_qws.h> |
54 | #endif | 53 | #endif |
55 | 54 | ||
56 | 55 | ||
57 | extern MediaPlayerState *mediaPlayerState; | 56 | extern MediaPlayerState *mediaPlayerState; |
58 | extern PlayListWidget *playList; | 57 | extern PlayListWidget *playList; |
59 | 58 | ||
60 | 59 | ||