Attachment #38864 for bug #61223

View | Details | Raw Unified | Return to bug 61223
Collapse All | Expand All

Lines 50-56 Link Here

(-)old/mixerctl.cc (-1 / +1 lines)
50		50
51	if((fd = ::open(devname.c_str(), O_RDWR)) != -1) {	51	if((fd = ::open(devname.c_str(), O_RDWR)) != -1) {
52	if(ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devmask) != -1) {	52	if(ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devmask) != -1) {
53	for(ct = ctVolume; ct != channeltype_end; (int) ct += 1) {	53	for(ct = ctVolume; ct != channeltype_end; ct = (mixerctl::channeltype) (ct + 1)) {
54	if((1 << (int) ct) & devmask) {	54	if((1 << (int) ct) & devmask) {
55	channels.insert(ct);	55	channels.insert(ct);
56	}	56	}




			autosavepl = !autosavepl;
			break;
		    case 41:
			if(((int) playmode + 1) == PlayMode_size)
			    playmode = Normal;
			break;
		    case 42:
			autoplay = !autoplay;
			break;
		    case 43:
			if(((int) sortorder + 1) == SortOrder_size)
			    sortorder = byFileName;
			break;
		    case 44:

    while(!finished) {
	m.clear();

	for(ct = mixerctl::ctVolume; ct != mixerctl::channeltype_end; ct = (mixerctl::channeltype) (ct + 1)) {
	    if(chavail.count(ct)) {
		val = mix.readlevel(ct);
		if(val >= 0) {

Return to bug 61223

Lines 577-590 Link Here

(-)old/uitext.cc (-3 / +3 lines)
577	autosavepl = !autosavepl;	577	autosavepl = !autosavepl;
578	break;	578	break;
579	case 41:	579	case 41:
580	if(++((int) playmode) == PlayMode_size)	580	if(((int) playmode + 1) == PlayMode_size)
581	playmode = Normal;	581	playmode = Normal;
582	break;	582	break;
583	case 42:	583	case 42:
584	autoplay = !autoplay;	584	autoplay = !autoplay;
585	break;	585	break;
586	case 43:	586	case 43:
587	if(++((int) sortorder) == SortOrder_size)	587	if(((int) sortorder + 1) == SortOrder_size)
588	sortorder = byFileName;	588	sortorder = byFileName;
589	break;	589	break;
590	case 44:	590	case 44:
Lines 719-725 Link Here
719	while(!finished) {	719	while(!finished) {
720	m.clear();	720	m.clear();
721		721
722	for(ct = mixerctl::ctVolume; ct != mixerctl::channeltype_end; (int) ct += 1) {	722	for(ct = mixerctl::ctVolume; ct != mixerctl::channeltype_end; ct = (mixerctl::channeltype) (ct + 1)) {
723	if(chavail.count(ct)) {	723	if(chavail.count(ct)) {
724	val = mix.readlevel(ct);	724	val = mix.readlevel(ct);
725	if(val >= 0) {	725	if(val >= 0) {