Move codecs.[ch] out of epan and into codecs directory.

This may break easy_codec plugins, but it appears a better/more consistent way is needed to register codecs.  See Guy's comments in bug 7893 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893)

svn path=/trunk/; revision=53686

8 files changed, 16 insertions, 15 deletions

diff --git a/codecs/CMakeLists.txt b/codecs/CMakeLists.txt
index 723d891510..8af9897dfa 100644
--- a/codecs/CMakeLists.txt
+++ b/codecs/CMakeLists.txt
@@ -22,6 +22,7 @@
 #
 
 set(CODECS_FILES
+  codecs.c
   G711a/G711adecode.c
   G711u/G711udecode.c
   G722/G722decode.c
diff --git a/codecs/Makefile.am b/codecs/Makefile.am
index 9d036e982e..96cdf18676 100644
--- a/codecs/Makefile.am
+++ b/codecs/Makefile.am
@@ -35,6 +35,7 @@ MAINTAINERCLEANFILES =	\
        Makefile.in
 
 libcodec_a_SOURCES = \
+       codecs.c codecs.h	\
        G711a/G711adecode.c G711a/G711adecode.h G711a/G711atable.h	\
        G711u/G711udecode.c G711u/G711udecode.h G711u/G711utable.h	\
        G722/G722decode.c G722/G722decode.h							\
@@ -49,6 +50,7 @@ EXTRA_DIST = \
 
 checkapi: 
 	$(PERL) ../tools/checkAPIs.pl -g abort -g termoutput -build \
+	codecs.c \
 	G711a/G711adecode.c \
 	G711u/G711udecode.c \
 	G722/G722decode.c \
diff --git a/codecs/Makefile.nmake b/codecs/Makefile.nmake
index f335a48e5c..fd1e638d4e 100644
--- a/codecs/Makefile.nmake
+++ b/codecs/Makefile.nmake
@@ -14,6 +14,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
 	$(CC) $(CFLAGS)  -Fd.\ -c $<
 
 CODEC_OBJECTS= \
+    codecs.obj \
 	G711udecode.obj \
 	G711adecode.obj \
 	G722decode.obj \
@@ -25,6 +26,9 @@ codecs.lib	:  $(CODEC_OBJECTS)
 	link /lib /out:codecs.lib $(CODEC_OBJECTS)
 
 
+codecs.obj: codecs.c codecs.h
+	$(CC) $(CFLAGS) -Fd.\ -c codecs.c /Fo%|fF.obj
+
 G711adecode.obj: G711a\G711adecode.c G711a\G711adecode.h G711a\G711atable.h
 	$(CC) $(CFLAGS) -Fd.\ -c G711a\G711adecode.c /Fo%|fF.obj
 
@@ -49,6 +53,7 @@ maintainer-clean: distclean
 
 checkapi:
 	$(PERL) ../tools/checkAPIs.pl -g abort -g termoutput -build \
+	codecs.c \
 	G711a/G711adecode.c \
 	G711u/G711udecode.c \
 	G722/G722decode.c \
diff --git a/epan/codecs.c b/codecs/codecs.c
index 40f4926eca..0cb397f99b 100644
--- a/epan/codecs.c
+++ b/codecs/codecs.c
@@ -22,9 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
-
-#include <epan/codecs.h>
+#include <glib.h>
+#include "codecs.h"
 
 struct codec_handle {
 	const char *name;
diff --git a/epan/codecs.h b/codecs/codecs.h
index 0d407f5205..9231fe8455 100644
--- a/epan/codecs.h
+++ b/codecs/codecs.h
@@ -25,9 +25,6 @@
 #ifndef _CODECS_H_
 #define _CODECS_H_
 
-#include <epan/epan.h>
-#include "ws_symbol_export.h"
-
 struct codec_handle;
 typedef struct codec_handle *codec_handle_t;
 
@@ -35,10 +32,10 @@ typedef void *(*codec_init_fn)(void);
 typedef void (*codec_release_fn)(void *context);
 typedef int (*codec_decode_fn)(void *context, const void *input, int inputSizeBytes, void *output, int *outputSizeBytes);
 
-WS_DLL_PUBLIC void register_codec(const char *name, codec_init_fn init_fn, codec_release_fn release_fn, codec_decode_fn decode_fn);
-WS_DLL_PUBLIC codec_handle_t find_codec(const char *name);
-WS_DLL_PUBLIC void *codec_init(codec_handle_t codec);
-WS_DLL_PUBLIC void codec_release(codec_handle_t codec, void *context);
-WS_DLL_PUBLIC int codec_decode(codec_handle_t codec, void *context, const void *input, int inputSizeBytes, void *output, int *outputSizeBytes);
+extern void register_codec(const char *name, codec_init_fn init_fn, codec_release_fn release_fn, codec_decode_fn decode_fn);
+extern codec_handle_t find_codec(const char *name);
+extern void *codec_init(codec_handle_t codec);
+extern void codec_release(codec_handle_t codec, void *context);
+extern int codec_decode(codec_handle_t codec, void *context, const void *input, int inputSizeBytes, void *output, int *outputSizeBytes);
 
 #endif
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 162b24b023..dea24df3a2 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1468,7 +1468,6 @@ set(LIBWIRESHARK_FILES
 	camel-persistentdata.c
 	charsets.c
 	circuit.c
-	codecs.c
 	column.c
 	column-utils.c
 	conversation.c
diff --git a/epan/Makefile.common b/epan/Makefile.common
index 42989c4f8f..b3462760ee 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -35,7 +35,6 @@ LIBWIRESHARK_SRC =		\
 	camel-persistentdata.c	\
 	charsets.c		\
 	circuit.c		\
-	codecs.c		\
 	column.c		\
 	column-utils.c		\
 	conversation.c		\
@@ -162,7 +161,6 @@ LIBWIRESHARK_INCLUDES =		\
 	charsets.h		\
 	chdlctypes.h		\
 	circuit.h		\
-	codecs.h		\
 	column.h		\
 	column-info.h		\
 	column-utils.h		\
diff --git a/ui/gtk/rtp_player.c b/ui/gtk/rtp_player.c
index 82f833ccf1..98a20f8795 100644
--- a/ui/gtk/rtp_player.c
+++ b/ui/gtk/rtp_player.c
@@ -64,7 +64,7 @@
 #include <epan/addr_resolv.h>
 #include <epan/dissectors/packet-rtp.h>
 #include <epan/rtp_pt.h>
-#include <epan/codecs.h>
+#include <../codecs/codecs.h>
 #include <epan/prefs.h>
 
 #include "../globals.h"