comparison libao2/ao_alsa1x.c @ 10258:d9371eecb619

-ao alsa9:hw:0,0 fix by Wojtek Kaniewski <[e-mail]>

10257:14c4e284a702

	  else if (strcmp(*(token_str+i3), "noblock") == 0) {
	    ao_noblock = 1;
	  }
	  else if (strcmp(*(token_str+i3), "hw") == 0) {
	    if ((i3 < i2-1) && (strcmp(*(token_str+i3+1), "noblock") != 0) && (strcmp(*(token_str+i3+1), "mmap") != 0)) {
	      alsa_device = alloca(ALSA_DEVICE_SIZE);
	      snprintf(alsa_device, ALSA_DEVICE_SIZE, "hw:%s", *(token_str+(i3+1)));
	      device_set = 1;
	    }
		else {
		  alsa_device = *(token_str+i3);
		  device_set = 1;

	       (cards >= 0) ? "" : "s", alsa_device);
      } else if (strcmp(alsa_device, "help") == 0) {
	printf("alsa-help: available options are:\n");
	printf("           mmap: sets mmap-mode\n");
	printf("           noblock: sets noblock-mode\n");
	printf("           device-name: sets device name\n");
	printf("           example -ao alsa9:mmap:noblock:hw:0,3 sets noblock-mode,\n");
	printf("           mmap-mode and the device-name as first card third device\n");
	return(0);
      } else {
		printf("alsa-init: soundcard set to %s\n", alsa_device);
      }

10258:d9371eecb619

	  else if (strcmp(*(token_str+i3), "noblock") == 0) {
	    ao_noblock = 1;
	  }
	  else if (strcmp(*(token_str+i3), "hw") == 0) {
	    if ((i3 < i2-1) && (strcmp(*(token_str+i3+1), "noblock") != 0) && (strcmp(*(token_str+i3+1), "mmap") != 0)) {
              char *tmp;

	      alsa_device = alloca(ALSA_DEVICE_SIZE);
	      snprintf(alsa_device, ALSA_DEVICE_SIZE, "hw:%s", *(token_str+(i3+1)));
	      if ((tmp = strrchr(alsa_device, '.')) && isdigit(*(tmp+1)))
                *tmp = ',';
	      device_set = 1;
	    }
		else {
		  alsa_device = *(token_str+i3);
		  device_set = 1;

	       (cards >= 0) ? "" : "s", alsa_device);
      } else if (strcmp(alsa_device, "help") == 0) {
	printf("alsa-help: available options are:\n");
	printf("           mmap: sets mmap-mode\n");
	printf("           noblock: sets noblock-mode\n");
	printf("           device-name: sets device name (change comma to point)\n");
	printf("           example -ao alsa9:mmap:noblock:hw:0.3 sets noblock-mode,\n");
	printf("           mmap-mode and the device-name as first card fourth device\n");
	return(0);
      } else {
		printf("alsa-init: soundcard set to %s\n", alsa_device);
      }