summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-08-16 12:22:46 (UTC)
committer llornkcor <llornkcor>2002-08-16 12:22:46 (UTC)
commit5144bf5607a246441f5b37dd0bbb9564017ce017 (patch) (unidiff)
treec6f29d27a14426562f7cfa622230cce5879bd3df
parent2ce537c4275c5071a85efae8e9862b5fd9ceb6ae (diff)
downloadopie-5144bf5607a246441f5b37dd0bbb9564017ce017.zip
opie-5144bf5607a246441f5b37dd0bbb9564017ce017.tar.gz
opie-5144bf5607a246441f5b37dd0bbb9564017ce017.tar.bz2
added mute and changed qcop from volumeChange to setVolume
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/volumecontrol.cpp7
-rw-r--r--noncore/multimedia/opieplayer2/volumecontrol.h1
2 files changed, 6 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/volumecontrol.cpp b/noncore/multimedia/opieplayer2/volumecontrol.cpp
index b8ec0df..219f63e 100644
--- a/noncore/multimedia/opieplayer2/volumecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/volumecontrol.cpp
@@ -24,17 +24,18 @@ void VolumeControl::setVolume( int volumePerc ) {
24 volumePerc = 100; 24 volumePerc = 100;
25 } 25 }
26 if ( volumePerc < 0 ) { 26 if ( volumePerc < 0 ) {
27 volumePerc = 0; 27 volumePerc = 0;
28 } 28 }
29 29
30 m_volumePerc = volumePerc; 30 m_volumePerc = volumePerc;
31 cfg.writeEntry("VolumePercent", volumePerc ); 31 cfg.writeEntry("VolumePercent", volumePerc );
32 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << false; 32// QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << false;
33 QCopEnvelope( "QPE/System", "setVolume(int,int)" ) << 0, volumePerc;
33} 34}
34 35
35 36
36void VolumeControl::incVol( int ammount ) { 37void VolumeControl::incVol( int ammount ) {
37 int oldVol = getVolume(); 38 int oldVol = getVolume();
38 setVolume( oldVol + ammount); 39 setVolume( oldVol + ammount);
39} 40}
40 41
@@ -47,13 +48,15 @@ void VolumeControl::decVol( int ammount ) {
47VolumeControl::VolumeControl( ) { 48VolumeControl::VolumeControl( ) {
48 getVolume(); 49 getVolume();
49} 50}
50 51
51VolumeControl::~VolumeControl() { 52VolumeControl::~VolumeControl() {
52 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << false; 53 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << false;
53} 54}
54 55
55 56void VolumeControl::setMute(bool on) {
57 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << on;
58}
56 59
57 60
58 61
59 62
diff --git a/noncore/multimedia/opieplayer2/volumecontrol.h b/noncore/multimedia/opieplayer2/volumecontrol.h
index 37be398..d0d34a2 100644
--- a/noncore/multimedia/opieplayer2/volumecontrol.h
+++ b/noncore/multimedia/opieplayer2/volumecontrol.h
@@ -30,16 +30,17 @@ public:
30public slots: 30public slots:
31 31
32 /** 32 /**
33 * Set the volume in percent 33 * Set the volume in percent
34 * @value volumePerc between 0 and 100 34 * @value volumePerc between 0 and 100
35 */ 35 */
36 void setVolume( int volumePerc ); 36 void setVolume( int volumePerc );
37 37
38 void setMute(bool);
38 39
39 40
40private: 41private:
41 42
42 int m_volumePerc; 43 int m_volumePerc;
43 44
44}; 45};
45 46