make sound conform to sharps warped sense of conf

1 files changed, 5 insertions, 5 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 5f61c0c..cf437da 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -127,118 +127,118 @@ public:
                                const QByteArray &data)
     {
   qcopq.append(new QCopRec(ch,msg,data));
     }
     void sendQCopQ()
     {
   QCopRec* r;
   for (QListIterator<QCopRec> it(qcopq); (r=it.current()); ++it)
       QCopChannel::sendLocally(r->channel,r->message,r->data);
   qcopq.clear();
     }
 };
 
 class ResourceMimeFactory : public QMimeSourceFactory {
 public:
     ResourceMimeFactory()
     {
   setFilePath( Global::helpPath() );
   setExtensionType("html","text/html;charset=UTF-8");
     }
 
     const QMimeSource* data(const QString& abs_name) const
     {
   const QMimeSource* r = QMimeSourceFactory::data(abs_name);
   if ( !r ) {
       int sl = abs_name.length();
       do {
     sl = abs_name.findRev('/',sl-1);
     QString name = sl>=0 ? abs_name.mid(sl+1) : abs_name;
     int dot = name.findRev('.');
     if ( dot >= 0 )
         name = name.left(dot);
     QImage img = Resource::loadImage(name);
     if ( !img.isNull() )
         r = new QImageDrag(img);
       } while (!r && sl>0);
   }
   return r;
     }
 };
 
 static int muted=0;
 static int micMuted=0;
 
 static void setVolume(int t=0, int percent=-1)
 {
   switch (t) {
   case 0: {
-  Config cfg("Sound");
-  cfg.setGroup("System");
+  Config cfg("qpe");
+  cfg.setGroup("Volume");
   if ( percent < 0 )
-    percent = cfg.readNumEntry("Volume",50);
+    percent = cfg.readNumEntry("VolumePercent",50);
   int fd = 0;
   if ((fd = open("/dev/mixer", O_RDWR))>=0) {
     int vol = muted ? 0 : percent;
     // set both channels to same volume
     vol |= vol << 8;
     ioctl(fd, MIXER_WRITE(0), &vol);
     ::close(fd);
   }
   } break;
   }
 }
 
 static void setMic(int t=0, int percent=-1)
 {
   switch (t) {
   case 0: {
-  Config cfg("Sound");
-  cfg.setGroup("System");
+  Config cfg("qpe");
+  cfg.setGroup("Volume");
   if ( percent < 0 )
     percent = cfg.readNumEntry("Mic",50);
   
   int fd = 0;
   int mic = micMuted ? 0 : percent;
   if ((fd = open("/dev/mixer", O_RDWR))>=0) {
     ioctl(fd, MIXER_WRITE(SOUND_MIXER_MIC), &mic);
     ::close(fd);
   }
   } break;
   }
 }
 
 int qpe_sysBrightnessSteps()
 {
 #if defined(QT_QWS_IPAQ)
     return 255;
 #elif defined(QT_QWS_EBX)
     return 4;
 #else
     return 255; // ?
 #endif
 }
 
 
 static int& hack(int& i)
 {
 #if QT_VERSION <= 230 && defined(QT_NO_CODECS)
     // These should be created, but aren't in Qt 2.3.0
     (void)new QUtf8Codec;
     (void)new QUtf16Codec;
 #endif
     return i;
 }
 
 static bool forced_off = FALSE;
 static int curbl=-1;
 
 static int backlight()
 {
     if ( curbl == -1 ) {
   // Read from config
   Config config( "qpe" );
   config.setGroup( "Screensaver" );
   curbl = config.readNumEntry("Brightness",255);
     }
     return curbl;
 }