author | zecke <zecke> | 2004-09-23 21:38:02 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-23 21:38:02 (UTC) |
commit | 97ab73d99688443d02086b4f00d1de7c81faa3c7 (patch) (side-by-side diff) | |
tree | 63864e847abc41442d2ed88ca27a27ad1942c15a /noncore/multimedia | |
parent | 3080b2095fd9dddc4937cbf74037ce1dbc7fa6b2 (diff) | |
download | opie-97ab73d99688443d02086b4f00d1de7c81faa3c7.zip opie-97ab73d99688443d02086b4f00d1de7c81faa3c7.tar.gz opie-97ab73d99688443d02086b4f00d1de7c81faa3c7.tar.bz2 |
-Remove bogus whitespaces
-Remove stl dependency
-Make switching from fullscreen video to audio work
-Remove debug output
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 35 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 44 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 23 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 5 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 3 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidgetgui.cpp | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 3 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 9 |
8 files changed, 24 insertions, 99 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp index 248221b..8afb318 100644 --- a/noncore/multimedia/opieplayer2/lib.cpp +++ b/noncore/multimedia/opieplayer2/lib.cpp @@ -132,17 +132,9 @@ void Lib::initialize() - -//xine_open_video_driver( m_xine, NULL, XINE_VISUAL_TYPE_FB, NULL); - - -// null_display_handler( m_videoOutput, xine_display_frame, this ); - m_stream = xine_stream_new (m_xine, m_audioOutput, m_videoOutput ); - if (m_wid != 0 ) { - printf( "!0\n" ); + if (m_wid != 0 ) setWidget( m_wid ); - } - m_queue = xine_event_new_queue (m_stream); + m_queue = xine_event_new_queue (m_stream); xine_event_create_listener_thread (m_queue, xine_event_handler, this); @@ -161,8 +153,6 @@ Lib::~Lib() { xine_close( m_stream ); - xine_event_dispose_queue( m_queue ); - xine_dispose( m_stream ); - xine_exit( m_xine ); + /* FIXME either free or delete but valgrind bitches against both */ @@ -201,5 +191,2 @@ int Lib::play( const QString& fileName, int startPos, int start_time ) { assert( m_initialized ); - // FIXME actually a hack imho. Should not be needed to dispose the whole stream - // but without we get wrong media length reads from libxine for the second media - //xine_dispose ( m_stream ); @@ -207,5 +194,2 @@ int Lib::play( const QString& fileName, int startPos, int start_time ) { - //m_stream = xine_stream_new (m_xine, m_audioOutput, m_videoOutput ); - //m_queue = xine_event_new_queue (m_stream); - //xine_event_create_listener_thread (m_queue, xine_event_handler, this); @@ -219,4 +203,2 @@ void Lib::stop() { assert( m_initialized ); - - odebug << "<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>" << oendl; xine_stop( m_stream ); @@ -260,9 +242,9 @@ int Lib::currentTime() const { int pos, time, length; - xine_get_pos_length( m_stream, &pos, &time, &length ); - if ( time > 0 ) { + pos = time = length = 0; + + if ( xine_get_pos_length( m_stream, &pos, &time, &length ) ) return time/1000; - } else { + else return 0; } -} @@ -302,4 +284,2 @@ void Lib::seekTo( int time ) { - //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 ); @@ -427,3 +407,2 @@ void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { if ( !m_video ) { - owarn << "not showing video now" << oendl; return; diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index e6afbd8..b8023ca 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp @@ -7,2 +7,3 @@ #include <opie2/odebug.h> +#include <opie2/odevice.h> #include <qpe/qpeapplication.h> @@ -36,6 +37,2 @@ MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPla connect( &mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); - -// What is pauseCheck good for? (Simon) -// connect( &mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pauseCheck(bool) ) ); - connect( &mediaPlayerState, SIGNAL( next() ), this, SLOT( next() ) ); @@ -283,38 +280,3 @@ void MediaPlayer::timerEvent( QTimerEvent * ) { void MediaPlayer::blank( bool b ) { -#ifdef QT_QWS_DEVFS - fd=open("/dev/fb/0",O_RDWR); -#else - fd=open("/dev/fb0",O_RDWR); -#endif -#ifdef QT_QWS_SL5XXX - fl= open( "/dev/fl", O_RDWR ); -#endif - if (fd != -1) { - if ( b ) { - odebug << "do blanking" << oendl; -#ifdef QT_QWS_SL5XXX - ioctl( fd, FBIOBLANK, 1 ); - if(fl !=-1) { - ioctl( fl, 2 ); - ::close(fl); - } -#else - ioctl( fd, FBIOBLANK, 3 ); -#endif - isBlanked = TRUE; - } else { - odebug << "do unblanking" << oendl; - ioctl( fd, FBIOBLANK, 0); -#ifdef QT_QWS_SL5XXX - if(fl != -1) { - ioctl( fl, 1); - ::close(fl); - } -#endif - isBlanked = FALSE; - } - close( fd ); - } else { - odebug << "<< /dev/fb0 could not be opened >>" << oendl; - } + Opie::Core::ODevice::inst()->setDisplayStatus( b ); } @@ -348,4 +310,2 @@ void MediaPlayer::cleanUp() {// this happens on closing -// QPEApplication::grabKeyboard(); -// QPEApplication::ungrabKeyboard(); } diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index 563ccf5..880b295 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp @@ -50,3 +50,2 @@ void MediaWidget::setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount buttons.clear(); - buttons.reserve( buttonCount ); @@ -54,3 +53,3 @@ void MediaWidget::setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount Button button = setupButton( skinInfo[ i ], skin ); - buttons.push_back( button ); + buttons.append( button ); } @@ -89,3 +88,3 @@ void MediaWidget::closeEvent( QCloseEvent * ) -void MediaWidget::paintEvent( QPaintEvent *pe ) +void MediaWidget::paintEvent( QPaintEvent * ) { @@ -93,8 +92,2 @@ void MediaWidget::paintEvent( QPaintEvent *pe ) - if ( mediaPlayerState.isFullscreen() ) { - // Clear the background - p.setBrush( QBrush( Qt::black ) ); - return; - } - QPixmap buffer( size() ); @@ -111,3 +104,3 @@ void MediaWidget::resizeEvent( QResizeEvent *e ) - for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) { + for ( ButtonVector::Iterator it = buttons.begin(); it != buttons.end(); ++it ) { Button &button = *it; @@ -131,4 +124,4 @@ MediaWidget::Button *MediaWidget::buttonAt( const QPoint &position ) int pixelIdx = buttonMask.pixelIndex( position.x(), position.y() ); - for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) - if ( it->command + 1 == pixelIdx ) + for ( ButtonVector::Iterator it = buttons.begin(); it != buttons.end(); ++it ) + if ( (*it).command + 1 == pixelIdx ) return &( *it ); @@ -203,3 +196,3 @@ void MediaWidget::paintAllButtons( QPainter &p ) { - for ( ButtonVector::const_iterator it = buttons.begin(); + for ( ButtonVector::ConstIterator it = buttons.begin(); it != buttons.end(); ++it ) @@ -224,4 +217,4 @@ void MediaWidget::setToggleButton( Command command, bool down ) { - for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) - if ( it->command == command ) { + for ( ButtonVector::Iterator it = buttons.begin(); it != buttons.end(); ++it ) + if ( (*it).command == command ) { setToggleButton( *it, down ); diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 8c3a467..d885150 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h @@ -31,5 +31,2 @@ -#include <vector> -#include <memory> - class Skin; @@ -56,3 +53,3 @@ public: }; - typedef std::vector<Button> ButtonVector; + typedef QValueList<Button> ButtonVector; diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 36f77be..d73f0cd 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp @@ -187,3 +187,2 @@ void PlayListWidget::writeDefaultPlaylist() { Om3u *m3uList; - // odebug << "<<<<<<<<<<<<<default>>>>>>>>>>>>>>>>>>>" << oendl; if( d->selectedFiles->first() ) { @@ -191,3 +190,2 @@ void PlayListWidget::writeDefaultPlaylist() { do { - // odebug << d->selectedFiles->current()->file() << oendl; m3uList->add( d->selectedFiles->current()->file() ); @@ -210,3 +208,2 @@ void PlayListWidget::addToSelection( const DocLnk& lnk ) { } -// writeCurrentM3u(); } diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp index 922f9d7..c3c1282 100644 --- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp @@ -185,3 +185,2 @@ void PlayListWidgetGui::setView( char view ) { void PlayListWidgetGui::setActiveWindow() { - // odebug << "SETTING active window" << oendl; // When we get raised we need to ensure that it switches views diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 0625376..2b44701 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp @@ -147,2 +147,3 @@ void VideoWidget::setDisplayType( MediaPlayerState::DisplayType displayType ) scaledHeight = 0; + videoFrame->hide(); hide(); @@ -196,2 +197,3 @@ void VideoWidget::backToNormal() { void VideoWidget::makeVisible() { + videoFrame->show(); if ( mediaPlayerState.isFullscreen() ) { @@ -206,3 +208,2 @@ void VideoWidget::makeVisible() { disconnect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); - } else { diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp index 9f944d7..e1816c8 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.cpp +++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp @@ -83,3 +83,3 @@ void XineControl::init() XineControl::~XineControl() { -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) if ( disabledSuspendScreenSaver ) { @@ -112,3 +112,2 @@ void XineControl::play( const QString& fileName ) { displayType = MediaPlayerState::Audio; - odebug << "HAS AUDIO" << oendl; libXine->setShowVideo( false ); @@ -117,3 +116,2 @@ void XineControl::play( const QString& fileName ) { displayType = MediaPlayerState::Video; - odebug << "HAS VIDEO" << oendl; libXine->setShowVideo( true ); @@ -152,3 +150,3 @@ void XineControl::stop( bool isSet ) { -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) if ( disabledSuspendScreenSaver ) { @@ -178,3 +176,2 @@ long XineControl::currentTime() { return m_currentTime; - QTimer::singleShot( 1000, this, SLOT( currentTime() ) ); } @@ -259,2 +256,4 @@ QString XineControl::getErrorCode() { return tr( "Malformed MRL" ); + } else if ( errorCode == 5 ) { + return tr( "Input failed" ); } else { |