diff options
| author | Guy Harris <guy@alum.mit.edu> | 2006-09-12 20:23:57 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2006-09-12 20:23:57 +0000 |
| commit | c577480d71a742177885c4cd642e5786725c89c6 (patch) | |
| tree | a9f85e07658d558e402fdc62ede3430b0bbcab67 | |
| parent | 5dd7a4e7f95145d82947c71d5509b0e6b0a1e323 (diff) | |
Move the PortAudio stuff to from version_info.c to gtk/main.c, so it can
use Pa_GetVersionText().
(The word-wrapping stuff appears to work.)
svn path=/trunk/; revision=19222
| -rw-r--r-- | gtk/main.c | 18 | ||||
| -rw-r--r-- | version_info.c | 29 |
2 files changed, 17 insertions, 30 deletions
diff --git a/gtk/main.c b/gtk/main.c index 81de778d00..c98a25419b 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -52,6 +52,10 @@ #include <conio.h> #endif +#ifdef HAVE_LIBPORTAUDIO +#include <portaudio.h> +#endif /* HAVE_LIBPORTAUDIO */ + #include <epan/epan.h> #include <epan/filesystem.h> #include <epan/privileges.h> @@ -2058,6 +2062,18 @@ main(int argc, char *argv[]) /* Assemble the compile-time version information string */ comp_info_str = g_string_new("Compiled "); +#ifdef HAVE_LIBPORTAUDIO +#ifdef PORTAUDIO_API_1 + g_string_append(comp_info_str, "with PortAudio <= V18"); +#else + g_string_append(comp_info_str, "with PortAudio "); + g_string_append(comp_info_str, Pa_GetVersionText()); +#endif +#else + g_string_append(comp_info_str, "without PortAudio"); +#endif /* HAVE_LIBPORTAUDIO */ + g_string_append(comp_info_str, ", "); + g_string_append(comp_info_str, "with "); g_string_sprintfa(comp_info_str, #ifdef GTK_MAJOR_VERSION @@ -2066,8 +2082,8 @@ main(int argc, char *argv[]) #else "GTK+ (version unknown)"); #endif - g_string_append(comp_info_str, ", "); + get_compiled_version_info(comp_info_str); /* Assemble the run-time version information string */ diff --git a/version_info.c b/version_info.c index d3a83844bc..7cc3731423 100644 --- a/version_info.c +++ b/version_info.c @@ -68,10 +68,6 @@ #include <sys/utsname.h> #endif -#ifdef HAVE_LIBPORTAUDIO -#include <portaudio.h> -#endif /* HAVE_LIBPORTAUDIO */ - #include "version_info.h" #include "capture-pcap-util.h" #include "epan/strutil.h" @@ -269,31 +265,6 @@ get_compiled_version_info(GString *str) #else g_string_append(str, "without Kerberos"); #endif /* HAVE_KERBEROS */ - g_string_append(str, ","); - do_word_wrap(str, break_point); - - /* PortAudio */ - g_string_append(str, " "); - break_point = str->len - 1; -#ifdef HAVE_LIBPORTAUDIO -#ifdef PORTAUDIO_API_1 - g_string_append(str, "with PortAudio <= V18"); -#else - g_string_append(str, "with PortAudio "); - -#if 0 /* FIXME: tshark doesn't need portaudio but - * links against this file - */ - g_string_append(str, Pa_GetVersionText()); -#else /* 0 (FIXME) */ - g_string_append(str, ">= V19"); -#endif /* 0 (FIXME) */ -#endif -#else - g_string_append(str, "without PortAudio"); -#endif /* HAVE_LIBPORTAUDIO */ - - g_string_append(str, "."); do_word_wrap(str, break_point); |