Wip/include rework 2

aravis/arv.h

@@ -0,0 +1,132 @@
+/* Aravis - Digital camera library
+ *
+ * Copyright © 2009-2025 Emmanuel Pacaud <emmanuel.pacaud@free.fr>
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr>
+ */
+
+#ifndef ARV_H
+#define ARV_H
+
+#define ARV_H_INSIDE
+
+#include <aravis/arvtypes.h>
+
+#include <aravis/arvbuffer.h>
+#include <aravis/arvcamera.h>
+#include <aravis/arvchunkparser.h>
+#include <aravis/arvdebug.h>
+#include <aravis/arvdevice.h>
+
+#include <aravis/arvdomcharacterdata.h>
+#include <aravis/arvdomdocumentfragment.h>
+#include <aravis/arvdomdocument.h>
+#include <aravis/arvdomelement.h>
+#include <aravis/arvdomimplementation.h>
+#include <aravis/arvdomnamednodemap.h>
+#include <aravis/arvdomnode.h>
+#include <aravis/arvdomnodelist.h>
+#include <aravis/arvdomnodechildlist.h>
+#include <aravis/arvdomparser.h>
+#include <aravis/arvdomtext.h>
+
+#include <aravis/arvenums.h>
+#include <aravis/arvevaluator.h>
+
+#include <aravis/arvfakecamera.h>
+#include <aravis/arvfakedevice.h>
+#include <aravis/arvfakeinterface.h>
+#include <aravis/arvfakestream.h>
+
+#include <aravis/arvfeatures.h>
+
+#include <aravis/arvgc.h>
+#include <aravis/arvgcboolean.h>
+#include <aravis/arvgccategory.h>
+#include <aravis/arvgccommand.h>
+#include <aravis/arvgcconverter.h>
+#include <aravis/arvgcconverternode.h>
+#include <aravis/arvgcenumentry.h>
+#include <aravis/arvgcenumeration.h>
+#include <aravis/arvgcenums.h>
+#include <aravis/arvgcfeaturenode.h>
+#include <aravis/arvgcfloat.h>
+#include <aravis/arvgcfloatnode.h>
+#include <aravis/arvgcfloatregnode.h>
+#include <aravis/arvgcgroupnode.h>
+#include <aravis/arvgcindexnode.h>
+#include <aravis/arvgcintconverternode.h>
+#include <aravis/arvgcinteger.h>
+#include <aravis/arvgcintegernode.h>
+#include <aravis/arvgcintregnode.h>
+#include <aravis/arvgcintswissknifenode.h>
+#include <aravis/arvgcinvalidatornode.h>
+#include <aravis/arvgcnode.h>
+#include <aravis/arvgcmaskedintregnode.h>
+#include <aravis/arvgcport.h>
+#include <aravis/arvgcpropertynode.h>
+#include <aravis/arvgcregisterdescriptionnode.h>
+#include <aravis/arvgcregister.h>
+#include <aravis/arvgcregisternode.h>
+#include <aravis/arvgcselector.h>
+#include <aravis/arvgcstring.h>
+#include <aravis/arvgcstringnode.h>
+#include <aravis/arvgcstringregnode.h>
+#include <aravis/arvgcstructregnode.h>
+#include <aravis/arvgcstructentrynode.h>
+#include <aravis/arvgcswissknife.h>
+#include <aravis/arvgcswissknifenode.h>
+#include <aravis/arvgcvalueindexednode.h>
+
+#include <aravis/arvgvdevice.h>
+#include <aravis/arvgvfakecamera.h>
+#include <aravis/arvgvinterface.h>
+#include <aravis/arvgvstream.h>
+
+#include <aravis/arvgentlsystem.h>
+#include <aravis/arvgentlinterface.h>
+#include <aravis/arvgentldevice.h>
+#include <aravis/arvgentlstream.h>
+
+#include <aravis/arvinterface.h>
+#include <aravis/arvmisc.h>
+#include <aravis/arvnetwork.h>
+#include <aravis/arvrealtime.h>
+#include <aravis/arvstream.h>
+#include <aravis/arvstr.h>
+#include <aravis/arvsystem.h>
+
+#if ARAVIS_HAS_USB
+#include <aravis/arvuvinterface.h>
+#include <aravis/arvuvdevice.h>
+#include <aravis/arvuvstream.h>
+#endif
+
+#if ARAVIS_HAS_V4L2
+#include <aravis/arvv4l2interface.h>
+#include <aravis/arvv4l2device.h>
+#include <aravis/arvv4l2stream.h>
+#endif
+
+#include <aravis/arvversion.h>
+#include <aravis/arvzip.h>
+#include <aravis/arvxmlschema.h>
+
+#undef ARV_H_INSIDE
+
+#endif

