From f419d2a0dd4118d3617ce12166966097dfe837d1 Mon Sep 17 00:00:00 2001 From: "rafael@riseup.net" Date: Sat, 18 May 2013 05:29:13 +0000 Subject: [PATCH] added pulseaudio support. Release 0.7.1 --- darkice-gui/trunk/config_files.c | 5 ++++- darkice-gui/trunk/configure.in | 2 +- darkice-gui/trunk/darksnow.c | 1 + darkice-gui/trunk/documentation/CHANGES | 3 +++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/darkice-gui/trunk/config_files.c b/darkice-gui/trunk/config_files.c index f87c71c..3ec5438 100644 --- a/darkice-gui/trunk/config_files.c +++ b/darkice-gui/trunk/config_files.c @@ -226,7 +226,10 @@ gboolean darksnow2darkice_cfg() { fprintf(f_darkice_cfg, "%s", buffersize); /* size of internal slip buffer, in seconds */ fprintf(f_darkice_cfg, "\n\n[input]"); fprintf(f_darkice_cfg, "\ndevice = "); - fprintf(f_darkice_cfg, "%s", device); /* OSS, ALSA or JACK */ + fprintf(f_darkice_cfg, "%s", device); /* OSS, ALSA, Pulse or JACK */ + if (!strcmp(device, "pulseaudio")) { + fprintf(f_darkice_cfg, "\npaSourceName = default"); + } fprintf(f_darkice_cfg, "\nsampleRate = "); fprintf(f_darkice_cfg, "%s", samplerate); /* sample rate in Hz. try 11025, 22050 or 44100 */ fprintf(f_darkice_cfg, "\nbitsPerSample = "); diff --git a/darkice-gui/trunk/configure.in b/darkice-gui/trunk/configure.in index f863476..2157c9a 100644 --- a/darkice-gui/trunk/configure.in +++ b/darkice-gui/trunk/configure.in @@ -8,7 +8,7 @@ AC_PROG_CC dnl tests C compiler AC_LANG([C]) -VERSION="0.7" +VERSION="0.7.1" AC_SUBST(VERSION) AC_CHECK_FUNC(mmap,,AC_MSG_ERROR(Sorry, you need mmap. If you are reading this, email-me and report this problem and your system description - rafael@riseup.net)) diff --git a/darkice-gui/trunk/darksnow.c b/darkice-gui/trunk/darksnow.c index af29fd7..50755f6 100644 --- a/darkice-gui/trunk/darksnow.c +++ b/darkice-gui/trunk/darksnow.c @@ -397,6 +397,7 @@ int main( int argc, char *argv[], char *envp[]) { gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_device), "jack"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_device), "jack_auto"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_device), "default"); + gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_device), "pulseaudio"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_device), "/dev/dsp"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_device), "/dev/dsp0"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_device), "/dev/dsp1"); diff --git a/darkice-gui/trunk/documentation/CHANGES b/darkice-gui/trunk/documentation/CHANGES index 7d29142..9f60ac6 100644 --- a/darkice-gui/trunk/documentation/CHANGES +++ b/darkice-gui/trunk/documentation/CHANGES @@ -1,3 +1,6 @@ +0.7.1 + Added pulseaudio support. + Small fixes. 0.7 Added Opus support. GTK3 support.