summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/audiowidget.cpp16
-rw-r--r--core/multimedia/opieplayer/videowidget.cpp36
2 files changed, 26 insertions, 26 deletions
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index cda3f77..3212001 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -64,13 +64,13 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
QWidget( parent, name, f )
{
// QPEApplication::grabKeyboard();
setCaption( tr("OpiePlayer") );
- setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) );
- pixmaps[0] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButtonsAll" ) );
- pixmaps[1] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButtonsBig" ) );
- pixmaps[2] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaControls" ) );
- pixmaps[3] = new QPixmap( Resource::loadPixmap( "mpegplayer/animatedButton" ) );
+ setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) );
+ pixmaps[0] = new QPixmap( Resource::loadPixmap( "opieplayer/mediaButtonsAll" ) );
+ pixmaps[1] = new QPixmap( Resource::loadPixmap( "opieplayer/mediaButtonsBig" ) );
+ pixmaps[2] = new QPixmap( Resource::loadPixmap( "opieplayer/mediaControls" ) );
+ pixmaps[3] = new QPixmap( Resource::loadPixmap( "opieplayer/animatedButton" ) );
songInfo = new Ticker( this );
songInfo->setFocusPolicy( QWidget::NoFocus );
songInfo->setGeometry( QRect( 7, 3, 220, 20 ) );
@@ -79,9 +79,9 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
slider->setFixedWidth( 220 );
slider->setFixedHeight( 20 );
slider->setMinValue( 0 );
slider->setMaxValue( 1 );
- slider->setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) );
+ slider->setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) );
slider->setFocusPolicy( QWidget::NoFocus );
slider->setGeometry( QRect( 7, 262, 220, 20 ) );
connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
@@ -152,9 +152,9 @@ void AudioWidget::setView( char view ) {
void AudioWidget::updateSlider( long i, long max ) {
if ( max == 0 )
return;
// Will flicker too much if we don't do this
- // Scale to something reasonable
+ // Scale to something reasonable
int width = slider->width();
int val = int((double)i * width / max);
if ( !audioSliderBeingMoved ) {
if ( slider->value() != val )
@@ -332,7 +332,7 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e)
// toggleButton(4);
break;
case Key_Escape:
break;
-
+
};
}
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index 23b36e5..70b4a95 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -66,18 +66,18 @@ static const int numButtons = (sizeof(videoButtons)/sizeof(MediaButton));
VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
setCaption( tr("OpiePlayer") );
- setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) );
- pixmaps[0] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButton0a" ) );
- pixmaps[1] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButton0b" ) );
- pixmaps[2] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaControls0" ) );
+ setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) );
+ pixmaps[0] = new QPixmap( Resource::loadPixmap( "opieplayer/mediaButton0a" ) );
+ pixmaps[1] = new QPixmap( Resource::loadPixmap( "opieplayer/mediaButton0b" ) );
+ pixmaps[2] = new QPixmap( Resource::loadPixmap( "opieplayer/mediaControls0" ) );
currentFrame = new QImage( 220 + 2, 160, (QPixmap::defaultDepth() == 16) ? 16 : 32 );
slider = new QSlider( Qt::Horizontal, this );
slider->setMinValue( 0 );
slider->setMaxValue( 1 );
- slider->setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) );
+ slider->setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) );
slider->setFocusPolicy( QWidget::NoFocus );
slider->setGeometry( QRect( 7, 250, 220, 20 ) );
connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
@@ -200,9 +200,9 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
}
} else {
if ( videoButtons[i].isHeld ) {
videoButtons[i].isHeld = FALSE;
- if ( !videoButtons[i].isToggle )
+ if ( !videoButtons[i].isToggle )
setToggleButton( i, FALSE );
}
}
switch (i) {
@@ -213,9 +213,9 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
case VideoPrevious: mediaPlayerState->setPrev(); return;
case VideoPlayList: mediaPlayerState->setList(); return;
case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
}
-
+
}
}
@@ -227,9 +227,9 @@ void VideoWidget::mousePressEvent( QMouseEvent *event ) {
void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
if ( mediaPlayerState->fullscreen() ) {
mediaPlayerState->setFullscreen( FALSE );
makeVisible();
-
+
mouseMoveEvent( event );
}
}
@@ -240,9 +240,9 @@ void VideoWidget::makeVisible() {
showFullScreen();
resize( qApp->desktop()->size() );
slider->hide();
} else {
- setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) );
+ setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) );
showNormal();
showMaximized();
slider->show();
}
@@ -252,9 +252,9 @@ void VideoWidget::makeVisible() {
void VideoWidget::paintEvent( QPaintEvent * ) {
QPainter p( this );
if ( mediaPlayerState->fullscreen() ) {
- // Clear the background
+ // Clear the background
p.setBrush( QBrush( Qt::black ) );
p.drawRect( rect() );
// Draw the current frame
@@ -287,9 +287,9 @@ void VideoWidget::closeEvent( QCloseEvent* ) {
bool VideoWidget::playVideo() {
bool result = FALSE;
- int stream = 0;
+ int stream = 0;
int sw = mediaPlayerState->curDecoder()->videoWidth( stream );
int sh = mediaPlayerState->curDecoder()->videoHeight( stream );
int dd = QPixmap::defaultDepth();
@@ -309,20 +309,20 @@ bool VideoWidget::playVideo() {
h = 240;
if ( mediaPlayerState->scaled() ) {
// maintain aspect ratio
- if ( w * sh > sw * h )
+ if ( w * sh > sw * h )
w = sw * h / sh;
else
h = sh * w / sw;
} else {
w = sw;
- h = sh;
+ h = sh;
}
w--; // we can't allow libmpeg to overwrite.
QPoint roff = qt_screen->mapToDevice( p.offset(), QSize( qt_screen->width(), qt_screen->height() ) );
-
+
int ox = roff.x() - height() + 2 + (height() - w) / 2;
int oy = roff.y() + (width() - h) / 2;
int sx = 0, sy = 0;
@@ -345,15 +345,15 @@ bool VideoWidget::playVideo() {
h = 240;
if ( mediaPlayerState->scaled() ) {
// maintain aspect ratio
- if ( w * sh > sw * h )
+ if ( w * sh > sw * h )
w = sw * h / sh;
else
h = sh * w / sw;
} else {
w = sw;
- h = sh;
+ h = sh;
}
int bytes = ( dd == 16 ) ? 2 : 4;
QImage tempFrame( w, h, bytes << 3 );
@@ -393,9 +393,9 @@ bool VideoWidget::playVideo() {
w = 220;
h = 160;
// maintain aspect ratio
- if ( w * sh > sw * h )
+ if ( w * sh > sw * h )
w = sw * h / sh;
else
h = sh * w / sw;
@@ -466,7 +466,7 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e)
mediaPlayerState->setPrev();
break;
case Key_Escape:
break;
-
+
};
}