src/arvbuffer.c → aravis/arvbuffer.c

@@ -31,7 +31,7 @@
  * interest, pixel format and time stamp.
  */
 
-#include <arvbufferprivate.h>
+#include "arvbufferprivate.h"
 
 static gboolean
 arv_buffer_part_is_image (ArvBuffer *buffer, guint part_id)

src/arvbuffer.h → aravis/arvbuffer.h

@@ -27,8 +27,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
 
 G_BEGIN_DECLS
 

src/arvbufferprivate.h → aravis/arvbufferprivate.h

@@ -23,8 +23,8 @@
 #ifndef ARV_BUFFER_PRIVATE_H
 #define ARV_BUFFER_PRIVATE_H
 
-#include <arvbuffer.h>
-#include <arvgvspprivate.h>
+#include <aravis/arvbuffer.h>
+#include <aravis/arvgvspprivate.h>
 #include <stddef.h>
 
 G_BEGIN_DECLS

src/arvcamera.c → aravis/arvcamera.c

@@ -29,28 +29,28 @@
  * and [class@Aravis.Gc] for a more advanced use of the Aravis library.
  */
 
-#include <arvfeatures.h>
-#include <arvdebug.h>
-#include <arvcamera.h>
-#include <arvsystem.h>
-#include <arvgvinterface.h>
-#include <arvgcboolean.h>
-#include <arvgccommand.h>
-#include <arvgcinteger.h>
-#include <arvgcfloat.h>
-#include <arvgcenumeration.h>
-#include <arvgcenumentry.h>
-#include <arvgcregister.h>
-#include <arvgcstring.h>
-#include <arvbuffer.h>
-#include <arvgc.h>
-#include <arvgvdevice.h>
+#include "arvfeatures.h"
+#include "arvdebug.h"
+#include "arvcamera.h"
+#include "arvsystem.h"
+#include "arvgvinterface.h"
+#include "arvgcboolean.h"
+#include "arvgccommand.h"
+#include "arvgcinteger.h"
+#include "arvgcfloat.h"
+#include "arvgcenumeration.h"
+#include "arvgcenumentry.h"
+#include "arvgcregister.h"
+#include "arvgcstring.h"
+#include "arvbuffer.h"
+#include "arvgc.h"
+#include "arvgvdevice.h"
 #if ARAVIS_HAS_USB
-#include <arvuvdevice.h>
+#include "arvuvdevice.h"
 #endif
-#include <arvgentldeviceprivate.h>
-#include <arvenums.h>
-#include <arvstr.h>
+#include "arvgentldeviceprivate.h"
+#include "arvenums.h"
+#include "arvstr.h"
 
 static void arv_camera_get_integer_bounds_as_gint (ArvCamera *camera, const char *feature, gint *min, gint *max, GError **error);
 static void arv_camera_get_integer_bounds_as_guint (ArvCamera *camera, const char *feature, guint *min, guint *max, GError **error);

src/arvcamera.h → aravis/arvcamera.h

@@ -27,11 +27,11 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvstream.h>
-#include <arvgvstream.h>
-#include <arvgvdevice.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvstream.h>
+#include <aravis/arvgvstream.h>
+#include <aravis/arvgvdevice.h>
 
 G_BEGIN_DECLS
 

src/arvcameratest.c → aravis/arvcameratest.c

@@ -1,5 +1,5 @@
-#include <arvdebugprivate.h>
-#include <arvgvstreamprivate.h>
+#include "arvdebugprivate.h"
+#include "arvgvstreamprivate.h"
 #include <arv.h>
 #include <stdlib.h>
 #include <signal.h>

src/arvchunkparser.c → aravis/arvchunkparser.c

