audio/liveice/patches/patch-ae

   1 $NetBSD$
   2
   3 --- setup.c.orig        Wed May 24 15:50:02 2000
   4 +++ setup.c
   5 @@ -38,7 +38,13 @@
   6  char default_mountpoint[]       = "liveice";
   7  char default_description[]      = "LiveIce";
   8  char default_pipe_directory[]   = ".liveice_temp_files";
   9 +#ifdef __NetBSD__
  10 +char default_sound_input_file[] = "/dev/audio";
  11 +char default_netbsd_audio_file[] = "/dev/audio";
  12 +char default_netbsd_audioctl_file[] = "/dev/audioctl";
  13 +#else
  14  char default_sound_input_file[] = "/dev/dsp";
  15 +#endif
  16
  17  /* default encoder commands */
  18  char AJ_encoder_command[]       = "encoder";
  19 @@ -46,7 +52,7 @@
  20  char MP3ENC_encoder_command[]   = "mp3enc";
  21  char SCREAMER_encoder_command[] = "lamer";
  22  char XING_encoder_command[]     = "xingmp3enc";
  23 -char LAME3_encoder_command[]    = "lame3";
  24 +char LAME3_encoder_command[]    = "lame";
  25  char GOGO_encoder_command[]    = "gogo";
  26
  27  static int in_stream_set;
  28 @@ -244,6 +250,13 @@
  29         g_conf.sound_input_file=malloc(strlen(default_sound_input_file)+2);
  30         strcpy(g_conf.sound_input_file,default_sound_input_file);
  31
  32 +#ifdef __NetBSD__
  33 +       g_conf.netbsd_audio_file=malloc(strlen(default_netbsd_audio_file)+2);
  34 +       strcpy(g_conf.netbsd_audio_file,default_netbsd_audio_file);
  35 +
  36 +       g_conf.netbsd_audioctl_file=malloc(strlen(default_netbsd_audioctl_file)+2);
  37 +       strcpy(g_conf.netbsd_audioctl_file,default_netbsd_audioctl_file);
  38 +#endif
  39
  40         g_conf.icy_public=1;
  41         g_conf.bitrate=BITRATE;
  42 @@ -407,6 +420,12 @@
  43                  string_copy(&(g_conf.update_script),line);
  44          } else if(!strcmp(cmd,"URL")) {
  45                  string_copy(&(g_conf.icy_url),line);
  46 +#ifdef __NetBSD__
  47 +        } else if(!strcmp(cmd,"NETBSD_AUDIO_FILE")) {
  48 +                string_copy(&(g_conf.netbsd_audio_file),line);
  49 +        } else if(!strcmp(cmd,"NETBSD_AUDIOCTL_FILE")) {
  50 +                string_copy(&(g_conf.netbsd_audioctl_file),line);
  51 +#endif
  52          } else if(!strcmp(cmd,"MIXER_CMD")) {
  53                 string_copy(&g_conf.mixer_cmd,line);
  54                 g_conf.mixer=COMMAND_MODE;