diff --git a/Makefile.am b/Makefile.am index d37ac5bed..4652b77e8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,17 +1,17 @@ -# This file is part of PulseAudio. +# This file is part of Pinos. # -# PulseAudio is free software; you can redistribute it and/or modify +# Pinos 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 of the License, or # (at your option) any later version. # -# PulseAudio is distributed in the hope that it will be useful, but +# Pinos 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 # General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with PulseAudio; if not, see . +# along with Pinos; if not, see . ACLOCAL_AMFLAGS = -I m4 @@ -34,7 +34,7 @@ MAINTAINERCLEANFILES = noinst_DATA = pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = pkgconfig/libpulsevideo.pc +pkgconfig_DATA = pkgconfig/libpinos.pc eolspace: find \( -name '*.c' -o -name '*.h' -o -name 'Makefile.am' \) -exec perl -i -pe 's/\s+\n$$/\1\n/;' \{\} \; @@ -43,7 +43,7 @@ untabify: find \( -name '*.c' -o -name '*.h' \) -exec perl -i -pe 's/\t/ /g;' \{\} \; fedora-snapshot: dist - cp $(distdir).tar.gz $$HOME/git.fedora/pulseaudio/$(distdir).tar.gz + cp $(distdir).tar.gz $$HOME/git.fedora/pinos/$(distdir).tar.gz dist-hook: echo $(VERSION) > $(distdir)/.tarball-version diff --git a/NEWS b/NEWS index b18c4e8b7..c965a018a 100644 --- a/NEWS +++ b/NEWS @@ -1 +1 @@ -PulseVideo 0.1 +Pinos 0.1 diff --git a/README b/README index f215d64ba..6dcbbb52f 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ -Pulsevideo ----------- +Pinos +----- -Pulsevideo is a user space API to deal with video. This includes: +Pinos is a user space API to deal with video. This includes: - Make availabe sources of video (such as from a capture devices or application provided streams) diff --git a/autogen.sh b/autogen.sh index 2b6f1d546..416877e9f 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,19 +1,19 @@ #!/bin/sh -# This file is part of PulseVideo +# This file is part of Pinos # -# PulseAudio is free software; you can redistribute it and/or modify it +# Pinos 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 of the License, or # (at your option) any later version. # -# PulseAudio is distributed in the hope that it will be useful, but +# Pinos 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 # General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with PulseAudio; if not, see . +# along with Pinos; if not, see . # Only there to make jhbuild happy diff --git a/bootstrap.sh b/bootstrap.sh index 0bb5e3ac7..d9c64907b 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,19 +1,19 @@ #!/usr/bin/env bash -# This file is part of PulseVideo +# This file is part of Pinos # -# PulseAudio is free software; you can redistribute it and/or modify it +# Pinos 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 of the License, or # (at your option) any later version. # -# PulseAudio is distributed in the hope that it will be useful, but +# Pinos 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 # General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with PulseAudio; if not, see . +# along with Pinos; if not, see . case $(uname) in *Darwin*) diff --git a/configure.ac b/configure.ac index cd28f6140..7db05678e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.63) -AC_INIT(pulsevideo, 0.1) +AC_INIT(pinos, 0.1) AC_CONFIG_SRCDIR([src/daemon/main.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) @@ -23,7 +23,7 @@ AC_SUBST(PV_PROTOCOL_VERSION, 0) # The stable ABI for client applications, for the version info x:y:z # always will hold y=z -AC_SUBST(LIBPULSE_VERSION_INFO, [0:0:0]) +AC_SUBST(LIBPINOS_VERSION_INFO, [0:0:0]) dnl sets host_* variables AC_CANONICAL_HOST @@ -217,7 +217,7 @@ dnl keep this alphabetic per directory, please AC_CONFIG_FILES([ Makefile src/Makefile -pkgconfig/libpulsevideo.pc +pkgconfig/libpinos.pc ]) AC_OUTPUT @@ -229,5 +229,5 @@ Configuration Prefix : ${prefix} Compiler : ${CC} -pulsevideo configured. Type 'make' to build. +pinos configured. Type 'make' to build. " diff --git a/doc/.gitignore b/doc/.gitignore index e1d0f0485..2fcf77a7d 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -1 +1 @@ -org-pulsevideo-*.xml +org-pinos-*.xml diff --git a/pkgconfig/libpulsevideo.pc.in b/pkgconfig/libpinos.pc.in similarity index 62% rename from pkgconfig/libpulsevideo.pc.in rename to pkgconfig/libpinos.pc.in index 62bd0a316..e0c621777 100644 --- a/pkgconfig/libpulsevideo.pc.in +++ b/pkgconfig/libpinos.pc.in @@ -4,8 +4,8 @@ libdir=@libdir@ includedir=@includedir@ modlibexecdir=@modlibexecdir@ -Name: libpulsevideo -Description: PulseVideo Client Interface +Name: libpinos +Description: Pinos Client Interface Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -lpulsevideo @PTHREAD_LIBS@ +Libs: -L${libdir} -lpinos @PTHREAD_LIBS@ Cflags: -I${includedir} -D_REENTRANT diff --git a/pkgconfig/libpulsevideo.pc b/pkgconfig/libpulsevideo.pc deleted file mode 100644 index feb5b871b..000000000 --- a/pkgconfig/libpulsevideo.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/mnt/d00b721c-6d2d-4050-8d52-431da51984ef/home/wim/src/gnome/prefix -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include -modlibexecdir=@modlibexecdir@ - -Name: libpulsevideo -Description: PulseVideo Client Interface -Version: 0.1 -Libs: -L${libdir} -lpulsevideo @PTHREAD_LIBS@ -Cflags: -I${includedir} -D_REENTRANT diff --git a/src/.gitignore b/src/.gitignore index 22385a26f..cd3bd2086 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,3 +1,3 @@ -pulsevideo +pinos test-client test-subscribe diff --git a/src/Makefile.am b/src/Makefile.am index 2c2a75b4b..3374c1f75 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,27 +1,27 @@ -# This file is part of PulseVideo. +# This file is part of Pinos. # # Copyright 2015 Wim Taymans # -# PulseVideo is free software; you can redistribute it and/or modify +# Pinos 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 of the License, or # (at your option) any later version. # -# PulseVideo is distributed in the hope that it will be useful, but +# Pinos 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 # General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with PulseVideo; if not, see . +# along with Pinos; if not, see . ################################### # Extra directories # ################################### -pulsevideoincludedir=$(includedir)/client -pulsevideoserverincludedir=$(includedir)/server -pulsevideolibexecdir=$(libexecdir)/client +pinosincludedir=$(includedir)/client +pinosserverincludedir=$(includedir)/server +pinoslibexecdir=$(libexecdir)/client dbuspolicydir=$(sysconfdir)/dbus-1/system.d ################################### @@ -36,7 +36,7 @@ AM_CPPFLAGS = \ -DPV_BUILDDIR=\"$(abs_builddir)\" AM_CFLAGS = $(GLIB_CFLAGS) $(GST_CFLAGS) AM_CXXFLAGS = $(AM_CFLAGS) -SERVER_CFLAGS = -D__INCLUDED_FROM_PULSE_VIDEO +SERVER_CFLAGS = -D__INCLUDED_FROM_PINOS AM_LIBADD = $(GLIB_LIBS) $(INTLLIBS) $(GST_LIBS) AM_LDADD = $(GLIB_LIBS) $(GST_LIBS) $(INTLLIBS) @@ -50,10 +50,10 @@ FOREIGN_CFLAGS = -w EXTRA_DIST = \ src/version.h.in \ - daemon/pulsevideo-system.conf + daemon/pinos-system.conf dbuspolicy_DATA = \ - daemon/pulsevideo-system.conf + daemon/pinos-system.conf ################################### # Includes # @@ -74,7 +74,7 @@ client/pv-enumtypes.h: $(enumtypesincludes) client/pv-enumtypes.c: $(enumtypesincludes) client/pv-enumtypes.h $(AM_V_GEN)$(GLIB_MKENUMS) \ - --fhead "#include \"pv-enumtypes.h\"\n#include \n#define C_ENUM(v) ((gint) v)\n#define C_FLAGS(v) ((guint) v)\n " \ + --fhead "#include \"pv-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@\" }," \ @@ -82,18 +82,18 @@ client/pv-enumtypes.c: $(enumtypesincludes) client/pv-enumtypes.h $^ > client/pv-enumtypes.c -dbus/org-pulsevideo.c: dbus/org-pulsevideo.h -dbus/org-pulsevideo.h: dbus/org.pulsevideo.xml +dbus/org-pinos.c: dbus/org-pinos.h +dbus/org-pinos.h: dbus/org.pinos.xml $(AM_V_GEN) $(GDBUS_CODEGEN) \ - --interface-prefix org.pulsevideo. \ - --generate-c-code dbus/org-pulsevideo \ - --generate-docbook ../doc/org-pulsevideo \ - --c-namespace Pv dbus/org.pulsevideo.xml \ + --interface-prefix org.pinos. \ + --generate-c-code dbus/org-pinos \ + --generate-docbook ../doc/org-pinos \ + --c-namespace Pv dbus/org.pinos.xml \ --c-generate-object-manager -built_header_make = client/pv-enumtypes.h dbus/org-pulsevideo.h -built_source_make = client/pv-enumtypes.c dbus/org-pulsevideo.c +built_header_make = client/pv-enumtypes.h dbus/org-pinos.h +built_source_make = client/pv-enumtypes.c dbus/org-pinos.c BUILT_SOURCES = $(built_header_make) \ $(built_source_make) @@ -104,16 +104,16 @@ CLEANFILES = $(built_header_make) $(built_source_make) # Main daemon # ################################### -bin_PROGRAMS = pulsevideo +bin_PROGRAMS = pinos -pulsevideo_SOURCES = \ +pinos_SOURCES = \ daemon/main.c -pulsevideo_CFLAGS = $(AM_CFLAGS) -pulsevideo_LDADD = $(AM_LDADD) libpulsevideocore-@PV_MAJORMINOR@.la libpulsevideo-@PV_MAJORMINOR@.la $(LIBLTDL) +pinos_CFLAGS = $(AM_CFLAGS) +pinos_LDADD = $(AM_LDADD) libpinoscore-@PV_MAJORMINOR@.la libpinos-@PV_MAJORMINOR@.la $(LIBLTDL) # This is needed because automake doesn't properly expand the foreach below -pulsevideo_DEPENDENCIES = libpulsevideocore-@PV_MAJORMINOR@.la libpulsevideo-@PV_MAJORMINOR@.la -pulsevideo_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(IMMEDIATE_LDFLAGS) +pinos_DEPENDENCIES = libpinoscore-@PV_MAJORMINOR@.la libpinos-@PV_MAJORMINOR@.la +pinos_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(IMMEDIATE_LDFLAGS) ################################### # Test programs # @@ -125,32 +125,32 @@ TESTS_default = TESTS_norun = test-client \ test-subscribe -# These tests need a running pulsevideo daemon +# These tests need a running pinos daemon TESTS_daemon = noinst_PROGRAMS = $(TESTS_default) $(TESTS_norun) $(TESTS_daemon) test_client_SOURCES = tests/test-client.c test_client_CFLAGS = $(AM_CFLAGS) -test_client_LDADD = $(AM_LDADD) libpulsevideo-@PV_MAJORMINOR@.la +test_client_LDADD = $(AM_LDADD) libpinos-@PV_MAJORMINOR@.la test_client_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) test_subscribe_SOURCES = tests/test-subscribe.c test_subscribe_CFLAGS = $(AM_CFLAGS) -test_subscribe_LDADD = $(AM_LDADD) libpulsevideo-@PV_MAJORMINOR@.la +test_subscribe_LDADD = $(AM_LDADD) libpinos-@PV_MAJORMINOR@.la test_subscribe_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) ################################### # Client library # ################################### -pulsevideogstsource = gst/gstfdpay.h gst/gstfdpay.c \ +pinosgstsource = gst/gstfdpay.h gst/gstfdpay.c \ gst/gstfddepay.h gst/gstfddepay.c \ gst/gsttmpfileallocator.h gst/gsttmpfileallocator.c \ wire-protocol.h -pulsevideoinclude_HEADERS = \ - client/pulsevideo.h \ +pinosinclude_HEADERS = \ + client/pinos.h \ client/pv-context.h \ client/pv-enumtypes.h \ client/pv-introspect.h \ @@ -158,31 +158,31 @@ pulsevideoinclude_HEADERS = \ client/pv-subscribe.h lib_LTLIBRARIES = \ - libpulsevideo-@PV_MAJORMINOR@.la + libpinos-@PV_MAJORMINOR@.la # Public interface -libpulsevideo_@PV_MAJORMINOR@_la_SOURCES = \ +libpinos_@PV_MAJORMINOR@_la_SOURCES = \ client/pv-context.h client/pv-context.c \ client/pv-enumtypes.h client/pv-enumtypes.c \ client/pv-introspect.h client/pv-introspect.c \ client/pv-stream.h client/pv-stream.c \ - client/pulsevideo.c client/pulsevideo.h \ + client/pinos.c client/pinos.h \ client/pv-subscribe.c client/pv-subscribe.h \ - $(pulsevideogstsource) + $(pinosgstsource) -libpulsevideo_@PV_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(GST_CFLAGS) -libpulsevideo_@PV_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version -libpulsevideo_@PV_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LTLIBICONV) $(GST_LIBS) +libpinos_@PV_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(GST_CFLAGS) +libpinos_@PV_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version +libpinos_@PV_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LTLIBICONV) $(GST_LIBS) ################################### # Daemon core library # ################################### -lib_LTLIBRARIES += libpulsevideocore-@PV_MAJORMINOR@.la +lib_LTLIBRARIES += libpinoscore-@PV_MAJORMINOR@.la # Pure core stuff -libpulsevideocore_@PV_MAJORMINOR@_la_SOURCES = \ +libpinoscore_@PV_MAJORMINOR@_la_SOURCES = \ server/pv-client.c server/pv-client.h \ server/pv-daemon.c server/pv-daemon.h \ server/pv-source.c server/pv-source.h \ @@ -190,12 +190,12 @@ libpulsevideocore_@PV_MAJORMINOR@_la_SOURCES = \ server/pv-source-output.c server/pv-source-output.h \ modules/gst/pv-gst-manager.c \ modules/gst/pv-gst-source.c \ - dbus/org-pulsevideo.c dbus/org-pulsevideo.h + dbus/org-pinos.c dbus/org-pinos.h -libpulsevideocore_@PV_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) -libpulsevideocore_@PV_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version -libpulsevideocore_@PV_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LTLIBICONV) \ - libpulsevideo-@PV_MAJORMINOR@.la +libpinoscore_@PV_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) +libpinoscore_@PV_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version +libpinoscore_@PV_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LTLIBICONV) \ + libpinos-@PV_MAJORMINOR@.la ################################### # GStreamer Plugin # @@ -203,20 +203,20 @@ libpulsevideocore_@PV_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LTLIBICO plugindir = $(libdir)/gstreamer-1.0 -plugin_LTLIBRARIES = libgstpulsevideo.la +plugin_LTLIBRARIES = libgstpinos.la -libgstpulsevideo_la_SOURCES = \ +libgstpinos_la_SOURCES = \ gst/gstpv.c \ gst/gstfdpay.c \ gst/gstfddepay.c \ gst/gstpvsrc.c \ gst/gstpvsink.c -libgstpulsevideo_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GLIB_CFLAGS) -libgstpulsevideo_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -libgstpulsevideo_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GLIB_LIBS) $(LIBM) -lgstvideo-1.0 \ - libpulsevideo-@PV_MAJORMINOR@.la libpulsevideocore-@PV_MAJORMINOR@.la -libgstpulsevideo_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) +libgstpinos_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GLIB_CFLAGS) +libgstpinos_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstpinos_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GLIB_LIBS) $(LIBM) -lgstvideo-1.0 \ + libpinos-@PV_MAJORMINOR@.la libpinoscore-@PV_MAJORMINOR@.la +libgstpinos_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) noinst_HEADERS = gst/gstpvsrc.h gst/gstpvsink.h gst/gstfdpay.h gst/gstfddepay.h @@ -234,9 +234,9 @@ uninstall-hook: # Automatically generate linker version script. We use the same one for all public .sos update-map-file: - ( echo "PULSE_0 {" ; \ + ( echo "PINOS_0 {" ; \ echo "global:" ; \ - ctags -I PV_GCC_MALLOC,PV_GCC_ALLOC_SIZE2,PV_GCC_ALLOC_SIZE,PV_GCC_PURE,PV_GCC_CONST,PV_GCC_DEPRECATED,PV_GCC_PRINTF_ATTR -f - --c-kinds=p $(pulsevideoinclude_HEADERS) | awk '/^pa_/ { print $$1 ";" }' | sort ; \ + ctags -I PV_GCC_MALLOC,PV_GCC_ALLOC_SIZE2,PV_GCC_ALLOC_SIZE,PV_GCC_PURE,PV_GCC_CONST,PV_GCC_DEPRECATED,PV_GCC_PRINTF_ATTR -f - --c-kinds=p $(pinosinclude_HEADERS) | awk '/^pa_/ { print $$1 ";" }' | sort ; \ echo "local:" ; \ echo "*;" ; \ echo "};" ) > $(srcdir)/map-file diff --git a/src/client/pulsevideo.c b/src/client/pinos.c similarity index 89% rename from src/client/pulsevideo.c rename to src/client/pinos.c index 9ce56141c..0d761bad9 100644 --- a/src/client/pulsevideo.c +++ b/src/client/pinos.c @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include "client/pulsevideo.h" +#include "client/pinos.h" #include "gst/gstfdpay.h" #include "gst/gstfddepay.h" @@ -27,7 +27,7 @@ * @argc: pointer to argc * @argv: pointer to argv * - * initialize the pulsevideo system, parse and modify any parameters given + * initialize the pinos system, parse and modify any parameters given * by @argc and @argv. */ void diff --git a/src/client/pulsevideo.h b/src/client/pinos.h similarity index 86% rename from src/client/pulsevideo.h rename to src/client/pinos.h index 2c0593493..2e0b38169 100644 --- a/src/client/pulsevideo.h +++ b/src/client/pinos.h @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -17,21 +17,20 @@ * Boston, MA 02110-1301, USA. */ -#ifndef __PULSEVIDEO_H__ -#define __PULSEVIDEO_H__ +#ifndef __PINOS_H__ +#define __PINOS_H__ #include #include #include #include -#define PV_DBUS_SERVICE "org.pulsevideo" -#define PV_DBUS_OBJECT_PREFIX "/org/pulsevideo" +#define PV_DBUS_SERVICE "org.pinos" +#define PV_DBUS_OBJECT_PREFIX "/org/pinos" #define PV_DBUS_OBJECT_SERVER PV_DBUS_OBJECT_PREFIX "/server" #define PV_DBUS_OBJECT_SOURCE PV_DBUS_OBJECT_PREFIX "/source" #define PV_DBUS_OBJECT_CLIENT PV_DBUS_OBJECT_PREFIX "/client" void pv_init (int *argc, char **argv[]); -#endif /* __PULSEVIDEO_H__ */ - +#endif /* __PINOS_H__ */ diff --git a/src/client/pv-context.c b/src/client/pv-context.c index 32450b4db..e95df6561 100644 --- a/src/client/pv-context.c +++ b/src/client/pv-context.c @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include "client/pulsevideo.h" +#include "client/pinos.h" #include "client/pv-context.h" #include "client/pv-enumtypes.h" @@ -372,7 +372,7 @@ on_client_connected (GObject *source_object, pv_subscribe_get_proxy (priv->subscribe, PV_DBUS_SERVICE, client_path, - "org.pulsevideo.Client1", + "org.pinos.Client1", NULL, on_client_proxy, context); diff --git a/src/client/pv-context.h b/src/client/pv-context.h index 35ed02fc6..fc0da865a 100644 --- a/src/client/pv-context.h +++ b/src/client/pv-context.h @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -77,7 +77,7 @@ typedef enum { /** * PvContext: * - * Pulsevideo context object class. + * Pinos context object class. */ struct _PvContext { GObject object; @@ -88,7 +88,7 @@ struct _PvContext { /** * PvContextClass: * - * Pulsevideo context object class. + * Pinos context object class. */ struct _PvContextClass { GObjectClass parent_class; diff --git a/src/client/pv-introspect.c b/src/client/pv-introspect.c index 516249dd5..3ce93f931 100644 --- a/src/client/pv-introspect.c +++ b/src/client/pv-introspect.c @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include "client/pulsevideo.h" +#include "client/pinos.h" #include "client/pv-context.h" #include "client/pv-enumtypes.h" diff --git a/src/client/pv-introspect.h b/src/client/pv-introspect.h index ea435dc88..4ece0fa28 100644 --- a/src/client/pv-introspect.h +++ b/src/client/pv-introspect.h @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or diff --git a/src/client/pv-private.h b/src/client/pv-private.h index 3e4141357..3be1617cb 100644 --- a/src/client/pv-private.h +++ b/src/client/pv-private.h @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or diff --git a/src/client/pv-stream.c b/src/client/pv-stream.c index 58569d604..782e65fb1 100644 --- a/src/client/pv-stream.c +++ b/src/client/pv-stream.c @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ #include #include "server/pv-daemon.h" -#include "client/pulsevideo.h" +#include "client/pinos.h" #include "client/pv-context.h" #include "client/pv-stream.h" #include "client/pv-enumtypes.h" @@ -498,7 +498,7 @@ on_source_output_created (GObject *source_object, pv_subscribe_get_proxy (context->priv->subscribe, PV_DBUS_SERVICE, source_output_path, - "org.pulsevideo.SourceOutput1", + "org.pinos.SourceOutput1", NULL, on_source_output_proxy, stream); diff --git a/src/client/pv-stream.h b/src/client/pv-stream.h index 1714ba1bf..55f31de4b 100644 --- a/src/client/pv-stream.h +++ b/src/client/pv-stream.h @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -72,7 +72,7 @@ typedef enum { /** * PvStream: * - * Pulsevideo stream object class. + * Pinos stream object class. */ struct _PvStream { GObject object; @@ -83,7 +83,7 @@ struct _PvStream { /** * PvStreamClass: * - * Pulsevideo stream object class. + * Pinos stream object class. */ struct _PvStreamClass { GObjectClass parent_class; diff --git a/src/client/pv-subscribe.c b/src/client/pv-subscribe.c index 7340aa2fb..58c0e223b 100644 --- a/src/client/pv-subscribe.c +++ b/src/client/pv-subscribe.c @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #include -#include "client/pulsevideo.h" +#include "client/pinos.h" #include "client/pv-enumtypes.h" struct _PvSubscribePrivate @@ -94,16 +94,16 @@ notify_event (PvSubscribe *subscribe, PvSubscriptionFlags flags = 0; interface_name = g_dbus_proxy_get_interface_name (data->proxy); - if (g_strcmp0 (interface_name, "org.pulsevideo.Daemon1") == 0) { + if (g_strcmp0 (interface_name, "org.pinos.Daemon1") == 0) { flags = PV_SUBSCRIPTION_FLAGS_DAEMON; } - else if (g_strcmp0 (interface_name, "org.pulsevideo.Client1") == 0) { + else if (g_strcmp0 (interface_name, "org.pinos.Client1") == 0) { flags = PV_SUBSCRIPTION_FLAGS_CLIENT; } - else if (g_strcmp0 (interface_name, "org.pulsevideo.Source1") == 0) { + else if (g_strcmp0 (interface_name, "org.pinos.Source1") == 0) { flags = PV_SUBSCRIPTION_FLAGS_SOURCE; } - else if (g_strcmp0 (interface_name, "org.pulsevideo.SourceOutput1") == 0) { + else if (g_strcmp0 (interface_name, "org.pinos.SourceOutput1") == 0) { flags = PV_SUBSCRIPTION_FLAGS_SOURCE_OUTPUT; } g_signal_emit (subscribe, signals[SIGNAL_SUBSCRIPTION_EVENT], 0, diff --git a/src/client/pv-subscribe.h b/src/client/pv-subscribe.h index 5443304c4..c527160a2 100644 --- a/src/client/pv-subscribe.h +++ b/src/client/pv-subscribe.h @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -62,7 +62,7 @@ typedef enum { /** * PvSubscribe: * - * Pulsevideo subscribe object class. + * Pinos subscribe object class. */ struct _PvSubscribe { GObject object; @@ -73,7 +73,7 @@ struct _PvSubscribe { /** * PvSubscribeClass: * - * Pulsevideo subscribe object class. + * Pinos subscribe object class. */ struct _PvSubscribeClass { GObjectClass parent_class; diff --git a/src/daemon/main.c b/src/daemon/main.c index a6a9a036b..f61d268bc 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/src/daemon/pulsevideo-system.conf b/src/daemon/pinos-system.conf similarity index 59% rename from src/daemon/pulsevideo-system.conf rename to src/daemon/pinos-system.conf index 67226a79c..19206c999 100644 --- a/src/daemon/pulsevideo-system.conf +++ b/src/daemon/pinos-system.conf @@ -3,29 +3,29 @@ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> - + - - + + diff --git a/src/dbus/.gitignore b/src/dbus/.gitignore index ec02dc3f1..5c8219669 100644 --- a/src/dbus/.gitignore +++ b/src/dbus/.gitignore @@ -1,2 +1,2 @@ -org-pulsevideo.c -org-pulsevideo.h +org-pinos.c +org-pinos.h diff --git a/src/dbus/org.pulsevideo.xml b/src/dbus/org.pinos.xml similarity index 90% rename from src/dbus/org.pulsevideo.xml rename to src/dbus/org.pinos.xml index ee60b6d05..05a3d6be9 100644 --- a/src/dbus/org.pulsevideo.xml +++ b/src/dbus/org.pinos.xml @@ -3,13 +3,13 @@ "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd" > - + @@ -24,7 +24,7 @@ @properties: properties of the client @client: a new client object - Register a client to the pulsevideo daemon. A new client object + Register a client to the pinos daemon. A new client object will be generated that should be used to perform any other action on the server. --> @@ -35,13 +35,13 @@ - + @@ -76,13 +76,13 @@ - + - + @@ -129,19 +129,18 @@ - + @@ -152,7 +151,7 @@ @format: output format Start the datatransfer of the source with @requested_format. - + The result is a file descriptor that can be used to get metadata and media. @format contains the final media format. --> diff --git a/src/gst/gstpv.c b/src/gst/gstpv.c index bceac4045..b9eda8c7e 100644 --- a/src/gst/gstpv.c +++ b/src/gst/gstpv.c @@ -18,13 +18,13 @@ */ /** - * SECTION:element-pulsevideosrc + * SECTION:element-pinossrc * * * Example launch line * |[ - * gst-launch -v pulsevideosrc ! ximagesink - * ]| Shows pulsevideo output in an X window. + * gst-launch -v pinossrc ! ximagesink + * ]| Shows pinos output in an X window. * */ @@ -44,15 +44,15 @@ plugin_init (GstPlugin * plugin) GST_TYPE_FDPAY); gst_element_register (plugin, "pvfddepay", GST_RANK_NONE, GST_TYPE_FDDEPAY); - gst_element_register (plugin, "pulsevideosrc", GST_RANK_PRIMARY + 1, - GST_TYPE_PULSEVIDEO_SRC); - gst_element_register (plugin, "pulsevideosink", GST_RANK_NONE, - GST_TYPE_PULSEVIDEO_SINK); + gst_element_register (plugin, "pinossrc", GST_RANK_PRIMARY + 1, + GST_TYPE_PINOS_SRC); + gst_element_register (plugin, "pinossink", GST_RANK_NONE, + GST_TYPE_PINOS_SINK); return TRUE; } GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - pulsevideo, - "Uses pulsevideo to handle video streams", - plugin_init, VERSION, "LGPL", "pulsevideo", "pulsevideo.org") + pinos, + "Uses pinos to handle video streams", + plugin_init, VERSION, "LGPL", "pinos", "pinos.org") diff --git a/src/gst/gstpvsink.c b/src/gst/gstpvsink.c index 4800790c1..5b6430418 100644 --- a/src/gst/gstpvsink.c +++ b/src/gst/gstpvsink.c @@ -18,13 +18,13 @@ */ /** - * SECTION:element-pulsevideosink + * SECTION:element-pinossink * * * Example launch line * |[ - * gst-launch -v videotestsrc ! pulsevideosink - * ]| Sends a test video source to pulsevideo + * gst-launch -v videotestsrc ! pinossink + * ]| Sends a test video source to pinos * */ @@ -45,8 +45,8 @@ #include "gsttmpfileallocator.h" -GST_DEBUG_CATEGORY_STATIC (pulsevideo_sink_debug); -#define GST_CAT_DEFAULT pulsevideo_sink_debug +GST_DEBUG_CATEGORY_STATIC (pinos_sink_debug); +#define GST_CAT_DEFAULT pinos_sink_debug enum { @@ -57,36 +57,36 @@ enum #define PVS_VIDEO_CAPS GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL) -static GstStaticPadTemplate gst_pulsevideo_sink_template = +static GstStaticPadTemplate gst_pinos_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY ); -#define gst_pulsevideo_sink_parent_class parent_class -G_DEFINE_TYPE (GstPulsevideoSink, gst_pulsevideo_sink, GST_TYPE_BASE_SINK); +#define gst_pinos_sink_parent_class parent_class +G_DEFINE_TYPE (GstPinosSink, gst_pinos_sink, GST_TYPE_BASE_SINK); -static void gst_pulsevideo_sink_set_property (GObject * object, guint prop_id, +static void gst_pinos_sink_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); -static void gst_pulsevideo_sink_get_property (GObject * object, guint prop_id, +static void gst_pinos_sink_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); static GstStateChangeReturn -gst_pulsevideo_sink_change_state (GstElement * element, GstStateChange transition); +gst_pinos_sink_change_state (GstElement * element, GstStateChange transition); -static GstCaps *gst_pulsevideo_sink_getcaps (GstBaseSink * bsink, GstCaps * filter); -static gboolean gst_pulsevideo_sink_setcaps (GstBaseSink * bsink, GstCaps * caps); -static GstCaps *gst_pulsevideo_sink_sink_fixate (GstBaseSink * bsink, +static GstCaps *gst_pinos_sink_getcaps (GstBaseSink * bsink, GstCaps * filter); +static gboolean gst_pinos_sink_setcaps (GstBaseSink * bsink, GstCaps * caps); +static GstCaps *gst_pinos_sink_sink_fixate (GstBaseSink * bsink, GstCaps * caps); -static GstFlowReturn gst_pulsevideo_sink_render (GstBaseSink * psink, +static GstFlowReturn gst_pinos_sink_render (GstBaseSink * psink, GstBuffer * buffer); -static gboolean gst_pulsevideo_sink_start (GstBaseSink * basesink); -static gboolean gst_pulsevideo_sink_stop (GstBaseSink * basesink); +static gboolean gst_pinos_sink_start (GstBaseSink * basesink); +static gboolean gst_pinos_sink_stop (GstBaseSink * basesink); static void -gst_pulsevideo_sink_class_init (GstPulsevideoSinkClass * klass) +gst_pinos_sink_class_init (GstPinosSinkClass * klass) { GObjectClass *gobject_class; GstElementClass *gstelement_class; @@ -96,31 +96,31 @@ gst_pulsevideo_sink_class_init (GstPulsevideoSinkClass * klass) gstelement_class = (GstElementClass *) klass; gstbasesink_class = (GstBaseSinkClass *) klass; - gobject_class->set_property = gst_pulsevideo_sink_set_property; - gobject_class->get_property = gst_pulsevideo_sink_get_property; + gobject_class->set_property = gst_pinos_sink_set_property; + gobject_class->get_property = gst_pinos_sink_get_property; - gstelement_class->change_state = gst_pulsevideo_sink_change_state; + gstelement_class->change_state = gst_pinos_sink_change_state; gst_element_class_set_static_metadata (gstelement_class, - "Pulsevideo sink", "Sink/Video", - "Send video to pulsevideo", "Wim Taymans "); + "Pinos sink", "Sink/Video", + "Send video to pinos", "Wim Taymans "); gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&gst_pulsevideo_sink_template)); + gst_static_pad_template_get (&gst_pinos_sink_template)); - gstbasesink_class->get_caps = gst_pulsevideo_sink_getcaps; - gstbasesink_class->set_caps = gst_pulsevideo_sink_setcaps; - gstbasesink_class->fixate = gst_pulsevideo_sink_sink_fixate; - gstbasesink_class->start = gst_pulsevideo_sink_start; - gstbasesink_class->stop = gst_pulsevideo_sink_stop; - gstbasesink_class->render = gst_pulsevideo_sink_render; + gstbasesink_class->get_caps = gst_pinos_sink_getcaps; + gstbasesink_class->set_caps = gst_pinos_sink_setcaps; + gstbasesink_class->fixate = gst_pinos_sink_sink_fixate; + gstbasesink_class->start = gst_pinos_sink_start; + gstbasesink_class->stop = gst_pinos_sink_stop; + gstbasesink_class->render = gst_pinos_sink_render; - GST_DEBUG_CATEGORY_INIT (pulsevideo_sink_debug, "pulsevideosink", 0, - "Pulsevideo Sink"); + GST_DEBUG_CATEGORY_INIT (pinos_sink_debug, "pinossink", 0, + "Pinos Sink"); } static void -gst_pulsevideo_sink_init (GstPulsevideoSink * sink) +gst_pinos_sink_init (GstPinosSink * sink) { sink->allocator = gst_tmpfile_allocator_new (); g_mutex_init (&sink->lock); @@ -128,7 +128,7 @@ gst_pulsevideo_sink_init (GstPulsevideoSink * sink) } static GstCaps * -gst_pulsevideo_sink_sink_fixate (GstBaseSink * bsink, GstCaps * caps) +gst_pinos_sink_sink_fixate (GstBaseSink * bsink, GstCaps * caps) { GstStructure *structure; @@ -165,7 +165,7 @@ gst_pulsevideo_sink_sink_fixate (GstBaseSink * bsink, GstCaps * caps) } static void -gst_pulsevideo_sink_set_property (GObject * object, guint prop_id, +gst_pinos_sink_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec) { switch (prop_id) { @@ -176,7 +176,7 @@ gst_pulsevideo_sink_set_property (GObject * object, guint prop_id, } static void -gst_pulsevideo_sink_get_property (GObject * object, guint prop_id, +gst_pinos_sink_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec) { switch (prop_id) { @@ -190,7 +190,7 @@ static void on_new_buffer (GObject *gobject, gpointer user_data) { - GstPulsevideoSink *pvsink = user_data; + GstPinosSink *pvsink = user_data; g_cond_signal (&pvsink->cond); } @@ -201,7 +201,7 @@ on_stream_notify (GObject *gobject, gpointer user_data) { PvStreamState state; - GstPulsevideoSink *pvsink = user_data; + GstPinosSink *pvsink = user_data; state = pv_stream_get_state (pvsink->stream); g_print ("got stream state %d\n", state); @@ -215,19 +215,19 @@ on_stream_notify (GObject *gobject, } static GstCaps * -gst_pulsevideo_sink_getcaps (GstBaseSink * bsink, GstCaps * filter) +gst_pinos_sink_getcaps (GstBaseSink * bsink, GstCaps * filter) { return GST_BASE_SINK_CLASS (parent_class)->get_caps (bsink, filter); } static gboolean -gst_pulsevideo_sink_setcaps (GstBaseSink * bsink, GstCaps * caps) +gst_pinos_sink_setcaps (GstBaseSink * bsink, GstCaps * caps) { - GstPulsevideoSink *pvsink; + GstPinosSink *pvsink; gchar *str; GBytes *format; - pvsink = GST_PULSEVIDEO_SINK (bsink); + pvsink = GST_PINOS_SINK (bsink); str = gst_caps_to_string (caps); format = g_bytes_new_take (str, strlen (str) + 1); @@ -278,14 +278,14 @@ connect_error: } static GstFlowReturn -gst_pulsevideo_sink_render (GstBaseSink * bsink, GstBuffer * buffer) +gst_pinos_sink_render (GstBaseSink * bsink, GstBuffer * buffer) { - GstPulsevideoSink *pvsink; + GstPinosSink *pvsink; PvBufferInfo info; GSocketControlMessage *mesg; GstMemory *mem = NULL; - pvsink = GST_PULSEVIDEO_SINK (bsink); + pvsink = GST_PINOS_SINK (bsink); if (!pvsink->negotiated) goto not_negotiated; @@ -341,9 +341,9 @@ streaming_error: } static gboolean -gst_pulsevideo_sink_start (GstBaseSink * basesink) +gst_pinos_sink_start (GstBaseSink * basesink) { - GstPulsevideoSink *sink = GST_PULSEVIDEO_SINK (basesink); + GstPinosSink *sink = GST_PINOS_SINK (basesink); sink->negotiated = FALSE; @@ -351,9 +351,9 @@ gst_pulsevideo_sink_start (GstBaseSink * basesink) } static gboolean -gst_pulsevideo_sink_stop (GstBaseSink * basesink) +gst_pinos_sink_stop (GstBaseSink * basesink) { - GstPulsevideoSink *sink = GST_PULSEVIDEO_SINK (basesink); + GstPinosSink *sink = GST_PINOS_SINK (basesink); sink->negotiated = FALSE; @@ -366,7 +366,7 @@ static gint do_poll (GPollFD *ufds, guint nfsd, gint timeout_) { gint res; - GstPulsevideoSink *this = g_private_get (&sink_key); + GstPinosSink *this = g_private_get (&sink_key); g_mutex_unlock (&this->lock); res = this->poll_func (ufds, nfsd, timeout_); @@ -376,7 +376,7 @@ do_poll (GPollFD *ufds, guint nfsd, gint timeout_) } static gpointer -handle_mainloop (GstPulsevideoSink *this) +handle_mainloop (GstPinosSink *this) { g_mutex_lock (&this->lock); g_private_set (&sink_key, this); @@ -397,7 +397,7 @@ on_state_notify (GObject *gobject, GParamSpec *pspec, gpointer user_data) { - GstPulsevideoSink *pvsink = user_data; + GstPinosSink *pvsink = user_data; PvContextState state; state = pv_context_get_state (pvsink->ctx); @@ -412,7 +412,7 @@ on_state_notify (GObject *gobject, } static gboolean -gst_pulsevideo_sink_open (GstPulsevideoSink * pvsink) +gst_pinos_sink_open (GstPinosSink * pvsink) { g_mutex_lock (&pvsink->lock); pvsink->ctx = pv_context_new (pvsink->context, "test-client", NULL); @@ -444,7 +444,7 @@ connect_error: } static gboolean -gst_pulsevideo_sink_close (GstPulsevideoSink * pvsink) +gst_pinos_sink_close (GstPinosSink * pvsink) { g_mutex_lock (&pvsink->lock); @@ -472,18 +472,18 @@ gst_pulsevideo_sink_close (GstPulsevideoSink * pvsink) } static GstStateChangeReturn -gst_pulsevideo_sink_change_state (GstElement * element, GstStateChange transition) +gst_pinos_sink_change_state (GstElement * element, GstStateChange transition) { GstStateChangeReturn ret; - GstPulsevideoSink *this = GST_PULSEVIDEO_SINK_CAST (element); + GstPinosSink *this = GST_PINOS_SINK_CAST (element); switch (transition) { case GST_STATE_CHANGE_NULL_TO_READY: this->context = g_main_context_new (); g_print ("context %p\n", this->context); this->loop = g_main_loop_new (this->context, FALSE); - this->thread = g_thread_new ("pulsevideo", (GThreadFunc) handle_mainloop, this); - if (!gst_pulsevideo_sink_open (this)) { + this->thread = g_thread_new ("pinos", (GThreadFunc) handle_mainloop, this); + if (!gst_pinos_sink_open (this)) { ret = GST_STATE_CHANGE_FAILURE; goto exit; } @@ -508,7 +508,7 @@ gst_pulsevideo_sink_change_state (GstElement * element, GstStateChange transitio case GST_STATE_CHANGE_PAUSED_TO_READY: break; case GST_STATE_CHANGE_READY_TO_NULL: - gst_pulsevideo_sink_close (this); + gst_pinos_sink_close (this); g_main_loop_quit (this->loop); g_thread_join (this->thread); g_main_loop_unref (this->loop); diff --git a/src/gst/gstpvsink.h b/src/gst/gstpvsink.h index f5e6c5faf..24c74bd3c 100644 --- a/src/gst/gstpvsink.h +++ b/src/gst/gstpvsink.h @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef __GST_PULSEVIDEO_SINK_H__ -#define __GST_PULSEVIDEO_SINK_H__ +#ifndef __GST_PINOS_SINK_H__ +#define __GST_PINOS_SINK_H__ #include #include @@ -29,28 +29,28 @@ G_BEGIN_DECLS -#define GST_TYPE_PULSEVIDEO_SINK \ - (gst_pulsevideo_sink_get_type()) -#define GST_PULSEVIDEO_SINK(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PULSEVIDEO_SINK,GstPulsevideoSink)) -#define GST_PULSEVIDEO_SINK_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PULSEVIDEO_SINK,GstPulsevideoSinkClass)) -#define GST_IS_PULSEVIDEO_SINK(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PULSEVIDEO_SINK)) -#define GST_IS_PULSEVIDEO_SINK_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PULSEVIDEO_SINK)) -#define GST_PULSEVIDEO_SINK_CAST(obj) \ - ((GstPulsevideoSink *) (obj)) +#define GST_TYPE_PINOS_SINK \ + (gst_pinos_sink_get_type()) +#define GST_PINOS_SINK(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PINOS_SINK,GstPinosSink)) +#define GST_PINOS_SINK_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PINOS_SINK,GstPinosSinkClass)) +#define GST_IS_PINOS_SINK(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PINOS_SINK)) +#define GST_IS_PINOS_SINK_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PINOS_SINK)) +#define GST_PINOS_SINK_CAST(obj) \ + ((GstPinosSink *) (obj)) -typedef struct _GstPulsevideoSink GstPulsevideoSink; -typedef struct _GstPulsevideoSinkClass GstPulsevideoSinkClass; +typedef struct _GstPinosSink GstPinosSink; +typedef struct _GstPinosSinkClass GstPinosSinkClass; /** - * GstPulsevideoSink: + * GstPinosSink: * * Opaque data structure. */ -struct _GstPulsevideoSink { +struct _GstPinosSink { GstBaseSink element; /*< private >*/ @@ -70,12 +70,12 @@ struct _GstPulsevideoSink { GCond cond; }; -struct _GstPulsevideoSinkClass { +struct _GstPinosSinkClass { GstBaseSinkClass parent_class; }; -GType gst_pulsevideo_sink_get_type (void); +GType gst_pinos_sink_get_type (void); G_END_DECLS -#endif /* __GST_PULSEVIDEO_SINK_H__ */ +#endif /* __GST_PINOS_SINK_H__ */ diff --git a/src/gst/gstpvsrc.c b/src/gst/gstpvsrc.c index 95eff7061..1c9c5ea83 100644 --- a/src/gst/gstpvsrc.c +++ b/src/gst/gstpvsrc.c @@ -18,13 +18,13 @@ */ /** - * SECTION:element-pulsevideosrc + * SECTION:element-pinossrc * * * Example launch line * |[ - * gst-launch -v pulsevideosrc ! videoconvert ! ximagesink - * ]| Shows pulsevideo output in an X window. + * gst-launch -v pinossrc ! videoconvert ! ximagesink + * ]| Shows pinos output in an X window. * */ @@ -44,8 +44,8 @@ -GST_DEBUG_CATEGORY_STATIC (pulsevideo_src_debug); -#define GST_CAT_DEFAULT pulsevideo_src_debug +GST_DEBUG_CATEGORY_STATIC (pinos_src_debug); +#define GST_CAT_DEFAULT pinos_src_debug enum { @@ -56,35 +56,35 @@ enum #define PVS_VIDEO_CAPS GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL) -static GstStaticPadTemplate gst_pulsevideo_src_template = +static GstStaticPadTemplate gst_pinos_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY ); -#define gst_pulsevideo_src_parent_class parent_class -G_DEFINE_TYPE (GstPulsevideoSrc, gst_pulsevideo_src, GST_TYPE_PUSH_SRC); +#define gst_pinos_src_parent_class parent_class +G_DEFINE_TYPE (GstPinosSrc, gst_pinos_src, GST_TYPE_PUSH_SRC); static GstStateChangeReturn -gst_pulsevideo_src_change_state (GstElement * element, GstStateChange transition); +gst_pinos_src_change_state (GstElement * element, GstStateChange transition); -static gboolean gst_pulsevideo_src_negotiate (GstBaseSrc * basesrc); -static GstCaps *gst_pulsevideo_src_getcaps (GstBaseSrc * bsrc, GstCaps * filter); -static gboolean gst_pulsevideo_src_setcaps (GstBaseSrc * bsrc, GstCaps * caps); -static GstCaps *gst_pulsevideo_src_src_fixate (GstBaseSrc * bsrc, +static gboolean gst_pinos_src_negotiate (GstBaseSrc * basesrc); +static GstCaps *gst_pinos_src_getcaps (GstBaseSrc * bsrc, GstCaps * filter); +static gboolean gst_pinos_src_setcaps (GstBaseSrc * bsrc, GstCaps * caps); +static GstCaps *gst_pinos_src_src_fixate (GstBaseSrc * bsrc, GstCaps * caps); -static GstFlowReturn gst_pulsevideo_src_create (GstPushSrc * psrc, +static GstFlowReturn gst_pinos_src_create (GstPushSrc * psrc, GstBuffer ** buffer); -static gboolean gst_pulsevideo_src_start (GstBaseSrc * basesrc); -static gboolean gst_pulsevideo_src_stop (GstBaseSrc * basesrc); +static gboolean gst_pinos_src_start (GstBaseSrc * basesrc); +static gboolean gst_pinos_src_stop (GstBaseSrc * basesrc); static void -gst_pulsevideo_src_set_property (GObject * object, guint prop_id, +gst_pinos_src_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec) { - GstPulsevideoSrc *pvsrc = GST_PULSEVIDEO_SRC (object); + GstPinosSrc *pvsrc = GST_PINOS_SRC (object); switch (prop_id) { case PROP_SOURCE: @@ -99,10 +99,10 @@ gst_pulsevideo_src_set_property (GObject * object, guint prop_id, } static void -gst_pulsevideo_src_get_property (GObject * object, guint prop_id, +gst_pinos_src_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec) { - GstPulsevideoSrc *pvsrc = GST_PULSEVIDEO_SRC (object); + GstPinosSrc *pvsrc = GST_PINOS_SRC (object); switch (prop_id) { case PROP_SOURCE: @@ -116,9 +116,9 @@ gst_pulsevideo_src_get_property (GObject * object, guint prop_id, } static void -gst_pulsevideo_src_finalize (GObject * object) +gst_pinos_src_finalize (GObject * object) { - GstPulsevideoSrc *pvsrc = GST_PULSEVIDEO_SRC (object); + GstPinosSrc *pvsrc = GST_PINOS_SRC (object); g_object_unref (pvsrc->fd_allocator); g_mutex_clear (&pvsrc->lock); @@ -129,7 +129,7 @@ gst_pulsevideo_src_finalize (GObject * object) } static void -gst_pulsevideo_src_class_init (GstPulsevideoSrcClass * klass) +gst_pinos_src_class_init (GstPinosSrcClass * klass) { GObjectClass *gobject_class; GstElementClass *gstelement_class; @@ -141,9 +141,9 @@ gst_pulsevideo_src_class_init (GstPulsevideoSrcClass * klass) gstbasesrc_class = (GstBaseSrcClass *) klass; gstpushsrc_class = (GstPushSrcClass *) klass; - gobject_class->finalize = gst_pulsevideo_src_finalize; - gobject_class->set_property = gst_pulsevideo_src_set_property; - gobject_class->get_property = gst_pulsevideo_src_get_property; + gobject_class->finalize = gst_pinos_src_finalize; + gobject_class->set_property = gst_pinos_src_set_property; + gobject_class->get_property = gst_pinos_src_get_property; g_object_class_install_property (gobject_class, PROP_SOURCE, @@ -155,30 +155,30 @@ gst_pulsevideo_src_class_init (GstPulsevideoSrcClass * klass) G_PARAM_STATIC_STRINGS)); - gstelement_class->change_state = gst_pulsevideo_src_change_state; + gstelement_class->change_state = gst_pinos_src_change_state; gst_element_class_set_static_metadata (gstelement_class, - "Pulsevideo source", "Source/Video", - "Uses pulsevideo to create video", "Wim Taymans "); + "Pinos source", "Source/Video", + "Uses pinos to create video", "Wim Taymans "); gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&gst_pulsevideo_src_template)); + gst_static_pad_template_get (&gst_pinos_src_template)); - gstbasesrc_class->negotiate = gst_pulsevideo_src_negotiate; - gstbasesrc_class->get_caps = gst_pulsevideo_src_getcaps; - gstbasesrc_class->set_caps = gst_pulsevideo_src_setcaps; - gstbasesrc_class->fixate = gst_pulsevideo_src_src_fixate; - gstbasesrc_class->start = gst_pulsevideo_src_start; - gstbasesrc_class->stop = gst_pulsevideo_src_stop; + gstbasesrc_class->negotiate = gst_pinos_src_negotiate; + gstbasesrc_class->get_caps = gst_pinos_src_getcaps; + gstbasesrc_class->set_caps = gst_pinos_src_setcaps; + gstbasesrc_class->fixate = gst_pinos_src_src_fixate; + gstbasesrc_class->start = gst_pinos_src_start; + gstbasesrc_class->stop = gst_pinos_src_stop; - gstpushsrc_class->create = gst_pulsevideo_src_create; + gstpushsrc_class->create = gst_pinos_src_create; - GST_DEBUG_CATEGORY_INIT (pulsevideo_src_debug, "pulsevideosrc", 0, - "Pulsevideo Source"); + GST_DEBUG_CATEGORY_INIT (pinos_src_debug, "pinossrc", 0, + "Pinos Source"); } static void -gst_pulsevideo_src_init (GstPulsevideoSrc * src) +gst_pinos_src_init (GstPinosSrc * src) { /* we operate in time */ gst_base_src_set_format (GST_BASE_SRC (src), GST_FORMAT_TIME); @@ -191,7 +191,7 @@ gst_pulsevideo_src_init (GstPulsevideoSrc * src) } static GstCaps * -gst_pulsevideo_src_src_fixate (GstBaseSrc * bsrc, GstCaps * caps) +gst_pinos_src_src_fixate (GstBaseSrc * bsrc, GstCaps * caps) { GstStructure *structure; @@ -231,7 +231,7 @@ static void on_new_buffer (GObject *gobject, gpointer user_data) { - GstPulsevideoSrc *pvsrc = user_data; + GstPinosSrc *pvsrc = user_data; g_cond_signal (&pvsrc->cond); } @@ -242,7 +242,7 @@ on_stream_notify (GObject *gobject, gpointer user_data) { PvStreamState state; - GstPulsevideoSrc *pvsrc = user_data; + GstPinosSrc *pvsrc = user_data; state = pv_stream_get_state (pvsrc->stream); g_print ("got stream state %d\n", state); @@ -256,9 +256,9 @@ on_stream_notify (GObject *gobject, } static gboolean -gst_pulsevideo_src_negotiate (GstBaseSrc * basesrc) +gst_pinos_src_negotiate (GstBaseSrc * basesrc) { - GstPulsevideoSrc *pvsrc = GST_PULSEVIDEO_SRC (basesrc); + GstPinosSrc *pvsrc = GST_PINOS_SRC (basesrc); GstCaps *thiscaps; GstCaps *caps = NULL; GstCaps *peercaps = NULL; @@ -326,7 +326,7 @@ gst_pulsevideo_src_negotiate (GstBaseSrc * basesrc) * nego is not needed */ result = TRUE; } else { - caps = gst_pulsevideo_src_src_fixate (basesrc, caps); + caps = gst_pinos_src_src_fixate (basesrc, caps); GST_DEBUG_OBJECT (basesrc, "fixated to: %" GST_PTR_FORMAT, caps); if (gst_caps_is_fixed (caps)) { /* yay, fixed caps, use those then, it's possible that the subclass does @@ -367,20 +367,20 @@ connect_error: } static GstCaps * -gst_pulsevideo_src_getcaps (GstBaseSrc * bsrc, GstCaps * filter) +gst_pinos_src_getcaps (GstBaseSrc * bsrc, GstCaps * filter) { return GST_BASE_SRC_CLASS (parent_class)->get_caps (bsrc, filter); } static gboolean -gst_pulsevideo_src_setcaps (GstBaseSrc * bsrc, GstCaps * caps) +gst_pinos_src_setcaps (GstBaseSrc * bsrc, GstCaps * caps) { - GstPulsevideoSrc *pvsrc; + GstPinosSrc *pvsrc; gchar *str; GBytes *format; gboolean res; - pvsrc = GST_PULSEVIDEO_SRC (bsrc); + pvsrc = GST_PINOS_SRC (bsrc); str = gst_caps_to_string (caps); format = g_bytes_new_take (str, strlen (str) + 1); @@ -393,14 +393,14 @@ gst_pulsevideo_src_setcaps (GstBaseSrc * bsrc, GstCaps * caps) } static GstFlowReturn -gst_pulsevideo_src_create (GstPushSrc * psrc, GstBuffer ** buffer) +gst_pinos_src_create (GstPushSrc * psrc, GstBuffer ** buffer) { - GstPulsevideoSrc *pvsrc; + GstPinosSrc *pvsrc; PvBufferInfo info; gint *fds, n_fds; GstMemory *fdmem = NULL; - pvsrc = GST_PULSEVIDEO_SRC (psrc); + pvsrc = GST_PINOS_SRC (psrc); if (!pvsrc->negotiated) goto not_negotiated; @@ -458,13 +458,13 @@ streaming_stopped: } static gboolean -gst_pulsevideo_src_start (GstBaseSrc * basesrc) +gst_pinos_src_start (GstBaseSrc * basesrc) { return TRUE; } static gboolean -gst_pulsevideo_src_stop (GstBaseSrc * basesrc) +gst_pinos_src_stop (GstBaseSrc * basesrc) { return TRUE; } @@ -475,7 +475,7 @@ static gint do_poll (GPollFD *ufds, guint nfsd, gint timeout_) { gint res; - GstPulsevideoSrc *this = g_private_get (&src_key); + GstPinosSrc *this = g_private_get (&src_key); g_mutex_unlock (&this->lock); res = this->poll_func (ufds, nfsd, timeout_); @@ -485,7 +485,7 @@ do_poll (GPollFD *ufds, guint nfsd, gint timeout_) } static gpointer -handle_mainloop (GstPulsevideoSrc *this) +handle_mainloop (GstPinosSrc *this) { g_mutex_lock (&this->lock); g_private_set (&src_key, this); @@ -506,7 +506,7 @@ on_state_notify (GObject *gobject, GParamSpec *pspec, gpointer user_data) { - GstPulsevideoSrc *pvsrc = user_data; + GstPinosSrc *pvsrc = user_data; PvContextState state; state = pv_context_get_state (pvsrc->ctx); @@ -521,7 +521,7 @@ on_state_notify (GObject *gobject, } static gboolean -gst_pulsevideo_src_open (GstPulsevideoSrc * pvsrc) +gst_pinos_src_open (GstPinosSrc * pvsrc) { g_mutex_lock (&pvsrc->lock); @@ -558,18 +558,18 @@ connect_error: } static GstStateChangeReturn -gst_pulsevideo_src_change_state (GstElement * element, GstStateChange transition) +gst_pinos_src_change_state (GstElement * element, GstStateChange transition) { GstStateChangeReturn ret; - GstPulsevideoSrc *this = GST_PULSEVIDEO_SRC_CAST (element); + GstPinosSrc *this = GST_PINOS_SRC_CAST (element); switch (transition) { case GST_STATE_CHANGE_NULL_TO_READY: this->context = g_main_context_new (); g_print ("context %p\n", this->context); this->loop = g_main_loop_new (this->context, FALSE); - this->thread = g_thread_new ("pulsevideo", (GThreadFunc) handle_mainloop, this); - if (!gst_pulsevideo_src_open (this)) { + this->thread = g_thread_new ("pinos", (GThreadFunc) handle_mainloop, this); + if (!gst_pinos_src_open (this)) { ret = GST_STATE_CHANGE_FAILURE; goto exit; } diff --git a/src/gst/gstpvsrc.h b/src/gst/gstpvsrc.h index 01a196d46..4567d5b4a 100644 --- a/src/gst/gstpvsrc.h +++ b/src/gst/gstpvsrc.h @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef __GST_PULSEVIDEO_SRC_H__ -#define __GST_PULSEVIDEO_SRC_H__ +#ifndef __GST_PINOS_SRC_H__ +#define __GST_PINOS_SRC_H__ #include #include @@ -29,28 +29,28 @@ G_BEGIN_DECLS -#define GST_TYPE_PULSEVIDEO_SRC \ - (gst_pulsevideo_src_get_type()) -#define GST_PULSEVIDEO_SRC(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PULSEVIDEO_SRC,GstPulsevideoSrc)) -#define GST_PULSEVIDEO_SRC_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PULSEVIDEO_SRC,GstPulsevideoSrcClass)) -#define GST_IS_PULSEVIDEO_SRC(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PULSEVIDEO_SRC)) -#define GST_IS_PULSEVIDEO_SRC_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PULSEVIDEO_SRC)) -#define GST_PULSEVIDEO_SRC_CAST(obj) \ - ((GstPulsevideoSrc *) (obj)) +#define GST_TYPE_PINOS_SRC \ + (gst_pinos_src_get_type()) +#define GST_PINOS_SRC(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PINOS_SRC,GstPinosSrc)) +#define GST_PINOS_SRC_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PINOS_SRC,GstPinosSrcClass)) +#define GST_IS_PINOS_SRC(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PINOS_SRC)) +#define GST_IS_PINOS_SRC_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PINOS_SRC)) +#define GST_PINOS_SRC_CAST(obj) \ + ((GstPinosSrc *) (obj)) -typedef struct _GstPulsevideoSrc GstPulsevideoSrc; -typedef struct _GstPulsevideoSrcClass GstPulsevideoSrcClass; +typedef struct _GstPinosSrc GstPinosSrc; +typedef struct _GstPinosSrcClass GstPinosSrcClass; /** - * GstPulsevideoSrc: + * GstPinosSrc: * * Opaque data structure. */ -struct _GstPulsevideoSrc { +struct _GstPinosSrc { GstPushSrc element; /*< private >*/ @@ -70,12 +70,12 @@ struct _GstPulsevideoSrc { GCond cond; }; -struct _GstPulsevideoSrcClass { +struct _GstPinosSrcClass { GstPushSrcClass parent_class; }; -GType gst_pulsevideo_src_get_type (void); +GType gst_pinos_src_get_type (void); G_END_DECLS -#endif /* __GST_PULSEVIDEO_SRC_H__ */ +#endif /* __GST_PINOS_SRC_H__ */ diff --git a/src/modules/gst/pv-gst-manager.c b/src/modules/gst/pv-gst-manager.c index f55d3ce3b..699b71f88 100644 --- a/src/modules/gst/pv-gst-manager.c +++ b/src/modules/gst/pv-gst-manager.c @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or diff --git a/src/modules/gst/pv-gst-manager.h b/src/modules/gst/pv-gst-manager.h index 2a5800dfe..17b9df4ea 100644 --- a/src/modules/gst/pv-gst-manager.h +++ b/src/modules/gst/pv-gst-manager.h @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ #include -#include +#include #include G_BEGIN_DECLS diff --git a/src/modules/gst/pv-gst-source.c b/src/modules/gst/pv-gst-source.c index 1b732f9b2..6fd7bc83b 100644 --- a/src/modules/gst/pv-gst-source.c +++ b/src/modules/gst/pv-gst-source.c @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or diff --git a/src/modules/gst/pv-gst-source.h b/src/modules/gst/pv-gst-source.h index c32579a2e..c7c1ebfac 100644 --- a/src/modules/gst/pv-gst-source.h +++ b/src/modules/gst/pv-gst-source.h @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ #include -#include +#include #include #include diff --git a/src/server/pv-client-source.c b/src/server/pv-client-source.c index 09bb1ef9f..f17cda645 100644 --- a/src/server/pv-client-source.c +++ b/src/server/pv-client-source.c @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or diff --git a/src/server/pv-client-source.h b/src/server/pv-client-source.h index e0471bb5b..2ffd1be61 100644 --- a/src/server/pv-client-source.h +++ b/src/server/pv-client-source.h @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -43,7 +43,7 @@ typedef struct _PvClientSourcePrivate PvClientSourcePrivate; /** * PvClientSource: * - * Pulsevideo client source object class. + * Pinos client source object class. */ struct _PvClientSource { PvSource object; @@ -54,7 +54,7 @@ struct _PvClientSource { /** * PvClientSourceClass: * - * Pulsevideo client source object class. + * Pinos client source object class. */ struct _PvClientSourceClass { PvSourceClass parent_class; diff --git a/src/server/pv-client.c b/src/server/pv-client.c index d6811f0ef..acf23b1ec 100644 --- a/src/server/pv-client.c +++ b/src/server/pv-client.c @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -18,14 +18,14 @@ */ #include -#include "client/pulsevideo.h" +#include "client/pinos.h" #include "client/pv-enumtypes.h" #include "server/pv-client.h" #include "server/pv-client-source.h" -#include "dbus/org-pulsevideo.h" +#include "dbus/org-pinos.h" struct _PvClientPrivate { @@ -193,7 +193,7 @@ handle_create_source_output (PvClient1 *interface, not_allowed: { g_dbus_method_invocation_return_dbus_error (invocation, - "org.pulsevideo.Error", "not client owner"); + "org.pinos.Error", "not client owner"); return TRUE; } no_source: @@ -270,13 +270,13 @@ handle_create_source_input (PvClient1 *interface, not_allowed: { g_dbus_method_invocation_return_dbus_error (invocation, - "org.pulsevideo.Error", "not client owner"); + "org.pinos.Error", "not client owner"); return TRUE; } no_source: { g_dbus_method_invocation_return_dbus_error (invocation, - "org.pulsevideo.Error", "Can't create source"); + "org.pinos.Error", "Can't create source"); return TRUE; } no_input: diff --git a/src/server/pv-client.h b/src/server/pv-client.h index dbaa01d28..6c4fea47d 100644 --- a/src/server/pv-client.h +++ b/src/server/pv-client.h @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -42,7 +42,7 @@ typedef struct _PvClientPrivate PvClientPrivate; /** * PvClient: * - * Pulsevideo client object class. + * Pinos client object class. */ struct _PvClient { GObject object; @@ -53,7 +53,7 @@ struct _PvClient { /** * PvClientClass: * - * Pulsevideo client object class. + * Pinos client object class. */ struct _PvClientClass { GObjectClass parent_class; diff --git a/src/server/pv-daemon.c b/src/server/pv-daemon.c index a194983d9..5862887f4 100644 --- a/src/server/pv-daemon.c +++ b/src/server/pv-daemon.c @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -21,12 +21,12 @@ #include "config.h" -#include "client/pulsevideo.h" +#include "client/pinos.h" #include "server/pv-daemon.h" #include "server/pv-client.h" -#include "dbus/org-pulsevideo.h" +#include "dbus/org-pinos.h" #define PV_DAEMON_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE ((obj), PV_TYPE_DAEMON, PvDaemonPrivate)) diff --git a/src/server/pv-daemon.h b/src/server/pv-daemon.h index 396a2dd6e..edcd9a37d 100644 --- a/src/server/pv-daemon.h +++ b/src/server/pv-daemon.h @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -43,7 +43,7 @@ typedef struct _PvDaemonPrivate PvDaemonPrivate; /** * PvDaemon: * - * Pulsevideo daemon object class. + * Pinos daemon object class. */ struct _PvDaemon { GObject object; @@ -54,7 +54,7 @@ struct _PvDaemon { /** * PvDaemonClass: * - * Pulsevideo daemon object class. + * Pinos daemon object class. */ struct _PvDaemonClass { GObjectClass parent_class; diff --git a/src/server/pv-source-output.c b/src/server/pv-source-output.c index 93c94b28d..83241966b 100644 --- a/src/server/pv-source-output.c +++ b/src/server/pv-source-output.c @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -27,7 +27,7 @@ #include "server/pv-daemon.h" #include "server/pv-source-output.h" -#include "dbus/org-pulsevideo.h" +#include "dbus/org-pinos.h" struct _PvSourceOutputPrivate { @@ -202,7 +202,7 @@ handle_start (PvSourceOutput1 *interface, no_format: { g_dbus_method_invocation_return_dbus_error (invocation, - "org.pulsevideo.Error", "No format"); + "org.pinos.Error", "No format"); close (fd[0]); close (fd[1]); g_clear_pointer (&priv->requested_format, g_bytes_unref); diff --git a/src/server/pv-source-output.h b/src/server/pv-source-output.h index ce52c3b0d..97f225f8a 100644 --- a/src/server/pv-source-output.h +++ b/src/server/pv-source-output.h @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -40,7 +40,7 @@ typedef struct _PvSourceOutputPrivate PvSourceOutputPrivate; /** * PvSourceOutput: * - * Pulsevideo source output object class. + * Pinos source output object class. */ struct _PvSourceOutput { GObject object; @@ -51,7 +51,7 @@ struct _PvSourceOutput { /** * PvSourceOutputClass: * - * Pulsevideo source output object class. + * Pinos source output object class. */ struct _PvSourceOutputClass { GObjectClass parent_class; diff --git a/src/server/pv-source.c b/src/server/pv-source.c index 66400ad70..7647c22b3 100644 --- a/src/server/pv-source.c +++ b/src/server/pv-source.c @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -19,13 +19,13 @@ #include -#include "client/pulsevideo.h" +#include "client/pinos.h" #include "client/pv-enumtypes.h" #include "server/pv-source.h" #include "server/pv-daemon.h" -#include "dbus/org-pulsevideo.h" +#include "dbus/org-pinos.h" #define PV_SOURCE_GET_PRIVATE(obj) \ diff --git a/src/server/pv-source.h b/src/server/pv-source.h index 1b862ddf0..33aecdd89 100644 --- a/src/server/pv-source.h +++ b/src/server/pv-source.h @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -44,7 +44,7 @@ typedef struct _PvSourcePrivate PvSourcePrivate; /** * PvSource: * - * Pulsevideo source object class. + * Pinos source object class. */ struct _PvSource { GObject object; @@ -59,7 +59,7 @@ struct _PvSource { * @create_source_output: called to create a new source-output object * @release_source_output: called to release a source-output object * - * Pulsevideo source object class. + * Pinos source object class. */ struct _PvSourceClass { GObjectClass parent_class; diff --git a/src/tests/test-client.c b/src/tests/test-client.c index fec510027..8a1b096a3 100644 --- a/src/tests/test-client.c +++ b/src/tests/test-client.c @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ #include #include -#include +#include #define ANY_CAPS "ANY" diff --git a/src/tests/test-subscribe.c b/src/tests/test-subscribe.c index 43e7ef8ce..f230b5252 100644 --- a/src/tests/test-subscribe.c +++ b/src/tests/test-subscribe.c @@ -1,4 +1,4 @@ -/* Pulsevideo +/* Pinos * Copyright (C) 2015 Wim Taymans * * This library is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #include -#include +#include static GMainLoop *loop;