@@ -36,13 +36,13 @@
  * Here is an example of this API in use: [tests/arvchunkparsertest.c](https://github.com/AravisProject/aravis/blob/main/tests/arvchunkparsertest.c)
  */
 
-#include <arvchunkparserprivate.h>
-#include <arvbuffer.h>
-#include <arvgcinteger.h>
-#include <arvgcfloat.h>
-#include <arvgcstring.h>
-#include <arvgcboolean.h>
-#include <arvdebugprivate.h>
+#include "arvchunkparserprivate.h"
+#include "arvbuffer.h"
+#include "arvgcinteger.h"
+#include "arvgcfloat.h"
+#include "arvgcstring.h"
+#include "arvgcboolean.h"
+#include "arvdebugprivate.h"
 
 enum {
 	ARV_CHUNK_PARSER_PROPERTY_0,

src/arvchunkparser.h → aravis/arvchunkparser.h

@@ -27,9 +27,9 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvtypes.h>
-#include <arvgc.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvgc.h>
 
 G_BEGIN_DECLS
 

src/arvchunkparserprivate.h → aravis/arvchunkparserprivate.h

@@ -27,7 +27,7 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvchunkparser.h>
+#include <aravis/arvchunkparser.h>
 
 G_BEGIN_DECLS
 

src/arvdebug.c → aravis/arvdebug.c

@@ -26,9 +26,9 @@
 
 #include <glib/gprintf.h>
 #include <stdlib.h>
-#include <arvdebugprivate.h>
-#include <arvenumtypesprivate.h>
-#include <arvmiscprivate.h>
+#include "arvdebugprivate.h"
+#include "arvenumtypesprivate.h"
+#include "arvmiscprivate.h"
 
 #ifdef _MSC_VER
 #define STDERR_FILENO _fileno(stderr)

src/arvdebug.h → aravis/arvdebug.h

@@ -28,7 +28,7 @@
 #endif
 
 #include <glib.h>
-#include <arvapi.h>
+#include <aravis/arvapi.h>
 
 G_BEGIN_DECLS
 

src/arvdebugprivate.h → aravis/arvdebugprivate.h

@@ -23,7 +23,7 @@
 #ifndef ARV_DEBUG_PRIVATE_H
 #define ARV_DEBUG_PRIVATE_H
 
-#include <arvdebug.h>
+#include <aravis/arvdebug.h>
 
 G_BEGIN_DECLS
 

src/arvdevice.c → aravis/arvdevice.c

@@ -29,19 +29,19 @@
  * advanced uses.
  */
 
-#include <arvdevice.h>
-#include <arvdeviceprivate.h>
-#include <arvgc.h>
-#include <arvgccommand.h>
-#include <arvgcinteger.h>
-#include <arvgcfloat.h>
-#include <arvgcfeaturenode.h>
-#include <arvgcboolean.h>
-#include <arvgcenumeration.h>
-#include <arvgcregister.h>
-#include <arvgcstring.h>
-#include <arvstream.h>
-#include <arvdebug.h>
+#include "arvdevice.h"
+#include "arvdeviceprivate.h"
+#include "arvgc.h"
+#include "arvgccommand.h"
+#include "arvgcinteger.h"
+#include "arvgcfloat.h"
+#include "arvgcfeaturenode.h"
+#include "arvgcboolean.h"
+#include "arvgcenumeration.h"
+#include "arvgcregister.h"
+#include "arvgcstring.h"
+#include "arvstream.h"
+#include "arvdebug.h"
 
 enum {
 	ARV_DEVICE_SIGNAL_CONTROL_LOST,

src/arvdevice.h → aravis/arvdevice.h

@@ -27,11 +27,11 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvgcenums.h>
-#include <arvtypes.h>
-#include <arvstream.h>
-#include <arvchunkparser.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvgcenums.h>
+#include <aravis/arvtypes.h>
+#include <aravis/arvstream.h>
+#include <aravis/arvchunkparser.h>
 
 G_BEGIN_DECLS
 

src/arvdeviceprivate.h → aravis/arvdeviceprivate.h

@@ -27,7 +27,7 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvdevice.h>
+#include <aravis/arvdevice.h>
 
 G_BEGIN_DECLS
 

src/arvdomcharacterdata.c → aravis/arvdomcharacterdata.c

@@ -26,8 +26,8 @@
  * @short_description: Base class for DOM character data nodes
  */
 
-#include <arvdomcharacterdata.h>
-#include <arvdebugprivate.h>
+#include "arvdomcharacterdata.h"
+#include "arvdebugprivate.h"
 #include <string.h>
 
 typedef struct {

src/arvdomcharacterdata.h → aravis/arvdomcharacterdata.h

@@ -28,8 +28,8 @@
 #error "Only <arv.h> can be included directly."
 #endif
 
-#include <arvapi.h>
-#include <arvdomnode.h>
+#include <aravis/arvapi.h>
+#include <aravis/arvdomnode.h>
 
 G_BEGIN_DECLS