Changeset 12065
- Timestamp:
- 12/06/11 18:17:03 (12 years ago)
- Location:
- titan/titan
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/titan/global.h
r12053 r12065 2700 2700 debug(1000, "in"); 2701 2701 char* mutedev; 2702 2703 mutedev = getconfig("mutedev", NULL); 2704 2705 if(mutedev != NULL) 2706 { 2707 debug(100, "set %s to %d", mutedev, value); 2708 return writesysint(mutedev, value, 0); 2709 } 2710 2702 int tmpvol; 2703 2704 if(value == 2) 2705 { 2706 tmpvol = getvol(); 2707 tmpvol = tmpvol*50/100; 2708 setvol(tmpvol); 2709 } 2710 else 2711 { 2712 mutedev = getconfig("mutedev", NULL); 2713 2714 if(mutedev != NULL) 2715 { 2716 debug(100, "set %s to %d", mutedev, value); 2717 return writesysint(mutedev, value, 0); 2718 } 2719 } 2711 2720 debug(1000, "out"); 2712 2721 return 0; … … 2726 2735 debug(100, "set %s to %d", voldev, value); 2727 2736 ret = writesysint(voldev, value, 0); 2728 if(ret == 0 ) addconfigint("vol", tmpvol);2737 if(ret == 0 && status.mute != 2) addconfigint("vol", tmpvol); 2729 2738 return ret; 2730 2739 } -
titan/titan/mute.h
r11087 r12065 8 8 struct skin* mute = getscreen("mute"); 9 9 10 if(status.mute == 0 )10 if(status.mute == 0 && atoi(getconfig("stepmute", NULL)) == 1) 11 11 { 12 err("************"); 13 status.mute = 2; 14 setmute(2); 15 } 16 else if(status.mute == 0 || status.mute == 2) 17 { 18 setmute(1); 19 if(status.mute == 2) 20 setvol(getconfigint("vol", NULL)); 12 21 status.mute = 1; 13 setmute(1);14 22 setnodeattr(mute, framebuffer); 15 23 if(status.drawallwaysbg[0] != NULL) … … 22 30 status.drawallways[0] = mute; 23 31 } 32 24 33 else 25 34 {
Note: See TracChangeset
for help on using the changeset viewer.