Date:2012-06-14 23:59:39 (11 years 9 months ago)
Author:Paul Cercueil
Commit:21fee6ccd1ff874843782134d40c34403fb0af70
Message:Removed last bits of the "volume" feature.

Files: src/gmenu2x.cpp (3 diffs)
src/gmenu2x.h (1 diff)

Change Details

src/gmenu2x.cpp
9999  GMENU2X_SYSTEM_DIR "/skins/Default/wallpapers/default.png"
100100#endif
101101
102const int MAX_VOLUME_SCALE_FACTOR = 200;
103// Default values - going to add settings adjustment, saving, loading and such
104const int VOLUME_SCALER_MUTE = 0;
105const int VOLUME_SCALER_PHONES = 65;
106const int VOLUME_SCALER_NORMAL = 100;
107const int VOLUME_MODE_MUTE = 0;
108const int VOLUME_MODE_PHONES = 1;
109const int VOLUME_MODE_NORMAL = 2;
110const int BATTERY_READS = 10;
111
112102#ifdef _CARD_ROOT
113103const char *CARD_ROOT = _CARD_ROOT;
114104#elif defined(PLATFORM_DINGUX)
...... 
760750
761751        drawScrollBar(linkRows,menu->sectionLinks()->size()/linkColumns + ((menu->sectionLinks()->size()%linkColumns==0) ? 0 : 1),menu->firstDispRow(),43,resY-81);
762752
763        /*
764        switch(volumeMode) {
765            case VOLUME_MODE_MUTE: sc.skinRes("imgs/mute.png")->blit(s,279,bottomBarIconY); break;
766            case VOLUME_MODE_PHONES: sc.skinRes("imgs/phones.png")->blit(s,279,bottomBarIconY); break;
767            default: sc.skinRes("imgs/volume.png")->blit(s,279,bottomBarIconY); break;
768        }
769        */
770
771753        if (menu->selLink()!=NULL) {
772754            s->write ( font, menu->selLink()->getDescription(), halfX, resY-19, ASFont::HAlignCenter, ASFont::VAlignBottom );
773755            if (menu->selLinkApp()!=NULL) {
...... 
15551537#endif
15561538}
15571539
1558void GMenu2X::setVolumeScaler(int scale) {
1559    scale = constrain(scale,0,MAX_VOLUME_SCALE_FACTOR);
1560    unsigned long soundDev = open("/dev/mixer", O_WRONLY);
1561    if (soundDev) {
1562        ioctl(soundDev, SOUND_MIXER_PRIVATE2, &scale);
1563        close(soundDev);
1564    }
1565}
1566
1567int GMenu2X::getVolumeScaler() {
1568    int currentscalefactor = -1;
1569    unsigned long soundDev = open("/dev/mixer", O_RDONLY);
1570    if (soundDev) {
1571        ioctl(soundDev, SOUND_MIXER_PRIVATE1, &currentscalefactor);
1572        close(soundDev);
1573    }
1574    return currentscalefactor;
1575}
1576
15771540const string &GMenu2X::getExePath() {
15781541    if (path.empty()) {
15791542        char buf[255];
src/gmenu2x.h
173173
174174    void setClock(unsigned mhz);
175175
176    void setVolume(int vol);
177    int getVolume();
178    void setVolumeScaler(int scaler);
179    int getVolumeScaler();
180
181176    void setBacklight(int val);
182177    int getBackLight();
183178

Archive Download the corresponding diff file



interactive