summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-02 19:40:58 (UTC)
committer simon <simon>2002-12-02 19:40:58 (UTC)
commit1706751f05c1d4312beb1ca939a156b090c7b5f6 (patch) (side-by-side diff)
treea33d7a618d2e8599fd999e78d6eeaea0372adb78
parent31443fddddcb3e43bd32bb2f5e9553255d8309a8 (diff)
downloadopie-1706751f05c1d4312beb1ca939a156b090c7b5f6.zip
opie-1706751f05c1d4312beb1ca939a156b090c7b5f6.tar.gz
opie-1706751f05c1d4312beb1ca939a156b090c7b5f6.tar.bz2
- new base class for AudioWidget and VideoWidget
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.cpp37
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h40
-rw-r--r--noncore/multimedia/opieplayer2/opieplayer2.pro4
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 @@
+/*
+ Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library 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.
+*/
+
+
+#include "mediawidget.h"
+
+extern MediaPlayerState *mediaPlayerState;
+
+MediaWidget::MediaWidget( QWidget *parent, const char *name )
+ : QWidget( parent, name )
+{
+ connect( mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ),
+ this, SLOT( setDisplayType( MediaPlayerState::DisplayType ) ) );
+}
+
+MediaWidget::~MediaWidget()
+{
+}
+
+/* vim: et sw=4 ts=4
+ */
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 @@
+/*
+ Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library 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 MEDIAWIDGET_H
+#define MEDIAWIDGET_H
+
+#include <qwidget.h>
+
+#include "mediaplayerstate.h"
+
+class MediaWidget : public QWidget
+{
+ Q_OBJECT
+public:
+ MediaWidget( QWidget *parent = 0, const char *name = 0 );
+ virtual ~MediaWidget();
+
+public slots:
+ virtual void setDisplayType( MediaPlayerState::DisplayType displayType ) = 0;
+};
+
+#endif // MEDIAWIDGET_H
+/* vim: et sw=4 ts=4
+ */
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
@@ -2,20 +2,20 @@ TEMPLATE = app
#CONFIG = qt warn_on release
CONFIG = qt warn_on debug
DESTDIR = $(OPIEDIR)/bin
HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h \
videowidget.h audiowidget.h playlistwidget.h om3u.h mediaplayer.h inputDialog.h \
frame.h lib.h xinevideowidget.h volumecontrol.h playlistwidgetgui.h\
- alphablend.h yuv2rgb.h threadutil.h
+ alphablend.h yuv2rgb.h threadutil.h mediawidget.h
SOURCES = main.cpp \
playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp \
videowidget.cpp audiowidget.cpp playlistwidget.cpp om3u.cpp mediaplayer.cpp inputDialog.cpp \
frame.cpp lib.cpp nullvideo.c xinevideowidget.cpp volumecontrol.cpp \
playlistwidgetgui.cpp\
alphablend.c yuv2rgb.c yuv2rgb_arm.c yuv2rgb_arm4l.S \
- threadutil.cpp
+ threadutil.cpp mediawidget.cpp
TARGET = opieplayer2
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lpthread -lopie -lxine
MOC_DIR = qpeobj
OBJECTS_DIR = qpeobj