summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVito Caputo <vcaputo@pengaru.com>2023-01-13 20:13:37 -0800
committerVito Caputo <vcaputo@pengaru.com>2023-01-20 00:20:05 -0800
commit729ea9c0f2d6a9caa27f17c05e0c26560a8f07e1 (patch)
tree56417256e28e216bad5d2398b10f6197d733afed
parentc741a478a1096212e93e881b58fdb654465bc19d (diff)
libs/rocket: add GNU Rocket submodule
Preparatory commit for experimenting with a GNU Rocket integration for controlling the stream pipes on a timeline. Since rocket doesn't support things like arbitrary strings, it's not a natural fit for rototiller where the obvious thing would be to describe scene compositions as settings strings as if you were invoking rototiller. But a temporary hack might be to just tell a rocket module up-front all the scenes as settings strings you provide to its setup. Those get assigned numeric identifiers, then rocket tracks can control when they come on/off numerically. It just requires describing all the scenes up front rather than in the pattern editor which is less than ideal. Being able to experiment with this half-ass solution may prove useful anyways, and shouldn't be too much work.
-rw-r--r--.gitmodules3
-rw-r--r--configure.ac3
-rw-r--r--src/Makefile.am2
-rw-r--r--src/libs/Makefile.am2
-rw-r--r--src/libs/rocket/Makefile.am2
m---------src/libs/rocket/rocket0
6 files changed, 9 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..a3554f1
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src/libs/rocket/rocket"]
+ path = src/libs/rocket/rocket
+ url = https://github.com/rocket/rocket
diff --git a/configure.ac b/configure.ac
index 1c56d34..c796695 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_INIT([rototiller], [1.0], [vcaputo@pengaru.com])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
AC_CONFIG_MACRO_DIRS([m4])
AC_PROG_CC
AM_PROG_CC_C_O
@@ -36,6 +36,7 @@ AC_CONFIG_FILES([
src/libs/ascii/Makefile
src/libs/grid/Makefile
src/libs/din/Makefile
+ src/libs/rocket/Makefile
src/libs/puddle/Makefile
src/libs/ray/Makefile
src/libs/sig/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 458294c..f5b2116 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = libs modules
noinst_LTLIBRARIES = libtil.la
libtil_la_SOURCES = til_args.c til_args.h til_fb.c til_fb.h til_jenkins.c til_jenkins.h til_knobs.h til.c til.h til_module_context.c til_module_context.h til_settings.h til_settings.c til_setup.c til_setup.h til_stream.c til_stream.h til_tap.h til_threads.c til_threads.h til_util.c til_util.h
libtil_la_CPPFLAGS = -I@top_srcdir@/src
-libtil_la_LIBADD = modules/blinds/libblinds.la modules/checkers/libcheckers.la modules/compose/libcompose.la modules/drizzle/libdrizzle.la modules/flui2d/libflui2d.la modules/julia/libjulia.la modules/meta2d/libmeta2d.la modules/moire/libmoire.la modules/montage/libmontage.la modules/pixbounce/libpixbounce.la modules/plasma/libplasma.la modules/plato/libplato.la modules/ray/libray.la modules/roto/libroto.la modules/rtv/librtv.la modules/shapes/libshapes.la modules/snow/libsnow.la modules/sparkler/libsparkler.la modules/spiro/libspiro.la modules/stars/libstars.la modules/strobe/libstrobe.la modules/submit/libsubmit.la modules/swab/libswab.la modules/swarm/libswarm.la modules/voronoi/libvoronoi.la libs/grid/libgrid.la libs/puddle/libpuddle.la libs/ray/libray.la libs/sig/libsig.la libs/txt/libtxt.la libs/ascii/libascii.la libs/din/libdin.la
+libtil_la_LIBADD = modules/blinds/libblinds.la modules/checkers/libcheckers.la modules/compose/libcompose.la modules/drizzle/libdrizzle.la modules/flui2d/libflui2d.la modules/julia/libjulia.la modules/meta2d/libmeta2d.la modules/moire/libmoire.la modules/montage/libmontage.la modules/pixbounce/libpixbounce.la modules/plasma/libplasma.la modules/plato/libplato.la modules/ray/libray.la modules/roto/libroto.la modules/rtv/librtv.la modules/shapes/libshapes.la modules/snow/libsnow.la modules/sparkler/libsparkler.la modules/spiro/libspiro.la modules/stars/libstars.la modules/strobe/libstrobe.la modules/submit/libsubmit.la modules/swab/libswab.la modules/swarm/libswarm.la modules/voronoi/libvoronoi.la libs/grid/libgrid.la libs/puddle/libpuddle.la libs/ray/libray.la libs/rocket/librocket.la libs/sig/libsig.la libs/txt/libtxt.la libs/ascii/libascii.la libs/din/libdin.la
bin_PROGRAMS = rototiller
rototiller_SOURCES = fps.c fps.h main.c mem_fb.c setup.h setup.c til.h til_fb.c til_fb.h til_knobs.h til_settings.c til_settings.h til_threads.c til_threads.h til_util.c til_util.h
diff --git a/src/libs/Makefile.am b/src/libs/Makefile.am
index 36addcd..39de08d 100644
--- a/src/libs/Makefile.am
+++ b/src/libs/Makefile.am
@@ -1 +1 @@
-SUBDIRS = ascii grid din puddle ray sig txt
+SUBDIRS = ascii grid din rocket puddle ray sig txt
diff --git a/src/libs/rocket/Makefile.am b/src/libs/rocket/Makefile.am
new file mode 100644
index 0000000..a51d0f5
--- /dev/null
+++ b/src/libs/rocket/Makefile.am
@@ -0,0 +1,2 @@
+noinst_LTLIBRARIES = librocket.la
+librocket_la_SOURCES = rocket/lib/base.h rocket/lib/device.c rocket/lib/device.h rocket/lib/sync.h rocket/lib/track.c rocket/lib/track.h
diff --git a/src/libs/rocket/rocket b/src/libs/rocket/rocket
new file mode 160000
+Subproject 268211781867dbbd8e0f54fa9e74a6afc3b9647
© All Rights Reserved