summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp8
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h5
-rw-r--r--noncore/multimedia/opieplayer2/inputDialog.cpp8
-rw-r--r--noncore/multimedia/opieplayer2/inputDialog.h5
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp4
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.cpp2
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp6
-rw-r--r--noncore/multimedia/opieplayer2/volumecontrol.cpp15
-rw-r--r--noncore/multimedia/opieplayer2/volumecontrol.h2
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp2
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.h10
-rw-r--r--noncore/multimedia/opieplayer2/xinevideowidget.cpp7
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
@@ -165,8 +165,8 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
165 } 165 }
166 166
167 for ( int i = 0; i < 10; i++ ) { 167 for ( int i = 0; i < 10; i++ ) {
168 buttonPixUp[i] = NULL; 168 buttonPixUp[i] = 0l;
169 buttonPixDown[i] = NULL; 169 buttonPixDown[i] = 0l;
170 } 170 }
171 171
172 setBackgroundPixmap( *pixBg ); 172 setBackgroundPixmap( *pixBg );
@@ -227,6 +227,8 @@ AudioWidget::~AudioWidget() {
227 } 227 }
228} 228}
229 229
230namespace {
231
230QPixmap *combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { 232QPixmap *combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) {
231 QPixmap pix( img.width(), img.height() ); 233 QPixmap pix( img.width(), img.height() );
232 QPainter p( &pix ); 234 QPainter p( &pix );
@@ -242,7 +244,7 @@ QPixmap *maskPixToMask( QPixmap pix, QBitmap mask ) {
242 return pixmap; 244 return pixmap;
243} 245}
244 246
245 247};
246 248
247void AudioWidget::resizeEvent( QResizeEvent * ) { 249void AudioWidget::resizeEvent( QResizeEvent * ) {
248 int h = height(); 250 int h = height();
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
@@ -46,6 +46,8 @@
46 46
47class QPixmap; 47class QPixmap;
48 48
49namespace {
50
49enum AudioButtons { 51enum AudioButtons {
50 AudioPlay=0, 52 AudioPlay=0,
51 AudioStop, 53 AudioStop,
@@ -58,7 +60,7 @@ enum AudioButtons {
58 AudioForward, 60 AudioForward,
59 AudioBack 61 AudioBack
60}; 62};
61 63};
62 64
63class Ticker : public QFrame { 65class Ticker : public QFrame {
64 Q_OBJECT 66 Q_OBJECT
@@ -140,6 +142,7 @@ private:
140 QSlider slider; 142 QSlider slider;
141 QLineEdit time; 143 QLineEdit time;
142 int xoff, yoff; 144 int xoff, yoff;
145 bool isStreaming : 1;
143}; 146};
144 147
145 148
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
@@ -26,12 +26,16 @@ InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags
26 LineEdit1 = new QLineEdit( this, "LineEdit1" ); 26 LineEdit1 = new QLineEdit( this, "LineEdit1" );
27 LineEdit1->setGeometry( QRect( 4, 10, 190, 22 ) ); 27 LineEdit1->setGeometry( QRect( 4, 10, 190, 22 ) );
28} 28}
29 29/*
30 * return the current text(input)
31 */
32QString InputDialog::text() const {
33 return LineEdit1->text();
34}
30/* 35/*
31 * Destroys the object and frees any allocated resources 36 * Destroys the object and frees any allocated resources
32 */ 37 */
33InputDialog::~InputDialog() { 38InputDialog::~InputDialog() {
34 inputText= LineEdit1->text();
35} 39}
36 40
37void InputDialog::browse() { 41void 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
@@ -13,8 +13,11 @@ class InputDialog : public QDialog {
13public: 13public:
14 InputDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); 14 InputDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
15 ~InputDialog(); 15 ~InputDialog();
16 QString inputText; 16 QString text()const;
17
18private:
17 QLineEdit* LineEdit1; 19 QLineEdit* LineEdit1;
20
18protected slots: 21protected slots:
19 void browse(); 22 void browse();
20}; 23};
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
@@ -180,8 +180,8 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
180 180
181 181
182 // TODO FIXME 182 // TODO FIXME
183 unsigned int v; 183 unsigned int v= 0;
184 v = volControl->getVolume(); 184 v = volControl->volume();
185 v = v / 10; 185 v = v / 10;
186 186
187 if ( drawnOnScreenDisplay && onScreenDisplayVolume == v ) { 187 if ( drawnOnScreenDisplay && onScreenDisplayVolume == v ) {
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
@@ -16,7 +16,7 @@ MediaPlayerState::MediaPlayerState( QObject *parent, const char *name )
16 : QObject( parent, name ) { 16 : QObject( parent, name ) {
17 Config cfg( "OpiePlayer" ); 17 Config cfg( "OpiePlayer" );
18 readConfig( cfg ); 18 readConfig( cfg );
19 19 isStreaming = false;
20} 20}
21 21
22 22
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
@@ -589,7 +589,7 @@ void PlayListWidget::saveList() {
589 if( fileDlg->result() == 1 ) { 589 if( fileDlg->result() == 1 ) {
590 if ( d->current ) 590 if ( d->current )
591 delete d->current; 591 delete d->current;
592 filename = fileDlg->LineEdit1->text();//+".playlist"; 592 filename = fileDlg->text();//+".playlist";
593 // qDebug("saving playlist "+filename+".playlist"); 593 // qDebug("saving playlist "+filename+".playlist");
594 Config cfg( filename +".playlist"); 594 Config cfg( filename +".playlist");
595 writeConfig( cfg ); 595 writeConfig( cfg );
@@ -948,7 +948,7 @@ void PlayListWidget::openFile() {
948 fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0); 948 fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0);
949 fileDlg->exec(); 949 fileDlg->exec();
950 if( fileDlg->result() == 1 ) { 950 if( fileDlg->result() == 1 ) {
951 filename = fileDlg->LineEdit1->text(); 951 filename = fileDlg->text();
952 952
953 qDebug("Selected filename is "+filename); 953 qDebug("Selected filename is "+filename);
954 if(filename.right(3) == "m3u") { 954 if(filename.right(3) == "m3u") {
@@ -1123,7 +1123,7 @@ void PlayListWidget::writem3u() {
1123 fileDlg->exec(); 1123 fileDlg->exec();
1124 QString filename,list; 1124 QString filename,list;
1125 if( fileDlg->result() == 1 ) { 1125 if( fileDlg->result() == 1 ) {
1126 filename = fileDlg->LineEdit1->text(); 1126 filename = fileDlg->text();
1127 qDebug(filename); 1127 qDebug(filename);
1128 int noOfFiles = 0; 1128 int noOfFiles = 0;
1129 d->selectedFiles->first(); 1129 d->selectedFiles->first();
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
@@ -6,13 +6,12 @@
6 6
7#include "volumecontrol.h" 7#include "volumecontrol.h"
8 8
9int VolumeControl::getVolume() { 9int VolumeControl::volume() {
10 int volumePerc;
11 Config cfg( "qpe" ); 10 Config cfg( "qpe" );
12 cfg. setGroup( "Volume" ); 11 cfg. setGroup( "Volume" );
13 volumePerc = cfg. readNumEntry( "VolumePercent", 50 ); 12 m_volumePerc = cfg. readNumEntry( "VolumePercent", 50 );
14 m_volumePerc = volumePerc; 13
15 return volumePerc; 14 return m_volumePerc;
16} 15}
17 16
18 17
@@ -35,18 +34,18 @@ void VolumeControl::setVolume( int volumePerc ) {
35 34
36 35
37void VolumeControl::incVol( int ammount ) { 36void VolumeControl::incVol( int ammount ) {
38 int oldVol = getVolume(); 37 int oldVol = volume();
39 setVolume( oldVol + ammount); 38 setVolume( oldVol + ammount);
40} 39}
41 40
42void VolumeControl::decVol( int ammount ) { 41void VolumeControl::decVol( int ammount ) {
43 int oldVol = getVolume(); 42 int oldVol = volume();
44 setVolume( oldVol - ammount); 43 setVolume( oldVol - ammount);
45} 44}
46 45
47 46
48VolumeControl::VolumeControl( ) { 47VolumeControl::VolumeControl( ) {
49 getVolume(); 48 volume();
50} 49}
51 50
52VolumeControl::~VolumeControl() { 51VolumeControl::~VolumeControl() {
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
@@ -25,7 +25,7 @@ public:
25 * Get the volume in percent 25 * Get the volume in percent
26 * @return volume percentage 26 * @return volume percentage
27 */ 27 */
28 int getVolume(); 28 int volume();
29 29
30public slots: 30public slots:
31 31
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
@@ -71,7 +71,9 @@ void XineControl::play( const QString& fileName ) {
71 hasVideoChannel=FALSE; 71 hasVideoChannel=FALSE;
72 hasAudioChannel=FALSE; 72 hasAudioChannel=FALSE;
73 m_fileName = fileName; 73 m_fileName = fileName;
74
74 qDebug("<<FILENAME: " + fileName + ">>>>"); 75 qDebug("<<FILENAME: " + fileName + ">>>>");
76
75 libXine->play( fileName ); 77 libXine->play( fileName );
76 mediaPlayerState->setPlaying( true ); 78 mediaPlayerState->setPlaying( true );
77 // default to audio view until we know how to handle video 79 // default to audio view until we know how to handle video
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
@@ -43,7 +43,6 @@ class XineControl : public QObject {
43public: 43public:
44 XineControl( QObject *parent = 0, const char *name =0 ); 44 XineControl( QObject *parent = 0, const char *name =0 );
45 ~XineControl(); 45 ~XineControl();
46 int m_length;
47 46
48 bool hasVideo() const { return hasVideoChannel; } 47 bool hasVideo() const { return hasVideoChannel; }
49 bool hasAudio() const { return hasAudioChannel; } 48 bool hasAudio() const { return hasAudioChannel; }
@@ -64,12 +63,13 @@ public slots:
64private: 63private:
65 XINE::Lib *libXine; 64 XINE::Lib *libXine;
66 MediaDetect mdetect; 65 MediaDetect mdetect;
67 long m_currentTime; 66 long m_currentTime;
68 long m_position; 67 long m_position;
68 int m_length;
69 QString m_fileName; 69 QString m_fileName;
70 bool disabledSuspendScreenSaver; 70 bool disabledSuspendScreenSaver : 1;
71 bool hasVideoChannel; 71 bool hasVideoChannel : 1;
72 bool hasAudioChannel; 72 bool hasAudioChannel : 1;
73signals: 73signals:
74 void positionChanged( long ); 74 void positionChanged( long );
75 75
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
@@ -141,6 +141,7 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
141 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; 141 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;
142 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; 142 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;
143 case 3: src += ( (( clip. y ( ) - framerect. y ( )) * m_bytes_per_pixel ) + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_line_frame ) ); break; 143 case 3: src += ( (( clip. y ( ) - framerect. y ( )) * m_bytes_per_pixel ) + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_line_frame ) ); break;
144 default: break;
144 } 145 }
145 146
146 uint leftfill = 0; 147 uint leftfill = 0;
@@ -169,6 +170,7 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
169 case 1: memcpy_step ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break; 170 case 1: memcpy_step ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break;
170 case 2: memcpy_rev ( dst + leftfill, src, framefill ); break; 171 case 2: memcpy_rev ( dst + leftfill, src, framefill ); break;
171 case 3: memcpy_step_rev ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break; 172 case 3: memcpy_step_rev ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break;
173 default: break;
172 } 174 }
173 } 175 }
174 if ( rightfill ) 176 if ( rightfill )
@@ -182,6 +184,7 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
182 case 1: src -= m_bytes_per_pixel; break; 184 case 1: src -= m_bytes_per_pixel; break;
183 case 2: src -= m_bytes_per_line_frame; break; 185 case 2: src -= m_bytes_per_line_frame; break;
184 case 3: src += m_bytes_per_pixel; break; 186 case 3: src += m_bytes_per_pixel; break;
187 default: break;
185 } 188 }
186 } 189 }
187 } 190 }
@@ -244,7 +247,7 @@ void XineVideoWidget::resizeEvent ( QResizeEvent * )
244} 247}
245 248
246 249
247void XineVideoWidget::mousePressEvent ( QMouseEvent *me ) 250void XineVideoWidget::mousePressEvent ( QMouseEvent * /*me*/ )
248{ 251{
249 QWidget *p = parentWidget ( ); 252 QWidget *p = parentWidget ( );
250 253
@@ -256,7 +259,7 @@ void XineVideoWidget::mousePressEvent ( QMouseEvent *me )
256 } 259 }
257} 260}
258 261
259void XineVideoWidget::mouseReleaseEvent ( QMouseEvent *me ) 262void XineVideoWidget::mouseReleaseEvent ( QMouseEvent * /*me*/ )
260{ 263{
261 QWidget *p = parentWidget ( ); 264 QWidget *p = parentWidget ( );
262 265