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

Fixes after merge

Browse source
This commit is contained in:
Fischlurch 2009-01-10 21:35:43 +01:00
parent e64e9a19b6
commit ba9b72bce4
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/Makefile.am
View file

@ -61,6 +61,6 @@ noinst_HEADERS += \
$(liblumieracommon_la_srcdir)/subsys.hpp \
$(liblumieracommon_la_srcdir)/appstate.hpp \
$(liblumieracommon_la_srcdir)/option.hpp \
$(liblumieracommon_la_srcdir)/subsystemrunner.hpp \
$(liblumieracommon_la_srcdir)/subsystem-runner.hpp \
$(liblumieracommon_la_srcdir)/instancehandle.hpp

25
src/gui/Makefile.am
View file

@ -64,7 +64,7 @@ pkglib_LTLIBRARIES += gtk_gui.la
gtk_gui_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
gtk_gui_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
gtk_gui_la_CPPFLAGS = $(AM_CPPFLAGS) -DLUMIERA_PLUGIN -I$(top_srcdir)/src/
gtk_gui_la_CPPFLAGS = $(AM_CPPFLAGS) $(LUMIERA_GUI_CFLAGS) -DLUMIERA_PLUGIN -I$(top_srcdir)/src/
gtk_gui_la_LDFLAGS = -module -avoid-version -no-undefined -rpath /dev/null -shrext .lum
gtk_gui_la_LIBADD = \
@ -72,10 +72,11 @@ gtk_gui_la_LIBADD = \
liblumierabackend.la \
liblumieraproc.la \
liblumiera.la \
libgui.la \
$(LUMIERA_GUI_LIBS) \
$(NOBUGMT_LUMIERA_LIBS)
gtk_gui_la_SOURCES = \
gtk_gui_la_SOURCES = \
$(lumigui_srcdir)/guistart.cpp
@ -94,18 +95,18 @@ libgui_la_CPPFLAGS = $(AM_CPPFLAGS) \
$(LUMIERA_GUI_CFLAGS)
libgui_la_SOURCES = \
$(lumigui_srcdir)/guinotificationfacade.cpp \
$(lumigui_srcdir)/notification-service.cpp \
$(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)/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/preferences-dialog.cpp \
$(lumigui_srcdir)/dialogs/preferences-dialog.hpp \
$(lumigui_srcdir)/dialogs/name-chooser.cpp \
$(lumigui_srcdir)/dialogs/name-chooser.hpp \
$(lumigui_srcdir)/panels/panel.cpp \
@ -152,19 +153,19 @@ libgui_la_SOURCES = \
$(lumigui_srcdir)/model/track.hpp \
$(lumigui_srcdir)/model/clip-track.cpp \
$(lumigui_srcdir)/model/clip-track.hpp \
$(lumigui_srcdir)/model/parent-track.cpp \
$(lumigui_srcdir)/model/parent-track.hpp \
$(lumigui_srcdir)/model/parent-track.cpp \
$(lumigui_srcdir)/model/parent-track.hpp \
$(lumigui_srcdir)/model/group-track.cpp \
$(lumigui_srcdir)/model/group-track.hpp \
$(lumigui_srcdir)/model/sequence.cpp \
$(lumigui_srcdir)/model/sequence.hpp \
$(lumigui_srcdir)/model/clip.cpp \
$(lumigui_srcdir)/model/clip.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.cpp \
$(lumigui_srcdir)/output/xvdisplayer.hpp
libgui_la_LIBADD = \

2
src/gui/gtk-lumiera.cpp
View file

@ -69,9 +69,9 @@ GtkLumiera::main(int argc, char *argv[])
kit.run(main_window);
return 0;
}
Glib::ustring
GtkLumiera::get_home_data_path()
{

3
tests/lib/subsystem-runner-test.cpp
View file

@ -315,9 +315,8 @@ namespace lumiera {
// is a short time window where isUp_==true )
bool emergency = runner.wait();
runner.wait();
ASSERT (emergency); // emergency state from unit4 got propagated
ASSERT (!unit1.isRunning());
ASSERT (!unit2.isRunning());
ASSERT (!unit3.isRunning());