author | llornkcor <llornkcor> | 2005-08-11 10:10:40 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2005-08-11 10:10:40 (UTC) |
commit | 6040d26c56a95d9f5bd09688e22009fc5b5e124d (patch) (side-by-side diff) | |
tree | 53ad03c346cc006d17093918d5cf6bbb09aa4b3b /noncore/applets/volumeapplet2 | |
parent | 8938048502047f781447ed24351512cdca997a2e (diff) | |
download | opie-6040d26c56a95d9f5bd09688e22009fc5b5e124d.zip opie-6040d26c56a95d9f5bd09688e22009fc5b5e124d.tar.gz opie-6040d26c56a95d9f5bd09688e22009fc5b5e124d.tar.bz2 |
add opie-smb
Diffstat (limited to 'noncore/applets/volumeapplet2') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/applets/volumeapplet2/volumeapplet.cpp | 58 | ||||
-rw-r--r-- | noncore/applets/volumeapplet2/volumeapplet.h | 15 |
2 files changed, 60 insertions, 13 deletions
diff --git a/noncore/applets/volumeapplet2/volumeapplet.cpp b/noncore/applets/volumeapplet2/volumeapplet.cpp index 2f61f48..2122007 100644 --- a/noncore/applets/volumeapplet2/volumeapplet.cpp +++ b/noncore/applets/volumeapplet2/volumeapplet.cpp @@ -40,2 +40,3 @@ _;:, .> :=|. This program is free software; you can #include <qpe/applnk.h> +#include <qpe/qpeapplication.h> @@ -90,3 +91,4 @@ void VolumeAppletControl::build() - OMixerInterface* mixer = new OMixerInterface( this, "/dev/mixer" ); +// OMixerInterface* + mixer = new OMixerInterface( this, "/dev/mixer" ); @@ -99,4 +101,7 @@ void VolumeAppletControl::build() { - odebug << "OSSDEMO: Mixer has channel " << *it << "" << oendl; - odebug << "OSSDEMO: +--- volume " << ( mixer->volume( *it ) & 0xff ) + if((*it) == mixer->volume( "Vol")) { + m_vol_percent=mixer->volume( *it ) >> 8; + } + owarn << "OSSDEMO: Mixer has channel " << *it << "" << oendl; + owarn << "OSSDEMO: +--- volume " << ( mixer->volume( *it ) & 0xff ) << " (left) | " << ( mixer->volume( *it ) >> 8 ) << " (right)" << oendl; @@ -113,2 +118,12 @@ VolumeAppletControl::~VolumeAppletControl() +int VolumeAppletControl::volPercent ( ) const +{ + return m_vol_percent; +} + +bool VolumeAppletControl::volMuted ( ) const +{ + return m_vol_muted; +} + @@ -128,5 +143,6 @@ void VolumeAppletControl::hideEvent( QHideEvent* e ) -QSize VolumeAppletControl::sizeHint() const -{ - return QSize( 200, 200 ); //QFrame::sizeHint(); + QSize VolumeAppletControl::sizeHint() const + { + int wd = QPEApplication::desktop()->width(); + return QSize( wd, 200 ); //QFrame::sizeHint(); } @@ -137,5 +153,5 @@ VolumeApplet::VolumeApplet( QWidget *parent, const char *name ) { - setFixedHeight( AppLnk::smallIconSize() ); + setFixedHeight( AppLnk::smallIconSize() +4); setFixedWidth( AppLnk::smallIconSize() ); - _pixmap = Opie::Core::OResource::loadPixmap( "volume", Opie::Core::OResource::SmallIcon ); + _pixmap = new QPixmap (Opie::Core::OResource::loadPixmap( "volume", Opie::Core::OResource::SmallIcon )); _control = new VolumeAppletControl( this, "control" ); @@ -157,4 +173,26 @@ void VolumeApplet::paintEvent( QPaintEvent* ) { - QPainter p(this); - p.drawPixmap(0, 2, _pixmap ); + QPainter p ( this ); + + p. drawPixmap ( (width()- _pixmap->width())/2, QMAX( (height()-4-_pixmap->height() )/2, 1), *_pixmap ); + p. setPen ( darkGray ); + p. drawRect ( 1, height() - 4, width() - 2, 4 ); + + OMixerInterface* mixer = new OMixerInterface( this, "/dev/mixer" ); + + int volPercent = mixer->volume( "Vol" ) >> 8; + + int pixelsWide = volPercent * ( width() - 4 ) / 100; + p. fillRect ( 2, height() - 3, pixelsWide, 2, red ); + p. fillRect ( pixelsWide + 2, height() - 3, width() - 4 - pixelsWide, 2, lightGray ); + +// if ( _control-> volMuted ( )) { +// p. setPen ( red ); +// p. drawLine ( 1, 2, width() - 2, height() - 5 ); +// p. drawLine ( 1, 3, width() - 2, height() - 4 ); +// p. drawLine ( width() - 2, 2, 1, height() - 5 ); +// p. drawLine ( width() - 2, 3, 1, height() - 4 ); +// } + +// QPainter p(this); + // p.drawPixmap(0, 2, _pixmap ); } diff --git a/noncore/applets/volumeapplet2/volumeapplet.h b/noncore/applets/volumeapplet2/volumeapplet.h index c1f1a3a..953c305 100644 --- a/noncore/applets/volumeapplet2/volumeapplet.h +++ b/noncore/applets/volumeapplet2/volumeapplet.h @@ -34,2 +34,3 @@ #include <opie2/otaskbarapplet.h> +#include <opie2/osoundsystem.h> #include <qframe.h> @@ -38,2 +39,3 @@ #include <qpixmap.h> +//using namespace Opie::MM; @@ -42,3 +44,3 @@ namespace Opie namespace Ui { class OLedBox; } - namespace MM { class OMixerInterface; } +// namespace MM { class OMixerInterface; } } @@ -71,2 +73,9 @@ class VolumeAppletControl : public QFrame ~VolumeAppletControl(); + bool volMuted() const; + int volPercent() const; + + int m_vol_percent; + bool m_vol_muted; + + Opie::MM::OMixerInterface* mixer; @@ -80,4 +89,4 @@ class VolumeAppletControl : public QFrame private: + QGridLayout* l; - }; @@ -98,3 +107,3 @@ class VolumeApplet : public Opie::Ui::OTaskbarApplet VolumeAppletControl* _control; - QPixmap _pixmap; + QPixmap* _pixmap; }; |