summaryrefslogtreecommitdiff
authorzecke <zecke>2005-04-09 22:13:02 (UTC)
committer zecke <zecke>2005-04-09 22:13:02 (UTC)
commit8729cfb1a96057fb2d46188aa091c4086ae6ae61 (patch) (side-by-side diff)
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 @@
-
-#include "frame.h"
-
-using namespace XINE;
-
-Frame::Frame() {
- m_height = 0;
- m_width = 0;
- m_ratioCode = 0;
- m_format = 0;
- m_u = 0;
- m_y = 0;
- m_v = 0;
-}
-Frame::Frame( int *width, int* height,
- int *ratio_code, int *format,
- uint8_t **y, uint8_t **u,
- uint8_t **v ) {
- m_width = width;
- m_height = height;
- m_ratioCode = ratio_code ;
- m_format = format;
- m_y = y;
- m_u = u;
- m_v = v;
-}
-Frame::~Frame() {
-
-
-}
-void Frame::setHeight( int* height ) {
- m_height = height;
-}
-void Frame::setWidth( int* width ) {
- m_width = width;
-}
-void Frame::setRatioCode( int* ratio ) {
- m_ratioCode = ratio;
-}
-void Frame::setFormat( int* format ) {
- m_format = format;
-}
-void Frame::setU( uint8_t** u ) {
- m_u = u;
-}
-void Frame::setY( uint8_t** y ) {
- m_y = y;
-}
-void Frame::setV( uint8_t** v ) {
- m_v = v;
-}
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 @@
-
-#ifndef XINELIBFRAME_H
-#define XINELIBFRAME_H
-
-#include <xine.h>
-
-namespace XINE {
- class Frame {
- public:
- Frame();
- Frame( int *width, int* height,
- int *ratio_code, int *format,
- uint8_t **y, uint8_t **u,
- uint8_t **v );
- ~Frame();
- int* width() { return m_width; };
- int* height() { return m_height; };
-
- int* ratioCode() { return m_ratioCode; };
- int* format() { return m_format; };
- uint8_t ** y() { return m_y; };
- uint8_t ** u() { return m_u; };
- uint8_t ** v() { return m_v; };
-
- void setHeight( int* );
- void setWidth( int* );
- void setRatioCode(int *);
- void setFormat( int* );
- void setU( uint8_t** );
- void setY( uint8_t** );
- void setV( uint8_t** );
-
- private:
- friend class Lib;
- int* m_height;
- int* m_width;
- int* m_ratioCode;
- int* m_format;
- uint8_t** m_u;
- uint8_t** m_y;
- uint8_t** m_v;
- };
-};
-
-#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
@@ -23,25 +23,24 @@
++=   -.     .`     .: 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 "xinevideowidget.h"
-#include "frame.h"
#include "lib.h"
/* OPIE */
#include <opie2/odebug.h>
#include <qpe/global.h>
/* QT */
#include <qtextstream.h>
#include <qdir.h>
#include <qgfx_qws.h>
/* STD */
@@ -298,31 +297,24 @@ void Lib::seekTo( int time ) {
if ( xine_get_param( m_stream, XINE_PARAM_SPEED ) ) {
xine_play( m_stream, 0, time*1000 );
}
else {
xine_play( m_stream, 0, time*1000 );
xine_set_param( m_stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE );
}
}
-Frame Lib::currentFrame() const {
- assert( m_initialized );
-
- Frame frame;
- return frame;
-};
-
QString Lib::metaInfo( int number) const {
assert( m_initialized );
return xine_get_meta_info( m_stream, number );
}
int Lib::error() const {
assert( m_initialized );
return xine_get_error( m_stream );
};
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
@@ -22,43 +22,42 @@
..}^=.=       =       ; 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 ZECKEXINELIB_H
-#define ZECKEXINELIB_H
+#ifndef XINE_VIDEO_LIB_H
+#define XINE_VIDEO_LIB_H
#include <xine.h>
#include "threadutil.h"
class XineVideoWidget;
namespace XINE {
/**
* Lib wrapps the simple interface
* of libxine for easy every day use
* This will become a full C++ Wrapper
* It supports playing, pausing, info,
* stooping, seeking.
*/
- class Frame;
class Lib : public ThreadUtil::Channel, private ThreadUtil::Thread
{
Q_OBJECT
public:
enum InitializationMode { InitializeImmediately, InitializeInThread };
Lib( InitializationMode initMode, XineVideoWidget* = 0);
~Lib();
static int majorVersion();
static int minorVersion();
static int subVersion();
@@ -150,29 +149,24 @@ namespace XINE {
/**
*
*/
void setScaling( bool );
/**
* Set the Gamma value for video output
* @param int the value between -100 and 100, 0 is original
*/
void setGamma( int );
/**
- * test
- */
- Frame currentFrame() const;
-
- /**
* Returns the error code
* XINE_ERROR_NONE 0
* XINE_ERROR_NO_INPUT_PLUGIN 1
* XINE_ERROR_NO_DEMUXER_PLUGIN 2
* XINE_ERROR_DEMUXER_FAILED 3
*/
int error() const;
void ensureInitialized();
void setWidget( XineVideoWidget *widget );
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
@@ -1,22 +1,22 @@
CONFIG = qt warn_on quick-app
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\
+ lib.h xinevideowidget.h volumecontrol.h playlistwidgetgui.h\
alphablend.h yuv2rgb.h threadutil.h mediawidget.h playlistview.h playlistfileview.h \
skin.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 \
+ lib.cpp nullvideo.c xinevideowidget.cpp volumecontrol.cpp \
playlistwidgetgui.cpp\
alphablend.c yuv2rgb.c yuv2rgb_arm2.c yuv2rgb_arm4l.S \
threadutil.cpp mediawidget.cpp playlistview.cpp playlistfileview.cpp \
skin.cpp
TARGET = opieplayer2
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lpthread -lopiecore2 -lopieui2 -lqtaux2 -lxine
MOC_DIR = qpeobj
OBJECTS_DIR = qpeobj
include( $(OPIEDIR)/include.pro )
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 @@
-TEMPLATE = app
-DESTDIR = .
-#CONFIG = qt warn_on
-CONFIG = qt warn_on
-HEADERS = frame.h lib.h
-SOURCES = alphablend.c yuv2rgb.c nullvideo.o frame.cpp lib.cpp mainTest.cpp
-INCLUDEPATH += $(OPIEDIR)/include /opt/QtPalmtop/include
-DEPENDPATH += $(OPIEDIR)/include /opt/QtPalmtop/include
-LIBS += -L/opt/QtPalmtop/lib -lxine -lxineutils
-TARGET = zeckeplayer
-
-
-include( $(OPIEDIR)/include.pro )