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 /noncore/multimedia | |
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 @@ -166,6 +166,6 @@ 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; } @@ -228,4 +228,6 @@ AudioWidget::~AudioWidget() { } +namespace { + QPixmap *combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { QPixmap pix( img.width(), img.height() ); @@ -243,5 +245,5 @@ QPixmap *maskPixToMask( QPixmap pix, QBitmap mask ) { } - +}; void AudioWidget::resizeEvent( QResizeEvent * ) { 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 @@ -47,4 +47,6 @@ class QPixmap; +namespace { + enum AudioButtons { AudioPlay=0, @@ -59,5 +61,5 @@ enum AudioButtons { AudioBack }; - +}; class Ticker : public QFrame { @@ -141,4 +143,5 @@ private: QLineEdit time; int xoff, yoff; + bool isStreaming : 1; }; 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 @@ -27,10 +27,14 @@ InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags 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(); } 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 @@ -14,6 +14,9 @@ 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 @@ -181,6 +181,6 @@ void MediaPlayer::timerEvent( QTimerEvent * ) { // TODO FIXME - unsigned int v; - v = volControl->getVolume(); + unsigned int v= 0; + v = volControl->volume(); v = v / 10; 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 @@ -17,5 +17,5 @@ MediaPlayerState::MediaPlayerState( QObject *parent, const char *name ) Config cfg( "OpiePlayer" ); readConfig( cfg ); - + isStreaming = false; } 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 @@ -590,5 +590,5 @@ void PlayListWidget::saveList() { if ( d->current ) delete d->current; - filename = fileDlg->LineEdit1->text();//+".playlist"; + filename = fileDlg->text();//+".playlist"; // qDebug("saving playlist "+filename+".playlist"); Config cfg( filename +".playlist"); @@ -949,5 +949,5 @@ void PlayListWidget::openFile() { fileDlg->exec(); if( fileDlg->result() == 1 ) { - filename = fileDlg->LineEdit1->text(); + filename = fileDlg->text(); qDebug("Selected filename is "+filename); @@ -1124,5 +1124,5 @@ void PlayListWidget::writem3u() { QString filename,list; if( fileDlg->result() == 1 ) { - filename = fileDlg->LineEdit1->text(); + filename = fileDlg->text(); qDebug(filename); int noOfFiles = 0; 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 @@ -7,11 +7,10 @@ #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; } @@ -36,10 +35,10 @@ 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); } @@ -47,5 +46,5 @@ void VolumeControl::decVol( int ammount ) { VolumeControl::VolumeControl( ) { - getVolume(); + volume(); } 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 @@ -26,5 +26,5 @@ public: * @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 @@ -72,5 +72,7 @@ void XineControl::play( const QString& fileName ) { hasAudioChannel=FALSE; m_fileName = fileName; + qDebug("<<FILENAME: " + fileName + ">>>>"); + libXine->play( fileName ); mediaPlayerState->setPlaying( true ); 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 @@ -44,5 +44,4 @@ public: XineControl( QObject *parent = 0, const char *name =0 ); ~XineControl(); - int m_length; bool hasVideo() const { return hasVideoChannel; } @@ -65,10 +64,11 @@ 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 @@ -142,4 +142,5 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) 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; } @@ -170,4 +171,5 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) 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; } } @@ -183,4 +185,5 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) case 2: src -= m_bytes_per_line_frame; break; case 3: src += m_bytes_per_pixel; break; + default: break; } } @@ -245,5 +248,5 @@ void XineVideoWidget::resizeEvent ( QResizeEvent * ) -void XineVideoWidget::mousePressEvent ( QMouseEvent *me ) +void XineVideoWidget::mousePressEvent ( QMouseEvent * /*me*/ ) { QWidget *p = parentWidget ( ); @@ -257,5 +260,5 @@ void XineVideoWidget::mousePressEvent ( QMouseEvent *me ) } -void XineVideoWidget::mouseReleaseEvent ( QMouseEvent *me ) +void XineVideoWidget::mouseReleaseEvent ( QMouseEvent * /*me*/ ) { QWidget *p = parentWidget ( ); |