summaryrefslogtreecommitdiff
path: root/noncore/multimedia/opieplayer2/xinecontrol.cpp
authorsimon <simon>2002-12-11 14:25:49 (UTC)
committer simon <simon>2002-12-11 14:25:49 (UTC)
commit7a17954c26add31f28b69989f54e0f28a17c8949 (patch) (unidiff)
tree8603026771be07c996f49a29375fda64c8cd0e67 /noncore/multimedia/opieplayer2/xinecontrol.cpp
parent16138f0cdf46994d20ade71b5621b82fb9386933 (diff)
downloadopie-7a17954c26add31f28b69989f54e0f28a17c8949.zip
opie-7a17954c26add31f28b69989f54e0f28a17c8949.tar.gz
opie-7a17954c26add31f28b69989f54e0f28a17c8949.tar.bz2
- roll back the threaded xine initialization, the mediaplayer initialization
state and the PlayButton change set - instead load the audio-/video widget and the xine control on-demand. much faster and much simpler for startup
Diffstat (limited to 'noncore/multimedia/opieplayer2/xinecontrol.cpp') (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index e791c3b..ee2cd83 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -52,13 +52,13 @@ XineControl::XineControl( XineVideoWidget *xineWidget,
52 connect( this, SIGNAL( positionChanged( long ) ), &mediaPlayerState, SLOT( updatePosition( long ) ) ); 52 connect( this, SIGNAL( positionChanged( long ) ), &mediaPlayerState, SLOT( updatePosition( long ) ) );
53 connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); 53 connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) );
54 connect( &mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) ); 54 connect( &mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) );
55 connect( &mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) ); 55 connect( &mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) );
56 connect( &mediaPlayerState, SIGNAL( videoGammaChanged( int ) ), this, SLOT( setGamma( int ) ) ); 56 connect( &mediaPlayerState, SIGNAL( videoGammaChanged( int ) ), this, SLOT( setGamma( int ) ) );
57 connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) ); 57 connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) );
58 connect( libXine, SIGNAL( initialized() ), this, SLOT( xineInitialized() ) ); 58 connect( xineVideoWidget, SIGNAL( videoResized( const QSize & ) ), this, SLOT( videoResized ( const QSize & ) ) );
59 59
60 disabledSuspendScreenSaver = FALSE; 60 disabledSuspendScreenSaver = FALSE;
61} 61}
62 62
63XineControl::~XineControl() { 63XineControl::~XineControl() {
64#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 64#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
@@ -123,20 +123,12 @@ void XineControl::nextMedia() {
123} 123}
124 124
125void XineControl::setGamma( int value ) { 125void XineControl::setGamma( int value ) {
126 libXine->setGamma( value ); 126 libXine->setGamma( value );
127} 127}
128 128
129void XineControl::xineInitialized()
130{
131 connect( xineVideoWidget, SIGNAL( videoResized( const QSize & ) ), this, SLOT( videoResized ( const QSize & ) ) );
132 libXine->resize( xineVideoWidget->videoSize() );
133
134 emit initialized();
135}
136
137void XineControl::stop( bool isSet ) { 129void XineControl::stop( bool isSet ) {
138 if ( !isSet ) { 130 if ( !isSet ) {
139 libXine->stop(); 131 libXine->stop();
140 132
141#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 133#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
142 if ( disabledSuspendScreenSaver ) { 134 if ( disabledSuspendScreenSaver ) {