diff options
author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-16 02:04:55 +0000 |
---|---|---|
committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-16 02:04:55 +0000 |
commit | 56735f8c160a5c648ef1b6a338a8daa6d6ae826c (patch) | |
tree | 1584f409c83e19c394f9890c8242fc975929a161 | |
parent | 69eb477c9e832f614bd2ed1a21ec2945a5ccb151 (diff) |
Move u3.{h,c} and g711.{h,c} into wsutil.
Project g711.h against multiple inclusion and add C++ compatibility wrapper.
svn path=/trunk/; revision=50654
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | Makefile.common | 4 | ||||
-rw-r--r-- | ui/gtk/iax2_analysis.c | 11 | ||||
-rw-r--r-- | ui/gtk/main.c | 7 | ||||
-rw-r--r-- | ui/gtk/main_menubar.c | 3 | ||||
-rw-r--r-- | ui/gtk/rtp_analysis.c | 9 | ||||
-rw-r--r-- | ui/qt/main.cpp | 4 | ||||
-rw-r--r-- | ui/recent.c | 3 | ||||
-rw-r--r-- | wsutil/CMakeLists.txt | 2 | ||||
-rw-r--r-- | wsutil/Makefile.common | 8 | ||||
-rw-r--r-- | wsutil/g711.c (renamed from g711.c) | 0 | ||||
-rw-r--r-- | wsutil/g711.h (renamed from g711.h) | 23 | ||||
-rw-r--r-- | wsutil/u3.c (renamed from u3.c) | 2 | ||||
-rw-r--r-- | wsutil/u3.h (renamed from u3.h) | 14 |
14 files changed, 53 insertions, 39 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5761253086..06d5bb6290 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -761,12 +761,10 @@ if( (BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND) ) file.c fileset.c filters.c - g711.c iface_monitor.c merge.c proto_hier_stats.c summary.c - u3.c ws80211_utils.c ${SHARK_COMMON_CAPTURE_SRC} ${WIRESHARK_COMMON_SRC} diff --git a/Makefile.common b/Makefile.common index 8ee66f40b8..dcd139d34a 100644 --- a/Makefile.common +++ b/Makefile.common @@ -96,12 +96,10 @@ WIRESHARK_COMMON_SRC = \ file.c \ fileset.c \ filters.c \ - g711.c \ iface_monitor.c \ merge.c \ proto_hier_stats.c \ summary.c \ - u3.c \ ws80211_utils.c # corresponding headers @@ -113,7 +111,6 @@ WIRESHARK_COMMON_INCLUDES = \ capture_opts.h \ color_filters.h \ filters.h \ - g711.h \ globals.h \ iface_monitor.h \ log.h \ @@ -122,7 +119,6 @@ WIRESHARK_COMMON_INCLUDES = \ stat_menu.h \ summary.h \ sync_pipe.h \ - u3.h \ ws80211_utils.h # tshark specifics diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c index 142727c6b3..fe8de8db34 100644 --- a/ui/gtk/iax2_analysis.c +++ b/ui/gtk/iax2_analysis.c @@ -51,6 +51,10 @@ #include <gtk/gtk.h> +#include <wsutil/file_util.h> +#include <wsutil/g711.h> +#include <wsutil/tempfile.h> + #include <epan/epan_dissect.h> #include <epan/filesystem.h> #include <epan/pint.h> @@ -62,19 +66,15 @@ #include <epan/stat_cmd_args.h> #include <epan/strutil.h> -#include "ui/util.h" -#include "../g711.h" #include "../stat_menu.h" -#include "wsutil/tempfile.h" +#include "ui/util.h" #include "ui/alert_box.h" #include "ui/last_open_dir.h" #include "ui/progress_dlg.h" #include "ui/simple_dialog.h" #include "ui/utf8_entities.h" -#include <wsutil/file_util.h> - #include "ui/gtk/gtkglobals.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/file_dlg.h" @@ -85,7 +85,6 @@ #include "ui/gtk/iax2_analysis.h" #include "ui/gtk/rtp_stream.h" #include "ui/gtk/rtp_stream_dlg.h" - #include "ui/gtk/old-gtk-compat.h" #include "ui/gtk/gui_utils.h" diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 812777b490..8aa1c6792b 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -64,10 +64,12 @@ #endif /* HAVE_LIBPORTAUDIO */ #include <wsutil/crash_info.h> +#include <wsutil/u3.h> +#include <wsutil/privileges.h> +#include <wsutil/file_util.h> #include <epan/epan.h> #include <epan/filesystem.h> -#include <wsutil/privileges.h> #include <epan/epan_dissect.h> #include <epan/timestamp.h> #include <epan/plugins.h> @@ -103,7 +105,6 @@ #include "../version_info.h" #include "../merge.h" #include "../log.h" -#include "../u3.h" #include "gtk_iface_monitor.h" @@ -121,8 +122,6 @@ #include "ui/iface_lists.h" #endif -#include <wsutil/file_util.h> - #ifdef HAVE_LIBPCAP #include "capture_ui_utils.h" #include "capture-pcap-util.h" diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c index e9b9081753..ea32ecd578 100644 --- a/ui/gtk/main_menubar.c +++ b/ui/gtk/main_menubar.c @@ -28,6 +28,8 @@ #include <stdio.h> #include <string.h> +#include <wsutil/u3.h> + #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/prefs.h> @@ -49,7 +51,6 @@ #include "globals.h" #include "color_filters.h" #include "stat_menu.h" -#include "u3.h" #include "ui/iface_lists.h" #include "ui/main_statusbar.h" diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c index 647775e6d4..b3d9778b73 100644 --- a/ui/gtk/rtp_analysis.c +++ b/ui/gtk/rtp_analysis.c @@ -50,6 +50,10 @@ #include <gtk/gtk.h> +#include <wsutil/file_util.h> +#include <wsutil/tempfile.h> +#include <wsutil/g711.h> + #include <epan/epan_dissect.h> #include <epan/filesystem.h> #include <epan/pint.h> @@ -60,18 +64,15 @@ #include <epan/stat_cmd_args.h> #include <epan/strutil.h> -#include "ui/util.h" -#include "../g711.h" #include "../stat_menu.h" -#include "wsutil/tempfile.h" +#include "ui/util.h" #include "ui/alert_box.h" #include "ui/last_open_dir.h" #include "ui/progress_dlg.h" #include "ui/simple_dialog.h" #include "ui/utf8_entities.h" -#include <wsutil/file_util.h> #include "ui/gtk/gtkglobals.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index 5570e5965d..ba271236a4 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -41,6 +41,8 @@ #endif /* HAVE_LIBPORTAUDIO */ #include <wsutil/crash_info.h> +#include <wsutil/u3.h> +#include <wsutil/file_util.h> #include <epan/epan.h> #include <epan/filesystem.h> @@ -79,8 +81,6 @@ #include "version_info.h" #include "merge.h" #include "log.h" -#include "u3.h" -#include <wsutil/file_util.h> #include "ui/alert_box.h" #include "ui/capture_globals.h" diff --git a/ui/recent.c b/ui/recent.c index db1881e585..c739397144 100644 --- a/ui/recent.c +++ b/ui/recent.c @@ -44,8 +44,7 @@ #include "ui/simple_dialog.h" #include "ui/ui_util.h" -#include "u3.h" - +#include <wsutil/u3.h> #include <wsutil/file_util.h> #include <wsutil/str_util.h> diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index 0864101435..85fe2a96f5 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -46,6 +46,7 @@ set(WSUTIL_FILES crc8.c crc11.c crcdrm.c + g711.c mpeg-audio.c nstime.c privileges.c @@ -54,6 +55,7 @@ set(WSUTIL_FILES report_err.c tempfile.c type_util.c + u3.c ${WSUTIL_PLATFORM_FILES} ) diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common index dd15f9fb51..8e2903bef5 100644 --- a/wsutil/Makefile.common +++ b/wsutil/Makefile.common @@ -40,6 +40,7 @@ LIBWSUTIL_SRC = \ crc16-plain.c \ crc32.c \ crcdrm.c \ + g711.c \ mpeg-audio.c \ nstime.c \ privileges.c \ @@ -47,7 +48,8 @@ LIBWSUTIL_SRC = \ str_util.c \ report_err.c \ tempfile.c \ - type_util.c + type_util.c \ + u3.c # Header files that are not generated from other files LIBWSUTIL_INCLUDES = \ @@ -61,6 +63,7 @@ LIBWSUTIL_INCLUDES = \ crc16-plain.h \ crc32.h \ crcdrm.h \ + g711.h \ mpeg-audio.h \ nstime.h \ privileges.h \ @@ -68,4 +71,5 @@ LIBWSUTIL_INCLUDES = \ str_util.h \ report_err.h \ tempfile.h \ - type_util.h + type_util.h \ + u3.h diff --git a/g711.c b/wsutil/g711.c index 5ae74148ba..5ae74148ba 100644 --- a/g711.c +++ b/wsutil/g711.c diff --git a/g711.h b/wsutil/g711.h index 2df327e894..8dc7d206ef 100644 --- a/g711.h +++ b/wsutil/g711.h @@ -24,7 +24,22 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -unsigned char linear2alaw( int ); -int alaw2linear( unsigned char ); -unsigned char linear2ulaw( int ); -int ulaw2linear( unsigned char ); +#ifndef __G711_H__ +#define __G711_H__ + +#include "ws_symbol_export.h" + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +WS_DLL_PUBLIC unsigned char linear2alaw( int ); +WS_DLL_PUBLIC int alaw2linear( unsigned char ); +WS_DLL_PUBLIC unsigned char linear2ulaw( int ); +WS_DLL_PUBLIC int ulaw2linear( unsigned char ); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __G711_H__ */ @@ -46,8 +46,6 @@ #include <wsutil/file_util.h> -#include <epan/filesystem.h> - #include "u3.h" @@ -25,19 +25,21 @@ #ifndef __U3_H__ #define __U3_H__ +#include "ws_symbol_export.h" + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -gboolean u3_active(void); +WS_DLL_PUBLIC gboolean u3_active(void); -void u3_runtime_info(GString *str); +WS_DLL_PUBLIC void u3_runtime_info(GString *str); -void u3_register_pid(void); -void u3_deregister_pid(void); +WS_DLL_PUBLIC void u3_register_pid(void); +WS_DLL_PUBLIC void u3_deregister_pid(void); -const char * u3_expand_device_path(const char *path); -const char * u3_contract_device_path(char *path); +WS_DLL_PUBLIC const char *u3_expand_device_path(const char *path); +WS_DLL_PUBLIC const char *u3_contract_device_path(char *path); #ifdef __cplusplus } |