author | simon <simon> | 2002-12-02 19:40:58 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-02 19:40:58 (UTC) |
commit | 1706751f05c1d4312beb1ca939a156b090c7b5f6 (patch) (unidiff) | |
tree | a33d7a618d2e8599fd999e78d6eeaea0372adb78 | |
parent | 31443fddddcb3e43bd32bb2f5e9553255d8309a8 (diff) | |
download | opie-1706751f05c1d4312beb1ca939a156b090c7b5f6.zip opie-1706751f05c1d4312beb1ca939a156b090c7b5f6.tar.gz opie-1706751f05c1d4312beb1ca939a156b090c7b5f6.tar.bz2 |
- new base class for AudioWidget and VideoWidget
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 37 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 40 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/opieplayer2.pro | 4 |
3 files changed, 79 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp new file mode 100644 index 0000000..9d1d7fc --- a/dev/null +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp | |||
@@ -0,0 +1,37 @@ | |||
1 | /* | ||
2 | Copyright (C) 2002 Simon Hausmann <hausmann@kde.org> | ||
3 | |||
4 | This library is free software; you can redistribute it and/or | ||
5 | modify it under the terms of the GNU Library General Public | ||
6 | License as published by the Free Software Foundation; either | ||
7 | version 2 of the License, or (at your option) any later version. | ||
8 | |||
9 | This library is distributed in the hope that it will be useful, | ||
10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
12 | Library General Public License for more details. | ||
13 | |||
14 | You should have received a copy of the GNU Library General Public License | ||
15 | along with this library; see the file COPYING.LIB. If not, write to | ||
16 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
17 | Boston, MA 02111-1307, USA. | ||
18 | */ | ||
19 | |||
20 | |||
21 | #include "mediawidget.h" | ||
22 | |||
23 | extern MediaPlayerState *mediaPlayerState; | ||
24 | |||
25 | MediaWidget::MediaWidget( QWidget *parent, const char *name ) | ||
26 | : QWidget( parent, name ) | ||
27 | { | ||
28 | connect( mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ), | ||
29 | this, SLOT( setDisplayType( MediaPlayerState::DisplayType ) ) ); | ||
30 | } | ||
31 | |||
32 | MediaWidget::~MediaWidget() | ||
33 | { | ||
34 | } | ||
35 | |||
36 | /* vim: et sw=4 ts=4 | ||
37 | */ | ||
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h new file mode 100644 index 0000000..cbd08e2 --- a/dev/null +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -0,0 +1,40 @@ | |||
1 | /* | ||
2 | Copyright (C) 2002 Simon Hausmann <hausmann@kde.org> | ||
3 | |||
4 | This library is free software; you can redistribute it and/or | ||
5 | modify it under the terms of the GNU Library General Public | ||
6 | License as published by the Free Software Foundation; either | ||
7 | version 2 of the License, or (at your option) any later version. | ||
8 | |||
9 | This library is distributed in the hope that it will be useful, | ||
10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
12 | Library General Public License for more details. | ||
13 | |||
14 | You should have received a copy of the GNU Library General Public License | ||
15 | along with this library; see the file COPYING.LIB. If not, write to | ||
16 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
17 | Boston, MA 02111-1307, USA. | ||
18 | */ | ||
19 | |||
20 | #ifndef MEDIAWIDGET_H | ||
21 | #define MEDIAWIDGET_H | ||
22 | |||
23 | #include <qwidget.h> | ||
24 | |||
25 | #include "mediaplayerstate.h" | ||
26 | |||
27 | class MediaWidget : public QWidget | ||
28 | { | ||
29 | Q_OBJECT | ||
30 | public: | ||
31 | MediaWidget( QWidget *parent = 0, const char *name = 0 ); | ||
32 | virtual ~MediaWidget(); | ||
33 | |||
34 | public slots: | ||
35 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ) = 0; | ||
36 | }; | ||
37 | |||
38 | #endif // MEDIAWIDGET_H | ||
39 | /* vim: et sw=4 ts=4 | ||
40 | */ | ||
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro index 43a557d..dbc21b1 100644 --- a/noncore/multimedia/opieplayer2/opieplayer2.pro +++ b/noncore/multimedia/opieplayer2/opieplayer2.pro | |||
@@ -1,25 +1,25 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | #CONFIG = qt warn_on release | 2 | #CONFIG = qt warn_on release |
3 | CONFIG = qt warn_on debug | 3 | CONFIG = qt warn_on debug |
4 | DESTDIR = $(OPIEDIR)/bin | 4 | DESTDIR = $(OPIEDIR)/bin |
5 | HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h \ | 5 | HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h \ |
6 | videowidget.h audiowidget.h playlistwidget.h om3u.h mediaplayer.h inputDialog.h \ | 6 | videowidget.h audiowidget.h playlistwidget.h om3u.h mediaplayer.h inputDialog.h \ |
7 | frame.h lib.h xinevideowidget.h volumecontrol.h playlistwidgetgui.h\ | 7 | frame.h lib.h xinevideowidget.h volumecontrol.h playlistwidgetgui.h\ |
8 | alphablend.h yuv2rgb.h threadutil.h | 8 | alphablend.h yuv2rgb.h threadutil.h mediawidget.h |
9 | SOURCES = main.cpp \ | 9 | SOURCES = main.cpp \ |
10 | playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp \ | 10 | playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp \ |
11 | videowidget.cpp audiowidget.cpp playlistwidget.cpp om3u.cpp mediaplayer.cpp inputDialog.cpp \ | 11 | videowidget.cpp audiowidget.cpp playlistwidget.cpp om3u.cpp mediaplayer.cpp inputDialog.cpp \ |
12 | frame.cpp lib.cpp nullvideo.c xinevideowidget.cpp volumecontrol.cpp \ | 12 | frame.cpp lib.cpp nullvideo.c xinevideowidget.cpp volumecontrol.cpp \ |
13 | playlistwidgetgui.cpp\ | 13 | playlistwidgetgui.cpp\ |
14 | alphablend.c yuv2rgb.c yuv2rgb_arm.c yuv2rgb_arm4l.S \ | 14 | alphablend.c yuv2rgb.c yuv2rgb_arm.c yuv2rgb_arm4l.S \ |
15 | threadutil.cpp | 15 | threadutil.cpp mediawidget.cpp |
16 | TARGET = opieplayer2 | 16 | TARGET = opieplayer2 |
17 | INCLUDEPATH += $(OPIEDIR)/include | 17 | INCLUDEPATH += $(OPIEDIR)/include |
18 | DEPENDPATH += $(OPIEDIR)/include | 18 | DEPENDPATH += $(OPIEDIR)/include |
19 | LIBS += -lqpe -lpthread -lopie -lxine | 19 | LIBS += -lqpe -lpthread -lopie -lxine |
20 | MOC_DIR = qpeobj | 20 | MOC_DIR = qpeobj |
21 | OBJECTS_DIR = qpeobj | 21 | OBJECTS_DIR = qpeobj |
22 | 22 | ||
23 | #INCLUDEPATH += $(OPIEDIR)/include | 23 | #INCLUDEPATH += $(OPIEDIR)/include |
24 | #DEPENDPATH += $(OPIEDIR)/include | 24 | #DEPENDPATH += $(OPIEDIR)/include |
25 | 25 | ||