summaryrefslogtreecommitdiff
authorzecke <zecke>2005-04-09 22:13:02 (UTC)
committer zecke <zecke>2005-04-09 22:13:02 (UTC)
commit8729cfb1a96057fb2d46188aa091c4086ae6ae61 (patch) (unidiff)
tree635612f3638234f8e85fb133ff9209f67894620f
parent274690da3f91a808b77a7b9bf98b6bc09a302fc9 (diff)
downloadopie-8729cfb1a96057fb2d46188aa091c4086ae6ae61.zip
opie-8729cfb1a96057fb2d46188aa091c4086ae6ae61.tar.gz
opie-8729cfb1a96057fb2d46188aa091c4086ae6ae61.tar.bz2
Cosmetic OpiePlayer2 changes:
-Remove class Frame and zeckeplayer.pro -Update to compile without frame.h
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/frame.cpp51
-rw-r--r--noncore/multimedia/opieplayer2/frame.h45
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp8
-rw-r--r--noncore/multimedia/opieplayer2/lib.h10
-rw-r--r--noncore/multimedia/opieplayer2/opieplayer2.pro4
-rw-r--r--noncore/multimedia/opieplayer2/zeckeplayer.pro13
6 files changed, 4 insertions, 127 deletions
diff --git a/noncore/multimedia/opieplayer2/frame.cpp b/noncore/multimedia/opieplayer2/frame.cpp
deleted file mode 100644
index 3a3e418..0000000
--- a/noncore/multimedia/opieplayer2/frame.cpp
+++ b/dev/null
@@ -1,51 +0,0 @@
1
2#include "frame.h"
3
4using namespace XINE;
5
6Frame::Frame() {
7 m_height = 0;
8 m_width = 0;
9 m_ratioCode = 0;
10 m_format = 0;
11 m_u = 0;
12 m_y = 0;
13 m_v = 0;
14}
15Frame::Frame( int *width, int* height,
16 int *ratio_code, int *format,
17 uint8_t **y, uint8_t **u,
18 uint8_t **v ) {
19 m_width = width;
20 m_height = height;
21 m_ratioCode = ratio_code ;
22 m_format = format;
23 m_y = y;
24 m_u = u;
25 m_v = v;
26}
27Frame::~Frame() {
28
29
30}
31void Frame::setHeight( int* height ) {
32 m_height = height;
33}
34void Frame::setWidth( int* width ) {
35 m_width = width;
36}
37void Frame::setRatioCode( int* ratio ) {
38 m_ratioCode = ratio;
39}
40void Frame::setFormat( int* format ) {
41 m_format = format;
42}
43void Frame::setU( uint8_t** u ) {
44 m_u = u;
45}
46void Frame::setY( uint8_t** y ) {
47 m_y = y;
48}
49void Frame::setV( uint8_t** v ) {
50 m_v = v;
51}
diff --git a/noncore/multimedia/opieplayer2/frame.h b/noncore/multimedia/opieplayer2/frame.h
deleted file mode 100644
index 0ce7feb..0000000
--- a/noncore/multimedia/opieplayer2/frame.h
+++ b/dev/null
@@ -1,45 +0,0 @@
1
2#ifndef XINELIBFRAME_H
3#define XINELIBFRAME_H
4
5#include <xine.h>
6
7namespace XINE {
8 class Frame {
9 public:
10 Frame();
11 Frame( int *width, int* height,
12 int *ratio_code, int *format,
13 uint8_t **y, uint8_t **u,
14 uint8_t **v );
15 ~Frame();
16 int* width() { return m_width; };
17 int* height() { return m_height; };
18
19 int* ratioCode() { return m_ratioCode; };
20 int* format() { return m_format; };
21 uint8_t ** y() { return m_y; };
22 uint8_t ** u() { return m_u; };
23 uint8_t ** v() { return m_v; };
24
25 void setHeight( int* );
26 void setWidth( int* );
27 void setRatioCode(int *);
28 void setFormat( int* );
29 void setU( uint8_t** );
30 void setY( uint8_t** );
31 void setV( uint8_t** );
32
33 private:
34 friend class Lib;
35 int* m_height;
36 int* m_width;
37 int* m_ratioCode;
38 int* m_format;
39 uint8_t** m_u;
40 uint8_t** m_y;
41 uint8_t** m_v;
42 };
43};
44
45#endif
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 9f0d448..e3289bc 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -33,5 +33,4 @@
33 33
34#include "xinevideowidget.h" 34#include "xinevideowidget.h"
35#include "frame.h"
36#include "lib.h" 35#include "lib.h"
37 36
@@ -308,11 +307,4 @@ void Lib::seekTo( int time ) {
308 307
309 308
310Frame Lib::currentFrame() const {
311 assert( m_initialized );
312
313 Frame frame;
314 return frame;
315};
316
317QString Lib::metaInfo( int number) const { 309QString Lib::metaInfo( int number) const {
318 assert( m_initialized ); 310 assert( m_initialized );
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index dfddc2a..ab432a0 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -32,6 +32,6 @@
32*/ 32*/
33 33
34#ifndef ZECKEXINELIB_H 34#ifndef XINE_VIDEO_LIB_H
35#define ZECKEXINELIB_H 35#define XINE_VIDEO_LIB_H
36 36
37#include <xine.h> 37#include <xine.h>
@@ -50,5 +50,4 @@ namespace XINE {
50 * stooping, seeking. 50 * stooping, seeking.
51 */ 51 */
52 class Frame;
53 class Lib : public ThreadUtil::Channel, private ThreadUtil::Thread 52 class Lib : public ThreadUtil::Channel, private ThreadUtil::Thread
54 { 53 {
@@ -160,9 +159,4 @@ namespace XINE {
160 159
161 /** 160 /**
162 * test
163 */
164 Frame currentFrame() const;
165
166 /**
167 * Returns the error code 161 * Returns the error code
168 * XINE_ERROR_NONE 0 162 * XINE_ERROR_NONE 0
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro
index cd103ee..af7fc5d 100644
--- a/noncore/multimedia/opieplayer2/opieplayer2.pro
+++ b/noncore/multimedia/opieplayer2/opieplayer2.pro
@@ -2,5 +2,5 @@ CONFIG = qt warn_on quick-app
2HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h \ 2HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h \
3 videowidget.h audiowidget.h playlistwidget.h om3u.h mediaplayer.h inputDialog.h \ 3 videowidget.h audiowidget.h playlistwidget.h om3u.h mediaplayer.h inputDialog.h \
4 frame.h lib.h xinevideowidget.h volumecontrol.h playlistwidgetgui.h\ 4 lib.h xinevideowidget.h volumecontrol.h playlistwidgetgui.h\
5 alphablend.h yuv2rgb.h threadutil.h mediawidget.h playlistview.h playlistfileview.h \ 5 alphablend.h yuv2rgb.h threadutil.h mediawidget.h playlistview.h playlistfileview.h \
6 skin.h 6 skin.h
@@ -8,5 +8,5 @@ SOURCES = main.cpp \
8 playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp \ 8 playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp \
9 videowidget.cpp audiowidget.cpp playlistwidget.cpp om3u.cpp mediaplayer.cpp inputDialog.cpp \ 9 videowidget.cpp audiowidget.cpp playlistwidget.cpp om3u.cpp mediaplayer.cpp inputDialog.cpp \
10 frame.cpp lib.cpp nullvideo.c xinevideowidget.cpp volumecontrol.cpp \ 10 lib.cpp nullvideo.c xinevideowidget.cpp volumecontrol.cpp \
11 playlistwidgetgui.cpp\ 11 playlistwidgetgui.cpp\
12 alphablend.c yuv2rgb.c yuv2rgb_arm2.c yuv2rgb_arm4l.S \ 12 alphablend.c yuv2rgb.c yuv2rgb_arm2.c yuv2rgb_arm4l.S \
diff --git a/noncore/multimedia/opieplayer2/zeckeplayer.pro b/noncore/multimedia/opieplayer2/zeckeplayer.pro
deleted file mode 100644
index ba06081..0000000
--- a/noncore/multimedia/opieplayer2/zeckeplayer.pro
+++ b/dev/null
@@ -1,13 +0,0 @@
1 TEMPLATE= app
2DESTDIR = .
3 #CONFIG = qt warn_on
4 CONFIG = qt warn_on
5 HEADERS = frame.h lib.h
6 SOURCES = alphablend.c yuv2rgb.c nullvideo.o frame.cpp lib.cpp mainTest.cpp
7 INCLUDEPATH+= $(OPIEDIR)/include /opt/QtPalmtop/include
8 DEPENDPATH+= $(OPIEDIR)/include /opt/QtPalmtop/include
9LIBS += -L/opt/QtPalmtop/lib -lxine -lxineutils
10TARGET = zeckeplayer
11
12
13include( $(OPIEDIR)/include.pro )