summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp67
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp4
-rw-r--r--noncore/multimedia/opieplayer2/mediadetect.cpp5
-rw-r--r--noncore/multimedia/opieplayer2/opieplayer2.pro1
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
@@ -82,6 +82,7 @@ void Ticker::timerEvent( QTimerEvent * ) {
82 82
83void Ticker::drawContents( QPainter *p ) { 83void 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() );
87 pm.fill( colorGroup().base() ); 88 pm.fill( colorGroup().base() );
@@ -94,5 +95,5 @@ void Ticker::drawContents( QPainter *p ) {
94 95
95struct MediaButton { 96struct MediaButton {
96 bool isToggle, isHeld, isDown; 97 bool isToggle, isHeld, isDown;
97}; 98};
98 99
@@ -128,7 +129,6 @@ static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton));
128 129
129AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : 130AudioWidget::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
134 setCaption( tr("OpiePlayer") ); 134 setCaption( tr("OpiePlayer") );
@@ -137,6 +137,6 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
137 cfg.setGroup("Options"); 137 cfg.setGroup("Options");
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
142 QString skinPath = "opieplayer2/skins/" + skin; 142 QString skinPath = "opieplayer2/skins/" + skin;
@@ -194,5 +194,5 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
194 connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) ); 194 connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) );
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) ) );
198 198
@@ -208,5 +208,5 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
208 setPosition( mediaPlayerState->position() ); 208 setPosition( mediaPlayerState->position() );
209 setLooping( mediaPlayerState->fullscreen() ); 209 setLooping( mediaPlayerState->fullscreen() );
210// setPaused( mediaPlayerState->paused() ); 210 // setPaused( mediaPlayerState->paused() );
211 setPlaying( mediaPlayerState->playing() ); 211 setPlaying( mediaPlayerState->playing() );
212 212
@@ -237,6 +237,5 @@ QPixmap *combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) {
237 237
238 238
239QPixmap *maskPixToMask( QPixmap pix, QBitmap mask ) 239QPixmap *maskPixToMask( QPixmap pix, QBitmap mask ) {
240{
241 QPixmap *pixmap = new QPixmap( pix ); 240 QPixmap *pixmap = new QPixmap( pix );
242 pixmap->setMask( mask ); 241 pixmap->setMask( mask );
@@ -293,5 +292,5 @@ void AudioWidget::sliderReleased() {
293 292
294void AudioWidget::setPosition( long i ) { 293void 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() );
297} 296}
@@ -305,5 +304,5 @@ void AudioWidget::setLength( long max ) {
305void AudioWidget::setView( char view ) { 304void AudioWidget::setView( char view ) {
306 305
307// this isnt working for some reason 306 // this isnt working for some reason
308 307
309 if ( mediaPlayerState->streaming() ) { 308 if ( mediaPlayerState->streaming() ) {
@@ -407,6 +406,6 @@ void AudioWidget::stopSkip() {
407 406
408void AudioWidget::timerEvent( QTimerEvent * ) { 407void 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 ) {
412 mediaPlayerState->setPosition( mediaPlayerState->position() - 2 ); 411 mediaPlayerState->setPosition( mediaPlayerState->position() - 2 );
@@ -443,9 +442,8 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
443 return; 442 return;
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 {
451 if ( audioButtons[i].isHeld ) { 449 if ( audioButtons[i].isHeld ) {
@@ -523,13 +521,12 @@ void AudioWidget::paintEvent( QPaintEvent * pe) {
523} 521}
524 522
525void AudioWidget::keyReleaseEvent( QKeyEvent *e) 523void 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:
530 break; 527 break;
531 case Key_F9: //activity 528 case Key_F9: //activity
532 hide(); 529 hide();
533// qDebug("Audio F9"); 530 // qDebug("Audio F9");
534 break; 531 break;
535 case Key_F10: //contacts 532 case Key_F10: //contacts
@@ -545,35 +542,35 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e)
545 case Key_Space: { 542 case Key_Space: {
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 }
555 } 552 }
556 break; 553 break;
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;
579 case Key_Escape: { 576 case Key_Escape: {
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
@@ -166,6 +166,6 @@ int Lib::play( const QString& fileName,
166 QString str = fileName.stripWhiteSpace(); 166 QString str = fileName.stripWhiteSpace();
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(),
171 startPos, start_time); 171 startPos, start_time);
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
@@ -23,6 +23,9 @@ char MediaDetect::videoOrAudio( const QString& fileName ) {
23 qDebug("AUDIO out taken"); 23 qDebug("AUDIO out taken");
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 }
28} 31}
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
@@ -1,4 +1,5 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG = qt warn_on release 2CONFIG = qt warn_on release
3#CONFIG = qt warn_on debug
3#release 4#release
4DESTDIR = $(OPIEDIR)/bin 5DESTDIR = $(OPIEDIR)/bin