Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 3 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/main.cpp | 3 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 3 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 0 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 3 |
5 files changed, 9 insertions, 3 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 604ed3a..6d867e5 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -119,24 +119,27 @@ const char *skin_mask_file_names[10] = { | |||
119 | static void changeTextColor( QWidget *w ) { | 119 | static void changeTextColor( QWidget *w ) { |
120 | QPalette p = w->palette(); | 120 | QPalette p = w->palette(); |
121 | p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) ); | 121 | p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) ); |
122 | p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) ); | 122 | p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) ); |
123 | w->setPalette( p ); | 123 | w->setPalette( p ); |
124 | } | 124 | } |
125 | 125 | ||
126 | static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton)); | 126 | static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton)); |
127 | 127 | ||
128 | 128 | ||
129 | AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | 129 | AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : |
130 | QWidget( parent, name, f ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) { | 130 | QWidget( parent, name, f ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) { |
131 | |||
132 | |||
133 | |||
131 | setCaption( tr("OpiePlayer") ); | 134 | setCaption( tr("OpiePlayer") ); |
132 | 135 | ||
133 | Config cfg("OpiePlayer"); | 136 | Config cfg("OpiePlayer"); |
134 | cfg.setGroup("Options"); | 137 | cfg.setGroup("Options"); |
135 | skin = cfg.readEntry("Skin","default"); | 138 | skin = cfg.readEntry("Skin","default"); |
136 | //skin = "scaleTest"; | 139 | //skin = "scaleTest"; |
137 | // color of background, frame, degree of transparency | 140 | // color of background, frame, degree of transparency |
138 | 141 | ||
139 | QString skinPath = "opieplayer2/skins/" + skin; | 142 | QString skinPath = "opieplayer2/skins/" + skin; |
140 | pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); | 143 | pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); |
141 | imgUp = new QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); | 144 | imgUp = new QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); |
142 | imgDn = new QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); | 145 | imgDn = new QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); |
diff --git a/noncore/multimedia/opieplayer2/main.cpp b/noncore/multimedia/opieplayer2/main.cpp index 827f773..e951554 100644 --- a/noncore/multimedia/opieplayer2/main.cpp +++ b/noncore/multimedia/opieplayer2/main.cpp | |||
@@ -9,25 +9,26 @@ | |||
9 | MediaPlayerState *mediaPlayerState; | 9 | MediaPlayerState *mediaPlayerState; |
10 | PlayListWidget *playList; | 10 | PlayListWidget *playList; |
11 | AudioWidget *audioUI; | 11 | AudioWidget *audioUI; |
12 | VideoWidget *videoUI; | 12 | VideoWidget *videoUI; |
13 | 13 | ||
14 | int main(int argc, char **argv) { | 14 | int main(int argc, char **argv) { |
15 | QPEApplication a(argc,argv); | 15 | QPEApplication a(argc,argv); |
16 | 16 | ||
17 | MediaPlayerState st( 0, "mediaPlayerState" ); | 17 | MediaPlayerState st( 0, "mediaPlayerState" ); |
18 | mediaPlayerState = &st; | 18 | mediaPlayerState = &st; |
19 | PlayListWidget pl( 0, "playList" ); | 19 | PlayListWidget pl( 0, "playList" ); |
20 | playList = &pl; | 20 | playList = &pl; |
21 | pl.showMaximized(); | ||
21 | AudioWidget aw( 0, "audioUI" ); | 22 | AudioWidget aw( 0, "audioUI" ); |
22 | audioUI = &aw; | 23 | audioUI = &aw; |
23 | VideoWidget vw( 0, "videoUI" ); | 24 | VideoWidget vw( 0, "videoUI" ); |
24 | videoUI = &vw; | 25 | videoUI = &vw; |
25 | 26 | a.processEvents(); | |
26 | MediaPlayer mp( 0, "mediaPlayer" ); | 27 | MediaPlayer mp( 0, "mediaPlayer" ); |
27 | 28 | ||
28 | a.showMainDocumentWidget(&pl); | 29 | a.showMainDocumentWidget(&pl); |
29 | 30 | ||
30 | return a.exec(); | 31 | return a.exec(); |
31 | } | 32 | } |
32 | 33 | ||
33 | 34 | ||
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 87f4f0c..5531e81 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp | |||
@@ -25,26 +25,25 @@ | |||
25 | 25 | ||
26 | extern AudioWidget *audioUI; | 26 | extern AudioWidget *audioUI; |
27 | extern VideoWidget *videoUI; | 27 | extern VideoWidget *videoUI; |
28 | extern PlayListWidget *playList; | 28 | extern PlayListWidget *playList; |
29 | extern MediaPlayerState *mediaPlayerState; | 29 | extern MediaPlayerState *mediaPlayerState; |
30 | 30 | ||
31 | 31 | ||
32 | #define FBIOBLANK 0x4611 | 32 | #define FBIOBLANK 0x4611 |
33 | 33 | ||
34 | MediaPlayer::MediaPlayer( QObject *parent, const char *name ) | 34 | MediaPlayer::MediaPlayer( QObject *parent, const char *name ) |
35 | : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) { | 35 | : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) { |
36 | 36 | ||
37 | 37 | qApp->processEvents(); | |
38 | // xineControl = new XineControl(); | ||
39 | // QPEApplication::grabKeyboard(); // EVIL | 38 | // QPEApplication::grabKeyboard(); // EVIL |
40 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 39 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
41 | 40 | ||
42 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) ); | 41 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) ); |
43 | 42 | ||
44 | connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pauseCheck( bool ) ) ); | 43 | connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pauseCheck( bool ) ) ); |
45 | 44 | ||
46 | connect( mediaPlayerState, SIGNAL( next() ), this, SLOT( next() ) ); | 45 | connect( mediaPlayerState, SIGNAL( next() ), this, SLOT( next() ) ); |
47 | connect( mediaPlayerState, SIGNAL( prev() ), this, SLOT( prev() ) ); | 46 | connect( mediaPlayerState, SIGNAL( prev() ), this, SLOT( prev() ) ); |
48 | connect( mediaPlayerState, SIGNAL( blankToggled( bool ) ), this, SLOT ( blank( bool ) ) ); | 47 | connect( mediaPlayerState, SIGNAL( blankToggled( bool ) ), this, SLOT ( blank( bool ) ) ); |
49 | 48 | ||
50 | connect( audioUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); | 49 | connect( audioUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); |
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 874800a..39f5090 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index ddb4d74..60a3563 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -26,24 +26,25 @@ | |||
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include <qpe/resource.h> | 34 | #include <qpe/resource.h> |
35 | #include <qpe/mediaplayerplugininterface.h> | 35 | #include <qpe/mediaplayerplugininterface.h> |
36 | #include <qpe/config.h> | 36 | #include <qpe/config.h> |
37 | 37 | ||
38 | |||
38 | #include <qwidget.h> | 39 | #include <qwidget.h> |
39 | #include <qpainter.h> | 40 | #include <qpainter.h> |
40 | #include <qpixmap.h> | 41 | #include <qpixmap.h> |
41 | #include <qslider.h> | 42 | #include <qslider.h> |
42 | #include <qdrawutil.h> | 43 | #include <qdrawutil.h> |
43 | #include "videowidget.h" | 44 | #include "videowidget.h" |
44 | #include "mediaplayerstate.h" | 45 | #include "mediaplayerstate.h" |
45 | 46 | ||
46 | 47 | ||
47 | #ifdef Q_WS_QWS | 48 | #ifdef Q_WS_QWS |
48 | # define USE_DIRECT_PAINTER | 49 | # define USE_DIRECT_PAINTER |
49 | # include <qdirectpainter_qws.h> | 50 | # include <qdirectpainter_qws.h> |
@@ -72,24 +73,26 @@ MediaButton videoButtons[] = { | |||
72 | { TRUE, FALSE, FALSE } // fullscreen | 73 | { TRUE, FALSE, FALSE } // fullscreen |
73 | }; | 74 | }; |
74 | 75 | ||
75 | const char *skinV_mask_file_names[7] = { | 76 | const char *skinV_mask_file_names[7] = { |
76 | "stop","play","back","fwd","up","down","full" | 77 | "stop","play","back","fwd","up","down","full" |
77 | }; | 78 | }; |
78 | 79 | ||
79 | static const int numVButtons = (sizeof(videoButtons)/sizeof(MediaButton)); | 80 | static const int numVButtons = (sizeof(videoButtons)/sizeof(MediaButton)); |
80 | 81 | ||
81 | 82 | ||
82 | VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : | 83 | VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : |
83 | QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) { | 84 | QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) { |
85 | |||
86 | |||
84 | setCaption( tr("OpiePlayer - Video") ); | 87 | setCaption( tr("OpiePlayer - Video") ); |
85 | 88 | ||
86 | videoFrame = new XineVideoWidget ( this, "Video frame" ); | 89 | videoFrame = new XineVideoWidget ( this, "Video frame" ); |
87 | 90 | ||
88 | connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & ))); | 91 | connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & ))); |
89 | connect ( videoFrame, SIGNAL( clicked () ), this, SLOT ( backToNormal() ) ); | 92 | connect ( videoFrame, SIGNAL( clicked () ), this, SLOT ( backToNormal() ) ); |
90 | 93 | ||
91 | Config cfg("OpiePlayer"); | 94 | Config cfg("OpiePlayer"); |
92 | cfg.setGroup("Options"); | 95 | cfg.setGroup("Options"); |
93 | skin = cfg.readEntry("Skin","default"); | 96 | skin = cfg.readEntry("Skin","default"); |
94 | 97 | ||
95 | QString skinPath = "opieplayer2/skins/" + skin; | 98 | QString skinPath = "opieplayer2/skins/" + skin; |