| -rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 58 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer2/lib.h | 1 |
2 files changed, 58 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp index 6431de7..9d4b1be 100644 --- a/noncore/multimedia/opieplayer2/lib.cpp +++ b/noncore/multimedia/opieplayer2/lib.cpp @@ -73,4 +73,5 @@ using namespace XINE; Lib::Lib( InitializationMode initMode, XineVideoWidget* widget ) { + m_initialized = false; m_video = false; m_wid = widget; @@ -88,6 +89,8 @@ Lib::Lib( InitializationMode initMode, XineVideoWidget* widget ) } - if ( initMode == InitializeImmediately ) + if ( initMode == InitializeImmediately ) { initialize(); + m_initialized = true; + } else assert( false ); @@ -135,4 +138,7 @@ void Lib::initialize() Lib::~Lib() { + assert( isRunning() == false ) + assert( m_initialized ); + // free( m_config ); @@ -150,4 +156,6 @@ Lib::~Lib() { void Lib::resize ( const QSize &s ) { + assert( m_initialized ); + if ( s. width ( ) && s. height ( ) ) { ::null_set_gui_width( m_videoOutput, s. width() ); @@ -175,4 +183,6 @@ int Lib::subVersion() { int Lib::play( const QString& fileName, int startPos, int start_time ) { + assert( m_initialized ); + QString str = fileName.stripWhiteSpace(); if ( !xine_open( m_stream, QFile::encodeName(str.utf8() ).data() ) ) { @@ -183,4 +193,6 @@ int Lib::play( const QString& fileName, int startPos, int start_time ) { void Lib::stop() { + assert( m_initialized ); + qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>"); xine_stop( m_stream ); @@ -188,20 +200,30 @@ void Lib::stop() { void Lib::pause( bool toggle ) { + assert( m_initialized ); + xine_set_param( m_stream, XINE_PARAM_SPEED, toggle ? XINE_SPEED_PAUSE : XINE_SPEED_NORMAL ); } int Lib::speed() const { + assert( m_initialized ); + return xine_get_param ( m_stream, XINE_PARAM_SPEED ); } void Lib::setSpeed( int speed ) { + assert( m_initialized ); + xine_set_param ( m_stream, XINE_PARAM_SPEED, speed ); } int Lib::status() const { + assert( m_initialized ); + return xine_get_status( m_stream ); } int Lib::currentPosition() const { + assert( m_initialized ); + int pos, time, length; xine_get_pos_length( m_stream, &pos, &time, &length ); @@ -210,4 +232,6 @@ int Lib::currentPosition() const { int Lib::currentTime() const { + assert( m_initialized ); + int pos, time, length; xine_get_pos_length( m_stream, &pos, &time, &length ); @@ -216,4 +240,6 @@ int Lib::currentTime() const { int Lib::length() const { + assert( m_initialized ); + int pos, time, length; xine_get_pos_length( m_stream, &pos, &time, &length ); @@ -222,8 +248,12 @@ int Lib::length() const { bool Lib::isSeekable() const { + assert( m_initialized ); + return xine_get_stream_info( m_stream, XINE_STREAM_INFO_SEEKABLE ); } void Lib::seekTo( int time ) { + assert( m_initialized ); + //xine_trick_mode ( m_stream, XINE_TRICK_MODE_SEEK_TO_TIME, time ); NOT IMPLEMENTED YET IN XINE :_( // since its now milliseconds we need *1000 @@ -233,4 +263,6 @@ void Lib::seekTo( int time ) { Frame Lib::currentFrame() const { + assert( m_initialized ); + Frame frame; return frame; @@ -238,8 +270,12 @@ Frame Lib::currentFrame() const { 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 ); }; @@ -257,4 +293,6 @@ void Lib::handleXineEvent( const xine_event_t* t ) { void Lib::handleXineEvent( int type ) { + assert( m_initialized ); + if ( type == XINE_EVENT_UI_PLAYBACK_FINISHED ) { emit stopped(); @@ -264,4 +302,6 @@ void Lib::handleXineEvent( int type ) { void Lib::setShowVideo( bool video ) { + assert( m_initialized ); + m_video = video; ::null_set_show_video( m_videoOutput, video ); @@ -269,24 +309,36 @@ void Lib::setShowVideo( bool video ) { bool Lib::isShowingVideo() const { + assert( m_initialized ); + return ::null_is_showing_video( m_videoOutput ); } bool Lib::hasVideo() const { + assert( m_initialized ); + return xine_get_stream_info( m_stream, 18 ); } void Lib::showVideoFullScreen( bool fullScreen ) { + assert( m_initialized ); + ::null_set_fullscreen( m_videoOutput, fullScreen ); } bool Lib::isVideoFullScreen() const { + assert( m_initialized ); + return ::null_is_fullscreen( m_videoOutput ); } void Lib::setScaling( bool scale ) { + assert( m_initialized ); + ::null_set_scaling( m_videoOutput, scale ); } void Lib::setGamma( int value ) { + assert( m_initialized ); + //qDebug( QString( "%1").arg(value) ); /* int gammaValue = ( 100 + value ); */ @@ -295,4 +347,6 @@ void Lib::setGamma( int value ) { bool Lib::isScaling() const { + assert( m_initialized ); + return ::null_is_scaling( m_videoOutput ); } @@ -308,4 +362,6 @@ void Lib::xine_display_frame( void* user_data, uint8_t *frame, void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { + assert( m_initialized ); + if ( !m_video ) { qWarning("not showing video now"); diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h index 6363918..7e3a912 100644 --- a/noncore/multimedia/opieplayer2/lib.h +++ b/noncore/multimedia/opieplayer2/lib.h @@ -193,4 +193,5 @@ namespace XINE { int m_bytes_per_pixel; + bool m_initialized:1; bool m_video:1; XineVideoWidget *m_wid; |