summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-08-07 19:30:13 (UTC)
committer harlekin <harlekin>2002-08-07 19:30:13 (UTC)
commitc80f0885bf402b6dd4ea637ad1b7d8b3ebd69300 (patch) (side-by-side diff)
tree558e8528408f0ab27d644554279f646723c6dad9
parent7effde67fd121736ec658e690858c6c54bd6d125 (diff)
downloadopie-c80f0885bf402b6dd4ea637ad1b7d8b3ebd69300.zip
opie-c80f0885bf402b6dd4ea637ad1b7d8b3ebd69300.tar.gz
opie-c80f0885bf402b6dd4ea637ad1b7d8b3ebd69300.tar.bz2
added volume handling for audio gui and other small fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp16
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp52
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.h4
-rw-r--r--noncore/multimedia/opieplayer2/opieplayer2.pro4
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp2
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp29
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h1
-rw-r--r--noncore/multimedia/opieplayer2/volumecontrol.cpp59
-rw-r--r--noncore/multimedia/opieplayer2/volumecontrol.h47
9 files changed, 156 insertions, 58 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 0e9e7ea..955169c 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -65,13 +65,13 @@ struct MediaButton {
};
//Layout information for the audioButtons (and if it is a toggle button or not)
MediaButton audioButtons[] = {
{ TRUE, FALSE, FALSE }, // play
{ FALSE, FALSE, FALSE }, // stop
- { TRUE, FALSE, FALSE }, // pause
+ { FALSE, FALSE, FALSE }, // pause
{ FALSE, FALSE, FALSE }, // next
{ FALSE, FALSE, FALSE }, // previous
{ FALSE, FALSE, FALSE }, // volume up
{ FALSE, FALSE, FALSE }, // volume down
{ TRUE, FALSE, FALSE }, // repeat/loop
{ FALSE, FALSE, FALSE }, // playlist
@@ -339,16 +339,12 @@ void AudioWidget::paintButton( QPainter *p, int i ) {
else
p->drawPixmap( xoff, yoff, *buttonPixUp[i] );
}
void AudioWidget::timerEvent( QTimerEvent * ) {
-// static int frame = 0;
-// if ( !mediaPlayerState->paused() && audioButtons[ AudioPlay ].isDown ) {
-// frame = frame >= 7 ? 0 : frame + 1;
-// }
}
void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
for ( int i = 0; i < numButtons; i++ ) {
if ( event->state() == QMouseEvent::LeftButton ) {
@@ -368,27 +364,31 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
toggleButton(i);
switch (i) {
case AudioVolumeUp:
qDebug("more clicked");
emit moreClicked();
return;
- case AudioVolumeDown: emit lessClicked(); return;
+ case AudioVolumeDown:
+ emit lessClicked();
+ return;
}
} else if ( !isOnButton && audioButtons[i].isHeld ) {
audioButtons[i].isHeld = FALSE;
toggleButton(i);
}
} else {
if ( audioButtons[i].isHeld ) {
audioButtons[i].isHeld = FALSE;
- if ( !audioButtons[i].isToggle )
+ if ( !audioButtons[i].isToggle ) {
setToggleButton( i, FALSE );
+ qDebug("button toggled3 %d",i);
+ }
switch (i) {
case AudioPlay: mediaPlayerState->setPlaying(audioButtons[i].isDown); return;
case AudioStop: mediaPlayerState->setPlaying(FALSE); return;
- case AudioPause: mediaPlayerState->setPaused(audioButtons[i].isDown); return;
+ case AudioPause: mediaPlayerState->setPaused( audioButtons[i].isDown); return;
case AudioNext: mediaPlayerState->setNext(); return;
case AudioPrevious: mediaPlayerState->setPrev(); return;
case AudioLoop: mediaPlayerState->setLooping(audioButtons[i].isDown); return;
case AudioVolumeUp: emit moreReleased(); return;
case AudioVolumeDown: emit lessReleased(); return;
case AudioPlayList: mediaPlayerState->setList(); return;
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 5411a64..8d8e4e5 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -8,12 +8,13 @@
#include <qwidgetstack.h>
#include <qfile.h>
#include "mediaplayer.h"
#include "playlistwidget.h"
#include "audiowidget.h"
+#include "volumecontrol.h"
#include "mediaplayerstate.h"
extern AudioWidget *audioUI;
@@ -36,15 +37,19 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name )
connect( audioUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) );
connect( audioUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) );
connect( audioUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
connect( audioUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
+ volControl = new VolumeControl;
+
}
MediaPlayer::~MediaPlayer() {
+ delete xineControl;
+ delete volControl;
}
void MediaPlayer::pauseCheck( bool b ) {
// Only pause if playing
if ( b && !mediaPlayerState->playing() ) {
mediaPlayerState->setPaused( FALSE );
@@ -68,13 +73,13 @@ void MediaPlayer::setPlaying( bool play ) {
}
const DocLnk *playListCurrent = playList->current();
if ( playListCurrent != NULL ) {
currentFile = playListCurrent;
}
-
+
xineControl->play( currentFile->file() );
xineControl->length();
long seconds = mediaPlayerState->length();//
QString time; time.sprintf("%li:%02i", seconds/60, (int)seconds%60 );
qDebug(time);
@@ -89,13 +94,13 @@ void MediaPlayer::setPlaying( bool play ) {
// if ( !fileInfo.isEmpty() )
// tickerText += ", " + fileInfo;
// audioUI->setTickerText( tickerText + "." );
audioUI->setTickerText( currentFile->file( ) );
-
+
}
void MediaPlayer::prev() {
if ( playList->prev() ) {
play();
@@ -122,22 +127,20 @@ void MediaPlayer::next() {
}
void MediaPlayer::startDecreasingVolume() {
volumeDirection = -1;
startTimer( 100 );
- // da kommt demnächst osound denk ich mal
- /////////////////////////// lets just move those change volume here
- // AudioDevice::decreaseVolume();
+ volControl->decVol(2);
}
void MediaPlayer::startIncreasingVolume() {
volumeDirection = +1;
startTimer( 100 );
- // AudioDevice::increaseVolume();
+ volControl->incVol(2);
}
bool drawnOnScreenDisplay = FALSE;
unsigned int onScreenDisplayVolume = 0;
const int yoff = 110;
@@ -151,33 +154,35 @@ void MediaPlayer::stopChangingVolume() {
int h = audioUI->height();
audioUI->repaint( (w - 200) / 2, h - yoff, 200 + 9, 70, FALSE );
}
void MediaPlayer::timerEvent( QTimerEvent * ) {
- // if ( volumeDirection == +1 )
- // AudioDevice::increaseVolume();
- // else if ( volumeDirection == -1 )
- // AudioDevice::decreaseVolume();
+ if ( volumeDirection == +1 ) {
+ volControl->incVol(2);
+ } else if ( volumeDirection == -1 ) {
+ volControl->decVol(2);
+ }
-// Display an on-screen display volume
- unsigned int l, r, v; bool m;
-// TODO FIXME
-// AudioDevice::getVolume( l, r, m );
-// v = ((l + r) * 11) / (2*0xFFFF);
+ // TODO FIXME
+ int v;
+ v = volControl->getVolume();
+ v = v / 10;
- if ( drawnOnScreenDisplay && onScreenDisplayVolume == v )
- return;
+ if ( drawnOnScreenDisplay && onScreenDisplayVolume == v ) {
+ return;
+ }
int w = audioUI->width();
int h = audioUI->height();
if ( drawnOnScreenDisplay ) {
- if ( onScreenDisplayVolume > v )
- audioUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, (onScreenDisplayVolume - v) * 20 + 9, 30, FALSE );
+ if ( onScreenDisplayVolume > v ) {
+ audioUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, (onScreenDisplayVolume - v) * 20 + 9, 30, FALSE );
+ }
}
drawnOnScreenDisplay = TRUE;
onScreenDisplayVolume = v;
QPainter p( audioUI );
@@ -188,16 +193,17 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
f.setPixelSize( 20 );
f.setBold( TRUE );
p.setFont( f );
p.drawText( (w - 200) / 2, h - yoff + 20, tr("Volume") );
for ( unsigned int i = 0; i < 10; i++ ) {
- if ( v > i )
- p.drawRect( (w - 200) / 2 + i * 20 + 0, h - yoff + 40, 9, 30 );
- else
- p.drawRect( (w - 200) / 2 + i * 20 + 3, h - yoff + 50, 3, 10 );
+ if ( v > i ) {
+ p.drawRect( (w - 200) / 2 + i * 20 + 0, h - yoff + 40, 9, 30 );
+ } else {
+ p.drawRect( (w - 200) / 2 + i * 20 + 3, h - yoff + 50, 3, 10 );
+ }
}
}
void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
switch ( e->key() ) {
////////////////////////////// Zaurus keys
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.h b/noncore/multimedia/opieplayer2/mediaplayer.h
index 7b79066..16213b5 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.h
+++ b/noncore/multimedia/opieplayer2/mediaplayer.h
@@ -7,13 +7,13 @@
#include <qpe/qlibrary.h>
#include <qpe/mediaplayerplugininterface.h>
#include "xinecontrol.h"
class DocLnk;
-
+class VolumeControl;
class MediaPlayer : public QObject {
Q_OBJECT
public:
MediaPlayer( QObject *parent, const char *name );
~MediaPlayer();
@@ -35,12 +35,12 @@ protected:
void doBlank();
void doUnblank();
private:
int volumeDirection;
const DocLnk *currentFile;
XineControl *xineControl;
-
+ VolumeControl *volControl;
};
#endif // MEDIA_PLAYER_H
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro
index fee9242..edc4624 100644
--- a/noncore/multimedia/opieplayer2/opieplayer2.pro
+++ b/noncore/multimedia/opieplayer2/opieplayer2.pro
@@ -1,18 +1,18 @@
TEMPLATE = app
CONFIG = qt warn_on release
#release
DESTDIR = $(OPIEDIR)/bin
HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h mediadetect.h\
videowidget.h audiowidget.h playlistwidget.h mediaplayer.h inputDialog.h \
- frame.h lib.h xinevideowidget.h \
+ frame.h lib.h xinevideowidget.h volumecontrol.h\
alphablend.h yuv2rgb.h
SOURCES = main.cpp \
playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp mediadetect.cpp\
videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp inputDialog.cpp \
- frame.cpp lib.cpp nullvideo.c xinevideowidget.cpp \
+ frame.cpp lib.cpp nullvideo.c xinevideowidget.cpp volumecontrol.cpp\
alphablend.c yuv2rgb.c yuv2rgb_arm.c yuv2rgb_arm4l.S
TARGET = opieplayer2
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lpthread -lopie -lxine -lxineutils
MOC_DIR=qpeobj
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 9065d63..b43d9f7 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -161,13 +161,13 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
QPopupMenu *pmView = new QPopupMenu( this );
menu->insertItem( tr( "View" ), pmView );
fullScreenButton = new QAction(tr("Full Screen"), Resource::loadPixmap("fullscreen"), QString::null, 0, this, 0);
fullScreenButton->addTo(pmView);
scaleButton = new QAction(tr("Scale"), Resource::loadPixmap("opieplayer/scale"), QString::null, 0, this, 0);
- scaleButton->addTo(pmView);
+ //scaleButton->addTo(pmView);
QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton );
QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton );
QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton );
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index af06079..188b18d 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -29,13 +29,12 @@
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#include <qpe/resource.h>
-#include <qpe/mediaplayerplugininterface.h>
#include <qpe/config.h>
#include <qwidget.h>
#include <qpainter.h>
#include <qpixmap.h>
#include <qslider.h>
@@ -84,13 +83,12 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
setCaption( tr("OpiePlayer - Video") );
Config cfg("OpiePlayer");
cfg.setGroup("VideoWidget");
QString Button0aPix, Button0bPix, controlsPix;
- //backgroundPix=cfg.readEntry( "backgroundPix", "opieplayer/metalFinish");
Button0aPix=cfg.readEntry( "Button0aPix", "opieplayer/mediaButton0a");
Button0bPix=cfg.readEntry( "Button0bPix","opieplayer/mediaButton0b");
controlsPix=cfg.readEntry( "controlsPix","opieplayer/mediaControls0" );
cfg.setGroup("AudioWidget");
QString skin = cfg.readEntry("Skin","default");
@@ -103,19 +101,21 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
pixmaps[2] = new QPixmap( Resource::loadPixmap( controlsPix) );
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( backgroundPix ) );
+
+ slider->setBackgroundPixmap( *this->backgroundPixmap () ); //Resource::loadPixmap( backgroundPix ) );
+ slider->setBackgroundOrigin( QWidget::ParentOrigin);
slider->setFocusPolicy( QWidget::NoFocus );
slider->setGeometry( QRect( 7, 250, 220, 20 ) );
videoFrame = new XineVideoWidget ( this, "Video frame" );
- connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & )));
+ connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & )));
connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
connect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) );
connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
@@ -241,13 +241,15 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
}
} else {
if ( videoButtons[i].isHeld ) {
videoButtons[i].isHeld = FALSE;
if ( !videoButtons[i].isToggle )
setToggleButton( i, FALSE );
+ qDebug("button toggled3 %d",i);
}
+
}
switch (i) {
case VideoPlay: mediaPlayerState->setPlaying(videoButtons[i].isDown); return;
case VideoStop: mediaPlayerState->setPlaying(FALSE); return;
case VideoPause: mediaPlayerState->setPaused(videoButtons[i].isDown); return;
case VideoNext: mediaPlayerState->setNext(); return;
@@ -316,27 +318,12 @@ void VideoWidget::paintEvent( QPaintEvent * ) {
void VideoWidget::closeEvent( QCloseEvent* ) {
mediaPlayerState->setList();
}
-bool VideoWidget::playVideo() {
- bool result = FALSE;
-
- int stream = 0;
-
- int sw = 240;
- int sh = 320;
- int dd = QPixmap::defaultDepth();
- int w = height();
- int h = width();
-
- return true;
-}
-
-
void VideoWidget::keyReleaseEvent( QKeyEvent *e)
{
switch ( e->key() ) {
////////////////////////////// Zaurus keys
case Key_Home:
@@ -386,9 +373,9 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e)
XineVideoWidget* VideoWidget::vidWidget() {
return videoFrame;
}
void VideoWidget::setFullscreen ( bool b )
-{
+{
setToggleButton( VideoFullscreen, b );
-} \ No newline at end of file
+}
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index fc53f89..04e810e 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -53,13 +53,12 @@ enum VideoButtons {
class VideoWidget : public QWidget {
Q_OBJECT
public:
VideoWidget( QWidget* parent=0, const char* name=0, WFlags f=0 );
~VideoWidget();
- bool playVideo();
XineVideoWidget* vidWidget();
public slots:
void updateSlider( long, long );
void sliderPressed( );
void sliderReleased( );
void setPaused( bool b) { setToggleButton( VideoPause, b ); }
diff --git a/noncore/multimedia/opieplayer2/volumecontrol.cpp b/noncore/multimedia/opieplayer2/volumecontrol.cpp
new file mode 100644
index 0000000..b8ec0df
--- a/dev/null
+++ b/noncore/multimedia/opieplayer2/volumecontrol.cpp
@@ -0,0 +1,59 @@
+
+#include <qpe/qpeapplication.h>
+#include <qpe/config.h>
+#include "qpe/qcopenvelope_qws.h"
+#include <qmessagebox.h>
+
+#include "volumecontrol.h"
+
+int VolumeControl::getVolume() {
+ int volumePerc;
+ Config cfg( "qpe" );
+ cfg. setGroup( "Volume" );
+ volumePerc = cfg. readNumEntry( "VolumePercent", 50 );
+ m_volumePerc = volumePerc;
+ return volumePerc;
+}
+
+
+void VolumeControl::setVolume( int volumePerc ) {
+ Config cfg("qpe");
+ cfg.setGroup("Volume");
+
+ if ( volumePerc > 100 ) {
+ volumePerc = 100;
+ }
+ if ( volumePerc < 0 ) {
+ volumePerc = 0;
+ }
+
+ m_volumePerc = volumePerc;
+ cfg.writeEntry("VolumePercent", volumePerc );
+ QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << false;
+}
+
+
+void VolumeControl::incVol( int ammount ) {
+ int oldVol = getVolume();
+ setVolume( oldVol + ammount);
+}
+
+void VolumeControl::decVol( int ammount ) {
+ int oldVol = getVolume();
+ setVolume( oldVol - ammount);
+}
+
+
+VolumeControl::VolumeControl( ) {
+ getVolume();
+}
+
+VolumeControl::~VolumeControl() {
+ QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << false;
+}
+
+
+
+
+
+
diff --git a/noncore/multimedia/opieplayer2/volumecontrol.h b/noncore/multimedia/opieplayer2/volumecontrol.h
new file mode 100644
index 0000000..37be398
--- a/dev/null
+++ b/noncore/multimedia/opieplayer2/volumecontrol.h
@@ -0,0 +1,47 @@
+/*************
+ * this is only a quick hack and will be later replaced by osound
+ *
+ **********/
+
+
+#ifndef VOLUMECONTROL_H
+#define VOLUMECONTROL_H
+
+
+
+#include <qobject.h>
+
+class VolumeControl : public QObject {
+ Q_OBJECT
+public:
+ VolumeControl();
+ ~VolumeControl();
+
+ // increase by "ammount"
+ void incVol( int ammount );
+ void decVol( int ammount );
+
+ /**
+ * Get the volume in percent
+ * @return volume percentage
+ */
+ int getVolume();
+
+public slots:
+
+ /**
+ * Set the volume in percent
+ * @value volumePerc between 0 and 100
+ */
+ void setVolume( int volumePerc );
+
+
+
+private:
+
+ int m_volumePerc;
+
+};
+
+#endif
+