summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-09 15:01:12 (UTC)
committer simon <simon>2002-12-09 15:01:12 (UTC)
commitd3451a94e3a4425f9f1b1dcc3999259270780631 (patch) (unidiff)
tree6d0613d5ce951e08a8af539b28a689c96b0955c8
parent9ab8a657b23fd1871c4a376fdd097732c14392e0 (diff)
downloadopie-d3451a94e3a4425f9f1b1dcc3999259270780631.zip
opie-d3451a94e3a4425f9f1b1dcc3999259270780631.tar.gz
opie-d3451a94e3a4425f9f1b1dcc3999259270780631.tar.bz2
- get rid of the masks array and re-use the Button structure
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp22
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h2
2 files changed, 10 insertions, 14 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 7d85d63..089ef6a 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -102,7 +102,9 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
102 for ( int i = 0; i < 7; i++ ) { 102 for ( int i = 0; i < 7; i++ ) {
103 Button &button = buttons[ i ];
104
103 QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_" + skinV_mask_file_names[i] + ".png" ); 105 QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_" + skinV_mask_file_names[i] + ".png" );
104 masks[i] = new QBitmap( filename ); 106 button.mask = QBitmap( filename );
105 107
106 if ( !masks[i]->isNull() ) { 108 if ( !button.mask.isNull() ) {
107 QImage imgMask = masks[i]->convertToImage(); 109 QImage imgMask = button.mask.convertToImage();
108 uchar **dest = buttonMask.jumpTable(); 110 uchar **dest = buttonMask.jumpTable();
@@ -141,3 +143,2 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
141VideoWidget::~VideoWidget() { 143VideoWidget::~VideoWidget() {
142
143 for ( int i = 0; i < 7; i++ ) { 144 for ( int i = 0; i < 7; i++ ) {
@@ -146,7 +147,2 @@ VideoWidget::~VideoWidget() {
146 } 147 }
147
148 for ( int i = 0; i < 7; i++ ) {
149 delete masks[i];
150 }
151
152} 148}
@@ -190,7 +186,9 @@ void VideoWidget::resizeEvent( QResizeEvent * ) {
190 for ( int i = 0; i < 7; i++ ) { 186 for ( int i = 0; i < 7; i++ ) {
191 if ( !masks[i]->isNull() ) { 187 Button &button = buttons[ i ];
188
189 if ( !button.mask.isNull() ) {
192 delete buttonPixUp[i]; 190 delete buttonPixUp[i];
193 delete buttonPixDown[i]; 191 delete buttonPixDown[i];
194 buttonPixUp[i] = maskVPixToMask( *pixUp, *masks[i] ); 192 buttonPixUp[i] = maskVPixToMask( *pixUp, button.mask );
195 buttonPixDown[i] = maskVPixToMask( *pixDn, *masks[i] ); 193 buttonPixDown[i] = maskVPixToMask( *pixDn, button.mask );
196 } 194 }
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index cb6171c..fd301f9 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -102,3 +102,2 @@ private:
102 QImage imgDn; 102 QImage imgDn;
103 QBitmap *masks[7];
104 QPixmap *buttonPixUp[7]; 103 QPixmap *buttonPixUp[7];
@@ -106,3 +105,2 @@ private:
106 QString skin; 105 QString skin;
107// QPixmap *pixmaps[4];
108 106