| -rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 67 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer2/lib.h | 5 |
2 files changed, 71 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp index 641cbca..99d5de6 100644 --- a/noncore/multimedia/opieplayer2/lib.cpp +++ b/noncore/multimedia/opieplayer2/lib.cpp @@ -73,2 +73,3 @@ using namespace XINE; Lib::Lib( XineVideoWidget* widget ) { + m_initialized = false; m_video = false; @@ -118,3 +119,3 @@ void Lib::initialize() - m_wid->repaint(); +// m_wid->repaint(); } @@ -125,2 +126,3 @@ void Lib::initialize() + m_initialized = true; } @@ -128,2 +130,6 @@ void Lib::initialize() Lib::~Lib() { + ThreadUtil::AutoLock lock( m_initGuard ); + + assert( m_initialized ); + // free( m_config ); @@ -142,2 +148,13 @@ Lib::~Lib() { +void Lib::assertInitialized() const +{ + ThreadUtil::AutoLock lock( m_initGuard ); + + if ( m_initialized ) + return; + + qDebug( "LibXine: xine function called while not being initialized, yet! Fix the caller!" ); + assert( m_initialized ); +} + void Lib::resize ( const QSize &s ) { @@ -168,2 +185,4 @@ int Lib::subVersion() { int Lib::play( const QString& fileName, int startPos, int start_time ) { + assertInitialized(); + QString str = fileName.stripWhiteSpace(); @@ -176,2 +195,4 @@ int Lib::play( const QString& fileName, int startPos, int start_time ) { void Lib::stop() { + assertInitialized(); + qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>"); @@ -181,2 +202,4 @@ void Lib::stop() { void Lib::pause( bool toggle ) { + assertInitialized(); + xine_set_param( m_stream, XINE_PARAM_SPEED, toggle ? XINE_SPEED_PAUSE : XINE_SPEED_NORMAL ); @@ -185,2 +208,4 @@ void Lib::pause( bool toggle ) { int Lib::speed() const { + assertInitialized(); + return xine_get_param ( m_stream, XINE_PARAM_SPEED ); @@ -189,2 +214,4 @@ int Lib::speed() const { void Lib::setSpeed( int speed ) { + assertInitialized(); + xine_set_param ( m_stream, XINE_PARAM_SPEED, speed ); @@ -193,2 +220,4 @@ void Lib::setSpeed( int speed ) { int Lib::status() const { + assertInitialized(); + return xine_get_status( m_stream ); @@ -197,2 +226,4 @@ int Lib::status() const { int Lib::currentPosition() const { + assertInitialized(); + int pos, time, length; @@ -203,2 +234,4 @@ int Lib::currentPosition() const { int Lib::currentTime() const { + assertInitialized(); + int pos, time, length; @@ -209,2 +242,4 @@ int Lib::currentTime() const { int Lib::length() const { + assertInitialized(); + int pos, time, length; @@ -215,2 +250,4 @@ int Lib::length() const { bool Lib::isSeekable() const { + assertInitialized(); + return xine_get_stream_info( m_stream, XINE_STREAM_INFO_SEEKABLE ); @@ -219,2 +256,4 @@ bool Lib::isSeekable() const { void Lib::seekTo( int time ) { + assertInitialized(); + //xine_trick_mode ( m_stream, XINE_TRICK_MODE_SEEK_TO_TIME, time ); NOT IMPLEMENTED YET IN XINE :_( @@ -226,2 +265,4 @@ void Lib::seekTo( int time ) { Frame Lib::currentFrame() const { + assertInitialized(); + Frame frame; @@ -231,2 +272,4 @@ Frame Lib::currentFrame() const { QString Lib::metaInfo( int number) const { + assertInitialized(); + return xine_get_meta_info( m_stream, number ); @@ -235,2 +278,4 @@ QString Lib::metaInfo( int number) const { int Lib::error() const { + assertInitialized(); + return xine_get_error( m_stream ); @@ -250,2 +295,4 @@ void Lib::handleXineEvent( const xine_event_t* t ) { void Lib::handleXineEvent( int type ) { + assertInitialized(); + if ( type == XINE_EVENT_UI_PLAYBACK_FINISHED ) { @@ -257,2 +304,4 @@ void Lib::handleXineEvent( int type ) { void Lib::setShowVideo( bool video ) { + assertInitialized(); + m_video = video; @@ -262,2 +311,4 @@ void Lib::setShowVideo( bool video ) { bool Lib::isShowingVideo() const { + assertInitialized(); + return ::null_is_showing_video( m_videoOutput ); @@ -266,2 +317,4 @@ bool Lib::isShowingVideo() const { bool Lib::hasVideo() const { + assertInitialized(); + return xine_get_stream_info( m_stream, 18 ); @@ -270,2 +323,4 @@ bool Lib::hasVideo() const { void Lib::showVideoFullScreen( bool fullScreen ) { + assertInitialized(); + ::null_set_fullscreen( m_videoOutput, fullScreen ); @@ -274,2 +329,4 @@ void Lib::showVideoFullScreen( bool fullScreen ) { bool Lib::isVideoFullScreen() const { + assertInitialized(); + return ::null_is_fullscreen( m_videoOutput ); @@ -278,2 +335,4 @@ bool Lib::isVideoFullScreen() const { void Lib::setScaling( bool scale ) { + assertInitialized(); + ::null_set_scaling( m_videoOutput, scale ); @@ -282,2 +341,4 @@ void Lib::setScaling( bool scale ) { void Lib::setGamma( int value ) { + assertInitialized(); + //qDebug( QString( "%1").arg(value) ); @@ -288,2 +349,4 @@ void Lib::setGamma( int value ) { bool Lib::isScaling() const { + assertInitialized(); + return ::null_is_scaling( m_videoOutput ); @@ -301,2 +364,4 @@ void Lib::xine_display_frame( void* user_data, uint8_t *frame, void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { + assertInitialized(); + if ( !m_video ) { diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h index d546c99..4b8dc81 100644 --- a/noncore/multimedia/opieplayer2/lib.h +++ b/noncore/multimedia/opieplayer2/lib.h @@ -185,2 +185,7 @@ namespace XINE { + void assertInitialized() const; + + mutable ThreadUtil::Mutex m_initGuard; + bool m_initialized : 1; + int m_bytes_per_pixel; |