src -> pinos and fix include paths

Rename src to pinos and fix all the include paths so that they contain
pinos/ to avoid conflicts

Makefile.am

@@ -24,9 +24,9 @@ EXTRA_DIST = \
 	PROTOCOL \
 	README 
 
-SUBDIRS = src man po
+SUBDIRS = pinos man po
 
-DIST_SUBDIRS = src man po
+DIST_SUBDIRS = pinos man po
 
 MAINTAINERCLEANFILES =
 noinst_DATA =

configure.ac

@@ -1,7 +1,7 @@
 AC_PREREQ(2.63)
 
 AC_INIT(pinos, 0.1)
-AC_CONFIG_SRCDIR([src/daemon/main.c])
+AC_CONFIG_SRCDIR([pinos/daemon/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -116,8 +116,8 @@ AS_CASE([" $CFLAGS "], [*" -O0 "*], [], [
 # Check whether the linker supports the -version-script option.
 # The Make variable $(srcdir) needs to be in the LDFLAGS in that form,
 # so that it is expanded the right way in every subdir.
-AX_CHECK_LINK_FLAG(["-Wl,-version-script=${srcdir}/src/map-file"],
-    [VERSIONING_LDFLAGS='-Wl,-version-script=$(abs_top_srcdir)/src/map-file'])
+AX_CHECK_LINK_FLAG(["-Wl,-version-script=${srcdir}/pinos/map-file"],
+    [VERSIONING_LDFLAGS='-Wl,-version-script=$(abs_top_srcdir)/pinos/map-file'])
 AC_SUBST([VERSIONING_LDFLAGS])
 
 # Use immediate (now) bindings; avoids the funky re-call in itself.
@@ -241,7 +241,7 @@ dnl *** output files ***
 dnl keep this alphabetic per directory, please
 AC_CONFIG_FILES([
 Makefile
-src/Makefile
+pinos/Makefile
 man/Makefile
 man/pinos.1.xml
 man/pinos-monitor.1.xml

pinos/Makefile.am

@@ -30,9 +30,9 @@ dbuspolicydir=$(sysconfdir)/dbus-1/system.d
 ###################################
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/modules \
-	-I$(top_builddir)/src/modules \
+	-I$(top_srcdir)/ \
+	-I$(top_srcdir)/pinos/modules \
+	-I$(top_builddir)/pinos/modules \
 	-DPINOS_SRCDIR=\"$(abs_srcdir)\" \
 	-DPINOS_BUILDDIR=\"$(abs_builddir)\"
 AM_CFLAGS = $(GLIB_CFLAGS) $(GST_CFLAGS)
@@ -82,7 +82,7 @@ client/enumtypes.h: $(enumtypesincludes)
 
 client/enumtypes.c: $(enumtypesincludes) client/enumtypes.h
 	$(AM_V_GEN)$(GLIB_MKENUMS) \
-	--fhead "#include \"enumtypes.h\"\n#include <client/pinos.h>\n#define C_ENUM(v) ((gint) v)\n#define C_FLAGS(v) ((guint) v)\n " \
+	--fhead "#include \"enumtypes.h\"\n#include <pinos/client/pinos.h>\n#define C_ENUM(v) ((gint) v)\n#define C_FLAGS(v) ((guint) v)\n " \
 	--fprod "\n/* enumerations from \"@filename@\" */" \
 	--vhead "GType\n@enum_name@_get_type (void)\n{\n  static gsize id = 0;\n  static const G@Type@Value values[] = {"     \
 	--vprod "    { C_@TYPE@(@VALUENAME@), \"@VALUENAME@\", \"@valuenick@\" }," \
@@ -133,7 +133,7 @@ TESTS_default =
 TESTS_norun = test-client
 
 # These tests need a running pinos daemon
-TESTS_daemon = 
+TESTS_daemon =
 
 noinst_PROGRAMS = $(TESTS_default) $(TESTS_norun) $(TESTS_daemon)
 
@@ -246,7 +246,7 @@ noinst_HEADERS = gst/gstpinossrc.h gst/gstpinossink.h gst/gstpinospay.h \
 ###################################
 
 CLEANFILES += daemon/pinos.desktop
-DISTCLEANFILES = 
+DISTCLEANFILES =
 
 install-exec-hook:
 	rm -f $(DESTDIR)$(modlibexecdir)/*.la

pinos/client/buffer.c

@@ -23,10 +23,10 @@
 #include <gio/gio.h>
 #include <gio/gunixfdmessage.h>
 
-#include "client/properties.h"
-#include "client/context.h"
-#include "client/buffer.h"
-#include "client/private.h"
+#include "pinos/client/properties.h"
+#include "pinos/client/context.h"
+#include "pinos/client/buffer.h"
+#include "pinos/client/private.h"
 
 G_STATIC_ASSERT (sizeof (PinosStackBuffer) <= sizeof (PinosBuffer));
 

pinos/client/buffer.h

@@ -217,4 +217,3 @@ gboolean           pinos_buffer_builder_add_property_change (PinosBufferBuilder
 
 
 #endif /* __PINOS_BUFFER_H__ */
-

pinos/client/context.c

@@ -17,13 +17,13 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "client/pinos.h"
+#include "pinos/client/pinos.h"
 
-#include "client/context.h"
-#include "client/enumtypes.h"
-#include "client/subscribe.h"
+#include "pinos/client/context.h"
+#include "pinos/client/enumtypes.h"
+#include "pinos/client/subscribe.h"
 
-#include "client/private.h"
+#include "pinos/client/private.h"
 
 #define PINOS_CONTEXT_GET_PRIVATE(obj)  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), PINOS_TYPE_CONTEXT, PinosContextPrivate))

pinos/client/context.h

@@ -22,8 +22,8 @@
 
 #include <glib-object.h>
 
-#include <client/subscribe.h>
-#include <client/properties.h>
+#include <pinos/client/subscribe.h>
+#include <pinos/client/properties.h>
 
 G_BEGIN_DECLS
 
@@ -112,4 +112,3 @@ const GError *    pinos_context_get_error             (PinosContext *context);
 G_END_DECLS
 
 #endif /* __PINOS_CONTEXT_H__ */
-

pinos/client/introspect.c

@@ -19,13 +19,13 @@
 
 #include <string.h>
 
-#include "client/pinos.h"
+#include "pinos/client/pinos.h"
 
-#include "client/context.h"
-#include "client/enumtypes.h"
-#include "client/subscribe.h"
+#include "pinos/client/context.h"
+#include "pinos/client/enumtypes.h"
+#include "pinos/client/subscribe.h"
 
-#include "client/private.h"
+#include "pinos/client/private.h"
 
 /**
  * pinos_context_info_finish:
@@ -534,4 +534,3 @@ pinos_context_get_source_output_info_by_id (PinosContext *context,
   g_task_return_boolean (task, TRUE);
   g_object_unref (task);
 }
-

pinos/client/introspect.h

@@ -23,8 +23,8 @@
 #include <gio/gio.h>
 #include <glib-object.h>
 
-#include <client/context.h>
-#include <client/properties.h>
+#include <pinos/client/context.h>
+#include <pinos/client/properties.h>
 
 G_BEGIN_DECLS
 
@@ -311,4 +311,3 @@ void            pinos_context_get_source_output_info_by_id (PinosContext *contex
 G_END_DECLS
 
 #endif /* __PINOS_INTROSPECT_H__ */
-

pinos/client/mainloop.h

@@ -82,4 +82,3 @@ gboolean         pinos_main_loop_in_thread       (PinosMainLoop *loop);
 G_END_DECLS
 
 #endif /* __PINOS_MAIN_LOOP_H__ */
-

pinos/client/pinos.c

@@ -19,7 +19,7 @@
 
 #include <gst/gst.h>
 
-#include "client/pinos.h"
+#include "pinos/client/pinos.h"
 
 /**
  * pinos_init:
@@ -92,4 +92,3 @@ pinos_fill_stream_properties (PinosProperties *properties)
 {
   g_return_if_fail (properties != NULL);
 }
-

pinos/client/pinos.h

@@ -20,13 +20,13 @@
 #ifndef __PINOS_H__
 #define __PINOS_H__
 
-#include <client/buffer.h>
-#include <client/context.h>
-#include <client/introspect.h>
-#include <client/mainloop.h>
-#include <client/properties.h>
-#include <client/stream.h>
-#include <client/subscribe.h>
+#include <pinos/client/buffer.h>
+#include <pinos/client/context.h>
+#include <pinos/client/introspect.h>
+#include <pinos/client/mainloop.h>
+#include <pinos/client/properties.h>
+#include <pinos/client/stream.h>
+#include <pinos/client/subscribe.h>
 
 #define PINOS_DBUS_SERVICE "org.pinos"
 #define PINOS_DBUS_OBJECT_PREFIX "/org/pinos"

pinos/client/private.h

@@ -73,4 +73,3 @@ typedef struct {
 #define PSB_MAGIC          ((gsize) 5493683301u)
 #define is_valid_buffer(b) (b != NULL && \
                             PSB(b)->magic == PSB_MAGIC)
-

pinos/client/properties.c

@@ -19,7 +19,7 @@
 
 #include <glib-object.h>
 
-#include "client/properties.h"
+#include "pinos/client/properties.h"
 
 struct _PinosProperties {
   GHashTable *hashtable;
@@ -308,4 +308,3 @@ pinos_properties_from_variant (GVariant *variant)
 
 G_DEFINE_BOXED_TYPE (PinosProperties, pinos_properties,
         pinos_properties_copy, pinos_properties_free);
-

pinos/client/properties.h

@@ -57,4 +57,3 @@ PinosProperties * pinos_properties_from_variant (GVariant *variant);
 G_END_DECLS
 
 #endif /* __PINOS_PROPERTIES_H__ */
-

pinos/client/stream.c

@@ -20,13 +20,13 @@
 #include <string.h>
 #include <gio/gunixfdlist.h>
 
-#include "server/daemon.h"
-#include "client/pinos.h"
-#include "client/context.h"
-#include "client/stream.h"
-#include "client/enumtypes.h"
+#include "pinos/server/daemon.h"
+#include "pinos/client/pinos.h"
+#include "pinos/client/context.h"
+#include "pinos/client/stream.h"
+#include "pinos/client/enumtypes.h"
 
-#include "client/private.h"
+#include "pinos/client/private.h"
 
 struct _PinosStreamPrivate
 {
@@ -1251,4 +1251,3 @@ send_error:
     return FALSE;
   }
 }
-

pinos/client/stream.h

@@ -22,8 +22,8 @@
 
 #include <glib-object.h>
 
-#include <client/buffer.h>
-#include <client/context.h>
+#include <pinos/client/buffer.h>
+#include <pinos/client/context.h>
 
 G_BEGIN_DECLS
 
@@ -113,4 +113,3 @@ gboolean         pinos_stream_send_buffer       (PinosStream     *stream,
 G_END_DECLS
 
 #endif /* __PINOS_STREAM_H__ */
-

pinos/client/subscribe.c

@@ -19,9 +19,9 @@
 
 #include <gio/gio.h>
 
-#include "client/pinos.h"
-#include "client/enumtypes.h"
-#include "client/private.h"
+#include "pinos/client/pinos.h"
+#include "pinos/client/enumtypes.h"
+#include "pinos/client/private.h"
 
 struct _PinosSubscribePrivate
 {
@@ -787,4 +787,3 @@ pinos_subscribe_get_proxy_finish (PinosSubscribe *subscribe,
 {
   return g_task_propagate_pointer (G_TASK (res), error);
 }
-

pinos/client/subscribe.h

@@ -90,4 +90,3 @@ GError *               pinos_subscribe_get_error          (PinosSubscribe *subsc
 G_END_DECLS
 
 #endif /* __PINOS_SUBSCRIBE_H__ */
-

pinos/gst/gstpinosdepay.c

@@ -203,4 +203,3 @@ gst_pinos_depay_init (GstPinosDepay * depay)
 
   depay->fd_allocator = gst_fd_allocator_new ();
 }
-

pinos/gst/gstpinosdeviceprovider.c

@@ -643,4 +643,3 @@ gst_pinos_device_provider_init (GstPinosDeviceProvider * self)
 {
   self->client_name = pinos_client_name ();
 }
-

pinos/gst/gsttmpfileallocator.c

@@ -142,4 +142,3 @@ gst_is_tmpfile_memory (GstMemory * mem)
 {
   return gst_memory_is_type (mem, GST_ALLOCATOR_TMPFILE);
 }
-

pinos/modules/gst/gst-manager.h

@@ -57,4 +57,3 @@ PinosGstManager * pinos_gst_manager_new                 (PinosDaemon *daemon);
 G_END_DECLS
 
 #endif /* __PINOS_GST_MANAGER_H__ */
-

pinos/modules/gst/gst-source.h

@@ -62,4 +62,3 @@ PinosSource *   pinos_gst_source_new             (PinosDaemon     *daemon,
 G_END_DECLS
 
 #endif /* __PINOS_GST_SOURCE_H__ */
-

pinos/server/client-source.c

@@ -21,8 +21,8 @@
 #include <gst/gst.h>
 #include <gio/gio.h>
 
-#include <server/daemon.h>
-#include <server/client-source.h>
+#include <pinos/server/daemon.h>
+#include <pinos/server/client-source.h>
 
 #define PINOS_CLIENT_SOURCE_GET_PRIVATE(obj)  \
      (G_TYPE_INSTANCE_GET_PRIVATE ((obj), PINOS_TYPE_CLIENT_SOURCE, PinosClientSourcePrivate))

pinos/server/client-source.h

@@ -28,7 +28,7 @@ typedef struct _PinosClientSource PinosClientSource;
 typedef struct _PinosClientSourceClass PinosClientSourceClass;
 typedef struct _PinosClientSourcePrivate PinosClientSourcePrivate;
 
-#include <server/source.h>
+#include <pinos/server/source.h>
 
 #define PINOS_TYPE_CLIENT_SOURCE                 (pinos_client_source_get_type ())
 #define PINOS_IS_CLIENT_SOURCE(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PINOS_TYPE_SOURCE))
@@ -75,4 +75,3 @@ PinosSourceOutput * pinos_client_source_get_source_input (PinosClientSource *sou
 G_END_DECLS
 
 #endif /* __PINOS_CLIENT_SOURCE_H__ */
-

pinos/server/client.c

@@ -18,14 +18,14 @@
  */
 
 #include <string.h>
-#include "client/pinos.h"
+#include "pinos/client/pinos.h"
 
-#include "client/enumtypes.h"
+#include "pinos/client/enumtypes.h"
 
-#include "server/client.h"
-#include "server/client-source.h"
+#include "pinos/server/client.h"
+#include "pinos/server/client-source.h"
 
-#include "dbus/org-pinos.h"
+#include "pinos/dbus/org-pinos.h"
 
 struct _PinosClientPrivate
 {
@@ -531,4 +531,3 @@ pinos_client_get_object_path (PinosClient *client)
 
   return priv->object_path;
 }
-

pinos/server/client.h

@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 
-#include <server/daemon.h>
+#include <pinos/server/daemon.h>
 
 G_BEGIN_DECLS
 
@@ -73,4 +73,3 @@ const gchar *   pinos_client_get_object_path      (PinosClient *client);
 G_END_DECLS
 
 #endif /* __PINOS_CLIENT_H__ */
-

pinos/server/daemon.c

@@ -21,12 +21,12 @@
 
 #include "config.h"
 
-#include "client/pinos.h"
+#include "pinos/client/pinos.h"
 
-#include "server/daemon.h"
-#include "server/client.h"
+#include "pinos/server/daemon.h"
+#include "pinos/server/client.h"
 
-#include "dbus/org-pinos.h"
+#include "pinos/dbus/org-pinos.h"
 
 #define PINOS_DAEMON_GET_PRIVATE(obj)  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), PINOS_TYPE_DAEMON, PinosDaemonPrivate))
@@ -512,4 +512,3 @@ pinos_daemon_init (PinosDaemon * daemon)
   priv->server_manager = g_dbus_object_manager_server_new (PINOS_DBUS_OBJECT_PREFIX);
   priv->senders = g_hash_table_new (g_str_hash, g_str_equal);
 }
-

pinos/server/daemon.h

@@ -37,8 +37,8 @@ typedef struct _PinosDaemon PinosDaemon;
 typedef struct _PinosDaemonClass PinosDaemonClass;
 typedef struct _PinosDaemonPrivate PinosDaemonPrivate;
 
-#include <server/source.h>
-#include <client/properties.h>
+#include <pinos/server/source.h>
+#include <pinos/client/properties.h>
 
 /**
  * PinosDaemon:
@@ -82,4 +82,3 @@ PinosSource *     pinos_daemon_find_source       (PinosDaemon     *daemon,
 G_END_DECLS
 
 #endif /* __PINOS_DAEMON_H__ */
-

pinos/server/source-output.c

@@ -22,12 +22,12 @@
 
 #include <gio/gunixfdlist.h>
 
-#include "client/enumtypes.h"
+#include "pinos/client/enumtypes.h"
 
-#include "server/daemon.h"
-#include "server/source-output.h"
+#include "pinos/server/daemon.h"
+#include "pinos/server/source-output.h"
 
-#include "dbus/org-pinos.h"
+#include "pinos/dbus/org-pinos.h"
 
 struct _PinosSourceOutputPrivate
 {
@@ -506,4 +506,3 @@ pinos_source_output_get_object_path (PinosSourceOutput *output)
 
   return priv->object_path;
 }
-

pinos/server/source-output.h

@@ -67,4 +67,3 @@ const gchar *      pinos_source_output_get_object_path      (PinosSourceOutput *
 G_END_DECLS
 
 #endif /* __PINOS_SOURCE_OUTPUT_H__ */
-

pinos/server/source.c

@@ -19,13 +19,13 @@
 
 #include <gio/gio.h>
 
-#include "client/pinos.h"
-#include "client/enumtypes.h"
+#include "pinos/client/pinos.h"
+#include "pinos/client/enumtypes.h"
 
-#include "server/source.h"
-#include "server/daemon.h"
+#include "pinos/server/source.h"
+#include "pinos/server/daemon.h"
 
-#include "dbus/org-pinos.h"
+#include "pinos/dbus/org-pinos.h"
 
 
 #define PINOS_SOURCE_GET_PRIVATE(obj)  \
@@ -579,4 +579,3 @@ pinos_source_get_object_path (PinosSource *source)
 
  return priv->object_path;
 }
-

pinos/server/source.h

@@ -28,8 +28,8 @@ typedef struct _PinosSource PinosSource;
 typedef struct _PinosSourceClass PinosSourceClass;
 typedef struct _PinosSourcePrivate PinosSourcePrivate;
 
-#include <client/introspect.h>
-#include <server/source-output.h>
+#include <pinos/client/introspect.h>
+#include <pinos/server/source-output.h>
 
 #define PINOS_TYPE_SOURCE                 (pinos_source_get_type ())
 #define PINOS_IS_SOURCE(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PINOS_TYPE_SOURCE))
@@ -108,4 +108,3 @@ gboolean            pinos_source_release_source_output   (PinosSource       *sou
 G_END_DECLS
 
 #endif /* __PINOS_SOURCE_H__ */
-

pkgconfig/libpinos.pc.in

@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/pinos
+includedir=@includedir@/
 modlibexecdir=@modlibexecdir@
 
 Name: libpinos