From 32261ba465be203f973a0e126672b8d7188ba327 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 4 Oct 2006 07:11:09 +0000 Subject: Global build system, build system bugfixes. git-svn-id: http://svn.drobilla.net/lad/ingen@154 a436a847-0d15-0410-975c-d299462d15a1 --- src/Makefile.am | 3 +- src/libs/client/Makefile.am | 2 - src/libs/engine/Makefile.am | 16 ++--- src/libs/engine/events/Makefile.am | 118 ++++++++++++++++----------------- src/libs/engine/tests/Makefile.am | 13 +--- src/progs/Makefile.am | 2 +- src/progs/ingenuity/DSSIController.cpp | 5 +- src/progs/ingenuity/DSSIController.h | 1 + src/progs/ingenuity/Makefile.am | 5 +- src/progs/ingenuity/PatchCanvas.cpp | 6 +- src/progs/python/Makefile.am | 2 +- src/progs/supercollider/Makefile.am | 2 +- 12 files changed, 80 insertions(+), 95 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 4c02c4c5..48cb026b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,4 @@ SUBDIRS = libs progs -DIST_SUBDIRS = common + +DIST_SUBDIRS = $(SUBDIRS) common diff --git a/src/libs/client/Makefile.am b/src/libs/client/Makefile.am index 126b07fa..de9b1ca4 100644 --- a/src/libs/client/Makefile.am +++ b/src/libs/client/Makefile.am @@ -7,7 +7,6 @@ libingenclient_la_CXXFLAGS = -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdata libingenclient_la_LIBADD = @LXML2_LIBS@ @LOSC_LIBS@ @RAPTOR_LIBS@ @LSIGCPP_LIBS@ libingenclient_la_SOURCES = \ - ClientInterface.h \ OSCEngineSender.h \ OSCEngineSender.cpp \ OSCModelEngineInterface.h \ @@ -21,7 +20,6 @@ libingenclient_la_SOURCES = \ ModelEngineInterface.cpp \ PresetModel.h \ ControlModel.h \ - ObjectController.h \ ObjectModel.h \ ObjectModel.cpp \ NodeModel.h \ diff --git a/src/libs/engine/Makefile.am b/src/libs/engine/Makefile.am index 95b684d5..ac58885f 100644 --- a/src/libs/engine/Makefile.am +++ b/src/libs/engine/Makefile.am @@ -1,5 +1,4 @@ -SUBDIRS = tests -DIST_SUBDIRS = events +SUBDIRS = tests events AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/engine/events @@ -12,6 +11,7 @@ noinst_LTLIBRARIES = libingen.la libingen_la_SOURCES = \ util.h \ tuning.h \ + events.h \ DataType.h \ Node.h \ NodeBase.h \ @@ -31,7 +31,6 @@ libingen_la_SOURCES = \ DirectResponder.h \ OSCResponder.h \ OSCResponder.cpp \ - ClientKey.h \ ClientBroadcaster.h \ ClientBroadcaster.cpp \ ObjectSender.h \ @@ -68,7 +67,7 @@ libingen_la_SOURCES = \ Maid.cpp \ MaidObject.h \ Tree.h \ - ClientRecord.h \ + TreeImplementation.h \ PluginLibrary.h \ Plugin.h \ Plugin.cpp \ @@ -88,12 +87,6 @@ libingen_la_SOURCES = \ AudioDriver.h \ MidiDriver.h \ midi.h \ - ../libingen_la/util/Semaphore.h \ - ../libingen_la/util/types.h \ - ../libingen_la/util/Path.h \ - ../libingen_la/util/Queue.h \ - ../libingen_la/interface/ClientInterface.h \ - ../libingen_la/interface/EngineInterface.h \ instantiations.cpp \ events/RegisterClientEvent.h \ events/RegisterClientEvent.cpp \ @@ -213,7 +206,6 @@ endif if WITH_LASH libingen_la_SOURCES += \ LashDriver.h \ - LashDriver.cpp \ - LashRestoreDoneEvent.h + LashDriver.cpp endif diff --git a/src/libs/engine/events/Makefile.am b/src/libs/engine/events/Makefile.am index a1760738..7bc54238 100644 --- a/src/libs/engine/events/Makefile.am +++ b/src/libs/engine/events/Makefile.am @@ -1,65 +1,65 @@ MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = \ - events/RegisterClientEvent.h \ - events/RegisterClientEvent.cpp \ - events/UnregisterClientEvent.h \ - events/UnregisterClientEvent.cpp \ - events/PingQueuedEvent.h \ - events/ActivateEvent.h \ - events/ActivateEvent.cpp \ - events/DeactivateEvent.h \ - events/DeactivateEvent.cpp \ - events/SetPortValueEvent.h \ - events/SetPortValueEvent.cpp \ - events/SetPortValueQueuedEvent.h \ - events/SetPortValueQueuedEvent.cpp \ - events/NoteOnEvent.h \ - events/NoteOnEvent.cpp \ - events/NoteOffEvent.h \ - events/NoteOffEvent.cpp \ - events/AllNotesOffEvent.h \ - events/AllNotesOffEvent.cpp \ - events/ConnectionEvent.h \ - events/ConnectionEvent.cpp \ - events/DisconnectionEvent.h \ - events/DisconnectionEvent.cpp \ - events/DisconnectNodeEvent.h \ - events/DisconnectNodeEvent.cpp \ - events/DisconnectPortEvent.h \ - events/DisconnectPortEvent.cpp \ - events/DestroyEvent.h \ - events/DestroyEvent.cpp \ - events/AddNodeEvent.h \ - events/AddNodeEvent.cpp \ - events/SetMetadataEvent.h \ - events/SetMetadataEvent.cpp \ - events/RequestMetadataEvent.h \ - events/RequestMetadataEvent.cpp \ - events/RequestPluginEvent.h \ - events/RequestPluginEvent.cpp \ - events/RequestObjectEvent.h \ - events/RequestObjectEvent.cpp \ - events/RequestPortValueEvent.h \ - events/RequestPortValueEvent.cpp \ - events/RequestAllObjectsEvent.h \ - events/RequestAllObjectsEvent.cpp \ - events/RequestPluginsEvent.h \ - events/RequestPluginsEvent.cpp \ - events/CreatePatchEvent.h \ - events/CreatePatchEvent.cpp \ - events/LoadPluginsEvent.h \ - events/LoadPluginsEvent.cpp \ - events/EnablePatchEvent.h \ - events/EnablePatchEvent.cpp \ - events/DisablePatchEvent.h \ - events/DisablePatchEvent.cpp \ - events/ClearPatchEvent.h \ - events/ClearPatchEvent.cpp \ - events/RenameEvent.h \ - events/RenameEvent.cpp \ - events/MidiLearnEvent.h \ - events/MidiLearnEvent.cpp \ + RegisterClientEvent.h \ + RegisterClientEvent.cpp \ + UnregisterClientEvent.h \ + UnregisterClientEvent.cpp \ + PingQueuedEvent.h \ + ActivateEvent.h \ + ActivateEvent.cpp \ + DeactivateEvent.h \ + DeactivateEvent.cpp \ + SetPortValueEvent.h \ + SetPortValueEvent.cpp \ + SetPortValueQueuedEvent.h \ + SetPortValueQueuedEvent.cpp \ + NoteOnEvent.h \ + NoteOnEvent.cpp \ + NoteOffEvent.h \ + NoteOffEvent.cpp \ + AllNotesOffEvent.h \ + AllNotesOffEvent.cpp \ + ConnectionEvent.h \ + ConnectionEvent.cpp \ + DisconnectionEvent.h \ + DisconnectionEvent.cpp \ + DisconnectNodeEvent.h \ + DisconnectNodeEvent.cpp \ + DisconnectPortEvent.h \ + DisconnectPortEvent.cpp \ + DestroyEvent.h \ + DestroyEvent.cpp \ + AddNodeEvent.h \ + AddNodeEvent.cpp \ + SetMetadataEvent.h \ + SetMetadataEvent.cpp \ + RequestMetadataEvent.h \ + RequestMetadataEvent.cpp \ + RequestPluginEvent.h \ + RequestPluginEvent.cpp \ + RequestObjectEvent.h \ + RequestObjectEvent.cpp \ + RequestPortValueEvent.h \ + RequestPortValueEvent.cpp \ + RequestAllObjectsEvent.h \ + RequestAllObjectsEvent.cpp \ + RequestPluginsEvent.h \ + RequestPluginsEvent.cpp \ + CreatePatchEvent.h \ + CreatePatchEvent.cpp \ + LoadPluginsEvent.h \ + LoadPluginsEvent.cpp \ + EnablePatchEvent.h \ + EnablePatchEvent.cpp \ + DisablePatchEvent.h \ + DisablePatchEvent.cpp \ + ClearPatchEvent.h \ + ClearPatchEvent.cpp \ + RenameEvent.h \ + RenameEvent.cpp \ + MidiLearnEvent.h \ + MidiLearnEvent.cpp \ DSSIConfigureEvent.cpp \ DSSIConfigureEvent.h \ DSSIControlEvent.cpp \ diff --git a/src/libs/engine/tests/Makefile.am b/src/libs/engine/tests/Makefile.am index 54f6ad1f..0da5ee09 100644 --- a/src/libs/engine/tests/Makefile.am +++ b/src/libs/engine/tests/Makefile.am @@ -5,23 +5,16 @@ common_ldadd = @JACK_LIBS@ @LOSC_LIBS@ @ALSA_LIBS@ -lrt node_tree_test_LDADD = $(common_ldadd) queue_test_LDADD = $(common_ldadd) -bin_PROGRAMS = node_tree_test queue_test list_test path_test +bin_PROGRAMS = node_tree_test queue_test list_test list_test_SOURCES = \ ../List.h \ list_test.cpp -path_test_SOURCES = \ - ../../common/Path.h \ - path_test.cpp - node_tree_test_SOURCES = \ - node_tree_test.cpp \ - ../Tree.h \ - ../TreeImplementation.h + node_tree_test.cpp queue_test_SOURCES = \ - queue_test.cpp \ - ../../common/Queue.h + queue_test.cpp endif # BUILD_UNIT_TESTS diff --git a/src/progs/Makefile.am b/src/progs/Makefile.am index f37c8af0..aa28c47d 100644 --- a/src/progs/Makefile.am +++ b/src/progs/Makefile.am @@ -1,6 +1,6 @@ AM_CXXFLAGS = -I$(top_srcdir)/src/common -DIST_SUBDIRS = python supercollider +DIST_SUBDIRS = python supercollider patch_loader ingenuity server demolition SUBDIRS = server diff --git a/src/progs/ingenuity/DSSIController.cpp b/src/progs/ingenuity/DSSIController.cpp index 4d5bb2f7..a5075470 100644 --- a/src/progs/ingenuity/DSSIController.cpp +++ b/src/progs/ingenuity/DSSIController.cpp @@ -75,6 +75,8 @@ DSSIController::show_gui() void DSSIController::update_program_menu() { + cerr << "FIXME: Program menu\n"; +#if 0 m_program_menu.items().clear(); const map >& banks = node_model()->get_programs(); @@ -113,13 +115,14 @@ DSSIController::update_program_menu() m_program_menu_item->set_sensitive(true); m_banks_dirty = false; +#endif } void DSSIController::send_program_change(int bank, int program) { - App::instance().engine()->set_program(node_model()->path(), bank, program); + //App::instance().engine()->set_program(node_model()->path(), bank, program); } diff --git a/src/progs/ingenuity/DSSIController.h b/src/progs/ingenuity/DSSIController.h index 3eaba91a..7b8c6fb6 100644 --- a/src/progs/ingenuity/DSSIController.h +++ b/src/progs/ingenuity/DSSIController.h @@ -20,6 +20,7 @@ #include #include #include "util/Path.h" +#include "NodeModel.h" using std::string; using namespace Ingen::Client; diff --git a/src/progs/ingenuity/Makefile.am b/src/progs/ingenuity/Makefile.am index 753980b8..24b818cb 100644 --- a/src/progs/ingenuity/Makefile.am +++ b/src/progs/ingenuity/Makefile.am @@ -13,7 +13,6 @@ ingenuity_DEPENDENCIES = ../../libs/client/libingenclient.la # FIXME: make engine have a separate include dir if MONOLITHIC_INGENUITY ingenuity_CXXFLAGS += -I$(top_srcdir)/src/libs -#ingenuity_LDADD += @JACK_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @SLV2_LIBS@ -lrt ../../libs/engine/libingen.la ingenuity_LDADD += ../../libs/engine/libingen.la ingenuity_DEPENDENCIES += ../../libs/engine/libingen.la endif @@ -58,14 +57,14 @@ ingenuity_SOURCES = \ PatchWindow.cpp \ WindowFactory.h \ WindowFactory.cpp \ - ../../common/types.h \ - ../../common/Path.h \ NodeModule.h \ NodeModule.cpp \ PatchPortModule.h \ PatchPortModule.cpp \ DSSIModule.h \ DSSIModule.cpp \ + DSSIController.h \ + DSSIController.cpp \ SubpatchModule.h \ SubpatchModule.cpp \ Port.h \ diff --git a/src/progs/ingenuity/PatchCanvas.cpp b/src/progs/ingenuity/PatchCanvas.cpp index 3f9c97fa..289150de 100644 --- a/src/progs/ingenuity/PatchCanvas.cpp +++ b/src/progs/ingenuity/PatchCanvas.cpp @@ -174,10 +174,8 @@ PatchCanvas::connection(CountedPtr cm) boost::shared_ptr dst = get_port(dst_parent_name, cm->dst_port_path().name()); if (src && dst) { - boost::shared_ptr c(new Connection(shared_from_this(), cm, src, dst)); - src->add_connection(c); - dst->add_connection(c); - add_connection(c); + add_connection(boost::shared_ptr( + new Connection(shared_from_this(), cm, src, dst))); } else { cerr << "[Canvas] ERROR: Unable to find ports to create connection." << endl; } diff --git a/src/progs/python/Makefile.am b/src/progs/python/Makefile.am index 017b1f4b..c6da5467 100644 --- a/src/progs/python/Makefile.am +++ b/src/progs/python/Makefile.am @@ -1,4 +1,4 @@ SUBDIRS = scripts -EXTRA_DIST = omecho.py omsynth.py OSC.py +EXTRA_DIST = ingen.py ingenecho.py OSC.py diff --git a/src/progs/supercollider/Makefile.am b/src/progs/supercollider/Makefile.am index 69661c73..a6001b7a 100644 --- a/src/progs/supercollider/Makefile.am +++ b/src/progs/supercollider/Makefile.am @@ -1,2 +1,2 @@ -EXTRA_DIST = Om.sc example.sc +EXTRA_DIST = Ingen.sc example.sc -- cgit v1.2.1