From: Paul Davis Date: Mon, 25 Sep 2017 15:12:32 +0000 (-0400) Subject: additional changes to follow library name change from timecode -> temporal X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=dcb55c508effe34453dc1c7e367ae08fe0a3b782;p=ardour.git additional changes to follow library name change from timecode -> temporal --- diff --git a/doc/Doxyfile b/doc/Doxyfile index e816b1165a..ca439eab5b 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -768,7 +768,7 @@ INPUT = ../libs/ardour \ ../libs/pbd \ ../libs/ptformat \ ../libs/qm-dsp \ - ../libs/timecode \ + ../libs/temporal \ ../gtk2_ardour \ mainpage.txt diff --git a/doc/source_tree_layout.txt b/doc/source_tree_layout.txt index 9dd982cb39..87226ee7d4 100644 --- a/doc/source_tree_layout.txt +++ b/doc/source_tree_layout.txt @@ -40,8 +40,9 @@ libs/ - vamp-plugins VAMP plugins for audio analysis and offline processing (uses qm-dsp) - - timecode - Timecode (FPS) and musical time conversions + - temporal + various utility code for dealing with different kinds of time, + including Timecode (FPS) and musical time conversions - lua Lua Script interpreter and C++ class abstraction diff --git a/headless/hardev_common.sh.in b/headless/hardev_common.sh.in index 703e388e5a..f06a4f1f8d 100644 --- a/headless/hardev_common.sh.in +++ b/headless/hardev_common.sh.in @@ -30,7 +30,7 @@ export ARDOUR_DLL_PATH=$libs export GTK_PATH=~/.ardour3:$libs/clearlooks-newer export VAMP_PATH=$libs/vamp-plugins${VAMP_PATH:+:$VAMP_PATH} -export LD_LIBRARY_PATH=$libs/qm-dsp:$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/gnomecanvas:$libs/libsndfile:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer:$libs/timecode:$libs/libltc:$libs/canvas${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} +export LD_LIBRARY_PATH=$libs/qm-dsp:$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/gnomecanvas:$libs/libsndfile:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer:$libs/temporal:$libs/libltc:$libs/canvas${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} # DYLD_LIBRARY_PATH is for darwin. export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH diff --git a/libs/temporal/MSVCtimecode/timecode.vcproj b/libs/temporal/MSVCtimecode/timecode.vcproj index 9ef7d30e70..c9039eaa90 100644 --- a/libs/temporal/MSVCtimecode/timecode.vcproj +++ b/libs/temporal/MSVCtimecode/timecode.vcproj @@ -2,9 +2,9 @@ diff --git a/nutemp/makefile b/nutemp/makefile index 422317c88c..82d1a9884c 100644 --- a/nutemp/makefile +++ b/nutemp/makefile @@ -1,11 +1,11 @@ AD = .. CXXFLAGS = -g -CPPFLAGS = -I $(AD)/libs/ardour -I $(AD)/libs/evoral -I $(AD)/libs/pbd -I $(AD)/build/libs/pbd -I $(AD)/libs/timecode +CPPFLAGS = -I $(AD)/libs/ardour -I $(AD)/libs/evoral -I $(AD)/libs/pbd -I $(AD)/build/libs/pbd -I $(AD)/libs/temporal CPPFLAGS += `pkg-config --cflags glibmm-2.4` `pkg-config --cflags libxml-2.0` LDFLAGS = -L $(AD)/build/libs/evoral -levoral -Xlinker -rpath=$(AD)/build/libs/evoral LDFLAGS += -L $(AD)/build/libs/pbd -lpbd -Xlinker -rpath=$(AD)/build/libs/pbd -LDFLAGS += -L $(AD)/build/libs/timecode -ltimecode -Xlinker -rpath=$(AD)/build/libs/timecode +LDFLAGS += -L $(AD)/build/libs/temporal -ltemporal -Xlinker -rpath=$(AD)/build/libs/temporal LDFLAGS += `pkg-config --cflags --libs glibmm-2.4` `pkg-config --cflags --libs libxml-2.0` all: t diff --git a/tools/doxy2json/ardourdoc.sh b/tools/doxy2json/ardourdoc.sh index ebe8767d86..43e940bca7 100755 --- a/tools/doxy2json/ardourdoc.sh +++ b/tools/doxy2json/ardourdoc.sh @@ -20,7 +20,7 @@ time ./tools/doxy2json/doxy2json -j 4 \ -D HAVE_LILV_0_16_0=1 -D HAVE_LILV_0_19_2=1 -D HAVE_LILV_0_21_3=1 -D HAVE_SUIL=1 -D LV2_SUPPORT=1 -D LV2_EXTENDED=1 -D HAVE_GTK=1 -D HAVE_LIBS_GTKMM2EXT=1 \ -D HAVE_X11=1 -D LXVST_64BIT=1 -D LXVST_SUPPORT=1 -D HAVE_TAGLIB=1 -D HAVE_POSIX_MEMALIGN=1 -D HAVE_VAMPSDK=1 -D HAVE_VAMPHOSTSDK=1 -D HAVE_RUBBERBAND=1 -D ENABLE_NLS=1 \ -D HAVE_CURL=1 -D HAVE_LO=1 -D HAVE_LRDF=1 -D _VAMP_NO_PLUGIN_NAMESPACE=1 \ - -I libs/ardour -I libs/pbd -I libs/lua -I gtk2_ardour -I libs/timecode -I libs/audiographer -I libs/ptformat -I libs/fst \ + -I libs/ardour -I libs/pbd -I libs/lua -I gtk2_ardour -I libs/temporal -I libs/audiographer -I libs/ptformat -I libs/fst \ -I libs/ltc -I libs/evoral -I libs/canvas -I libs/gtkmm2ext -I libs/midi++2 -I libs/surfaces/control_protocol \ -I libs/waveview -I libs/widgets -I libs -I build/libs/pbd -I build/libs/ardour -I build/gtk2_ardour \ `pkg-config --cflags glib-2.0 glibmm-2.4 cairomm-1.0 gtkmm-2.4 libxml-2.0 lilv-0 suil-0 | sed 's/-std=c++11 //;s/-pthread //'` \ diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 81b661812f..830b4d2ef7 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -487,7 +487,7 @@ EOF fi OURLIBDIR=$BUILD_ROOT/libs -OURLIBS=$OURLIBDIR/surfaces/control_protocol:$OURLIBDIR/ardour:$OURLIBDIR/midi++2:$OURLIBDIR/pbd:$OURLIBDIR/gtkmm2ext:$OURLIBDIR/glibmm2:$OURLIBDIR/canvas:$OURLIBDIR/widgets:$OURLIBDIR/waveview:$OURLIBDIR/evoral:$OURLIBDIR/evoral/src/libsmf:$OURLIBDIR/audiographer:$OURLIBDIR/timecode:$OURLIBDIR/libltc:$OURLIBDIR/qm-dsp:$OURLIBDIR/ardouralsautil:$OURLIBDIR/ptformat:$BUILD_ROOT/gtk2_ardour +OURLIBS=$OURLIBDIR/surfaces/control_protocol:$OURLIBDIR/ardour:$OURLIBDIR/midi++2:$OURLIBDIR/pbd:$OURLIBDIR/gtkmm2ext:$OURLIBDIR/glibmm2:$OURLIBDIR/canvas:$OURLIBDIR/widgets:$OURLIBDIR/waveview:$OURLIBDIR/evoral:$OURLIBDIR/evoral/src/libsmf:$OURLIBDIR/audiographer:$OURLIBDIR/temporal:$OURLIBDIR/libltc:$OURLIBDIR/qm-dsp:$OURLIBDIR/ardouralsautil:$OURLIBDIR/ptformat:$BUILD_ROOT/gtk2_ardour echo $OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh index bfb7381e41..1d9faa46f4 100755 --- a/tools/x-win/package.sh +++ b/tools/x-win/package.sh @@ -135,7 +135,7 @@ cp build/libs/gtkmm2ext/gtkmm2ext-*.dll $DESTDIR/bin/ cp build/libs/midi++2/midipp-*.dll $DESTDIR/bin/ cp build/libs/evoral/evoral-*.dll $DESTDIR/bin/ cp build/libs/ardour/ardour-*.dll $DESTDIR/bin/ -cp build/libs/timecode/timecode.dll $DESTDIR/bin/ +cp build/libs/temporal/temporal-*.dll $DESTDIR/bin/ cp build/libs/canvas/canvas-*.dll $DESTDIR/bin/ cp build/libs/widgets/widgets-*.dll $DESTDIR/bin/ cp build/libs/waveview/waveview-*.dll $DESTDIR/bin/