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
@@ -167,4 +167,4 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
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 }
@@ -229,2 +229,4 @@ AudioWidget::~AudioWidget() {
229 229
230namespace {
231
230QPixmap *combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { 232QPixmap *combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) {
@@ -244,3 +246,3 @@ QPixmap *maskPixToMask( QPixmap pix, QBitmap mask ) {
244 246
245 247};
246 248
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
@@ -48,2 +48,4 @@ class QPixmap;
48 48
49namespace {
50
49enum AudioButtons { 51enum AudioButtons {
@@ -60,3 +62,3 @@ enum AudioButtons {
60}; 62};
61 63};
62 64
@@ -142,2 +144,3 @@ private:
142 int xoff, yoff; 144 int xoff, yoff;
145 bool isStreaming : 1;
143}; 146};
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
@@ -28,3 +28,8 @@ InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags
28} 28}
29 29/*
30 * return the current text(input)
31 */
32QString InputDialog::text() const {
33 return LineEdit1->text();
34}
30/* 35/*
@@ -33,3 +38,2 @@ InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags
33InputDialog::~InputDialog() { 38InputDialog::~InputDialog() {
34 inputText= LineEdit1->text();
35} 39}
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
@@ -15,4 +15,7 @@ public:
15 ~InputDialog(); 15 ~InputDialog();
16 QString inputText; 16 QString text()const;
17
18private:
17 QLineEdit* LineEdit1; 19 QLineEdit* LineEdit1;
20
18protected slots: 21protected slots:
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
@@ -182,4 +182,4 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
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;
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
@@ -18,3 +18,3 @@ MediaPlayerState::MediaPlayerState( QObject *parent, const char *name )
18 readConfig( cfg ); 18 readConfig( cfg );
19 19 isStreaming = false;
20} 20}
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
@@ -591,3 +591,3 @@ void PlayListWidget::saveList() {
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");
@@ -950,3 +950,3 @@ void PlayListWidget::openFile() {
950 if( fileDlg->result() == 1 ) { 950 if( fileDlg->result() == 1 ) {
951 filename = fileDlg->LineEdit1->text(); 951 filename = fileDlg->text();
952 952
@@ -1125,3 +1125,3 @@ void PlayListWidget::writem3u() {
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);
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
@@ -8,9 +8,8 @@
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}
@@ -37,3 +36,3 @@ void VolumeControl::setVolume( int volumePerc ) {
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);
@@ -42,3 +41,3 @@ void VolumeControl::incVol( int ammount ) {
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);
@@ -48,3 +47,3 @@ void VolumeControl::decVol( int ammount ) {
48VolumeControl::VolumeControl( ) { 47VolumeControl::VolumeControl( ) {
49 getVolume(); 48 volume();
50} 49}
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
@@ -27,3 +27,3 @@ public:
27 */ 27 */
28 int getVolume(); 28 int volume();
29 29
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
@@ -73,3 +73,5 @@ void XineControl::play( const QString& fileName ) {
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 );
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
@@ -45,3 +45,2 @@ public:
45 ~XineControl(); 45 ~XineControl();
46 int m_length;
47 46
@@ -66,8 +65,9 @@ private:
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:
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
@@ -143,2 +143,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
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 }
@@ -171,2 +172,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
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 }
@@ -184,2 +186,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
184 case 3: src += m_bytes_per_pixel; break; 186 case 3: src += m_bytes_per_pixel; break;
187 default: break;
185 } 188 }
@@ -246,3 +249,3 @@ void XineVideoWidget::resizeEvent ( QResizeEvent * )
246 249
247void XineVideoWidget::mousePressEvent ( QMouseEvent *me ) 250void XineVideoWidget::mousePressEvent ( QMouseEvent * /*me*/ )
248{ 251{
@@ -258,3 +261,3 @@ void XineVideoWidget::mousePressEvent ( QMouseEvent *me )
258 261
259void XineVideoWidget::mouseReleaseEvent ( QMouseEvent *me ) 262void XineVideoWidget::mouseReleaseEvent ( QMouseEvent * /*me*/ )
260{ 263{