From 67c3b09a1e46cad7acf84801cd89ccef48fb2bf6 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 30 Sep 2008 07:52:18 +0000 Subject: Wafify ingen. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1548 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/client/wscript | 35 ++++++++++++++++++ src/libs/engine/MidiDriver.hpp | 6 ++- src/libs/engine/wscript | 73 +++++++++++++++++++++++++++++++++++++ src/libs/gui/App.cpp | 2 +- src/libs/gui/GladeFactory.cpp | 6 +-- src/libs/gui/LoadPatchWindow.cpp | 2 +- src/libs/gui/LoadSubpatchWindow.cpp | 2 +- src/libs/gui/Makefile.am | 2 +- src/libs/gui/wscript | 65 +++++++++++++++++++++++++++++++++ src/libs/module/wscript | 17 +++++++++ src/libs/serialisation/wscript | 16 ++++++++ src/libs/shared/wscript | 19 ++++++++++ 12 files changed, 237 insertions(+), 8 deletions(-) create mode 100644 src/libs/client/wscript create mode 100644 src/libs/engine/wscript create mode 100644 src/libs/gui/wscript create mode 100644 src/libs/module/wscript create mode 100644 src/libs/serialisation/wscript create mode 100644 src/libs/shared/wscript (limited to 'src/libs') diff --git a/src/libs/client/wscript b/src/libs/client/wscript new file mode 100644 index 00000000..6b4408a7 --- /dev/null +++ b/src/libs/client/wscript @@ -0,0 +1,35 @@ +#!/usr/bin/env python +import Params + +def build(bld): + obj = bld.create_obj('cpp', 'shlib') + obj.source = ''' + ClientStore.cpp + NodeModel.cpp + ObjectModel.cpp + PatchModel.cpp + PluginModel.cpp + PluginUI.cpp + PortModel.cpp + ThreadedSigClientInterface.cpp + client.cpp + ''' + + if bld.env()['HAVE_SOUP']: + obj.source += ''' + HTTPClientReceiver.cpp + HTTPEngineSender.cpp + ''' + + if bld.env()['HAVE_XML2']: + obj.source += ' DeprecatedLoader.cpp ' + + if bld.env()['HAVE_LIBLO']: + obj.source += ' OSCClientReceiver.cpp OSCEngineSender.cpp ' + + obj.includes = ['..', '../../common', '../..'] + obj.name = 'libingen_client' + obj.target = 'ingen_client' + obj.uselib = 'GLIBMM SLV2 RAUL REDLANDMM SOUP XML2 SIGCPP' + obj.vnum = '0.0.0' + diff --git a/src/libs/engine/MidiDriver.hpp b/src/libs/engine/MidiDriver.hpp index bd801eb4..e268124b 100644 --- a/src/libs/engine/MidiDriver.hpp +++ b/src/libs/engine/MidiDriver.hpp @@ -80,9 +80,13 @@ public: void enable() {} void disable() {} + DriverPort* create_port(DuplexPort* patch_port) { return NULL; } + + DriverPort* driver_port(const Raul::Path& path) { return NULL; } + DriverPort* new_port(DuplexPort* patch_port) { return NULL; } - void add_port(DriverPort* port) {} + void add_port(DriverPort* port) {} DriverPort* remove_port(const Raul::Path& path) { return NULL; } void pre_process(ProcessContext& context) {} diff --git a/src/libs/engine/wscript b/src/libs/engine/wscript new file mode 100644 index 00000000..1ad135d3 --- /dev/null +++ b/src/libs/engine/wscript @@ -0,0 +1,73 @@ +#!/usr/bin/env python +import Params + +def build(bld): + obj = bld.create_obj('cpp', 'shlib') + obj.source = ''' + AudioBuffer.cpp + Buffer.cpp + ClientBroadcaster.cpp + ConnectionImpl.cpp + DuplexPort.cpp + Engine.cpp + EngineStore.cpp + Event.cpp + EventBuffer.cpp + EventSink.cpp + InputPort.cpp + InternalPlugin.cpp + JackAudioDriver.cpp + JackMidiDriver.cpp + LADSPAPlugin.cpp + LV2Info.cpp + LV2Plugin.cpp + MessageContext.cpp + MidiControlNode.cpp + MidiNoteNode.cpp + MidiTriggerNode.cpp + NodeBase.cpp + NodeFactory.cpp + OSCClientSender.cpp + OSCEngineReceiver.cpp + ObjectSender.cpp + OutputPort.cpp + PluginImpl.cpp + PortImpl.cpp + PostProcessor.cpp + ProcessSlave.cpp + QueuedEngineInterface.cpp + QueuedEvent.cpp + QueuedEventSource.cpp + TransportNode.cpp + engine.cpp + events/AllNotesOffEvent.cpp + events/ConnectionEvent.cpp + events/CreateNodeEvent.cpp + events/CreatePortEvent.cpp + events/DeactivateEvent.cpp + events/DestroyEvent.cpp + events/DisconnectAllEvent.cpp + events/DisconnectionEvent.cpp + events/LoadPluginsEvent.cpp + events/MidiLearnEvent.cpp + events/NoteEvent.cpp + events/RegisterClientEvent.cpp + events/RenameEvent.cpp + events/RequestAllObjectsEvent.cpp + events/RequestMetadataEvent.cpp + events/RequestObjectEvent.cpp + events/RequestPluginEvent.cpp + events/RequestPluginsEvent.cpp + events/RequestPortValueEvent.cpp + events/SendPortActivityEvent.cpp + events/SendPortValueEvent.cpp + events/SetMetadataEvent.cpp + events/SetPortValueEvent.cpp + events/UnregisterClientEvent.cpp + ''' + obj.includes = ['..', '../../common', '../..', './events'] + obj.name = 'libingen_engine' + obj.target = 'ingen_engine' + obj.uselib = 'GLIBMM GTHREAD SLV2 JACK LIBLO RAUL REDLANDMM SOUP' + obj.vnum = '0.0.0' + diff --git a/src/libs/gui/App.cpp b/src/libs/gui/App.cpp index 9cf69596..f49d394c 100644 --- a/src/libs/gui/App.cpp +++ b/src/libs/gui/App.cpp @@ -107,7 +107,7 @@ App::run(int argc, char** argv, Ingen::Shared::World* world) _instance->configuration()->apply_settings(); // Set default window icon - const Glib::ustring icon_path = PKGDATADIR "/ingen.svg"; + const Glib::ustring icon_path = INGEN_DATA_DIR "/ingen.svg"; try { if (Glib::file_test(icon_path, Glib::FILE_TEST_EXISTS)) Gtk::Window::set_default_icon_from_file(icon_path); diff --git a/src/libs/gui/GladeFactory.cpp b/src/libs/gui/GladeFactory.cpp index 63dc4d0b..2b4d3ec9 100644 --- a/src/libs/gui/GladeFactory.cpp +++ b/src/libs/gui/GladeFactory.cpp @@ -38,14 +38,14 @@ GladeFactory::find_glade_file() glade_filename = "./ingen_gui.glade"; ifstream fs(glade_filename.c_str()); - if (fs.fail()) { // didn't find it, check PKGDATADIR + if (fs.fail()) { // didn't find it, check INGEN_DATA_DIR fs.clear(); - glade_filename = PKGDATADIR; + glade_filename = INGEN_DATA_DIR; glade_filename += "/ingen_gui.glade"; fs.open(glade_filename.c_str()); if (fs.fail()) { - cerr << "[GladeFactory] Unable to find ingen_gui.glade in current directory or " << PKGDATADIR << "." << endl; + cerr << "[GladeFactory] Unable to find ingen_gui.glade in current directory or " << INGEN_DATA_DIR << "." << endl; throw; } fs.close(); diff --git a/src/libs/gui/LoadPatchWindow.cpp b/src/libs/gui/LoadPatchWindow.cpp index c33ad495..70d3ec5b 100644 --- a/src/libs/gui/LoadPatchWindow.cpp +++ b/src/libs/gui/LoadPatchWindow.cpp @@ -60,7 +60,7 @@ LoadPatchWindow::LoadPatchWindow(BaseObjectType* cobject, const Glib::RefPtr