summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-11-10 16:43:22 (UTC)
committer harlekin <harlekin>2002-11-10 16:43:22 (UTC)
commit5a8660a4089fa2160da47e2a4d63baea431b48b1 (patch) (side-by-side diff)
tree4d4e7edb3c8fe6dc741fb19c6f5587093f7d4a57
parentcb4821802897bbf6e06be3b2608656e05db68b96 (diff)
downloadopie-5a8660a4089fa2160da47e2a4d63baea431b48b1.zip
opie-5a8660a4089fa2160da47e2a4d63baea431b48b1.tar.gz
opie-5a8660a4089fa2160da47e2a4d63baea431b48b1.tar.bz2
update
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp49
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h1
2 files changed, 25 insertions, 25 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index a847605..c643273 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -140,9 +140,8 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) );
connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) );
connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) );
- connect( mediaPlayerState, SIGNAL( isSeekableToggled( bool ) ), this, SLOT( setSeekable( bool ) ) );
setLength( mediaPlayerState->length() );
setPosition( mediaPlayerState->position() );
setFullscreen( mediaPlayerState->fullscreen() );
@@ -380,10 +379,16 @@ void VideoWidget::makeVisible() {
if ( mediaPlayerState->fullscreen() ) {
setBackgroundMode( QWidget::NoBackground );
showFullScreen();
resize( qApp->desktop()->size() );
- slider->hide();
videoFrame-> setGeometry ( 0, 0, width ( ), height ( ));
+
+ slider->hide();
+ disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
+ disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
+ disconnect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
+ disconnect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
+
} else {
showNormal();
showMaximized();
setBackgroundPixmap( *pixBg );
@@ -396,33 +401,30 @@ void VideoWidget::makeVisible() {
videoFrame->setGeometry( QRect( newW, 4, 240, 170 ) );
} else {
videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) );
}
- }
-}
-
-void VideoWidget::setSeekable( bool isSeekable ) {
-
- if ( !isSeekable || mediaPlayerState->fullscreen() ) {
- qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>");
- if( !slider->isHidden()) {
- slider->hide();
+ if ( !mediaPlayerState->seekable() ) {
+ if( !slider->isHidden()) {
+ slider->hide();
+ }
+ disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
+ disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
+ disconnect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
+ disconnect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
+ } else {
+ slider->show();
+ connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
+ connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
+ connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
+ connect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
}
- disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
- disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
- disconnect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
- disconnect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
- } else {
- slider->show();
- connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
- connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
- connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
- connect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
}
}
+
+
void VideoWidget::paintEvent( QPaintEvent * pe) {
QPainter p( this );
if ( mediaPlayerState->fullscreen() ) {
@@ -454,9 +456,8 @@ void VideoWidget::closeEvent( QCloseEvent* ) {
mediaPlayerState->setList();
}
-
void VideoWidget::keyReleaseEvent( QKeyEvent *e) {
switch ( e->key() ) {
////////////////////////////// Zaurus keys
case Key_Home:
@@ -509,12 +510,12 @@ XineVideoWidget* VideoWidget::vidWidget() {
}
void VideoWidget::setFullscreen ( bool b ) {
- setToggleButton( VideoFullscreen, b );
+ setToggleButton( VideoFullscreen, b );
}
void VideoWidget::setPlaying( bool b) {
- setToggleButton( VideoPlay, b );
+ setToggleButton( VideoPlay, b );
}
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index fd02805..990fa5f 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -68,9 +68,8 @@ public slots:
void makeVisible();
void backToNormal();
void setPosition( long );
void setLength( long );
- void setSeekable( bool );
void setView( char );
signals:
void moreClicked();