Mercurial > pidgin
diff src/gaimrc.c @ 4581:4b1e24835bbf
[gaim-migrate @ 4864]
put NAS sound support back in, and re-wrote a lot of the libao stuff
this should mostly put an end to people having to make a ~/.libao file
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Fri, 14 Feb 2003 20:57:32 +0000 |
| parents | 9df99116840a |
| children | eddb870a3c4d |
line wrap: on
line diff
--- a/src/gaimrc.c Wed Feb 12 17:16:16 2003 +0000 +++ b/src/gaimrc.c Fri Feb 14 20:57:32 2003 +0000 @@ -758,6 +758,7 @@ font_options = atoi(p->value[0]); } else if (!strcmp(p->option, "sound_options")) { sound_options = atoi(p->value[0]); + gaim_sound_change_output_method(); } else if (!strcmp(p->option, "away_options")) { away_options = atoi(p->value[0]); away_resend = atoi(p->value[1]); @@ -799,7 +800,8 @@ } /* this is where we do bugs and compatibility stuff */ - if (!(sound_options & (OPT_SOUND_BEEP | OPT_SOUND_NORMAL | OPT_SOUND_CMD))) + if (!(sound_options & (OPT_SOUND_BEEP | OPT_SOUND_NORMAL | OPT_SOUND_ESD + | OPT_SOUND_ARTS | OPT_SOUND_NAS | OPT_SOUND_CMD))) sound_options |= OPT_SOUND_NORMAL; if (conv_size.width == 0 && @@ -822,7 +824,7 @@ if (!read_logging) { logging_options = 0; if (general_options & OPT_GEN_LOG_ALL) - logging_options |= OPT_LOG_CONVOS | OPT_LOG_CHATS; + logging_options |= OPT_LOG_CONVOS | OPT_LOG_CHATS; if (general_options & OPT_GEN_STRIP_HTML) logging_options |= OPT_LOG_STRIP_HTML; } @@ -1232,7 +1234,8 @@ OPT_SOUND_RECV | OPT_SOUND_SEND | OPT_SOUND_SILENT_SIGNON | - OPT_SOUND_NORMAL; + OPT_SOUND_NORMAL | + OPT_SOUND_NAS; #ifdef USE_SCREENSAVER report_idle = IDLE_SCREENSAVER;