summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-08 20:36:14 (UTC)
committer simon <simon>2002-12-08 20:36:14 (UTC)
commit7c3bd0be34ef70a2297e6f27c592da62f3010da5 (patch) (unidiff)
treec73aaf583ef2b9f56f544f580b52145aca356e84
parentec91b042d8312f83027beb357448fe02a13e8923 (diff)
downloadopie-7c3bd0be34ef70a2297e6f27c592da62f3010da5.zip
opie-7c3bd0be34ef70a2297e6f27c592da62f3010da5.tar.gz
opie-7c3bd0be34ef70a2297e6f27c592da62f3010da5.tar.bz2
- minor cleanup
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp13
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp12
2 files changed, 15 insertions, 10 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 8dbfb3d..7bf3a19 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -47,14 +47,17 @@
47#include <stdio.h> 47#include <stdio.h>
48 48
49#include "audiowidget.h" 49#include "audiowidget.h"
50#include "mediaplayerstate.h" 50#include "mediaplayerstate.h"
51#include "playlistwidget.h" 51#include "playlistwidget.h"
52 52
53static const int xo = -2; // movable x offset 53namespace
54static const int yo = 22; // movable y offset 54{
55
56const int xo = -2; // movable x offset
57const int yo = 22; // movable y offset
55 58
56struct MediaButton { 59struct MediaButton {
57 bool isToggle, isHeld, isDown; 60 bool isToggle, isHeld, isDown;
58}; 61};
59 62
60//Layout information for the audioButtons (and if it is a toggle button or not) 63//Layout information for the audioButtons (and if it is a toggle button or not)
@@ -73,22 +76,22 @@ MediaButton audioButtons[] = {
73 76
74const char * const skin_mask_file_names[10] = { 77const char * const skin_mask_file_names[10] = {
75 "play", "stop", "next", "prev", "up", 78 "play", "stop", "next", "prev", "up",
76 "down", "loop", "playlist", "forward", "back" 79 "down", "loop", "playlist", "forward", "back"
77}; 80};
78 81
79 82void changeTextColor( QWidget * w) {
80static void changeTextColor( QWidget * w) {
81 QPalette p = w->palette(); 83 QPalette p = w->palette();
82 p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) ); 84 p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) );
83 p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) ); 85 p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) );
84 w->setPalette( p ); 86 w->setPalette( p );
85} 87}
86 88
87static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton)); 89const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton));
88 90
91}
89 92
90AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) : 93AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) :
91 94
92 MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) { 95 MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) {
93 96
94 setCaption( tr("OpiePlayer") ); 97 setCaption( tr("OpiePlayer") );
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index b7305fe..a0aed62 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -50,16 +50,17 @@
50# define USE_DIRECT_PAINTER 50# define USE_DIRECT_PAINTER
51# include <qdirectpainter_qws.h> 51# include <qdirectpainter_qws.h>
52# include <qgfxraster_qws.h> 52# include <qgfxraster_qws.h>
53#endif 53#endif
54 54
55 55
56namespace
57{
56 58
57 59const int xo = 2; // movable x offset
58static const int xo = 2; // movable x offset 60const int yo = 0; // movable y offset
59static const int yo = 0; // movable y offset
60 61
61 62
62struct MediaButton { 63struct MediaButton {
63 bool isToggle, isHeld, isDown; 64 bool isToggle, isHeld, isDown;
64}; 65};
65 66
@@ -70,18 +71,19 @@ MediaButton videoButtons[] = {
70 { FALSE, FALSE, FALSE }, // next 71 { FALSE, FALSE, FALSE }, // next
71 { FALSE, FALSE, FALSE }, // volUp 72 { FALSE, FALSE, FALSE }, // volUp
72 { FALSE, FALSE, FALSE }, // volDown 73 { FALSE, FALSE, FALSE }, // volDown
73 { TRUE, FALSE, FALSE } // fullscreen 74 { TRUE, FALSE, FALSE } // fullscreen
74}; 75};
75 76
76const char *skinV_mask_file_names[7] = { 77const char * const skinV_mask_file_names[7] = {
77"stop","play","back","fwd","up","down","full" 78"stop","play","back","fwd","up","down","full"
78}; 79};
79 80
80static const int numVButtons = (sizeof(videoButtons)/sizeof(MediaButton)); 81const int numVButtons = (sizeof(videoButtons)/sizeof(MediaButton));
81 82
83}
82 84
83VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) 85VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name )
84 : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) 86 : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 )
85{ 87{
86 setCaption( tr("OpiePlayer - Video") ); 88 setCaption( tr("OpiePlayer - Video") );
87 89