ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

post rebase fixes

Browse source 
tests are still broken and will be fixed for the shared lib transistion
This commit is contained in:
Christian Thaeter 2008-12-16 19:54:48 +01:00
parent 4458b6f232
commit 9a1a1890e2
12 changed files with 135 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/backend/Makefile.am
View file

@ -31,7 +31,12 @@ liblumibackend_a_SOURCES = \
$(liblumibackend_a_srcdir)/mmap.c \
$(liblumibackend_a_srcdir)/mmapings.c \
$(liblumibackend_a_srcdir)/mmapcache.c \
$(liblumibackend_a_srcdir)/filehandlecache.c
$(liblumibackend_a_srcdir)/filehandlecache.c \
$(liblumibackend_a_srcdir)/enginefacade.cpp \
$(liblumibackend_a_srcdir)/mediaaccessfacade.cpp \
$(liblumibackend_a_srcdir)/scriptrunnerfacade.cpp \
$(liblumibackend_a_srcdir)/netnodefacade.cpp
noinst_HEADERS += \
$(liblumibackend_a_srcdir)/mediaaccessfacade.cpp \

2
src/backend/backend.c
View file

@ -22,7 +22,7 @@
#include "lib/safeclib.h"
#include "backend/backend.h"
#include "backend/config.h"
#include "lumiera/config.h"
#include "backend/filehandlecache.h"
#include "backend/filedescriptor.h"
#include "backend/mmapcache.h"

2
src/backend/mmap.c
View file

@ -23,7 +23,7 @@
#include "backend/mmap.h"
#include "backend/mmapcache.h"
#include "backend/config.h"
#include "lumiera/config.h"
#include <unistd.h>
#include <sys/mman.h>

3
src/common/Makefile.am
View file

@ -27,7 +27,6 @@ liblumicommon_a_SOURCES = \
$(liblumicommon_a_srcdir)/lumitime.cpp \
$(liblumicommon_a_srcdir)/util.cpp \
$(liblumicommon_a_srcdir)/visitor.cpp \
$(liblumicommon_a_srcdir)/cmdline.cpp \
$(liblumicommon_a_srcdir)/configrules.cpp \
$(liblumicommon_a_srcdir)/error.cpp \
$(liblumicommon_a_srcdir)/query.cpp \
@ -38,7 +37,6 @@ liblumicommon_a_SOURCES = \
noinst_HEADERS += \
$(liblumicommon_a_srcdir)/cmdline.hpp \
$(liblumicommon_a_srcdir)/factory.hpp \
$(liblumicommon_a_srcdir)/frameid.hpp \
$(liblumicommon_a_srcdir)/singleton.hpp \
@ -49,7 +47,6 @@ noinst_HEADERS += \
$(liblumicommon_a_srcdir)/visitordispatcher.hpp \
$(liblumicommon_a_srcdir)/visitorpolicies.hpp \
$(liblumicommon_a_srcdir)/configrules.hpp \
$(liblumicommon_a_srcdir)/error.hpp \
$(liblumicommon_a_srcdir)/multithread.hpp \
$(liblumicommon_a_srcdir)/p.hpp \
$(liblumicommon_a_srcdir)/query.hpp \

146
src/gui/Makefile.am
View file

