support for json only

export directives

Author: dfober

src/include/export.h

@@ -0,0 +1,41 @@
+/*
+  JSON to OSC Library
+  Copyright (C) 2013  Grame
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+  Grame Research Laboratory, 11, cours de Verdun Gensoul 69002 Lyon - France
+  [email protected]
+
+*/
+
+#ifndef export__
+#define export__
+
+
+#if __MINGW32__
+#  define jsonexport
+
+#elif defined(WIN32) && !defined(GCC)
+
+# ifdef JSONExport
+#  define jsonexport		_declspec (dllexport)
+# else
+#  define jsonexport		_declspec (dllimport)
+# endif
+
+#else
+
+# ifdef JSONExport
+#  define jsonexport		__attribute__ ((visibility("default")))
+
+# else
+#  define jsonexport
+# endif
+
+#endif
+
+
+#endif

src/include/json_osc.h

@@ -89,6 +89,7 @@ Multiple messages can be included in a single JSON : they should be encoded usin
 #define json_osc__
 
 #include "osc2json.h"
+#include "export.h"
 
 namespace json
 {
@@ -106,13 +107,13 @@ enum { kNoError, kSyntaxError, kIncorrectParameter, kNoSuchFile, kCantBindSocket
 	\note The function does not return since it listens to a socket. 
 	Thus the caller is responsible of calling the function in a separate thread when appropriate.
 */
-int			start_osc2json	(osc2json* client, int port, osc_listener** listener);
+jsonexport int				start_osc2json	(osc2json* client, int port, osc_listener** listener);
 
 /**
 	\brief stops osc to json conversion
 	\param listener an osc listener that has been previously returned by start_osc2json
 */
-void			stop_osc2json	(osc_listener* listener);
+jsonexport void				stop_osc2json	(osc_listener* listener);
 
 /**
 	\brief starts json to osc conversion
@@ -122,36 +123,36 @@ void			stop_osc2json	(osc_listener* listener);
 	\note sending a json string including a destination and/or a udp port changes 
 	the default destination and/or default udp port number.
 */
-osc_stream*		start_json2osc	(const char* defaultDest, int defaultPort);
+jsonexport osc_stream*		start_json2osc	(const char* defaultDest, int defaultPort);
 
 /**
 	\brief sends a json string as osc packets
 	\param json the json code 
 	\param stream an osc stream that has been previously returned by start_json2osc
 	\return an error code or kNoError when no error
 */
-int				send			(const char * json, osc_stream* stream);
+jsonexport int				send			(const char * json, osc_stream* stream);
 
 /**
 	\brief sends a json file as osc packets
 	\param file the file path name 
 	\param stream an osc stream that has been previously returned by start_json2osc
 	\return an error code or kNoError when no error
 */
-int				sendfile		(const char * file, osc_stream* stream);
+jsonexport int				sendfile		(const char * file, osc_stream* stream);
 
 /**
 	\brief stops json to osc conversion
 	\param stream an osc stream that has been previously returned by start_json2osc
 */
-void			stop_json2osc	(osc_stream* stream);
+jsonexport void				stop_json2osc	(osc_stream* stream);
 
 /**
 	\brief gives a textual description of an error
 	\param error an error code 
 	\return a string
 */
-const char*		error_string	(int error);
+jsonexport const char*		error_string	(int error);
 
 
 } // end namespoace

src/json/json2osc.cpp

@@ -15,7 +15,9 @@
 
 #include "json2osc.h"
 #include "json_object.h"
-#include "osc_stream.h"
+#ifndef JSON_ONLY
+# include "osc_stream.h"
+#endif
 
 using namespace std;
 

src/json/json_array.cpp

@@ -30,13 +30,15 @@ json_array::~json_array()
 }
 
 // --------------------------------------------------------------
+#ifndef JSON_ONLY
 void json_array::print(osc_stream& out) const
 {
 	unsigned int n = fValues.size();
 	for (unsigned int i=0; i < n; i++) {
 		fValues[i]->print(out);
 	}	
 }
+#endif
 
 // --------------------------------------------------------------
 void json_array::print(json_stream& out) const

src/json/json_array.h

@@ -16,6 +16,7 @@
 #define json_array__
 
 #include <vector>
