author | harlekin <harlekin> | 2002-08-19 21:11:10 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-08-19 21:11:10 (UTC) |
commit | 0d336f310b310ba18af70185eed58be6e07c26d8 (patch) (side-by-side diff) | |
tree | 4084cce27741e5e3ae1bc309d539b7db2ecc8e99 | |
parent | 7f1a7e9b3272f7848423583ea5fc04eb67d97f14 (diff) | |
download | opie-0d336f310b310ba18af70185eed58be6e07c26d8.zip opie-0d336f310b310ba18af70185eed58be6e07c26d8.tar.gz opie-0d336f310b310ba18af70185eed58be6e07c26d8.tar.bz2 |
fixes
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 8 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 5 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/inputDialog.cpp | 8 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/inputDialog.h | 5 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 6 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/volumecontrol.cpp | 15 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/volumecontrol.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.h | 10 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.cpp | 7 |
12 files changed, 45 insertions, 29 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 40e20e1..a718826 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp @@ -164,10 +164,10 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : } for ( int i = 0; i < 10; i++ ) { - buttonPixUp[i] = NULL; - buttonPixDown[i] = NULL; + buttonPixUp[i] = 0l; + buttonPixDown[i] = 0l; } setBackgroundPixmap( *pixBg ); @@ -226,8 +226,10 @@ AudioWidget::~AudioWidget() { delete masks[i]; } } +namespace { + QPixmap *combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { QPixmap pix( img.width(), img.height() ); QPainter p( &pix ); p.drawTiledPixmap( pix.rect(), bg, offset ); @@ -241,9 +243,9 @@ QPixmap *maskPixToMask( QPixmap pix, QBitmap mask ) { pixmap->setMask( mask ); return pixmap; } - +}; void AudioWidget::resizeEvent( QResizeEvent * ) { int h = height(); int w = width(); diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index 626004a..c544882 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h @@ -45,8 +45,10 @@ class QPixmap; +namespace { + enum AudioButtons { AudioPlay=0, AudioStop, AudioNext, @@ -57,9 +59,9 @@ enum AudioButtons { AudioPlayList, AudioForward, AudioBack }; - +}; class Ticker : public QFrame { Q_OBJECT @@ -139,8 +141,9 @@ private: Ticker songInfo; QSlider slider; QLineEdit time; int xoff, yoff; + bool isStreaming : 1; }; #endif // AUDIO_WIDGET_H diff --git a/noncore/multimedia/opieplayer2/inputDialog.cpp b/noncore/multimedia/opieplayer2/inputDialog.cpp index c13ea63..9edb1d3 100644 --- a/noncore/multimedia/opieplayer2/inputDialog.cpp +++ b/noncore/multimedia/opieplayer2/inputDialog.cpp @@ -25,14 +25,18 @@ InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags connect( browserButton, SIGNAL(released()),this,SLOT(browse())); LineEdit1 = new QLineEdit( this, "LineEdit1" ); LineEdit1->setGeometry( QRect( 4, 10, 190, 22 ) ); } - +/* + * return the current text(input) + */ +QString InputDialog::text() const { + return LineEdit1->text(); +} /* * Destroys the object and frees any allocated resources */ InputDialog::~InputDialog() { - inputText= LineEdit1->text(); } void InputDialog::browse() { diff --git a/noncore/multimedia/opieplayer2/inputDialog.h b/noncore/multimedia/opieplayer2/inputDialog.h index d4f5e12..0f36ea4 100644 --- a/noncore/multimedia/opieplayer2/inputDialog.h +++ b/noncore/multimedia/opieplayer2/inputDialog.h @@ -12,10 +12,13 @@ class InputDialog : public QDialog { public: InputDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~InputDialog(); - QString inputText; + QString text()const; + +private: QLineEdit* LineEdit1; + protected slots: void browse(); }; diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 18caaad..0f8242b 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp @@ -179,10 +179,10 @@ void MediaPlayer::timerEvent( QTimerEvent * ) { } // TODO FIXME - unsigned int v; - v = volControl->getVolume(); + unsigned int v= 0; + v = volControl->volume(); v = v / 10; if ( drawnOnScreenDisplay && onScreenDisplayVolume == v ) { return; diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp index 8366ab4..eaedaa5 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp @@ -15,9 +15,9 @@ MediaPlayerState::MediaPlayerState( QObject *parent, const char *name ) : QObject( parent, name ) { Config cfg( "OpiePlayer" ); readConfig( cfg ); - + isStreaming = false; } MediaPlayerState::~MediaPlayerState() { diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 10f1792..251c2e5 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp @@ -588,9 +588,9 @@ void PlayListWidget::saveList() { fileDlg->exec(); if( fileDlg->result() == 1 ) { if ( d->current ) delete d->current; - filename = fileDlg->LineEdit1->text();//+".playlist"; + filename = fileDlg->text();//+".playlist"; // qDebug("saving playlist "+filename+".playlist"); Config cfg( filename +".playlist"); writeConfig( cfg ); @@ -947,9 +947,9 @@ void PlayListWidget::openFile() { InputDialog *fileDlg; fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0); fileDlg->exec(); if( fileDlg->result() == 1 ) { - filename = fileDlg->LineEdit1->text(); + filename = fileDlg->text(); qDebug("Selected filename is "+filename); if(filename.right(3) == "m3u") { readm3u( filename ); @@ -1122,9 +1122,9 @@ void PlayListWidget::writem3u() { fileDlg = new InputDialog(this,tr("Save m3u Playlist "),TRUE, 0); fileDlg->exec(); QString filename,list; if( fileDlg->result() == 1 ) { - filename = fileDlg->LineEdit1->text(); + filename = fileDlg->text(); qDebug(filename); int noOfFiles = 0; d->selectedFiles->first(); do { diff --git a/noncore/multimedia/opieplayer2/volumecontrol.cpp b/noncore/multimedia/opieplayer2/volumecontrol.cpp index a795f3b..271b84e 100644 --- a/noncore/multimedia/opieplayer2/volumecontrol.cpp +++ b/noncore/multimedia/opieplayer2/volumecontrol.cpp @@ -5,15 +5,14 @@ #include <qmessagebox.h> #include "volumecontrol.h" -int VolumeControl::getVolume() { - int volumePerc; +int VolumeControl::volume() { Config cfg( "qpe" ); cfg. setGroup( "Volume" ); - volumePerc = cfg. readNumEntry( "VolumePercent", 50 ); - m_volumePerc = volumePerc; - return volumePerc; + m_volumePerc = cfg. readNumEntry( "VolumePercent", 50 ); + + return m_volumePerc; } void VolumeControl::setVolume( int volumePerc ) { @@ -34,20 +33,20 @@ void VolumeControl::setVolume( int volumePerc ) { } void VolumeControl::incVol( int ammount ) { - int oldVol = getVolume(); + int oldVol = volume(); setVolume( oldVol + ammount); } void VolumeControl::decVol( int ammount ) { - int oldVol = getVolume(); + int oldVol = volume(); setVolume( oldVol - ammount); } VolumeControl::VolumeControl( ) { - getVolume(); + volume(); } VolumeControl::~VolumeControl() { QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << false; diff --git a/noncore/multimedia/opieplayer2/volumecontrol.h b/noncore/multimedia/opieplayer2/volumecontrol.h index d0d34a2..040f978 100644 --- a/noncore/multimedia/opieplayer2/volumecontrol.h +++ b/noncore/multimedia/opieplayer2/volumecontrol.h @@ -24,9 +24,9 @@ public: /** * Get the volume in percent * @return volume percentage */ - int getVolume(); + int volume(); public slots: /** diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp index 766ece2..12d80ba 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.cpp +++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp @@ -70,9 +70,11 @@ XineControl::~XineControl() { void XineControl::play( const QString& fileName ) { hasVideoChannel=FALSE; hasAudioChannel=FALSE; m_fileName = fileName; + qDebug("<<FILENAME: " + fileName + ">>>>"); + libXine->play( fileName ); mediaPlayerState->setPlaying( true ); // default to audio view until we know how to handle video // MediaDetect mdetect; diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h index 88458be..4263b36 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.h +++ b/noncore/multimedia/opieplayer2/xinecontrol.h @@ -42,9 +42,8 @@ class XineControl : public QObject { Q_OBJECT public: XineControl( QObject *parent = 0, const char *name =0 ); ~XineControl(); - int m_length; bool hasVideo() const { return hasVideoChannel; } bool hasAudio() const { return hasAudioChannel; } @@ -63,14 +62,15 @@ public slots: private: XINE::Lib *libXine; MediaDetect mdetect; - long m_currentTime; + long m_currentTime; long m_position; + int m_length; QString m_fileName; - bool disabledSuspendScreenSaver; - bool hasVideoChannel; - bool hasAudioChannel; + bool disabledSuspendScreenSaver : 1; + bool hasVideoChannel : 1; + bool hasAudioChannel : 1; signals: void positionChanged( long ); }; diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp index 3e28e54..bc95d86 100644 --- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp +++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp @@ -140,8 +140,9 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) case 0: src += ( (( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame ) ); break; case 1: src += ( (( clip. y ( ) - framerect. y ( )) * m_bytes_per_pixel ) + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_line_frame ) + (( framerect. height ( ) - 1 ) * m_bytes_per_pixel ) ); break; case 2: src += ( (( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame ) + (( framerect. height ( ) - 1 ) * m_bytes_per_line_frame ) ); break; case 3: src += ( (( clip. y ( ) - framerect. y ( )) * m_bytes_per_pixel ) + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_line_frame ) ); break; + default: break; } uint leftfill = 0; uint framefill = 0; @@ -168,8 +169,9 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) case 0: memcpy ( dst + leftfill, src, framefill ); break; case 1: memcpy_step ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break; case 2: memcpy_rev ( dst + leftfill, src, framefill ); break; case 3: memcpy_step_rev ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break; + default: break; } } if ( rightfill ) memset ( dst + leftfill + framefill, 0, rightfill ); @@ -181,8 +183,9 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) case 0: src += m_bytes_per_line_frame; break; case 1: src -= m_bytes_per_pixel; break; case 2: src -= m_bytes_per_line_frame; break; case 3: src += m_bytes_per_pixel; break; + default: break; } } } } @@ -243,9 +246,9 @@ void XineVideoWidget::resizeEvent ( QResizeEvent * ) emit videoResized ( s ); } -void XineVideoWidget::mousePressEvent ( QMouseEvent *me ) +void XineVideoWidget::mousePressEvent ( QMouseEvent * /*me*/ ) { QWidget *p = parentWidget ( ); if ( p ) { @@ -255,9 +258,9 @@ void XineVideoWidget::mousePressEvent ( QMouseEvent *me ) // emit clicked(); } } -void XineVideoWidget::mouseReleaseEvent ( QMouseEvent *me ) +void XineVideoWidget::mouseReleaseEvent ( QMouseEvent * /*me*/ ) { QWidget *p = parentWidget ( ); if ( p ) { |