Strip out references to PortAudio. Qt has its own audio module (Phonon).

We'll presumably use that.

svn path=/trunk/; revision=52282

ui/qt/Makefile.am

@@ -62,7 +62,7 @@ libqtui_a_CFLAGS = $(AM_CLEAN_CFLAGS)
 libqtui_a_DEPENDENCIES =
 
 # Common headers
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES) $(PIE_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PIE_CFLAGS)
 
 AM_V_MOC = $(am__v_MOC_@AM_V@)
 am__v_MOC_ = $(am__v_MOC_@AM_DEFAULT_V@)

ui/qt/QtShark.pro

@@ -96,10 +96,6 @@ unix {
     PKGCONFIG += \
         glib-2.0
 
-    packagesExist(portaudio-2.0) {
-        PKGCONFIG += portaudio-2.0
-    }
-
     # Some versions of Ubuntu don't ship with zlib.pc
     !macx {
         eval(PKGCONFIG += zlib) {
@@ -232,27 +228,6 @@ FORMS += \
     uat_dialog.ui \
     tcp_stream_dialog.ui
 
-win32 { ## These should be in config.pri ??
-    !isEmpty(PORTAUDIO_DIR) {
-        PA_OBJECTS = \
-            ../gtk/pa_allocation.obj \
-            ../gtk/pa_converters.obj \
-            ../gtk/pa_cpuload.obj \
-            ../gtk/pa_dither.obj \
-            ../gtk/pa_front.obj \
-            ../gtk/pa_process.obj \
-            ../gtk/pa_skeleton.obj \
-            ../gtk/pa_stream.obj \
-            ../gtk/pa_trace.obj \
-            ../gtk/pa_win_wmme.obj \
-            ../gtk/pa_win_hostapis.obj \
-            ../gtk/pa_win_util.obj \
-            ../gtk/pa_win_waveformat.obj \
-            ../gtk/pa_x86_plain_converters.obj
-        PA_OBJECTS ~= s,/,\\,g
-    }
-}
-
 HEADERS += $$HEADERS_WS_C \
     accordion_frame.h \
     capture_preferences_frame.h \
@@ -279,7 +254,6 @@ HEADERS += $$HEADERS_WS_C \
     elided_label.h \
     tcp_stream_dialog.h
 
-
 win32 {
     OBJECTS_WS_C = $$SOURCES_WS_C
     OBJECTS_WS_C ~= s/[.]c/.obj/g

ui/qt/main.cpp

@@ -36,10 +36,6 @@
 #  include <getopt.h>
 #endif
 
-#ifdef HAVE_LIBPORTAUDIO
-#  include <portaudio.h>
-#endif /* HAVE_LIBPORTAUDIO */
-
 #include <wsutil/crash_info.h>
 #include <wsutil/u3.h>
 #include <wsutil/file_util.h>
@@ -418,16 +414,7 @@ get_gui_compiled_info(GString *str)
   epan_get_compiled_version_info(str);
 
   g_string_append(str, ", ");
-#ifdef HAVE_LIBPORTAUDIO
-#ifdef PORTAUDIO_API_1
-  g_string_append(str, "with PortAudio <= V18");
-#else /* PORTAUDIO_API_1 */
-  g_string_append(str, "with ");
-  g_string_append(str, Pa_GetVersionText());
-#endif /* PORTAUDIO_API_1 */
-#else /* HAVE_LIBPORTAUDIO */
   g_string_append(str, "without PortAudio");
-#endif /* HAVE_LIBPORTAUDIO */
 
   g_string_append(str, ", ");
 #ifdef HAVE_AIRPCAP