Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/nullvideo.c | 22 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/opieplayer2.pro | 6 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.cpp | 53 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.h | 51 |
5 files changed, 130 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index 441eb6e..ce8604a 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h | |||
@@ -15,3 +15,3 @@ class QPixmap; | |||
15 | enum AudioButtons { | 15 | enum AudioButtons { |
16 | AudioPlay, | 16 | AudioPlay=0, |
17 | AudioStop, | 17 | AudioStop, |
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c index b8b8eb3..8badb7b 100644 --- a/noncore/multimedia/opieplayer2/nullvideo.c +++ b/noncore/multimedia/opieplayer2/nullvideo.c | |||
@@ -26,3 +26,19 @@ struct opie_frame_s { | |||
26 | int m_height; | 26 | int m_height; |
27 | int m_ratio_code; | ||
28 | int format; | ||
29 | int flags; | ||
30 | int user_ratio; | ||
31 | |||
32 | int ideal_width; | ||
33 | int ideal_height; | ||
34 | int output_width, output_height; | ||
27 | uint8_t *chunk[3]; | 35 | uint8_t *chunk[3]; |
36 | uint8_t *rgb_dst; | ||
37 | int yuv_stride; | ||
38 | int stripe_height, stripe_inc; | ||
39 | |||
40 | int bytes_per_line; | ||
41 | uint8_t *data; | ||
42 | |||
43 | |||
28 | null_driver_t *output; | 44 | null_driver_t *output; |
@@ -218 +234,7 @@ void null_set_scaling( vo_driver_t* self, int scale ){ | |||
218 | 234 | ||
235 | void null_set_gui_width( vo_driver_t* self, int width ){ | ||
236 | |||
237 | } | ||
238 | void null_set_gui_height( vo_driver_t* self, int height ){ | ||
239 | |||
240 | } | ||
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro index 37208ef..a2cb987 100644 --- a/noncore/multimedia/opieplayer2/opieplayer2.pro +++ b/noncore/multimedia/opieplayer2/opieplayer2.pro | |||
@@ -6,3 +6,3 @@ HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h mediadetect.h\ | |||
6 | videowidget.h audiowidget.h playlistwidget.h mediaplayer.h inputDialog.h \ | 6 | videowidget.h audiowidget.h playlistwidget.h mediaplayer.h inputDialog.h \ |
7 | frame.h lib.h | 7 | frame.h lib.h xinevideowidget.h |
8 | SOURCES = main.cpp \ | 8 | SOURCES = main.cpp \ |
@@ -10,4 +10,4 @@ SOURCES = main.cpp \ | |||
10 | videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp inputDialog.cpp \ | 10 | videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp inputDialog.cpp \ |
11 | frame.cpp lib.cpp nullvideo.c | 11 | frame.cpp lib.cpp nullvideo.c xinevideowidget.cpp |
12 | TARGET = opieplayer | 12 | TARGET = opieplayer2 |
13 | INCLUDEPATH += $(OPIEDIR)/include | 13 | INCLUDEPATH += $(OPIEDIR)/include |
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp new file mode 100644 index 0000000..47f4805 --- a/dev/null +++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp | |||
@@ -0,0 +1,53 @@ | |||
1 | |||
2 | /* | ||
3 | This file is part of the Opie Project | ||
4 | |||
5 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> | ||
6 | Copyright (c) 2002 LJP <> | ||
7 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> | ||
8 | =. | ||
9 | .=l. | ||
10 | .>+-= | ||
11 | _;:, .> :=|. This program is free software; you can | ||
12 | .> <`_, > . <= redistribute it and/or modify it under | ||
13 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | ||
14 | .="- .-=="i, .._ License as published by the Free Software | ||
15 | - . .-<_> .<> Foundation; either version 2 of the License, | ||
16 | ._= =} : or (at your option) any later version. | ||
17 | .%`+i> _;_. | ||
18 | .i_,=:_. -<s. This program is distributed in the hope that | ||
19 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | ||
20 | : .. .:, . . . without even the implied warranty of | ||
21 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | ||
22 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | ||
23 | ..}^=.= = ; Library General Public License for more | ||
24 | ++= -. .` .: details. | ||
25 | : = ...= . :.=- | ||
26 | -. .:....=;==+<; You should have received a copy of the GNU | ||
27 | -_. . . )=. = Library General Public License along with | ||
28 | -- :-=` this library; see the file COPYING.LIB. | ||
29 | If not, write to the Free Software Foundation, | ||
30 | Inc., 59 Temple Place - Suite 330, | ||
31 | Boston, MA 02111-1307, USA. | ||
32 | |||
33 | */ | ||
34 | |||
35 | #include <qimage.h> | ||
36 | #include <qgfx_qws.h> | ||
37 | |||
38 | #include "xinevideowidget.h" | ||
39 | |||
40 | XineVideoWidget::XineVideoWidget( int width, | ||
41 | int height, | ||
42 | QWidget* parent, | ||
43 | const char* name ) | ||
44 | : QWidget( parent, name ) | ||
45 | { | ||
46 | m_image = new QImage( width, height, qt_screen->depth() ); | ||
47 | } | ||
48 | XineVideoWidget::~XineVideoWidget() { | ||
49 | delete m_image; | ||
50 | } | ||
51 | void XineVideoWidget::paintEvent( QPaintEvent* e ) { | ||
52 | QWidget::paintEvent( e ); | ||
53 | } | ||
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.h b/noncore/multimedia/opieplayer2/xinevideowidget.h new file mode 100644 index 0000000..46bb98b --- a/dev/null +++ b/noncore/multimedia/opieplayer2/xinevideowidget.h | |||
@@ -0,0 +1,51 @@ | |||
1 | /* | ||
2 | This file is part of the Opie Project | ||
3 | |||
4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> | ||
5 | Copyright (c) 2002 LJP <> | ||
6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> | ||
7 | =. | ||
8 | .=l. | ||
9 | .>+-= | ||
10 | _;:, .> :=|. This program is free software; you can | ||
11 | .> <`_, > . <= redistribute it and/or modify it under | ||
12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | ||
13 | .="- .-=="i, .._ License as published by the Free Software | ||
14 | - . .-<_> .<> Foundation; either version 2 of the License, | ||
15 | ._= =} : or (at your option) any later version. | ||
16 | .%`+i> _;_. | ||
17 | .i_,=:_. -<s. This program is distributed in the hope that | ||
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | ||
19 | : .. .:, . . . without even the implied warranty of | ||
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | ||
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | ||
22 | ..}^=.= = ; Library General Public License for more | ||
23 | ++= -. .` .: details. | ||
24 | : = ...= . :.=- | ||
25 | -. .:....=;==+<; You should have received a copy of the GNU | ||
26 | -_. . . )=. = Library General Public License along with | ||
27 | -- :-=` this library; see the file COPYING.LIB. | ||
28 | If not, write to the Free Software Foundation, | ||
29 | Inc., 59 Temple Place - Suite 330, | ||
30 | Boston, MA 02111-1307, USA. | ||
31 | |||
32 | */ | ||
33 | |||
34 | |||
35 | |||
36 | #include <qwidget.h> | ||
37 | |||
38 | class QImage; | ||
39 | class XineVideoWidget : public QWidget { | ||
40 | Q_OBJECT | ||
41 | public: | ||
42 | XineVideoWidget( int width, int height, QWidget* parent, const char* name ); | ||
43 | ~XineVideoWidget(); | ||
44 | QImage *image() { return m_image; }; | ||
45 | protected: | ||
46 | void paintEvent( QPaintEvent* p ); | ||
47 | private: | ||
48 | QImage* m_image; | ||
49 | |||
50 | }; | ||
51 | |||