[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid.spec
^
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/mer-hybris/pulseaudio-modules-droid.git</param>
<param name="branch">master</param>
- <param name="revision">HEAD</param>
+ <param name="revision">22be43a324fee369c488c7b6b12282b133b38b95</param>
<param name="token"></param>
<param name="debian"></param>
<param name="dumb"></param>
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid-12.2.86.tar.bz2/src/droid/Makefile.am
^
|
@@ -19,6 +19,8 @@
module-droid-source.la \
module-droid-card.la
+noinst_HEADERS = module-droid-sink-symdef.h module-droid-source-symdef.h module-droid-card-symdef.h
+
libdroid_sink_la_SOURCES = droid-sink.c droid-sink.h
libdroid_sink_la_LDFLAGS = -avoid-version -Wl,-z,noexecstack -lhybris-common
libdroid_sink_la_LIBADD = $(top_builddir)/src/common/libdroid-util.la $(AM_LIBADD)
@@ -32,14 +34,14 @@
module_droid_sink_la_SOURCES = module-droid-sink.c
module_droid_sink_la_LDFLAGS = -module -avoid-version -Wl,-z,noexecstack -lhybris-common
module_droid_sink_la_LIBADD = -lm libdroid-sink.la $(AM_LIBADD)
-module_droid_sink_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_droid_sink
+module_droid_sink_la_CFLAGS = $(AM_CFLAGS)
module_droid_source_la_SOURCES = module-droid-source.c
module_droid_source_la_LDFLAGS = -module -avoid-version -Wl,-z,noexecstack -lhybris-common
module_droid_source_la_LIBADD = -lm libdroid-source.la $(AM_LIBADD)
-module_droid_source_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_droid_source
+module_droid_source_la_CFLAGS = $(AM_CFLAGS)
module_droid_card_la_SOURCES = module-droid-card.c
module_droid_card_la_LDFLAGS = -module -avoid-version -Wl,-z,noexecstack -lhybris-common
module_droid_card_la_LIBADD = -lm libdroid-sink.la libdroid-source.la $(top_builddir)/src/common/libdroid-util.la $(AM_LIBADD)
-module_droid_card_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_droid_card
+module_droid_card_la_CFLAGS = $(AM_CFLAGS)
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid-12.2.86.tar.bz2/src/droid/droid-sink.c
^
|
@@ -54,7 +54,6 @@
#include <pulsecore/time-smoother.h>
#include <pulsecore/hashmap.h>
#include <pulsecore/core-subscribe.h>
-#include <pulse/util.h>
#include <pulse/version.h>
#include "droid-sink.h"
@@ -524,6 +523,14 @@
*((pa_usec_t*) data) = pa_droid_stream_get_latency(u->stream);
return 0;
}
+
+#if PULSEAUDIO_VERSION < 12
+ case PA_SINK_MESSAGE_SET_STATE: {
+ int r;
+ if ((r = sink_set_state_in_io_thread_cb(u->sink, PA_PTR_TO_UINT(data), 0)) < 0)
+ return r;
+ }
+#endif
}
return pa_sink_process_msg(o, code, data, offset, chunk);
@@ -1278,7 +1285,9 @@
u->sink->userdata = u;
u->sink->parent.process_msg = sink_process_msg;
+#if PULSEAUDIO_VERSION >= 12
u->sink->set_state_in_io_thread = sink_set_state_in_io_thread_cb;
+#endif
u->sink->set_port = sink_set_port_cb;
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid-12.2.86.tar.bz2/src/droid/droid-source.c
^
|
@@ -51,7 +51,6 @@
#include <pulsecore/rtpoll.h>
#include <pulsecore/time-smoother.h>
#include <pulsecore/resampler.h>
-#include <pulse/util.h>
#include <pulse/version.h>
#include "droid-source.h"
@@ -325,6 +324,23 @@
return 0;
}
+/* Called from IO context */
+static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
+#if PULSEAUDIO_VERSION < 12
+ struct userdata *u = PA_SOURCE(o)->userdata;
+
+ switch (code) {
+ case PA_SOURCE_MESSAGE_SET_STATE: {
+ int r;
+ if ((r = source_set_state_in_io_thread_cb(u->source, PA_PTR_TO_UINT(data), 0)) < 0)
+ return r;
+ }
+ }
+#endif
+
+ return pa_source_process_msg(o, code, data, offset, chunk);
+}
+
static int source_set_port_cb(pa_source *s, pa_device_port *p) {
struct userdata *u = s->userdata;
pa_droid_port_data *data;
@@ -724,8 +740,10 @@
u->source->userdata = u;
- u->source->parent.process_msg = pa_source_process_msg;
+ u->source->parent.process_msg = source_process_msg;
+#if PULSEAUDIO_VERSION >= 12
u->source->set_state_in_io_thread = source_set_state_in_io_thread_cb;
+#endif
source_set_mute_control(u);
|
[-]
[+]
|
Added |
_service:tar_git:pulseaudio-modules-droid-12.2.86.tar.bz2/src/droid/module-droid-card-symdef.h
^
|
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2013-2018 Jolla Ltd.
+ *
+ * Contact: Juho Hämäläinen <juho.hamalainen@jolla.com>
+ *
+ * These PulseAudio Modules are 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
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA.
+ */
+#ifndef foomoduledroidcardsymdeffoo
+#define foomoduledroidcardsymdeffoo
+
+#include <pulsecore/core.h>
+#include <pulsecore/module.h>
+
+#define pa__init module_droid_card_LTX_pa__init
+#define pa__done module_droid_card_LTX_pa__done
+#define pa__get_author module_droid_card_LTX_pa__get_author
+#define pa__get_description module_droid_card_LTX_pa__get_description
+#define pa__get_usage module_droid_card_LTX_pa__get_usage
+#define pa__get_version module_droid_card_LTX_pa__get_version
+
+int pa__init(struct pa_module*m);
+void pa__done(struct pa_module*m);
+
+const char* pa__get_author(void);
+const char* pa__get_description(void);
+const char* pa__get_usage(void);
+const char* pa__get_version(void);
+
+#endif
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid-12.2.86.tar.bz2/src/droid/module-droid-card.c
^
|
@@ -64,6 +64,8 @@
#include "droid-sink.h"
#include "droid-source.h"
+#include "module-droid-card-symdef.h"
+
PA_MODULE_AUTHOR("Juho Hämäläinen");
PA_MODULE_DESCRIPTION("Droid card");
PA_MODULE_VERSION(PACKAGE_VERSION);
|
[-]
[+]
|
Added |
_service:tar_git:pulseaudio-modules-droid-12.2.86.tar.bz2/src/droid/module-droid-sink-symdef.h
^
|
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2013-2018 Jolla Ltd.
+ *
+ * Contact: Juho Hämäläinen <juho.hamalainen@jolla.com>
+ *
+ * These PulseAudio Modules are 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
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA.
+ */
+#ifndef foomoduledroidsinksymdeffoo
+#define foomoduledroidsinksymdeffoo
+
+#include <pulsecore/core.h>
+#include <pulsecore/module.h>
+
+#define pa__init module_droid_sink_LTX_pa__init
+#define pa__done module_droid_sink_LTX_pa__done
+#define pa__get_author module_droid_sink_LTX_pa__get_author
+#define pa__get_description module_droid_sink_LTX_pa__get_description
+#define pa__get_usage module_droid_sink_LTX_pa__get_usage
+#define pa__get_version module_droid_sink_LTX_pa__get_version
+
+int pa__init(struct pa_module*m);
+void pa__done(struct pa_module*m);
+
+const char* pa__get_author(void);
+const char* pa__get_description(void);
+const char* pa__get_usage(void);
+const char* pa__get_version(void);
+
+#endif
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid-12.2.86.tar.bz2/src/droid/module-droid-sink.c
^
|
@@ -41,6 +41,8 @@
#include <droid/conversion.h>
#include "droid-sink.h"
+#include "module-droid-sink-symdef.h"
+
PA_MODULE_AUTHOR("Juho Hämäläinen");
PA_MODULE_DESCRIPTION("Droid sink");
PA_MODULE_USAGE("master_sink=<sink to connect to> "
|
[-]
[+]
|
Added |
_service:tar_git:pulseaudio-modules-droid-12.2.86.tar.bz2/src/droid/module-droid-source-symdef.h
^
|
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2013-2018 Jolla Ltd.
+ *
+ * Contact: Juho Hämäläinen <juho.hamalainen@jolla.com>
+ *
+ * These PulseAudio Modules are 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
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA.
+ */
+#ifndef foomoduledroidsourcesymdeffoo
+#define foomoduledroidsourcesymdeffoo
+
+#include <pulsecore/core.h>
+#include <pulsecore/module.h>
+
+#define pa__init module_droid_source_LTX_pa__init
+#define pa__done module_droid_source_LTX_pa__done
+#define pa__get_author module_droid_source_LTX_pa__get_author
+#define pa__get_description module_droid_source_LTX_pa__get_description
+#define pa__get_usage module_droid_source_LTX_pa__get_usage
+#define pa__get_version module_droid_source_LTX_pa__get_version
+
+int pa__init(struct pa_module*m);
+void pa__done(struct pa_module*m);
+
+const char* pa__get_author(void);
+const char* pa__get_description(void);
+const char* pa__get_usage(void);
+const char* pa__get_version(void);
+
+#endif
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid-12.2.86.tar.bz2/src/droid/module-droid-source.c
^
|
@@ -40,6 +40,8 @@
#include <droid/droid-util.h>
#include "droid-source.h"
+#include "module-droid-source-symdef.h"
+
PA_MODULE_AUTHOR("Juho Hämäläinen");
PA_MODULE_DESCRIPTION("Droid source");
PA_MODULE_USAGE("master_source=<source to connect to> "
|