@ -20,83 +20,83 @@ lumigui_srcdir = $(top_srcdir)/src/gui
#lumigui_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror
lumigui_CPPFLAGS = $(AM_CPPFLAGS) \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
lumigui_CPPFLAGS = $(AM_CPPFLAGS) \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
$(LUMIERA_GUI_CFLAGS)
bin_PROGRAMS += lumigui
lumigui_SOURCES = \
$(lumigui_srcdir)/gtk-lumiera.cpp \
$(lumigui_srcdir)/gtk-lumiera.hpp \
$(lumigui_srcdir)/window-manager.cpp \
$(lumigui_srcdir)/window-manager.hpp \
$(lumigui_srcdir)/workspace/actions.cpp \
$(lumigui_srcdir)/workspace/actions.hpp \
$(lumigui_srcdir)/workspace/workspace-window.cpp \
$(lumigui_srcdir)/workspace/workspace-window.hpp \
$(lumigui_srcdir)/dialogs/dialog.hpp \
$(lumigui_srcdir)/dialogs/render.cpp \
$(lumigui_srcdir)/dialogs/render.hpp \
$(lumigui_srcdir)/dialogs/preferences-dialog.cpp \
$(lumigui_srcdir)/dialogs/preferences-dialog.hpp \
$(lumigui_srcdir)/dialogs/sequence-name.cpp \
$(lumigui_srcdir)/dialogs/sequence-name.hpp \
$(lumigui_srcdir)/panels/panel.cpp \
$(lumigui_srcdir)/panels/panel.hpp \
$(lumigui_srcdir)/panels/timeline-panel.cpp \
$(lumigui_srcdir)/panels/timeline-panel.hpp \
$(lumigui_srcdir)/panels/viewer-panel.cpp \
$(lumigui_srcdir)/panels/viewer-panel.hpp \
$(lumigui_srcdir)/panels/assets-panel.cpp \
$(lumigui_srcdir)/panels/assets-panel.hpp \
$(lumigui_srcdir)/widgets/video-display-widget.cpp \
$(lumigui_srcdir)/widgets/video-display-widget.hpp \
$(lumigui_srcdir)/widgets/timeline-widget.cpp \
$(lumigui_srcdir)/widgets/timeline-widget.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-view-window.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-view-window.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-header-container.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-header-container.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-body.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-body.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-ruler.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-ruler.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-tool.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-tool.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-arrow-tool.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-arrow-tool.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-ibeam-tool.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-ibeam-tool.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-track.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-track.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-clip-track.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-clip-track.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-group-track.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-group-track.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-clip.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-clip.hpp \
$(lumigui_srcdir)/model/project.cpp \
$(lumigui_srcdir)/model/project.hpp \
$(lumigui_srcdir)/model/track-base.cpp \
$(lumigui_srcdir)/model/track-base.hpp \
$(lumigui_srcdir)/model/sequence.cpp \
$(lumigui_srcdir)/model/sequence.hpp \
$(lumigui_srcdir)/model/track.cpp \
$(lumigui_srcdir)/model/track.hpp \
$(lumigui_srcdir)/model/clip-track.cpp \
$(lumigui_srcdir)/model/clip-track.hpp \
$(lumigui_srcdir)/model/group-track.cpp \
$(lumigui_srcdir)/model/group-track.hpp \
$(lumigui_srcdir)/model/clip.cpp \
$(lumigui_srcdir)/model/clip.hpp \
$(lumigui_srcdir)/output/displayer.cpp \
$(lumigui_srcdir)/output/displayer.hpp \
$(lumigui_srcdir)/output/gdkdisplayer.cpp \
$(lumigui_srcdir)/output/gdkdisplayer.hpp \
$(lumigui_srcdir)/output/xvdisplayer.cpp \
lumigui_SOURCES = \
$(lumigui_srcdir)/gtk-lumiera.cpp \
$(lumigui_srcdir)/gtk-lumiera.hpp \
$(lumigui_srcdir)/window-manager.cpp \
$(lumigui_srcdir)/window-manager.hpp \
$(lumigui_srcdir)/workspace/actions.cpp \
$(lumigui_srcdir)/workspace/actions.hpp \
$(lumigui_srcdir)/workspace/workspace-window.cpp \
$(lumigui_srcdir)/workspace/workspace-window.hpp \
$(lumigui_srcdir)/dialogs/dialog.hpp \
$(lumigui_srcdir)/dialogs/render.cpp \
$(lumigui_srcdir)/dialogs/render.hpp \
$(lumigui_srcdir)/dialogs/preferences-dialog.cpp \
$(lumigui_srcdir)/dialogs/preferences-dialog.hpp \
$(lumigui_srcdir)/dialogs/sequence-name.cpp \
$(lumigui_srcdir)/dialogs/sequence-name.hpp \
$(lumigui_srcdir)/panels/panel.cpp \
$(lumigui_srcdir)/panels/panel.hpp \
$(lumigui_srcdir)/panels/timeline-panel.cpp \
$(lumigui_srcdir)/panels/timeline-panel.hpp \
$(lumigui_srcdir)/panels/viewer-panel.cpp \
$(lumigui_srcdir)/panels/viewer-panel.hpp \
$(lumigui_srcdir)/panels/assets-panel.cpp \
$(lumigui_srcdir)/panels/assets-panel.hpp \
$(lumigui_srcdir)/widgets/video-display-widget.cpp \
$(lumigui_srcdir)/widgets/video-display-widget.hpp \
$(lumigui_srcdir)/widgets/timeline-widget.cpp \
$(lumigui_srcdir)/widgets/timeline-widget.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-view-window.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-view-window.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-header-container.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-header-container.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-body.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-body.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-ruler.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-ruler.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-tool.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-tool.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-arrow-tool.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-arrow-tool.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-ibeam-tool.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-ibeam-tool.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-track.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-track.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-clip-track.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-clip-track.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-group-track.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-group-track.hpp \
$(lumigui_srcdir)/widgets/timeline/timeline-clip.cpp \
$(lumigui_srcdir)/widgets/timeline/timeline-clip.hpp \
$(lumigui_srcdir)/model/project.cpp \
$(lumigui_srcdir)/model/project.hpp \
$(lumigui_srcdir)/model/track-base.cpp \
$(lumigui_srcdir)/model/track-base.hpp \
$(lumigui_srcdir)/model/sequence.cpp \
$(lumigui_srcdir)/model/sequence.hpp \
$(lumigui_srcdir)/model/track.cpp \
$(lumigui_srcdir)/model/track.hpp \
$(lumigui_srcdir)/model/clip-track.cpp \
$(lumigui_srcdir)/model/clip-track.hpp \
$(lumigui_srcdir)/model/group-track.cpp \
$(lumigui_srcdir)/model/group-track.hpp \
$(lumigui_srcdir)/model/clip.cpp \
$(lumigui_srcdir)/model/clip.hpp \
$(lumigui_srcdir)/output/displayer.cpp \
$(lumigui_srcdir)/output/displayer.hpp \
$(lumigui_srcdir)/output/gdkdisplayer.cpp \
$(lumigui_srcdir)/output/gdkdisplayer.hpp \
$(lumigui_srcdir)/output/xvdisplayer.cpp \
$(lumigui_srcdir)/output/xvdisplayer.hpp
lumigui_LDFLAGS =