+#include "export.h"
 
 namespace json
 {
@@ -27,7 +28,7 @@ class osc_stream;
 /*!
 	\brief a json array, as defined by the json spec (see http://json.org/)
 */
-class json_array
+class jsonexport json_array
 {
 	std::vector<const json_value *>	fValues;
 
@@ -37,7 +38,9 @@ class json_array
 
 		virtual void	add(const json_value * val)		{ fValues.push_back(val); }
 		virtual void	print(json_stream& out) const;
+#ifndef JSON_ONLY
 		virtual void	print(osc_stream& out) const;
+#endif
 };
 
 } // end namespace

src/json/json_element.h

@@ -18,6 +18,7 @@
 #include <string>
 #include "json_value.h"
 #include "json_stream.h"
+#include "export.h"
 
 namespace json
 {
@@ -27,7 +28,7 @@ class osc_stream;
 /*!
 	\brief a json element, actually a pair name/value
 */
-class json_element
+class jsonexport json_element
 {
 	std::string			fName;
 	const json_value *	fValue;

src/json/json_object.cpp

@@ -14,7 +14,9 @@
 #include "json_object.h"
 #include "json_stream.h"
 #include "json2osc.h"
-#include "osc_stream.h"
+#ifndef JSON_ONLY
+# include "osc_stream.h"
+#endif
 
 using namespace std;
 namespace json
@@ -61,6 +63,7 @@ void json_object::print(json_stream& out) const
 };
 
 // --------------------------------------------------------------
+#ifndef JSON_ONLY
 void json_object::print(osc_stream& out) const
 {
 	const json_element* list = getKey (kOSCMarker);
@@ -97,5 +100,6 @@ void json_object::print(osc_stream& out) const
 		}
 	}
 }
+#endif
 
 } // end namespace

src/json/json_object.h

@@ -17,6 +17,7 @@
 
 #include <vector>
 #include "json_element.h"
+#include "export.h"
 
 namespace json
 {
@@ -27,7 +28,7 @@ class osc_stream;
 /*!
 	\brief a json object, as defined by the json spec (see http://json.org/)
 */
-class json_object
+class jsonexport json_object
 {
 	std::vector<const json_element*>	fElements;
 
@@ -43,8 +44,10 @@ class json_object
 
 		/// \brief print the element to the json stream (for indented output)
 		virtual void	print(json_stream& out) const;
+#ifndef JSON_ONLY
 		/// \brief print the element to the osc stream
 		virtual void	print(osc_stream& out) const;
+#endif
 		/// \brief print the element to the output stream
 		virtual void	print(std::ostream& out) const;
 };

src/json/json_stream.h

@@ -16,6 +16,7 @@
 #define json_stream__
 
 #include <ostream>
+#include "export.h"
 
 namespace json
 {
@@ -26,7 +27,7 @@ namespace json
 \brief to be used in place of std::endl
 	to provide indentation of the json output.
 */
-class json_endl {
+class jsonexport json_endl {
 	private:
 		int fIndent;
 	public:
@@ -51,7 +52,7 @@ inline std::ostream& operator<< (std::ostream& os, const json_endl& eol) { eol.p
 \internal
 \brief a stream that embed a special endl for output formatting
 */
-class json_stream {
+class jsonexport json_stream {
 	std::ostream&	fStream;
 	json_endl		fEndl;
 	public:
@@ -63,8 +64,8 @@ class json_stream {
 			  json_endl& nl()				{ return fEndl; }
 };
 
-class json_array;
-class json_object;
+class jsonexport json_array;
+class jsonexport json_object;
 /// \private
 json_stream& operator<< (json_stream& os, const json_object* obj);
 /// \private

src/json/json_value.cpp

@@ -25,12 +25,16 @@ namespace json
 //--------------------------------------------------------------------------
 json_object_value::~json_object_value()					{ delete fValue; }
 void json_object_value::print(json_stream& out) const	{ out << fValue; }
+#ifndef JSON_ONLY
 void json_object_value::print(osc_stream& out) const	{ fValue->print(out); }
+#endif
 
 //--------------------------------------------------------------------------
 json_array_value::~json_array_value()					{ delete fValue; }
 void json_array_value::print(json_stream& out) const	{ out << fValue; }
+#ifndef JSON_ONLY
 void json_array_value::print(osc_stream& out) const		{ fValue->print(out); }
+#endif
 
 
 //--------------------------------------------------------------------------