diff --git a/Makefile.am b/Makefile.am index 7f4928d4e..f5c2de2cd 100644 --- a/Makefile.am +++ b/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 = diff --git a/configure.ac b/configure.ac index 0a5ce9273..14fedf3ec 100644 --- a/configure.ac +++ b/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 diff --git a/src/.gitignore b/pinos/.gitignore similarity index 100% rename from src/.gitignore rename to pinos/.gitignore diff --git a/src/Makefile.am b/pinos/Makefile.am similarity index 97% rename from src/Makefile.am rename to pinos/Makefile.am index 1c9fa4fa5..1027e546b 100644 --- a/src/Makefile.am +++ b/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 \n#define C_ENUM(v) ((gint) v)\n#define C_FLAGS(v) ((guint) v)\n " \ + --fhead "#include \"enumtypes.h\"\n#include \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 diff --git a/src/client/.gitignore b/pinos/client/.gitignore similarity index 100% rename from src/client/.gitignore rename to pinos/client/.gitignore diff --git a/src/client/buffer.c b/pinos/client/buffer.c similarity index 99% rename from src/client/buffer.c rename to pinos/client/buffer.c index d24041eae..eb7b96064 100644 --- a/src/client/buffer.c +++ b/pinos/client/buffer.c @@ -23,10 +23,10 @@ #include #include -#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)); diff --git a/src/client/buffer.h b/pinos/client/buffer.h similarity index 99% rename from src/client/buffer.h rename to pinos/client/buffer.h index 03dc08cc1..72d9bdfe8 100644 --- a/src/client/buffer.h +++ b/pinos/client/buffer.h @@ -217,4 +217,3 @@ gboolean pinos_buffer_builder_add_property_change (PinosBufferBuilder #endif /* __PINOS_BUFFER_H__ */ - diff --git a/src/client/context.c b/pinos/client/context.c similarity index 99% rename from src/client/context.c rename to pinos/client/context.c index 00e0ed85a..7e0498e0e 100644 --- a/src/client/context.c +++ b/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)) diff --git a/src/client/context.h b/pinos/client/context.h similarity index 98% rename from src/client/context.h rename to pinos/client/context.h index b9b5aa8a5..ec3a6ee61 100644 --- a/src/client/context.h +++ b/pinos/client/context.h @@ -22,8 +22,8 @@ #include -#include -#include +#include +#include G_BEGIN_DECLS @@ -112,4 +112,3 @@ const GError * pinos_context_get_error (PinosContext *context); G_END_DECLS #endif /* __PINOS_CONTEXT_H__ */ - diff --git a/src/client/introspect.c b/pinos/client/introspect.c similarity index 99% rename from src/client/introspect.c rename to pinos/client/introspect.c index 6c2cee505..c5b6ad962 100644 --- a/src/client/introspect.c +++ b/pinos/client/introspect.c @@ -19,13 +19,13 @@ #include -#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); } - diff --git a/src/client/introspect.h b/pinos/client/introspect.h similarity index 99% rename from src/client/introspect.h rename to pinos/client/introspect.h index 7f17901e2..e496b4f31 100644 --- a/src/client/introspect.h +++ b/pinos/client/introspect.h @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include 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__ */ - diff --git a/src/client/mainloop.c b/pinos/client/mainloop.c similarity index 100% rename from src/client/mainloop.c rename to pinos/client/mainloop.c diff --git a/src/client/mainloop.h b/pinos/client/mainloop.h similarity index 99% rename from src/client/mainloop.h rename to pinos/client/mainloop.h index 4d9d86ad9..e4cad87a4 100644 --- a/src/client/mainloop.h +++ b/pinos/client/mainloop.h @@ -82,4 +82,3 @@ gboolean pinos_main_loop_in_thread (PinosMainLoop *loop); G_END_DECLS #endif /* __PINOS_MAIN_LOOP_H__ */ - diff --git a/src/client/pinos.c b/pinos/client/pinos.c similarity index 98% rename from src/client/pinos.c rename to pinos/client/pinos.c index cb1c560f3..849161aa1 100644 --- a/src/client/pinos.c +++ b/pinos/client/pinos.c @@ -19,7 +19,7 @@ #include -#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); } - diff --git a/src/client/pinos.h b/pinos/client/pinos.h similarity index 85% rename from src/client/pinos.h rename to pinos/client/pinos.h index 1a87e6343..ffc1d5076 100644 --- a/src/client/pinos.h +++ b/pinos/client/pinos.h @@ -20,13 +20,13 @@ #ifndef __PINOS_H__ #define __PINOS_H__ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #define PINOS_DBUS_SERVICE "org.pinos" #define PINOS_DBUS_OBJECT_PREFIX "/org/pinos" diff --git a/src/client/private.h b/pinos/client/private.h similarity index 99% rename from src/client/private.h rename to pinos/client/private.h index 3d23f97ba..8f60ba8b2 100644 --- a/src/client/private.h +++ b/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) - diff --git a/src/client/properties.c b/pinos/client/properties.c similarity index 99% rename from src/client/properties.c rename to pinos/client/properties.c index 40c3a8439..48d3eeeb3 100644 --- a/src/client/properties.c +++ b/pinos/client/properties.c @@ -19,7 +19,7 @@ #include -#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); - diff --git a/src/client/properties.h b/pinos/client/properties.h similarity index 99% rename from src/client/properties.h rename to pinos/client/properties.h index 6297c6717..3b3976477 100644 --- a/src/client/properties.h +++ b/pinos/client/properties.h @@ -57,4 +57,3 @@ PinosProperties * pinos_properties_from_variant (GVariant *variant); G_END_DECLS #endif /* __PINOS_PROPERTIES_H__ */ - diff --git a/src/client/stream.c b/pinos/client/stream.c similarity index 99% rename from src/client/stream.c rename to pinos/client/stream.c index a8ebfe3f3..5146e4585 100644 --- a/src/client/stream.c +++ b/pinos/client/stream.c @@ -20,13 +20,13 @@ #include #include -#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; } } - diff --git a/src/client/stream.h b/pinos/client/stream.h similarity index 98% rename from src/client/stream.h rename to pinos/client/stream.h index 0a42a29ea..4332a9278 100644 --- a/src/client/stream.h +++ b/pinos/client/stream.h @@ -22,8 +22,8 @@ #include -#include -#include +#include +#include G_BEGIN_DECLS @@ -113,4 +113,3 @@ gboolean pinos_stream_send_buffer (PinosStream *stream, G_END_DECLS #endif /* __PINOS_STREAM_H__ */ - diff --git a/src/client/subscribe.c b/pinos/client/subscribe.c similarity index 99% rename from src/client/subscribe.c rename to pinos/client/subscribe.c index 6f581eeb2..71db7db87 100644 --- a/src/client/subscribe.c +++ b/pinos/client/subscribe.c @@ -19,9 +19,9 @@ #include -#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); } - diff --git a/src/client/subscribe.h b/pinos/client/subscribe.h similarity index 99% rename from src/client/subscribe.h rename to pinos/client/subscribe.h index 3a6a105ac..a62172fb4 100644 --- a/src/client/subscribe.h +++ b/pinos/client/subscribe.h @@ -90,4 +90,3 @@ GError * pinos_subscribe_get_error (PinosSubscribe *subsc G_END_DECLS #endif /* __PINOS_SUBSCRIBE_H__ */ - diff --git a/src/daemon/main.c b/pinos/daemon/main.c similarity index 100% rename from src/daemon/main.c rename to pinos/daemon/main.c diff --git a/src/daemon/pinos-system.conf b/pinos/daemon/pinos-system.conf similarity index 100% rename from src/daemon/pinos-system.conf rename to pinos/daemon/pinos-system.conf diff --git a/src/daemon/pinos.desktop.in b/pinos/daemon/pinos.desktop.in similarity index 100% rename from src/daemon/pinos.desktop.in rename to pinos/daemon/pinos.desktop.in diff --git a/src/dbus/.gitignore b/pinos/dbus/.gitignore similarity index 100% rename from src/dbus/.gitignore rename to pinos/dbus/.gitignore diff --git a/src/dbus/org.pinos.xml b/pinos/dbus/org.pinos.xml similarity index 100% rename from src/dbus/org.pinos.xml rename to pinos/dbus/org.pinos.xml diff --git a/src/gst/gstpinos.c b/pinos/gst/gstpinos.c similarity index 100% rename from src/gst/gstpinos.c rename to pinos/gst/gstpinos.c diff --git a/src/gst/gstpinosdepay.c b/pinos/gst/gstpinosdepay.c similarity index 99% rename from src/gst/gstpinosdepay.c rename to pinos/gst/gstpinosdepay.c index 41ed8739b..8ef2963ad 100644 --- a/src/gst/gstpinosdepay.c +++ b/pinos/gst/gstpinosdepay.c @@ -203,4 +203,3 @@ gst_pinos_depay_init (GstPinosDepay * depay) depay->fd_allocator = gst_fd_allocator_new (); } - diff --git a/src/gst/gstpinosdepay.h b/pinos/gst/gstpinosdepay.h similarity index 100% rename from src/gst/gstpinosdepay.h rename to pinos/gst/gstpinosdepay.h diff --git a/src/gst/gstpinosdeviceprovider.c b/pinos/gst/gstpinosdeviceprovider.c similarity index 99% rename from src/gst/gstpinosdeviceprovider.c rename to pinos/gst/gstpinosdeviceprovider.c index 3d6d00a27..fd1a13441 100644 --- a/src/gst/gstpinosdeviceprovider.c +++ b/pinos/gst/gstpinosdeviceprovider.c @@ -643,4 +643,3 @@ gst_pinos_device_provider_init (GstPinosDeviceProvider * self) { self->client_name = pinos_client_name (); } - diff --git a/src/gst/gstpinosdeviceprovider.h b/pinos/gst/gstpinosdeviceprovider.h similarity index 100% rename from src/gst/gstpinosdeviceprovider.h rename to pinos/gst/gstpinosdeviceprovider.h diff --git a/src/gst/gstpinospay.c b/pinos/gst/gstpinospay.c similarity index 100% rename from src/gst/gstpinospay.c rename to pinos/gst/gstpinospay.c diff --git a/src/gst/gstpinospay.h b/pinos/gst/gstpinospay.h similarity index 100% rename from src/gst/gstpinospay.h rename to pinos/gst/gstpinospay.h diff --git a/src/gst/gstpinossink.c b/pinos/gst/gstpinossink.c similarity index 100% rename from src/gst/gstpinossink.c rename to pinos/gst/gstpinossink.c diff --git a/src/gst/gstpinossink.h b/pinos/gst/gstpinossink.h similarity index 100% rename from src/gst/gstpinossink.h rename to pinos/gst/gstpinossink.h diff --git a/src/gst/gstpinossrc.c b/pinos/gst/gstpinossrc.c similarity index 100% rename from src/gst/gstpinossrc.c rename to pinos/gst/gstpinossrc.c diff --git a/src/gst/gstpinossrc.h b/pinos/gst/gstpinossrc.h similarity index 100% rename from src/gst/gstpinossrc.h rename to pinos/gst/gstpinossrc.h diff --git a/src/gst/gsttmpfileallocator.c b/pinos/gst/gsttmpfileallocator.c similarity index 99% rename from src/gst/gsttmpfileallocator.c rename to pinos/gst/gsttmpfileallocator.c index bcb31e134..0ee45de63 100644 --- a/src/gst/gsttmpfileallocator.c +++ b/pinos/gst/gsttmpfileallocator.c @@ -142,4 +142,3 @@ gst_is_tmpfile_memory (GstMemory * mem) { return gst_memory_is_type (mem, GST_ALLOCATOR_TMPFILE); } - diff --git a/src/gst/gsttmpfileallocator.h b/pinos/gst/gsttmpfileallocator.h similarity index 100% rename from src/gst/gsttmpfileallocator.h rename to pinos/gst/gsttmpfileallocator.h diff --git a/src/modules/gst/gst-manager.c b/pinos/modules/gst/gst-manager.c similarity index 100% rename from src/modules/gst/gst-manager.c rename to pinos/modules/gst/gst-manager.c diff --git a/src/modules/gst/gst-manager.h b/pinos/modules/gst/gst-manager.h similarity index 99% rename from src/modules/gst/gst-manager.h rename to pinos/modules/gst/gst-manager.h index d970094dc..f2172a066 100644 --- a/src/modules/gst/gst-manager.h +++ b/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__ */ - diff --git a/src/modules/gst/gst-source.c b/pinos/modules/gst/gst-source.c similarity index 100% rename from src/modules/gst/gst-source.c rename to pinos/modules/gst/gst-source.c diff --git a/src/modules/gst/gst-source.h b/pinos/modules/gst/gst-source.h similarity index 99% rename from src/modules/gst/gst-source.h rename to pinos/modules/gst/gst-source.h index 200d3fcbd..4c6ac92e6 100644 --- a/src/modules/gst/gst-source.h +++ b/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__ */ - diff --git a/src/server/client-source.c b/pinos/server/client-source.c similarity index 99% rename from src/server/client-source.c rename to pinos/server/client-source.c index f2b78c30e..6bdb6bbab 100644 --- a/src/server/client-source.c +++ b/pinos/server/client-source.c @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include #define PINOS_CLIENT_SOURCE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE ((obj), PINOS_TYPE_CLIENT_SOURCE, PinosClientSourcePrivate)) diff --git a/src/server/client-source.h b/pinos/server/client-source.h similarity index 98% rename from src/server/client-source.h rename to pinos/server/client-source.h index 43aa19870..58f1e98e7 100644 --- a/src/server/client-source.h +++ b/pinos/server/client-source.h @@ -28,7 +28,7 @@ typedef struct _PinosClientSource PinosClientSource; typedef struct _PinosClientSourceClass PinosClientSourceClass; typedef struct _PinosClientSourcePrivate PinosClientSourcePrivate; -#include +#include #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__ */ - diff --git a/src/server/client.c b/pinos/server/client.c similarity index 98% rename from src/server/client.c rename to pinos/server/client.c index 9bf91f54a..d47d0e41e 100644 --- a/src/server/client.c +++ b/pinos/server/client.c @@ -18,14 +18,14 @@ */ #include -#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; } - diff --git a/src/server/client.h b/pinos/server/client.h similarity index 98% rename from src/server/client.h rename to pinos/server/client.h index 57450121b..8902af142 100644 --- a/src/server/client.h +++ b/pinos/server/client.h @@ -22,7 +22,7 @@ #include -#include +#include G_BEGIN_DECLS @@ -73,4 +73,3 @@ const gchar * pinos_client_get_object_path (PinosClient *client); G_END_DECLS #endif /* __PINOS_CLIENT_H__ */ - diff --git a/src/server/daemon.c b/pinos/server/daemon.c similarity index 99% rename from src/server/daemon.c rename to pinos/server/daemon.c index 933b63de0..7307c523f 100644 --- a/src/server/daemon.c +++ b/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); } - diff --git a/src/server/daemon.h b/pinos/server/daemon.h similarity index 97% rename from src/server/daemon.h rename to pinos/server/daemon.h index 0c0eb7630..07879ecbf 100644 --- a/src/server/daemon.h +++ b/pinos/server/daemon.h @@ -37,8 +37,8 @@ typedef struct _PinosDaemon PinosDaemon; typedef struct _PinosDaemonClass PinosDaemonClass; typedef struct _PinosDaemonPrivate PinosDaemonPrivate; -#include -#include +#include +#include /** * PinosDaemon: @@ -82,4 +82,3 @@ PinosSource * pinos_daemon_find_source (PinosDaemon *daemon, G_END_DECLS #endif /* __PINOS_DAEMON_H__ */ - diff --git a/src/server/source-output.c b/pinos/server/source-output.c similarity index 99% rename from src/server/source-output.c rename to pinos/server/source-output.c index a4d5c1c0c..46008c3d4 100644 --- a/src/server/source-output.c +++ b/pinos/server/source-output.c @@ -22,12 +22,12 @@ #include -#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; } - diff --git a/src/server/source-output.h b/pinos/server/source-output.h similarity index 99% rename from src/server/source-output.h rename to pinos/server/source-output.h index 6c66fd4af..8115b0577 100644 --- a/src/server/source-output.h +++ b/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__ */ - diff --git a/src/server/source.c b/pinos/server/source.c similarity index 99% rename from src/server/source.c rename to pinos/server/source.c index 2cbfdea56..a90c8ef43 100644 --- a/src/server/source.c +++ b/pinos/server/source.c @@ -19,13 +19,13 @@ #include -#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; } - diff --git a/src/server/source.h b/pinos/server/source.h similarity index 98% rename from src/server/source.h rename to pinos/server/source.h index cc107557c..0a19731e1 100644 --- a/src/server/source.h +++ b/pinos/server/source.h @@ -28,8 +28,8 @@ typedef struct _PinosSource PinosSource; typedef struct _PinosSourceClass PinosSourceClass; typedef struct _PinosSourcePrivate PinosSourcePrivate; -#include -#include +#include +#include #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__ */ - diff --git a/src/tests/test-client.c b/pinos/tests/test-client.c similarity index 100% rename from src/tests/test-client.c rename to pinos/tests/test-client.c diff --git a/src/tools/pinos-monitor.c b/pinos/tools/pinos-monitor.c similarity index 100% rename from src/tools/pinos-monitor.c rename to pinos/tools/pinos-monitor.c diff --git a/pkgconfig/libpinos.pc.in b/pkgconfig/libpinos.pc.in index 2aeda7186..466e34833 100644 --- a/pkgconfig/libpinos.pc.in +++ b/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