33
src/lib/Makefile.am
View file

@ -31,25 +31,24 @@ liblumiera_a_SOURCES = \
$(liblumiera_a_srcdir)/psplay.c \
$(liblumiera_a_srcdir)/mrucache.c \
$(liblumiera_a_srcdir)/time.c \
$(liblumiera_a_srcdir)/allocationcluster.cpp\
$(liblumiera_a_srcdir)/allocationcluster.cpp \
$(liblumiera_a_srcdir)/external/libgavl.cpp \
$(liblumiera_a_srcdir)/appconfig.cpp
$(liblumiera_a_srcdir)/cmdline.cpp
noinst_HEADERS += \
$(liblumiera_a_srcdir)/error.h \
$(liblumiera_a_srcdir)/mutex.h \
$(liblumiera_a_srcdir)/rwlock.h \
$(liblumiera_a_srcdir)/condition.h \
$(liblumiera_a_srcdir)/luid.h \
$(liblumiera_a_srcdir)/safeclib.h \
$(liblumiera_a_srcdir)/cuckoo.h \
$(liblumiera_a_srcdir)/psplay.h \
$(liblumiera_a_srcdir)/mrucache.h \
$(liblumiera_a_srcdir)/time.h \
$(liblumiera_a_srcdir)/ppmpl.h \
$(liblumiera_a_srcdir)/appstate.hpp \
noinst_HEADERS += \
$(liblumiera_a_srcdir)/error.h \
$(liblumiera_a_srcdir)/mutex.h \
$(liblumiera_a_srcdir)/rwlock.h \
$(liblumiera_a_srcdir)/condition.h \
$(liblumiera_a_srcdir)/luid.h \
$(liblumiera_a_srcdir)/safeclib.h \
$(liblumiera_a_srcdir)/cuckoo.h \
$(liblumiera_a_srcdir)/psplay.h \
$(liblumiera_a_srcdir)/mrucache.h \
$(liblumiera_a_srcdir)/time.h \
$(liblumiera_a_srcdir)/ppmpl.h \
$(liblumiera_a_srcdir)/allocationcluster.hpp \
$(liblumiera_a_srcdir)/scopedholdertransfer.hpp \
$(liblumiera_a_srcdir)/scopedholder.hpp \
$(liblumiera_a_srcdir)/external/libgavl.hpp \
$(liblumiera_a_srcdir)/scopedholder.hpp \
$(liblumiera_a_srcdir)/external/libgavl.hpp \
$(liblumiera_a_srcdir)/lifecycleregistry.hpp

