summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-13 22:49:10 (UTC)
committer simon <simon>2002-12-13 22:49:10 (UTC)
commit789181777295e96d75c68d5136dcfdb4c77b85ca (patch) (side-by-side diff)
treeb3bd3b288068cc75246db7821ca7194b29fc75dc
parentb90d33132c1191fd299e902da9684e51615d1c41 (diff)
downloadopie-789181777295e96d75c68d5136dcfdb4c77b85ca.zip
opie-789181777295e96d75c68d5136dcfdb4c77b85ca.tar.gz
opie-789181777295e96d75c68d5136dcfdb4c77b85ca.tar.bz2
- assert everything is initialized when accessing xine functionality
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp58
-rw-r--r--noncore/multimedia/opieplayer2/lib.h1
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
@@ -72,6 +72,7 @@ using namespace XINE;
Lib::Lib( InitializationMode initMode, XineVideoWidget* widget )
{
+ m_initialized = false;
m_video = false;
m_wid = widget;
printf("Lib");
@@ -87,8 +88,10 @@ Lib::Lib( InitializationMode initMode, XineVideoWidget* widget )
f.close();
}
- if ( initMode == InitializeImmediately )
+ if ( initMode == InitializeImmediately ) {
initialize();
+ m_initialized = true;
+ }
else
assert( false );
}
@@ -134,6 +137,9 @@ void Lib::initialize()
}
Lib::~Lib() {
+ assert( isRunning() == false )
+ assert( m_initialized );
+
// free( m_config );
xine_close( m_stream );
@@ -149,6 +155,8 @@ Lib::~Lib() {
}
void Lib::resize ( const QSize &s ) {
+ assert( m_initialized );
+
if ( s. width ( ) && s. height ( ) ) {
::null_set_gui_width( m_videoOutput, s. width() );
::null_set_gui_height( m_videoOutput, s. height() );
@@ -174,6 +182,8 @@ 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() ) ) {
return 0;
@@ -182,49 +192,69 @@ 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 );
}
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 );
return pos;
}
int Lib::currentTime() const {
+ assert( m_initialized );
+
int pos, time, length;
xine_get_pos_length( m_stream, &pos, &time, &length );
return time/1000;
}
int Lib::length() const {
+ assert( m_initialized );
+
int pos, time, length;
xine_get_pos_length( m_stream, &pos, &time, &length );
return length/1000;
}
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
xine_play( m_stream, 0, time*1000 );
@@ -232,15 +262,21 @@ void Lib::seekTo( int time ) {
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 );
};
@@ -256,6 +292,8 @@ 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();
}
@@ -263,37 +301,53 @@ void Lib::handleXineEvent( int type ) {
void Lib::setShowVideo( bool video ) {
+ assert( m_initialized );
+
m_video = video;
::null_set_show_video( m_videoOutput, 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 ); */
::null_set_videoGamma( m_videoOutput, value );
}
bool Lib::isScaling() const {
+ assert( m_initialized );
+
return ::null_is_scaling( m_videoOutput );
}
@@ -307,6 +361,8 @@ 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");
return;
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
@@ -192,6 +192,7 @@ namespace XINE {
void initialize();
int m_bytes_per_pixel;
+ bool m_initialized:1;
bool m_video:1;
XineVideoWidget *m_wid;
xine_t *m_xine;