author | simon <simon> | 2002-12-02 20:36:40 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-02 20:36:40 (UTC) |
commit | 0090a335a7162f4b0d34f78850ebf9a8bd544c01 (patch) (side-by-side diff) | |
tree | aedbe7cbf4f30bb72dd4ded98f128227694de4b9 /noncore | |
parent | 6cd1494f86f2f60614c9b9a7b959666dec2500ee (diff) | |
download | opie-0090a335a7162f4b0d34f78850ebf9a8bd544c01.zip opie-0090a335a7162f4b0d34f78850ebf9a8bd544c01.tar.gz opie-0090a335a7162f4b0d34f78850ebf9a8bd544c01.tar.bz2 |
- removed last traces of mediaPlayerState singleton. yay :)
-rw-r--r-- | noncore/multimedia/opieplayer2/main.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 33 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.h | 5 |
4 files changed, 21 insertions, 21 deletions
diff --git a/noncore/multimedia/opieplayer2/main.cpp b/noncore/multimedia/opieplayer2/main.cpp index fd47ea5..7d11ca0 100644 --- a/noncore/multimedia/opieplayer2/main.cpp +++ b/noncore/multimedia/opieplayer2/main.cpp @@ -5,18 +5,16 @@ #include "audiowidget.h" #include "videowidget.h" #include "mediaplayer.h" -MediaPlayerState *mediaPlayerState; PlayListWidget *playList; AudioWidget *audioUI; VideoWidget *videoUI; int main(int argc, char **argv) { QPEApplication a(argc,argv); MediaPlayerState st( 0, "mediaPlayerState" ); - mediaPlayerState = &st; PlayListWidget pl( st, 0, "playList" ); playList = &pl; pl.showMaximized(); AudioWidget aw( st, 0, "audioUI" ); diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 424259b..eccb5d9 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp @@ -59,9 +59,9 @@ MediaPlayer::MediaPlayer( MediaPlayerState &_mediaPlayerState, QObject *parent, connect( videoUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); connect( videoUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); volControl = new VolumeControl; - xineControl = new XineControl(); + xineControl = new XineControl( mediaPlayerState ); Config cfg( "OpiePlayer" ); cfg.setGroup("PlayList"); QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default"); playList->setCaption( tr( "OpiePlayer: " ) + QFileInfo(currentPlaylist).baseName() ); diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp index e7d5a7b..071ef7c 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.cpp +++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp @@ -39,22 +39,21 @@ #include "xinecontrol.h" #include "mediaplayerstate.h" #include "videowidget.h" -extern MediaPlayerState *mediaPlayerState; extern VideoWidget *videoUI; -XineControl::XineControl( QObject *parent, const char *name ) - : QObject( parent, name ) { +XineControl::XineControl( MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name ) + : QObject( parent, name ), mediaPlayerState( _mediaPlayerState ) { libXine = new XINE::Lib( videoUI->vidWidget() ); connect ( videoUI, SIGNAL( videoResized( const QSize & )), this, SLOT( videoResized ( const QSize & ) ) ); - connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pause( bool ) ) ); - connect( this, SIGNAL( positionChanged( long ) ), mediaPlayerState, SLOT( updatePosition( long ) ) ); - connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); - connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) ); - connect( mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) ); - connect( mediaPlayerState, SIGNAL( videoGammaChanged( int ) ), this, SLOT( setGamma( int ) ) ); + connect( &mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pause( bool ) ) ); + connect( this, SIGNAL( positionChanged( long ) ), &mediaPlayerState, SLOT( updatePosition( long ) ) ); + connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); + connect( &mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) ); + connect( &mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) ); + connect( &mediaPlayerState, SIGNAL( videoGammaChanged( int ) ), this, SLOT( setGamma( int ) ) ); connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) ); disabledSuspendScreenSaver = FALSE; } @@ -79,12 +78,12 @@ void XineControl::play( const QString& fileName ) { if ( !libXine->play( fileName, 0, 0 ) ) { QMessageBox::warning( 0l , tr( "Failure" ), getErrorCode() ); // toggle stop so the the play button is reset - mediaPlayerState->setPlaying( false ); + mediaPlayerState.setPlaying( false ); return; } - mediaPlayerState->setPlaying( true ); + mediaPlayerState.setPlaying( true ); MediaPlayerState::DisplayType displayType; // qDebug( QString( "libXine->hasVideo() return : %1 ").arg( libXine->hasVideo() ) ); if ( !libXine->hasVideo() ) { @@ -98,12 +97,12 @@ void XineControl::play( const QString& fileName ) { libXine->setShowVideo( true ); hasVideoChannel = TRUE; } // determine if slider is shown - mediaPlayerState->setIsSeekable( libXine->isSeekable() ); + mediaPlayerState.setIsSeekable( libXine->isSeekable() ); // which gui (video / audio) - mediaPlayerState->setDisplayType( displayType ); + mediaPlayerState.setDisplayType( displayType ); #if defined(Q_WS_QWS) && !defined(QT_NO_COP) if ( !disabledSuspendScreenSaver ) { disabledSuspendScreenSaver = TRUE; @@ -117,9 +116,9 @@ void XineControl::play( const QString& fileName ) { position(); } void XineControl::nextMedia() { - mediaPlayerState->setNext(); + mediaPlayerState.setNext(); } void XineControl::setGamma( int value ) { libXine->setGamma( value ); @@ -166,9 +165,9 @@ long XineControl::currentTime() { * Set the length of the media file */ void XineControl::length() { m_length = libXine->length(); - mediaPlayerState->setLength( m_length ); + mediaPlayerState.setLength( m_length ); } /** @@ -176,12 +175,12 @@ void XineControl::length() { * @return long the postion in seconds */ long XineControl::position() { m_position = ( currentTime() ); - mediaPlayerState->updatePosition( m_position ); + mediaPlayerState.updatePosition( m_position ); long emitPos = (long)m_position; emit positionChanged( emitPos ); - if( mediaPlayerState->isPlaying() ) { + if( mediaPlayerState.isPlaying() ) { // needs to be stopped the media is stopped QTimer::singleShot( 1000, this, SLOT( position() ) ); } // qDebug("POSITION : %d", m_position); diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h index b1300a8..00486f2 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.h +++ b/noncore/multimedia/opieplayer2/xinecontrol.h @@ -36,12 +36,14 @@ #include "lib.h" #include <qobject.h> +#include "mediaplayerstate.h" + class XineControl : public QObject { Q_OBJECT public: - XineControl( QObject *parent = 0, const char *name =0 ); + XineControl( MediaPlayerState &_mediaPlayerState, QObject *parent = 0, const char *name =0 ); ~XineControl(); bool hasVideo() const { return hasVideoChannel; } bool hasAudio() const { return hasAudioChannel; } @@ -105,8 +107,9 @@ private: QString m_fileName; bool disabledSuspendScreenSaver : 1; bool hasVideoChannel : 1; bool hasAudioChannel : 1; + MediaPlayerState &mediaPlayerState; signals: void positionChanged( long ); |