23
src/lumiera/Makefile.am
View file

@ -19,7 +19,7 @@ lumiera_srcdir = $(top_srcdir)/src/lumiera
noinst_LIBRARIES += liblumieracore.a
liblumieracore_a_CPPFLAGS = $(AM_CPPFLAGS) -DLUMIERA_PLUGIN_PATH="\"$(pkglibdir)\""
liblumieracore_a_CPPFLAGS = $(AM_CPPFLAGS) -DLUMIERA_PLUGIN_PATH="\"$(pkglibdir)\"" -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\""
liblumieracore_a_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
liblumieracore_a_SOURCES = \
@ -34,16 +34,25 @@ liblumieracore_a_SOURCES = \
$(lumiera_srcdir)/interfaceregistry.c \
$(lumiera_srcdir)/plugin.c \
$(lumiera_srcdir)/plugin_dynlib.c \
$(lumiera_srcdir)/lumiera_init.c
$(lumiera_srcdir)/guifacade.cpp \
$(lumiera_srcdir)/configfacade.cpp \
$(lumiera_srcdir)/appstate.cpp \
$(lumiera_srcdir)/option.cpp \
$(lumiera_srcdir)/subsys.cpp \
$(lumiera_srcdir)/interfaceproxy.cpp \
$(lumiera_srcdir)/nobugcfg.cpp
bin_PROGRAMS += lumiera
lumiera_CPPFLAGS = $(AM_CPPFLAGS) -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\""
lumiera_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
lumiera_LDADD = liblumieracore.a liblumiera.a $(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS)
lumiera_LDADD = liblumieracore.a liblumibackend.a liblumiproc.a liblumiera.a liblumicommon.a \
$(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS) -lboost_program_options-mt -lboost_regex-mt
lumiera_SOURCES = \
$(lumiera_srcdir)/lumiera.c
$(top_srcdir)/src/guistart.cpp \
$(top_srcdir)/src/main.cpp
noinst_HEADERS += \
@ -56,4 +65,8 @@ noinst_HEADERS += \
$(lumiera_srcdir)/configitem.h \
$(lumiera_srcdir)/config_lookup.h \
$(lumiera_srcdir)/config_interface.h \
$(lumiera_srcdir)/lumiera.h
$(lumiera_srcdir)/subsys.hpp \
$(lumiera_srcdir)/appstate.hpp \
$(lumiera_srcdir)/option.hpp \
$(lumiera_srcdir)/subsystemrunner.hpp \
$(lumiera_srcdir)/instancehandle.hpp

