-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 67 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediadetect.cpp | 5 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/opieplayer2.pro | 1 |
4 files changed, 39 insertions, 38 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 6d867e5..bf3590b 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -83,4 +83,5 @@ void Ticker::timerEvent( QTimerEvent * ) { | |||
83 | void Ticker::drawContents( QPainter *p ) { | 83 | void Ticker::drawContents( QPainter *p ) { |
84 | for ( int i = 0; i - pos < width() && (i < 1 || pixelLen > width()); i += pixelLen ) | 84 | for ( int i = 0; i - pos < width() && (i < 1 || pixelLen > width()); i += pixelLen ) { |
85 | p->drawText( i - pos, 0, INT_MAX, height(), AlignVCenter, scrollText ); | 85 | p->drawText( i - pos, 0, INT_MAX, height(), AlignVCenter, scrollText ); |
86 | } | ||
86 | QPixmap pm( width(), height() ); | 87 | QPixmap pm( width(), height() ); |
@@ -95,3 +96,3 @@ void Ticker::drawContents( QPainter *p ) { | |||
95 | struct MediaButton { | 96 | struct MediaButton { |
96 | bool isToggle, isHeld, isDown; | 97 | bool isToggle, isHeld, isDown; |
97 | }; | 98 | }; |
@@ -129,5 +130,4 @@ static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton)); | |||
129 | AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | 130 | AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : |
130 | QWidget( parent, name, f ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) { | ||
131 | |||
132 | 131 | ||
132 | QWidget( parent, name, f ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) { | ||
133 | 133 | ||
@@ -138,4 +138,4 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
138 | skin = cfg.readEntry("Skin","default"); | 138 | skin = cfg.readEntry("Skin","default"); |
139 | //skin = "scaleTest"; | 139 | //skin = "scaleTest"; |
140 | // color of background, frame, degree of transparency | 140 | // color of background, frame, degree of transparency |
141 | 141 | ||
@@ -195,3 +195,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
195 | connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) ); | 195 | connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) ); |
196 | // connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( setPaused(bool) ) ); | 196 | // connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( setPaused(bool) ) ); |
197 | connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); | 197 | connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); |
@@ -209,3 +209,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
209 | setLooping( mediaPlayerState->fullscreen() ); | 209 | setLooping( mediaPlayerState->fullscreen() ); |
210 | // setPaused( mediaPlayerState->paused() ); | 210 | // setPaused( mediaPlayerState->paused() ); |
211 | setPlaying( mediaPlayerState->playing() ); | 211 | setPlaying( mediaPlayerState->playing() ); |
@@ -238,4 +238,3 @@ QPixmap *combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { | |||
238 | 238 | ||
239 | QPixmap *maskPixToMask( QPixmap pix, QBitmap mask ) | 239 | QPixmap *maskPixToMask( QPixmap pix, QBitmap mask ) { |
240 | { | ||
241 | QPixmap *pixmap = new QPixmap( pix ); | 240 | QPixmap *pixmap = new QPixmap( pix ); |
@@ -294,3 +293,3 @@ void AudioWidget::sliderReleased() { | |||
294 | void AudioWidget::setPosition( long i ) { | 293 | void AudioWidget::setPosition( long i ) { |
295 | // qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i); | 294 | // qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i); |
296 | updateSlider( i, mediaPlayerState->length() ); | 295 | updateSlider( i, mediaPlayerState->length() ); |
@@ -306,3 +305,3 @@ void AudioWidget::setView( char view ) { | |||
306 | 305 | ||
307 | // this isnt working for some reason | 306 | // this isnt working for some reason |
308 | 307 | ||
@@ -408,4 +407,4 @@ void AudioWidget::stopSkip() { | |||
408 | void AudioWidget::timerEvent( QTimerEvent * ) { | 407 | void AudioWidget::timerEvent( QTimerEvent * ) { |
409 | if ( skipDirection == +1 ) { | 408 | if ( skipDirection == +1 ) { |
410 | mediaPlayerState->setPosition( mediaPlayerState->position() + 2 ); | 409 | mediaPlayerState->setPosition( mediaPlayerState->position() + 2 ); |
411 | } else if ( skipDirection == -1 ) { | 410 | } else if ( skipDirection == -1 ) { |
@@ -444,7 +443,6 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
444 | } | 443 | } |
444 | } else if ( !isOnButton && audioButtons[i].isHeld ) { | ||
445 | audioButtons[i].isHeld = FALSE; | ||
446 | toggleButton(i); | ||
445 | } | 447 | } |
446 | else if ( !isOnButton && audioButtons[i].isHeld ) { | ||
447 | audioButtons[i].isHeld = FALSE; | ||
448 | toggleButton(i); | ||
449 | } | ||
450 | } else { | 448 | } else { |
@@ -524,6 +522,5 @@ void AudioWidget::paintEvent( QPaintEvent * pe) { | |||
524 | 522 | ||
525 | void AudioWidget::keyReleaseEvent( QKeyEvent *e) | 523 | void AudioWidget::keyReleaseEvent( QKeyEvent *e) { |
526 | { | ||
527 | switch ( e->key() ) { | 524 | switch ( e->key() ) { |
528 | ////////////////////////////// Zaurus keys | 525 | ////////////////////////////// Zaurus keys |
529 | case Key_Home: | 526 | case Key_Home: |
@@ -532,3 +529,3 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) | |||
532 | hide(); | 529 | hide(); |
533 | // qDebug("Audio F9"); | 530 | // qDebug("Audio F9"); |
534 | break; | 531 | break; |
@@ -546,9 +543,9 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) | |||
546 | if(mediaPlayerState->playing()) { | 543 | if(mediaPlayerState->playing()) { |
547 | // toggleButton(1); | 544 | // toggleButton(1); |
548 | mediaPlayerState->setPlaying(FALSE); | 545 | mediaPlayerState->setPlaying(FALSE); |
549 | // toggleButton(1); | 546 | // toggleButton(1); |
550 | } else { | 547 | } else { |
551 | // toggleButton(0); | 548 | // toggleButton(0); |
552 | mediaPlayerState->setPlaying(TRUE); | 549 | mediaPlayerState->setPlaying(TRUE); |
553 | // toggleButton(0); | 550 | // toggleButton(0); |
554 | } | 551 | } |
@@ -557,22 +554,22 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) | |||
557 | case Key_Down: | 554 | case Key_Down: |
558 | // toggleButton(6); | 555 | // toggleButton(6); |
559 | emit lessClicked(); | 556 | emit lessClicked(); |
560 | emit lessReleased(); | 557 | emit lessReleased(); |
561 | // toggleButton(6); | 558 | // toggleButton(6); |
562 | break; | 559 | break; |
563 | case Key_Up: | 560 | case Key_Up: |
564 | // toggleButton(5); | 561 | // toggleButton(5); |
565 | emit moreClicked(); | 562 | emit moreClicked(); |
566 | emit moreReleased(); | 563 | emit moreReleased(); |
567 | // toggleButton(5); | 564 | // toggleButton(5); |
568 | break; | 565 | break; |
569 | case Key_Right: | 566 | case Key_Right: |
570 | // toggleButton(3); | 567 | // toggleButton(3); |
571 | mediaPlayerState->setNext(); | 568 | mediaPlayerState->setNext(); |
572 | // toggleButton(3); | 569 | // toggleButton(3); |
573 | break; | 570 | break; |
574 | case Key_Left: | 571 | case Key_Left: |
575 | // toggleButton(4); | 572 | // toggleButton(4); |
576 | mediaPlayerState->setPrev(); | 573 | mediaPlayerState->setPrev(); |
577 | // toggleButton(4); | 574 | // toggleButton(4); |
578 | break; | 575 | break; |
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp index 39364ab..3a82a50 100644 --- a/noncore/multimedia/opieplayer2/lib.cpp +++ b/noncore/multimedia/opieplayer2/lib.cpp | |||
@@ -167,4 +167,4 @@ int Lib::play( const QString& fileName, | |||
167 | //workaround OpiePlayer bug | 167 | //workaround OpiePlayer bug |
168 | if (str.right(1) == QString::fromLatin1("/") ) | 168 | //f (str.right(1) == QString::fromLatin1("/") ) |
169 | str = str.mid( str.length() -1 ); | 169 | // str = str.mid( str.length() -1 ); |
170 | return xine_play( m_xine, QFile::encodeName(str.utf8() ).data(), | 170 | return xine_play( m_xine, QFile::encodeName(str.utf8() ).data(), |
diff --git a/noncore/multimedia/opieplayer2/mediadetect.cpp b/noncore/multimedia/opieplayer2/mediadetect.cpp index 5e0da88..91137db 100644 --- a/noncore/multimedia/opieplayer2/mediadetect.cpp +++ b/noncore/multimedia/opieplayer2/mediadetect.cpp | |||
@@ -24,4 +24,7 @@ char MediaDetect::videoOrAudio( const QString& fileName ) { | |||
24 | return 'a'; | 24 | return 'a'; |
25 | } else if ( (fileName.lower()).left(7) == "http://" && | ||
26 | (fileName.lower()).right(1) == "/" ) { | ||
27 | return 'a'; | ||
25 | } else { | 28 | } else { |
26 | return 'f'; | 29 | return 'f'; |
27 | } | 30 | } |
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro index edc4624..03540a1 100644 --- a/noncore/multimedia/opieplayer2/opieplayer2.pro +++ b/noncore/multimedia/opieplayer2/opieplayer2.pro | |||
@@ -2,2 +2,3 @@ TEMPLATE = app | |||
2 | CONFIG = qt warn_on release | 2 | CONFIG = qt warn_on release |
3 | #CONFIG = qt warn_on debug | ||
3 | #release | 4 | #release |