9
src/proc/Makefile.am
View file

@ -24,11 +24,11 @@ noinst_LIBRARIES += liblumiproc.a
liblumiproc_a_CXXFLAGS = $(CXXFLAGS) -Wall
liblumiproc_a_SOURCES = \
$(liblumiproc_a_srcdir)/controllerfacade.cpp \
$(liblumiproc_a_srcdir)/controllerfacade.cpp \
$(liblumiproc_a_srcdir)/facade.cpp \
$(liblumiproc_a_srcdir)/state.cpp \
$(liblumiproc_a_srcdir)/asset.cpp \
$(liblumiproc_a_srcdir)/assetmanager.cpp \
$(liblumiproc_a_srcdir)/nobugcfg.cpp
$(liblumiproc_a_srcdir)/assetmanager.cpp
@ -218,6 +218,5 @@ noinst_HEADERS += \
$(liblumiproc_a_srcdir)/mobject/session.hpp \
$(liblumiproc_a_srcdir)/asset.hpp \
$(liblumiproc_a_srcdir)/assetmanager.hpp \
$(liblumiproc_a_srcdir)/lumiera.hpp \
$(liblumiproc_a_srcdir)/nobugcfg.h
$(liblumiproc_a_srcdir)/facade.cpp

2
tests/Makefile.am
View file

@ -67,7 +67,7 @@ test_config_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/s
test_config_LDADD = liblumieracore.a liblumiera.a $(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS)
check_LTLIBRARIES += examplepluginc.la
examplepluginc_la_SOURCES = $(tests_srcdir)/lumiera/example_plugin.c
examplepluginc_la_SOURCES = $(tests_srcdir)/plugin/example_plugin.c
examplepluginc_la_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -DLUMIERA_PLUGIN -I$(top_srcdir)/src/
examplepluginc_la_LDFLAGS = -module -avoid-version -no-undefined -rpath /dev/null

2
tests/backend/test-filedescriptors.c
View file

@ -20,7 +20,7 @@
*/
#include "lib/safeclib.h"
#include "backend/config.h"
#include "lumiera/config.h"
#include "backend/backend.h"
#include "backend/filedescriptor.h"

23
tests/common/Makefile.am
View file

@ -20,17 +20,18 @@ testcommon_srcdir = $(top_srcdir)/tests/common
check_PROGRAMS += test-common
test_common_CPPFLAGS = $(AM_CPPFLAGS) -Wall -I$(testcommon_srcdir)
test_common_LDADD = \
liblumiprocmobjectbuilder.a \
liblumiprocmobjectsession.a \
liblumiprocmobject.a \
liblumiprocengine.a \
liblumiproccontrol.a \
liblumiproc.a \
liblumiprocasset.a \
liblumibackend.a \
liblumicommon.a \
liblumiera.a \
test_common_LDADD = \
liblumiprocmobjectbuilder.a \
liblumiprocmobjectsession.a \
liblumiprocmobject.a \
liblumiprocengine.a \
liblumiproccontrol.a \
liblumiproc.a \
liblumiprocasset.a \
liblumibackend.a \
liblumicommon.a \
liblumieracore.a \
liblumiera.a \
$(NOBUGMT_LUMIERA_LIBS) -ldl -lboost_program_options-mt -lboost_regex-mt
test_common_SOURCES = \

3
tests/components/Makefile.am
View file

@ -27,9 +27,10 @@ test_components_LDADD = \
liblumiprocmobjectsession.a \
liblumiprocasset.a \
liblumiprocmobject.a \
liblumiera.a \
liblumicommon.a \
liblumieracore.a \
liblumibackend.a \
liblumiera.a \
$(NOBUGMT_LUMIERA_LIBS) -ldl -lboost_program_options-mt -lboost_regex-mt
test_components_SOURCES = \