From adac9032064d973ff6cfe1f94d8619c71fe199a3 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 21 Jun 2006 05:53:27 +0000 Subject: Reorganized directory tree/names git-svn-id: http://svn.drobilla.net/lad/ingen@73 a436a847-0d15-0410-975c-d299462d15a1 --- src/common/interface/ClientInterface.h | 2 +- src/common/interface/ClientKey.h | 2 +- src/common/interface/EngineInterface.h | 2 +- src/common/util/CountedPtr.h | 2 +- src/common/util/Path.h | 2 +- src/common/util/Queue.h | 2 +- src/common/util/Semaphore.h | 2 +- src/libs/client/ConnectionModel.cpp | 2 +- src/libs/client/ConnectionModel.h | 2 +- src/libs/client/ControlModel.h | 2 +- src/libs/client/DirectSigClientInterface.h | 2 +- src/libs/client/ModelClientInterface.cpp | 2 +- src/libs/client/ModelClientInterface.h | 2 +- src/libs/client/ModelEngineInterface.h | 2 +- src/libs/client/NodeModel.cpp | 2 +- src/libs/client/NodeModel.h | 2 +- src/libs/client/OSCEngineInterface.cpp | 2 +- src/libs/client/OSCEngineInterface.h | 2 +- src/libs/client/OSCListener.cpp | 2 +- src/libs/client/OSCListener.h | 2 +- src/libs/client/OSCModelEngineInterface.cpp | 2 +- src/libs/client/OSCModelEngineInterface.h | 2 +- src/libs/client/ObjectController.h | 2 +- src/libs/client/ObjectModel.cpp | 2 +- src/libs/client/ObjectModel.h | 2 +- src/libs/client/PatchLibrarian.cpp | 2 +- src/libs/client/PatchLibrarian.cpp.new | 2 +- src/libs/client/PatchLibrarian.h | 2 +- src/libs/client/PatchModel.cpp | 2 +- src/libs/client/PatchModel.h | 2 +- src/libs/client/PluginModel.h | 2 +- src/libs/client/PortModel.h | 2 +- src/libs/client/PresetModel.h | 2 +- src/libs/client/SigClientInterface.h | 2 +- src/libs/client/Store.cpp | 2 +- src/libs/client/Store.h | 2 +- src/libs/client/ThreadedSigClientInterface.cpp | 2 +- src/libs/client/ThreadedSigClientInterface.h | 2 +- src/libs/engine/AlsaMidiDriver.cpp | 4 +- src/libs/engine/AlsaMidiDriver.h | 4 +- src/libs/engine/Array.h | 4 +- src/libs/engine/AudioDriver.h | 4 +- src/libs/engine/Buffer.cpp | 4 +- src/libs/engine/Buffer.h | 4 +- src/libs/engine/ClientBroadcaster.cpp | 4 +- src/libs/engine/ClientBroadcaster.h | 4 +- src/libs/engine/Connection.cpp | 4 +- src/libs/engine/Connection.h | 4 +- src/libs/engine/Controller.h | 4 +- src/libs/engine/DSSINode.cpp | 4 +- src/libs/engine/DSSINode.h | 4 +- src/libs/engine/DSSIPlugin.cpp.orig | 207 -- src/libs/engine/DataType.h | 4 +- src/libs/engine/Driver.h | 4 +- src/libs/engine/DuplexPort.cpp | 4 +- src/libs/engine/DuplexPort.h | 4 +- src/libs/engine/Event.cpp | 4 +- src/libs/engine/Event.h | 4 +- src/libs/engine/EventSource.h | 4 +- src/libs/engine/GraphObject.h | 4 +- src/libs/engine/InputPort.cpp | 4 +- src/libs/engine/InputPort.h | 4 +- src/libs/engine/InternalNode.h | 4 +- src/libs/engine/JackAudioDriver.cpp | 4 +- src/libs/engine/JackAudioDriver.h | 4 +- src/libs/engine/JackMidiDriver.cpp | 4 +- src/libs/engine/JackMidiDriver.h | 4 +- src/libs/engine/LADSPANode.cpp | 4 +- src/libs/engine/LADSPANode.h | 4 +- src/libs/engine/LV2Node.cpp | 4 +- src/libs/engine/LV2Node.h | 4 +- src/libs/engine/LashDriver.cpp | 4 +- src/libs/engine/LashDriver.h | 4 +- src/libs/engine/List.h | 4 +- src/libs/engine/Maid.cpp | 4 +- src/libs/engine/Maid.h | 4 +- src/libs/engine/MaidObject.h | 4 +- src/libs/engine/MidiControlNode.cpp | 4 +- src/libs/engine/MidiControlNode.h | 4 +- src/libs/engine/MidiDriver.h | 4 +- src/libs/engine/MidiMessage.h | 4 +- src/libs/engine/MidiNoteNode.cpp | 4 +- src/libs/engine/MidiNoteNode.h | 4 +- src/libs/engine/MidiTriggerNode.cpp | 4 +- src/libs/engine/MidiTriggerNode.h | 4 +- src/libs/engine/Node.h | 4 +- src/libs/engine/NodeBase.cpp | 4 +- src/libs/engine/NodeBase.h | 4 +- src/libs/engine/NodeFactory.cpp | 4 +- src/libs/engine/NodeFactory.h | 4 +- src/libs/engine/OSCClient.cpp | 4 +- src/libs/engine/OSCClient.h | 4 +- src/libs/engine/OSCReceiver.cpp | 4 +- src/libs/engine/OSCReceiver.h | 4 +- src/libs/engine/OSCResponder.cpp | 4 +- src/libs/engine/OSCResponder.h | 4 +- src/libs/engine/ObjectSender.cpp | 4 +- src/libs/engine/ObjectSender.h | 4 +- src/libs/engine/ObjectStore.cpp | 4 +- src/libs/engine/ObjectStore.h | 4 +- src/libs/engine/Om.cpp | 4 +- src/libs/engine/Om.h | 4 +- src/libs/engine/OmApp.cpp | 4 +- src/libs/engine/OmApp.h | 4 +- src/libs/engine/OmInProcess.cpp | 4 +- src/libs/engine/OutputPort.cpp | 4 +- src/libs/engine/OutputPort.h | 4 +- src/libs/engine/Patch.cpp | 4 +- src/libs/engine/Patch.h | 4 +- src/libs/engine/Plugin.h | 4 +- src/libs/engine/PluginLibrary.h | 4 +- src/libs/engine/Port.cpp | 4 +- src/libs/engine/Port.h | 4 +- src/libs/engine/PostProcessor.cpp | 4 +- src/libs/engine/PostProcessor.h | 4 +- src/libs/engine/QueuedEngineInterface.cpp | 4 +- src/libs/engine/QueuedEngineInterface.h | 4 +- src/libs/engine/QueuedEvent.h | 4 +- src/libs/engine/QueuedEventSource.cpp | 4 +- src/libs/engine/QueuedEventSource.h | 4 +- src/libs/engine/Responder.h | 4 +- src/libs/engine/TransportNode.cpp | 4 +- src/libs/engine/TransportNode.h | 4 +- src/libs/engine/Tree.h | 4 +- src/libs/engine/TreeImplementation.h | 4 +- src/libs/engine/TypedConnection.cpp | 4 +- src/libs/engine/TypedConnection.h | 4 +- src/libs/engine/TypedPort.cpp | 4 +- src/libs/engine/TypedPort.h | 4 +- src/libs/engine/events.h | 4 +- src/libs/engine/events/ActivateEvent.cpp | 4 +- src/libs/engine/events/ActivateEvent.h | 4 +- src/libs/engine/events/AddNodeEvent.cpp | 4 +- src/libs/engine/events/AddNodeEvent.h | 4 +- src/libs/engine/events/AddPortEvent.cpp | 4 +- src/libs/engine/events/AddPortEvent.h | 4 +- src/libs/engine/events/AllNotesOffEvent.cpp | 4 +- src/libs/engine/events/AllNotesOffEvent.h | 4 +- src/libs/engine/events/ClearPatchEvent.cpp | 4 +- src/libs/engine/events/ClearPatchEvent.h | 4 +- src/libs/engine/events/ConnectionEvent.cpp | 4 +- src/libs/engine/events/ConnectionEvent.h | 4 +- src/libs/engine/events/CreatePatchEvent.cpp | 4 +- src/libs/engine/events/CreatePatchEvent.h | 4 +- src/libs/engine/events/DSSIConfigureEvent.cpp | 4 +- src/libs/engine/events/DSSIConfigureEvent.h | 4 +- src/libs/engine/events/DSSIControlEvent.cpp | 4 +- src/libs/engine/events/DSSIControlEvent.h | 4 +- src/libs/engine/events/DSSIProgramEvent.cpp | 4 +- src/libs/engine/events/DSSIProgramEvent.h | 4 +- src/libs/engine/events/DSSIUpdateEvent.cpp | 4 +- src/libs/engine/events/DSSIUpdateEvent.h | 4 +- src/libs/engine/events/DeactivateEvent.cpp | 4 +- src/libs/engine/events/DeactivateEvent.h | 4 +- src/libs/engine/events/DestroyEvent.cpp | 4 +- src/libs/engine/events/DestroyEvent.h | 4 +- src/libs/engine/events/DisablePatchEvent.cpp | 4 +- src/libs/engine/events/DisablePatchEvent.h | 4 +- src/libs/engine/events/DisconnectNodeEvent.cpp | 4 +- src/libs/engine/events/DisconnectNodeEvent.h | 4 +- src/libs/engine/events/DisconnectPortEvent.cpp | 4 +- src/libs/engine/events/DisconnectPortEvent.h | 4 +- src/libs/engine/events/DisconnectionEvent.cpp | 4 +- src/libs/engine/events/DisconnectionEvent.h | 4 +- src/libs/engine/events/EnablePatchEvent.cpp | 4 +- src/libs/engine/events/EnablePatchEvent.h | 4 +- src/libs/engine/events/LashRestoreDoneEvent.h | 4 +- src/libs/engine/events/LoadPluginsEvent.cpp | 4 +- src/libs/engine/events/LoadPluginsEvent.h | 4 +- src/libs/engine/events/MidiLearnEvent.cpp | 4 +- src/libs/engine/events/MidiLearnEvent.h | 4 +- src/libs/engine/events/NoteOffEvent.cpp | 4 +- src/libs/engine/events/NoteOffEvent.h | 4 +- src/libs/engine/events/NoteOnEvent.cpp | 4 +- src/libs/engine/events/NoteOnEvent.h | 4 +- src/libs/engine/events/PingQueuedEvent.h | 4 +- src/libs/engine/events/RegisterClientEvent.cpp | 4 +- src/libs/engine/events/RegisterClientEvent.h | 4 +- src/libs/engine/events/RenameEvent.cpp | 4 +- src/libs/engine/events/RenameEvent.h | 4 +- src/libs/engine/events/RequestAllObjectsEvent.cpp | 4 +- src/libs/engine/events/RequestAllObjectsEvent.h | 4 +- src/libs/engine/events/RequestMetadataEvent.cpp | 4 +- src/libs/engine/events/RequestMetadataEvent.h | 4 +- src/libs/engine/events/RequestPluginsEvent.cpp | 4 +- src/libs/engine/events/RequestPluginsEvent.h | 4 +- src/libs/engine/events/RequestPortValueEvent.cpp | 4 +- src/libs/engine/events/RequestPortValueEvent.h | 4 +- src/libs/engine/events/SetMetadataEvent.cpp | 4 +- src/libs/engine/events/SetMetadataEvent.h | 4 +- src/libs/engine/events/SetPortValueEvent.cpp | 4 +- src/libs/engine/events/SetPortValueEvent.h | 4 +- src/libs/engine/events/SetPortValueQueuedEvent.cpp | 4 +- src/libs/engine/events/SetPortValueQueuedEvent.h | 4 +- src/libs/engine/events/UnregisterClientEvent.cpp | 4 +- src/libs/engine/events/UnregisterClientEvent.h | 4 +- src/libs/engine/instantiations.cpp | 4 +- src/libs/engine/midi.h | 2 +- src/libs/engine/tuning.h | 4 +- src/libs/engine/types.h | 4 +- src/libs/engine/util.h | 4 +- src/progs/demolition/DemolitionClientInterface.cpp | 8 +- src/progs/demolition/DemolitionClientInterface.h | 8 +- src/progs/demolition/DemolitionModel.cpp | 14 +- src/progs/demolition/DemolitionModel.h | 8 +- src/progs/demolition/demolition.cpp | 8 +- src/progs/gtk/App.cpp | 220 -- src/progs/gtk/App.h | 118 - src/progs/gtk/BreadCrumb.h | 68 - src/progs/gtk/ConfigWindow.cpp | 86 - src/progs/gtk/ConfigWindow.h | 63 - src/progs/gtk/Configuration.cpp | 184 - src/progs/gtk/Configuration.h | 76 - src/progs/gtk/ConnectWindow.cpp | 260 -- src/progs/gtk/ConnectWindow.h | 73 - src/progs/gtk/ControlGroups.cpp | 418 --- src/progs/gtk/ControlGroups.h | 197 -- src/progs/gtk/ControlPanel.cpp | 284 -- src/progs/gtk/ControlPanel.h | 129 - src/progs/gtk/Controller.cpp | 171 - src/progs/gtk/Controller.h | 110 - src/progs/gtk/DSSIController.cpp | 280 -- src/progs/gtk/DSSIController.h | 79 - src/progs/gtk/DSSIModule.cpp | 38 - src/progs/gtk/DSSIModule.h | 43 - src/progs/gtk/GladeFactory.cpp | 69 - src/progs/gtk/GladeFactory.h | 48 - src/progs/gtk/GtkObjectController.cpp | 31 - src/progs/gtk/GtkObjectController.h | 83 - src/progs/gtk/LashController.cpp | 168 - src/progs/gtk/LashController.h | 53 - src/progs/gtk/LoadPatchWindow.cpp | 131 - src/progs/gtk/LoadPatchWindow.h | 73 - src/progs/gtk/LoadPluginWindow.cpp | 407 --- src/progs/gtk/LoadPluginWindow.h | 145 - src/progs/gtk/LoadSubpatchWindow.cpp | 177 - src/progs/gtk/LoadSubpatchWindow.h | 78 - src/progs/gtk/Loader.cpp | 233 -- src/progs/gtk/Loader.h | 154 - src/progs/gtk/Makefile.am | 95 - src/progs/gtk/MessagesWindow.cpp | 64 - src/progs/gtk/MessagesWindow.h | 55 - src/progs/gtk/NewSubpatchWindow.cpp | 111 - src/progs/gtk/NewSubpatchWindow.h | 67 - src/progs/gtk/NodeControlWindow.cpp | 127 - src/progs/gtk/NodeControlWindow.h | 69 - src/progs/gtk/NodeController.cpp | 394 --- src/progs/gtk/NodeController.h | 114 - src/progs/gtk/NodePropertiesWindow.cpp | 65 - src/progs/gtk/NodePropertiesWindow.h | 55 - src/progs/gtk/OmFlowCanvas.cpp | 263 -- src/progs/gtk/OmFlowCanvas.h | 86 - src/progs/gtk/OmModule.cpp | 85 - src/progs/gtk/OmModule.h | 77 - src/progs/gtk/OmPatchPort.cpp | 57 - src/progs/gtk/OmPatchPort.h | 60 - src/progs/gtk/OmPort.cpp | 57 - src/progs/gtk/OmPort.h | 60 - src/progs/gtk/OmPortModule.cpp | 71 - src/progs/gtk/OmPortModule.h | 76 - src/progs/gtk/PatchController.cpp | 760 ---- src/progs/gtk/PatchController.h | 137 - src/progs/gtk/PatchPropertiesWindow.cpp | 73 - src/progs/gtk/PatchPropertiesWindow.h | 60 - src/progs/gtk/PatchTreeWindow.cpp | 252 -- src/progs/gtk/PatchTreeWindow.h | 105 - src/progs/gtk/PatchView.cpp | 119 - src/progs/gtk/PatchView.h | 86 - src/progs/gtk/PatchWindow.cpp | 583 ---- src/progs/gtk/PatchWindow.h | 142 - src/progs/gtk/PortController.cpp | 174 - src/progs/gtk/PortController.h | 84 - src/progs/gtk/RenameWindow.cpp | 113 - src/progs/gtk/RenameWindow.h | 57 - src/progs/gtk/SubpatchModule.cpp | 102 - src/progs/gtk/SubpatchModule.h | 69 - src/progs/gtk/cmdline.c | 149 - src/progs/gtk/cmdline.ggo | 7 - src/progs/gtk/cmdline.h | 45 - src/progs/gtk/main.cpp | 98 - src/progs/gtk/om-icon.png | Bin 1189 -> 0 bytes src/progs/gtk/om_gtk.glade | 3651 ------------------- src/progs/gtk/om_gtk.glade.bak | 3657 -------------------- src/progs/gtk/om_gtk.gladep | 9 - src/progs/gtk/om_gtk.gladep.bak | 9 - src/progs/gtk/singletons.cpp | 27 - src/progs/ingenuity/App.cpp | 220 ++ src/progs/ingenuity/App.h | 118 + src/progs/ingenuity/BreadCrumb.h | 68 + src/progs/ingenuity/ConfigWindow.cpp | 86 + src/progs/ingenuity/ConfigWindow.h | 63 + src/progs/ingenuity/Configuration.cpp | 184 + src/progs/ingenuity/Configuration.h | 76 + src/progs/ingenuity/ConnectWindow.cpp | 260 ++ src/progs/ingenuity/ConnectWindow.h | 73 + src/progs/ingenuity/ControlGroups.cpp | 418 +++ src/progs/ingenuity/ControlGroups.h | 197 ++ src/progs/ingenuity/ControlPanel.cpp | 284 ++ src/progs/ingenuity/ControlPanel.h | 129 + src/progs/ingenuity/Controller.cpp | 171 + src/progs/ingenuity/Controller.h | 110 + src/progs/ingenuity/DSSIController.cpp | 280 ++ src/progs/ingenuity/DSSIController.h | 79 + src/progs/ingenuity/DSSIModule.cpp | 38 + src/progs/ingenuity/DSSIModule.h | 43 + src/progs/ingenuity/GladeFactory.cpp | 69 + src/progs/ingenuity/GladeFactory.h | 48 + src/progs/ingenuity/GtkObjectController.cpp | 31 + src/progs/ingenuity/GtkObjectController.h | 83 + src/progs/ingenuity/LashController.cpp | 168 + src/progs/ingenuity/LashController.h | 53 + src/progs/ingenuity/LoadPatchWindow.cpp | 131 + src/progs/ingenuity/LoadPatchWindow.h | 73 + src/progs/ingenuity/LoadPluginWindow.cpp | 407 +++ src/progs/ingenuity/LoadPluginWindow.h | 145 + src/progs/ingenuity/LoadSubpatchWindow.cpp | 177 + src/progs/ingenuity/LoadSubpatchWindow.h | 78 + src/progs/ingenuity/Loader.cpp | 233 ++ src/progs/ingenuity/Loader.h | 154 + src/progs/ingenuity/Makefile.am | 95 + src/progs/ingenuity/MessagesWindow.cpp | 64 + src/progs/ingenuity/MessagesWindow.h | 55 + src/progs/ingenuity/NewSubpatchWindow.cpp | 111 + src/progs/ingenuity/NewSubpatchWindow.h | 67 + src/progs/ingenuity/NodeControlWindow.cpp | 127 + src/progs/ingenuity/NodeControlWindow.h | 69 + src/progs/ingenuity/NodeController.cpp | 394 +++ src/progs/ingenuity/NodeController.h | 114 + src/progs/ingenuity/NodePropertiesWindow.cpp | 65 + src/progs/ingenuity/NodePropertiesWindow.h | 55 + src/progs/ingenuity/OmFlowCanvas.cpp | 263 ++ src/progs/ingenuity/OmFlowCanvas.h | 86 + src/progs/ingenuity/OmModule.cpp | 85 + src/progs/ingenuity/OmModule.h | 77 + src/progs/ingenuity/OmPatchPort.cpp | 57 + src/progs/ingenuity/OmPatchPort.h | 60 + src/progs/ingenuity/OmPort.cpp | 57 + src/progs/ingenuity/OmPort.h | 60 + src/progs/ingenuity/OmPortModule.cpp | 71 + src/progs/ingenuity/OmPortModule.h | 76 + src/progs/ingenuity/PatchController.cpp | 760 ++++ src/progs/ingenuity/PatchController.h | 137 + src/progs/ingenuity/PatchPropertiesWindow.cpp | 73 + src/progs/ingenuity/PatchPropertiesWindow.h | 60 + src/progs/ingenuity/PatchTreeWindow.cpp | 252 ++ src/progs/ingenuity/PatchTreeWindow.h | 105 + src/progs/ingenuity/PatchView.cpp | 119 + src/progs/ingenuity/PatchView.h | 86 + src/progs/ingenuity/PatchWindow.cpp | 583 ++++ src/progs/ingenuity/PatchWindow.h | 142 + src/progs/ingenuity/PortController.cpp | 174 + src/progs/ingenuity/PortController.h | 84 + src/progs/ingenuity/RenameWindow.cpp | 113 + src/progs/ingenuity/RenameWindow.h | 57 + src/progs/ingenuity/SubpatchModule.cpp | 102 + src/progs/ingenuity/SubpatchModule.h | 69 + src/progs/ingenuity/cmdline.c | 149 + src/progs/ingenuity/cmdline.ggo | 7 + src/progs/ingenuity/cmdline.h | 45 + src/progs/ingenuity/main.cpp | 98 + src/progs/ingenuity/om-icon.png | Bin 0 -> 1189 bytes src/progs/ingenuity/om_gtk.glade | 3651 +++++++++++++++++++ src/progs/ingenuity/om_gtk.gladep | 9 + src/progs/ingenuity/om_gtk.gladep.bak | 9 + src/progs/ingenuity/singletons.cpp | 27 + src/progs/om/Makefile.am | 43 - src/progs/om/cmdline.c | 150 - src/progs/om/cmdline.ggo | 7 - src/progs/om/cmdline.h | 45 - src/progs/om/main.cpp | 153 - src/progs/patch_loader/new_patch_loader.cpp | 4 +- src/progs/patch_loader/patch_loader.cpp | 4 +- src/progs/python/OSC.py | 27 +- src/progs/python/ingen.py | 636 ++++ src/progs/python/ingenecho.py | 40 + src/progs/python/omecho.py | 40 - src/progs/python/omsynth.py | 635 ---- src/progs/python/scripts/flatten.py | 10 +- src/progs/python/scripts/sillysinepatch.py | 8 +- src/progs/server/Makefile.am | 43 + src/progs/server/cmdline.c | 150 + src/progs/server/cmdline.ggo | 7 + src/progs/server/cmdline.h | 45 + src/progs/server/main.cpp | 153 + src/progs/supercollider/Ingen.sc | 746 ++++ src/progs/supercollider/Om.sc | 746 ---- src/progs/supercollider/README | 4 +- src/progs/supercollider/example.sc | 4 +- 388 files changed, 16000 insertions(+), 19864 deletions(-) delete mode 100644 src/libs/engine/DSSIPlugin.cpp.orig delete mode 100644 src/progs/gtk/App.cpp delete mode 100644 src/progs/gtk/App.h delete mode 100644 src/progs/gtk/BreadCrumb.h delete mode 100644 src/progs/gtk/ConfigWindow.cpp delete mode 100644 src/progs/gtk/ConfigWindow.h delete mode 100644 src/progs/gtk/Configuration.cpp delete mode 100644 src/progs/gtk/Configuration.h delete mode 100644 src/progs/gtk/ConnectWindow.cpp delete mode 100644 src/progs/gtk/ConnectWindow.h delete mode 100644 src/progs/gtk/ControlGroups.cpp delete mode 100644 src/progs/gtk/ControlGroups.h delete mode 100644 src/progs/gtk/ControlPanel.cpp delete mode 100644 src/progs/gtk/ControlPanel.h delete mode 100644 src/progs/gtk/Controller.cpp delete mode 100644 src/progs/gtk/Controller.h delete mode 100644 src/progs/gtk/DSSIController.cpp delete mode 100644 src/progs/gtk/DSSIController.h delete mode 100644 src/progs/gtk/DSSIModule.cpp delete mode 100644 src/progs/gtk/DSSIModule.h delete mode 100644 src/progs/gtk/GladeFactory.cpp delete mode 100644 src/progs/gtk/GladeFactory.h delete mode 100644 src/progs/gtk/GtkObjectController.cpp delete mode 100644 src/progs/gtk/GtkObjectController.h delete mode 100644 src/progs/gtk/LashController.cpp delete mode 100644 src/progs/gtk/LashController.h delete mode 100644 src/progs/gtk/LoadPatchWindow.cpp delete mode 100644 src/progs/gtk/LoadPatchWindow.h delete mode 100644 src/progs/gtk/LoadPluginWindow.cpp delete mode 100644 src/progs/gtk/LoadPluginWindow.h delete mode 100644 src/progs/gtk/LoadSubpatchWindow.cpp delete mode 100644 src/progs/gtk/LoadSubpatchWindow.h delete mode 100644 src/progs/gtk/Loader.cpp delete mode 100644 src/progs/gtk/Loader.h delete mode 100644 src/progs/gtk/Makefile.am delete mode 100644 src/progs/gtk/MessagesWindow.cpp delete mode 100644 src/progs/gtk/MessagesWindow.h delete mode 100644 src/progs/gtk/NewSubpatchWindow.cpp delete mode 100644 src/progs/gtk/NewSubpatchWindow.h delete mode 100644 src/progs/gtk/NodeControlWindow.cpp delete mode 100644 src/progs/gtk/NodeControlWindow.h delete mode 100644 src/progs/gtk/NodeController.cpp delete mode 100644 src/progs/gtk/NodeController.h delete mode 100644 src/progs/gtk/NodePropertiesWindow.cpp delete mode 100644 src/progs/gtk/NodePropertiesWindow.h delete mode 100644 src/progs/gtk/OmFlowCanvas.cpp delete mode 100644 src/progs/gtk/OmFlowCanvas.h delete mode 100644 src/progs/gtk/OmModule.cpp delete mode 100644 src/progs/gtk/OmModule.h delete mode 100644 src/progs/gtk/OmPatchPort.cpp delete mode 100644 src/progs/gtk/OmPatchPort.h delete mode 100644 src/progs/gtk/OmPort.cpp delete mode 100644 src/progs/gtk/OmPort.h delete mode 100644 src/progs/gtk/OmPortModule.cpp delete mode 100644 src/progs/gtk/OmPortModule.h delete mode 100644 src/progs/gtk/PatchController.cpp delete mode 100644 src/progs/gtk/PatchController.h delete mode 100644 src/progs/gtk/PatchPropertiesWindow.cpp delete mode 100644 src/progs/gtk/PatchPropertiesWindow.h delete mode 100644 src/progs/gtk/PatchTreeWindow.cpp delete mode 100644 src/progs/gtk/PatchTreeWindow.h delete mode 100644 src/progs/gtk/PatchView.cpp delete mode 100644 src/progs/gtk/PatchView.h delete mode 100644 src/progs/gtk/PatchWindow.cpp delete mode 100644 src/progs/gtk/PatchWindow.h delete mode 100644 src/progs/gtk/PortController.cpp delete mode 100644 src/progs/gtk/PortController.h delete mode 100644 src/progs/gtk/RenameWindow.cpp delete mode 100644 src/progs/gtk/RenameWindow.h delete mode 100644 src/progs/gtk/SubpatchModule.cpp delete mode 100644 src/progs/gtk/SubpatchModule.h delete mode 100644 src/progs/gtk/cmdline.c delete mode 100644 src/progs/gtk/cmdline.ggo delete mode 100644 src/progs/gtk/cmdline.h delete mode 100644 src/progs/gtk/main.cpp delete mode 100644 src/progs/gtk/om-icon.png delete mode 100644 src/progs/gtk/om_gtk.glade delete mode 100644 src/progs/gtk/om_gtk.glade.bak delete mode 100644 src/progs/gtk/om_gtk.gladep delete mode 100644 src/progs/gtk/om_gtk.gladep.bak delete mode 100644 src/progs/gtk/singletons.cpp create mode 100644 src/progs/ingenuity/App.cpp create mode 100644 src/progs/ingenuity/App.h create mode 100644 src/progs/ingenuity/BreadCrumb.h create mode 100644 src/progs/ingenuity/ConfigWindow.cpp create mode 100644 src/progs/ingenuity/ConfigWindow.h create mode 100644 src/progs/ingenuity/Configuration.cpp create mode 100644 src/progs/ingenuity/Configuration.h create mode 100644 src/progs/ingenuity/ConnectWindow.cpp create mode 100644 src/progs/ingenuity/ConnectWindow.h create mode 100644 src/progs/ingenuity/ControlGroups.cpp create mode 100644 src/progs/ingenuity/ControlGroups.h create mode 100644 src/progs/ingenuity/ControlPanel.cpp create mode 100644 src/progs/ingenuity/ControlPanel.h create mode 100644 src/progs/ingenuity/Controller.cpp create mode 100644 src/progs/ingenuity/Controller.h create mode 100644 src/progs/ingenuity/DSSIController.cpp create mode 100644 src/progs/ingenuity/DSSIController.h create mode 100644 src/progs/ingenuity/DSSIModule.cpp create mode 100644 src/progs/ingenuity/DSSIModule.h create mode 100644 src/progs/ingenuity/GladeFactory.cpp create mode 100644 src/progs/ingenuity/GladeFactory.h create mode 100644 src/progs/ingenuity/GtkObjectController.cpp create mode 100644 src/progs/ingenuity/GtkObjectController.h create mode 100644 src/progs/ingenuity/LashController.cpp create mode 100644 src/progs/ingenuity/LashController.h create mode 100644 src/progs/ingenuity/LoadPatchWindow.cpp create mode 100644 src/progs/ingenuity/LoadPatchWindow.h create mode 100644 src/progs/ingenuity/LoadPluginWindow.cpp create mode 100644 src/progs/ingenuity/LoadPluginWindow.h create mode 100644 src/progs/ingenuity/LoadSubpatchWindow.cpp create mode 100644 src/progs/ingenuity/LoadSubpatchWindow.h create mode 100644 src/progs/ingenuity/Loader.cpp create mode 100644 src/progs/ingenuity/Loader.h create mode 100644 src/progs/ingenuity/Makefile.am create mode 100644 src/progs/ingenuity/MessagesWindow.cpp create mode 100644 src/progs/ingenuity/MessagesWindow.h create mode 100644 src/progs/ingenuity/NewSubpatchWindow.cpp create mode 100644 src/progs/ingenuity/NewSubpatchWindow.h create mode 100644 src/progs/ingenuity/NodeControlWindow.cpp create mode 100644 src/progs/ingenuity/NodeControlWindow.h create mode 100644 src/progs/ingenuity/NodeController.cpp create mode 100644 src/progs/ingenuity/NodeController.h create mode 100644 src/progs/ingenuity/NodePropertiesWindow.cpp create mode 100644 src/progs/ingenuity/NodePropertiesWindow.h create mode 100644 src/progs/ingenuity/OmFlowCanvas.cpp create mode 100644 src/progs/ingenuity/OmFlowCanvas.h create mode 100644 src/progs/ingenuity/OmModule.cpp create mode 100644 src/progs/ingenuity/OmModule.h create mode 100644 src/progs/ingenuity/OmPatchPort.cpp create mode 100644 src/progs/ingenuity/OmPatchPort.h create mode 100644 src/progs/ingenuity/OmPort.cpp create mode 100644 src/progs/ingenuity/OmPort.h create mode 100644 src/progs/ingenuity/OmPortModule.cpp create mode 100644 src/progs/ingenuity/OmPortModule.h create mode 100644 src/progs/ingenuity/PatchController.cpp create mode 100644 src/progs/ingenuity/PatchController.h create mode 100644 src/progs/ingenuity/PatchPropertiesWindow.cpp create mode 100644 src/progs/ingenuity/PatchPropertiesWindow.h create mode 100644 src/progs/ingenuity/PatchTreeWindow.cpp create mode 100644 src/progs/ingenuity/PatchTreeWindow.h create mode 100644 src/progs/ingenuity/PatchView.cpp create mode 100644 src/progs/ingenuity/PatchView.h create mode 100644 src/progs/ingenuity/PatchWindow.cpp create mode 100644 src/progs/ingenuity/PatchWindow.h create mode 100644 src/progs/ingenuity/PortController.cpp create mode 100644 src/progs/ingenuity/PortController.h create mode 100644 src/progs/ingenuity/RenameWindow.cpp create mode 100644 src/progs/ingenuity/RenameWindow.h create mode 100644 src/progs/ingenuity/SubpatchModule.cpp create mode 100644 src/progs/ingenuity/SubpatchModule.h create mode 100644 src/progs/ingenuity/cmdline.c create mode 100644 src/progs/ingenuity/cmdline.ggo create mode 100644 src/progs/ingenuity/cmdline.h create mode 100644 src/progs/ingenuity/main.cpp create mode 100644 src/progs/ingenuity/om-icon.png create mode 100644 src/progs/ingenuity/om_gtk.glade create mode 100644 src/progs/ingenuity/om_gtk.gladep create mode 100644 src/progs/ingenuity/om_gtk.gladep.bak create mode 100644 src/progs/ingenuity/singletons.cpp delete mode 100644 src/progs/om/Makefile.am delete mode 100644 src/progs/om/cmdline.c delete mode 100644 src/progs/om/cmdline.ggo delete mode 100644 src/progs/om/cmdline.h delete mode 100644 src/progs/om/main.cpp create mode 100644 src/progs/python/ingen.py create mode 100644 src/progs/python/ingenecho.py delete mode 100644 src/progs/python/omecho.py delete mode 100644 src/progs/python/omsynth.py create mode 100644 src/progs/server/Makefile.am create mode 100644 src/progs/server/cmdline.c create mode 100644 src/progs/server/cmdline.ggo create mode 100644 src/progs/server/cmdline.h create mode 100644 src/progs/server/main.cpp create mode 100644 src/progs/supercollider/Ingen.sc delete mode 100644 src/progs/supercollider/Om.sc (limited to 'src') diff --git a/src/common/interface/ClientInterface.h b/src/common/interface/ClientInterface.h index d03f1668..aed542d4 100644 --- a/src/common/interface/ClientInterface.h +++ b/src/common/interface/ClientInterface.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef CLIENTINTERFACE_H diff --git a/src/common/interface/ClientKey.h b/src/common/interface/ClientKey.h index eb580a2d..c57ebf27 100644 --- a/src/common/interface/ClientKey.h +++ b/src/common/interface/ClientKey.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef CLIENTKEY_H diff --git a/src/common/interface/EngineInterface.h b/src/common/interface/EngineInterface.h index 3c7084bc..d5b28a02 100644 --- a/src/common/interface/EngineInterface.h +++ b/src/common/interface/EngineInterface.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program = 0; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef ENGINEINTERFACE_H diff --git a/src/common/util/CountedPtr.h b/src/common/util/CountedPtr.h index 17c56cc9..6b9847eb 100644 --- a/src/common/util/CountedPtr.h +++ b/src/common/util/CountedPtr.h @@ -12,7 +12,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef COUNTED_PTR_H diff --git a/src/common/util/Path.h b/src/common/util/Path.h index 126fe01d..e54b7b61 100644 --- a/src/common/util/Path.h +++ b/src/common/util/Path.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PATH_H diff --git a/src/common/util/Queue.h b/src/common/util/Queue.h index 649cbcbe..db127e3e 100644 --- a/src/common/util/Queue.h +++ b/src/common/util/Queue.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef QUEUE_H diff --git a/src/common/util/Semaphore.h b/src/common/util/Semaphore.h index c8abaf35..045984a6 100644 --- a/src/common/util/Semaphore.h +++ b/src/common/util/Semaphore.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef SEMAPHORE_H diff --git a/src/libs/client/ConnectionModel.cpp b/src/libs/client/ConnectionModel.cpp index 18b6fbd7..3f9a6441 100644 --- a/src/libs/client/ConnectionModel.cpp +++ b/src/libs/client/ConnectionModel.cpp @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "ConnectionModel.h" diff --git a/src/libs/client/ConnectionModel.h b/src/libs/client/ConnectionModel.h index 427c5858..ad517777 100644 --- a/src/libs/client/ConnectionModel.h +++ b/src/libs/client/ConnectionModel.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/src/libs/client/ControlModel.h b/src/libs/client/ControlModel.h index 872dcca2..8e9bd856 100644 --- a/src/libs/client/ControlModel.h +++ b/src/libs/client/ControlModel.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License alongCont * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef CONTROLMODEL_H diff --git a/src/libs/client/DirectSigClientInterface.h b/src/libs/client/DirectSigClientInterface.h index 12672a48..8088bccd 100644 --- a/src/libs/client/DirectSigClientInterface.h +++ b/src/libs/client/DirectSigClientInterface.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef DIRECTSIGCLIENTINTERFACE_H diff --git a/src/libs/client/ModelClientInterface.cpp b/src/libs/client/ModelClientInterface.cpp index 33f2cb2f..36964425 100644 --- a/src/libs/client/ModelClientInterface.cpp +++ b/src/libs/client/ModelClientInterface.cpp @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "ModelClientInterface.h" diff --git a/src/libs/client/ModelClientInterface.h b/src/libs/client/ModelClientInterface.h index 1f5ea09d..05c16a32 100644 --- a/src/libs/client/ModelClientInterface.h +++ b/src/libs/client/ModelClientInterface.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef MODELCLIENTINTERFACE_H diff --git a/src/libs/client/ModelEngineInterface.h b/src/libs/client/ModelEngineInterface.h index aa041aef..b0f107a7 100644 --- a/src/libs/client/ModelEngineInterface.h +++ b/src/libs/client/ModelEngineInterface.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef MODELENGINEINTERFACE_H diff --git a/src/libs/client/NodeModel.cpp b/src/libs/client/NodeModel.cpp index 22b20858..6527dc1f 100644 --- a/src/libs/client/NodeModel.cpp +++ b/src/libs/client/NodeModel.cpp @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "NodeModel.h" diff --git a/src/libs/client/NodeModel.h b/src/libs/client/NodeModel.h index 1b79905a..b7b7db74 100644 --- a/src/libs/client/NodeModel.h +++ b/src/libs/client/NodeModel.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef NODEMODEL_H diff --git a/src/libs/client/OSCEngineInterface.cpp b/src/libs/client/OSCEngineInterface.cpp index 9c6c9299..978178ae 100644 --- a/src/libs/client/OSCEngineInterface.cpp +++ b/src/libs/client/OSCEngineInterface.cpp @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "OSCEngineInterface.h" diff --git a/src/libs/client/OSCEngineInterface.h b/src/libs/client/OSCEngineInterface.h index 89263e01..01f30b45 100644 --- a/src/libs/client/OSCEngineInterface.h +++ b/src/libs/client/OSCEngineInterface.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef OSCENGINEINTERFACE_H diff --git a/src/libs/client/OSCListener.cpp b/src/libs/client/OSCListener.cpp index 503be47d..82187b99 100644 --- a/src/libs/client/OSCListener.cpp +++ b/src/libs/client/OSCListener.cpp @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "OSCListener.h" diff --git a/src/libs/client/OSCListener.h b/src/libs/client/OSCListener.h index d0b9cc1c..a29bc7f7 100644 --- a/src/libs/client/OSCListener.h +++ b/src/libs/client/OSCListener.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/src/libs/client/OSCModelEngineInterface.cpp b/src/libs/client/OSCModelEngineInterface.cpp index 9e648141..721158b9 100644 --- a/src/libs/client/OSCModelEngineInterface.cpp +++ b/src/libs/client/OSCModelEngineInterface.cpp @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "OSCModelEngineInterface.h" diff --git a/src/libs/client/OSCModelEngineInterface.h b/src/libs/client/OSCModelEngineInterface.h index 4400a1b4..c0403d52 100644 --- a/src/libs/client/OSCModelEngineInterface.h +++ b/src/libs/client/OSCModelEngineInterface.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef OSCCONTROLLER_H diff --git a/src/libs/client/ObjectController.h b/src/libs/client/ObjectController.h index c79ac24d..6fbd3a8f 100644 --- a/src/libs/client/ObjectController.h +++ b/src/libs/client/ObjectController.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef OBJECTCONTROLLER_H diff --git a/src/libs/client/ObjectModel.cpp b/src/libs/client/ObjectModel.cpp index cb196f8a..0b06c58b 100644 --- a/src/libs/client/ObjectModel.cpp +++ b/src/libs/client/ObjectModel.cpp @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "ObjectModel.h" diff --git a/src/libs/client/ObjectModel.h b/src/libs/client/ObjectModel.h index b9a6d75d..f6ef4d9f 100644 --- a/src/libs/client/ObjectModel.h +++ b/src/libs/client/ObjectModel.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef OBJECTMODEL_H diff --git a/src/libs/client/PatchLibrarian.cpp b/src/libs/client/PatchLibrarian.cpp index 930cdccf..f80ba90b 100644 --- a/src/libs/client/PatchLibrarian.cpp +++ b/src/libs/client/PatchLibrarian.cpp @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "PatchLibrarian.h" diff --git a/src/libs/client/PatchLibrarian.cpp.new b/src/libs/client/PatchLibrarian.cpp.new index dc05c9e3..8e26e833 100644 --- a/src/libs/client/PatchLibrarian.cpp.new +++ b/src/libs/client/PatchLibrarian.cpp.new @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "PatchLibrarian.h" diff --git a/src/libs/client/PatchLibrarian.h b/src/libs/client/PatchLibrarian.h index ace91f24..95e6066d 100644 --- a/src/libs/client/PatchLibrarian.h +++ b/src/libs/client/PatchLibrarian.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PATCHLIBRARIAN_H diff --git a/src/libs/client/PatchModel.cpp b/src/libs/client/PatchModel.cpp index 265a17d8..d61258f3 100644 --- a/src/libs/client/PatchModel.cpp +++ b/src/libs/client/PatchModel.cpp @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "PatchModel.h" diff --git a/src/libs/client/PatchModel.h b/src/libs/client/PatchModel.h index c099d768..f9b5b2e7 100644 --- a/src/libs/client/PatchModel.h +++ b/src/libs/client/PatchModel.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PATCHMODEL_H diff --git a/src/libs/client/PluginModel.h b/src/libs/client/PluginModel.h index 85365d64..9ca75a4f 100644 --- a/src/libs/client/PluginModel.h +++ b/src/libs/client/PluginModel.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PLUGINMODEL_H diff --git a/src/libs/client/PortModel.h b/src/libs/client/PortModel.h index 9847bb1e..7743eed3 100644 --- a/src/libs/client/PortModel.h +++ b/src/libs/client/PortModel.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PORTMODEL_H diff --git a/src/libs/client/PresetModel.h b/src/libs/client/PresetModel.h index bd187dfc..0acf0c14 100644 --- a/src/libs/client/PresetModel.h +++ b/src/libs/client/PresetModel.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License alongCont * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PRESETMODEL_H diff --git a/src/libs/client/SigClientInterface.h b/src/libs/client/SigClientInterface.h index 6b427e3c..01e41e95 100644 --- a/src/libs/client/SigClientInterface.h +++ b/src/libs/client/SigClientInterface.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef SIGCLIENTINTERFACE_H diff --git a/src/libs/client/Store.cpp b/src/libs/client/Store.cpp index 15f91786..ee621ad0 100644 --- a/src/libs/client/Store.cpp +++ b/src/libs/client/Store.cpp @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "Store.h" diff --git a/src/libs/client/Store.h b/src/libs/client/Store.h index 0e47168d..2dc94f2d 100644 --- a/src/libs/client/Store.h +++ b/src/libs/client/Store.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef STORE_H diff --git a/src/libs/client/ThreadedSigClientInterface.cpp b/src/libs/client/ThreadedSigClientInterface.cpp index 4af7d805..dc29081a 100644 --- a/src/libs/client/ThreadedSigClientInterface.cpp +++ b/src/libs/client/ThreadedSigClientInterface.cpp @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "ThreadedSigClientInterface.h" diff --git a/src/libs/client/ThreadedSigClientInterface.h b/src/libs/client/ThreadedSigClientInterface.h index 16259531..292a409d 100644 --- a/src/libs/client/ThreadedSigClientInterface.h +++ b/src/libs/client/ThreadedSigClientInterface.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef THREADEDSIGCLIENTINTERFACE_H diff --git a/src/libs/engine/AlsaMidiDriver.cpp b/src/libs/engine/AlsaMidiDriver.cpp index 991b9d28..fbf928bf 100644 --- a/src/libs/engine/AlsaMidiDriver.cpp +++ b/src/libs/engine/AlsaMidiDriver.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "AlsaMidiDriver.h" diff --git a/src/libs/engine/AlsaMidiDriver.h b/src/libs/engine/AlsaMidiDriver.h index 38f51df2..760ea361 100644 --- a/src/libs/engine/AlsaMidiDriver.h +++ b/src/libs/engine/AlsaMidiDriver.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef ALSAMIDIDRIVER_H diff --git a/src/libs/engine/Array.h b/src/libs/engine/Array.h index bedfbe51..e1f1c28d 100644 --- a/src/libs/engine/Array.h +++ b/src/libs/engine/Array.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef ARRAY_H diff --git a/src/libs/engine/AudioDriver.h b/src/libs/engine/AudioDriver.h index 07fcf744..6848d07c 100644 --- a/src/libs/engine/AudioDriver.h +++ b/src/libs/engine/AudioDriver.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef AUDIODRIVER_H diff --git a/src/libs/engine/Buffer.cpp b/src/libs/engine/Buffer.cpp index 9d88f806..218ef79f 100644 --- a/src/libs/engine/Buffer.cpp +++ b/src/libs/engine/Buffer.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "Buffer.h" diff --git a/src/libs/engine/Buffer.h b/src/libs/engine/Buffer.h index 41cab494..7c4dba0d 100644 --- a/src/libs/engine/Buffer.h +++ b/src/libs/engine/Buffer.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef BUFFER_H diff --git a/src/libs/engine/ClientBroadcaster.cpp b/src/libs/engine/ClientBroadcaster.cpp index 2678f3cb..05cef8ea 100644 --- a/src/libs/engine/ClientBroadcaster.cpp +++ b/src/libs/engine/ClientBroadcaster.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "ClientBroadcaster.h" diff --git a/src/libs/engine/ClientBroadcaster.h b/src/libs/engine/ClientBroadcaster.h index e67f323a..6a62cb77 100644 --- a/src/libs/engine/ClientBroadcaster.h +++ b/src/libs/engine/ClientBroadcaster.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef CLIENTBROADCASTER_H diff --git a/src/libs/engine/Connection.cpp b/src/libs/engine/Connection.cpp index ad0cb486..1ca325fb 100644 --- a/src/libs/engine/Connection.cpp +++ b/src/libs/engine/Connection.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "Connection.h" diff --git a/src/libs/engine/Connection.h b/src/libs/engine/Connection.h index b7b17a0a..24c0f34c 100644 --- a/src/libs/engine/Connection.h +++ b/src/libs/engine/Connection.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef CONNECTION_H diff --git a/src/libs/engine/Controller.h b/src/libs/engine/Controller.h index facfb4c2..a49c358e 100644 --- a/src/libs/engine/Controller.h +++ b/src/libs/engine/Controller.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef CONTROLLER_H diff --git a/src/libs/engine/DSSINode.cpp b/src/libs/engine/DSSINode.cpp index dcf0f645..d9cad41d 100644 --- a/src/libs/engine/DSSINode.cpp +++ b/src/libs/engine/DSSINode.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "DSSINode.h" diff --git a/src/libs/engine/DSSINode.h b/src/libs/engine/DSSINode.h index 726b24f6..69797237 100644 --- a/src/libs/engine/DSSINode.h +++ b/src/libs/engine/DSSINode.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef DSSINODE_H diff --git a/src/libs/engine/DSSIPlugin.cpp.orig b/src/libs/engine/DSSIPlugin.cpp.orig deleted file mode 100644 index 7c8060f0..00000000 --- a/src/libs/engine/DSSIPlugin.cpp.orig +++ /dev/null @@ -1,207 +0,0 @@ -/* This file is part of Om. Copyright (C) 2005 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "DSSIPlugin.h" -#include -#include "Om.h" -#include "OmApp.h" -#include "config.h" -#include "Patch.h" -#include "PortBase.h" -#include "InputPort.h" -#include "PortInfo.h" - -using std::map; - -namespace Om { - - -DSSIPlugin::DSSIPlugin(const string& name, uint poly, Patch* parent, DSSI_Descriptor* descriptor, samplerate srate, size_t buffer_size) -: LADSPAPlugin(name, 1, parent, descriptor->LADSPA_Plugin, srate, buffer_size), - m_ui_addr(NULL), - m_bank(-1), - m_program(-1), - m_dssi_descriptor(descriptor) -{ - m_num_ports = descriptor->LADSPA_Plugin->PortCount + 1; - m_ports.alloc(m_num_ports); - - m_midi_in_port = new InputPort(this, "MIDI In", m_num_ports-1, 1, - new PortInfo("MIDI In", MIDI, INPUT), m_buffer_size); - - m_ports.at(m_num_ports-1) = m_midi_in_port; -} - - -DSSIPlugin::~DSSIPlugin() -{ - if (m_ui_addr != NULL) - lo_address_free(m_ui_addr); -} - - -void -DSSIPlugin::activate() -{ - LADSPAPlugin::activate(); -} - - -void -DSSIPlugin::set_ui_url(const string& url) -{ - if (m_ui_addr != NULL) - lo_address_free(m_ui_addr); - - m_ui_url = url; - m_ui_addr = lo_address_new_from_url(url.c_str()); - char* base_path = lo_url_get_path(url.c_str()); - m_ui_base_path = base_path; - free(base_path); - cerr << "Set UI base path to " << m_ui_base_path << endl; -} - - -void -DSSIPlugin::set_control(uint port_num, sample val) -{ - assert(port_num < m_descriptor->PortCount); - ((PortBase*)m_ports.at(port_num))->set_value(0, val); -} - - -void -DSSIPlugin::configure(const string& key, const string& val) -{ - m_dssi_descriptor->configure(m_instances[0], key.c_str(), val.c_str()); - m_configures[key] = val; -} - - -void -DSSIPlugin::program(int bank, int program) -{ - if (m_dssi_descriptor->select_program) - m_dssi_descriptor->select_program(m_instances[0], bank, program); - - m_bank = bank; - m_program = program; -} - - -void -DSSIPlugin::run(size_t nframes) -{ - NodeBase::run(nframes); - - /*if (m_dssi_descriptor->run_synth) { - m_dssi_descriptor->run_synth(m_instances[0], nframes, - parent_patch()->dssi_events_array(), parent_patch()->dssi_events_size()); - } else if (m_dssi_descriptor->run_multiple_synths) { // I hate this stupid function - snd_seq_event_t* events[1] = { parent_patch()->dssi_events_array() }; - long unsigned events_sizes[1] = { parent_patch()->dssi_events_size() }; - m_dssi_descriptor->run_multiple_synths(1, m_instances, nframes, - events, events_sizes); - } else { - LADSPAPlugin::run(nframes); - } - */ - - if (m_dssi_descriptor->run_synth) { - m_dssi_descriptor->run_synth(m_instances[0], nframes, - (snd_seq_event_t*)m_midi_in_port->buffer(0), m_midi_in_port->get_valid_buffer_size()); - /*} else if (m_dssi_descriptor->run_multiple_synths) { // I hate this stupid function - snd_seq_event_t* events[1] = { parent_patch()->dssi_events_array() }; - long unsigned events_sizes[1] = { parent_patch()->dssi_events_size() }; - m_dssi_descriptor->run_multiple_synths(1, m_instances, nframes, - events, events_sizes);*/ - } else { - LADSPAPlugin::run(nframes); - } - - -} - - -void -DSSIPlugin::send_control(int port_num, float value) -{ - string path = m_ui_base_path + "/control"; - lo_send(m_ui_addr, path.c_str(), "if", port_num, value); -} - - -void -DSSIPlugin::send_program(int bank, int value) -{ - string path = m_ui_base_path + "/program"; - lo_send(m_ui_addr, path.c_str(), "ii", bank, value); -} - - -void -DSSIPlugin::send_configure(const string& key, const string& val) -{ - string path = m_ui_base_path + "/configure"; - lo_send(m_ui_addr, path.c_str(), "ss", key.c_str(), val.c_str()); -} - - -void -DSSIPlugin::send_show() -{ - string path = m_ui_base_path + "/show"; - lo_send(m_ui_addr, path.c_str(), NULL); -} - - -void -DSSIPlugin::send_hide() -{ - string path = m_ui_base_path + "/hide"; - lo_send(m_ui_addr, path.c_str(), NULL); -} - - -void -DSSIPlugin::send_quit() -{ - string path = m_ui_base_path + "/quit"; - lo_send(m_ui_addr, path.c_str(), NULL); -} - - -void -DSSIPlugin::send_update() -{ - // send "configure"s - for (map::iterator i = m_configures.begin(); i != m_configures.end(); ++i) - send_configure((*i).first, (*i).second); - - // send "program" - send_program(m_bank, m_program); - - // send "control"s - for (size_t i=0; i < m_ports.size(); ++i) - if (m_ports[i]->port_info()->is_control()) - send_control(m_ports[i]->num(), ((PortBase*)m_ports[i])->get_value(0, 0)); - - // send "show" FIXME: not to spec - send_show(); -} - - -} // namespace Om diff --git a/src/libs/engine/DataType.h b/src/libs/engine/DataType.h index bd43a8a7..44e21b7e 100644 --- a/src/libs/engine/DataType.h +++ b/src/libs/engine/DataType.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef DATATYPE_H diff --git a/src/libs/engine/Driver.h b/src/libs/engine/Driver.h index bbc8d2a8..81750f78 100644 --- a/src/libs/engine/Driver.h +++ b/src/libs/engine/Driver.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef DRIVER_H diff --git a/src/libs/engine/DuplexPort.cpp b/src/libs/engine/DuplexPort.cpp index 4478d90c..9a4d2a69 100644 --- a/src/libs/engine/DuplexPort.cpp +++ b/src/libs/engine/DuplexPort.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "DuplexPort.h" diff --git a/src/libs/engine/DuplexPort.h b/src/libs/engine/DuplexPort.h index 1abf6a4d..99b04616 100644 --- a/src/libs/engine/DuplexPort.h +++ b/src/libs/engine/DuplexPort.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef DUPLEXPORT_H diff --git a/src/libs/engine/Event.cpp b/src/libs/engine/Event.cpp index 7d590e76..fca60bdc 100644 --- a/src/libs/engine/Event.cpp +++ b/src/libs/engine/Event.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "Event.h" diff --git a/src/libs/engine/Event.h b/src/libs/engine/Event.h index ebacf500..355525cf 100644 --- a/src/libs/engine/Event.h +++ b/src/libs/engine/Event.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef EVENT_H diff --git a/src/libs/engine/EventSource.h b/src/libs/engine/EventSource.h index b038f427..99423dc3 100644 --- a/src/libs/engine/EventSource.h +++ b/src/libs/engine/EventSource.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef EVENTSOURCE_H diff --git a/src/libs/engine/GraphObject.h b/src/libs/engine/GraphObject.h index ffe6076b..ecde1042 100644 --- a/src/libs/engine/GraphObject.h +++ b/src/libs/engine/GraphObject.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef OMOBJECT_H diff --git a/src/libs/engine/InputPort.cpp b/src/libs/engine/InputPort.cpp index ab7ca562..68d2a575 100644 --- a/src/libs/engine/InputPort.cpp +++ b/src/libs/engine/InputPort.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "InputPort.h" diff --git a/src/libs/engine/InputPort.h b/src/libs/engine/InputPort.h index 789d98ab..d7af9871 100644 --- a/src/libs/engine/InputPort.h +++ b/src/libs/engine/InputPort.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef INPUTPORT_H diff --git a/src/libs/engine/InternalNode.h b/src/libs/engine/InternalNode.h index 19846390..1e178cab 100644 --- a/src/libs/engine/InternalNode.h +++ b/src/libs/engine/InternalNode.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef INTERNALNODE_H diff --git a/src/libs/engine/JackAudioDriver.cpp b/src/libs/engine/JackAudioDriver.cpp index 39747f9a..edc13ee9 100644 --- a/src/libs/engine/JackAudioDriver.cpp +++ b/src/libs/engine/JackAudioDriver.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "JackAudioDriver.h" diff --git a/src/libs/engine/JackAudioDriver.h b/src/libs/engine/JackAudioDriver.h index 89db2454..f62e274f 100644 --- a/src/libs/engine/JackAudioDriver.h +++ b/src/libs/engine/JackAudioDriver.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef JACKAUDIODRIVER_H diff --git a/src/libs/engine/JackMidiDriver.cpp b/src/libs/engine/JackMidiDriver.cpp index 7c9ca9f4..9da1a46d 100644 --- a/src/libs/engine/JackMidiDriver.cpp +++ b/src/libs/engine/JackMidiDriver.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "JackMidiDriver.h" diff --git a/src/libs/engine/JackMidiDriver.h b/src/libs/engine/JackMidiDriver.h index f080833c..b4ce922d 100644 --- a/src/libs/engine/JackMidiDriver.h +++ b/src/libs/engine/JackMidiDriver.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef JACKMIDIDRIVER_H diff --git a/src/libs/engine/LADSPANode.cpp b/src/libs/engine/LADSPANode.cpp index 7d39399d..17a3e53d 100644 --- a/src/libs/engine/LADSPANode.cpp +++ b/src/libs/engine/LADSPANode.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/src/libs/engine/LADSPANode.h b/src/libs/engine/LADSPANode.h index de965eb3..8efbc1ff 100644 --- a/src/libs/engine/LADSPANode.h +++ b/src/libs/engine/LADSPANode.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef LADSPANODE_H diff --git a/src/libs/engine/LV2Node.cpp b/src/libs/engine/LV2Node.cpp index cd7c1b2b..562f7d9b 100644 --- a/src/libs/engine/LV2Node.cpp +++ b/src/libs/engine/LV2Node.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "LV2Node.h" diff --git a/src/libs/engine/LV2Node.h b/src/libs/engine/LV2Node.h index ddb1c27e..fd354015 100644 --- a/src/libs/engine/LV2Node.h +++ b/src/libs/engine/LV2Node.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef LV2NODE_H diff --git a/src/libs/engine/LashDriver.cpp b/src/libs/engine/LashDriver.cpp index f42f87f2..7c90bd12 100644 --- a/src/libs/engine/LashDriver.cpp +++ b/src/libs/engine/LashDriver.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "LashDriver.h" diff --git a/src/libs/engine/LashDriver.h b/src/libs/engine/LashDriver.h index dedf1c6b..5b549acf 100644 --- a/src/libs/engine/LashDriver.h +++ b/src/libs/engine/LashDriver.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef LASHDRIVER_H diff --git a/src/libs/engine/List.h b/src/libs/engine/List.h index 964bd8e2..75cad1b1 100644 --- a/src/libs/engine/List.h +++ b/src/libs/engine/List.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef LIST_H diff --git a/src/libs/engine/Maid.cpp b/src/libs/engine/Maid.cpp index 3bebdedb..2365832b 100644 --- a/src/libs/engine/Maid.cpp +++ b/src/libs/engine/Maid.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "Maid.h" diff --git a/src/libs/engine/Maid.h b/src/libs/engine/Maid.h index 75412186..986bad20 100644 --- a/src/libs/engine/Maid.h +++ b/src/libs/engine/Maid.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef MAID_H diff --git a/src/libs/engine/MaidObject.h b/src/libs/engine/MaidObject.h index d0060520..795565b2 100644 --- a/src/libs/engine/MaidObject.h +++ b/src/libs/engine/MaidObject.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef MAIDOBJECT_H diff --git a/src/libs/engine/MidiControlNode.cpp b/src/libs/engine/MidiControlNode.cpp index c9aa37ff..5eba4a92 100644 --- a/src/libs/engine/MidiControlNode.cpp +++ b/src/libs/engine/MidiControlNode.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "MidiControlNode.h" diff --git a/src/libs/engine/MidiControlNode.h b/src/libs/engine/MidiControlNode.h index 16bb2b6b..c195a8fd 100644 --- a/src/libs/engine/MidiControlNode.h +++ b/src/libs/engine/MidiControlNode.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef MIDICONTROLNODE_H diff --git a/src/libs/engine/MidiDriver.h b/src/libs/engine/MidiDriver.h index b037d52b..548d713b 100644 --- a/src/libs/engine/MidiDriver.h +++ b/src/libs/engine/MidiDriver.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef MIDIDRIVER_H diff --git a/src/libs/engine/MidiMessage.h b/src/libs/engine/MidiMessage.h index 8dcb3e67..94794a31 100644 --- a/src/libs/engine/MidiMessage.h +++ b/src/libs/engine/MidiMessage.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef MIDIMESSAGE_H diff --git a/src/libs/engine/MidiNoteNode.cpp b/src/libs/engine/MidiNoteNode.cpp index df214be5..3c66e283 100644 --- a/src/libs/engine/MidiNoteNode.cpp +++ b/src/libs/engine/MidiNoteNode.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "MidiNoteNode.h" diff --git a/src/libs/engine/MidiNoteNode.h b/src/libs/engine/MidiNoteNode.h index 2ffd2e56..a16d6198 100644 --- a/src/libs/engine/MidiNoteNode.h +++ b/src/libs/engine/MidiNoteNode.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef MIDINOTENODE_H diff --git a/src/libs/engine/MidiTriggerNode.cpp b/src/libs/engine/MidiTriggerNode.cpp index 174117f3..2f2d4362 100644 --- a/src/libs/engine/MidiTriggerNode.cpp +++ b/src/libs/engine/MidiTriggerNode.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "MidiTriggerNode.h" diff --git a/src/libs/engine/MidiTriggerNode.h b/src/libs/engine/MidiTriggerNode.h index a3e4694f..8263e1b4 100644 --- a/src/libs/engine/MidiTriggerNode.h +++ b/src/libs/engine/MidiTriggerNode.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/src/libs/engine/Node.h b/src/libs/engine/Node.h index b4214f13..95196489 100644 --- a/src/libs/engine/Node.h +++ b/src/libs/engine/Node.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef NODE_H diff --git a/src/libs/engine/NodeBase.cpp b/src/libs/engine/NodeBase.cpp index 790c9e93..279d384a 100644 --- a/src/libs/engine/NodeBase.cpp +++ b/src/libs/engine/NodeBase.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "NodeBase.h" diff --git a/src/libs/engine/NodeBase.h b/src/libs/engine/NodeBase.h index f2d5ab79..e21380cd 100644 --- a/src/libs/engine/NodeBase.h +++ b/src/libs/engine/NodeBase.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef NODEBASE_H diff --git a/src/libs/engine/NodeFactory.cpp b/src/libs/engine/NodeFactory.cpp index a26744d2..db721f8e 100644 --- a/src/libs/engine/NodeFactory.cpp +++ b/src/libs/engine/NodeFactory.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "NodeFactory.h" diff --git a/src/libs/engine/NodeFactory.h b/src/libs/engine/NodeFactory.h index f6a8dbd1..9f29644d 100644 --- a/src/libs/engine/NodeFactory.h +++ b/src/libs/engine/NodeFactory.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/src/libs/engine/OSCClient.cpp b/src/libs/engine/OSCClient.cpp index 7b92476b..c4474b82 100644 --- a/src/libs/engine/OSCClient.cpp +++ b/src/libs/engine/OSCClient.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "OSCClient.h" diff --git a/src/libs/engine/OSCClient.h b/src/libs/engine/OSCClient.h index fdb80ef7..71a3f343 100644 --- a/src/libs/engine/OSCClient.h +++ b/src/libs/engine/OSCClient.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef OSCCLIENT_H diff --git a/src/libs/engine/OSCReceiver.cpp b/src/libs/engine/OSCReceiver.cpp index c89d3f04..eb9db6e7 100644 --- a/src/libs/engine/OSCReceiver.cpp +++ b/src/libs/engine/OSCReceiver.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "OSCReceiver.h" diff --git a/src/libs/engine/OSCReceiver.h b/src/libs/engine/OSCReceiver.h index 7926a25c..15a30fc1 100644 --- a/src/libs/engine/OSCReceiver.h +++ b/src/libs/engine/OSCReceiver.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef OSCRECEIVER_H diff --git a/src/libs/engine/OSCResponder.cpp b/src/libs/engine/OSCResponder.cpp index 82e6b55d..3d88b4ca 100644 --- a/src/libs/engine/OSCResponder.cpp +++ b/src/libs/engine/OSCResponder.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "OSCResponder.h" diff --git a/src/libs/engine/OSCResponder.h b/src/libs/engine/OSCResponder.h index f579df98..ca5fefc7 100644 --- a/src/libs/engine/OSCResponder.h +++ b/src/libs/engine/OSCResponder.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef OSCRESPONDER_H diff --git a/src/libs/engine/ObjectSender.cpp b/src/libs/engine/ObjectSender.cpp index c382ea55..c7a008d7 100644 --- a/src/libs/engine/ObjectSender.cpp +++ b/src/libs/engine/ObjectSender.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "ObjectSender.h" diff --git a/src/libs/engine/ObjectSender.h b/src/libs/engine/ObjectSender.h index 06241080..3e11e529 100644 --- a/src/libs/engine/ObjectSender.h +++ b/src/libs/engine/ObjectSender.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef OBJECTSENDER_H diff --git a/src/libs/engine/ObjectStore.cpp b/src/libs/engine/ObjectStore.cpp index 5154e276..b210128c 100644 --- a/src/libs/engine/ObjectStore.cpp +++ b/src/libs/engine/ObjectStore.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "ObjectStore.h" diff --git a/src/libs/engine/ObjectStore.h b/src/libs/engine/ObjectStore.h index e008887c..be312003 100644 --- a/src/libs/engine/ObjectStore.h +++ b/src/libs/engine/ObjectStore.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/src/libs/engine/Om.cpp b/src/libs/engine/Om.cpp index c04a7464..f1e32a31 100644 --- a/src/libs/engine/Om.cpp +++ b/src/libs/engine/Om.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "config.h" diff --git a/src/libs/engine/Om.h b/src/libs/engine/Om.h index 2fe3fd8c..fe9689aa 100644 --- a/src/libs/engine/Om.h +++ b/src/libs/engine/Om.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef OM_H diff --git a/src/libs/engine/OmApp.cpp b/src/libs/engine/OmApp.cpp index eed6d90f..5a001633 100644 --- a/src/libs/engine/OmApp.cpp +++ b/src/libs/engine/OmApp.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "Om.h" diff --git a/src/libs/engine/OmApp.h b/src/libs/engine/OmApp.h index 0fe49b81..8f14d0c2 100644 --- a/src/libs/engine/OmApp.h +++ b/src/libs/engine/OmApp.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef OMAPP_H diff --git a/src/libs/engine/OmInProcess.cpp b/src/libs/engine/OmInProcess.cpp index 971a1316..e4410fac 100644 --- a/src/libs/engine/OmInProcess.cpp +++ b/src/libs/engine/OmInProcess.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Mario Lang. +/* This file is part of Ingen. Copyright (C) 2006 Mario Lang. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include diff --git a/src/libs/engine/OutputPort.cpp b/src/libs/engine/OutputPort.cpp index d713726a..31280d49 100644 --- a/src/libs/engine/OutputPort.cpp +++ b/src/libs/engine/OutputPort.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "OutputPort.h" diff --git a/src/libs/engine/OutputPort.h b/src/libs/engine/OutputPort.h index 23f91089..89cb3398 100644 --- a/src/libs/engine/OutputPort.h +++ b/src/libs/engine/OutputPort.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef OUTPUTPORT_H diff --git a/src/libs/engine/Patch.cpp b/src/libs/engine/Patch.cpp index 634b3bbd..5cfdd6e3 100644 --- a/src/libs/engine/Patch.cpp +++ b/src/libs/engine/Patch.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include diff --git a/src/libs/engine/Patch.h b/src/libs/engine/Patch.h index 0b40d705..b507fc7a 100644 --- a/src/libs/engine/Patch.h +++ b/src/libs/engine/Patch.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PATCH_H diff --git a/src/libs/engine/Plugin.h b/src/libs/engine/Plugin.h index fc7ed7c4..65b65735 100644 --- a/src/libs/engine/Plugin.h +++ b/src/libs/engine/Plugin.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PLUGIN_H diff --git a/src/libs/engine/PluginLibrary.h b/src/libs/engine/PluginLibrary.h index 53279d8a..9037544b 100644 --- a/src/libs/engine/PluginLibrary.h +++ b/src/libs/engine/PluginLibrary.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/src/libs/engine/Port.cpp b/src/libs/engine/Port.cpp index a8706102..d11119a7 100644 --- a/src/libs/engine/Port.cpp +++ b/src/libs/engine/Port.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "Port.h" diff --git a/src/libs/engine/Port.h b/src/libs/engine/Port.h index 4d8160b4..494de850 100644 --- a/src/libs/engine/Port.h +++ b/src/libs/engine/Port.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PORT_H diff --git a/src/libs/engine/PostProcessor.cpp b/src/libs/engine/PostProcessor.cpp index 65b92015..e339f757 100644 --- a/src/libs/engine/PostProcessor.cpp +++ b/src/libs/engine/PostProcessor.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "PostProcessor.h" diff --git a/src/libs/engine/PostProcessor.h b/src/libs/engine/PostProcessor.h index 909949cd..2083c442 100644 --- a/src/libs/engine/PostProcessor.h +++ b/src/libs/engine/PostProcessor.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef POSTPROCESSOR_H diff --git a/src/libs/engine/QueuedEngineInterface.cpp b/src/libs/engine/QueuedEngineInterface.cpp index 7c5b91ed..b2b02112 100644 --- a/src/libs/engine/QueuedEngineInterface.cpp +++ b/src/libs/engine/QueuedEngineInterface.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "QueuedEngineInterface.h" diff --git a/src/libs/engine/QueuedEngineInterface.h b/src/libs/engine/QueuedEngineInterface.h index 93649283..12e5540f 100644 --- a/src/libs/engine/QueuedEngineInterface.h +++ b/src/libs/engine/QueuedEngineInterface.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef QUEUEDENGINEINTERFACE_H diff --git a/src/libs/engine/QueuedEvent.h b/src/libs/engine/QueuedEvent.h index 0cdaacdb..d5cd9701 100644 --- a/src/libs/engine/QueuedEvent.h +++ b/src/libs/engine/QueuedEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef QUEUEDEVENT_H diff --git a/src/libs/engine/QueuedEventSource.cpp b/src/libs/engine/QueuedEventSource.cpp index 953eb5b1..d41b2201 100644 --- a/src/libs/engine/QueuedEventSource.cpp +++ b/src/libs/engine/QueuedEventSource.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "QueuedEventSource.h" diff --git a/src/libs/engine/QueuedEventSource.h b/src/libs/engine/QueuedEventSource.h index 94a8215d..15fb45f1 100644 --- a/src/libs/engine/QueuedEventSource.h +++ b/src/libs/engine/QueuedEventSource.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef QUEUEDEVENTSOURCE_H diff --git a/src/libs/engine/Responder.h b/src/libs/engine/Responder.h index cf16a20a..3846fbef 100644 --- a/src/libs/engine/Responder.h +++ b/src/libs/engine/Responder.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef RESPONDER_H diff --git a/src/libs/engine/TransportNode.cpp b/src/libs/engine/TransportNode.cpp index 8a48b1a6..e7a0ad72 100644 --- a/src/libs/engine/TransportNode.cpp +++ b/src/libs/engine/TransportNode.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/src/libs/engine/TransportNode.h b/src/libs/engine/TransportNode.h index 15b1059c..50ec6350 100644 --- a/src/libs/engine/TransportNode.h +++ b/src/libs/engine/TransportNode.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/src/libs/engine/Tree.h b/src/libs/engine/Tree.h index 033d48b7..4683d1f6 100644 --- a/src/libs/engine/Tree.h +++ b/src/libs/engine/Tree.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef NODETREE_H diff --git a/src/libs/engine/TreeImplementation.h b/src/libs/engine/TreeImplementation.h index a61ec407..5739607f 100644 --- a/src/libs/engine/TreeImplementation.h +++ b/src/libs/engine/TreeImplementation.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "Tree.h" diff --git a/src/libs/engine/TypedConnection.cpp b/src/libs/engine/TypedConnection.cpp index 66c3a244..dbe07edf 100644 --- a/src/libs/engine/TypedConnection.cpp +++ b/src/libs/engine/TypedConnection.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "TypedConnection.h" diff --git a/src/libs/engine/TypedConnection.h b/src/libs/engine/TypedConnection.h index 9bd339bb..0a1cccdd 100644 --- a/src/libs/engine/TypedConnection.h +++ b/src/libs/engine/TypedConnection.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef TYPEDCONNECTION_H diff --git a/src/libs/engine/TypedPort.cpp b/src/libs/engine/TypedPort.cpp index fdbd7956..1dad267b 100644 --- a/src/libs/engine/TypedPort.cpp +++ b/src/libs/engine/TypedPort.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "TypedPort.h" diff --git a/src/libs/engine/TypedPort.h b/src/libs/engine/TypedPort.h index bcfad10a..04a9bee9 100644 --- a/src/libs/engine/TypedPort.h +++ b/src/libs/engine/TypedPort.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef TYPEDPORT_H diff --git a/src/libs/engine/events.h b/src/libs/engine/events.h index cfb44ec8..a59cbfe9 100644 --- a/src/libs/engine/events.h +++ b/src/libs/engine/events.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef EVENTS_H diff --git a/src/libs/engine/events/ActivateEvent.cpp b/src/libs/engine/events/ActivateEvent.cpp index 671b26d5..716a0326 100644 --- a/src/libs/engine/events/ActivateEvent.cpp +++ b/src/libs/engine/events/ActivateEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "ActivateEvent.h" diff --git a/src/libs/engine/events/ActivateEvent.h b/src/libs/engine/events/ActivateEvent.h index 280b5523..65831f05 100644 --- a/src/libs/engine/events/ActivateEvent.h +++ b/src/libs/engine/events/ActivateEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef ACTIVATEEVENT_H diff --git a/src/libs/engine/events/AddNodeEvent.cpp b/src/libs/engine/events/AddNodeEvent.cpp index 2b31ef4a..1ad693dc 100644 --- a/src/libs/engine/events/AddNodeEvent.cpp +++ b/src/libs/engine/events/AddNodeEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "AddNodeEvent.h" diff --git a/src/libs/engine/events/AddNodeEvent.h b/src/libs/engine/events/AddNodeEvent.h index fe0236ba..eb02ddd5 100644 --- a/src/libs/engine/events/AddNodeEvent.h +++ b/src/libs/engine/events/AddNodeEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef ADDNODEEVENT_H diff --git a/src/libs/engine/events/AddPortEvent.cpp b/src/libs/engine/events/AddPortEvent.cpp index 43cc797a..1c96206a 100644 --- a/src/libs/engine/events/AddPortEvent.cpp +++ b/src/libs/engine/events/AddPortEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "AddPortEvent.h" diff --git a/src/libs/engine/events/AddPortEvent.h b/src/libs/engine/events/AddPortEvent.h index b0913719..2ccf2f78 100644 --- a/src/libs/engine/events/AddPortEvent.h +++ b/src/libs/engine/events/AddPortEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef ADDPORTEVENT_H diff --git a/src/libs/engine/events/AllNotesOffEvent.cpp b/src/libs/engine/events/AllNotesOffEvent.cpp index aa3a00f1..ae411ab9 100644 --- a/src/libs/engine/events/AllNotesOffEvent.cpp +++ b/src/libs/engine/events/AllNotesOffEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "AllNotesOffEvent.h" diff --git a/src/libs/engine/events/AllNotesOffEvent.h b/src/libs/engine/events/AllNotesOffEvent.h index ea23301b..51d33b26 100644 --- a/src/libs/engine/events/AllNotesOffEvent.h +++ b/src/libs/engine/events/AllNotesOffEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef ALLNOTESOFFEVENT_H diff --git a/src/libs/engine/events/ClearPatchEvent.cpp b/src/libs/engine/events/ClearPatchEvent.cpp index 8b8fc223..1f60a5a7 100644 --- a/src/libs/engine/events/ClearPatchEvent.cpp +++ b/src/libs/engine/events/ClearPatchEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "ClearPatchEvent.h" diff --git a/src/libs/engine/events/ClearPatchEvent.h b/src/libs/engine/events/ClearPatchEvent.h index c6e531a8..d0b17fe0 100644 --- a/src/libs/engine/events/ClearPatchEvent.h +++ b/src/libs/engine/events/ClearPatchEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef CLEARPATCHEVENT_H diff --git a/src/libs/engine/events/ConnectionEvent.cpp b/src/libs/engine/events/ConnectionEvent.cpp index 74fa4e97..1182c723 100644 --- a/src/libs/engine/events/ConnectionEvent.cpp +++ b/src/libs/engine/events/ConnectionEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "ConnectionEvent.h" diff --git a/src/libs/engine/events/ConnectionEvent.h b/src/libs/engine/events/ConnectionEvent.h index e2a50d53..2d2e0c92 100644 --- a/src/libs/engine/events/ConnectionEvent.h +++ b/src/libs/engine/events/ConnectionEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef CONNECTIONEVENT_H diff --git a/src/libs/engine/events/CreatePatchEvent.cpp b/src/libs/engine/events/CreatePatchEvent.cpp index 2d8cce99..61bd2827 100644 --- a/src/libs/engine/events/CreatePatchEvent.cpp +++ b/src/libs/engine/events/CreatePatchEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "CreatePatchEvent.h" diff --git a/src/libs/engine/events/CreatePatchEvent.h b/src/libs/engine/events/CreatePatchEvent.h index 507d03c7..4583efd9 100644 --- a/src/libs/engine/events/CreatePatchEvent.h +++ b/src/libs/engine/events/CreatePatchEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef CREATEPATCHEVENT_H diff --git a/src/libs/engine/events/DSSIConfigureEvent.cpp b/src/libs/engine/events/DSSIConfigureEvent.cpp index c7bfdb61..a16ebe4c 100644 --- a/src/libs/engine/events/DSSIConfigureEvent.cpp +++ b/src/libs/engine/events/DSSIConfigureEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "DSSIConfigureEvent.h" diff --git a/src/libs/engine/events/DSSIConfigureEvent.h b/src/libs/engine/events/DSSIConfigureEvent.h index 0e77e217..f8ef2aa6 100644 --- a/src/libs/engine/events/DSSIConfigureEvent.h +++ b/src/libs/engine/events/DSSIConfigureEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef DSSICONFIGUREEVENT_H diff --git a/src/libs/engine/events/DSSIControlEvent.cpp b/src/libs/engine/events/DSSIControlEvent.cpp index 986fa33c..f326ca72 100644 --- a/src/libs/engine/events/DSSIControlEvent.cpp +++ b/src/libs/engine/events/DSSIControlEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "DSSIControlEvent.h" diff --git a/src/libs/engine/events/DSSIControlEvent.h b/src/libs/engine/events/DSSIControlEvent.h index 33d9ec5e..de636445 100644 --- a/src/libs/engine/events/DSSIControlEvent.h +++ b/src/libs/engine/events/DSSIControlEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef DSSICONTROLEVENT_H diff --git a/src/libs/engine/events/DSSIProgramEvent.cpp b/src/libs/engine/events/DSSIProgramEvent.cpp index 970daef6..9a869c73 100644 --- a/src/libs/engine/events/DSSIProgramEvent.cpp +++ b/src/libs/engine/events/DSSIProgramEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "DSSIProgramEvent.h" diff --git a/src/libs/engine/events/DSSIProgramEvent.h b/src/libs/engine/events/DSSIProgramEvent.h index 27f70e41..49207ca1 100644 --- a/src/libs/engine/events/DSSIProgramEvent.h +++ b/src/libs/engine/events/DSSIProgramEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef DSSIPROGRAMEVENT_H diff --git a/src/libs/engine/events/DSSIUpdateEvent.cpp b/src/libs/engine/events/DSSIUpdateEvent.cpp index fb441e67..d32466d4 100644 --- a/src/libs/engine/events/DSSIUpdateEvent.cpp +++ b/src/libs/engine/events/DSSIUpdateEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "DSSIUpdateEvent.h" diff --git a/src/libs/engine/events/DSSIUpdateEvent.h b/src/libs/engine/events/DSSIUpdateEvent.h index 3cee300f..25a77f02 100644 --- a/src/libs/engine/events/DSSIUpdateEvent.h +++ b/src/libs/engine/events/DSSIUpdateEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef DSSIUPDATEEVENT_H diff --git a/src/libs/engine/events/DeactivateEvent.cpp b/src/libs/engine/events/DeactivateEvent.cpp index 48bff55a..22434cbe 100644 --- a/src/libs/engine/events/DeactivateEvent.cpp +++ b/src/libs/engine/events/DeactivateEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "DeactivateEvent.h" diff --git a/src/libs/engine/events/DeactivateEvent.h b/src/libs/engine/events/DeactivateEvent.h index 8401f332..35c96e78 100644 --- a/src/libs/engine/events/DeactivateEvent.h +++ b/src/libs/engine/events/DeactivateEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef DEACTIVATEEVENT_H diff --git a/src/libs/engine/events/DestroyEvent.cpp b/src/libs/engine/events/DestroyEvent.cpp index f851c9b5..383f1d34 100644 --- a/src/libs/engine/events/DestroyEvent.cpp +++ b/src/libs/engine/events/DestroyEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "DestroyEvent.h" diff --git a/src/libs/engine/events/DestroyEvent.h b/src/libs/engine/events/DestroyEvent.h index a0008ea6..1f26ed90 100644 --- a/src/libs/engine/events/DestroyEvent.h +++ b/src/libs/engine/events/DestroyEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef DESTROYEVENT_H diff --git a/src/libs/engine/events/DisablePatchEvent.cpp b/src/libs/engine/events/DisablePatchEvent.cpp index a772e6e9..c896d943 100644 --- a/src/libs/engine/events/DisablePatchEvent.cpp +++ b/src/libs/engine/events/DisablePatchEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "DisablePatchEvent.h" diff --git a/src/libs/engine/events/DisablePatchEvent.h b/src/libs/engine/events/DisablePatchEvent.h index f38f14af..708e269b 100644 --- a/src/libs/engine/events/DisablePatchEvent.h +++ b/src/libs/engine/events/DisablePatchEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef DISABLEPATCHEVENT_H diff --git a/src/libs/engine/events/DisconnectNodeEvent.cpp b/src/libs/engine/events/DisconnectNodeEvent.cpp index e430acc5..22c2459e 100644 --- a/src/libs/engine/events/DisconnectNodeEvent.cpp +++ b/src/libs/engine/events/DisconnectNodeEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "DisconnectNodeEvent.h" diff --git a/src/libs/engine/events/DisconnectNodeEvent.h b/src/libs/engine/events/DisconnectNodeEvent.h index 4bcbdf94..40e6c086 100644 --- a/src/libs/engine/events/DisconnectNodeEvent.h +++ b/src/libs/engine/events/DisconnectNodeEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef DISCONNECTNODEEVENT_H diff --git a/src/libs/engine/events/DisconnectPortEvent.cpp b/src/libs/engine/events/DisconnectPortEvent.cpp index a4c213d5..2ec408d6 100644 --- a/src/libs/engine/events/DisconnectPortEvent.cpp +++ b/src/libs/engine/events/DisconnectPortEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "DisconnectPortEvent.h" diff --git a/src/libs/engine/events/DisconnectPortEvent.h b/src/libs/engine/events/DisconnectPortEvent.h index e8de4120..82e0ef90 100644 --- a/src/libs/engine/events/DisconnectPortEvent.h +++ b/src/libs/engine/events/DisconnectPortEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef DISCONNECTPORTEVENT_H diff --git a/src/libs/engine/events/DisconnectionEvent.cpp b/src/libs/engine/events/DisconnectionEvent.cpp index 34570537..04193c6c 100644 --- a/src/libs/engine/events/DisconnectionEvent.cpp +++ b/src/libs/engine/events/DisconnectionEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "DisconnectionEvent.h" diff --git a/src/libs/engine/events/DisconnectionEvent.h b/src/libs/engine/events/DisconnectionEvent.h index 445815dd..6edbc78a 100644 --- a/src/libs/engine/events/DisconnectionEvent.h +++ b/src/libs/engine/events/DisconnectionEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef DISCONNECTIONEVENT_H diff --git a/src/libs/engine/events/EnablePatchEvent.cpp b/src/libs/engine/events/EnablePatchEvent.cpp index 6af3b844..eee50dac 100644 --- a/src/libs/engine/events/EnablePatchEvent.cpp +++ b/src/libs/engine/events/EnablePatchEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "EnablePatchEvent.h" diff --git a/src/libs/engine/events/EnablePatchEvent.h b/src/libs/engine/events/EnablePatchEvent.h index f3d22e69..0c86a100 100644 --- a/src/libs/engine/events/EnablePatchEvent.h +++ b/src/libs/engine/events/EnablePatchEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef ENABLEPATCHEVENT_H diff --git a/src/libs/engine/events/LashRestoreDoneEvent.h b/src/libs/engine/events/LashRestoreDoneEvent.h index b32f27d6..ed3933a5 100644 --- a/src/libs/engine/events/LashRestoreDoneEvent.h +++ b/src/libs/engine/events/LashRestoreDoneEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef LASHRESTOREDONEEVENT_H diff --git a/src/libs/engine/events/LoadPluginsEvent.cpp b/src/libs/engine/events/LoadPluginsEvent.cpp index 656e9010..93099ef0 100644 --- a/src/libs/engine/events/LoadPluginsEvent.cpp +++ b/src/libs/engine/events/LoadPluginsEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "LoadPluginsEvent.h" diff --git a/src/libs/engine/events/LoadPluginsEvent.h b/src/libs/engine/events/LoadPluginsEvent.h index b69dbb38..10970cec 100644 --- a/src/libs/engine/events/LoadPluginsEvent.h +++ b/src/libs/engine/events/LoadPluginsEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef LOADPLUGINSEVENT_H diff --git a/src/libs/engine/events/MidiLearnEvent.cpp b/src/libs/engine/events/MidiLearnEvent.cpp index 63ad82fc..cd9fd8f2 100644 --- a/src/libs/engine/events/MidiLearnEvent.cpp +++ b/src/libs/engine/events/MidiLearnEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "MidiLearnEvent.h" diff --git a/src/libs/engine/events/MidiLearnEvent.h b/src/libs/engine/events/MidiLearnEvent.h index 13928e09..de0dfbe3 100644 --- a/src/libs/engine/events/MidiLearnEvent.h +++ b/src/libs/engine/events/MidiLearnEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef MIDILEARNEVENT_H diff --git a/src/libs/engine/events/NoteOffEvent.cpp b/src/libs/engine/events/NoteOffEvent.cpp index fde2e520..a84317a5 100644 --- a/src/libs/engine/events/NoteOffEvent.cpp +++ b/src/libs/engine/events/NoteOffEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "NoteOffEvent.h" diff --git a/src/libs/engine/events/NoteOffEvent.h b/src/libs/engine/events/NoteOffEvent.h index d9857d0e..3a9f715f 100644 --- a/src/libs/engine/events/NoteOffEvent.h +++ b/src/libs/engine/events/NoteOffEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef NOTEOFFEVENT_H diff --git a/src/libs/engine/events/NoteOnEvent.cpp b/src/libs/engine/events/NoteOnEvent.cpp index 9688af79..4a0ba141 100644 --- a/src/libs/engine/events/NoteOnEvent.cpp +++ b/src/libs/engine/events/NoteOnEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "NoteOnEvent.h" diff --git a/src/libs/engine/events/NoteOnEvent.h b/src/libs/engine/events/NoteOnEvent.h index 079ff806..af6251e9 100644 --- a/src/libs/engine/events/NoteOnEvent.h +++ b/src/libs/engine/events/NoteOnEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef NOTEONEVENT_H diff --git a/src/libs/engine/events/PingQueuedEvent.h b/src/libs/engine/events/PingQueuedEvent.h index cd386600..790cf7cc 100644 --- a/src/libs/engine/events/PingQueuedEvent.h +++ b/src/libs/engine/events/PingQueuedEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PINGQUEUEDEVENT_H diff --git a/src/libs/engine/events/RegisterClientEvent.cpp b/src/libs/engine/events/RegisterClientEvent.cpp index ca7dd1f6..d2ea41ab 100644 --- a/src/libs/engine/events/RegisterClientEvent.cpp +++ b/src/libs/engine/events/RegisterClientEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "RegisterClientEvent.h" diff --git a/src/libs/engine/events/RegisterClientEvent.h b/src/libs/engine/events/RegisterClientEvent.h index f4b6b60f..6399e5be 100644 --- a/src/libs/engine/events/RegisterClientEvent.h +++ b/src/libs/engine/events/RegisterClientEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef REGISTERCLIENTEVENT_H diff --git a/src/libs/engine/events/RenameEvent.cpp b/src/libs/engine/events/RenameEvent.cpp index 98125fa4..52002774 100644 --- a/src/libs/engine/events/RenameEvent.cpp +++ b/src/libs/engine/events/RenameEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "RenameEvent.h" diff --git a/src/libs/engine/events/RenameEvent.h b/src/libs/engine/events/RenameEvent.h index 2fd0840e..41e5eec0 100644 --- a/src/libs/engine/events/RenameEvent.h +++ b/src/libs/engine/events/RenameEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef RENAMEEVENT_H diff --git a/src/libs/engine/events/RequestAllObjectsEvent.cpp b/src/libs/engine/events/RequestAllObjectsEvent.cpp index ef40a0de..0b8f6255 100644 --- a/src/libs/engine/events/RequestAllObjectsEvent.cpp +++ b/src/libs/engine/events/RequestAllObjectsEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "RequestAllObjectsEvent.h" diff --git a/src/libs/engine/events/RequestAllObjectsEvent.h b/src/libs/engine/events/RequestAllObjectsEvent.h index df63a577..b5d43f59 100644 --- a/src/libs/engine/events/RequestAllObjectsEvent.h +++ b/src/libs/engine/events/RequestAllObjectsEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef REQUESTALLOBJECTSEVENT_H diff --git a/src/libs/engine/events/RequestMetadataEvent.cpp b/src/libs/engine/events/RequestMetadataEvent.cpp index 79185b8a..0590f3b3 100644 --- a/src/libs/engine/events/RequestMetadataEvent.cpp +++ b/src/libs/engine/events/RequestMetadataEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "RequestMetadataEvent.h" diff --git a/src/libs/engine/events/RequestMetadataEvent.h b/src/libs/engine/events/RequestMetadataEvent.h index e8450210..d086d7da 100644 --- a/src/libs/engine/events/RequestMetadataEvent.h +++ b/src/libs/engine/events/RequestMetadataEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef REQUESTMETADATAEVENT_H diff --git a/src/libs/engine/events/RequestPluginsEvent.cpp b/src/libs/engine/events/RequestPluginsEvent.cpp index 89dbefd5..984bddf6 100644 --- a/src/libs/engine/events/RequestPluginsEvent.cpp +++ b/src/libs/engine/events/RequestPluginsEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "RequestPluginsEvent.h" diff --git a/src/libs/engine/events/RequestPluginsEvent.h b/src/libs/engine/events/RequestPluginsEvent.h index 83447fb3..b8c76362 100644 --- a/src/libs/engine/events/RequestPluginsEvent.h +++ b/src/libs/engine/events/RequestPluginsEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef REQUESTPLUGINSEVENT_H diff --git a/src/libs/engine/events/RequestPortValueEvent.cpp b/src/libs/engine/events/RequestPortValueEvent.cpp index e9766c9b..ac690883 100644 --- a/src/libs/engine/events/RequestPortValueEvent.cpp +++ b/src/libs/engine/events/RequestPortValueEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "RequestPortValueEvent.h" diff --git a/src/libs/engine/events/RequestPortValueEvent.h b/src/libs/engine/events/RequestPortValueEvent.h index 7ee5071c..fd915c3b 100644 --- a/src/libs/engine/events/RequestPortValueEvent.h +++ b/src/libs/engine/events/RequestPortValueEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef REQUESTPORTVALUEEVENT_H diff --git a/src/libs/engine/events/SetMetadataEvent.cpp b/src/libs/engine/events/SetMetadataEvent.cpp index 905c377c..37e164c1 100644 --- a/src/libs/engine/events/SetMetadataEvent.cpp +++ b/src/libs/engine/events/SetMetadataEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "SetMetadataEvent.h" diff --git a/src/libs/engine/events/SetMetadataEvent.h b/src/libs/engine/events/SetMetadataEvent.h index 6e98158f..faa9ae72 100644 --- a/src/libs/engine/events/SetMetadataEvent.h +++ b/src/libs/engine/events/SetMetadataEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef SETMETADATAEVENT_H diff --git a/src/libs/engine/events/SetPortValueEvent.cpp b/src/libs/engine/events/SetPortValueEvent.cpp index 73672248..6401689b 100644 --- a/src/libs/engine/events/SetPortValueEvent.cpp +++ b/src/libs/engine/events/SetPortValueEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "SetPortValueEvent.h" diff --git a/src/libs/engine/events/SetPortValueEvent.h b/src/libs/engine/events/SetPortValueEvent.h index f0d4a6cd..0606e546 100644 --- a/src/libs/engine/events/SetPortValueEvent.h +++ b/src/libs/engine/events/SetPortValueEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef SETPORTVALUEEVENT_H diff --git a/src/libs/engine/events/SetPortValueQueuedEvent.cpp b/src/libs/engine/events/SetPortValueQueuedEvent.cpp index 3e93b01b..6ef39d55 100644 --- a/src/libs/engine/events/SetPortValueQueuedEvent.cpp +++ b/src/libs/engine/events/SetPortValueQueuedEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "SetPortValueQueuedEvent.h" diff --git a/src/libs/engine/events/SetPortValueQueuedEvent.h b/src/libs/engine/events/SetPortValueQueuedEvent.h index 3b326ef0..d29f424b 100644 --- a/src/libs/engine/events/SetPortValueQueuedEvent.h +++ b/src/libs/engine/events/SetPortValueQueuedEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef SETPORTVALUEQUEUEDEVENT_H diff --git a/src/libs/engine/events/UnregisterClientEvent.cpp b/src/libs/engine/events/UnregisterClientEvent.cpp index ef5a9979..10696640 100644 --- a/src/libs/engine/events/UnregisterClientEvent.cpp +++ b/src/libs/engine/events/UnregisterClientEvent.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "UnregisterClientEvent.h" diff --git a/src/libs/engine/events/UnregisterClientEvent.h b/src/libs/engine/events/UnregisterClientEvent.h index fdbdb314..56556629 100644 --- a/src/libs/engine/events/UnregisterClientEvent.h +++ b/src/libs/engine/events/UnregisterClientEvent.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef UNREGISTERCLIENTEVENT_H diff --git a/src/libs/engine/instantiations.cpp b/src/libs/engine/instantiations.cpp index 34718406..c0152ba0 100644 --- a/src/libs/engine/instantiations.cpp +++ b/src/libs/engine/instantiations.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ /** @file diff --git a/src/libs/engine/midi.h b/src/libs/engine/midi.h index 6575ede7..b8fa4f83 100644 --- a/src/libs/engine/midi.h +++ b/src/libs/engine/midi.h @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * */ diff --git a/src/libs/engine/tuning.h b/src/libs/engine/tuning.h index aeec81da..2536b60a 100644 --- a/src/libs/engine/tuning.h +++ b/src/libs/engine/tuning.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef TUNING_H diff --git a/src/libs/engine/types.h b/src/libs/engine/types.h index d0ca5a0b..7205a649 100644 --- a/src/libs/engine/types.h +++ b/src/libs/engine/types.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2005 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/src/libs/engine/util.h b/src/libs/engine/util.h index 9cf4bf7f..86c851b7 100644 --- a/src/libs/engine/util.h +++ b/src/libs/engine/util.h @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef UTIL_H diff --git a/src/progs/demolition/DemolitionClientInterface.cpp b/src/progs/demolition/DemolitionClientInterface.cpp index e58371d4..1c3d7aa1 100644 --- a/src/progs/demolition/DemolitionClientInterface.cpp +++ b/src/progs/demolition/DemolitionClientInterface.cpp @@ -1,17 +1,17 @@ -/* This file is part of Om. Copyright (C) 2005 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * - * Om is free software; you can redistribute it and/or modify it under the + * Ingen is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software * Foundation; either version 2 of the License, or (at your option) any later * version. * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "DemolitionClientInterface.h" diff --git a/src/progs/demolition/DemolitionClientInterface.h b/src/progs/demolition/DemolitionClientInterface.h index 7b114c52..16a67ce9 100644 --- a/src/progs/demolition/DemolitionClientInterface.h +++ b/src/progs/demolition/DemolitionClientInterface.h @@ -1,17 +1,17 @@ -/* This file is part of Om. Copyright (C) 2005 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * - * Om is free software; you can redistribute it and/or modify it under the + * Ingen is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software * Foundation; either version 2 of the License, or (at your option) any later * version. * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/src/progs/demolition/DemolitionModel.cpp b/src/progs/demolition/DemolitionModel.cpp index 056c18e4..b91b461a 100644 --- a/src/progs/demolition/DemolitionModel.cpp +++ b/src/progs/demolition/DemolitionModel.cpp @@ -1,17 +1,17 @@ -/* This file is part of Om. Copyright (C) 2005 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * - * Om is free software; you can redistribute it and/or modify it under the + * Ingen is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software * Foundation; either version 2 of the License, or (at your option) any later * version. * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "DemolitionModel.h" @@ -221,15 +221,15 @@ void DemolitionModel::object_renamed(const Path& old_path, const Path& new_path) { /* FIXME: broken, does not rename children - assert(OmPath::parent(old_path) == OmPath::parent(new_path)); + assert(Path::parent(old_path) == Path::parent(new_path)); // Rename node NodeModel* nm = get_node(old_path); if (nm != NULL) { if (nm->parent() != NULL) { - nm->parent()->remove_node(OmPath::name(old_path)); + nm->parent()->remove_node(Path::name(old_path)); nm->path(new_path); - nm->parent()->add_node(OmPath::name(new_path)); + nm->parent()->add_node(Path::name(new_path)); } } diff --git a/src/progs/demolition/DemolitionModel.h b/src/progs/demolition/DemolitionModel.h index 64e0cc61..952d41cb 100644 --- a/src/progs/demolition/DemolitionModel.h +++ b/src/progs/demolition/DemolitionModel.h @@ -1,17 +1,17 @@ -/* This file is part of Om. Copyright (C) 2005 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * - * Om is free software; you can redistribute it and/or modify it under the + * Ingen is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software * Foundation; either version 2 of the License, or (at your option) any later * version. * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef DEMOLITIONMODEL_H diff --git a/src/progs/demolition/demolition.cpp b/src/progs/demolition/demolition.cpp index 93a37414..47c3279c 100644 --- a/src/progs/demolition/demolition.cpp +++ b/src/progs/demolition/demolition.cpp @@ -1,17 +1,17 @@ -/* This file is part of Om. Copyright (C) 2005 Dave Robillard. +/* This file is part of Ingen. Copyright (C) 2006 Dave Robillard. * - * Om is free software; you can redistribute it and/or modify it under the + * Ingen is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software * Foundation; either version 2 of the License, or (at your option) any later * version. * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "OSCModelEngineInterface.h" diff --git a/src/progs/gtk/App.cpp b/src/progs/gtk/App.cpp deleted file mode 100644 index 262849d5..00000000 --- a/src/progs/gtk/App.cpp +++ /dev/null @@ -1,220 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "config.h" -#include "App.h" -#include -#include -#include -#include -#include -#include -#include "PatchView.h" -#include "OmModule.h" -#include "ControlPanel.h" -#include "SubpatchModule.h" -#include "OmFlowCanvas.h" -#include "GtkObjectController.h" -#include "PatchController.h" -#include "NodeController.h" -#include "PortController.h" -#include "LoadPluginWindow.h" -#include "PatchWindow.h" -#include "MessagesWindow.h" -#include "ConfigWindow.h" -#include "Controller.h" -#include "GladeFactory.h" -#include "util/Path.h" -#include "ObjectModel.h" -#include "PatchModel.h" -#include "PatchTreeWindow.h" -#include "Configuration.h" -#include "ConnectWindow.h" -#ifdef HAVE_LASH -#include "LashController.h" -#endif -using std::cerr; using std::cout; using std::endl; -using std::string; -namespace LibOmClient { class PluginModel; } -using namespace LibOmClient; - -namespace OmGtk { - -class OmPort; - -App::App() -: m_configuration(new Configuration()), - m_about_dialog(NULL), - m_enable_signal(true) -{ - Glib::RefPtr glade_xml = GladeFactory::new_glade_reference(); - - glade_xml->get_widget_derived("connect_win", m_connect_window); - //glade_xml->get_widget_derived("new_patch_win", m_new_patch_window); - //glade_xml->get_widget_derived("load_patch_win", m_load_patch_window); - glade_xml->get_widget_derived("config_win", m_config_window); - glade_xml->get_widget_derived("patch_tree_win", m_patch_tree_window); -// glade_xml->get_widget_derived("main_patches_treeview", m_objects_treeview); - glade_xml->get_widget("about_win", m_about_dialog); - - m_config_window->configuration(m_configuration); - - glade_xml->get_widget_derived("messages_win", m_messages_window); -} - - -App::~App() -{ -} - - -void -App::error_message(const string& str) -{ - m_messages_window->post(str); - m_messages_window->show(); - m_messages_window->raise(); -} - - -/* -bool -App::idle_callback() -{ - m_client_hooks->process_events(); - -#ifdef HAVE_LASH - //if (lash_controller->enabled()) - // lash_controller->process_events(); -#endif - - return true; -} -*/ - - -/******** Event Handlers ************/ - - -#if 0 -App::event_load_session() -{ - Gtk::FileChooserDialog* dialog - = new Gtk::FileChooserDialog(*m_main_window, "Load Session", Gtk::FILE_CHOOSER_ACTION_OPEN); - - dialog->add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); - dialog->add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK); - int result = dialog->run(); - string filename = dialog->get_filename(); - delete dialog; - - cout << result << endl; - - assert(result == Gtk::RESPONSE_OK || result == Gtk::RESPONSE_CANCEL || result == Gtk::RESPONSE_NONE); - - if (result == Gtk::RESPONSE_OK) - //configuration->load_session(filename); - _controller->load_session(filename); -} - - -void -App::event_save_session_as() -{ - Gtk::FileChooserDialog dialog(*m_main_window, "Save Session", Gtk::FILE_CHOOSER_ACTION_SAVE); - - /* - Gtk::VBox* box = dialog.get_vbox(); - Gtk::Label warning("Warning: Recursively saving will overwrite any subpatch files \ - without confirmation."); - box->pack_start(warning, false, false, 2); - Gtk::CheckButton recursive_checkbutton("Recursively save all subpatches"); - box->pack_start(recursive_checkbutton, false, false, 0); - recursive_checkbutton.show(); - */ - dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); - dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK); - - int result = dialog.run(); - //bool recursive = recursive_checkbutton.get_active(); - - assert(result == Gtk::RESPONSE_OK || result == Gtk::RESPONSE_CANCEL || result == Gtk::RESPONSE_NONE); - - if (result == Gtk::RESPONSE_OK) { - string filename = dialog.get_filename(); - if (filename.length() < 11 || filename.substr(filename.length()-10) != ".omsession") - filename += ".omsession"; - - bool confirm = false; - std::fstream fin; - fin.open(filename.c_str(), std::ios::in); - if (fin.is_open()) { // File exists - string msg = "File already exists! Are you sure you want to overwrite "; - msg += filename + "?"; - Gtk::MessageDialog confirm_dialog(*m_main_window, - msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_YES_NO, true); - if (confirm_dialog.run() == Gtk::RESPONSE_YES) - confirm = true; - else - confirm = false; - } else { // File doesn't exist - confirm = true; - } - fin.close(); - - if (confirm) { - _controller->save_session(filename); - } - } -} -#endif - -void -App::add_patch_window(PatchWindow* pw) -{ - m_windows.push_back(pw); -} - - -void -App::remove_patch_window(PatchWindow* pw) -{ - m_windows.erase(find(m_windows.begin(), m_windows.end(), pw)); -} - - -/** Returns the number of Patch windows currently visible. - */ -int -App::num_open_patch_windows() -{ - int ret = 0; - for (list::iterator i = m_windows.begin(); i != m_windows.end(); ++i) - if ((*i)->is_visible()) - ++ret; - - return ret; -} - -void -App::quit() -{ - Gtk::Main::quit(); -} - - -} // namespace OmGtk - diff --git a/src/progs/gtk/App.h b/src/progs/gtk/App.h deleted file mode 100644 index f86dc568..00000000 --- a/src/progs/gtk/App.h +++ /dev/null @@ -1,118 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef OMGTKAPP_H -#define OMGTKAPP_H - -#include -#include -#include -#include -#include -#include -#include -#include -using std::string; using std::map; using std::list; -using std::cerr; using std::endl; - -namespace LibOmClient { class PatchModel; class PluginModel; } -using namespace LibOmClient; - -/** \defgroup OmGtk GTK Client - */ - -namespace OmGtk { - -class PatchWindow; -class GtkObjectController; -class PatchController; -class NodeController; -class PortController; -class LoadPatchWindow; -class MessagesWindow; -class ConfigWindow; -class OmGtkObject; -class OmModule; -class OmPort; -class OmFlowCanvas; -class PatchTreeView; -class PatchTreeWindow; -class ConnectWindow; -class Configuration; - - -/** Singleton master class most everything is contained within. - * - * This is a horrible god-object, but it's shrinking in size as things are - * moved out. Hopefully it will go away entirely some day.. - * - * \ingroup OmGtk - */ -class App -{ -public: - ~App(); - - void error_message(const string& msg); - - void quit(); - - void add_patch_window(PatchWindow* pw); - void remove_patch_window(PatchWindow* pw); - - int num_open_patch_windows(); - - ConnectWindow* connect_window() const { return m_connect_window; } - Gtk::Dialog* about_dialog() const { return m_about_dialog; } - ConfigWindow* configuration_dialog() const { return m_config_window; } - MessagesWindow* messages_dialog() const { return m_messages_window; } - PatchTreeWindow* patch_tree() const { return m_patch_tree_window; } - Configuration* configuration() const { return m_configuration; } - - static void instantiate() { if (!_instance) _instance = new App(); } - static inline App& instance() { assert(_instance); return *_instance; } - -protected: - App(); - static App* _instance; - - //bool connect_callback(); - //bool idle_callback(); - - Configuration* m_configuration; - - list m_windows; - - ConnectWindow* m_connect_window; - MessagesWindow* m_messages_window; - PatchTreeWindow* m_patch_tree_window; - ConfigWindow* m_config_window; - Gtk::Dialog* m_about_dialog; - Gtk::Button* m_engine_error_close_button; - - /** Used to avoid feedback loops with (eg) process checkbutton - * FIXME: Maybe this should be globally implemented at the Controller level, - * disable all command sending while handling events to avoid feedback - * issues with widget event callbacks? This same pattern is duplicated - * too much... */ - bool m_enable_signal; -}; - - -} // namespace OmGtk - -#endif // OMGTKAPP_H - diff --git a/src/progs/gtk/BreadCrumb.h b/src/progs/gtk/BreadCrumb.h deleted file mode 100644 index bbb8ee5c..00000000 --- a/src/progs/gtk/BreadCrumb.h +++ /dev/null @@ -1,68 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef BREADCRUMB_H -#define BREADCRUMB_H - -#include -#include "PatchWindow.h" -#include "PatchController.h" -#include "PatchModel.h" - -namespace OmGtk { - - -/** Breadcrumb button in a PatchWindow. - * - * \ingroup OmGtk - */ -class BreadCrumb : public Gtk::ToggleButton -{ -public: - BreadCrumb(PatchWindow* window, const Path& path) - : m_window(window) - , m_path(path) - { - set_border_width(0); - set_path(path); - signal_clicked().connect(sigc::bind(sigc::mem_fun( - m_window, &PatchWindow::breadcrumb_clicked), this)); - show_all(); - } - - //PatchController* patch() { return m_patch; } - - void set_path(const Path& path) - { - remove(); - const string text = (path == "/") ? "/" : path.name(); - Gtk::Label* lab = manage(new Gtk::Label(text)); - lab->set_padding(0, 0); - lab->show(); - add(*lab); - } - - Path& path() { return m_path; } - -private: - PatchWindow* m_window; - Path m_path; - //PatchController* m_patch; -}; - -} // namespace OmGtk - -#endif // BREADCRUMB_H diff --git a/src/progs/gtk/ConfigWindow.cpp b/src/progs/gtk/ConfigWindow.cpp deleted file mode 100644 index db3bce18..00000000 --- a/src/progs/gtk/ConfigWindow.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ConfigWindow.h" -#include -#include -#include -#include -#include "PatchController.h" -#include "NodeModel.h" -#include "OmFlowCanvas.h" -using std::cout; using std::cerr; using std::endl; - - -namespace OmGtk { - -ConfigWindow::ConfigWindow(BaseObjectType* cobject, const Glib::RefPtr& xml) -: Gtk::Window(cobject), - m_configuration(NULL) -{ - xml->get_widget("config_path_entry", m_path_entry); - xml->get_widget("config_save_button", m_save_button); - xml->get_widget("config_cancel_button", m_cancel_button); - xml->get_widget("config_ok_button", m_ok_button); - - m_save_button->signal_clicked().connect( sigc::mem_fun(this, &ConfigWindow::save_clicked)); - m_cancel_button->signal_clicked().connect(sigc::mem_fun(this, &ConfigWindow::cancel_clicked)); - m_ok_button->signal_clicked().connect( sigc::mem_fun(this, &ConfigWindow::ok_clicked)); -} - - -/** Sets the state manager for this window and initializes everything. - * - * This function MUST be called before using the window in any way! - */ -void -ConfigWindow::configuration(Configuration* sm) -{ - m_configuration = sm; - m_path_entry->set_text(sm->patch_path()); -} - - - -///// Event Handlers ////// - - -void -ConfigWindow::save_clicked() -{ - m_configuration->patch_path(m_path_entry->get_text()); - m_configuration->apply_settings(); - m_configuration->save_settings(); -} - - -void -ConfigWindow::cancel_clicked() -{ - hide(); -} - - -void -ConfigWindow::ok_clicked() -{ - m_configuration->patch_path(m_path_entry->get_text()); - m_configuration->apply_settings(); - hide(); -} - - -} // namespace OmGtk diff --git a/src/progs/gtk/ConfigWindow.h b/src/progs/gtk/ConfigWindow.h deleted file mode 100644 index caf1531f..00000000 --- a/src/progs/gtk/ConfigWindow.h +++ /dev/null @@ -1,63 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#ifndef CONFIGWINDOW_H -#define CONFIGWINDOW_H - -#include "PluginModel.h" -#include "Configuration.h" -#include -#include -#include -#include - -using std::list; -using LibOmClient::PluginModel; - -namespace OmGtk { - - -/** 'Configuration' window. - * - * Loaded by glade as a derived object. - * - * \ingroup OmGtk - */ -class ConfigWindow : public Gtk::Window -{ -public: - ConfigWindow(BaseObjectType* cobject, const Glib::RefPtr& xml); - - void configuration(Configuration* sm); - -private: - void save_clicked(); - void cancel_clicked(); - void ok_clicked(); - - Configuration* m_configuration; - - Gtk::Entry* m_path_entry; - Gtk::Button* m_save_button; - Gtk::Button* m_cancel_button; - Gtk::Button* m_ok_button; -}; - - -} // namespace OmGtk - -#endif // CONFIGWINDOW_H diff --git a/src/progs/gtk/Configuration.cpp b/src/progs/gtk/Configuration.cpp deleted file mode 100644 index e4882cc3..00000000 --- a/src/progs/gtk/Configuration.cpp +++ /dev/null @@ -1,184 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "Configuration.h" -#include -#include -#include -#include -#include -#include "PortModel.h" -#include "PluginModel.h" -#include "PatchController.h" -#include "PatchModel.h" -#include "OmFlowCanvas.h" -#include "Controller.h" - -using std::cerr; using std::cout; using std::endl; -using std::map; using std::string; -using LibOmClient::PatchModel; - -namespace OmGtk { - -using namespace LibOmClient; - - -Configuration::Configuration() -: m_patch_path("/usr/share/om/patches:/usr/local/share/om/patches"), - m_audio_port_color( 0x394f66FF), - m_control_port_color(0x396639FF), - m_midi_port_color( 0x663939FF) -{ -} - - -Configuration::~Configuration() -{ -} - - -/** Loads settings from the rc file. Passing no parameter will load from - * the default location. - */ -void -Configuration::load_settings(string filename) -{ - if (filename == "") - filename = string(getenv("HOME")).append("/.omgtkrc"); - - std::ifstream is; - is.open(filename.c_str(), std::ios::in); - - if ( ! is.good()) { - cout << "[Configuration] Unable to open settings file " << filename << endl; - return; - } else { - cout << "[Configuration] Loading settings from " << filename << endl; - } - - string s; - - is >> s; - if (s != "file_version") { - cerr << "[Configuration] Corrupt settings file, load aborted." << endl; - is.close(); - return; - } - - is >> s; - if (s != "1") { - cerr << "[Configuration] Unknown settings file version number, load aborted." << endl; - is.close(); - return; - } - - is >> s; - if (s != "patch_path") { - cerr << "[Configuration] Corrupt settings file, load aborted." << endl; - is.close(); - return; - } - - is >> s; - m_patch_path = s; - - is.close(); -} - - -/** Saves settings to rc file. Passing no parameter will save to the - * default location. - */ -void -Configuration::save_settings(string filename) -{ - if (filename == "") - filename = string(getenv("HOME")).append("/.omgtkrc"); - - std::ofstream os; - os.open(filename.c_str(), std::ios::out); - - if ( ! os.good()) { - cout << "[Configuration] Unable to write to setting file " << filename << endl; - return; - } else { - cout << "[Configuration] Saving settings to " << filename << endl; - } - - os << "file_version 1" << endl; - os << "patch_path " << m_patch_path << endl; - - os.close(); -} - - -/** Applies the current loaded settings to whichever parts of the app - * need updating. - */ -void -Configuration::apply_settings() -{ - Controller::instance().set_patch_path(m_patch_path); -} - - -int -Configuration::get_port_color(const PortModel* pi) -{ - assert(pi != NULL); - - if (pi->is_control()) { - return m_control_port_color; - } else if (pi->is_audio()) { - return m_audio_port_color; - } else if (pi->is_midi()) { - return m_midi_port_color; - } - - cerr << "[Configuration] Unknown port type! Port will be bright red, this is an error." << endl; - return 0xFF0000FF; -} - -/* -Coord -Configuration::get_window_location(const string& id) -{ - return m_window_locations[id]; -} - - -void -Configuration::set_window_location(const string& id, Coord loc) -{ - m_window_locations[id] = loc; -} - - -Coord -Configuration::get_window_size(const string& id) -{ - return m_window_sizes[id]; -} - - -void -Configuration::set_window_size(const string& id, Coord size) -{ - m_window_sizes[id] = size; -}*/ - - -} // namespace OmGtk diff --git a/src/progs/gtk/Configuration.h b/src/progs/gtk/Configuration.h deleted file mode 100644 index f0f9bef9..00000000 --- a/src/progs/gtk/Configuration.h +++ /dev/null @@ -1,76 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef CONFIG_H -#define CONFIG_H - -#include - -namespace LibOmClient { class PortModel; } -using LibOmClient::PortModel; -using std::string; - -struct Coord { double x; double y; }; - -namespace OmGtk { - -class Controller; - - -/** Singleton state manager for the entire app. - * - * Stores settings like color preferences, search paths, etc. - * (ie any user-defined preferences to be stoed in the rc file). - * - * \ingroup OmGtk - */ -class Configuration -{ -public: - Configuration(); - ~Configuration(); - - void load_settings(string filename = ""); - void save_settings(string filename = ""); - - void apply_settings(); - - string patch_path() { return m_patch_path; } - void patch_path(const string& path) { m_patch_path = path; } - - const string& patch_folder() { return m_patch_folder; } - void set_patch_folder(const string& f) { m_patch_folder = f; } - - int get_port_color(const PortModel* pi); - -private: - /** Search path for patch files. Colon delimited, as usual. */ - string m_patch_path; - - /** Most recent patch folder shown in open dialog */ - string m_patch_folder; - - int m_audio_port_color; - int m_control_port_color; - int m_midi_port_color; -}; - - -} // namespace OmGtk - -#endif // CONFIG_H - - diff --git a/src/progs/gtk/ConnectWindow.cpp b/src/progs/gtk/ConnectWindow.cpp deleted file mode 100644 index fd19fc64..00000000 --- a/src/progs/gtk/ConnectWindow.cpp +++ /dev/null @@ -1,260 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ConnectWindow.h" -#include -#include -#include -#include "interface/ClientKey.h" -#include "interface/ClientInterface.h" -#include "ThreadedSigClientInterface.h" -#include "Controller.h" -#include "OSCListener.h" -#include "Store.h" -#include "PatchController.h" -#include "PatchModel.h" - -namespace OmGtk { - - -ConnectWindow::ConnectWindow(BaseObjectType* cobject, const Glib::RefPtr& xml) -: Gtk::Dialog(cobject) -, _client(NULL) -{ - xml->get_widget("connect_icon", _icon); - xml->get_widget("connect_progress_bar", _progress_bar); - xml->get_widget("connect_progress_label", _progress_label); - xml->get_widget("connect_server_radiobutton", _server_radio); - xml->get_widget("connect_url_entry", _url_entry); - xml->get_widget("connect_launch_radiobutton", _launch_radio); - xml->get_widget("connect_port_spinbutton", _port_spinbutton); - xml->get_widget("connect_internal_radiobutton", _internal_radio); - xml->get_widget("connect_disconnect_button", _disconnect_button); - xml->get_widget("connect_connect_button", _connect_button); - xml->get_widget("connect_quit_button", _quit_button); - - _server_radio->signal_toggled().connect(sigc::mem_fun(this, &ConnectWindow::server_toggled)); - _launch_radio->signal_toggled().connect(sigc::mem_fun(this, &ConnectWindow::launch_toggled)); - _internal_radio->signal_clicked().connect(sigc::mem_fun(this, &ConnectWindow::internal_toggled)); - _disconnect_button->signal_clicked().connect(sigc::mem_fun(this, &ConnectWindow::disconnect)); - _connect_button->signal_clicked().connect(sigc::mem_fun(this, &ConnectWindow::connect)); - _quit_button->signal_clicked().connect(sigc::mem_fun(this, &ConnectWindow::quit)); -} - - -void -ConnectWindow::start(CountedPtr client) -{ - _client = client; - resize(100, 100); - show(); -} - - -void -ConnectWindow::connect() -{ - if (_server_radio->get_active()) { - Controller::instance().set_engine_url(_url_entry->get_text()); - Glib::signal_timeout().connect( - sigc::mem_fun(this, &ConnectWindow::gtk_callback), 100); - - } else if (_launch_radio->get_active()) { - int port = _port_spinbutton->get_value_as_int(); - char port_str[6]; - snprintf(port_str, 6, "%u", port); - const string port_arg = string("--port=").append(port_str); - Controller::instance().set_engine_url( - string("osc.udp://localhost:").append(port_str)); - - if (fork() == 0) { // child - cerr << "Executing 'om " << port_arg << "' ..." << endl; - execlp("om", port_arg.c_str(), 0); - } else { - Glib::signal_timeout().connect( - sigc::mem_fun(this, &ConnectWindow::gtk_callback), 100); - } - } - - _connect_button->set_sensitive(false); -} - - -void -ConnectWindow::disconnect() -{ - // Nope -} - - -void -ConnectWindow::quit() -{ - if (Controller::instance().is_attached()) { - Gtk::MessageDialog d(*this, "This will exit OmGtk, but the engine will " - "remain running (if it is remote).\n\nAre you sure you want to quit?", - true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE, true); - d.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); - d.add_button(Gtk::Stock::QUIT, Gtk::RESPONSE_CLOSE); - int ret = d.run(); - if (ret == Gtk::RESPONSE_CLOSE) - Gtk::Main::quit(); - } else { - Gtk::Main::quit(); - } -} - - -void -ConnectWindow::server_toggled() -{ - _url_entry->set_sensitive(true); - _port_spinbutton->set_sensitive(false); -} - - -void -ConnectWindow::launch_toggled() -{ - _url_entry->set_sensitive(false); - _port_spinbutton->set_sensitive(true); -} - - -void -ConnectWindow::internal_toggled() -{ - // Not quite yet... - _url_entry->set_sensitive(false); - _port_spinbutton->set_sensitive(false); -} - - -bool -ConnectWindow::gtk_callback() -{ - /* This isn't very nice (isn't threaded), but better than no dialog at - * all like before :) - */ - - // Timing stuff for repeated attach attempts - timeval now; - gettimeofday(&now, NULL); - static timeval last = now; - - static int stage = 0; - - /* Connecting to engine */ - if (stage == 0) { - // FIXME - //assert(!Controller::instance().is_attached()); - _progress_label->set_text(string("Connecting to engine at ").append( - Controller::instance().engine_url()).append("...")); - present(); - Controller::instance().attach(); - ++stage; - } else if (stage == 1) { - if (Controller::instance().is_attached()) { - Controller::instance().activate(); - ++stage; - } else { - const float ms_since_last = (now.tv_sec - last.tv_sec) * 1000.0f + - (now.tv_usec - last.tv_usec) * 0.001f; - if (ms_since_last > 1000) { - Controller::instance().attach(); - last = now; - } - } - } else if (stage == 2) { - _progress_label->set_text(string("Registering as client...")); - //Controller::instance().register_client(Controller::instance().client_hooks()); - // FIXME - //auto_ptr client(new ThreadedSigClientInterface(); - Controller::instance().register_client(ClientKey(), _client); - Controller::instance().load_plugins(); - ++stage; - } else if (stage == 3) { - // Register idle callback to process events and whatnot - // (Gtk refreshes at priority G_PRIORITY_HIGH_IDLE+20) - /*Glib::signal_timeout().connect( - sigc::mem_fun(this, &App::idle_callback), 100, G_PRIORITY_HIGH_IDLE);*/ - //Glib::signal_idle().connect(sigc::mem_fun(this, &App::idle_callback)); - /* Glib::signal_timeout().connect( - sigc::mem_fun((ThreadedSigClientInterface*)_client, &ThreadedSigClientInterface::emit_signals), - 5, G_PRIORITY_DEFAULT_IDLE);*/ - - _progress_label->set_text(string("Requesting plugins...")); - Controller::instance().request_plugins(); - ++stage; - } else if (stage == 4) { - // Wait for first plugins message - if (Store::instance().plugins().size() > 0) { - _progress_label->set_text(string("Receiving plugins...")); - ++stage; - } - } else if (stage == 5) { - // FIXME - /*if (Store::instance().plugins().size() < _client->num_plugins()) { - static char buf[32]; - snprintf(buf, 32, "%zu/%zu", Store::instance().plugins().size(), - ThreadedSigClientInterface::instance()->num_plugins()); - _progress_bar->set_text(Glib::ustring(buf)); - _progress_bar->set_fraction( - Store::instance().plugins().size() / (double)_client->num_plugins()); - } else {*/ - _progress_bar->set_text(""); - ++stage; - //} - } else if (stage == 6) { - _progress_label->set_text(string("Waiting for root patch...")); - Controller::instance().request_all_objects(); - ++stage; - } else if (stage == 7) { - if (Store::instance().num_objects() > 0) { - CountedPtr root = Store::instance().patch("/"); - assert(root); - PatchController* root_controller = new PatchController(root); - root_controller->show_patch_window(); - ++stage; - } - } else if (stage == 8) { - _progress_label->set_text(string("Connected to engine at ").append( - Controller::instance().engine_url())); - ++stage; - } else if (stage == 9) { - stage = -1; - hide(); - } - - if (stage != 5) // yeah, ew - _progress_bar->pulse(); - - if (stage == -1) { // finished connecting - _icon->set(Gtk::Stock::CONNECT, Gtk::ICON_SIZE_LARGE_TOOLBAR); - _progress_bar->set_fraction(1.0); - _url_entry->set_sensitive(false); - _connect_button->set_sensitive(false); - _port_spinbutton->set_sensitive(false); - _launch_radio->set_sensitive(false); - _internal_radio->set_sensitive(false); - return false; // deregister this callback - } else { - return true; - } -} - - -} // namespace OmGtk diff --git a/src/progs/gtk/ConnectWindow.h b/src/progs/gtk/ConnectWindow.h deleted file mode 100644 index cc8b1c79..00000000 --- a/src/progs/gtk/ConnectWindow.h +++ /dev/null @@ -1,73 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef CONNECT_WINDOW_H -#define CONNECT_WINDOW_H - -#include -#include -#include -#include "util/CountedPtr.h" -#include "interface/ClientInterface.h" - -namespace OmGtk { - -class App; -class Controller; - - -/** The initially visible "Connect to engine" window. - * - * This handles actually connecting to the engine and making sure everything - * is ready before really launching the app (eg wait for the root patch). - * - * \ingroup OmGtk - */ -class ConnectWindow : public Gtk::Dialog -{ -public: - ConnectWindow(BaseObjectType* cobject, const Glib::RefPtr& xml); - - void start(CountedPtr client); -private: - void server_toggled(); - void launch_toggled(); - void internal_toggled(); - - void disconnect(); - void connect(); - void quit(); - - bool gtk_callback(); - - CountedPtr _client; - Gtk::Image* _icon; - Gtk::ProgressBar* _progress_bar; - Gtk::Label* _progress_label; - Gtk::Entry* _url_entry; - Gtk::RadioButton* _server_radio; - Gtk::SpinButton* _port_spinbutton; - Gtk::RadioButton* _launch_radio; - Gtk::RadioButton* _internal_radio; - Gtk::Button* _disconnect_button; - Gtk::Button* _connect_button; - Gtk::Button* _quit_button; -}; - - -} // namespace OmGtk - -#endif // CONNECT_WINDOW_H diff --git a/src/progs/gtk/ControlGroups.cpp b/src/progs/gtk/ControlGroups.cpp deleted file mode 100644 index b5834f3c..00000000 --- a/src/progs/gtk/ControlGroups.cpp +++ /dev/null @@ -1,418 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ControlGroups.h" -#include "ControlPanel.h" -#include "PortModel.h" -#include "Controller.h" -#include -#include -using std::cerr; using std::cout; using std::endl; - -using namespace LibOmClient; - -namespace OmGtk { - -//////////////////// SliderControlGroup //////////////////////// - - -SliderControlGroup::SliderControlGroup(ControlPanel* panel, CountedPtr pm, bool separator) -: ControlGroup(panel, pm, separator), - m_enabled(true), - m_enable_signal(false), - m_name_label(pm->name(), 0.0, 0.0), - m_range_box(false, 0), - m_range_label("Range: "), - m_min_spinner(1.0, (pm->is_integer() ? 0 : 4)), // climb rate, digits - m_hyphen_label(" - "), - m_max_spinner(1.0, (pm->is_integer() ? 0 : 4)), - m_slider_box(false, 0), - m_value_spinner(1.0, (pm->is_integer() ? 0 : 4)), - m_slider(pm->user_min(), pm->user_max(), (pm->is_integer() ? 1.0 : 0.0001)) -{ - m_slider.set_increments(1.0, 10.0); - - // Compensate for crazy plugins - if (m_port_model->user_max() <= m_port_model->user_min()) { - m_port_model->user_max(m_port_model->user_min() + 1.0); - m_slider.set_range(m_port_model->user_min(), m_port_model->user_max()); - } - m_slider.property_draw_value() = false; - - set_name(pm->name()); - - m_name_label.property_use_markup() = true; - m_range_label.property_use_markup() = true; - - m_value_spinner.set_range(-99999, 99999); - m_value_spinner.set_update_policy(Gtk::UPDATE_ALWAYS); // allow entered values outside range - m_value_spinner.set_value(m_port_model->value()); - m_value_spinner.set_increments(1.0, 10.0); - m_value_spinner.set_digits(5); - m_value_spinner.signal_value_changed().connect( - sigc::mem_fun(*this, &SliderControlGroup::update_value_from_spinner)); - m_min_spinner.set_range(-99999, 99999); - m_min_spinner.set_value(m_port_model->user_min()); - m_min_spinner.set_increments(1.0, 10.0); - m_min_spinner.set_digits(5); - m_min_spinner.signal_value_changed().connect(sigc::mem_fun(*this, &SliderControlGroup::min_changed)); - m_max_spinner.set_range(-99999, 99999); - m_max_spinner.set_value(m_port_model->user_max()); - m_max_spinner.set_increments(1.0, 10.0); - m_max_spinner.set_digits(5); - m_max_spinner.signal_value_changed().connect(sigc::mem_fun(*this, &SliderControlGroup::max_changed)); - - m_slider.set_value(m_port_model->value()); - - m_slider.signal_event().connect( - sigc::mem_fun(*this, &SliderControlGroup::slider_pressed)); - - m_slider.signal_value_changed().connect( - sigc::mem_fun(*this, &SliderControlGroup::update_value_from_slider)); - - m_range_box.pack_start(m_range_label, false, false, 2); - m_range_box.pack_start(m_min_spinner, false, false, 1); - m_range_box.pack_start(m_hyphen_label, false, false, 1); - m_range_box.pack_start(m_max_spinner, false, false, 1); - - m_header_box.pack_start(m_name_label, true, true, 0); - m_header_box.pack_start(m_range_box, true, true, 2); - - m_slider_box.pack_start(m_value_spinner, false, false, 1); - m_slider_box.pack_start(m_slider, true, true, 5); - - pack_start(m_header_box, false, false, 0); - pack_start(m_slider_box, false, false, 0); - - update_range(); - - m_enable_signal = true; - - show_all(); -} - - -void -SliderControlGroup::set_name(const string& name) -{ - string name_label = ""; - name_label += name + ""; - m_name_label.set_markup(name_label); -} - - -void -SliderControlGroup::set_min(float val) -{ - m_enable_signal = false; - m_min_spinner.set_value(val); - m_enable_signal = true; -} - - -void -SliderControlGroup::set_max(float val) -{ - m_enable_signal = false; - m_max_spinner.set_value(val); - m_enable_signal = true; -} - - -void -SliderControlGroup::enable() -{ - m_slider.property_sensitive() = true; - m_min_spinner.property_sensitive() = true; - m_max_spinner.property_sensitive() = true; - m_value_spinner.property_sensitive() = true; - m_name_label.property_sensitive() = true; - m_range_label.property_sensitive() = true; -} - - -void -SliderControlGroup::disable() -{ - m_slider.property_sensitive() = false; - m_min_spinner.property_sensitive() = false; - m_max_spinner.property_sensitive() = false; - m_value_spinner.property_sensitive() = false; - m_name_label.property_sensitive() = false; - m_range_label.property_sensitive() = false; -} - - -void -SliderControlGroup::min_changed() -{ - double min = m_min_spinner.get_value(); - const double max = m_max_spinner.get_value(); - - if (min >= max) { - min = max - 1.0; - m_min_spinner.set_value(min); - } - - update_range(); -} - - -void -SliderControlGroup::max_changed() -{ - const double min = m_min_spinner.get_value(); - double max = m_max_spinner.get_value(); - - if (max <= min) { - max = min + 1.0; - m_max_spinner.set_value(max); - } - - update_range(); -} - - -void -SliderControlGroup::update_range() -{ - const double min = m_min_spinner.get_value(); - const double max = m_max_spinner.get_value(); - - assert(min < max); - m_slider.set_range(min, max); - - m_port_model->user_min(min); - m_port_model->user_max(max); - - if (m_enable_signal) { - char temp_buf[16]; - snprintf(temp_buf, 16, "%f", m_port_model->user_min()); - Controller::instance().set_metadata(m_port_model->path(), "user-min", temp_buf); - snprintf(temp_buf, 16, "%f", m_port_model->user_max()); - Controller::instance().set_metadata(m_port_model->path(), "user-max", temp_buf); - } -} - - -void -SliderControlGroup::update_value_from_slider() -{ - if (m_enable_signal) { - const float value = m_slider.get_value(); - // Prevent spinner signal from doing all this over again (slow) - m_enable_signal = false; - m_value_spinner.set_value(value); - m_control_panel->value_changed(m_port_model->path(), value); - m_port_model->value(value); - m_enable_signal = true; - } -} - - -void -SliderControlGroup::update_value_from_spinner() -{ - if (m_enable_signal) { - m_enable_signal = false; - const float value = m_value_spinner.get_value(); - if (value < m_min_spinner.get_value()) - m_min_spinner.set_value(value); - if (value > m_max_spinner.get_value()) - m_max_spinner.set_value(value); - - m_enable_signal = false; - update_range(); - m_slider.set_value(m_value_spinner.get_value()); - m_enable_signal = true; - - m_control_panel->value_changed(m_port_model->path(), value); - - m_port_model->value(value); - m_enable_signal = true; - } -} - - -/** Callback for when slider is grabbed so we can ignore set_control - * events for this port (and avoid nasty feedback issues). - */ -bool -SliderControlGroup::slider_pressed(GdkEvent* ev) -{ - //cerr << "Pressed: " << ev->type << endl; - if (ev->type == GDK_BUTTON_PRESS) { - m_enabled = false; - cerr << "SLIDER FIXME\n"; - //GtkClientInterface::instance()->set_ignore_port(m_port_model->path()); - } else if (ev->type == GDK_BUTTON_RELEASE) { - m_enabled = true; - cerr << "SLIDER FIXME\n"; - //GtkClientInterface::instance()->clear_ignore_port(); - } - - return false; -} - - -/////////////// IntegerControlGroup //////////////// - - -IntegerControlGroup::IntegerControlGroup(ControlPanel* panel, CountedPtr pm, bool separator) -: ControlGroup(panel, pm, separator), - m_enable_signal(false), - m_alignment(0.5, 0.5, 0.0, 0.0), - m_name_label(pm->name()), - m_spinner(1.0, 0) -{ - set_name(pm->name()); - - m_spinner.set_range(-99999, 99999); - m_spinner.set_value(m_port_model->value()); - m_spinner.signal_value_changed().connect( - sigc::mem_fun(*this, &IntegerControlGroup::update_value)); - m_spinner.set_increments(1, 10); - - m_alignment.add(m_spinner); - pack_start(m_name_label); - pack_start(m_alignment); - - m_enable_signal = true; - - show_all(); -} - - -void -IntegerControlGroup::set_name(const string& name) -{ - string name_label = ""; - name_label += name + ""; - m_name_label.set_markup(name_label); -} - - -void -IntegerControlGroup::set_value(float val) -{ - //cerr << "[IntegerControlGroup] Setting value to " << val << endl; - m_enable_signal = false; - m_spinner.set_value(val); - m_port_model->value(val); - m_enable_signal = true; -} - - -void -IntegerControlGroup::enable() -{ - m_spinner.property_sensitive() = true; - m_name_label.property_sensitive() = true; -} - - -void -IntegerControlGroup::disable() -{ - m_spinner.property_sensitive() = false; - m_name_label.property_sensitive() = false; -} - - -void -IntegerControlGroup::update_value() -{ - if (m_enable_signal) { - float value = m_spinner.get_value(); - m_control_panel->value_changed(m_port_model->path(), value); - m_port_model->value(value); - } -} - - -/////////////// ToggleControlGroup //////////////// - - -ToggleControlGroup::ToggleControlGroup(ControlPanel* panel, CountedPtr pm, bool separator) -: ControlGroup(panel, pm, separator), - m_enable_signal(false), - m_alignment(0.5, 0.5, 0.0, 0.0), - m_name_label(pm->name()) -{ - set_name(pm->name()); - - set_value(m_port_model->value()); - m_checkbutton.signal_toggled().connect( - sigc::mem_fun(*this, &ToggleControlGroup::update_value)); - - m_alignment.add(m_checkbutton); - pack_start(m_name_label); - pack_start(m_alignment); - - m_enable_signal = true; - - show_all(); -} - - -void -ToggleControlGroup::set_name(const string& name) -{ - string name_label = ""; - name_label += name + ""; - m_name_label.set_markup(name_label); -} - - -void -ToggleControlGroup::set_value(float val) -{ - //cerr << "[ToggleControlGroup] Setting value to " << val << endl; - m_enable_signal = false; - m_checkbutton.set_active( (val > 0.0f) ); - m_port_model->value(val); - m_enable_signal = true; -} - - -void -ToggleControlGroup::enable() -{ - m_checkbutton.property_sensitive() = true; - m_name_label.property_sensitive() = true; -} - - -void -ToggleControlGroup::disable() -{ - m_checkbutton.property_sensitive() = false; - m_name_label.property_sensitive() = false; -} - - -void -ToggleControlGroup::update_value() -{ - if (m_enable_signal) { - float value = m_checkbutton.get_active() ? 1.0f : 0.0f; - m_control_panel->value_changed(m_port_model->path(), value); - m_port_model->value(value); - } -} - - -} // namespace OmGtk diff --git a/src/progs/gtk/ControlGroups.h b/src/progs/gtk/ControlGroups.h deleted file mode 100644 index 9f46bdac..00000000 --- a/src/progs/gtk/ControlGroups.h +++ /dev/null @@ -1,197 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef CONTROLGROUPS_H -#define CONTROLGROUPS_H - -#include -#include -#include -#include -#include "PortModel.h" -#include "util/CountedPtr.h" - - -namespace LibOmClient { class PortModel; } -using namespace LibOmClient; - -namespace OmGtk { - -class ControlPanel; - - -/** A group of controls in a NodeControlWindow. - * - * \ingroup OmGtk - */ -class ControlGroup : public Gtk::VBox -{ -public: - ControlGroup(ControlPanel* panel, CountedPtr pm, bool separator) - : Gtk::VBox(false, 0), - m_control_panel(panel), - m_port_model(pm), - m_has_separator(separator) - { - assert(m_port_model); - assert(panel); - - if (separator) { - m_separator = new Gtk::HSeparator(); - pack_start(*m_separator, false, false, 4); - } else { - m_separator = NULL; - } - } - - ~ControlGroup() { delete m_separator; } - - virtual void set_name(const string& name) {} - - virtual void set_value(float val) = 0; - - inline const CountedPtr port_model() const { return m_port_model; } - - virtual void set_min(float val) {} - virtual void set_max(float val) {} - - void remove_separator() { assert(m_has_separator); - remove(*m_separator); delete m_separator; } - - virtual void enable() {} - virtual void disable() {} - -protected: - ControlPanel* m_control_panel; - CountedPtr m_port_model; - bool m_has_separator; - Gtk::HSeparator* m_separator; -}; - - -/** A slider for a continuous control. - * - * \ingroup OmGtk - */ -class SliderControlGroup : public ControlGroup -{ -public: - SliderControlGroup(ControlPanel* panel, CountedPtr pm, bool separator); - - void set_name(const string& name); - - inline void set_value(const float val); - void set_min(float val); - void set_max(float val); - - void enable(); - void disable(); - -private: - void min_changed(); - void max_changed(); - void update_range(); - void update_value_from_slider(); - void update_value_from_spinner(); - - //void slider_grabbed(bool b); - - bool slider_pressed(GdkEvent* ev); - - bool m_enabled; - bool m_enable_signal; - - Gtk::HBox m_header_box; - Gtk::Label m_name_label; - Gtk::HBox m_range_box; - Gtk::Label m_range_label; - Gtk::SpinButton m_min_spinner; - Gtk::Label m_hyphen_label; - Gtk::SpinButton m_max_spinner; - Gtk::HBox m_slider_box; - Gtk::SpinButton m_value_spinner; - Gtk::HScale m_slider; -}; - - -inline void -SliderControlGroup::set_value(const float val) -{ - m_enable_signal = false; - if (m_enabled) { - m_slider.set_value(val); - m_value_spinner.set_value(val); - } - m_port_model->value(val); - m_enable_signal = true; -} - - - - -/** A spinbutton for integer controls. - * - * \ingroup OmGtk - */ -class IntegerControlGroup : public ControlGroup -{ -public: - IntegerControlGroup(ControlPanel* panel, CountedPtr pm, bool separator); - - void set_name(const string& name); - void set_value(float val); - - void enable(); - void disable(); - -private: - void update_value(); - - bool m_enable_signal; - Gtk::Alignment m_alignment; - Gtk::Label m_name_label; - Gtk::SpinButton m_spinner; -}; - - -/** A radio button for toggle controls. - * - * \ingroup OmGtk - */ -class ToggleControlGroup : public ControlGroup -{ -public: - ToggleControlGroup(ControlPanel* panel, CountedPtr pm, bool separator); - - void set_name(const string& name); - void set_value(float val); - - void enable(); - void disable(); - -private: - void update_value(); - - bool m_enable_signal; - Gtk::Alignment m_alignment; - Gtk::Label m_name_label; - Gtk::CheckButton m_checkbutton; -}; - - -} // namespace OmGtk - -#endif // CONTROLGROUPS_H diff --git a/src/progs/gtk/ControlPanel.cpp b/src/progs/gtk/ControlPanel.cpp deleted file mode 100644 index 9f3279ee..00000000 --- a/src/progs/gtk/ControlPanel.cpp +++ /dev/null @@ -1,284 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License alongCont - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ControlPanel.h" -#include "PatchModel.h" -#include "NodeModel.h" -#include "PortModel.h" -#include "ControlGroups.h" -#include "PatchController.h" -#include "Controller.h" - -namespace OmGtk { - - -ControlPanel::ControlPanel(BaseObjectType* cobject, const Glib::RefPtr& xml) -: Gtk::VBox(cobject), - m_callback_enabled(true) -{ - xml->get_widget("control_panel_controls_box", m_control_box); - xml->get_widget("control_panel_voice_controls_box", m_voice_control_box); - xml->get_widget("control_panel_all_voices_radio", m_all_voices_radio); - xml->get_widget("control_panel_specific_voice_radio", m_specific_voice_radio); - xml->get_widget("control_panel_voice_spinbutton", m_voice_spinbutton); - - m_all_voices_radio->signal_toggled().connect(sigc::mem_fun(this, &ControlPanel::all_voices_selected)); - m_specific_voice_radio->signal_toggled().connect(sigc::mem_fun(this, &ControlPanel::specific_voice_selected)); - m_voice_spinbutton->signal_value_changed().connect(sigc::mem_fun(this, &ControlPanel::voice_selected)); - - show_all(); -} - - -ControlPanel::~ControlPanel() -{ - for (vector::iterator i = m_controls.begin(); i != m_controls.end(); ++i) - delete (*i); -} - - -void -ControlPanel::init(NodeController* node, size_t poly) -{ - assert(node != NULL); - assert(poly > 0); - - const CountedPtr node_model(node->node_model()); - - if (poly > 1) { - m_voice_spinbutton->set_range(0, poly - 1); - } else { - remove(*m_voice_control_box); - } - - for (PortModelList::const_iterator i = node_model->ports().begin(); - i != node_model->ports().end(); ++i) { - // FIXME: - if (*i) { - PortController* pc = (PortController*)((*i)->controller()); - assert(pc != NULL); - add_port(pc); - } else { - cerr << "WTF?\n"; - } - } - - m_callback_enabled = true; -} - - -ControlGroup* -ControlPanel::find_port(const Path& path) const -{ - for (vector::const_iterator cg = m_controls.begin(); cg != m_controls.end(); ++cg) - if ((*cg)->port_model()->path() == path) - return (*cg); - - return NULL; -} - - -/** Add a control to the panel for the given port. - */ -void -ControlPanel::add_port(PortController* port) -{ - assert(port); - assert(port->model()); - assert(port->control_panel() == NULL); - - const CountedPtr pm = port->port_model(); - - // Already have port, don't add another - if (find_port(pm->path()) != NULL) - return; - - // Add port - if (pm->is_control() && pm->is_input()) { - bool separator = (m_controls.size() > 0); - ControlGroup* cg = NULL; - if (pm->is_integer()) - cg = new IntegerControlGroup(this, pm, separator); - else if (pm->is_toggle()) - cg = new ToggleControlGroup(this, pm, separator); - else - cg = new SliderControlGroup(this, pm, separator); - - m_controls.push_back(cg); - m_control_box->pack_start(*cg, false, false, 0); - - if (pm->connected()) - cg->disable(); - else - cg->enable(); - } - - port->set_control_panel(this); - - Gtk::Requisition controls_size; - m_control_box->size_request(controls_size); - m_ideal_size.first = controls_size.width; - m_ideal_size.second = controls_size.height; - - Gtk::Requisition voice_size; - m_voice_control_box->size_request(voice_size); - m_ideal_size.first += voice_size.width; - m_ideal_size.second += voice_size.height; - - //cerr << "Setting ideal size to " << m_ideal_size.first - // << " x " << m_ideal_size.second << endl; -} - - -/** Remove the control for the given port. - */ -void -ControlPanel::remove_port(const Path& path) -{ - bool was_first = false; - for (vector::iterator cg = m_controls.begin(); cg != m_controls.end(); ++cg) { - if ((*cg)->port_model()->path() == path) { - m_control_box->remove(**cg); - if (cg == m_controls.begin()) - was_first = true; - m_controls.erase(cg); - break; - } - } - - if (was_first && m_controls.size() > 0) - (*m_controls.begin())->remove_separator(); -} - - -/** Rename the control for the given port. - */ -void -ControlPanel::rename_port(const Path& old_path, const Path& new_path) -{ - for (vector::iterator cg = m_controls.begin(); cg != m_controls.end(); ++cg) { - if ((*cg)->port_model()->path() == old_path) { - (*cg)->set_name(new_path.name()); - return; - } - } -} - - -/** Enable the control for the given port. - * - * Used when all connections to port are un-made. - */ -void -ControlPanel::enable_port(const Path& path) -{ - for (vector::iterator i = m_controls.begin(); i != m_controls.end(); ++i) { - if ((*i)->port_model()->path() == path) { - (*i)->enable(); - return; - } - } -} - - -/** Disable the control for the given port. - * - * Used when port is connected. - */ -void -ControlPanel::disable_port(const Path& path) -{ - for (vector::iterator i = m_controls.begin(); i != m_controls.end(); ++i) { - if ((*i)->port_model()->path() == path) { - (*i)->disable(); - return; - } - } -} - - -/** Callback for ControlGroups to notify this of a change. - */ -void -ControlPanel::value_changed(const Path& port_path, float val) -{ - if (m_callback_enabled) { - // Update patch control slider, if this is a control panel for a patch - // (or vice versa) - //if (m_mirror != NULL) - // m_mirror->set_port_value(port_path, val); - - if (m_all_voices_radio->get_active()) { - Controller::instance().set_port_value(port_path, val); - } else { - int voice = m_voice_spinbutton->get_value_as_int(); - Controller::instance().set_port_value(port_path, voice, val); - } - } -} - - -void -ControlPanel::set_range_min(const Path& port_path, float val) -{ - bool found = false; - for (vector::iterator i = m_controls.begin(); i != m_controls.end(); ++i) { - if ((*i)->port_model()->path() == port_path) { - found = true; - (*i)->set_min(val); - } - } - if (found == false) - cerr << "[ControlPanel::set_range_min] Unable to find control " << port_path << endl; -} - - -void -ControlPanel::set_range_max(const Path& port_path, float val) -{ - bool found = false; - for (vector::iterator i = m_controls.begin(); i != m_controls.end(); ++i) { - if ((*i)->port_model()->path() == port_path) { - found = true; - (*i)->set_max(val); - } - } - if (found == false) - cerr << "[ControlPanel::set_range_max] Unable to find control " << port_path << endl; -} - - -void -ControlPanel::all_voices_selected() -{ - m_voice_spinbutton->property_sensitive() = false; -} - - -void -ControlPanel::specific_voice_selected() -{ - m_voice_spinbutton->property_sensitive() = true; -} - - -void -ControlPanel::voice_selected() -{ -} - - -} // namespace OmGtk diff --git a/src/progs/gtk/ControlPanel.h b/src/progs/gtk/ControlPanel.h deleted file mode 100644 index 1f24344f..00000000 --- a/src/progs/gtk/ControlPanel.h +++ /dev/null @@ -1,129 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef CONTROLPANEL_H -#define CONTROLPANEL_H - -#include -#include -#include -#include -#include -#include -#include -#include // for pair<> -#include "ControlGroups.h" -#include "util/Path.h" -#include "PortController.h" - -using std::vector; using std::string; using std::pair; -using std::cerr; using std::cout; using std::endl; - -namespace LibOmClient { -class PortModel; -class NodeModel; -} -using namespace LibOmClient; -using Om::Path; - -namespace OmGtk { - -class NodeController; -class PortController; - - -/** A group of controls for a node (or patch). - * - * Used by both NodeControlWindow and the main window (for patch controls). - * - * \ingroup OmGtk - */ -class ControlPanel : public Gtk::VBox { -public: - ControlPanel(BaseObjectType* cobject, const Glib::RefPtr& glade_xml); - virtual ~ControlPanel(); - - void init(NodeController* node, size_t poly); - - ControlGroup* find_port(const Path& path) const; - - void add_port(PortController* port); - void remove_port(const Path& path); - - void rename_port(const Path& old_path, const Path& new_path); - - void enable_port(const Path& path); - void disable_port(const Path& path); - - size_t num_controls() const { return m_controls.size(); } - pair ideal_size() const { return m_ideal_size; } - - // Callback for ControlGroup - void value_changed(const Path& port_path, float val); - - inline void set_control(const Path& port_path, float value); - void set_range_min(const Path& port_path, float value); - void set_range_max(const Path& port_path, float value); - -private: - void all_voices_selected(); - void specific_voice_selected(); - void voice_selected(); - - bool m_callback_enabled; - - pair m_ideal_size; - - vector m_controls; - Gtk::VBox* m_control_box; - Gtk::Box* m_voice_control_box; - Gtk::RadioButton* m_all_voices_radio; - Gtk::RadioButton* m_specific_voice_radio; - Gtk::SpinButton* m_voice_spinbutton; -}; - - -/** Set a port on this panel to a certain value. - * - * Profiling has shown this is performance critical. Needs to be made - * faster. - */ -inline void -ControlPanel::set_control(const Path& port_path, const float val) -{ - // FIXME: double lookup, ports should just have a pointer directly to - // their control group - - m_callback_enabled = false; - ControlGroup* cg = NULL; - - for (vector::iterator i = m_controls.begin(); i != m_controls.end(); ++i) { - cg = (*i); - if (cg->port_model()->path() == port_path) { - cg->set_value(val); - m_callback_enabled = true; - return; - } - } - - cerr << "[ControlPanel::set_control] Unable to find control " << port_path << endl; - m_callback_enabled = true; -} - - -} // namespace OmGtk - -#endif // CONTROLPANEL_H diff --git a/src/progs/gtk/Controller.cpp b/src/progs/gtk/Controller.cpp deleted file mode 100644 index 9bf9aca5..00000000 --- a/src/progs/gtk/Controller.cpp +++ /dev/null @@ -1,171 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "PatchModel.h" -#include "PatchController.h" -#include "OSCModelEngineInterface.h" -#include "OSCListener.h" -#include "PatchLibrarian.h" -#include "Controller.h" -#include "Loader.h" -#include "interface/ClientKey.h" - -namespace OmGtk { - - -Controller::Controller(const string& engine_url) -: OSCModelEngineInterface(engine_url), - m_patch_librarian(new PatchLibrarian(this)), - m_loader(new Loader(m_patch_librarian)) -{ - m_loader->launch(); -} - - -Controller::~Controller() -{ - if (is_attached()) { - unregister_client(ClientKey()); // FIXME - detach(); - } - - delete m_loader; - delete m_patch_librarian; -} - - -/** "Attach" to the Om engine. - * See documentation OSCModelEngineInterface::attach. - */ -void -Controller::attach() -{ - OSCModelEngineInterface::attach(false); -} - -/* -void -Controller::register_client_and_wait() -{ -// int id = get_next_request_id(); -// set_wait_response_id(id); - OSCModelEngineInterface::register_client(); -// wait_for_response(); - cout << "[Controller] Registered with engine. maybe. fixme." << endl; -} -*/ -void Controller::set_engine_url(const string& url) { _engine_url = url; } - -void -Controller::create_node_from_model(const NodeModel* nm) -{ - //push_added_node(nm); - OSCModelEngineInterface::create_node_from_model(nm); - char temp_buf[16]; - snprintf(temp_buf, 16, "%f", nm->x()); - set_metadata(nm->path(), "module-x", temp_buf); - snprintf(temp_buf, 16, "%f", nm->y()); - set_metadata(nm->path(), "module-y", temp_buf); -} - -void -Controller::create_patch_from_model(const PatchModel* pm) -{ - //push_added_patch(pm); - - //int id = get_next_request_id(); - //set_wait_response_id(id); - OSCModelEngineInterface::create_patch_from_model(pm); - if (pm->parent()) { - // wait_for_response(); - char temp_buf[16]; - snprintf(temp_buf, 16, "%f", pm->x()); - set_metadata(pm->path(), "module-x", temp_buf); - snprintf(temp_buf, 16, "%f", pm->y()); - set_metadata(pm->path(), "module-y", temp_buf); - } - enable_patch(pm->path()); -} - - -void -Controller::set_patch_path(const string& path) -{ - m_patch_librarian->path(path); -} - - -/** Load patch in a seperate thread. - * This will return immediately and the patch will be loaded in the background. - * FIXME: merge parameter makes no sense, always true */ -void -Controller::load_patch(PatchModel* model, bool wait, bool merge) -{ - //push_added_patch(model); - m_loader->load_patch(model, wait, merge); -} - - -/** Load patch in a seperate thread. - * This will return immediately and the patch will be saved in the background. */ -void -Controller::save_patch(PatchModel* model, const string& filename, bool recursive) -{ - m_loader->save_patch(model, filename, recursive); -} - - -#if 0 -/** Returns the added node with the given path and removes it from the cache. - */ -NodeModel* -Controller::yank_added_node(const string& path) -{ - NodeModel* nm = NULL; - - for (list::iterator i = m_added_nodes.begin(); i != m_added_nodes.end(); ++i) { - if ((*i)->path() == path) { - nm = *i; - m_added_nodes.erase(i); - break; - } - } - - return nm; -} - - -/** Returns the added patch with the given path and removes it from the cache. - */ -PatchModel* -Controller::yank_added_patch(const string& path) -{ - PatchModel* pm = NULL; - - for (list::iterator i = m_added_patches.begin(); i != m_added_patches.end(); ++i) { - if ((*i)->path() == path) { - pm = *i; - m_added_patches.erase(i); - break; - } - } - - return pm; -} -#endif - -} // namespace OmGtk - diff --git a/src/progs/gtk/Controller.h b/src/progs/gtk/Controller.h deleted file mode 100644 index 0f1e3249..00000000 --- a/src/progs/gtk/Controller.h +++ /dev/null @@ -1,110 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef CONTROLLER_H -#define CONTROLLER_H - -#include -#include -#include -#include -#include "PluginModel.h" -#include "OSCModelEngineInterface.h" - -namespace LibOmClient { -class PatchModel; -class NodeModel; -class PatchLibrarian; -} - -using std::string; using std::list; -using namespace LibOmClient; - -namespace OmGtk { - -class PatchController; -class Loader; - - -/** Singleton engine controller for the entire app. - * - * This is hardly more than a trivial wrapper for OSCModelEngineInterface, suggesting something - * needs a rethink around here.. - * - * This needs to be either eliminated or the name changed to OmController. Probably - * best to keep around in case multiple engine control support comes around? - * - * \ingroup OmGtk - */ -class Controller : public OSCModelEngineInterface -{ -public: - ~Controller(); - - void attach(); - - //void register_client_and_wait(); - - void set_engine_url(const string& url); - - void create_node_from_model(const NodeModel* nm); - - void load_patch(PatchModel* model, bool wait = true, bool merge = false); - void save_patch(PatchModel* model, const string& filename, bool recursive); - - void create_patch_from_model(const PatchModel* pm); - - //void lash_restore_finished(); - - void set_patch_path(const string& path); - - /* - void push_added_node(NodeModel* nm) { m_added_nodes.push_back(nm); } - NodeModel* yank_added_node(const string& path); - - void push_added_patch(PatchModel* pm) { m_added_patches.push_back(pm); } - PatchModel* yank_added_patch(const string& path); - */ - - static void instantiate(const string& engine_url) - { if (!_instance) _instance = new Controller(engine_url); } - - inline static Controller& instance() { assert(_instance); return *_instance; } - -private: - Controller(const string& engine_url); - static Controller* _instance; - - PatchLibrarian* m_patch_librarian; - Loader* m_loader; - - /** Used to cache added nodes so client can remember some values when the - * new node notification comes (location, etc). Used to prevent the node - * jumping locations during the delay between new node and the module-x/y - * metadata notifications */ - //list m_added_nodes; - - /** Used to cache added patches in the same was as m_added_nodes. Used to - * rember filename so File->Save can work without prompting (filename can't - * be sent to the server as metadata, because a client on another machine - * doesn't want that information) */ - //list m_added_patches; -}; - - -} // namespace OmGtk - -#endif // CONTROLLER_H diff --git a/src/progs/gtk/DSSIController.cpp b/src/progs/gtk/DSSIController.cpp deleted file mode 100644 index dedcbceb..00000000 --- a/src/progs/gtk/DSSIController.cpp +++ /dev/null @@ -1,280 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "DSSIController.h" -#include -#include -#include -#include -#include -#include "NodeModel.h" -#include "DSSIModule.h" -#include "Controller.h" - -namespace OmGtk { - - -DSSIController::DSSIController(CountedPtr model) -: NodeController(model), - m_banks_dirty(true) -{ - assert(model->plugin()->type() == PluginModel::DSSI); - Gtk::Menu::MenuList& items = m_menu.items(); - items[0].property_sensitive() = true; // "Show Control Window" item - - Gtk::Menu_Helpers::MenuElem program_elem("Select Program", m_program_menu); - items.push_front(program_elem); - m_program_menu_item = program_elem.get_child(); - m_program_menu_item->set_sensitive(false); - - items.push_front(Gtk::Menu_Helpers::MenuElem("Show Plugin GUI", - sigc::mem_fun(this, &DSSIController::show_gui))); -} - -void -DSSIController::program_add(int bank, int program, const string& name) -{ - node_model()->add_program(bank, program, name); - m_banks_dirty = true; -} - - -void -DSSIController::program_remove(int bank, int program) -{ - node_model()->remove_program(bank, program); - m_banks_dirty = true; -} - -/** Trivial wrapper of attempt_to_show_gui for libsigc - */ -void -DSSIController::show_gui() -{ - attempt_to_show_gui(); -} - - -void -DSSIController::update_program_menu() -{ - m_program_menu.items().clear(); - - const map >& banks = node_model()->get_programs(); - std::ostringstream oss; - - map >::const_iterator i; - for (i = banks.begin(); i != banks.end(); ++i) { - Gtk::Menu* bank_menu; - if (banks.size() > 1) - bank_menu = manage(new Gtk::Menu()); - else - bank_menu = &m_program_menu; - map::const_iterator j; - for (j = i->second.begin(); j != i->second.end(); ++j) { - oss.str(""); - oss << std::setw(3) << std::setfill('0') - << j->first << ' ' << j->second; - sigc::slot slt = bind( - bind(sigc::mem_fun(*this, &DSSIController::send_program_change), - j->first), i->first); - bank_menu->items().push_back( - Gtk::Menu_Helpers::MenuElem(oss.str(), slt)); - } - if (banks.size() > 1) { - oss.str(""); - oss << "Bank " << i->first; - m_program_menu.items().push_back( - Gtk::Menu_Helpers::MenuElem(oss.str(), *bank_menu)); - } - } - - // Disable the program menu if there are no programs - if (banks.size() == 0) - m_program_menu_item->set_sensitive(false); - else - m_program_menu_item->set_sensitive(true); - - m_banks_dirty = false; -} - - -void -DSSIController::send_program_change(int bank, int program) -{ - Controller::instance().set_program(node_model()->path(), bank, program); -} - - -void -DSSIController::create_module(OmFlowCanvas* canvas) -{ - //cerr << "Creating DSSI module " << m_model->path() << endl; - - assert(canvas != NULL); - assert(m_module == NULL); - - m_module = new DSSIModule(canvas, this); - create_all_ports(); - - m_module->move_to(node_model()->x(), node_model()->y()); -} - - - -/** Attempt to show the DSSI GUI for this plugin. - * - * Returns whether or not GUI was successfully loaded/shown. - */ -bool -DSSIController::attempt_to_show_gui() -{ - // Shamelessley "inspired by" jack-dssi-host - // Copyright 2004 Chris Cannam, Steve Harris and Sean Bolton. - - const bool verbose = false; - - string engine_url = Controller::instance().engine_url(); - // Hack off last character if it's a / - if (engine_url[engine_url.length()-1] == '/') - engine_url = engine_url.substr(0, engine_url.length()-1); - - const char* dllName = node_model()->plugin()->lib_name().c_str(); - const char* label = node_model()->plugin()->plug_label().c_str(); - const char* myName = "om_gtk"; - const string& oscUrl = engine_url + "/dssi" + node_model()->path(); - - struct dirent* entry = NULL; - char* dllBase = strdup(dllName); - char* subpath = NULL; - DIR* subdir = NULL; - char* filename = NULL; - struct stat buf; - int fuzzy = 0; - - char* env_dssi_path = getenv("DSSI_PATH"); - string dssi_path; - if (!env_dssi_path) { - cerr << "DSSI_PATH is empty. Assuming /usr/lib/dssi:/usr/local/lib/dssi." << endl; - dssi_path = "/usr/lib/dssi:/usr/local/lib/dssi"; - } else { - dssi_path = env_dssi_path; - } - - if (strlen(dllBase) > 3 && !strcasecmp(dllBase + strlen(dllBase) - 3, ".so")) { - dllBase[strlen(dllBase) - 3] = '\0'; - } - - - // This is pretty nasty, it loops through the path, even if the dllBase is absolute - while (dssi_path != "") { - string directory = dssi_path.substr(0, dssi_path.find(':')); - if (dssi_path.find(':') != string::npos) - dssi_path = dssi_path.substr(dssi_path.find(':')+1); - else - dssi_path = ""; - - if (*dllBase == '/') { - subpath = strdup(dllBase); - } else { - subpath = (char*)malloc(strlen(directory.c_str()) + strlen(dllBase) + 2); - sprintf(subpath, "%s/%s", directory.c_str(), dllBase); - } - - for (fuzzy = 0; fuzzy <= 1; ++fuzzy) { - - if (!(subdir = opendir(subpath))) { - if (verbose) { - fprintf(stderr, "%s: can't open plugin GUI directory \"%s\"\n", myName, subpath); - } - break; - } - - while ((entry = readdir(subdir))) { - - if (entry->d_name[0] == '.') - continue; - if (!strchr(entry->d_name, '_')) - continue; - - if (fuzzy) { - if (verbose) { - fprintf(stderr, "checking %s against %s\n", entry->d_name, dllBase); - } - if (strncmp(entry->d_name, dllBase, strlen(dllBase))) - continue; - } else { - if (verbose) { - fprintf(stderr, "checking %s against %s\n", entry->d_name, label); - } - if (strncmp(entry->d_name, label, strlen(label))) - continue; - } - - filename = (char*)malloc(strlen(subpath) + strlen(entry->d_name) + 2); - sprintf(filename, "%s/%s", subpath, entry->d_name); - - if (stat(filename, &buf)) { - perror("stat failed"); - free(filename); - continue; - } - - if ((S_ISREG(buf.st_mode) || S_ISLNK(buf.st_mode)) && - (buf.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) { - - if (verbose) { - fprintf(stderr, "%s: trying to execute GUI at \"%s\"\n", - myName, filename); - } - - if (fork() == 0) { - execlp(filename, filename, oscUrl.c_str(), dllName, label, - node_model()->name().c_str(), 0); - perror("exec failed"); - exit(1); - } - - free(filename); - free(subpath); - free(dllBase); - return true; - } - - free(filename); - } - } - } - - cerr << "Unable to launch DSSI GUI for " << node_model()->path() << endl; - - free(subpath); - free(dllBase); - return false; -} - - -void -DSSIController::show_menu(GdkEventButton* event) -{ - if (m_banks_dirty) - update_program_menu(); - NodeController::show_menu(event); -} - - -} // namespace OmGtk - diff --git a/src/progs/gtk/DSSIController.h b/src/progs/gtk/DSSIController.h deleted file mode 100644 index ca8da578..00000000 --- a/src/progs/gtk/DSSIController.h +++ /dev/null @@ -1,79 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef DSSICONTROLLER_H -#define DSSICONTROLLER_H - -#include -#include -#include "util/Path.h" -#include "NodeController.h" - -using std::string; -using Om::Path; -using namespace LibOmClient; - -namespace LibOmClient { - class MetadataModel; - class NodeModel; - class PortModel; -} - -namespace OmGtk { - -class Controller; -class OmModule; -class NodeControlWindow; -class NodePropertiesWindow; -class PortController; -class OmFlowCanvas; -class DSSIModule; - -/* Controller for a DSSI node. - * - * \ingroup OmGtk - */ -class DSSIController : public NodeController -{ -public: - DSSIController(CountedPtr model); - - virtual ~DSSIController() {} - - void show_gui(); - bool attempt_to_show_gui(); - void program_add(int bank, int program, const string& name); - void program_remove(int bank, int program); - - void send_program_change(int bank, int program); - - void create_module(OmFlowCanvas* canvas); - - void show_menu(GdkEventButton* event); - -private: - void update_program_menu(); - - Gtk::Menu m_program_menu; - Glib::RefPtr m_program_menu_item; - - bool m_banks_dirty; -}; - - -} // namespace OmGtk - -#endif // DSSICONTROLLER_H diff --git a/src/progs/gtk/DSSIModule.cpp b/src/progs/gtk/DSSIModule.cpp deleted file mode 100644 index 7dae48ac..00000000 --- a/src/progs/gtk/DSSIModule.cpp +++ /dev/null @@ -1,38 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "DSSIModule.h" -#include "DSSIController.h" - -namespace OmGtk { - - -DSSIModule::DSSIModule(OmFlowCanvas* canvas, DSSIController* node) -: OmModule(canvas, static_cast(node)) -{ -} - - -void -DSSIModule::on_double_click(GdkEventButton* ev) -{ - DSSIController* const dc = static_cast(m_node); - if (!dc->attempt_to_show_gui()) - show_control_window(); -} - - -} // namespace OmGtk diff --git a/src/progs/gtk/DSSIModule.h b/src/progs/gtk/DSSIModule.h deleted file mode 100644 index 2ad10c04..00000000 --- a/src/progs/gtk/DSSIModule.h +++ /dev/null @@ -1,43 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef DSSIMODULE_H -#define DSSIMODULE_H - -#include "OmModule.h" - -namespace OmGtk { - -class DSSIController; - -/* Module for a DSSI node. - * - * \ingroup OmGtk - */ -class DSSIModule : public OmModule -{ -public: - DSSIModule(OmFlowCanvas* canvas, DSSIController* node); - virtual ~DSSIModule() {} - - void on_double_click(GdkEventButton* ev); -}; - - -} // namespace OmGtk - -#endif // DSSIMODULE_H - diff --git a/src/progs/gtk/GladeFactory.cpp b/src/progs/gtk/GladeFactory.cpp deleted file mode 100644 index e930c4c4..00000000 --- a/src/progs/gtk/GladeFactory.cpp +++ /dev/null @@ -1,69 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "GladeFactory.h" -#include -#include -using std::cout; using std::cerr; using std::endl; -using std::ifstream; - -namespace OmGtk { - - -Glib::ustring GladeFactory::glade_filename = ""; - - -void -GladeFactory::find_glade_file() -{ - // Check for the .glade file in current directory - glade_filename = "./om_gtk.glade"; - ifstream fs(glade_filename.c_str()); - if (fs.fail()) { // didn't find it, check PKGDATADIR - fs.clear(); - glade_filename = PKGDATADIR; - glade_filename += "/om_gtk.glade"; - - fs.open(glade_filename.c_str()); - if (fs.fail()) { - cerr << "[GladeFactory] Unable to find om_gtk.glade in current directory or " << PKGDATADIR << "." << endl; - throw; - } - fs.close(); - } - cerr << "[GladeFactory] Loading widgets from " << glade_filename.c_str() << endl; -} - - -Glib::RefPtr -GladeFactory::new_glade_reference(const string& toplevel_widget) -{ - if (glade_filename == "") - find_glade_file(); - - try { - if (toplevel_widget == "") - return Gnome::Glade::Xml::create(glade_filename); - else - return Gnome::Glade::Xml::create(glade_filename, toplevel_widget.c_str()); - } catch (const Gnome::Glade::XmlError& ex) { - cerr << ex.what() << endl; - throw ex; - } -} - - -} // namespace OmGtk diff --git a/src/progs/gtk/GladeFactory.h b/src/progs/gtk/GladeFactory.h deleted file mode 100644 index a3ee1022..00000000 --- a/src/progs/gtk/GladeFactory.h +++ /dev/null @@ -1,48 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef GLADEFACTORY_H -#define GLADEFACTORY_H - -#include -#include - -using std::string; - -namespace OmGtk { - - -/** Creates glade references, so various objects can create widgets. - * Purely static. - * - * \ingroup OmGtk - */ -class GladeFactory { -public: - static Glib::RefPtr - new_glade_reference(const string& toplevel_widget = ""); - -private: - GladeFactory() {} - - static void find_glade_file(); - static Glib::ustring glade_filename; -}; - - -} // namespace OmGtk - -#endif // GLADEFACTORY_H diff --git a/src/progs/gtk/GtkObjectController.cpp b/src/progs/gtk/GtkObjectController.cpp deleted file mode 100644 index 241f123b..00000000 --- a/src/progs/gtk/GtkObjectController.cpp +++ /dev/null @@ -1,31 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "GtkObjectController.h" - -namespace OmGtk { - - -GtkObjectController::GtkObjectController(CountedPtr model) -: m_model(model) -{ - assert(m_model); - model->metadata_update_sig.connect(sigc::mem_fun(this, &GtkObjectController::metadata_update)); -} - - -} // namespace OmGtk - diff --git a/src/progs/gtk/GtkObjectController.h b/src/progs/gtk/GtkObjectController.h deleted file mode 100644 index 77860a9c..00000000 --- a/src/progs/gtk/GtkObjectController.h +++ /dev/null @@ -1,83 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef GTKOBJECTCONTROLLER_H -#define GTKOBJECTCONTROLLER_H - -#include -#include - -#include "ObjectModel.h" -#include "ObjectController.h" -#include "util/CountedPtr.h" - -using std::string; - -using namespace LibOmClient; - -namespace OmGtk { - -class Controller; - - -/** Controller for an Om object. - * - * Management of the model and view are this object's responsibility. - * The view may not be created (ie in the case of patches which have never - * been shown and all their children). - * - * \ingroup OmGtk - */ -class GtkObjectController : public LibOmClient::ObjectController -{ -public: - GtkObjectController(CountedPtr model); - virtual ~GtkObjectController() {} - - /** Destroy object. - * - * Object must be safe to delete immediately following the return of - * this call. - */ - virtual void destroy() = 0; - -/* - virtual void add_to_store() = 0; - virtual void remove_from_store() = 0; -*/ - - /** Derived classes should override this to handle special metadata - * keys, then call this to set the model's metadata key. - */ - virtual void metadata_update(const string& key, const string& value) - { assert(m_model->get_metadata(key) != ""); } - - /** Rename object */ - virtual void set_path(const Path& new_path) - { m_model->set_path(new_path); } - - const Path& path() const { return m_model->path(); } - - CountedPtr model() const { return m_model; } - -protected: - CountedPtr m_model; ///< Model for this object -}; - - -} // namespace OmGtk - -#endif // GTKOBJECTCONTROLLER_H diff --git a/src/progs/gtk/LashController.cpp b/src/progs/gtk/LashController.cpp deleted file mode 100644 index d95d8515..00000000 --- a/src/progs/gtk/LashController.cpp +++ /dev/null @@ -1,168 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "LashController.h" -#include "config.h" -#include -#include -#include -#include -#include -#include "App.h" -#include "PatchController.h" -#include "PatchModel.h" - -using std::cerr; using std::cout; using std::endl; -using std::string; - -namespace OmGtk { - - -LashController::LashController(lash_args_t* args) -: m_client(NULL) -{ - m_client = lash_init(args, PACKAGE_NAME, - /*LASH_Config_Data_Set|*/LASH_Config_File, LASH_PROTOCOL(2, 0)); - if (m_client == NULL) { - cerr << "[LashController] Failed to connect to LASH. Session management will not function." << endl; - } else { - cout << "[LashController] Lash initialised" << endl; - } - - lash_event_t* event = lash_event_new_with_type(LASH_Client_Name); - lash_event_set_string(event, "OmGtk"); - lash_send_event(m_client, event); -} - - -LashController::~LashController() -{ - if (m_client != NULL) { - lash_event_t* quit_event = lash_event_new_with_type(LASH_Quit); - lash_send_event(m_client, quit_event); - } -} - - -void -LashController::process_events() -{ - assert(m_client != NULL); - - lash_event_t* ev = NULL; - lash_config_t* conf = NULL; - - // Process events - while ((ev = lash_get_event(m_client)) != NULL) { - handle_event(ev); - lash_event_destroy(ev); - } - - // Process configs - while ((conf = lash_get_config(m_client)) != NULL) { - handle_config(conf); - lash_config_destroy(conf); - } -} - - -void -LashController::handle_event(lash_event_t* ev) -{ - assert(ev != NULL); - - LASH_Event_Type type = lash_event_get_type(ev); - const char* c_str = lash_event_get_string(ev); - string str = (c_str == NULL) ? "" : c_str; - - if (type == LASH_Save_File) { - cout << "[LashController] LASH Save File - " << str << endl; - save(str); - lash_send_event(m_client, lash_event_new_with_type(LASH_Save_File)); - } else if (type == LASH_Restore_File) { - cout << "[LashController] LASH Restore File - " << str << endl; - cerr << "LASH RESTORE NOT YET (RE)IMPLEMENTED." << endl; - /*_controller->load_session_blocking(str + "/session"); - _controller->lash_restore_finished(); - lash_send_event(m_client, lash_event_new_with_type(LASH_Restore_File)); - */ - /*} else if (type == LASH_Save_Data_Set) { - //cout << "[LashController] LASH Save Data Set - " << endl; - - // Tell LASH we're done - lash_send_event(m_client, lash_event_new_with_type(LASH_Save_Data_Set)); - */ - } else if (type == LASH_Quit) { - cout << "[LashController] LASH Quit" << endl; - m_client = NULL; - App::instance().quit(); - } else { - cerr << "[LashController] Unhandled LASH event, type: " << static_cast(type) << endl; - } -} - - -void -LashController::handle_config(lash_config_t* conf) -{ - assert(conf != NULL); - - const char* key = NULL; - const void* val = NULL; - size_t val_size = 0; - - cout << "[LashController] LASH Config. Key = " << key << endl; - - key = lash_config_get_key(conf); - val = lash_config_get_value(conf); - val_size = lash_config_get_value_size(conf); -} - -void -LashController::save(const string& dir) -{ - cerr << "LASH SAVING NOT YET (RE)IMPLEMENTED\n"; - /* - PatchController* pc = NULL; - - // Save every patch under dir with it's path as a filename - // (so the dir structure will resemble the patch heirarchy) - for (map::iterator i = m_app->patches().begin(); - i != m_app->patches().end(); ++i) { - pc = (*i).second; - pc->model()->filename(dir + pc->model()->path() + ".om"); - } - - // Create directories - for (map::iterator i = m_app->patches().begin(); - i != m_app->patches().end(); ++i) { - pc = (*i).second; - if (pc->model()->parent() != NULL) { - string path = OmPath::parent(pc->model()->path()).substr(1) + "/"; - while (path.find("/") != string::npos) { - mkdir(string(dir +"/"+ path.substr(0, path.find("/"))).c_str(), 0744); - path = path.substr(path.find("/")+1); - } - } - _controller->save_patch_blocking(pc->model(), pc->model()->filename(), false); - } - - //m_app->state_manager()->save(str + "/omgtkrc"); - _controller->save_session_blocking(dir + "/session"); - */ -} - -} // namespace OmGtk diff --git a/src/progs/gtk/LashController.h b/src/progs/gtk/LashController.h deleted file mode 100644 index f61c9f7f..00000000 --- a/src/progs/gtk/LashController.h +++ /dev/null @@ -1,53 +0,0 @@ -/* This file is part of OmGtk. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef LASHCONTROLLER_H -#define LASHCONTROLLER_H - -#include -#include -using std::string; - -namespace OmGtk { - -class App; - -/* Old and unused LASH controller. - * - * \ingroup OmGtk - */ -class LashController -{ -public: - LashController(lash_args_t* args); - ~LashController(); - - bool enabled() { return lash_enabled(m_client); } - void process_events(); - -private: - void save(const string& dir); - - lash_client_t* m_client; - - void handle_event(lash_event_t* conf); - void handle_config(lash_config_t* conf); -}; - - -} // namespace OmGtk - -#endif // LASHCONTROLLER_H diff --git a/src/progs/gtk/LoadPatchWindow.cpp b/src/progs/gtk/LoadPatchWindow.cpp deleted file mode 100644 index 60f6e15f..00000000 --- a/src/progs/gtk/LoadPatchWindow.cpp +++ /dev/null @@ -1,131 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "LoadPatchWindow.h" -#include -#include -#include "App.h" -#include "Configuration.h" -#include "PatchController.h" -#include "PatchModel.h" -#include "Controller.h" - -namespace OmGtk { - - -LoadPatchWindow::LoadPatchWindow(BaseObjectType* cobject, const Glib::RefPtr& xml) -: Gtk::FileChooserDialog(cobject), - m_patch_controller(NULL), - m_replace(true) -{ - xml->get_widget("load_patch_poly_from_current_radio", m_poly_from_current_radio); - xml->get_widget("load_patch_poly_from_file_radio", m_poly_from_file_radio); - xml->get_widget("load_patch_poly_from_user_radio", m_poly_from_user_radio); - xml->get_widget("load_patch_poly_spinbutton", m_poly_spinbutton); - xml->get_widget("load_patch_ok_button", m_ok_button); - xml->get_widget("load_patch_cancel_button", m_cancel_button); - - m_poly_from_current_radio->signal_toggled().connect(sigc::mem_fun(this, &LoadPatchWindow::poly_from_file_selected)); - m_poly_from_file_radio->signal_toggled().connect(sigc::mem_fun(this, &LoadPatchWindow::poly_from_file_selected)); - m_poly_from_user_radio->signal_toggled().connect(sigc::mem_fun(this, &LoadPatchWindow::poly_from_user_selected)); - m_ok_button->signal_clicked().connect(sigc::mem_fun(this, &LoadPatchWindow::ok_clicked)); - m_cancel_button->signal_clicked().connect(sigc::mem_fun(this, &LoadPatchWindow::cancel_clicked)); - - m_poly_from_current_radio->set_active(true); - - Gtk::FileFilter filt; - filt.add_pattern("*.om"); - filt.set_name("Om patch files (*.om)"); - set_filter(filt); - - // Add global examples directory to "shortcut folders" (bookmarks) - string examples_dir = PKGDATADIR; - examples_dir.append("/patches"); - DIR* d = opendir(examples_dir.c_str()); - if (d != NULL) - add_shortcut_folder(examples_dir); -} - - -/** Sets the patch controller for this window and initializes everything. - * - * This function MUST be called before using the window in any way! - */ -void -LoadPatchWindow::patch_controller(PatchController* pc) -{ - m_patch_controller = pc; -} - - -void -LoadPatchWindow::on_show() -{ - if (App::instance().configuration()->patch_folder().length() > 0) - set_current_folder(App::instance().configuration()->patch_folder()); - Gtk::FileChooserDialog::on_show(); -} - - -///// Event Handlers ////// - - -void -LoadPatchWindow::poly_from_file_selected() -{ - m_poly_spinbutton->property_sensitive() = false; -} - - -void -LoadPatchWindow::poly_from_user_selected() -{ - m_poly_spinbutton->property_sensitive() = true; -} - - -void -LoadPatchWindow::ok_clicked() -{ - // These values are interpreted by load_patch() as "not defined", ie load from file - string name = ""; - int poly = 0; - - if (m_poly_from_user_radio->get_active()) - poly = m_poly_spinbutton->get_value_as_int(); - - if (m_replace) - Controller::instance().clear_patch(m_patch_controller->model()->path()); - - PatchModel* pm = new PatchModel(m_patch_controller->model()->path(), poly); - pm->filename(get_filename()); - pm->set_metadata("filename", get_filename()); - pm->set_parent(m_patch_controller->patch_model()->parent()); - //Controller::instance().push_added_patch(pm); - Controller::instance().load_patch(pm, true, true); - - hide(); -} - - -void -LoadPatchWindow::cancel_clicked() -{ - hide(); -} - - -} // namespace OmGtk diff --git a/src/progs/gtk/LoadPatchWindow.h b/src/progs/gtk/LoadPatchWindow.h deleted file mode 100644 index 7d7093bd..00000000 --- a/src/progs/gtk/LoadPatchWindow.h +++ /dev/null @@ -1,73 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef LOADPATCHWINDOW_H -#define LOADPATCHWINDOW_H - -#include "PluginModel.h" - -#include -#include - -namespace OmGtk { - -class PatchController; - - -/** 'Load Patch' window. - * - * Loaded by glade as a derived object. Used for both "Load" and "Load Into" - * operations (the radio button state should be changed with the provided - * methods prior to presenting this window). - * - * This is not for loading subpatches. See @a LoadSubpatchWindow for that. - * - * \ingroup OmGtk - */ -class LoadPatchWindow : public Gtk::FileChooserDialog -{ -public: - LoadPatchWindow(BaseObjectType* cobject, const Glib::RefPtr& xml); - - void patch_controller(PatchController* pc); - - void set_replace() { m_replace = true; } - void set_merge() { m_replace = false; } - -protected: - void on_show(); - -private: - void poly_from_file_selected(); - void poly_from_user_selected(); - void ok_clicked(); - void cancel_clicked(); - - PatchController* m_patch_controller; - bool m_replace; - - Gtk::RadioButton* m_poly_from_current_radio; - Gtk::RadioButton* m_poly_from_file_radio; - Gtk::RadioButton* m_poly_from_user_radio; - Gtk::SpinButton* m_poly_spinbutton; - Gtk::Button* m_ok_button; - Gtk::Button* m_cancel_button; -}; - - -} // namespace OmGtk - -#endif // LOADPATCHWINDOW_H diff --git a/src/progs/gtk/LoadPluginWindow.cpp b/src/progs/gtk/LoadPluginWindow.cpp deleted file mode 100644 index a1eba51c..00000000 --- a/src/progs/gtk/LoadPluginWindow.cpp +++ /dev/null @@ -1,407 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "LoadPluginWindow.h" -#include -#include -#include -#include -#include "PatchController.h" -#include "NodeModel.h" -#include "Controller.h" -#include "App.h" -#include "PatchWindow.h" -#include "OmFlowCanvas.h" -#include "PatchModel.h" -#include "Store.h" -using std::cout; using std::cerr; using std::endl; - - -namespace OmGtk { - -LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject, const Glib::RefPtr& xml) -: Gtk::Window(cobject), - m_patch_controller(NULL), - m_has_shown(false), - m_plugin_name_offset(0), - m_new_module_x(0), - m_new_module_y(0) -{ - xml->get_widget("load_plugin_plugins_treeview", m_plugins_treeview); - xml->get_widget("load_plugin_polyphonic_checkbutton", m_polyphonic_checkbutton); - xml->get_widget("load_plugin_name_entry", m_node_name_entry); - xml->get_widget("load_plugin_clear_button", m_clear_button); - xml->get_widget("load_plugin_add_button", m_add_button); - xml->get_widget("load_plugin_close_button", m_close_button); - //xml->get_widget("load_plugin_ok_button", m_ok_button); - - xml->get_widget("load_plugin_filter_combo", m_filter_combo); - xml->get_widget("load_plugin_search_entry", m_search_entry); - - // Set up the plugins list - m_plugins_liststore = Gtk::ListStore::create(m_plugins_columns); - m_plugins_treeview->set_model(m_plugins_liststore); - m_plugins_treeview->append_column("Name", m_plugins_columns.m_col_name); - m_plugins_treeview->append_column("Type", m_plugins_columns.m_col_type); - m_plugins_treeview->append_column("URI", m_plugins_columns.m_col_uri); - //m_plugins_treeview->append_column("Library", m_plugins_columns.m_col_library); - //m_plugins_treeview->append_column("Label", m_plugins_columns.m_col_label); - - // This could be nicer.. store the TreeViewColumns locally maybe? - m_plugins_treeview->get_column(0)->set_sort_column(m_plugins_columns.m_col_name); - m_plugins_treeview->get_column(1)->set_sort_column(m_plugins_columns.m_col_type); - m_plugins_treeview->get_column(2)->set_sort_column(m_plugins_columns.m_col_uri); - //m_plugins_treeview->get_column(3)->set_sort_column(m_plugins_columns.m_col_library); - //m_plugins_treeview->get_column(4)->set_sort_column(m_plugins_columns.m_col_label); - for (int i=0; i < 3; ++i) - m_plugins_treeview->get_column(i)->set_resizable(true); - - // Set up the search criteria combobox - m_criteria_liststore = Gtk::ListStore::create(m_criteria_columns); - m_filter_combo->set_model(m_criteria_liststore); - Gtk::TreeModel::iterator iter = m_criteria_liststore->append(); - Gtk::TreeModel::Row row = *iter; - row[m_criteria_columns.m_col_label] = "Name contains: "; - row[m_criteria_columns.m_col_criteria] = CriteriaColumns::NAME; - m_filter_combo->set_active(iter); - iter = m_criteria_liststore->append(); row = *iter; - row[m_criteria_columns.m_col_label] = "Type contains: "; - row[m_criteria_columns.m_col_criteria] = CriteriaColumns::TYPE; - iter = m_criteria_liststore->append(); row = *iter; - row[m_criteria_columns.m_col_label] = "URI contains: "; - row[m_criteria_columns.m_col_criteria] = CriteriaColumns::URI; - /*iter = m_criteria_liststore->append(); row = *iter; - row[m_criteria_columns.m_col_label] = "Library contains: "; - row[m_criteria_columns.m_col_criteria] = CriteriaColumns::LIBRARY; - iter = m_criteria_liststore->append(); row = *iter; - row[m_criteria_columns.m_col_label] = "Label contains: "; - row[m_criteria_columns.m_col_criteria] = CriteriaColumns::LABEL;*/ - - m_clear_button->signal_clicked().connect( sigc::mem_fun(this, &LoadPluginWindow::clear_clicked)); - m_add_button->signal_clicked().connect( sigc::mem_fun(this, &LoadPluginWindow::add_clicked)); - m_close_button->signal_clicked().connect( sigc::mem_fun(this, &LoadPluginWindow::close_clicked)); - //m_ok_button->signal_clicked().connect( sigc::mem_fun(this, &LoadPluginWindow::ok_clicked)); - m_plugins_treeview->signal_row_activated().connect(sigc::mem_fun(this, &LoadPluginWindow::plugin_activated)); - m_search_entry->signal_activate().connect( sigc::mem_fun(this, &LoadPluginWindow::add_clicked)); - m_search_entry->signal_changed().connect( sigc::mem_fun(this, &LoadPluginWindow::filter_changed)); - - m_selection = m_plugins_treeview->get_selection(); - m_selection->signal_changed().connect(sigc::mem_fun(this, &LoadPluginWindow::plugin_selection_changed)); - - //m_add_button->grab_default(); -} - - -/** Sets the patch controller for this window and initializes everything. - * - * This function MUST be called before using the window in any way! - */ -void -LoadPluginWindow::patch_controller(PatchController* pc) -{ - m_patch_controller = pc; - - if (pc->patch_model()->poly() <= 1) - m_polyphonic_checkbutton->property_sensitive() = false; - else - m_polyphonic_checkbutton->property_sensitive() = true; - -} - - -/** Populates the plugin list on the first show. - * - * This is done here instead of construction time as the list population is - * really expensive and bogs down creation of a patch. This is especially - * important when many patch notifications are sent at one time from the - * engine. - */ -void -LoadPluginWindow::on_show() -{ - if (!m_has_shown) { - set_plugin_list(Store::instance().plugins()); - - // Center on patch window - int m_w, m_h; - get_size(m_w, m_h); - - int parent_x, parent_y, parent_w, parent_h; - m_patch_controller->window()->get_position(parent_x, parent_y); - m_patch_controller->window()->get_size(parent_w, parent_h); - - move(parent_x + parent_w/2 - m_w/2, parent_y + parent_h/2 - m_h/2); - - m_has_shown = true; - } - Gtk::Window::on_show(); -} - - -void -LoadPluginWindow::on_hide() -{ - m_new_module_x = 0; - m_new_module_y = 0; - Gtk::Window::on_hide(); -} - - -void -LoadPluginWindow::set_plugin_list(const std::map >& m) -{ - m_plugins_liststore->clear(); - - CountedPtr plugin = NULL; - for (std::map >::const_iterator i = m.begin(); i != m.end(); ++i) { - plugin = (*i).second; - - Gtk::TreeModel::iterator iter = m_plugins_liststore->append(); - Gtk::TreeModel::Row row = *iter; - - row[m_plugins_columns.m_col_name] = plugin->name(); - //row[m_plugins_columns.m_col_label] = plugin->plug_label(); - row[m_plugins_columns.m_col_type] = plugin->type_string(); - row[m_plugins_columns.m_col_uri] = plugin->uri(); - row[m_plugins_columns.m_col_label] = plugin->name(); - //row[m_plugins_columns.m_col_library] = plugin->lib_name(); - row[m_plugins_columns.m_col_plugin_model] = plugin; - } - - m_plugins_treeview->columns_autosize(); -} - - -void -LoadPluginWindow::add_plugin(CountedPtr plugin) -{ - Gtk::TreeModel::iterator iter = m_plugins_liststore->append(); - Gtk::TreeModel::Row row = *iter; - - row[m_plugins_columns.m_col_name] = plugin->name(); - //row[m_plugins_columns.m_col_label] = plugin->plug_label(); - row[m_plugins_columns.m_col_type] = plugin->type_string(); - row[m_plugins_columns.m_col_uri] = plugin->uri(); - row[m_plugins_columns.m_col_label] = plugin->name(); - //row[m_plugins_columns.m_col_library] = plugin->lib_name(); - row[m_plugins_columns.m_col_plugin_model] = plugin; -} - - - -///// Event Handlers ////// - - -void -LoadPluginWindow::plugin_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* col) -{ - add_clicked(); -} - - -void -LoadPluginWindow::plugin_selection_changed() -{ - m_plugin_name_offset = 0; - - m_node_name_entry->set_text(generate_module_name()); - - //Gtk::TreeModel::iterator iter = m_selection->get_selected(); - //Gtk::TreeModel::Row row = *iter; - //const PluginModel* plugin = row.get_value(m_plugins_columns.m_col_plugin_model); -} - - -/** Generate an automatic name for this Node. - * - * Offset is an offset of the number that will be appended to the plugin's - * label, needed if the user adds multiple plugins faster than the engine - * sends the notification back. - */ -string -LoadPluginWindow::generate_module_name(int offset) -{ - string name = ""; - - Gtk::TreeModel::iterator iter = m_selection->get_selected(); - - if (iter) { - Gtk::TreeModel::Row row = *iter; - CountedPtr plugin = row.get_value(m_plugins_columns.m_col_plugin_model); - char num_buf[3]; - for (uint i=0; i < 99; ++i) { - name = plugin->plug_label(); - if (name == "") - name = plugin->name().substr(0, plugin->name().find(' ')); - if (i+offset != 0) { - snprintf(num_buf, 3, "%d", i+offset+1); - name += "_"; - name += num_buf; - } - if (!m_patch_controller->patch_model()->get_node(name)) - break; - else - name = ""; - } - } - - return name; -} - - -void -LoadPluginWindow::add_clicked() -{ - Gtk::TreeModel::iterator iter = m_selection->get_selected(); - bool polyphonic = m_polyphonic_checkbutton->get_active(); - - if (iter) { // If anything is selected - Gtk::TreeModel::Row row = *iter; - CountedPtr plugin = row.get_value(m_plugins_columns.m_col_plugin_model); - string name = m_node_name_entry->get_text(); - if (name == "") { - name = generate_module_name(); - } - if (name == "") { - Gtk::MessageDialog dialog(*this, - "Unable to chose a default name for this node. Please enter a name.", - false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); - - dialog.run(); - } else { - const string path = m_patch_controller->model()->base_path() + name; - NodeModel* nm = new NodeModel(plugin, path); - nm->polyphonic(polyphonic); - - if (m_new_module_x == 0 && m_new_module_y == 0) { - m_patch_controller->get_new_module_location( - m_new_module_x, m_new_module_y); - } - nm->x(m_new_module_x); - nm->y(m_new_module_y); - - Controller::instance().create_node_from_model(nm); - ++m_plugin_name_offset; - m_node_name_entry->set_text(generate_module_name(m_plugin_name_offset)); - - // Set the next module location 20 over, for a cascade effect - m_new_module_x += 20; - m_new_module_y += 20; - } - } -} - - -void -LoadPluginWindow::close_clicked() -{ - hide(); -} - - -/* -void -LoadPluginWindow::ok_clicked() -{ - add_clicked(); - close_clicked(); -} -*/ - -void -LoadPluginWindow::filter_changed() -{ - m_plugins_liststore->clear(); - - string search = m_search_entry->get_text(); - transform(search.begin(), search.end(), search.begin(), toupper); - - // Get selected criteria - const Gtk::TreeModel::Row row = *(m_filter_combo->get_active()); - CriteriaColumns::Criteria criteria = row[m_criteria_columns.m_col_criteria]; - - string field; - - Gtk::TreeModel::Row model_row; - Gtk::TreeModel::iterator model_iter; - size_t num_visible = 0; - - - for (std::map >::const_iterator i = Store::instance().plugins().begin(); - i != Store::instance().plugins().end(); ++i) { - - const CountedPtr plugin = (*i).second; - - switch (criteria) { - case CriteriaColumns::NAME: - field = plugin->name(); break; - case CriteriaColumns::TYPE: - field = plugin->type_string(); break; - case CriteriaColumns::URI: - field = plugin->uri(); break; - /*case CriteriaColumns::LIBRARY: - field = plugin->lib_name(); break; - case CriteriaColumns::LABEL: - field = plugin->plug_label(); break;*/ - default: - throw; - } - - transform(field.begin(), field.end(), field.begin(), toupper); - - if (field.find(search) != string::npos) { - model_iter = m_plugins_liststore->append(); - model_row = *model_iter; - - model_row[m_plugins_columns.m_col_name] = plugin->name(); - //model_row[m_plugins_columns.m_col_label] = plugin->plug_label(); - model_row[m_plugins_columns.m_col_type] = plugin->type_string(); - model_row[m_plugins_columns.m_col_uri] = plugin->uri(); - model_row[m_plugins_columns.m_col_label] = plugin->plug_label(); - //model_row[m_plugins_columns.m_col_library] = plugin->lib_name(); - model_row[m_plugins_columns.m_col_plugin_model] = plugin; - - ++num_visible; - } - } - - if (num_visible == 1) { - m_selection->unselect_all(); - m_selection->select(model_iter); - } -} - - -void -LoadPluginWindow::clear_clicked() -{ - m_search_entry->set_text(""); - set_plugin_list(Store::instance().plugins()); -} - -bool -LoadPluginWindow::on_key_press_event(GdkEventKey* event) -{ - if (event->keyval == GDK_w && event->state & GDK_CONTROL_MASK) { - hide(); - return true; - } else { - return Gtk::Window::on_key_press_event(event); - } -} - - -} // namespace OmGtk diff --git a/src/progs/gtk/LoadPluginWindow.h b/src/progs/gtk/LoadPluginWindow.h deleted file mode 100644 index 4bf302c2..00000000 --- a/src/progs/gtk/LoadPluginWindow.h +++ /dev/null @@ -1,145 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#ifndef LOADPLUGINWINDOW_H -#define LOADPLUGINWINDOW_H - -#include "PluginModel.h" -#include -#include -#include -#include -#include "util/CountedPtr.h" - -using LibOmClient::PluginModel; - -namespace OmGtk { - -class PatchController; - -// Gtkmm _really_ needs to add some helper to abstract away this stupid nonsense - -/** Columns for the plugin list in the load plugin window. - * - * \ingroup OmGtk - */ -class ModelColumns : public Gtk::TreeModel::ColumnRecord -{ -public: - ModelColumns() { - add(m_col_name); - add(m_col_type); - add(m_col_uri); - add(m_col_label); - //add(m_col_library); - //add(m_col_label); - add(m_col_plugin_model); - } - - Gtk::TreeModelColumn m_col_name; - Gtk::TreeModelColumn m_col_type; - Gtk::TreeModelColumn m_col_uri; - - // Not displayed: - Gtk::TreeModelColumn m_col_label; - Gtk::TreeModelColumn > m_col_plugin_model; -}; - - -/** Column for the criteria combo box in the load plugin window. - * - * \ingroup OmGtk - */ -class CriteriaColumns : public Gtk::TreeModel::ColumnRecord -{ -public: - enum Criteria { NAME, TYPE, URI, }; - - CriteriaColumns() { add(m_col_label); add(m_col_criteria); } - - Gtk::TreeModelColumn m_col_label; - Gtk::TreeModelColumn m_col_criteria; -}; - - -/** 'Load Plugin' window. - * - * Loaded by glade as a derived object. - * - * \ingroup OmGtk - */ -class LoadPluginWindow : public Gtk::Window -{ -public: - LoadPluginWindow(BaseObjectType* cobject, const Glib::RefPtr& xml); - - void patch_controller(PatchController* pc); - void set_plugin_list(const std::map >& m); - - void set_next_module_location(int x, int y) - { m_new_module_x = x; m_new_module_y = y; } - - void add_plugin(CountedPtr plugin); - bool has_shown() const { return m_has_shown; } - -protected: - void on_show(); - void on_hide(); - bool on_key_press_event(GdkEventKey* event); - -private: - void add_clicked(); - void close_clicked(); - //void ok_clicked(); - void filter_changed(); - void clear_clicked(); - - void plugin_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* col); - void plugin_selection_changed(); - string generate_module_name(int offset = 0); - - PatchController* m_patch_controller; - bool m_has_shown; // plugin list only populated on show to speed patch window creation - - Glib::RefPtr m_plugins_liststore; - ModelColumns m_plugins_columns; - - Glib::RefPtr m_criteria_liststore; - CriteriaColumns m_criteria_columns; - - Glib::RefPtr m_selection; - - int m_plugin_name_offset; // see comments for generate_plugin_name - - int m_new_module_x; - int m_new_module_y; - - Gtk::TreeView* m_plugins_treeview; - Gtk::CheckButton* m_polyphonic_checkbutton; - Gtk::Entry* m_node_name_entry; - Gtk::Button* m_clear_button; - Gtk::Button* m_add_button; - Gtk::Button* m_close_button; - //Gtk::Button* m_ok_button; - Gtk::ComboBox* m_filter_combo; - Gtk::Entry* m_search_entry; -}; - - -} // namespace OmGtk - -#endif // LOADPLUGINWINDOW_H diff --git a/src/progs/gtk/LoadSubpatchWindow.cpp b/src/progs/gtk/LoadSubpatchWindow.cpp deleted file mode 100644 index 1c8f8fe2..00000000 --- a/src/progs/gtk/LoadSubpatchWindow.cpp +++ /dev/null @@ -1,177 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "LoadSubpatchWindow.h" -#include -#include -#include -#include "App.h" -#include "PatchController.h" -#include "NodeModel.h" -#include "Controller.h" -#include "PatchModel.h" -#include "Configuration.h" - -namespace OmGtk { - - -LoadSubpatchWindow::LoadSubpatchWindow(BaseObjectType* cobject, const Glib::RefPtr& xml) -: Gtk::FileChooserDialog(cobject), - m_patch_controller(NULL), - m_new_module_x(0), - m_new_module_y(0) -{ - xml->get_widget("load_subpatch_name_from_file_radio", m_name_from_file_radio); - xml->get_widget("load_subpatch_name_from_user_radio", m_name_from_user_radio); - xml->get_widget("load_subpatch_name_entry", m_name_entry); - xml->get_widget("load_subpatch_poly_from_file_radio", m_poly_from_file_radio); - xml->get_widget("load_subpatch_poly_from_parent_radio", m_poly_from_parent_radio); - xml->get_widget("load_subpatch_poly_from_user_radio", m_poly_from_user_radio); - xml->get_widget("load_subpatch_poly_spinbutton", m_poly_spinbutton); - xml->get_widget("load_subpatch_ok_button", m_ok_button); - xml->get_widget("load_subpatch_cancel_button", m_cancel_button); - - m_name_from_file_radio->signal_toggled().connect(sigc::mem_fun(this, &LoadSubpatchWindow::disable_name_entry)); - m_name_from_user_radio->signal_toggled().connect(sigc::mem_fun(this, &LoadSubpatchWindow::enable_name_entry)); - m_poly_from_file_radio->signal_toggled().connect(sigc::mem_fun(this, &LoadSubpatchWindow::disable_poly_spinner)); - m_poly_from_parent_radio->signal_toggled().connect(sigc::mem_fun(this, &LoadSubpatchWindow::disable_poly_spinner)); - m_poly_from_user_radio->signal_toggled().connect(sigc::mem_fun(this, &LoadSubpatchWindow::enable_poly_spinner)); - m_ok_button->signal_clicked().connect(sigc::mem_fun(this, &LoadSubpatchWindow::ok_clicked)); - m_cancel_button->signal_clicked().connect(sigc::mem_fun(this, &LoadSubpatchWindow::cancel_clicked)); - - Gtk::FileFilter filt; - filt.add_pattern("*.om"); - filt.set_name("Om patch files (*.om)"); - set_filter(filt); - - // Add global examples directory to "shortcut folders" (bookmarks) - string examples_dir = PKGDATADIR; - examples_dir.append("/patches"); - DIR* d = opendir(examples_dir.c_str()); - if (d != NULL) - add_shortcut_folder(examples_dir); -} - - -/** Sets the patch controller for this window and initializes everything. - * - * This function MUST be called before using the window in any way! - */ -void -LoadSubpatchWindow::patch_controller(PatchController* pc) -{ - m_patch_controller = pc; - - char temp_buf[4]; - snprintf(temp_buf, 4, "%zd", pc->patch_model()->poly()); - Glib::ustring txt = "Same as parent ("; - txt.append(temp_buf).append(")"); - m_poly_from_parent_radio->set_label(txt); -} - - -void -LoadSubpatchWindow::on_show() -{ - if (App::instance().configuration()->patch_folder().length() > 0) - set_current_folder(App::instance().configuration()->patch_folder()); - Gtk::FileChooserDialog::on_show(); -} - - -///// Event Handlers ////// - - - -void -LoadSubpatchWindow::disable_name_entry() -{ - m_name_entry->property_sensitive() = false; -} - - -void -LoadSubpatchWindow::enable_name_entry() -{ - m_name_entry->property_sensitive() = true; -} - - -void -LoadSubpatchWindow::disable_poly_spinner() -{ - m_poly_spinbutton->property_sensitive() = false; -} - - -void -LoadSubpatchWindow::enable_poly_spinner() -{ - m_poly_spinbutton->property_sensitive() = true; -} - - -void -LoadSubpatchWindow::ok_clicked() -{ - assert(m_patch_controller != NULL); - assert(m_patch_controller->model()); - - // These values are interpreted by load_patch() as "not defined", ie load from file - string name = ""; - int poly = 0; - - if (m_name_from_user_radio->get_active()) - name = m_name_entry->get_text(); - - if (m_poly_from_user_radio->get_active()) - poly = m_poly_spinbutton->get_value_as_int(); - else if (m_poly_from_parent_radio->get_active()) - poly = m_patch_controller->patch_model()->poly(); - - if (m_new_module_x == 0 && m_new_module_y == 0) { - m_patch_controller->get_new_module_location( - m_new_module_x, m_new_module_y); - } - - PatchModel* pm = new PatchModel(m_patch_controller->model()->base_path() + name, poly); - pm->filename(get_filename()); - pm->set_parent(m_patch_controller->model().get()); - pm->x(m_new_module_x); - pm->y(m_new_module_y); - if (name == "") - pm->set_path(""); - char temp_buf[16]; - snprintf(temp_buf, 16, "%d", m_new_module_x); - pm->set_metadata("module-x", temp_buf); - snprintf(temp_buf, 16, "%d", m_new_module_y); - pm->set_metadata("module-y", temp_buf); - Controller::instance().load_patch(pm); - - App::instance().configuration()->set_patch_folder(pm->filename().substr(0, pm->filename().find_last_of("/"))); - - hide(); -} - - -void -LoadSubpatchWindow::cancel_clicked() -{ - hide(); -} - - -} // namespace OmGtk diff --git a/src/progs/gtk/LoadSubpatchWindow.h b/src/progs/gtk/LoadSubpatchWindow.h deleted file mode 100644 index 45efdd15..00000000 --- a/src/progs/gtk/LoadSubpatchWindow.h +++ /dev/null @@ -1,78 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#ifndef LOADSUBPATCHWINDOW_H -#define LOADSUBPATCHWINDOW_H - -#include "PluginModel.h" -#include -#include - - -namespace OmGtk { - -class PatchController; - - -/** 'Add Subpatch' window. - * - * Loaded by glade as a derived object. - * - * \ingroup OmGtk - */ -class LoadSubpatchWindow : public Gtk::FileChooserDialog -{ -public: - LoadSubpatchWindow(BaseObjectType* cobject, const Glib::RefPtr& xml); - - void patch_controller(PatchController* pc); - - void set_next_module_location(int x, int y) - { m_new_module_x = x; m_new_module_y = y; } - -protected: - void on_show(); - -private: - void disable_name_entry(); - void enable_name_entry(); - void disable_poly_spinner(); - void enable_poly_spinner(); - - void ok_clicked(); - void cancel_clicked(); - - PatchController* m_patch_controller; - - int m_new_module_x; - int m_new_module_y; - - Gtk::RadioButton* m_name_from_file_radio; - Gtk::RadioButton* m_name_from_user_radio; - Gtk::Entry* m_name_entry; - Gtk::RadioButton* m_poly_from_file_radio; - Gtk::RadioButton* m_poly_from_parent_radio; - Gtk::RadioButton* m_poly_from_user_radio; - Gtk::SpinButton* m_poly_spinbutton; - Gtk::Button* m_ok_button; - Gtk::Button* m_cancel_button; -}; - - -} // namespace OmGtk - -#endif // LOADSUBPATCHWINDOW_H diff --git a/src/progs/gtk/Loader.cpp b/src/progs/gtk/Loader.cpp deleted file mode 100644 index 643dc3c9..00000000 --- a/src/progs/gtk/Loader.cpp +++ /dev/null @@ -1,233 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "Loader.h" -#include -#include -#include -#include "PatchLibrarian.h" -#include "PatchModel.h" -#include "PatchController.h" -using std::cout; using std::endl; - -namespace OmGtk { - - -// LoadPatchEvent // - -void -LoadPatchEvent::execute() -{ - assert(m_patch_librarian != NULL); - m_patch_librarian->load_patch(m_patch_model, m_wait, m_merge); -} - - - -// SavePatchEvent // - -void -SavePatchEvent::execute() -{ - assert(m_patch_librarian != NULL); - m_patch_librarian->save_patch(m_patch_model, m_filename, m_recursive); -} - -/* -void -LoadSessionEvent::execute() -{ - std::ifstream is; - is.open(m_filename.c_str(), std::ios::in); - - if ( ! is.good()) { - cout << "[Loader] Unable to open session file " << m_filename << endl; - return; - } else { - cout << "[Loader] Loading session from " << m_filename << endl; - } - string s; - - is >> s; - if (s != "version") { - cout << "[Loader] Corrupt session file." << endl; - is.close(); - return; - } - - is >> s; - if (s != "1") { - cout << "[Loader] Unrecognised session file version." << endl; - is.close(); - return; - } - - while (!is.eof()) { - is >> s; - if (s == "") continue; - - if (s != "patch") { - //cerr << "[Loader] Corrupt session file, aborting session load." << endl; - break; - } else { - is >> s; - PatchModel* pm = new PatchModel("", 0); - if (s.substr(0, 1) != "/") - s = m_filename.substr(0, m_filename.find_last_of("/")+1) + s; - pm->filename(s); - pm->parent(NULL); - m_patch_librarian->load_patch(pm); - } - } - - is.close(); -} - - -void -SaveSessionEvent::execute() -{ - assert(m_filename != ""); - string dir = m_filename.substr(0, m_filename.find_last_of("/")); - - string patch_filename; - - std::ofstream os; - os.open(m_filename.c_str(), std::ios::out); - - if ( ! os.good()) { - cout << "[Loader] Unable to write to session file " << m_filename << endl; - return; - } else { - cout << "[Loader] Saving session to " << m_filename << endl; - } - - os << "version 1" << endl; - - for (map::iterator i = app->patches().begin(); - i != app->patches().end(); ++i) - { - if ((*i).second->model()->parent() == NULL) { - patch_filename = (*i).second->model()->filename(); - - // Make path relative if possible - if (patch_filename.length() > dir.length() && - patch_filename.substr(0, dir.length()) == dir) - patch_filename = patch_filename.substr(dir.length()+1); - - os << "patch " << patch_filename << endl; - } - } - - os.close(); -} -*/ - - -//////// Loader ////////// - - -Loader::Loader(PatchLibrarian* const patch_librarian) -: m_patch_librarian(patch_librarian), - m_event(NULL), - m_thread_exit_flag(false) -{ - assert(m_patch_librarian != NULL); - pthread_mutex_init(&m_mutex, NULL); - pthread_cond_init(&m_cond, NULL); -} - - -void -Loader::set_event(LoaderEvent* ev) -{ - assert(ev != NULL); - - pthread_mutex_lock(&m_mutex); - assert(m_event == NULL); - m_event = ev; - pthread_cond_signal(&m_cond); - pthread_mutex_unlock(&m_mutex); -} - - -void -Loader::launch() -{ - pthread_create(&m_thread, NULL, Loader::thread_function, this); -} - - -void* -Loader::thread_function(void* me) -{ - Loader* ct = static_cast(me); - return ct->m_thread_function(NULL); -} - - -void* -Loader::m_thread_function(void *) -{ - while ( ! m_thread_exit_flag) { - pthread_mutex_lock(&m_mutex); - pthread_cond_wait(&m_cond, &m_mutex); - - LoaderEvent* ev = m_event; - ev->execute(); - delete ev; - m_event = NULL; - - pthread_mutex_unlock(&m_mutex); - } - - pthread_exit(NULL); - return NULL; -} - - -void -Loader::load_patch(PatchModel* model, bool wait, bool merge) -{ - set_event(new LoadPatchEvent(m_patch_librarian, model, wait, merge)); -} - - -void -Loader::save_patch(PatchModel* model, const string& filename, bool recursive) -{ - cout << "[Loader] Saving patch " << filename << endl; - set_event(new SavePatchEvent(m_patch_librarian, model, filename, recursive)); -} - - -/* -void -Loader::load_session(const string& filename) -{ - set_event(new LoadSessionEvent(m_patch_librarian, filename)); -} - - -void -Loader::save_session(const string& filename) -{ - cout << "Saving session..." << endl; - set_event(new SaveSessionEvent(m_patch_librarian, filename)); -} -*/ - -} // namespace OmGtk diff --git a/src/progs/gtk/Loader.h b/src/progs/gtk/Loader.h deleted file mode 100644 index 46b5f3a8..00000000 --- a/src/progs/gtk/Loader.h +++ /dev/null @@ -1,154 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef LOADERTHREAD_H -#define LOADERTHREAD_H - -#include -#include -using std::string; - -namespace LibOmClient { - class PatchLibrarian; - class PatchModel; -} -using LibOmClient::PatchLibrarian; -using LibOmClient::PatchModel; - - -namespace OmGtk { - -/** Event to run in the Loader thread. - * - * \ingroup OmGtk - */ -class LoaderEvent -{ -public: - virtual void execute() = 0; - virtual ~LoaderEvent() {} -protected: - LoaderEvent() {} -}; - - -/** Loader thread patch loading event. - * - * \ingroup OmGtk - */ -class LoadPatchEvent : public LoaderEvent -{ -public: - LoadPatchEvent(PatchLibrarian* pl, PatchModel* model, bool wait, bool merge) - : m_patch_librarian(pl), m_patch_model(model), m_wait(wait), m_merge(merge) {} - virtual ~LoadPatchEvent() {} - void execute(); -private: - PatchLibrarian* m_patch_librarian; - PatchModel* m_patch_model; - bool m_wait; - bool m_merge; -}; - - -/** Loader thread patch loading event. - * - * \ingroup OmGtk - */ -class SavePatchEvent : public LoaderEvent -{ -public: - SavePatchEvent(PatchLibrarian* pl, PatchModel* pm, const string& filename, bool recursive) - : m_patch_librarian(pl), m_patch_model(pm), m_filename(filename), m_recursive(recursive) {} - virtual ~SavePatchEvent() {} - void execute(); -private: - PatchLibrarian* m_patch_librarian; - PatchModel* m_patch_model; - string m_filename; - bool m_recursive; -}; - -/* -class LoadSessionEvent : public LoaderEvent -{ -public: - LoadSessionEvent(PatchLibrarian* pl, const string& filename) - : m_patch_librarian(pl), m_filename(filename) {} - virtual ~LoadSessionEvent() {} - void execute(); -private: - PatchLibrarian* m_patch_librarian; - string m_filename; -}; - - -class SaveSessionEvent : public LoaderEvent -{ -public: - SaveSessionEvent(PatchLibrarian* pl, const string& filename) - : m_patch_librarian(pl), m_filename(filename) {} - virtual ~SaveSessionEvent() {} - void execute(); -private: - PatchLibrarian* m_patch_librarian; - string m_filename; -}; -*/ - -/** Thread for loading patch files. - * - * This is a seperate thread so it can send all the loading message without - * blocking everything else, so the app can respond to the incoming events - * caused as a result of the patch loading. - * - * \ingroup OmGtk - */ -class Loader -{ -public: - Loader(PatchLibrarian* const patch_librarian); - ~Loader() { m_thread_exit_flag = true; } - - void launch(); - void exit() { m_thread_exit_flag = true; } - - void load_patch(PatchModel* model, bool wait, bool merge); - void save_patch(PatchModel* model, const string& filename, bool recursive); - - //void load_session(const string& filename); - //void save_session(const string& filename); - - static void* thread_function(void* me); - -private: - void* m_thread_function(void*); - - void set_event(LoaderEvent* ev); - - PatchLibrarian* const m_patch_librarian; - LoaderEvent* m_event; - bool m_thread_exit_flag; - pthread_t m_thread; - pthread_mutex_t m_mutex; - pthread_cond_t m_cond; - -}; - - -} // namespace OmGtk - -#endif // LOADERRTHREAD_H diff --git a/src/progs/gtk/Makefile.am b/src/progs/gtk/Makefile.am deleted file mode 100644 index bb42d575..00000000 --- a/src/progs/gtk/Makefile.am +++ /dev/null @@ -1,95 +0,0 @@ -if BUILD_GTK_CLIENT - -EXTRA_DIST = om_gtk.gladep -MAINTAINERCLEANFILES = Makefile.in - -sharefilesdir = $(pkgdatadir) -dist_sharefiles_DATA = om_gtk.glade om-icon.png - -AM_CXXFLAGS = -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/client -DPKGDATADIR=\"$(pkgdatadir)\" @GTKMM_CFLAGS@ @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @LOSC_CFLAGS@ @LASH_CFLAGS@ @FLOWCANVAS_CFLAGS@ -DWITH_RTTI -om_gtk_LDADD = @GTKMM_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @LOSC_LIBS@ @LASH_LIBS@ @FLOWCANVAS_LIBS@ ../../libs/client/libomclient.la -om_gtk_DEPENDENCIES = ../../libs/client/libomclient.la - - -bin_PROGRAMS = om_gtk -om_gtk_SOURCES = \ - cmdline.h \ - cmdline.c \ - main.cpp \ - singletons.cpp \ - ConnectWindow.h \ - ConnectWindow.cpp \ - App.h \ - App.cpp \ - Configuration.h \ - Configuration.cpp \ - GladeFactory.h \ - GladeFactory.cpp \ - Controller.h \ - Controller.cpp \ - GtkObjectController.h \ - GtkObjectController.cpp \ - PatchController.h \ - PatchController.cpp \ - NodeController.h \ - NodeController.cpp \ - PortController.h \ - PortController.cpp \ - DSSIController.h \ - DSSIController.cpp \ - LoadPluginWindow.h \ - LoadPluginWindow.cpp \ - LoadPatchWindow.h \ - LoadPatchWindow.cpp \ - MessagesWindow.h \ - MessagesWindow.cpp \ - LoadSubpatchWindow.h \ - LoadSubpatchWindow.cpp \ - NodeControlWindow.h \ - NodeControlWindow.cpp \ - ControlPanel.h \ - ControlPanel.cpp \ - ControlGroups.h \ - ControlGroups.cpp \ - PatchView.h \ - PatchView.cpp \ - PatchWindow.h \ - PatchWindow.cpp \ - BreadCrumb.h \ - OmFlowCanvas.h \ - OmFlowCanvas.cpp \ - ../../common/types.h \ - ../../common/Path.h \ - OmModule.h \ - OmModule.cpp \ - OmPortModule.h \ - OmPortModule.cpp \ - DSSIModule.h \ - DSSIModule.cpp \ - SubpatchModule.h \ - SubpatchModule.cpp \ - OmPort.h \ - OmPort.cpp \ - OmPatchPort.h \ - OmPatchPort.cpp \ - NewSubpatchWindow.h \ - NewSubpatchWindow.cpp \ - ConfigWindow.h \ - ConfigWindow.cpp \ - PatchPropertiesWindow.h \ - PatchPropertiesWindow.cpp \ - Loader.h \ - Loader.cpp \ - RenameWindow.h \ - RenameWindow.cpp \ - NodePropertiesWindow.h \ - NodePropertiesWindow.cpp \ - PatchTreeWindow.h \ - PatchTreeWindow.cpp - -if WITH_LASH -om_gtk_SOURCES += LashController.h LashController.cpp -endif - - -endif # WITH_GTK_CLIENT diff --git a/src/progs/gtk/MessagesWindow.cpp b/src/progs/gtk/MessagesWindow.cpp deleted file mode 100644 index dfdc3750..00000000 --- a/src/progs/gtk/MessagesWindow.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "MessagesWindow.h" -#include - -namespace OmGtk { -using std::string; - - -MessagesWindow::MessagesWindow(BaseObjectType* cobject, const Glib::RefPtr& glade_xml) -: Gtk::Window(cobject) -{ - glade_xml->get_widget("messages_textview", m_textview); - glade_xml->get_widget("messages_clear_button", m_clear_button); - glade_xml->get_widget("messages_close_button", m_close_button); - - m_clear_button->signal_clicked().connect(sigc::mem_fun(this, &MessagesWindow::clear_clicked)); - m_close_button->signal_clicked().connect(sigc::mem_fun(this, &MessagesWindow::close_clicked)); -} - - -void -MessagesWindow::post(const string& msg) -{ - Glib::RefPtr text_buf = m_textview->get_buffer(); - text_buf->insert(text_buf->end(), msg); - text_buf->insert(text_buf->end(), "\n"); - - if (!m_clear_button->is_sensitive()) - m_clear_button->set_sensitive(true); -} - - -void -MessagesWindow::close_clicked() -{ - hide(); -} - - -void -MessagesWindow::clear_clicked() -{ - Glib::RefPtr text_buf = m_textview->get_buffer(); - text_buf->erase(text_buf->begin(), text_buf->end()); - m_clear_button->set_sensitive(false); -} - - -} // namespace OmGtk diff --git a/src/progs/gtk/MessagesWindow.h b/src/progs/gtk/MessagesWindow.h deleted file mode 100644 index 5f5b86e6..00000000 --- a/src/progs/gtk/MessagesWindow.h +++ /dev/null @@ -1,55 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef MESSAGESWINDOW_H -#define MESSAGESWINDOW_H - -#include -#include -#include -using std::string; - - -namespace OmGtk { - - -/** Messages Window. - * - * Loaded by libglade as a derived object. - * This is shown when errors occur (ie during patch loading). - * - * \ingroup OmGtk - */ -class MessagesWindow : public Gtk::Window -{ -public: - MessagesWindow(BaseObjectType* cobject, const Glib::RefPtr& refGlade); - - void post(const string& str); - -private: - void clear_clicked(); - void close_clicked(); - - Gtk::TextView* m_textview; - Gtk::Button* m_clear_button; - Gtk::Button* m_close_button; -}; - - -} // namespace OmGtk - -#endif // MESSAGESWINDOW_H diff --git a/src/progs/gtk/NewSubpatchWindow.cpp b/src/progs/gtk/NewSubpatchWindow.cpp deleted file mode 100644 index 6f64d9e8..00000000 --- a/src/progs/gtk/NewSubpatchWindow.cpp +++ /dev/null @@ -1,111 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "NewSubpatchWindow.h" -#include "PatchController.h" -#include "NodeModel.h" -#include "Controller.h" -#include "PatchModel.h" - -namespace OmGtk { - - -NewSubpatchWindow::NewSubpatchWindow(BaseObjectType* cobject, const Glib::RefPtr& xml) -: Gtk::Window(cobject), - m_new_module_x(0), - m_new_module_y(0) -{ - xml->get_widget("new_subpatch_name_entry", m_name_entry); - xml->get_widget("new_subpatch_message_label", m_message_label); - xml->get_widget("new_subpatch_polyphony_spinbutton", m_poly_spinbutton); - xml->get_widget("new_subpatch_ok_button", m_ok_button); - xml->get_widget("new_subpatch_cancel_button", m_cancel_button); - - m_name_entry->signal_changed().connect(sigc::mem_fun(this, &NewSubpatchWindow::name_changed)); - m_ok_button->signal_clicked().connect(sigc::mem_fun(this, &NewSubpatchWindow::ok_clicked)); - m_cancel_button->signal_clicked().connect(sigc::mem_fun(this, &NewSubpatchWindow::cancel_clicked)); - - m_ok_button->property_sensitive() = false; -} - - -/** Sets the patch controller for this window and initializes everything. - * - * This function MUST be called before using the window in any way! - */ -void -NewSubpatchWindow::patch_controller(PatchController* pc) -{ - m_patch_controller = pc; -} - - -/** Called every time the user types into the name input box. - * Used to display warning messages, and enable/disable the OK button. - */ -void -NewSubpatchWindow::name_changed() -{ - string name = m_name_entry->get_text(); - if (name.find("/") != string::npos) { - m_message_label->set_text("Name may not contain '/'"); - m_ok_button->property_sensitive() = false; - } else if (m_patch_controller->patch_model()->get_node(name)) { - m_message_label->set_text("An object already exists with that name."); - m_ok_button->property_sensitive() = false; - } else if (name.length() == 0) { - m_message_label->set_text(""); - m_ok_button->property_sensitive() = false; - } else { - m_message_label->set_text(""); - m_ok_button->property_sensitive() = true; - } -} - - -void -NewSubpatchWindow::ok_clicked() -{ - PatchModel* pm = new PatchModel( - m_patch_controller->model()->base_path() + m_name_entry->get_text(), - m_poly_spinbutton->get_value_as_int()); - - if (m_new_module_x == 0 && m_new_module_y == 0) { - m_patch_controller->get_new_module_location( - m_new_module_x, m_new_module_y); - } - - pm->set_parent(m_patch_controller->patch_model()); - pm->x(m_new_module_x); - pm->y(m_new_module_y); - char temp_buf[16]; - snprintf(temp_buf, 16, "%d", m_new_module_x); - pm->set_metadata("module-x", temp_buf); - snprintf(temp_buf, 16, "%d", m_new_module_y); - pm->set_metadata("module-y", temp_buf); - Controller::instance().create_patch_from_model(pm); - hide(); -} - - -void -NewSubpatchWindow::cancel_clicked() -{ - hide(); -} - - -} // namespace OmGtk diff --git a/src/progs/gtk/NewSubpatchWindow.h b/src/progs/gtk/NewSubpatchWindow.h deleted file mode 100644 index 8421ea08..00000000 --- a/src/progs/gtk/NewSubpatchWindow.h +++ /dev/null @@ -1,67 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#ifndef NEWSUBPATCHWINDOW_H -#define NEWSUBPATCHWINDOW_H - -#include "PluginModel.h" -#include -#include - - -namespace OmGtk { - -class PatchController; - - -/** 'New Subpatch' window. - * - * Loaded by glade as a derived object. - * - * \ingroup OmGtk - */ -class NewSubpatchWindow : public Gtk::Window -{ -public: - NewSubpatchWindow(BaseObjectType* cobject, const Glib::RefPtr& xml); - - void patch_controller(PatchController* pc); - - void set_next_module_location(int x, int y) - { m_new_module_x = x; m_new_module_y = y; } - -private: - void name_changed(); - void ok_clicked(); - void cancel_clicked(); - - PatchController* m_patch_controller; - - int m_new_module_x; - int m_new_module_y; - - Gtk::Entry* m_name_entry; - Gtk::Label* m_message_label; - Gtk::SpinButton* m_poly_spinbutton; - Gtk::Button* m_ok_button; - Gtk::Button* m_cancel_button; -}; - - -} // namespace OmGtk - -#endif // NEWSUBPATCHWINDOW_H diff --git a/src/progs/gtk/NodeControlWindow.cpp b/src/progs/gtk/NodeControlWindow.cpp deleted file mode 100644 index e40af67f..00000000 --- a/src/progs/gtk/NodeControlWindow.cpp +++ /dev/null @@ -1,127 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License alongCont - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "NodeControlWindow.h" -#include "GladeFactory.h" -#include "NodeController.h" -#include "ControlGroups.h" -#include "PatchWindow.h" -#include -#include -using std::cerr; using std::cout; using std::endl; - -namespace OmGtk { - - -/** Create a node control window and load a new ControlPanel for it. - */ -NodeControlWindow::NodeControlWindow(NodeController* node, size_t poly) -: m_node(node), - m_position_stored(false), - m_x(0), m_y(0) -{ - assert(m_node != NULL); - - property_resizable() = true; - set_border_width(5); - - set_title(m_node->path() + " Controls"); - - Glib::RefPtr xml = GladeFactory::new_glade_reference("warehouse_win"); - xml->get_widget_derived("control_panel_vbox", m_control_panel); - m_control_panel->reparent(*this); - - m_control_panel->init(m_node, poly); - - show_all_children(); - resize(); - - // FIXME: not working - set_icon_from_file(string(PKGDATADIR) + "/om-icon.png"); - - m_callback_enabled = true; -} - - -/** Create a node control window and with an existing ControlPanel. - */ -NodeControlWindow::NodeControlWindow(NodeController* node, ControlPanel* panel) -: m_node(node), - m_control_panel(panel) -{ - assert(m_node != NULL); - - property_resizable() = true; - set_border_width(5); - - set_title(m_node->path() + " Controls"); - - m_control_panel->reparent(*this); - - show_all_children(); - resize(); - - m_callback_enabled = true; -} - - -NodeControlWindow::~NodeControlWindow() -{ - delete m_control_panel; -} - - -void -NodeControlWindow::resize() -{ - pair controls_size = m_control_panel->ideal_size(); - /*int width = 400; - int height = controls_size.second - + ((m_node->polyphonic()) ? 4 : 40);*/ - int width = controls_size.first; - int height = controls_size.second; - - if (height > property_screen().get_value()->get_height() - 64) - height = property_screen().get_value()->get_height() - 64; - if (width > property_screen().get_value()->get_width() - 64) - width = property_screen().get_value()->get_width() - 64; - - //cerr << "Resizing to: " << width << " x " << height << endl; - - Gtk::Window::resize(width, height); -} - - -void -NodeControlWindow::on_show() -{ - if (m_position_stored) - move(m_x, m_y); - - Gtk::Window::on_show(); -} - - -void -NodeControlWindow::on_hide() -{ - m_position_stored = true; - get_position(m_x, m_y); - Gtk::Window::on_hide(); -} - - -} // namespace OmGtk diff --git a/src/progs/gtk/NodeControlWindow.h b/src/progs/gtk/NodeControlWindow.h deleted file mode 100644 index a9224de9..00000000 --- a/src/progs/gtk/NodeControlWindow.h +++ /dev/null @@ -1,69 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#ifndef NODECONTROLWINDOW_H -#define NODECONTROLWINDOW_H - -#include -#include -#include -#include -#include -#include "ControlPanel.h" -using std::string; using std::vector; - -using namespace LibOmClient; - -namespace OmGtk { - -class ControlGroup; -class NodeController; - - -/** Window with controls (sliders) for all control-rate ports on a Node. - * - * \ingroup OmGtk - */ -class NodeControlWindow : public Gtk::Window -{ -public: - NodeControlWindow(NodeController* node, size_t poly); - NodeControlWindow(NodeController* node, ControlPanel* panel); - virtual ~NodeControlWindow(); - - ControlPanel* control_panel() const { return m_control_panel; } - - void resize(); - -protected: - void on_show(); - void on_hide(); - -private: - NodeController* m_node; - ControlPanel* m_control_panel; - bool m_callback_enabled; - - bool m_position_stored; - int m_x; - int m_y; -}; - - -} // namespace OmGtk - -#endif // NODECONTROLWINDOW_H diff --git a/src/progs/gtk/NodeController.cpp b/src/progs/gtk/NodeController.cpp deleted file mode 100644 index b73da18b..00000000 --- a/src/progs/gtk/NodeController.cpp +++ /dev/null @@ -1,394 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "NodeController.h" -#include -#include -#include "OmModule.h" -#include "NodeModel.h" -#include "PortModel.h" -#include "PortController.h" -#include "GtkObjectController.h" -#include "NodeControlWindow.h" -#include "OmModule.h" -#include "PatchController.h" -#include "OmFlowCanvas.h" -#include "RenameWindow.h" -#include "GladeFactory.h" -#include "Controller.h" -#include "PatchWindow.h" -#include "PatchModel.h" -#include "NodePropertiesWindow.h" -#include "Store.h" -using std::cerr; using std::endl; - -namespace OmGtk { - - -NodeController::NodeController(CountedPtr model) -: GtkObjectController(model), - m_controls_menuitem(NULL), - m_module(NULL), - m_control_window(NULL), - m_properties_window(NULL), - m_bridge_port(NULL) -{ - assert(!model->controller()); - model->set_controller(this); - - // Create port controllers - for (PortModelList::const_iterator i = node_model()->ports().begin(); - i != node_model()->ports().end(); ++i) { - assert(!(*i)->controller()); - assert((*i)->parent()); - assert((*i)->parent().get() == node_model().get()); - // FIXME: leak - PortController* const pc = new PortController(*i); - assert((*i)->controller() == pc); // PortController() does this - } - - // Build menu - - Gtk::Menu::MenuList& items = m_menu.items(); - - Gtk::Menu_Helpers::MenuElem controls_elem - = Gtk::Menu_Helpers::MenuElem("Controls", - sigc::mem_fun(this, &NodeController::show_control_window)); - m_controls_menuitem = controls_elem.get_child(); - items.push_back(controls_elem); - items.push_back(Gtk::Menu_Helpers::MenuElem("Properties", - sigc::mem_fun(this, &NodeController::show_properties_window))); - items.push_back(Gtk::Menu_Helpers::SeparatorElem()); - items.push_back(Gtk::Menu_Helpers::MenuElem("Rename...", - sigc::mem_fun(this, &NodeController::show_rename_window))); - items.push_back(Gtk::Menu_Helpers::MenuElem("Clone", - sigc::mem_fun(this, &NodeController::on_menu_clone))); - items.push_back(Gtk::Menu_Helpers::MenuElem("Disconnect All", - sigc::mem_fun(this, &NodeController::on_menu_disconnect_all))); - items.push_back(Gtk::Menu_Helpers::MenuElem("Destroy", - sigc::mem_fun(this, &NodeController::on_menu_destroy))); - - m_controls_menuitem->property_sensitive() = false; - - if (node_model()->plugin() && node_model()->plugin()->type() == PluginModel::Internal - && node_model()->plugin()->plug_label() == "midi_control_in") { - Gtk::Menu::MenuList& items = m_menu.items(); - items.push_back(Gtk::Menu_Helpers::MenuElem("Learn", - sigc::mem_fun(this, &NodeController::on_menu_learn))); - } - - model->new_port_sig.connect(sigc::mem_fun(this, &NodeController::add_port)); -} - - -NodeController::~NodeController() -{ -} - - -void -NodeController::create_module(OmFlowCanvas* canvas) -{ - //cerr << "Creating node module " << m_model->path() << endl; - - // If this is a DSSI plugin, DSSIController should be doing this - /*assert(node_model()->plugin()); - assert(node_model()->plugin()->type() != PluginModel::DSSI); - assert(canvas != NULL); - assert(m_module == NULL);*/ - - assert(canvas); - assert(node_model()); - m_module = new OmModule(canvas, this); - - create_all_ports(); - - m_module->move_to(node_model()->x(), node_model()->y()); -} - - -void -NodeController::set_path(const Path& new_path) -{ - cerr << "FIXME: rename\n"; - /* - remove_from_store(); - - // Rename ports - for (list::const_iterator i = node_model()->ports().begin(); - i != node_model()->ports().end(); ++i) { - GtkObjectController* const pc = (GtkObjectController*)((*i)->controller()); - assert(pc != NULL); - pc->set_path(m_model->path().base_path() + pc->model()->name()); - } - - // Handle bridge port, if this node represents one - if (m_bridge_port != NULL) - m_bridge_port->set_path(new_path); - - if (m_module != NULL) - m_module->canvas()->rename_module(node_model()->path().name(), new_path.name()); - - GtkObjectController::set_path(new_path); - - add_to_store(); - */ -} - - -void -NodeController::destroy() -{ - PatchController* pc = ((PatchController*)m_model->parent()->controller()); - assert(pc != NULL); - - //remove_from_store(); - //pc->remove_node(m_model->path().name()); - cerr << "FIXME: remove node\n"; - - if (m_bridge_port != NULL) - m_bridge_port->destroy(); - m_bridge_port = NULL; - - //if (m_module != NULL) - // delete m_module; -} - - -void -NodeController::metadata_update(const string& key, const string& value) -{ - //cout << "[NodeController] Metadata update: " << m_model->path() << endl; - - if (m_module != NULL) { - if (key == "module-x") { - float x = atof(value.c_str()); - //if (x > 0 && x < m_canvas->width()) - m_module->move_to(x, m_module->property_y().get_value()); - } else if (key == "module-y") { - float y = atof(value.c_str()); - //if (y > 0 && y < m_canvas->height()) - m_module->move_to(m_module->property_x().get_value(), y); - } - } - - if (m_bridge_port != NULL) - m_bridge_port->metadata_update(key, value); - - GtkObjectController::metadata_update(key, value); -} - - -void -NodeController::add_port(CountedPtr pm) -{ - assert(pm->parent().get() == node_model().get()); - assert(pm->parent() == node_model()); - assert(node_model()->get_port(pm->name()) == pm); - - cout << "[NodeController] Adding port " << pm->path() << endl; - - // FIXME: leak - PortController* pc = new PortController(pm); - assert(pm->controller() == pc); - //pc->add_to_store(); - - if (m_module != NULL) { - pc->create_port(m_module); - m_module->resize(); - - // Enable "Controls" menu item on module - if (has_control_inputs()) - enable_controls_menuitem(); - } - - if (m_control_window != NULL) { - assert(m_control_window->control_panel() != NULL); - m_control_window->control_panel()->add_port(pc); - m_control_window->resize(); - } -} - - -void -NodeController::show_control_window() -{ - size_t poly = 1; - if (node_model()->polyphonic()) - poly = ((PatchModel*)node_model()->parent().get())->poly(); - - if (!m_control_window) - m_control_window = new NodeControlWindow(this, poly); - - if (m_control_window->control_panel()->num_controls() > 0) - m_control_window->present(); -} - - -void -NodeController::on_menu_destroy() -{ - Controller::instance().destroy(node_model()->path()); -} - - -void -NodeController::show_rename_window() -{ - assert(node_model()->parent()); - - // FIXME: will this be magically cleaned up? - RenameWindow* win = NULL; - Glib::RefPtr xml = GladeFactory::new_glade_reference("rename_win"); - xml->get_widget_derived("rename_win", win); - - PatchController* parent = ((PatchController*)node_model()->parent()->controller()); - assert(parent != NULL); - - if (parent->window() != NULL) - win->set_transient_for(*parent->window()); - - win->set_object(this); - win->show(); -} - -void -NodeController::on_menu_clone() -{ - cerr << "FIXME: clone broken\n"; - /* - assert(node_model()); - //assert(m_parent != NULL); - //assert(m_parent->model() != NULL); - - string clone_name = node_model()->name(); - int i = 2; // postfix number (ie oldname_2) - - // Check if name already has a number postfix - if (clone_name.find_last_of("_") != string::npos) { - string name_postfix = clone_name.substr(clone_name.find_last_of("_")+1); - clone_name = clone_name.substr(0, clone_name.find_last_of("_")); - if (sscanf(name_postfix.c_str(), "%d", &i)) - ++i; - } - - char clone_postfix[4]; - for ( ; i < 100; ++i) { - snprintf(clone_postfix, 4, "_%d", i); - if (node_model()->parent_patch()->get_node(clone_name + clone_postfix) == NULL) - break; - } - - clone_name = clone_name + clone_postfix; - - const string path = node_model()->parent_patch()->base_path() + clone_name; - NodeModel* nm = new NodeModel(node_model()->plugin(), path); - nm->polyphonic(node_model()->polyphonic()); - nm->x(node_model()->x() + 20); - nm->y(node_model()->y() + 20); - Controller::instance().create_node_from_model(nm); - */ -} - - -void -NodeController::on_menu_learn() -{ - Controller::instance().midi_learn(node_model()->path()); -} - -void -NodeController::on_menu_disconnect_all() -{ - Controller::instance().disconnect_all(node_model()->path()); -} - - -void -NodeController::show_properties_window() -{ - PatchController* parent = ((PatchController*)node_model()->parent()->controller()); - assert(parent != NULL); - - if (m_properties_window == NULL) { - Glib::RefPtr xml = GladeFactory::new_glade_reference("node_properties_win"); - xml->get_widget_derived("node_properties_win", m_properties_window); - } - assert(m_properties_window != NULL); - assert(parent != NULL); - m_properties_window->set_node(node_model()); - if (parent->window() != NULL) - m_properties_window->set_transient_for(*parent->window()); - m_properties_window->show(); -} - - -/** Create all (visual) ports and add them to module (and resize it). - */ -void -NodeController::create_all_ports() -{ - assert(m_module != NULL); - - PortController* pc = NULL; - for (PortModelList::const_iterator i = node_model()->ports().begin(); - i != node_model()->ports().end(); ++i) { - pc = dynamic_cast((*i)->controller()); - // FIXME: leak - if (pc == NULL) - pc = new PortController(*i); - pc->create_port(m_module); - } - - m_module->resize(); - - if (has_control_inputs()) - enable_controls_menuitem(); -} - - -bool -NodeController::has_control_inputs() -{ - for (PortModelList::const_iterator i = node_model()->ports().begin(); - i != node_model()->ports().end(); ++i) - if ((*i)->is_input() && (*i)->is_control()) - return true; - - return false; -} - - -void -NodeController::enable_controls_menuitem() -{ - m_controls_menuitem->property_sensitive() = true; -} - - -void -NodeController::disable_controls_menuitem() -{ - m_controls_menuitem->property_sensitive() = false; - - if (m_control_window != NULL) - m_control_window->hide(); -} - - - -} // namespace OmGtk - diff --git a/src/progs/gtk/NodeController.h b/src/progs/gtk/NodeController.h deleted file mode 100644 index 3168bc7b..00000000 --- a/src/progs/gtk/NodeController.h +++ /dev/null @@ -1,114 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef NODECONTROLLER_H -#define NODECONTROLLER_H - -#include -#include -#include "util/Path.h" -#include "GtkObjectController.h" -#include "NodeModel.h" - -using std::string; -using Om::Path; -using namespace LibOmClient; - -template class CountedPtr; - -namespace LibOmClient { - class MetadataModel; - class PortModel; -} - -namespace OmGtk { - -class Controller; -class OmModule; -class NodeControlWindow; -class NodePropertiesWindow; -class PortController; -class OmFlowCanvas; - -/** Controller for a Node. - * - * \ingroup OmGtk - */ -class NodeController : public GtkObjectController -{ -public: - NodeController(CountedPtr model); - virtual ~NodeController(); - - virtual void destroy(); - - virtual void metadata_update(const string& key, const string& value); - - virtual void create_module(OmFlowCanvas* canvas); - - void set_path(const Path& new_path); - - virtual void remove_port(const Path& path, bool resize_module) {} - - virtual void program_add(int bank, int program, const string& name) {} - virtual void program_remove(int bank, int program) {} - - OmModule* module() { return m_module; } - - void bridge_port(PortController* port) { m_bridge_port = port; } - PortController* as_port() { return m_bridge_port; } - - CountedPtr node_model() { return m_model; } - - NodeControlWindow* control_window() { return m_control_window; } - void control_window(NodeControlWindow* cw) { m_control_window = cw; } - - virtual void show_control_window(); - virtual void show_properties_window(); - void show_rename_window(); - - bool has_control_inputs(); - - virtual void show_menu(GdkEventButton* event) - { m_menu.popup(event->button, event->time); } - - virtual void enable_controls_menuitem(); - virtual void disable_controls_menuitem(); - -protected: - virtual void add_port(CountedPtr pm); - - void create_all_ports(); - - void on_menu_destroy(); - void on_menu_clone(); - void on_menu_learn(); - void on_menu_disconnect_all(); - - Gtk::Menu m_menu; - Glib::RefPtr m_controls_menuitem; - - OmModule* m_module; ///< View (module on a patch canvas) - - NodeControlWindow* m_control_window; - NodePropertiesWindow* m_properties_window; - PortController* m_bridge_port; -}; - - -} // namespace OmGtk - -#endif // NODECONTROLLER_H diff --git a/src/progs/gtk/NodePropertiesWindow.cpp b/src/progs/gtk/NodePropertiesWindow.cpp deleted file mode 100644 index abf5625c..00000000 --- a/src/progs/gtk/NodePropertiesWindow.cpp +++ /dev/null @@ -1,65 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "NodePropertiesWindow.h" -#include -#include -#include "NodeModel.h" -#include "PluginModel.h" - -namespace OmGtk { -using std::string; - - -NodePropertiesWindow::NodePropertiesWindow(BaseObjectType* cobject, const Glib::RefPtr& glade_xml) -: Gtk::Window(cobject) -, m_node_model(NULL) -{ - glade_xml->get_widget("node_properties_path_label", m_node_path_label); - glade_xml->get_widget("node_properties_polyphonic_checkbutton", m_node_polyphonic_toggle); - glade_xml->get_widget("node_properties_plugin_type_label", m_plugin_type_label); - glade_xml->get_widget("node_properties_plugin_uri_label", m_plugin_uri_label); - glade_xml->get_widget("node_properties_plugin_name_label", m_plugin_name_label); -} - - -/** Set the node this window is associated with. - * This function MUST be called before using this object in any way. - */ -void -NodePropertiesWindow::set_node(CountedPtr node_model) -{ - assert(node_model); - - m_node_model = node_model; - - set_title(node_model->path() + " Properties"); - - m_node_path_label->set_text(node_model->path()); - m_node_polyphonic_toggle->set_active(node_model->polyphonic()); - - CountedPtr pm = node_model->plugin(); - - if (pm) { - m_plugin_type_label->set_text(pm->type_string()); - m_plugin_uri_label->set_text(pm->uri()); - m_plugin_name_label->set_text(pm->name()); - } -} - - -} // namespace OmGtk - diff --git a/src/progs/gtk/NodePropertiesWindow.h b/src/progs/gtk/NodePropertiesWindow.h deleted file mode 100644 index 1710823b..00000000 --- a/src/progs/gtk/NodePropertiesWindow.h +++ /dev/null @@ -1,55 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef NODEPROPERTIESWINDOW_H -#define NODEPROPERTIESWINDOW_H - -#include -#include -#include "util/CountedPtr.h" - -namespace LibOmClient { class NodeModel; } -using namespace LibOmClient; - -namespace OmGtk { - - -/** 'New Patch' Window. - * - * Loaded by libglade as a derived object. - * - * \ingroup OmGtk - */ -class NodePropertiesWindow : public Gtk::Window -{ -public: - NodePropertiesWindow(BaseObjectType* cobject, const Glib::RefPtr& refGlade); - - void set_node(CountedPtr node_model); - -private: - - CountedPtr m_node_model; - Gtk::Label* m_node_path_label; - Gtk::CheckButton* m_node_polyphonic_toggle; - Gtk::Label* m_plugin_type_label; - Gtk::Label* m_plugin_uri_label; - Gtk::Label* m_plugin_name_label; -}; - -} // namespace OmGtk - -#endif // NODEPROPERTIESWINDOW_H diff --git a/src/progs/gtk/OmFlowCanvas.cpp b/src/progs/gtk/OmFlowCanvas.cpp deleted file mode 100644 index 4920dc59..00000000 --- a/src/progs/gtk/OmFlowCanvas.cpp +++ /dev/null @@ -1,263 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "OmFlowCanvas.h" -#include -#include -#include "Controller.h" -#include "PatchController.h" -#include "PatchModel.h" -#include "PatchWindow.h" -#include "LoadPluginWindow.h" -#include "LoadSubpatchWindow.h" -#include "NewSubpatchWindow.h" -#include "OmPort.h" -#include "NodeModel.h" -#include "OmModule.h" -#include "GladeFactory.h" - -namespace OmGtk { - - -OmFlowCanvas::OmFlowCanvas(PatchController* controller, int width, int height) -: FlowCanvas(width, height), - m_patch_controller(controller), - m_last_click_x(0), - m_last_click_y(0) -{ - assert(controller != NULL); - - /*Gtk::Menu::MenuList& items = m_menu.items(); - items.push_back(Gtk::Menu_Helpers::MenuElem("Load Plugin...", - sigc::mem_fun(this, &OmFlowCanvas::menu_load_plugin))); - items.push_back(Gtk::Menu_Helpers::MenuElem("Load Subpatch...", - sigc::mem_fun(this, &OmFlowCanvas::menu_load_subpatch))); - items.push_back(Gtk::Menu_Helpers::MenuElem("New Subpatch...", - sigc::mem_fun(this, &OmFlowCanvas::menu_create_subpatch)));*/ - - Glib::RefPtr xml = GladeFactory::new_glade_reference(); - xml->get_widget("canvas_menu", m_menu); - - xml->get_widget("canvas_menu_add_audio_input", m_menu_add_audio_input); - xml->get_widget("canvas_menu_add_audio_output", m_menu_add_audio_output); - xml->get_widget("canvas_menu_add_control_input", m_menu_add_control_input); - xml->get_widget("canvas_menu_add_control_output", m_menu_add_control_output); - xml->get_widget("canvas_menu_add_midi_input", m_menu_add_midi_input); - xml->get_widget("canvas_menu_add_midi_output", m_menu_add_midi_output); - xml->get_widget("canvas_menu_load_plugin", m_menu_load_plugin); - xml->get_widget("canvas_menu_load_patch", m_menu_load_patch); - xml->get_widget("canvas_menu_new_patch", m_menu_new_patch); - - // Add port menu items - m_menu_add_audio_input->signal_activate().connect( - sigc::bind(sigc::mem_fun(this, &OmFlowCanvas::menu_add_port), - "audio_input", "AUDIO", false)); - m_menu_add_audio_output->signal_activate().connect( - sigc::bind(sigc::mem_fun(this, &OmFlowCanvas::menu_add_port), - "audio_output", "AUDIO", true)); - m_menu_add_control_input->signal_activate().connect( - sigc::bind(sigc::mem_fun(this, &OmFlowCanvas::menu_add_port), - "control_input", "CONTROL", false)); - m_menu_add_control_output->signal_activate().connect( - sigc::bind(sigc::mem_fun(this, &OmFlowCanvas::menu_add_port), - "control_output", "CONTROL", true)); - m_menu_add_midi_input->signal_activate().connect( - sigc::bind(sigc::mem_fun(this, &OmFlowCanvas::menu_add_port), - "midi_input", "MIDI", false)); - m_menu_add_midi_output->signal_activate().connect( - sigc::bind(sigc::mem_fun(this, &OmFlowCanvas::menu_add_port), - "midi_output", "MIDI", true)); - - m_menu_load_plugin->signal_activate().connect(sigc::mem_fun(this, &OmFlowCanvas::menu_load_plugin)); - m_menu_load_patch->signal_activate().connect(sigc::mem_fun(this, &OmFlowCanvas::menu_load_patch)); - m_menu_new_patch->signal_activate().connect(sigc::mem_fun(this, &OmFlowCanvas::menu_new_patch)); -} - - -void -OmFlowCanvas::connect(const Port* src_port, const Port* dst_port) -{ - assert(src_port != NULL); - assert(dst_port != NULL); - - const OmPort* const src = static_cast(src_port); - const OmPort* const dst = static_cast(dst_port); - - // Midi binding/learn shortcut - if (src->model()->type() == PortModel::MIDI && - dst->model()->type() == PortModel::CONTROL) - { - // FIXME: leaks? - PluginModel* pm = new PluginModel(PluginModel::Internal, "", "midi_control_in", ""); - NodeModel* nm = new NodeModel(pm, m_patch_controller->model()->base_path() - + src->name() + "-" + dst->name()); - nm->x(dst->module()->property_x() - dst->module()->width() - 20); - nm->y(dst->module()->property_y()); - Controller::instance().create_node_from_model(nm); - Controller::instance().connect(src->model()->path(), nm->path() + "/MIDI In"); - Controller::instance().connect(nm->path() + "/Out (CR)", dst->model()->path()); - Controller::instance().midi_learn(nm->path()); - - // Set control node range to port's user range - - Controller::instance().set_port_value_queued(nm->path().base_path() + "Min", - atof(dst->model()->get_metadata("user-min").c_str())); - Controller::instance().set_port_value_queued(nm->path().base_path() + "Max", - atof(dst->model()->get_metadata("user-max").c_str())); - } else { - Controller::instance().connect(src->model()->path(), - dst->model()->path()); - } -} - - -void -OmFlowCanvas::disconnect(const Port* src_port, const Port* dst_port) -{ - assert(src_port != NULL); - assert(dst_port != NULL); - - Controller::instance().disconnect(((OmPort*)src_port)->model()->path(), - ((OmPort*)dst_port)->model()->path()); -} - - -bool -OmFlowCanvas::canvas_event(GdkEvent* event) -{ - assert(event != NULL); - - switch (event->type) { - - case GDK_BUTTON_PRESS: - if (event->button.button == 3) { - m_last_click_x = (int)event->button.x; - m_last_click_y = (int)event->button.y; - show_menu(event); - } - break; - - /*case GDK_KEY_PRESS: - if (event->key.keyval == GDK_Delete) - destroy_selected(); - break; - */ - - default: - break; - } - - return FlowCanvas::canvas_event(event); -} - - -void -OmFlowCanvas::destroy_selected() -{ - for (list::iterator m = m_selected_modules.begin(); m != m_selected_modules.end(); ++m) - Controller::instance().destroy(((OmModule*)(*m))->node()->path()); -} - - -void -OmFlowCanvas::menu_add_port(const string& name, const string& type, bool is_output) -{ - const Path& path = m_patch_controller->path().base_path() + name; - Controller::instance().create_port(path, type, is_output); - - char temp_buf[16]; - snprintf(temp_buf, 16, "%d", m_last_click_x); - Controller::instance().set_metadata(path, "module-x", temp_buf); - snprintf(temp_buf, 16, "%d", m_last_click_y); - Controller::instance().set_metadata(path, "module-y", temp_buf); -} -/* -void -OmFlowCanvas::menu_add_audio_input() -{ - string name = "audio_in"; - Controller::instance().create_port(m_patch_controller->path().base_path() + name, "AUDIO", false); -} - - -void -OmFlowCanvas::menu_add_audio_output() -{ - string name = "audio_out"; - Controller::instance().create_port(m_patch_controller->path().base_path() + name, "AUDIO", true); -} - - -void -OmFlowCanvas::menu_add_control_input() -{ - string name = "control_in"; - Controller::instance().create_port(m_patch_controller->path().base_path() + name, "CONTROL", false); -} - - -void -OmFlowCanvas::menu_add_control_output() -{ - string name = "control_out"; - Controller::instance().create_port(m_patch_controller->path().base_path() + name, "CONTROL", true); -} - - -void -OmFlowCanvas::menu_add_midi_input() -{ - string name = "midi_in"; - Controller::instance().create_port(m_patch_controller->path().base_path() + name, "MIDI", false); -} - - -void -OmFlowCanvas::menu_add_midi_output() -{ - string name = "midi_out"; - Controller::instance().create_port(m_patch_controller->path().base_path() + name, "MIDI", true); -} -*/ - -void -OmFlowCanvas::menu_load_plugin() -{ - m_patch_controller->window()->load_plugin_window()->set_next_module_location( - m_last_click_x, m_last_click_y); - m_patch_controller->window()->load_plugin_window()->show(); -} - - -void -OmFlowCanvas::menu_load_patch() -{ - m_patch_controller->window()->load_subpatch_window()->set_next_module_location( - m_last_click_x, m_last_click_y); - m_patch_controller->window()->load_subpatch_window()->show(); -} - - -void -OmFlowCanvas::menu_new_patch() -{ - m_patch_controller->window()->new_subpatch_window()->set_next_module_location( - m_last_click_x, m_last_click_y); - m_patch_controller->window()->new_subpatch_window()->show(); -} - - -} // namespace OmGtk diff --git a/src/progs/gtk/OmFlowCanvas.h b/src/progs/gtk/OmFlowCanvas.h deleted file mode 100644 index c645d43f..00000000 --- a/src/progs/gtk/OmFlowCanvas.h +++ /dev/null @@ -1,86 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef OMPATCHBAYAREA_H -#define OMPATCHBAYAREA_H - -#include -#include - - -using std::string; -using namespace LibFlowCanvas; - -using LibFlowCanvas::Port; - -namespace OmGtk { - -class OmModule; -class PatchController; - -/** Patch canvas widget. - * - * \ingroup OmGtk - */ -class OmFlowCanvas : public LibFlowCanvas::FlowCanvas -{ -public: - OmFlowCanvas(PatchController* controller, int width, int height); - - OmModule* find_module(const string& name) - { return (OmModule*)FlowCanvas::find_module(name); } - - void connect(const Port* src_port, const Port* dst_port); - void disconnect(const Port* src_port, const Port* dst_port); - - bool canvas_event(GdkEvent* event); - void destroy_selected(); - - void show_menu(GdkEvent* event) - { m_menu->popup(event->button.button, event->button.time); } - -private: - void menu_add_port(const string& name, const string& type, bool is_output); - /*void menu_add_audio_input(); - void menu_add_audio_output(); - void menu_add_control_input(); - void menu_add_control_output(); - void menu_add_midi_input(); - void menu_add_midi_output();*/ - void menu_load_plugin(); - void menu_new_patch(); - void menu_load_patch(); - - PatchController* m_patch_controller; - int m_last_click_x; - int m_last_click_y; - - Gtk::Menu* m_menu; - Gtk::MenuItem* m_menu_add_audio_input; - Gtk::MenuItem* m_menu_add_audio_output; - Gtk::MenuItem* m_menu_add_control_input; - Gtk::MenuItem* m_menu_add_control_output; - Gtk::MenuItem* m_menu_add_midi_input; - Gtk::MenuItem* m_menu_add_midi_output; - Gtk::MenuItem* m_menu_load_plugin; - Gtk::MenuItem* m_menu_load_patch; - Gtk::MenuItem* m_menu_new_patch; -}; - - -} // namespace OmGtk - -#endif // OMPATCHBAYAREA_H diff --git a/src/progs/gtk/OmModule.cpp b/src/progs/gtk/OmModule.cpp deleted file mode 100644 index 3a31b7f3..00000000 --- a/src/progs/gtk/OmModule.cpp +++ /dev/null @@ -1,85 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "OmModule.h" -#include -#include "Controller.h" -#include "OmFlowCanvas.h" -#include "PatchModel.h" -#include "NodeModel.h" -#include "OmPort.h" -#include "GladeFactory.h" -#include "RenameWindow.h" -#include "PatchController.h" -#include "PatchWindow.h" - -namespace OmGtk { - - -OmModule::OmModule(OmFlowCanvas* canvas, NodeController* node) -: LibFlowCanvas::Module(canvas, node->node_model()->name(), - node->node_model()->x(), node->node_model()->y()), - m_node(node) -{ - assert(m_node != NULL); - - /*if (node_model()->polyphonic() && node_model()->parent() != NULL - && node_model()->parent_patch()->poly() > 1) { - border_width(2.0); - }*/ - if (node->node_model()->polyphonic()) { - border_width(2.0); - } -} - - -void -OmModule::show_control_window() -{ - node()->show_control_window(); -} - - -void -OmModule::store_location() -{ - if (m_node->node_model()->x() == 0 || m_node->node_model()->y() == 0) - return; - - char temp_buf[16]; - - m_node->node_model()->x(property_x()); - snprintf(temp_buf, 16, "%f", m_node->node_model()->x()); - m_node->node_model()->set_metadata("module-x", temp_buf); // just in case? - Controller::instance().set_metadata(m_node->node_model()->path(), "module-x", temp_buf); - - m_node->node_model()->y(property_y()); - snprintf(temp_buf, 16, "%f", m_node->node_model()->y()); - m_node->node_model()->set_metadata("module-y", temp_buf); // just in case? - Controller::instance().set_metadata(m_node->node_model()->path(), "module-y", temp_buf); -} - - -void -OmModule::move_to(double x, double y) -{ - Module::move_to(x, y); - m_node->node_model()->x(x); - m_node->node_model()->y(y); - //store_location(); -} - -} // namespace OmGtk diff --git a/src/progs/gtk/OmModule.h b/src/progs/gtk/OmModule.h deleted file mode 100644 index ebb36fe6..00000000 --- a/src/progs/gtk/OmModule.h +++ /dev/null @@ -1,77 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#ifndef OMMODULE_H -#define OMMODULE_H - -#include -#include -#include -#include "NodeController.h" -using std::string; - -namespace LibOmClient { -class PortModel; -class NodeModel; -class ControlModel; -} -using namespace LibOmClient; - -namespace OmGtk { - -class PatchController; -class OmFlowCanvas; -class OmPort; - - -/** A module in a patch. - * - * This base class is extended for various types of modules - SubpatchModule, - * DSSIModule, etc. - * - * \ingroup OmGtk - */ -class OmModule : public LibFlowCanvas::Module -{ -public: - OmModule(OmFlowCanvas* canvas, NodeController* node); - virtual ~OmModule() {} - - virtual OmPort* port(const string& port_name) { - return (OmPort*)Module::port(port_name); - } - - virtual void store_location(); - void move_to(double x, double y); - - void on_right_click(GdkEventButton* event) { m_node->show_menu(event); } - - void show_control_window(); - - NodeController* node() const { return m_node; } - -protected: - virtual void on_double_click(GdkEventButton* ev) { show_control_window(); } - virtual void on_middle_click(GdkEventButton* ev) { show_control_window(); } - - NodeController* m_node; -}; - - -} // namespace OmGtk - -#endif // OMMODULE_H diff --git a/src/progs/gtk/OmPatchPort.cpp b/src/progs/gtk/OmPatchPort.cpp deleted file mode 100644 index 1e26b658..00000000 --- a/src/progs/gtk/OmPatchPort.cpp +++ /dev/null @@ -1,57 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "OmPatchPort.h" -#include -#include -#include "PortModel.h" -#include "OmPortModule.h" -#include "ControlModel.h" -#include "Configuration.h" -#include "App.h" -using std::cerr; using std::endl; - -using namespace LibOmClient; - -namespace OmGtk { - -OmPatchPort::OmPatchPort(OmPortModule* module, CountedPtr pm) -: Port(module, pm->name(), !pm->is_input(), App::instance().configuration()->get_port_color(pm.get())), - m_port_model(pm) -{ - assert(module); - assert(m_port_model); -} - -#if 0 -void -OmPatchPort::set_name(const string& n) -{ - cerr << "********** OmPatchPort::set_name broken **********************" << endl; - - /* FIXME: move to PortController - string new_path = OmPath::parent(m_port_model->path()) +"/"+ n; - - for (list::iterator i = m_control_panels.begin(); i != m_control_panels.end(); ++i) - (*i)->rename_port(m_port_model->path(), new_path); - - Port::set_name(n); - m_port_model->path(new_path); - */ -} -#endif - -} // namespace OmGtk diff --git a/src/progs/gtk/OmPatchPort.h b/src/progs/gtk/OmPatchPort.h deleted file mode 100644 index 1a379df3..00000000 --- a/src/progs/gtk/OmPatchPort.h +++ /dev/null @@ -1,60 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef OMPATCHPORT_H -#define OMPATCHPORT_H - -#include -#include -#include -#include "util/CountedPtr.h" - -namespace LibOmClient { class PortModel; } -using namespace LibOmClient; -using namespace LibFlowCanvas; -using std::string; using std::list; - -namespace OmGtk { - -class FlowCanvas; -class PatchController; -class PatchWindow; -class OmPortModule; - - -/** A Port (on a pseudo node) in a patch canvas, to represent a port on that patch. - * - * \ingroup OmGtk - */ -class OmPatchPort : public LibFlowCanvas::Port -{ -public: - OmPatchPort(OmPortModule* module, CountedPtr pm); - - virtual ~OmPatchPort() {} - - //void set_name(const string& n); - - CountedPtr model() const { return m_port_model; } - -private: - CountedPtr m_port_model; -}; - - -} // namespace OmGtk - -#endif // OMPATCHPORT_H diff --git a/src/progs/gtk/OmPort.cpp b/src/progs/gtk/OmPort.cpp deleted file mode 100644 index d51adc77..00000000 --- a/src/progs/gtk/OmPort.cpp +++ /dev/null @@ -1,57 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "OmPort.h" -#include -#include -#include "PortModel.h" -#include "OmModule.h" -#include "ControlModel.h" -#include "Configuration.h" -#include "App.h" -using std::cerr; using std::endl; - -using namespace LibOmClient; - -namespace OmGtk { - -OmPort::OmPort(OmModule* module, CountedPtr pm) -: Port(module, pm->name(), pm->is_input(), App::instance().configuration()->get_port_color(pm.get())), - m_port_model(pm) -{ - assert(module); - assert(m_port_model); -} - -#if 0 -void -OmPort::set_name(const string& n) -{ - cerr << "********** OmPort::set_name broken **********************" << endl; - - /* FIXME: move to PortController - string new_path = OmPath::parent(m_port_model->path()) +"/"+ n; - - for (list::iterator i = m_control_panels.begin(); i != m_control_panels.end(); ++i) - (*i)->rename_port(m_port_model->path(), new_path); - - Port::set_name(n); - m_port_model->path(new_path); - */ -} -#endif - -} // namespace OmGtk diff --git a/src/progs/gtk/OmPort.h b/src/progs/gtk/OmPort.h deleted file mode 100644 index a4bd653e..00000000 --- a/src/progs/gtk/OmPort.h +++ /dev/null @@ -1,60 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef OMPORT_H -#define OMPORT_H - -#include -#include -#include -#include "util/CountedPtr.h" - -namespace LibOmClient { class PortModel; } -using namespace LibOmClient; -using namespace LibFlowCanvas; -using std::string; using std::list; - -namespace OmGtk { - -class FlowCanvas; -class PatchController; -class PatchWindow; -class OmModule; - - -/** A Port on an OmModule. - * - * \ingroup OmGtk - */ -class OmPort : public LibFlowCanvas::Port -{ -public: - OmPort(OmModule* module, CountedPtr pm); - - virtual ~OmPort() {} - - //void set_name(const string& n); - - CountedPtr model() const { return m_port_model; } - -private: - CountedPtr m_port_model; -}; - - -} // namespace OmGtk - -#endif // OMPORT_H diff --git a/src/progs/gtk/OmPortModule.cpp b/src/progs/gtk/OmPortModule.cpp deleted file mode 100644 index 4fab5048..00000000 --- a/src/progs/gtk/OmPortModule.cpp +++ /dev/null @@ -1,71 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "OmPortModule.h" -#include -#include "Controller.h" -#include "OmFlowCanvas.h" -#include "PatchModel.h" -#include "NodeModel.h" -#include "OmPort.h" -#include "GladeFactory.h" -#include "RenameWindow.h" -#include "PatchController.h" -#include "PatchWindow.h" - -namespace OmGtk { - - -OmPortModule::OmPortModule(OmFlowCanvas* canvas, PortController* port, double x, double y) -: LibFlowCanvas::Module(canvas, "", x, y), - m_port(port) -{ - assert(m_port != NULL); - - /*if (port_model()->polyphonic() && port_model()->parent() != NULL - && port_model()->parent_patch()->poly() > 1) { - border_width(2.0); - }*/ -} - - -void -OmPortModule::store_location() -{ - char temp_buf[16]; - - //m_port->port_model()->x(property_x()); - snprintf(temp_buf, 16, "%f", property_x().get_value()); - //m_port->port_model()->set_metadata("module-x", temp_buf); // just in case? - Controller::instance().set_metadata(m_port->port_model()->path(), "module-x", temp_buf); - - //m_port->port_model()->y(property_y()); - snprintf(temp_buf, 16, "%f", property_y().get_value()); - //m_port->port_model()->set_metadata("module-y", temp_buf); // just in case? - Controller::instance().set_metadata(m_port->port_model()->path(), "module-y", temp_buf); -} - - -void -OmPortModule::move_to(double x, double y) -{ - Module::move_to(x, y); - //m_port->port_model()->x(x); - //m_port->port_model()->y(y); - //store_location(); -} - -} // namespace OmGtk diff --git a/src/progs/gtk/OmPortModule.h b/src/progs/gtk/OmPortModule.h deleted file mode 100644 index d07026a3..00000000 --- a/src/progs/gtk/OmPortModule.h +++ /dev/null @@ -1,76 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#ifndef OMPORTMODULE_H -#define OMPORTMODULE_H - -#include -#include -#include -#include "PortController.h" -using std::string; - -namespace LibOmClient { -class PortModel; -class NodeModel; -class ControlModel; -} -using namespace LibOmClient; - -namespace OmGtk { - -class PatchController; -class PortController; -class OmFlowCanvas; -class OmPort; - - -/** A module in a patch. - * - * This base class is extended for various types of modules - SubpatchModule, - * DSSIModule, etc. - * - * \ingroup OmGtk - */ -class OmPortModule : public LibFlowCanvas::Module -{ -public: - OmPortModule(OmFlowCanvas* canvas, PortController* port, double x, double y); - virtual ~OmPortModule() {} - - //virtual OmPort* port(const string& port_name) { - // return (OmPort*)Module::port(port_name); - //} - - virtual void store_location(); - void move_to(double x, double y); - - //void on_right_click(GdkEventButton* event) { m_port->show_menu(event); } - - PortController* port() const { return m_port; } - -protected: - //virtual void on_double_click(GdkEventButton* ev) { show_control_window(); } - //virtual void on_middle_click(GdkEventButton* ev) { show_control_window(); } - - PortController* m_port; -}; - - -} // namespace OmGtk - -#endif // OMPORTMODULE_H diff --git a/src/progs/gtk/PatchController.cpp b/src/progs/gtk/PatchController.cpp deleted file mode 100644 index ae604bae..00000000 --- a/src/progs/gtk/PatchController.cpp +++ /dev/null @@ -1,760 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "config.h" -#include "PatchController.h" -#include -#include -#include "GladeFactory.h" -#include "Configuration.h" -#include "util/Path.h" -#include "ControlPanel.h" -#include "ConnectionModel.h" -#include "OmFlowCanvas.h" -#include "PatchView.h" -#include "flowcanvas/Module.h" -#include "PluginModel.h" -#include "Controller.h" -#include "SubpatchModule.h" -#include "DSSIModule.h" -#include "PatchWindow.h" -#include "NodeModel.h" -#include "OmModule.h" -#include "OmPortModule.h" -#include "OmPort.h" -#include "ControlModel.h" -#include "NodeControlWindow.h" -#include "NodeController.h" -#include "PortController.h" -#include "App.h" -#include "PatchTreeWindow.h" -#include "PatchPropertiesWindow.h" -#include "DSSIController.h" -#include "PatchModel.h" -#include "Store.h" - -using std::cerr; using std::cout; using std::endl; -using Om::Path; -using namespace LibOmClient; - -namespace OmGtk { - - -PatchController::PatchController(CountedPtr model) -: NodeController(model), - m_properties_window(NULL), - m_window(NULL), - m_patch_view(NULL), - m_patch_model(model), - m_module_x(0), - m_module_y(0) -{ - assert(model->path().length() > 0); - assert(model->controller() == this); // NodeController() does this - assert(m_patch_model == model); - -/* FIXME if (model->path() != "/") { - PatchController* parent = Store::instance().patch(model->path().parent()); - if (parent != NULL) - parent->add_subpatch(this); - else - cerr << "[PatchController] " << path() << " ERROR: Parent not found." << endl; - }*/ - - //model->new_port_sig.connect(sigc::mem_fun(this, &PatchController::add_port)); - model->new_node_sig.connect(sigc::mem_fun(this, &PatchController::add_node)); - model->removed_node_sig.connect(sigc::mem_fun(this, &PatchController::remove_node)); - model->new_connection_sig.connect(sigc::mem_fun(this, &PatchController::connection)); - model->removed_connection_sig.connect(sigc::mem_fun(this, &PatchController::disconnection)); -} - - -PatchController::~PatchController() -{ - if (m_patch_view != NULL) { - claim_patch_view(); - m_patch_view->hide(); - delete m_patch_view; - m_patch_view = NULL; - } - - if (m_control_window != NULL) { - m_control_window->hide(); - delete m_control_window; - m_control_window = NULL; - } - - if (m_window != NULL) { - m_window->hide(); - delete m_window; - m_window = NULL; - } -} - -/* -void -PatchController::add_to_store() -{ - Store::instance().add_object(this); -} - - -void -PatchController::remove_from_store() -{ - Store::instance().remove_object(this); -} -*/ - -void -PatchController::clear() -{ - // Destroy model - // Destroying nodes removes models from patch model, which invalidates any - // iterator to nodes, so avoid the iterator problem by doing it this way: - const NodeModelMap& nodes = patch_model()->nodes(); - size_t remaining = nodes.size(); - - while (remaining > 0) { - NodeController* const nc = (NodeController*)(*nodes.begin()).second->controller(); - assert(nc != NULL); - nc->destroy(); - assert(nodes.size() == remaining - 1); - --remaining; - } - assert(nodes.empty()); - - patch_model()->clear(); - - if (m_patch_view != NULL) { - assert(m_patch_view->canvas() != NULL); - m_patch_view->canvas()->destroy(); - } -} - - -void -PatchController::destroy() -{ - // Destroying nodes removes models from patch model, which invalidates any - // iterator to nodes, so avoid the iterator problem by doing it this way: - const NodeModelMap& nodes = patch_model()->nodes(); - size_t remaining = nodes.size(); - - while (remaining > 0) { - NodeController* const nc = (NodeController*) - (*nodes.begin()).second->controller(); - assert(nc != NULL); - nc->destroy(); - assert(nodes.size() == remaining - 1); - --remaining; - } - assert(nodes.empty()); - - //App::instance().remove_patch(this); - App::instance().patch_tree()->remove_patch(path()); - - // Delete all children models - //patch_model()->clear(); - - // Remove self from object store - //Store::instance().remove_object(this); - - // Delete self from parent (this will delete model) - /*if (patch_model()->parent() != NULL) { - PatchController* const parent = (PatchController*)patch_model()->parent()->controller(); - assert(parent != NULL); - parent->remove_node(name()); - } else { - //delete m_model; - }*/ -} - - -void -PatchController::metadata_update(const string& key, const string& value) -{ - NodeController::metadata_update(key, value); - - if (key == "filename") - patch_model()->filename(value); -} - - -void -PatchController::set_path(const Path& new_path) -{ - assert(m_model); - Path old_path = path(); - - // Rename nodes - for (NodeModelMap::const_iterator i = patch_model()->nodes().begin(); - i != patch_model()->nodes().end(); ++i) { - const NodeModel* const nm = (*i).second.get(); - assert(nm != NULL); - NodeController* const nc = ((NodeController*)nm->controller()); - assert(nc != NULL); - nc->set_path(new_path.base_path() + nc->node_model()->name()); - } - -#ifdef DEBUG - // Be sure ports were renamed by their bridge nodes - for (PortModelList::const_iterator i = node_model()->ports().begin(); - i != node_model()->ports().end(); ++i) { - GtkObjectController* const pc = (GtkObjectController*)((*i)->controller()); - assert(pc != NULL); - assert(pc->path().parent()== new_path); - } -#endif - - App::instance().patch_tree()->patch_renamed(old_path, new_path); - - if (m_window != NULL) - m_window->patch_renamed(new_path); - - if (m_control_window != NULL) - m_control_window->set_title(new_path + " Controls"); - - if (m_module != NULL) { - assert(m_module->canvas() != NULL); - m_module->canvas()->rename_module(old_path.name(), new_path.name()); - assert(m_module->name() == new_path.name()); - } - - PatchController* parent = dynamic_cast( - patch_model()->parent()->controller()); - - if (parent != NULL && parent->window() != NULL) - parent->window()->node_renamed(old_path, new_path); - - //remove_from_store(); - GtkObjectController::set_path(new_path); - //add_to_store(); - - if (old_path.name() != new_path.name()) - parent->patch_model()->rename_node(old_path, new_path); -} - - -void -PatchController::enable() -{ - if (m_patch_view != NULL) - m_patch_view->enabled(true); - - patch_model()->enabled(true); - - App::instance().patch_tree()->patch_enabled(m_model->path()); -} - - -void -PatchController::disable() -{ - if (m_patch_view != NULL) - m_patch_view->enabled(false); - - patch_model()->enabled(false); - - App::instance().patch_tree()->patch_disabled(m_model->path()); -} - - -void -PatchController::create_module(OmFlowCanvas* canvas) -{ - //cerr << "Creating patch module " << m_model->path() << endl; - - assert(canvas != NULL); - assert(m_module == NULL); - assert(!m_patch_view || canvas != m_patch_view->canvas()); - - m_module = new SubpatchModule(canvas, this); - - - m_menu.remove(m_menu.items()[4]); - - // Add navigation menu items - Gtk::Menu::MenuList& items = m_menu.items(); - items.push_front(Gtk::Menu_Helpers::SeparatorElem()); - items.push_front(Gtk::Menu_Helpers::MenuElem("Browse to Patch", - sigc::mem_fun((SubpatchModule*)m_module, &SubpatchModule::browse_to_patch))); - items.push_front(Gtk::Menu_Helpers::MenuElem("Open Patch in New Window", - sigc::mem_fun(this, &PatchController::show_patch_window))); - - create_all_ports(); - - m_module->move_to(node_model()->x(), node_model()->y()); -} - - -void -PatchController::create_view() -{ - assert(m_patch_view == NULL); - - Glib::RefPtr xml = GladeFactory::new_glade_reference(); - - xml->get_widget_derived("patch_view_vbox", m_patch_view); - assert(m_patch_view != NULL); - m_patch_view->patch_controller(this); - assert(m_patch_view->canvas() != NULL); - - // Create modules for nodes - for (NodeModelMap::const_iterator i = patch_model()->nodes().begin(); - i != patch_model()->nodes().end(); ++i) { - - NodeModel* const nm = (*i).second.get(); - - string val = nm->get_metadata("module-x"); - if (val != "") - nm->x(atof(val.c_str())); - val = nm->get_metadata("module-y"); - if (val != "") - nm->y(atof(val.c_str())); - - /* Set sane default coordinates if not set already yet */ - if (nm->x() == 0.0f && nm->y() == 0.0f) { - int x, y; - get_new_module_location(x, y); - nm->x(x); - nm->y(y); - } - - NodeController* nc = ((NodeController*)nm->controller()); - if (!nc) - nc = create_controller_for_node(nm); - - assert(nc); - assert(nm->controller() == nc); - - if (nc->module() == NULL); - nc->create_module(m_patch_view->canvas()); - assert(nc->module() != NULL); - m_patch_view->canvas()->add_module(nc->module()); - } - - // Create pseudo modules for ports (ports on this canvas, not on our module) - for (PortModelList::const_iterator i = patch_model()->ports().begin(); - i != patch_model()->ports().end(); ++i) { - PortController* const pc = dynamic_cast((*i)->controller()); - assert(pc); - if (pc->module() == NULL) - pc->create_module(m_patch_view->canvas(), 1600, 1200); - assert(pc->module() != NULL); - m_patch_view->canvas()->add_module(pc->module()); - pc->module()->resize(); - } - - - // Create connections - for (list >::const_iterator i = patch_model()->connections().begin(); - i != patch_model()->connections().end(); ++i) { - create_connection(*i); - } - - // Set run checkbox - m_patch_view->enabled(patch_model()->enabled()); -} - - -void -PatchController::show_properties_window() -{ - if (!m_properties_window) { - Glib::RefPtr glade_xml = GladeFactory::new_glade_reference(); - glade_xml->get_widget_derived("patch_properties_win", m_properties_window); - m_properties_window->patch_model(patch_model()); - } - - m_properties_window->show(); - -} - - -/** Create a connection in the view (canvas). - */ -void -PatchController::create_connection(CountedPtr cm) -{ - // Deal with messy anonymous nodes for this patch's own ports... - const Path& src_parent_path = cm->src_port_path().parent(); - const Path& dst_parent_path = cm->dst_port_path().parent(); - - const string& src_parent_name = - (src_parent_path == path()) ? "" : src_parent_path.name(); - const string& dst_parent_name = - (dst_parent_path == path()) ? "" : dst_parent_path.name(); - - m_patch_view->canvas()->add_connection( - src_parent_name, - cm->src_port_path().name(), - dst_parent_name, - cm->dst_port_path().name()); - - // Disable control slider from destination node control window - - cerr << "FIXME: create_connection\n"; - /*PortController* p = Store::instance().port(cm->dst_port_path()); - assert(p != NULL); - - if (p->control_panel() != NULL) - p->control_panel()->disable_port(p->path());*/ - - // FIXME: don't use canvas as a model (search object store) - /*OmModule* m = (OmModule*)m_patch_view->canvas()->find_module( - cm->dst_port_path().parent().name()); - - if (m != NULL) { - OmPort* p = m->port(cm->dst_port_path().name()); - if (p != NULL && p->connections().size() == 1) { - p->model()->connected(true); - assert(m->node_model()->controller() != NULL); - NodeControlWindow* cw = (((NodeController*) - m->node_model()->controller())->control_window()); - if (cw != NULL) - cw->control_panel()->disable_port(cm->dst_port_path()); - } - }*/ -} - - -NodeController* -PatchController::create_controller_for_node(CountedPtr node) -{ - assert(!node->controller()); - NodeController* nc = NULL; - - CountedPtr patch(node); - if (patch) { - assert(patch == node); - assert(patch->parent() == m_patch_model); - nc = new PatchController(patch); - } else { - assert(node->plugin()); - if (node->plugin()->type() == PluginModel::DSSI) - nc = new DSSIController(node); - else - nc = new NodeController(node); - } - - assert(node->controller() == nc); - return nc; -} - - -/** Add a child node to this patch. - * - * This is for plugin nodes and patches, and is responsible for creating the - * GtkObjectController for @a object (and through that the View if necessary) - */ -void -PatchController::add_node(CountedPtr object) -{ - assert(object); - assert(object->parent() == m_patch_model); - assert(patch_model()->get_node(object->name())); - - /*if (patch_model()->get_node(nm->name()) != NULL) { - cerr << "Ignoring existing\n"; - // Node already exists, ignore - //delete nm; - } else {*/ - - - CountedPtr node(object); - assert(node == object); - if (node) { - assert(node->parent() == m_patch_model); - - NodeController* nc = create_controller_for_node(node); - assert(nc); - assert(node->controller() == nc); - - if (m_patch_view != NULL) { - int x, y; - get_new_module_location(x, y); - node->x(x); - node->y(y); - - // Set zoom to 1.0 so module isn't messed up (Death to GnomeCanvas) - float old_zoom = m_patch_view->canvas()->zoom(); - if (old_zoom != 1.0) - m_patch_view->canvas()->zoom(1.0); - - if (nc->module() == NULL) - nc->create_module(m_patch_view->canvas()); - assert(nc->module() != NULL); - m_patch_view->canvas()->add_module(nc->module()); - nc->module()->resize(); - - // Reset zoom - if (old_zoom != 1.0) { - m_patch_view->canvas()->zoom(old_zoom); - nc->module()->zoom(old_zoom); - } - } - - } -} - - -/** Removes a node from this patch. - */ -void -PatchController::remove_node(const string& name) -{ - assert(name.find("/") == string::npos); - assert(!m_patch_model->get_node(name)); - - // Update breadcrumbs if necessary - if (m_window != NULL) - m_window->node_removed(name); - - if (m_patch_view != NULL) { - assert(m_patch_view->canvas() != NULL); - m_patch_view->canvas()->remove_module(name); - } -} - - -/** Add a port to this patch. - * - * Will add a port to the subpatch module and the control window, if they - * exist. - */ -void -PatchController::add_port(CountedPtr pm) -{ - assert(pm); - assert(pm->parent() == m_patch_model); - assert(patch_model()->get_port(pm->name())); - - cerr << "ADDING PORT " << pm->name() << "TO PATCH: " << patch_model()->path() << endl; - - //cerr << "[PatchController] Adding port " << pm->path() << endl; - - /*if (patch_model()->get_port(pm->name())) { - cerr << "[PatchController] Ignoring duplicate port " - << pm->path() << endl; - return; - }*/ - - //node_model()->add_port(pm); - // FIXME: leak - PortController* pc = new PortController(pm); - - // Handle bridge ports/nodes (this is uglier than it should be) - /*NodeController* nc = (NodeController*)Store::instance().node(pm->path())->controller(); - if (nc != NULL) - nc->bridge_port(pc); - */ - - // Create port on this patch's module (if there is one) - if (m_module != NULL) { - pc->create_port(m_module); - m_module->resize(); - } - - // Create port's (pseudo) module on this patch's canvas (if there is one) - if (m_patch_view != NULL) { - int x, y; - get_new_module_location(x, y); - - // Set zoom to 1.0 so module isn't messed up (Death to GnomeCanvas) - float old_zoom = m_patch_view->canvas()->zoom(); - if (old_zoom != 1.0) - m_patch_view->canvas()->zoom(1.0); - - if (pc->module() == NULL) - pc->create_module(m_patch_view->canvas(), x, y); - assert(pc->module() != NULL); - m_patch_view->canvas()->add_module(pc->module()); - pc->module()->resize(); - - // Reset zoom - if (old_zoom != 1.0) { - m_patch_view->canvas()->zoom(old_zoom); - pc->module()->zoom(old_zoom); - } - } - - if (m_control_window != NULL) { - assert(m_control_window->control_panel() != NULL); - m_control_window->control_panel()->add_port(pc); - m_control_window->resize(); - } - - // Enable "Controls" menuitem on module and patch window, if necessary - if (has_control_inputs()) - enable_controls_menuitem(); -} - - -/** Removes a port from this patch - */ -void -PatchController::remove_port(const Path& path, bool resize_module) -{ - assert(path.parent() == m_model->path()); - - //cerr << "[PatchController] Removing port " << path << endl; - - /* FIXME - if (m_control_panel != NULL) { - m_control_panel->remove_port(path); - if (m_control_window != NULL) { - assert(m_control_window->control_panel() == m_control_panel); - m_control_window->resize(); - } - }*/ - - // Remove port on module - if (m_module != NULL) { - assert(m_module->port(path.name()) != NULL); - m_module->remove_port(path.name(), resize_module); - assert(m_module->port(path.name()) == NULL); - } - - patch_model()->remove_port(path); - assert(patch_model()->get_port(path.name())); - - // Disable "Controls" menuitem on module and patch window, if necessary - if (!has_control_inputs()) - disable_controls_menuitem(); -} - - -void -PatchController::connection(CountedPtr cm) -{ - assert(cm); - - //patch_model()->add_connection(cm); - - if (m_patch_view != NULL) - create_connection(cm); -} - - - -void -PatchController::disconnection(const Path& src_port_path, const Path& dst_port_path) -{ - const string& src_node_name = src_port_path.parent().name(); - const string& src_port_name = src_port_path.name(); - const string& dst_node_name = dst_port_path.parent().name(); - const string& dst_port_name = dst_port_path.name(); - - if (m_patch_view != NULL) - m_patch_view->canvas()->remove_connection( - src_node_name, src_port_name, dst_node_name, dst_port_name); - - //patch_model()->remove_connection(src_port_path, dst_port_path); - - cerr << "FIXME: disconnection\n"; - /* - // Enable control slider in destination node control window - PortController* p = (PortController)Store::instance().port(dst_port_path)->controller(); - assert(p != NULL); - - if (p->control_panel() != NULL) - p->control_panel()->enable_port(p->path()); - */ -} - - -/** Try to guess a suitable location for a new module. - */ -void -PatchController::get_new_module_location(int& x, int& y) -{ - assert(m_patch_view != NULL); - assert(m_patch_view->canvas() != NULL); - m_patch_view->canvas()->get_scroll_offsets(x, y); - x += 20; - y += 20; -} - - -void -PatchController::show_patch_window() -{ - if (m_window == NULL) { - Glib::RefPtr xml = GladeFactory::new_glade_reference(); - - xml->get_widget_derived("patch_win", m_window); - assert(m_window != NULL); - - if (m_patch_view == NULL) - create_view(); - - m_window->patch_controller(this); - } - - assert(m_window != NULL); - m_window->present(); -} - - -/** Become the parent of the patch view. - * - * Steals the view away from whatever window is currently showing it. - */ -void -PatchController::claim_patch_view() -{ - assert(m_patch_view != NULL); - - m_patch_view->hide(); - m_patch_view->reparent(m_patch_view_bin); -} - - -void -PatchController::show_control_window() -{ - assert(patch_model()); - - if (m_control_window == NULL) - m_control_window = new NodeControlWindow(this, patch_model()->poly()); - - if (m_control_window->control_panel()->num_controls() > 0) - m_control_window->present(); -} - - -void -PatchController::enable_controls_menuitem() -{ - if (m_window != NULL) - m_window->menu_view_control_window()->property_sensitive() = true; - - NodeController::enable_controls_menuitem(); -} - - -void -PatchController::disable_controls_menuitem() -{ - if (m_window != NULL) - m_window->menu_view_control_window()->property_sensitive() = false; - - NodeController::disable_controls_menuitem(); -} - - -} // namespace OmGtk diff --git a/src/progs/gtk/PatchController.h b/src/progs/gtk/PatchController.h deleted file mode 100644 index 4dde58e3..00000000 --- a/src/progs/gtk/PatchController.h +++ /dev/null @@ -1,137 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef PATCHCONTROLLER_H -#define PATCHCONTROLLER_H - -#include -#include -#include "NodeController.h" -#include "PatchModel.h" -template class CountedPtr; - -namespace LibOmClient { -class PatchModel; -class NodeModel; -class PortModel; -class ControlModel; -class ConnectionModel; -} - -using std::string; -using namespace LibOmClient; - -namespace OmGtk { - -class PatchWindow; -class SubpatchModule; -class Controller; -class OmFlowCanvas; -class NodeControlWindow; -class PatchPropertiesWindow; -class ControlPanel; -class PatchView; -class NodeController; - - -/** Controller for a patch. - * - * A patch is different from a port or node because there are two - * representations in the Gtk client - the window and the module in the parent - * patch (if applicable). So, this is a master class that contains both of - * those representations, and acts as the recipient of all patch related - * events (being the controller). - * - * \ingroup OmGtk - */ -class PatchController : public NodeController -{ -public: - PatchController(CountedPtr model); - virtual ~PatchController(); - - /* - virtual void add_to_store(); - virtual void remove_from_store(); - */ - - virtual void destroy(); - - virtual void metadata_update(const string& key, const string& value); - - virtual void add_port(CountedPtr pm); - virtual void remove_port(const Path& path, bool resize_module); - - void connection(CountedPtr cm); - void disconnection(const Path& src_port_path, const Path& dst_port_path); - void clear(); - - void get_new_module_location(int& x, int& y); - - void show_control_window(); - void show_properties_window(); - void show_patch_window(); - - void claim_patch_view(); - - void create_module(OmFlowCanvas* canvas); - void create_view(); - - PatchView* view() const { return m_patch_view; } - PatchWindow* window() const { return m_window; } - void window(PatchWindow* pw) { m_window = pw; } - - inline string name() const { return m_model->name(); } - inline const Path& path() const { return m_model->path(); } - - void set_path(const Path& new_path); - - void enable(); - void disable(); - - CountedPtr patch_model() const { return m_patch_model; } - - void enable_controls_menuitem(); - void disable_controls_menuitem(); - -private: - void add_node(CountedPtr object); - void remove_node(const string& name); - - void create_connection(CountedPtr cm); - - NodeController* create_controller_for_node(CountedPtr node); - - PatchPropertiesWindow* m_properties_window; - - PatchWindow* m_window; ///< Patch Window currently showing m_patch_view - PatchView* m_patch_view; ///< View (canvas) of this patch - - CountedPtr m_patch_model; - - /** Invisible bin used to store patch view when not shown by a patch window */ - Gtk::Alignment m_patch_view_bin; - - // Coordinates for next added plugin (used by canvas menu) - // 0 means "not set", ie guess at the best location - int m_module_x; - int m_module_y; -}; - - -} // namespace OmGtk - -#endif // PATCHCONTROLLER_H diff --git a/src/progs/gtk/PatchPropertiesWindow.cpp b/src/progs/gtk/PatchPropertiesWindow.cpp deleted file mode 100644 index 6e17a1f7..00000000 --- a/src/progs/gtk/PatchPropertiesWindow.cpp +++ /dev/null @@ -1,73 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "PatchPropertiesWindow.h" -#include -#include "PatchModel.h" - -namespace OmGtk { -using std::string; - - -PatchPropertiesWindow::PatchPropertiesWindow(BaseObjectType* cobject, const Glib::RefPtr& glade_xml) -: Gtk::Window(cobject) -, m_patch_model(NULL) -{ - glade_xml->get_widget("properties_author_entry", m_author_entry); - glade_xml->get_widget("properties_description_textview", m_textview); - glade_xml->get_widget("properties_cancel_button", m_cancel_button); - glade_xml->get_widget("properties_ok_button", m_ok_button); - - m_cancel_button->signal_clicked().connect(sigc::mem_fun(this, &PatchPropertiesWindow::cancel_clicked)); - m_ok_button->signal_clicked().connect(sigc::mem_fun(this, &PatchPropertiesWindow::ok_clicked)); -} - - -/** Set the patch model this description is for. - * - * This function is a "post-constructor" - it MUST be called before using - * the window in any way. - */ -void -PatchPropertiesWindow::patch_model(CountedPtr patch_model) -{ - property_title() = patch_model->path() + " Properties"; - m_patch_model = patch_model; - m_author_entry->set_text(m_patch_model->get_metadata("author")); - m_textview->get_buffer()->set_text(m_patch_model->get_metadata("description")); -} - - -void -PatchPropertiesWindow::cancel_clicked() -{ - m_author_entry->set_text(m_patch_model->get_metadata("author")); - m_textview->get_buffer()->set_text(m_patch_model->get_metadata("description")); - hide(); -} - - -void -PatchPropertiesWindow::ok_clicked() -{ - m_patch_model->set_metadata("author", m_author_entry->get_text()); - m_patch_model->set_metadata("description", m_textview->get_buffer()->get_text()); - hide(); -} - - - -} // namespace OmGtk diff --git a/src/progs/gtk/PatchPropertiesWindow.h b/src/progs/gtk/PatchPropertiesWindow.h deleted file mode 100644 index adca6e75..00000000 --- a/src/progs/gtk/PatchPropertiesWindow.h +++ /dev/null @@ -1,60 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef PATCHPROPERTIESWINDOW_H -#define PATCHPROPERTIESWINDOW_H - -#include -#include -#include -#include "util/CountedPtr.h" -using std::string; - -namespace LibOmClient { class PatchModel; } -using LibOmClient::PatchModel; - -namespace OmGtk { - - -/** Patch Properties Window. - * - * Loaded by libglade as a derived object. - * - * \ingroup OmGtk - */ -class PatchPropertiesWindow : public Gtk::Window -{ -public: - PatchPropertiesWindow(BaseObjectType* cobject, const Glib::RefPtr& refGlade); - - void patch_model(CountedPtr patch_model); - - void cancel_clicked(); - void ok_clicked(); - -private: - CountedPtr m_patch_model; - - Gtk::Entry* m_author_entry; - Gtk::TextView* m_textview; - Gtk::Button* m_cancel_button; - Gtk::Button* m_ok_button; -}; - - -} // namespace OmGtk - -#endif // PATCHPROPERTIESWINDOW_H diff --git a/src/progs/gtk/PatchTreeWindow.cpp b/src/progs/gtk/PatchTreeWindow.cpp deleted file mode 100644 index 390187b8..00000000 --- a/src/progs/gtk/PatchTreeWindow.cpp +++ /dev/null @@ -1,252 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "PatchTreeWindow.h" -#include "Controller.h" -#include "PatchController.h" -#include "PatchWindow.h" -#include "SubpatchModule.h" -#include "PatchModel.h" -#include "util/Path.h" - -using Om::Path; - -namespace OmGtk { - - -PatchTreeWindow::PatchTreeWindow(BaseObjectType* cobject, - const Glib::RefPtr& xml) -: Gtk::Window(cobject), - m_enable_signal(true) -{ - xml->get_widget_derived("patches_treeview", m_patches_treeview); - - m_patch_treestore = Gtk::TreeStore::create(m_patch_tree_columns); - m_patches_treeview->set_window(this); - m_patches_treeview->set_model(m_patch_treestore); - Gtk::TreeViewColumn* name_col = Gtk::manage(new Gtk::TreeViewColumn( - "Patch", m_patch_tree_columns.name_col)); - Gtk::TreeViewColumn* enabled_col = Gtk::manage(new Gtk::TreeViewColumn( - "Run", m_patch_tree_columns.enabled_col)); - name_col->set_resizable(true); - name_col->set_expand(true); - - m_patches_treeview->append_column(*name_col); - m_patches_treeview->append_column(*enabled_col); - Gtk::CellRendererToggle* enabled_renderer = dynamic_cast( - m_patches_treeview->get_column_cell_renderer(1)); - enabled_renderer->property_activatable() = true; - - m_patch_tree_selection = m_patches_treeview->get_selection(); - - //m_patch_tree_selection->signal_changed().connect( - // sigc::mem_fun(this, &PatchTreeWindow::event_patch_selected)); - m_patches_treeview->signal_row_activated().connect( - sigc::mem_fun(this, &PatchTreeWindow::event_patch_activated)); - enabled_renderer->signal_toggled().connect( - sigc::mem_fun(this, &PatchTreeWindow::event_patch_enabled_toggled)); - - m_patches_treeview->columns_autosize(); -} - - -void -PatchTreeWindow::add_patch(PatchController* pc) -{ - const CountedPtr pm = pc->patch_model(); - - if (!pm->parent()) { - Gtk::TreeModel::iterator iter = m_patch_treestore->append(); - Gtk::TreeModel::Row row = *iter; - if (pm->path() == "/") { - string root_name = Controller::instance().engine_url(); - // Hack off trailing '/' if it's there (ugly) - //if (root_name.substr(root_name.length()-1,1) == "/") - // root_name = root_name.substr(0, root_name.length()-1); - //root_name.append(":/"); - row[m_patch_tree_columns.name_col] = root_name; - } else { - row[m_patch_tree_columns.name_col] = pm->path().name(); - } - row[m_patch_tree_columns.enabled_col] = false; - row[m_patch_tree_columns.patch_controller_col] = pc; - m_patches_treeview->expand_row(m_patch_treestore->get_path(iter), true); - } else { - Gtk::TreeModel::Children children = m_patch_treestore->children(); - Gtk::TreeModel::iterator c = find_patch(children, pm->parent()->path()); - - if (c != children.end()) { - Gtk::TreeModel::iterator iter = m_patch_treestore->append(c->children()); - Gtk::TreeModel::Row row = *iter; - row[m_patch_tree_columns.name_col] = pm->path().name(); - row[m_patch_tree_columns.enabled_col] = false; - row[m_patch_tree_columns.patch_controller_col] = pc; - m_patches_treeview->expand_row(m_patch_treestore->get_path(iter), true); - } - } -} - - -void -PatchTreeWindow::remove_patch(const Path& path) -{ - Gtk::TreeModel::iterator i = find_patch(m_patch_treestore->children(), path); - if (i != m_patch_treestore->children().end()) - m_patch_treestore->erase(i); -} - - -Gtk::TreeModel::iterator -PatchTreeWindow::find_patch(Gtk::TreeModel::Children root, const Path& path) -{ - PatchController* pc = NULL; - - for (Gtk::TreeModel::iterator c = root.begin(); c != root.end(); ++c) { - pc = (*c)[m_patch_tree_columns.patch_controller_col]; - if (pc->model()->path() == path) { - return c; - } else if ((*c)->children().size() > 0) { - Gtk::TreeModel::iterator ret = find_patch(c->children(), path); - if (ret != c->children().end()) - return ret; - } - } - return root.end(); -} - -/* -void -PatchTreeWindow::event_patch_selected() -{ - Gtk::TreeModel::iterator active = m_patch_tree_selection->get_selected(); - if (active) { - Gtk::TreeModel::Row row = *active; - PatchController* pc = row[m_patch_tree_columns.patch_controller_col]; - } -} -*/ - - -/** Show the context menu for the selected patch in the patches treeview. - */ -void -PatchTreeWindow::show_patch_menu(GdkEventButton* ev) -{ - Gtk::TreeModel::iterator active = m_patch_tree_selection->get_selected(); - if (active) { - Gtk::TreeModel::Row row = *active; - PatchController* pc = row[m_patch_tree_columns.patch_controller_col]; - if (pc != NULL) - pc->show_menu(ev); - } -} - - -void -PatchTreeWindow::event_patch_activated(const Gtk::TreeModel::Path& path, Gtk::TreeView::Column* col) -{ - Gtk::TreeModel::iterator active = m_patch_treestore->get_iter(path); - Gtk::TreeModel::Row row = *active; - PatchController* pc = row[m_patch_tree_columns.patch_controller_col]; - - pc->show_patch_window(); -} - - -void -PatchTreeWindow::event_patch_enabled_toggled(const Glib::ustring& path_str) -{ - Gtk::TreeModel::Path path(path_str); - Gtk::TreeModel::iterator active = m_patch_treestore->get_iter(path); - Gtk::TreeModel::Row row = *active; - - PatchController* pc = row[m_patch_tree_columns.patch_controller_col]; - Glib::ustring patch_path = pc->model()->path(); - - assert(pc != NULL); - - if ( ! pc->patch_model()->enabled()) { - if (m_enable_signal) - Controller::instance().enable_patch(patch_path); - pc->enable(); - row[m_patch_tree_columns.enabled_col] = true; - } else { - if (m_enable_signal) - Controller::instance().disable_patch(patch_path); - pc->disable(); - row[m_patch_tree_columns.enabled_col] = false; - } -} - - -void -PatchTreeWindow::patch_enabled(const Path& path) -{ - m_enable_signal = false; - - Gtk::TreeModel::iterator i - = find_patch(m_patch_treestore->children(), path); - - if (i != m_patch_treestore->children().end()) { - Gtk::TreeModel::Row row = *i; - row[m_patch_tree_columns.enabled_col] = true; - } else { - cerr << "[PatchTreeWindow] Unable to find patch " << path << endl; - } - - m_enable_signal = true; -} - - -void -PatchTreeWindow::patch_disabled(const Path& path) -{ - m_enable_signal = false; - - Gtk::TreeModel::iterator i - = find_patch(m_patch_treestore->children(), path); - - if (i != m_patch_treestore->children().end()) { - Gtk::TreeModel::Row row = *i; - row[m_patch_tree_columns.enabled_col] = false; - } else { - cerr << "[PatchTreeWindow] Unable to find patch " << path << endl; - } - - m_enable_signal = true; -} - - -void -PatchTreeWindow::patch_renamed(const Path& old_path, const Path& new_path) -{ - m_enable_signal = false; - - Gtk::TreeModel::iterator i - = find_patch(m_patch_treestore->children(), old_path); - - if (i != m_patch_treestore->children().end()) { - Gtk::TreeModel::Row row = *i; - row[m_patch_tree_columns.name_col] = new_path.name(); - } else { - cerr << "[PatchTreeWindow] Unable to find patch " << old_path << endl; - } - - m_enable_signal = true; -} - - -} // namespace OmGtk diff --git a/src/progs/gtk/PatchTreeWindow.h b/src/progs/gtk/PatchTreeWindow.h deleted file mode 100644 index 3177e5e2..00000000 --- a/src/progs/gtk/PatchTreeWindow.h +++ /dev/null @@ -1,105 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef PATCHTREEWINDOW_H -#define PATCHTREEWINDOW_H - -#include -#include -#include "util/Path.h" - - -using namespace Om; -using Om::Path; - -namespace OmGtk { - -class PatchWindow; -class PatchController; -class PatchTreeView; - - -/** Window with a TreeView of all loaded patches. - * - * \ingroup OmGtk - */ -class PatchTreeWindow : public Gtk::Window -{ -public: - PatchTreeWindow(BaseObjectType* cobject, const Glib::RefPtr& refGlade); - - void patch_enabled(const Path& path); - void patch_disabled(const Path& path); - void patch_renamed(const Path& old_path, const Path& new_path); - - void add_patch(PatchController* pc); - void remove_patch(const Path& path); - void show_patch_menu(GdkEventButton* ev); - -protected: - //void event_patch_selected(); - void event_patch_activated(const Gtk::TreeModel::Path& path, Gtk::TreeView::Column* col); - void event_patch_enabled_toggled(const Glib::ustring& path_str); - - Gtk::TreeModel::iterator find_patch(Gtk::TreeModel::Children root, const Path& path); - - PatchTreeView* m_patches_treeview; - - struct PatchTreeModelColumns : public Gtk::TreeModel::ColumnRecord - { - PatchTreeModelColumns() - { add(name_col); add(enabled_col); add(patch_controller_col); } - - Gtk::TreeModelColumn name_col; - Gtk::TreeModelColumn enabled_col; - Gtk::TreeModelColumn patch_controller_col; - }; - - bool m_enable_signal; - PatchTreeModelColumns m_patch_tree_columns; - Glib::RefPtr m_patch_treestore; - Glib::RefPtr m_patch_tree_selection; -}; - - -/** Derived TreeView class to support context menus for patches */ -class PatchTreeView : public Gtk::TreeView -{ -public: - PatchTreeView(BaseObjectType* cobject, const Glib::RefPtr& xml) - : Gtk::TreeView(cobject) - {} - - void set_window(PatchTreeWindow* win) { m_window = win; } - - bool on_button_press_event(GdkEventButton* ev) { - bool ret = Gtk::TreeView::on_button_press_event(ev); - - if ((ev->type == GDK_BUTTON_PRESS) && (ev->button == 3)) - m_window->show_patch_menu(ev); - - return ret; - } - -private: - PatchTreeWindow* m_window; - -}; // struct PatchTreeView - - -} // namespace OmGtk - -#endif // PATCHTREEWINDOW_H diff --git a/src/progs/gtk/PatchView.cpp b/src/progs/gtk/PatchView.cpp deleted file mode 100644 index 4d421979..00000000 --- a/src/progs/gtk/PatchView.cpp +++ /dev/null @@ -1,119 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "PatchView.h" -#include -#include -#include -#include "App.h" -#include "OmFlowCanvas.h" -#include "PatchController.h" -#include "LoadPluginWindow.h" -#include "PatchModel.h" -#include "NewSubpatchWindow.h" -#include "LoadSubpatchWindow.h" -#include "NodeControlWindow.h" -#include "PatchPropertiesWindow.h" -#include "PatchTreeWindow.h" -#include "Controller.h" - -namespace OmGtk { - - -PatchView::PatchView(BaseObjectType* cobject, const Glib::RefPtr& xml) -: Gtk::Box(cobject), - m_patch(NULL), - m_canvas(NULL), - m_enable_signal(true) -{ - property_visible() = false; - - xml->get_widget("patch_canvas_scrolledwindow", m_canvas_scrolledwindow); - xml->get_widget("patch_zoom_scale", m_zoom_slider); - xml->get_widget("patch_polyphony_label", m_polyphony_label); - xml->get_widget("patch_process_checkbutton", m_process_checkbutton); - - m_zoom_slider->signal_value_changed().connect( sigc::mem_fun(this, &PatchView::zoom_changed)); - m_process_checkbutton->signal_toggled().connect(sigc::mem_fun(this, &PatchView::process_toggled)); -} - - -/** Sets the patch controller for this window and initializes everything. - * - * This function MUST be called before using the window in any way! - */ -void -PatchView::patch_controller(PatchController* pc) -{ - //m_patch = new PatchController(pm, controller); - m_patch = pc; - - m_canvas = new OmFlowCanvas(pc, 1600*2, 1200*2); - - m_canvas_scrolledwindow->add(*m_canvas); - //m_canvas->show(); - //m_canvas_scrolledwindow->show(); - - char txt[4]; - snprintf(txt, 8, "%zd", pc->patch_model()->poly()); - m_polyphony_label->set_text(txt); - - //m_description_window->patch_model(pc->model()); -} - - -void -PatchView::show_control_window() -{ - if (m_patch != NULL) - m_patch->show_control_window(); -} - - -void -PatchView::zoom_changed() -{ - float z = m_zoom_slider->get_value(); - m_canvas->zoom(z); -} - - -void -PatchView::process_toggled() -{ - if (!m_enable_signal) - return; - - if (m_process_checkbutton->get_active()) { - Controller::instance().enable_patch(m_patch->model()->path()); - App::instance().patch_tree()->patch_enabled(m_patch->model()->path()); - } else { - Controller::instance().disable_patch(m_patch->model()->path()); - App::instance().patch_tree()->patch_disabled(m_patch->model()->path()); - } -} - - -void -PatchView::enabled(bool e) -{ - m_enable_signal = false; - m_process_checkbutton->set_active(e); - m_enable_signal = true; -} - - -} // namespace OmGtk diff --git a/src/progs/gtk/PatchView.h b/src/progs/gtk/PatchView.h deleted file mode 100644 index ff6aebf9..00000000 --- a/src/progs/gtk/PatchView.h +++ /dev/null @@ -1,86 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef PATCHVIEW_H -#define PATCHVIEW_H - -#include -#include -#include -#include - -using std::string; - -namespace LibOmClient { -class PatchModel; -class NodeModel; -class PortModel; -class ControlModel; -class MetadataModel; -} -using namespace LibOmClient; - - -namespace OmGtk { - -class PatchController; -class OmFlowCanvas; -class LoadPluginWindow; -class NewSubpatchWindow; -class LoadSubpatchWindow; -class NewSubpatchWindow; -class NodeControlWindow; -class PatchDescriptionWindow; -class SubpatchModule; -class OmPort; - - -/** The patch specific contents of a PatchWindow (ie the canvas and whatever else). - * - * \ingroup OmGtk - */ -class PatchView : public Gtk::Box -{ -public: - PatchView(BaseObjectType* cobject, const Glib::RefPtr& glade_xml); - - void patch_controller(PatchController* pc); - - OmFlowCanvas* canvas() const { return m_canvas; } - PatchController* patch_controller() const { return m_patch; } - - void show_control_window(); - void zoom_changed(); - void process_toggled(); - - void enabled(bool e); - -private: - PatchController* m_patch; - OmFlowCanvas* m_canvas; - - Gtk::ScrolledWindow* m_canvas_scrolledwindow; - Gtk::HScale* m_zoom_slider; - Gtk::Label* m_polyphony_label; - Gtk::CheckButton* m_process_checkbutton; - - bool m_enable_signal; -}; - - -} // namespace OmGtk - -#endif // PATCHVIEW_H diff --git a/src/progs/gtk/PatchWindow.cpp b/src/progs/gtk/PatchWindow.cpp deleted file mode 100644 index 46b5ce91..00000000 --- a/src/progs/gtk/PatchWindow.cpp +++ /dev/null @@ -1,583 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "PatchWindow.h" -#include -#include -#include -#include "App.h" -#include "PatchView.h" -#include "OmFlowCanvas.h" -#include "PatchController.h" -#include "LoadPluginWindow.h" -#include "PatchModel.h" -#include "NewSubpatchWindow.h" -#include "LoadPatchWindow.h" -#include "LoadSubpatchWindow.h" -#include "NodeControlWindow.h" -#include "PatchPropertiesWindow.h" -#include "ConfigWindow.h" -#include "MessagesWindow.h" -#include "PatchTreeWindow.h" -#include "Controller.h" -#include "BreadCrumb.h" -#include "Store.h" -#include "ConnectWindow.h" - -namespace OmGtk { - - -PatchWindow::PatchWindow(BaseObjectType* cobject, const Glib::RefPtr& xml) -: Gtk::Window(cobject), - m_patch(NULL), - m_load_plugin_window(NULL), - m_new_subpatch_window(NULL), - m_enable_signal(true), - m_position_stored(false), - m_x(0), - m_y(0) -{ - property_visible() = false; - - xml->get_widget("patch_win_vbox", m_vbox); - xml->get_widget("patch_win_viewport", m_viewport); - xml->get_widget("patch_win_breadcrumb_box", m_breadcrumb_box); - //xml->get_widget("patch_win_status_bar", m_status_bar); - //xml->get_widget("patch_open_menuitem", m_menu_open); - xml->get_widget("patch_import_menuitem", m_menu_import); - //xml->get_widget("patch_open_into_menuitem", m_menu_open_into); - xml->get_widget("patch_save_menuitem", m_menu_save); - xml->get_widget("patch_save_as_menuitem", m_menu_save_as); - xml->get_widget("patch_close_menuitem", m_menu_close); - xml->get_widget("patch_configuration_menuitem", m_menu_configuration); - xml->get_widget("patch_quit_menuitem", m_menu_quit); - xml->get_widget("patch_view_control_window_menuitem", m_menu_view_control_window); - xml->get_widget("patch_view_engine_window_menuitem", m_menu_view_engine_window); - xml->get_widget("patch_properties_menuitem", m_menu_view_patch_properties); - xml->get_widget("patch_fullscreen_menuitem", m_menu_fullscreen); - xml->get_widget("patch_clear_menuitem", m_menu_clear); - xml->get_widget("patch_destroy_menuitem", m_menu_destroy_patch); - /*xml->get_widget("patch_add_plugin_menuitem", m_menu_add_plugin); - xml->get_widget("patch_add_new_subpatch_menuitem", m_menu_new_subpatch); - xml->get_widget("patch_add_subpatch_from_file_menuitem", m_menu_load_subpatch);*/ - xml->get_widget("patch_view_messages_window_menuitem", m_menu_view_messages_window); - xml->get_widget("patch_view_patch_tree_window_menuitem", m_menu_view_patch_tree_window); - xml->get_widget("patch_help_about_menuitem", m_menu_help_about); - - xml->get_widget_derived("load_plugin_win", m_load_plugin_window); - xml->get_widget_derived("new_subpatch_win", m_new_subpatch_window); - xml->get_widget_derived("load_patch_win", m_load_patch_window); - xml->get_widget_derived("load_subpatch_win", m_load_subpatch_window); - - //m_load_plugin_window->set_transient_for(*this); - m_new_subpatch_window->set_transient_for(*this); - m_load_patch_window->set_transient_for(*this); - m_load_subpatch_window->set_transient_for(*this); - - m_menu_view_control_window->property_sensitive() = false; - //m_status_bar->push(Controller::instance().engine_url()); - //m_status_bar->pack_start(*Gtk::manage(new Gtk::Image(Gtk::Stock::CONNECT, Gtk::ICON_SIZE_MENU)), false, false); - - /*m_menu_open->signal_activate().connect( - sigc::mem_fun(this, &PatchWindow::event_open));*/ - m_menu_import->signal_activate().connect( - sigc::mem_fun(this, &PatchWindow::event_import)); - m_menu_save->signal_activate().connect( - sigc::mem_fun(this, &PatchWindow::event_save)); - m_menu_save_as->signal_activate().connect( - sigc::mem_fun(this, &PatchWindow::event_save_as)); - m_menu_close->signal_activate().connect( - sigc::mem_fun(this, &PatchWindow::event_close)); - m_menu_quit->signal_activate().connect( - sigc::mem_fun(this, &PatchWindow::event_quit)); - m_menu_configuration->signal_activate().connect( - sigc::mem_fun(App::instance().configuration_dialog(), &ConfigWindow::show)); - m_menu_fullscreen->signal_activate().connect( - sigc::mem_fun(this, &PatchWindow::event_fullscreen_toggled)); - m_menu_view_engine_window->signal_activate().connect( - sigc::mem_fun(this, &PatchWindow::event_show_engine)); - m_menu_view_control_window->signal_activate().connect( - sigc::mem_fun(this, &PatchWindow::event_show_controls)); - m_menu_view_patch_properties->signal_activate().connect( - sigc::mem_fun(this, &PatchWindow::event_show_properties)); - m_menu_destroy_patch->signal_activate().connect( - sigc::mem_fun(this, &PatchWindow::event_destroy)); - m_menu_clear->signal_activate().connect( - sigc::mem_fun(this, &PatchWindow::event_clear)); - /*m_menu_add_plugin->signal_activate().connect( - sigc::mem_fun(m_load_plugin_window, &LoadPluginWindow::present)); - m_menu_new_subpatch->signal_activate().connect( - sigc::mem_fun(m_new_subpatch_window, &NewSubpatchWindow::present)); - m_menu_load_subpatch->signal_activate().connect( - sigc::mem_fun(m_load_subpatch_window, &LoadSubpatchWindow::present));*/ - m_menu_view_messages_window->signal_activate().connect( - sigc::mem_fun(App::instance().messages_dialog(), &MessagesWindow::present)); - m_menu_view_patch_tree_window->signal_activate().connect( - sigc::mem_fun(App::instance().patch_tree(), &PatchTreeWindow::present)); - - // Temporary workaround for Gtkmm 2.4 (no AboutDialog) - if (App::instance().about_dialog() != NULL) - m_menu_help_about->signal_activate().connect( - sigc::mem_fun(App::instance().about_dialog(), &Gtk::Dialog::present)); - - App::instance().add_patch_window(this); -} - - -PatchWindow::~PatchWindow() -{ - App::instance().remove_patch_window(this); - - hide(); - - delete m_new_subpatch_window; - delete m_load_subpatch_window; -} - - -/** Sets the patch controller for this window and initializes everything. - * - * This function MUST be called before using the window in any way! - */ -void -PatchWindow::patch_controller(PatchController* pc) -{ - m_enable_signal = false; - - assert(pc != NULL); - assert(m_patch != pc); - assert(m_patch == NULL || - pc->model()->path() != m_patch->model()->path()); - - PatchController* old_pc = m_patch; - if (old_pc != NULL) { - assert(old_pc->window() == NULL || old_pc->window() == this); - old_pc->claim_patch_view(); - old_pc->window(NULL); - } - - m_patch = pc; - - if (pc->view() == NULL) - pc->create_view(); - assert(pc->view() != NULL); - - PatchView* const patch_view = pc->view(); - assert(patch_view != NULL); - patch_view->reparent(*m_viewport); - pc->window(this); - show_all(); - - assert(m_load_plugin_window != NULL); - assert(m_new_subpatch_window != NULL); - assert(m_load_patch_window != NULL); - assert(m_load_subpatch_window != NULL); - - m_load_patch_window->patch_controller(m_patch); - m_load_plugin_window->patch_controller(m_patch); - m_new_subpatch_window->patch_controller(m_patch); - m_load_subpatch_window->patch_controller(m_patch); - - m_menu_view_control_window->property_sensitive() = pc->has_control_inputs(); - - int width, height; - get_size(width, height); - patch_view->canvas()->scroll_to( - ((int)patch_view->canvas()->width() - width)/2, - ((int)patch_view->canvas()->height() - height)/2); - - set_title(m_patch->model()->path()); - - //m_properties_window->patch_model(pc->patch_model()); - - - // Setup breadcrumbs box - // FIXME: this is filthy - - // Moving to a parent patch, depress correct button - if (old_pc != NULL && - old_pc->model()->path().substr(0, pc->model()->path().length()) - == pc->model()->path()) { - for (list::iterator i = m_breadcrumbs.begin(); i != m_breadcrumbs.end(); ++i) { - if ((*i)->path() == pc->path()) - (*i)->set_active(true); - else if ((*i)->path() == old_pc->path()) - (*i)->set_active(false); - } - - // Rebuild breadcrumbs from scratch (yeah, laziness..) - } else { - rebuild_breadcrumbs(); - } - - if (pc->model()->path() == "/") - m_menu_destroy_patch->set_sensitive(false); - else - m_menu_destroy_patch->set_sensitive(true); - - assert(old_pc == NULL || old_pc->window() != this); - assert(m_patch == pc); - assert(m_patch->window() == this); - - m_enable_signal = true; -} - - -/** Destroys current breadcrumbs and rebuilds from scratch. - * - * (Needs to be called when a patch is cleared to eliminate children crumbs) - */ -void -PatchWindow::rebuild_breadcrumbs() -{ - // Empty existing breadcrumbs - for (list::iterator i = m_breadcrumbs.begin(); i != m_breadcrumbs.end(); ++i) - m_breadcrumb_box->remove(**i); - m_breadcrumbs.clear(); - - // Add new ones - string path = m_patch->path(); // To be chopped up, starting at the left - string but_name; // Name on breadcrumb button - string but_path; // Full path breadcrumb represents - - // Add root - assert(path[0] == '/'); - BreadCrumb* but = manage(new BreadCrumb(this, "/")); - m_breadcrumb_box->pack_start(*but, false, false, 1); - m_breadcrumbs.push_back(but); - path = path.substr(1); // hack off leading slash - - // Add the rest - while (path.length() > 0) { - if (path.find("/") != string::npos) { - but_name = path.substr(0, path.find("/")); - but_path += string("/") + path.substr(0, path.find("/")); - path = path.substr(path.find("/")+1); - } else { - but_name = path; - but_path += string("/") + path; - path = ""; - } - BreadCrumb* but = manage(new BreadCrumb(this, but_path));//Store::instance().patch(but_path))); - m_breadcrumb_box->pack_start(*but, false, false, 1); - m_breadcrumbs.push_back(but); - } - (*m_breadcrumbs.back()).set_active(true); - -} - - -void -PatchWindow::breadcrumb_clicked(BreadCrumb* crumb) -{ - if (m_enable_signal) { - // FIXME: check to be sure PatchModel exists, then controller - maybe - // even make a controller if there isn't one? - PatchController* const pc = dynamic_cast( - Store::instance().patch(crumb->path())->controller()); - assert(pc != NULL); - - if (pc == m_patch) { - crumb->set_active(true); - } else if (pc->window() != NULL && pc->window()->is_visible()) { - pc->show_patch_window(); - crumb->set_active(false); - } else { - patch_controller(pc); - } - } -} - - -void -PatchWindow::event_show_engine() -{ - if (m_patch) - App::instance().connect_window()->show(); -} - - -void -PatchWindow::event_show_controls() -{ - if (m_patch) - m_patch->show_control_window(); -} - - -void -PatchWindow::event_show_properties() -{ - if (m_patch) - m_patch->show_properties_window(); -} - - -/** Notification a node has been removed from the PatchView this window - * currently contains. - * - * This is used to update the breadcrumbs in case the Node is a patch which has - * a button present in the breadcrumbs that needs to be removed. - */ -void -PatchWindow::node_removed(const string& name) -{ - for (list::iterator i = m_breadcrumbs.begin(); i != m_breadcrumbs.end(); ++i) { - if ((*i)->path() == m_patch->model()->base_path() + name) { - for (list::iterator j = i; j != m_breadcrumbs.end(); ) { - BreadCrumb* bc = *j; - j = m_breadcrumbs.erase(j); - m_breadcrumb_box->remove(*bc); - } - break; - } - } -} - - -/** Same as @a node_removed, but for renaming. - */ -void -PatchWindow::node_renamed(const string& old_path, const string& new_path) -{ - for (list::iterator i = m_breadcrumbs.begin(); i != m_breadcrumbs.end(); ++i) { - if ((*i)->path() == old_path) - (*i)->set_path(new_path); - } -} - - -/** Notification the patch this window is currently showing was renamed. - */ -void -PatchWindow::patch_renamed(const string& new_path) -{ - set_title(new_path); - for (list::iterator i = m_breadcrumbs.begin(); i != m_breadcrumbs.end(); ++i) { - if ((*i)->path() == m_patch->path()) - (*i)->set_path(new_path); - } -} - -/* -void -PatchWindow::event_open() -{ - m_load_patch_window->set_replace(); - m_load_patch_window->present(); -} -*/ - -void -PatchWindow::event_import() -{ - m_load_patch_window->set_merge(); - m_load_patch_window->present(); -} - - -void -PatchWindow::event_save() -{ - PatchModel* const model = m_patch->patch_model().get(); - - if (model->filename() == "") - event_save_as(); - else - Controller::instance().save_patch(model, model->filename(), false); -} - - -void -PatchWindow::event_save_as() -{ - Gtk::FileChooserDialog dialog(*this, "Save Patch", Gtk::FILE_CHOOSER_ACTION_SAVE); - - Gtk::VBox* box = dialog.get_vbox(); - Gtk::Label warning("Warning: Recursively saving will overwrite any subpatch files \ - without confirmation."); - box->pack_start(warning, false, false, 2); - Gtk::CheckButton recursive_checkbutton("Recursively save all subpatches"); - box->pack_start(recursive_checkbutton, false, false, 0); - recursive_checkbutton.show(); - - dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); - dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK); - - // Set current folder to most sensible default - const string& current_filename = m_patch->patch_model()->filename(); - if (current_filename.length() > 0) - dialog.set_filename(current_filename); - else if (App::instance().configuration()->patch_folder().length() > 0) - dialog.set_current_folder(App::instance().configuration()->patch_folder()); - - int result = dialog.run(); - bool recursive = recursive_checkbutton.get_active(); - - assert(result == Gtk::RESPONSE_OK || result == Gtk::RESPONSE_CANCEL || result == Gtk::RESPONSE_NONE); - - if (result == Gtk::RESPONSE_OK) { - string filename = dialog.get_filename(); - if (filename.length() < 4 || filename.substr(filename.length()-3) != ".om") - filename += ".om"; - - bool confirm = false; - std::fstream fin; - fin.open(filename.c_str(), std::ios::in); - if (fin.is_open()) { // File exists - string msg = "File already exists! Are you sure you want to overwrite "; - msg += filename + "?"; - Gtk::MessageDialog confirm_dialog(*this, - msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_YES_NO, true); - if (confirm_dialog.run() == Gtk::RESPONSE_YES) - confirm = true; - else - confirm = false; - } else { // File doesn't exist - confirm = true; - } - fin.close(); - - if (confirm) { - Controller::instance().save_patch(m_patch->patch_model().get(), filename, recursive); - m_patch->patch_model()->filename(filename); - } - } - App::instance().configuration()->set_patch_folder(dialog.get_current_folder()); -} - - -void -PatchWindow::on_show() -{ - if (m_position_stored) - move(m_x, m_y); - - Gtk::Window::on_show(); -} - - -void -PatchWindow::on_hide() -{ - m_position_stored = true; - get_position(m_x, m_y); - Gtk::Window::on_hide(); -} - - -bool -PatchWindow::on_delete_event(GdkEventAny* ev) -{ - event_close(); - return true; // destroy window -} - - -bool -PatchWindow::on_key_press_event(GdkEventKey* event) -{ - if (event->keyval == GDK_Delete) { - if (m_patch != NULL && m_patch->view() != NULL) { - assert(m_patch->view()->canvas() != NULL); - m_patch->view()->canvas()->destroy_selected(); - } - return true; - } else { - return Gtk::Window::on_key_press_event(event); - } -} - - -void -PatchWindow::event_close() -{ - if (App::instance().num_open_patch_windows() > 1) { - hide(); - } else { - Gtk::MessageDialog d(*this, "This is the last remaining open patch " - "window. Closing this window will exit OmGtk (the engine will " - "remain running).\n\nAre you sure you want to quit?", - true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE, true); - d.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); - d.add_button(Gtk::Stock::QUIT, Gtk::RESPONSE_CLOSE); - int ret = d.run(); - if (ret == Gtk::RESPONSE_CLOSE) - App::instance().quit(); - else - d.hide(); - } -} - - -void -PatchWindow::event_quit() -{ - Gtk::MessageDialog d(*this, "Would you like to quit just OmGtk\nor kill the engine as well?", - true, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_NONE, true); - d.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); - - Gtk::Button* b = d.add_button(Gtk::Stock::REMOVE, 2); // kill - b->set_label("_Kill Engine"); - Gtk::Widget* kill_img = Gtk::manage(new Gtk::Image(Gtk::Stock::CLOSE, Gtk::ICON_SIZE_BUTTON)); - b->set_image(*kill_img); - - b = d.add_button(Gtk::Stock::QUIT, 1); // just exit - b->set_label("_Quit"); - Gtk::Widget* close_img = Gtk::manage(new Gtk::Image(Gtk::Stock::QUIT, Gtk::ICON_SIZE_BUTTON)); - b->set_image(*close_img); - - int ret = d.run(); - if (ret == 1) { - App::instance().quit(); - } else if (ret == 2) { - Controller::instance().quit(); - App::instance().quit(); - } - // Otherwise cancelled, do nothing -} - - -void -PatchWindow::event_destroy() -{ - Controller::instance().destroy(m_patch->model()->path()); -} - - -void -PatchWindow::event_clear() -{ - Controller::instance().clear_patch(m_patch->model()->path()); -} - -void -PatchWindow::event_fullscreen_toggled() -{ - // FIXME: ugh, use GTK signals to track state and now for sure - static bool is_fullscreen = false; - - if (!is_fullscreen) { - fullscreen(); - is_fullscreen = true; - } else { - unfullscreen(); - is_fullscreen = false; - } -} - - -} // namespace OmGtk diff --git a/src/progs/gtk/PatchWindow.h b/src/progs/gtk/PatchWindow.h deleted file mode 100644 index e835c9e3..00000000 --- a/src/progs/gtk/PatchWindow.h +++ /dev/null @@ -1,142 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef PATCHWINDOW_H -#define PATCHWINDOW_H - -#include -#include -#include -#include -#include - -using std::string; using std::list; - -namespace LibOmClient { -class PatchModel; -class NodeModel; -class PortModel; -class ControlModel; -class MetadataModel; -} -using namespace LibOmClient; - - -namespace OmGtk { - -class PatchController; -class OmFlowCanvas; -class PatchView; -class LoadPluginWindow; -class LoadPatchWindow; -class NewSubpatchWindow; -class LoadSubpatchWindow; -class NewSubpatchWindow; -class NodeControlWindow; -class PatchDescriptionWindow; -class SubpatchModule; -class OmPort; -class BreadCrumb; - - -/** A window for a patch. - * - * \ingroup OmGtk - */ -class PatchWindow : public Gtk::Window -{ -public: - PatchWindow(BaseObjectType* cobject, const Glib::RefPtr& glade_xml); - ~PatchWindow(); - - void patch_controller(PatchController* pc); - - PatchController* patch_controller() const { return m_patch; } - LoadPluginWindow* load_plugin_window() const { return m_load_plugin_window; } - LoadSubpatchWindow* load_subpatch_window() const { return m_load_subpatch_window; } - NewSubpatchWindow* new_subpatch_window() const { return m_new_subpatch_window; } - - // Breadcrumb management - void node_removed(const string& name); - void node_renamed(const string& old_path, const string& new_path); - void patch_renamed(const string& new_path); - void rebuild_breadcrumbs(); - void breadcrumb_clicked(BreadCrumb* crumb); - - Gtk::MenuItem* menu_view_control_window() { return m_menu_view_control_window; } - -protected: - void on_show(); - void on_hide(); - bool on_delete_event(GdkEventAny* ev); - bool on_key_press_event(GdkEventKey* event); - -private: - //void event_open(); - void event_import(); - void event_save(); - void event_save_as(); - void event_close(); - void event_quit(); - void event_destroy(); - void event_clear(); - void event_fullscreen_toggled(); - void event_show_properties(); - void event_show_controls(); - void event_show_engine(); - - PatchController* m_patch; - LoadPluginWindow* m_load_plugin_window; - LoadPatchWindow* m_load_patch_window; - NewSubpatchWindow* m_new_subpatch_window; - LoadSubpatchWindow* m_load_subpatch_window; - - bool m_enable_signal; - bool m_position_stored; - int m_x; - int m_y; - - //Gtk::MenuItem* m_menu_open; - Gtk::MenuItem* m_menu_import; - Gtk::MenuItem* m_menu_save; - Gtk::MenuItem* m_menu_save_as; - Gtk::MenuItem* m_menu_configuration; - Gtk::MenuItem* m_menu_close; - Gtk::MenuItem* m_menu_quit; - Gtk::MenuItem* m_menu_fullscreen; - Gtk::MenuItem* m_menu_clear; - Gtk::MenuItem* m_menu_destroy_patch; - Gtk::MenuItem* m_menu_view_engine_window; - Gtk::MenuItem* m_menu_view_control_window; - Gtk::MenuItem* m_menu_view_patch_properties; - /*Gtk::MenuItem* m_menu_add_plugin; - Gtk::MenuItem* m_menu_new_subpatch; - Gtk::MenuItem* m_menu_load_subpatch;*/ - Gtk::MenuItem* m_menu_view_messages_window; - Gtk::MenuItem* m_menu_view_patch_tree_window; - Gtk::MenuItem* m_menu_help_about; - - Gtk::VBox* m_vbox; - Gtk::Viewport* m_viewport; - Gtk::HBox* m_breadcrumb_box; - list m_breadcrumbs; - //Gtk::Statusbar* m_status_bar; -}; - - -} // namespace OmGtk - -#endif // PATCHWINDOW_H diff --git a/src/progs/gtk/PortController.cpp b/src/progs/gtk/PortController.cpp deleted file mode 100644 index a33a2122..00000000 --- a/src/progs/gtk/PortController.cpp +++ /dev/null @@ -1,174 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "PortController.h" -#include "OmModule.h" -#include "PortModel.h" -#include "ControlPanel.h" -#include "OmPort.h" -#include "OmPatchPort.h" -#include "Store.h" - -namespace OmGtk { - - -PortController::PortController(CountedPtr model) -: GtkObjectController(model), - m_module(NULL), - m_port(NULL), - m_control_panel(NULL) -{ - assert(model); - assert(model->parent()); - assert(model->controller() == NULL); - - model->set_controller(this); -} - -/* -void -PortController::add_to_store() -{ - Store::instance().add_object(this); -} - - -void -PortController::remove_from_store() -{ - Store::instance().remove_object(this); -} -*/ - -void -PortController::destroy() -{ - assert(m_model->parent()); - NodeController* parent = (NodeController*)m_model->parent()->controller(); - assert(parent != NULL); - - if (m_control_panel != NULL) - m_control_panel->remove_port(path()); - - parent->remove_port(path(), false); -} - - -void -PortController::create_module(OmFlowCanvas* canvas, double x, double y) -{ - cerr << "Creating port module " << m_model->path() << endl; - - assert(canvas); - assert(port_model()); - m_module = new OmPortModule(canvas, this, x, y); - - // FIXME: leak - m_patch_port = new OmPatchPort(m_module, port_model()); - m_module->add_port(m_patch_port, false); - - m_module->move_to(x, y); -} - - -void -PortController::metadata_update(const string& key, const string& value) -{ - // FIXME: double lookups - - //cerr << path() << ": " << key << " = " << value << endl; - - if (key == "user-min") { - port_model()->user_min(atof(value.c_str())); - if (m_control_panel != NULL) - m_control_panel->set_range_min(m_model->path(), atof(value.c_str())); - } else if (key == "user-max") { - port_model()->user_max(atof(value.c_str())); - if (m_control_panel != NULL) - m_control_panel->set_range_max(m_model->path(), atof(value.c_str())); - } - - if (m_module != NULL) { - if (key == "module-x") { - float x = atof(value.c_str()); - //if (x > 0 && x < m_canvas->width()) - m_module->move_to(x, m_module->property_y().get_value()); - } else if (key == "module-y") { - float y = atof(value.c_str()); - //if (y > 0 && y < m_canvas->height()) - m_module->move_to(m_module->property_x().get_value(), y); - } - } - - GtkObjectController::metadata_update(key, value); -} - - -void -PortController::control_change(float value) -{ - // FIXME: double lookups - - port_model()->value(value); - - if (m_control_panel != NULL) - m_control_panel->set_control(port_model()->path(), value); -} - - -/** "Register" a control panel that is monitoring this port. - * - * The OmPort will handle notifying the ControlPanel when state - * changes occur, etc. - */ -void -PortController::set_control_panel(ControlPanel* cp) -{ - assert(m_control_panel == NULL); - m_control_panel = cp; -} - - -void -PortController::set_path(const Path& new_path) -{ - // Change port name on module, if view exists - if (m_port != NULL) - m_port->set_name(new_path.name()); - - if (m_control_panel != NULL) - m_control_panel->rename_port(m_model->path(), new_path); - - m_model->set_path(new_path); -} - - -/** Create the visible port on a canvas module. - * - * Does not resize the module, caller's responsibility to do so if necessary. - */ -void -PortController::create_port(OmModule* module) -{ - assert(module != NULL); - - m_port = new OmPort(module, port_model()); - module->add_port(m_port, false); -} - - -} // namespace OmGtk - diff --git a/src/progs/gtk/PortController.h b/src/progs/gtk/PortController.h deleted file mode 100644 index 34919129..00000000 --- a/src/progs/gtk/PortController.h +++ /dev/null @@ -1,84 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef PORTCONTROLLER_H -#define PORTCONTROLLER_H - -#include -#include -#include "GtkObjectController.h" -#include "OmPortModule.h" - -using std::string; -using namespace LibOmClient; - -namespace LibOmClient { - class MetadataModel; - class PortModel; -} - -namespace OmGtk { - -class Controller; -class OmPort; -class OmPatchPort; -class ControlPanel; -class OmModule; -class OmPortModule; -class OmFlowCanvas; - - -/** Controller for a port on a (non-patch) node. - * - * \ingroup OmGtk - */ -class PortController : public GtkObjectController -{ -public: - PortController(CountedPtr model); - virtual ~PortController() {} - - virtual void destroy(); - - virtual void create_module(OmFlowCanvas* canvas, double x, double y); - OmPortModule* module() { return m_module; } -/* - virtual void add_to_store(); - virtual void remove_from_store(); -*/ - virtual void metadata_update(const string& key, const string& value); - - void create_port(OmModule* module); - void set_path(const Path& new_path); - - void control_change(float value); - - ControlPanel* control_panel() const { return m_control_panel; } - void set_control_panel(ControlPanel* cp); - - CountedPtr port_model() const { return m_model; } - -private: - OmPatchPort* m_patch_port; ///< Port on m_module - OmPortModule* m_module; ///< Port pseudo-module (for patch ports only) - OmPort* m_port; ///< Port on some other canvas module - ControlPanel* m_control_panel; ///< Control panel that contains this port -}; - - -} // namespace OmGtk - -#endif // PORTCONTROLLER_H diff --git a/src/progs/gtk/RenameWindow.cpp b/src/progs/gtk/RenameWindow.cpp deleted file mode 100644 index 78f4d067..00000000 --- a/src/progs/gtk/RenameWindow.cpp +++ /dev/null @@ -1,113 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "RenameWindow.h" -#include -#include -#include "Controller.h" -#include "ObjectModel.h" -#include "GtkObjectController.h" -#include "Store.h" -using std::string; - -namespace OmGtk { - - -RenameWindow::RenameWindow(BaseObjectType* cobject, const Glib::RefPtr& glade_xml) -: Gtk::Window(cobject) -{ - glade_xml->get_widget("rename_name_entry", m_name_entry); - glade_xml->get_widget("rename_message_label", m_message_label); - glade_xml->get_widget("rename_cancel_button", m_cancel_button); - glade_xml->get_widget("rename_ok_button", m_ok_button); - - m_name_entry->signal_changed().connect(sigc::mem_fun(this, &RenameWindow::name_changed)); - m_cancel_button->signal_clicked().connect(sigc::mem_fun(this, &RenameWindow::cancel_clicked)); - m_ok_button->signal_clicked().connect(sigc::mem_fun(this, &RenameWindow::ok_clicked)); - - m_ok_button->property_sensitive() = false; -} - - -/** Set the object this window is renaming. - * This function MUST be called before using this object in any way. - */ -void -RenameWindow::set_object(GtkObjectController* object) -{ - m_object = object; - m_name_entry->set_text(object->path().name()); -} - - -/** Called every time the user types into the name input box. - * Used to display warning messages, and enable/disable the rename button. - */ -void -RenameWindow::name_changed() -{ - assert(m_name_entry); - assert(m_message_label); - assert(m_object->model()); - assert(m_object->model()->parent()); - - string name = m_name_entry->get_text(); - if (name.find("/") != string::npos) { - m_message_label->set_text("Name may not contain '/'"); - m_ok_button->property_sensitive() = false; - //} else if (m_object->parent()->patch_model()->get_node(name) != NULL) { - } else if (Store::instance().object(m_object->model()->parent()->base_path() + name)) { - m_message_label->set_text("An object already exists with that name."); - m_ok_button->property_sensitive() = false; - } else if (name.length() == 0) { - m_message_label->set_text(""); - m_ok_button->property_sensitive() = false; - } else { - m_message_label->set_text(""); - m_ok_button->property_sensitive() = true; - } -} - - -void -RenameWindow::cancel_clicked() -{ - cout << "cancel\n"; - m_name_entry->set_text(""); - hide(); -} - - -/** Rename the object. - * - * It shouldn't be possible for this to be called with an invalid name set - * (since the Rename button should be deactivated). This is just shinification - * though - the engine will handle invalid names gracefully. - */ -void -RenameWindow::ok_clicked() -{ - string name = m_name_entry->get_text(); - assert(name.length() > 0); - assert(name.find("/") == string::npos); - - Controller::instance().rename(m_object->model()->path(), name); - - hide(); -} - - -} // namespace OmGtk diff --git a/src/progs/gtk/RenameWindow.h b/src/progs/gtk/RenameWindow.h deleted file mode 100644 index 81dc96e3..00000000 --- a/src/progs/gtk/RenameWindow.h +++ /dev/null @@ -1,57 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef RENAMEWINDOW_H -#define RENAMEWINDOW_H - -#include -#include - - -namespace OmGtk { - -class GtkObjectController; - - -/** 'New Patch' Window. - * - * Loaded by libglade as a derived object. - * - * \ingroup OmGtk - */ -class RenameWindow : public Gtk::Window -{ -public: - RenameWindow(BaseObjectType* cobject, const Glib::RefPtr& refGlade); - - void set_object(GtkObjectController* object); - -private: - void name_changed(); - void cancel_clicked(); - void ok_clicked(); - - GtkObjectController* m_object; - - Gtk::Entry* m_name_entry; - Gtk::Label* m_message_label; - Gtk::Button* m_cancel_button; - Gtk::Button* m_ok_button; -}; - -} // namespace OmGtk - -#endif // RENAMEWINDOW_H diff --git a/src/progs/gtk/SubpatchModule.cpp b/src/progs/gtk/SubpatchModule.cpp deleted file mode 100644 index 8c79aed5..00000000 --- a/src/progs/gtk/SubpatchModule.cpp +++ /dev/null @@ -1,102 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "SubpatchModule.h" -#include -#include -#include "OmModule.h" -#include "NodeControlWindow.h" -#include "PatchModel.h" -#include "PatchWindow.h" -#include "OmFlowCanvas.h" -#include "PatchController.h" -#include "OmPort.h" -#include "Controller.h" -using std::cerr; using std::cout; using std::endl; - -namespace OmGtk { - - -SubpatchModule::SubpatchModule(OmFlowCanvas* canvas, PatchController* patch) -: OmModule(canvas, patch), - m_patch(patch) -{ - assert(canvas != NULL); - assert(patch != NULL); -} - - -void -SubpatchModule::add_om_port(PortModel* pm, bool resize_to_fit) -{ - OmPort* port = new OmPort(this, pm); - - port->signal_event().connect( - sigc::bind(sigc::mem_fun(m_canvas, &OmFlowCanvas::port_event), port)); - - Module::add_port(port, resize_to_fit); -} - - -void -SubpatchModule::on_double_click(GdkEventButton* event) -{ - assert(m_patch != NULL); - - // If window is visible - if (m_patch->window() != NULL - && m_patch->window()->is_visible()) { - m_patch->show_patch_window(); // just raise it - // No window visible - } else { - if (event->state & GDK_SHIFT_MASK) - m_patch->show_patch_window(); // open a new window - else - browse_to_patch(); - } -} - - - -/** Browse to this patch in current (parent's) window. */ -void -SubpatchModule::browse_to_patch() -{ - assert(m_patch->model()->parent()); - PatchController* pc = (PatchController*)m_patch->model()->parent()->controller(); - assert(pc != NULL); - assert(pc->window() != NULL); - - assert(pc->window() != NULL); - pc->window()->patch_controller(m_patch); -} - - - -void -SubpatchModule::show_dialog() -{ - m_patch->show_control_window(); -} - - -void -SubpatchModule::menu_remove() -{ - Controller::instance().destroy(m_patch->model()->path()); -} - -} // namespace OmGtk diff --git a/src/progs/gtk/SubpatchModule.h b/src/progs/gtk/SubpatchModule.h deleted file mode 100644 index 162779d7..00000000 --- a/src/progs/gtk/SubpatchModule.h +++ /dev/null @@ -1,69 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#ifndef SUBPATCHMODULE_H -#define SUBPATCHMODULE_H - -#include -#include -#include "OmModule.h" -#include "PatchController.h" -using std::string; using std::list; - -namespace LibOmClient { -class PatchModel; -class NodeModel; -class PortModel; -class PatchWindow; -} -using namespace LibOmClient; - -namespace OmGtk { - -class OmFlowCanvas; -class NodeControlWindow; -class PatchController; - - -/** A module to represent a subpatch - * - * \ingroup OmGtk - */ -class SubpatchModule : public OmModule -{ -public: - SubpatchModule(OmFlowCanvas* canvas, PatchController* controller); - virtual ~SubpatchModule() {} - - void add_om_port(PortModel* pm, bool resize=true); - - void on_double_click(GdkEventButton* ev); - - void show_dialog(); - void browse_to_patch(); - void menu_remove(); - - PatchController* patch() { return m_patch; } - -protected: - PatchController* m_patch; -}; - - -} // namespace OmGtk - -#endif // SUBPATCHMODULE_H diff --git a/src/progs/gtk/cmdline.c b/src/progs/gtk/cmdline.c deleted file mode 100644 index 11fcd108..00000000 --- a/src/progs/gtk/cmdline.c +++ /dev/null @@ -1,149 +0,0 @@ -/* - File autogenerated by gengetopt version 2.10 - generated with the following command: - gengetopt - - The developers of gengetopt consider the fixed text that goes in all - gengetopt output files to be in the public domain: - we make no copyright claims on it. -*/ - - -#include -#include -#include - -/* If we use autoconf. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "getopt.h" - -#include "cmdline.h" - -void -cmdline_parser_print_version (void) -{ - printf ("%s %s\n", CMDLINE_PARSER_PACKAGE, CMDLINE_PARSER_VERSION); -} - -void -cmdline_parser_print_help (void) -{ - cmdline_parser_print_version (); - printf("\n" - "Usage: %s [OPTIONS]...\n", CMDLINE_PARSER_PACKAGE); - printf(" -h --help Print help and exit\n"); - printf(" -V --version Print version and exit\n"); - printf(" -uSTRING --engine-url=STRING Om engine URL to connect to\n"); - printf(" -pINT --client-port=INT Client port to listen on\n"); -} - - -static char *gengetopt_strdup (const char *s); - -/* gengetopt_strdup() */ -/* strdup.c replacement of strdup, which is not standard */ -char * -gengetopt_strdup (const char *s) -{ - char *result = (char*)malloc(strlen(s) + 1); - if (result == (char*)0) - return (char*)0; - strcpy(result, s); - return result; -} - -int -cmdline_parser (int argc, char * const *argv, struct gengetopt_args_info *args_info) -{ - int c; /* Character of the parsed option. */ - int missing_required_options = 0; - - args_info->help_given = 0 ; - args_info->version_given = 0 ; - args_info->engine_url_given = 0 ; - args_info->client_port_given = 0 ; -#define clear_args() { \ - args_info->engine_url_arg = NULL; \ -} - - clear_args(); - - optarg = 0; - optind = 1; - opterr = 1; - optopt = '?'; - - while (1) - { - int option_index = 0; - char *stop_char; - - static struct option long_options[] = { - { "help", 0, NULL, 'h' }, - { "version", 0, NULL, 'V' }, - { "engine-url", 1, NULL, 'u' }, - { "client-port", 1, NULL, 'p' }, - { NULL, 0, NULL, 0 } - }; - - stop_char = 0; - c = getopt_long (argc, argv, "hVu:p:", long_options, &option_index); - - if (c == -1) break; /* Exit from `while (1)' loop. */ - - switch (c) - { - case 'h': /* Print help and exit. */ - clear_args (); - cmdline_parser_print_help (); - exit (EXIT_SUCCESS); - - case 'V': /* Print version and exit. */ - clear_args (); - cmdline_parser_print_version (); - exit (EXIT_SUCCESS); - - case 'u': /* Om engine URL to connect to. */ - if (args_info->engine_url_given) - { - fprintf (stderr, "%s: `--engine-url' (`-u') option given more than once\n", CMDLINE_PARSER_PACKAGE); - clear_args (); - exit (EXIT_FAILURE); - } - args_info->engine_url_given = 1; - args_info->engine_url_arg = gengetopt_strdup (optarg); - break; - - case 'p': /* Client port to listen on. */ - if (args_info->client_port_given) - { - fprintf (stderr, "%s: `--client-port' (`-p') option given more than once\n", CMDLINE_PARSER_PACKAGE); - clear_args (); - exit (EXIT_FAILURE); - } - args_info->client_port_given = 1; - args_info->client_port_arg = strtol (optarg,&stop_char,0); - break; - - - case 0: /* Long option with no short option */ - - case '?': /* Invalid option. */ - /* `getopt_long' already printed an error message. */ - exit (EXIT_FAILURE); - - default: /* bug: option not considered. */ - fprintf (stderr, "%s: option unknown: %c\n", CMDLINE_PARSER_PACKAGE, c); - abort (); - } /* switch */ - } /* while */ - - - if ( missing_required_options ) - exit (EXIT_FAILURE); - - return 0; -} diff --git a/src/progs/gtk/cmdline.ggo b/src/progs/gtk/cmdline.ggo deleted file mode 100644 index d62cf521..00000000 --- a/src/progs/gtk/cmdline.ggo +++ /dev/null @@ -1,7 +0,0 @@ -# Process this file with gengetopt -u to generate the necessary code (in cmdline.h, cmdline.c) - -package "om_gtk - A GUI client for the Om realtime modular synthesizer" - -option "engine-url" u "Om engine URL to connect to" string no -option "client-port" p "Client port to listen on" int no - diff --git a/src/progs/gtk/cmdline.h b/src/progs/gtk/cmdline.h deleted file mode 100644 index e404ac2e..00000000 --- a/src/progs/gtk/cmdline.h +++ /dev/null @@ -1,45 +0,0 @@ -/* cmdline.h */ - -/* File autogenerated by gengetopt version 2.10 */ - -#ifndef CMDLINE_H -#define CMDLINE_H - -/* If we use autoconf. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#ifndef CMDLINE_PARSER_PACKAGE -#define CMDLINE_PARSER_PACKAGE "om_gtk - A GUI client for the Om realtime modular synthesizer" -#endif - -#ifndef CMDLINE_PARSER_VERSION -#define CMDLINE_PARSER_VERSION VERSION -#endif - -struct gengetopt_args_info -{ - char * engine_url_arg; /* Om engine URL to connect to. */ - int client_port_arg; /* Client port to listen on. */ - - int help_given ; /* Whether help was given. */ - int version_given ; /* Whether version was given. */ - int engine_url_given ; /* Whether engine-url was given. */ - int client_port_given ; /* Whether client-port was given. */ - -} ; - -int cmdline_parser (int argc, char * const *argv, struct gengetopt_args_info *args_info); - -void cmdline_parser_print_help(void); -void cmdline_parser_print_version(void); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ -#endif /* CMDLINE_H */ diff --git a/src/progs/gtk/main.cpp b/src/progs/gtk/main.cpp deleted file mode 100644 index a5f41e90..00000000 --- a/src/progs/gtk/main.cpp +++ /dev/null @@ -1,98 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "config.h" -#include "cmdline.h" -#include "ConnectWindow.h" -#include "App.h" -#include "Store.h" -#include "Controller.h" -#include "Configuration.h" -#ifdef HAVE_LASH - #include "LashController.h" -#endif -#include "ThreadedSigClientInterface.h" -#include "OSCListener.h" -using Om::Shared::ClientInterface; - -using namespace OmGtk; - - -class OSCSigEmitter : public OSCListener, public ThreadedSigClientInterface { -public: - OSCSigEmitter(size_t queue_size, int listen_port) - : Om::Shared::ClientInterface() - , OSCListener(listen_port) - , ThreadedSigClientInterface(queue_size) - { - Glib::signal_timeout().connect( - sigc::mem_fun((ThreadedSigClientInterface*)this, - &ThreadedSigClientInterface::emit_signals), - 5, G_PRIORITY_DEFAULT_IDLE); - } -}; - - -int -main(int argc, char** argv) -{ - string engine_url = "osc.udp://localhost:16180"; - int client_port = 0; - - /* **** Parse command line options **** */ - gengetopt_args_info args_info; - if (cmdline_parser (argc, argv, &args_info) != 0) - return 1; - - if (args_info.engine_url_given) - engine_url = args_info.engine_url_arg; - if (args_info.client_port_given) - client_port = args_info.client_port_arg; - - // FIXME: - client_port = 16181; - - Gnome::Canvas::init(); - Gtk::Main gtk_main(argc, argv); - - OSCSigEmitter* emitter = new OSCSigEmitter(1024, 16181); - - /* Instantiate all singletons */ - App::instantiate(); - Store::instantiate(*(SigClientInterface*)emitter); - - Controller::instantiate(engine_url); - - /* Load settings */ - App::instance().configuration()->load_settings(); - App::instance().configuration()->apply_settings(); - - #ifdef HAVE_LASH - lash_args_t* lash_args = lash_extract_args(&argc, &argv); - #endif - - //gtk_main.signal_quit().connect(sigc::ptr_fun(cleanup)); - - #ifdef HAVE_LASH - LashController* lash_controller = new LashController(lash_args); - #endif - - App::instance().connect_window()->start(CountedPtr(emitter)); - gtk_main.run(); - - return 0; -} - diff --git a/src/progs/gtk/om-icon.png b/src/progs/gtk/om-icon.png deleted file mode 100644 index b26dd942..00000000 Binary files a/src/progs/gtk/om-icon.png and /dev/null differ diff --git a/src/progs/gtk/om_gtk.glade b/src/progs/gtk/om_gtk.glade deleted file mode 100644 index 17736ce2..00000000 --- a/src/progs/gtk/om_gtk.glade +++ /dev/null @@ -1,3651 +0,0 @@ - - - - - - - 1 - Om - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 640 - 480 - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 0 - - - - True - GTK_PACK_DIRECTION_LTR - GTK_PACK_DIRECTION_LTR - - - - True - _File - True - - - - - - - True - Load a patch into the current patch (merge with existing contents). - _Import - True - - - - - True - gtk-open - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - - - - True - Save this patch - gtk-save - True - - - - - - - True - Save this patch to a specific filename - gtk-save-as - True - - - - - - - True - - - - - - True - Configure OmGtk - Confi_guration - True - - - - - - True - gtk-preferences - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - - - - True - Close this window (patch will not be destroyed) - gtk-close - True - - - - - - - True - - - - - - True - Quit OmGtk (Om engine will continue running) - gtk-quit - True - - - - - - - - - - - True - _Patch - True - - - - - - - True - gtk-fullscreen - True - - - - - - - True - - - - - - True - View/Edit controls for this patch - _Controls - True - - - - - - True - gtk-preferences - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - View/Edit properties for this patch - gtk-properties - True - - - - - - - True - Remove all objects from patch - gtk-clear - True - - - - - - - True - Destoy this patch (remove it from the engine) - _Destroy - True - - - - - True - gtk-delete - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - - - - - True - _Windows - True - - - - - - - - True - Connect to, Disconnect from, or Launch Engine - _Engine - True - - - - - - True - gtk-connect - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - View all patches in the engine as a heirarchial list - _Patch Tree - True - - - - - - True - gtk-index - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - View error messages from the engine - _Messages - True - - - - - - True - gtk-dialog-error - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - - - - - True - _Help - True - - - - - - - - True - Right-click the canvas to add objects - True - - - - - True - gtk-info - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - - - - True - gtk-about - True - - - - - - - - - - 0 - False - False - - - - - - True - False - 0 - - - - - - - 0 - False - False - - - - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_NEVER - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - True - GTK_SHADOW_NONE - - - - - - - - - 0 - True - True - - - - - - - - 8 - Load Plugin - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ON_PARENT - False - 640 - 480 - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 10 - - - - True - False - 10 - - - - True - False - 5 - - - - True - False - 1 - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - True - All plugins available for loading - True - True - True - True - True - False - False - False - - - - - 0 - True - True - - - - - - True - 3 - 3 - False - 12 - 0 - - - - True - Clear filter text (show all plugins) - True - gtk-clear - True - GTK_RELIEF_NORMAL - True - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - Module Name: - False - True - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - Close dialog - True - gtk-close - True - GTK_RELIEF_NORMAL - True - - - 2 - 3 - 2 - 3 - fill - - - - - - - True - - - 1 - 2 - 1 - 2 - fill - - - - - - True - - - 0 - 1 - 1 - 2 - fill - fill - - - - - - True - - - 2 - 3 - 1 - 2 - fill - fill - - - - - - True - False - 0 - - - - True - Name of new Module - True - True - True - 0 - - True - * - False - - - 0 - True - True - - - - - - True - True - Polyphonic - True - GTK_RELIEF_NORMAL - True - True - False - True - - - 8 - False - False - - - - - - True - Add selected plugin to patch - True - gtk-add - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - - - - - 1 - 2 - 2 - 3 - 6 - fill - fill - - - - - - True - Search string to filter plugin list - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - 6 - - - - - - - True - Name contains: - False - True - - - 0 - 1 - 0 - 1 - fill - fill - - - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - - 8 - 320 - Create Subpatch - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ON_PARENT - False - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 0 - - - - True - 2 - 2 - False - 0 - 0 - - - - True - Name: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - 5 - fill - expand - - - - - - True - Polyphony: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - 5 - fill - expand - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 - - - 1 - 2 - 1 - 2 - 4 - fill - - - - - - - True - True - True - True - True - 0 - - True - * - True - - - 1 - 2 - 0 - 1 - 4 - - - - - - 0 - True - True - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - True - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - GTK_BUTTONBOX_END - 4 - - - - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-ok - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Create - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - 0 - True - True - - - - - - - - GTK_FILE_CHOOSER_ACTION_OPEN - True - False - False - False - Load Subpatch - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ON_PARENT - False - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 24 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - True - gtk-open - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - 2 - 4 - False - 4 - 12 - - - - True - <b>Name: </b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - <b>Polyphony: </b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - Use the name stored in the patch file - True - Load from file - True - GTK_RELIEF_NORMAL - True - True - False - True - - - 1 - 2 - 0 - 1 - fill - - - - - - - True - Use the polyphony value stored in the patch file - True - Load from file - True - GTK_RELIEF_NORMAL - True - True - False - True - - - 1 - 2 - 1 - 2 - fill - - - - - - - True - False - 0 - - - - True - Specify a custom polyphony value for new patch - True - Specify: - True - GTK_RELIEF_NORMAL - True - False - False - True - load_subpatch_poly_from_file_radio - - - 0 - False - False - - - - - - True - False - Specify a custom polyphony value for new patch - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 1000 1 10 10 - - - 0 - False - True - - - - - 3 - 4 - 1 - 2 - fill - fill - - - - - - True - Set polyphony to the same value as the parent (containing) patch - True - Same as parent (?) - True - GTK_RELIEF_NORMAL - True - False - False - True - load_subpatch_poly_from_file_radio - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - False - 0 - - - - True - Specify the name for the new patch - True - Specify: - True - GTK_RELIEF_NORMAL - True - False - False - True - load_subpatch_name_from_file_radio - - - 0 - False - False - - - - - - True - False - Specify the name for the new patch - True - True - True - 0 - - True - * - True - - - 0 - False - True - - - - - 3 - 4 - 0 - 1 - fill - - - - - 0 - False - True - - - - - - - - GTK_FILE_CHOOSER_ACTION_OPEN - True - False - False - False - Load Patch - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ON_PARENT - False - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - - - - False - 24 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - True - gtk-open - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - 1 - 4 - False - 4 - 12 - - - - True - <b>Polyphony: </b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Use the same polyphony as the current patch - True - Keep current - True - GTK_RELIEF_NORMAL - True - True - False - True - - - 1 - 2 - 0 - 1 - fill - - - - - - - True - Use the polyphony value stored in the patch file - True - Load from file - True - GTK_RELIEF_NORMAL - True - False - False - True - load_patch_poly_from_current_radio - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - False - 0 - - - - True - True - Specify: - True - GTK_RELIEF_NORMAL - True - False - False - True - load_patch_poly_from_current_radio - - - 0 - False - False - - - - - - True - False - Specify a custom polyphony value for new patch - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 - - - 0 - False - True - - - - - 3 - 4 - 0 - 1 - fill - fill - - - - - 0 - False - True - - - - - - - - window1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - 2 - 2 - False - 0 - 0 - - - - True - False - 0 - - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - True - GTK_SHADOW_NONE - - - - True - False - 0 - - - - - - - - - - - 0 - True - True - - - - - - True - True - 0 - - - - Apply changed controls to all voices - True - All Voices - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - False - 5 - - - - True - Apply changed controls to one voice only - True - Specific Voice: - True - GTK_RELIEF_NORMAL - True - False - False - True - control_panel_all_voices_radio - - - 0 - False - False - - - - - - True - False - Voice control changes are applied to - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1 1 100 1 10 10 - - - 0 - True - True - - - - - 0 - False - False - - - - - 5 - False - True - - - - - 0 - 1 - 0 - 1 - - - - - - True - False - 0 - - - - 1 - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - - - - 0 - True - True - - - - - - True - False - 0 - - - - True - Enable audio processing for this patch - True - Run - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - True - - - - - - True - True - False - True - - - 0 - False - False - - - - - - True - False - 0 - - - - True - Polyphony: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - ? - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 10 - True - False - - - - - - True - True - False - True - - - 0 - False - False - - - - - - True - False - 0 - - - - True - Zoom: - False - True - GTK_JUSTIFY_LEFT - False - False - 0.469999998808 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - False - False - - - - - - 90 - True - True - False - GTK_POS_RIGHT - 1 - GTK_UPDATE_CONTINUOUS - False - 1.10638296604 0.25 2 0.25 0 0 - - - 0 - False - False - - - - - 0 - False - True - - - - - 0 - False - False - - - - - 0 - 1 - 1 - 2 - fill - - - - - - - - 8 - 400 - 180 - Error Messages - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 6 - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - Error messages from the engine since the last time "Clear" was pressed - True - False - False - False - GTK_JUSTIFY_LEFT - GTK_WRAP_WORD - False - 5 - 5 - 0 - 5 - 5 - 0 - - - - - - 0 - True - True - - - - - - True - GTK_BUTTONBOX_END - 6 - - - - True - False - True - True - gtk-clear - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - - - - - 0 - False - True - - - - - - - - 8 - Configuration - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 6 - - - - True - 2 - 2 - False - 0 - 0 - - - - True - <b>Patch Search Path: </b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - - - - - - True - <i>Example: /foo/bar:/home/john/patches:/usr/share/om/patches</i> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 1 - 2 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - 0 - True - False - - - - - - True - GTK_BUTTONBOX_END - 6 - - - - True - Save these settings for future sessions - True - gtk-save - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - - - - - - True - Apply these settings to this session only - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - - - - - 0 - False - True - - - - - - - - 8 - 400 - 200 - Patch Description - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ON_PARENT - False - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 6 - - - - True - False - 5 - - - - True - Author: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - * - False - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - A short description of the patch to be included in the patch file - True - True - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_WORD - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 0 - True - True - - - - - - True - GTK_BUTTONBOX_END - 5 - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - - - - - - True - Apply these changes to be saved the next time the patch is saved - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - - - - - 0 - False - False - - - - - - - - 250 - Rename - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ON_PARENT - False - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - 5 - True - False - 0 - - - - True - False - 0 - - - - True - New name: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - * - True - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - True - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 6 - False - True - - - - - - True - GTK_BUTTONBOX_END - 5 - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-ok - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Rename - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - 0 - False - True - - - - - - - - 6 - window1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 0 - - - - True - <b>Node</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - 12 - True - False - 6 - - - - True - False - 4 - - - - True - Path: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - False - False - - - - - - True - False - True - Polyphonic - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - 6 - True - True - - - - - - 240 - True - <b>Plugin</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - 12 - True - 3 - 2 - False - 6 - 10 - - - - True - - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 0 - 1 - fill - - - - - - - True - Type: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - URI: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 1 - 2 - fill - - - - - - - True - Name: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 2 - 3 - fill - - - - - - 0 - True - True - - - - - - - - True - OmGtk - Copyright (C) 2005-2006 Dave Robillard - A client for the Om modular synthesizer - Licensed under the GNU GPL, Version 2. - -See COPYING file included with Om, or http://www.gnu.org/licenses/gpl.txt for more information - False - http://om-synth.nongnu.org - - Author: - Dave Robillard <drobilla@connect.carelton.ca> - -Contributors: - Lars Luthman - DSSI enhancements, bugfixes - Mario Lang - SuperCollider bindings, bugfixes - Leonard Ritter - Python bindings - - Usability / UI Design: - Thorsten Wilms - translator-credits - om-icon.png - - - - 8 - 320 - 340 - Patches - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - 3 - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - All patches loaded in the engine - True - True - True - False - True - False - False - False - - - - - - - - 6 - Connect to Engine - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER - False - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 6 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-quit - True - GTK_RELIEF_NORMAL - True - 0 - - - - - - True - False - True - True - gtk-disconnect - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - True - gtk-connect - True - GTK_RELIEF_NORMAL - True - -6 - - - - - 0 - False - False - GTK_PACK_END - - - - - - True - False - 0 - - - - True - False - 0 - - - - True - gtk-disconnect - 3 - 0.5 - 0.5 - 12 - 0 - - - 0 - False - True - - - - - - 5 - True - True - 0 - - - - True - GTK_PROGRESS_LEFT_TO_RIGHT - 0 - 0.10000000149 - - PANGO_ELLIPSIZE_NONE - - - 0 - False - False - - - - - - True - Not Connected - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - 0 - True - True - - - - - 0 - True - False - - - - - - True - - - 4 - True - True - - - - - - True - 3 - 2 - False - 8 - 0 - - - - True - False - 0 - - - - True - False - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 16180 1 65535 1 10 10 - - - 0 - False - False - - - - - 1 - 2 - 1 - 2 - 8 - fill - - - - - - True - False - 0 - - - - True - True - True - True - 0 - osc.udp://localhost:16180 - True - * - True - 28 - - - 0 - True - True - - - - - 1 - 2 - 0 - 1 - 8 - fill - fill - - - - - - True - True - Connect to running server at: - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - Launch and connect to server on port: - True - GTK_RELIEF_NORMAL - True - False - False - True - connect_server_radiobutton - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - False - True - Use internal engine - True - GTK_RELIEF_NORMAL - True - False - False - True - connect_server_radiobutton - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 2 - 3 - fill - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - - True - - - - True - Input - True - - - - True - gtk-connect - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - - True - Add an audio input to this patch - Audio - True - - - - - - - True - Add a control input (and a control slider for it) to this patch - Control - True - - - - - - - True - Add a MIDI input to this patch - MIDI - True - - - - - - - - - - - True - Output - True - - - - True - gtk-connect - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - - True - Add an audio output to this patch - Audio - True - - - - - - - True - Add a control output to this patch - Control - True - - - - - - - True - Add a MIDI output to this patch - MIDI - True - - - - - - - - - - - True - Load a plugin as a child of this patch - _Plugin... - True - - - - - True - gtk-execute - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - Load a patch as a child of this patch - Patch From _File... - True - - - - - True - gtk-open - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - Create a new (empty) patch as a child of this patch - _New Patch... - True - - - - - True - gtk-new - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - diff --git a/src/progs/gtk/om_gtk.glade.bak b/src/progs/gtk/om_gtk.glade.bak deleted file mode 100644 index 584336a9..00000000 --- a/src/progs/gtk/om_gtk.glade.bak +++ /dev/null @@ -1,3657 +0,0 @@ - - - - - - - 1 - Om - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 640 - 480 - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 0 - - - - True - GTK_PACK_DIRECTION_LTR - GTK_PACK_DIRECTION_LTR - - - - True - _File - True - - - - - - - True - Load a patch into the current patch (merge with existing contents). - _Import - True - - - - - True - gtk-open - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - - - - True - Save this patch - gtk-save - True - - - - - - - True - Save this patch to a specific filename - gtk-save-as - True - - - - - - - True - - - - - - True - Configure OmGtk - Confi_guration - True - - - - - - True - gtk-preferences - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - - - - True - Close this window (patch will not be destroyed) - gtk-close - True - - - - - - - True - - - - - - True - Quit OmGtk (Om engine will continue running) - gtk-quit - True - - - - - - - - - - - True - _Patch - True - - - - - - - True - gtk-fullscreen - True - - - - - - - True - - - - - - True - View/Edit controls for this patch - _Controls - True - - - - - - True - gtk-preferences - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - View/Edit properties for this patch - gtk-properties - True - - - - - - - True - Remove all objects from patch - gtk-clear - True - - - - - - - True - Destoy this patch (remove it from the engine) - _Destroy - True - - - - - True - gtk-delete - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - - - - - True - - - - - - True - _Windows - True - - - - - - - - True - Connect to, Disconnect from, or Launch Engine - _Engine - True - - - - - - True - gtk-connect - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - View all patches in the engine as a heirarchial list - _Patch Tree - True - - - - - - True - gtk-index - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - View error messages from the engine - _Messages - True - - - - - - True - gtk-dialog-error - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - - - - - True - _Help - True - - - - - - - - True - Right-click the canvas to add objects - True - - - - - True - gtk-info - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - - - - True - gtk-about - True - - - - - - - - - - 0 - False - False - - - - - - True - False - 0 - - - - - - - 0 - False - False - - - - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_NEVER - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - True - GTK_SHADOW_NONE - - - - - - - - - 0 - True - True - - - - - - - - 8 - Load Plugin - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ON_PARENT - False - 640 - 480 - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 10 - - - - True - False - 10 - - - - True - False - 5 - - - - True - False - 1 - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - True - All plugins available for loading - True - True - True - True - True - False - False - False - - - - - 0 - True - True - - - - - - True - 3 - 3 - False - 12 - 0 - - - - True - Clear filter text (show all plugins) - True - gtk-clear - True - GTK_RELIEF_NORMAL - True - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - Module Name: - False - True - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - Close dialog - True - gtk-close - True - GTK_RELIEF_NORMAL - True - - - 2 - 3 - 2 - 3 - fill - - - - - - - True - - - 1 - 2 - 1 - 2 - fill - - - - - - True - - - 0 - 1 - 1 - 2 - fill - fill - - - - - - True - - - 2 - 3 - 1 - 2 - fill - fill - - - - - - True - False - 0 - - - - True - Name of new Module - True - True - True - 0 - - True - * - False - - - 0 - True - True - - - - - - True - True - Polyphonic - True - GTK_RELIEF_NORMAL - True - True - False - True - - - 8 - False - False - - - - - - True - Add selected plugin to patch - True - gtk-add - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - - - - - 1 - 2 - 2 - 3 - 6 - fill - fill - - - - - - True - Search string to filter plugin list - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - 6 - - - - - - - True - Name contains: - False - True - - - 0 - 1 - 0 - 1 - fill - fill - - - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - - 8 - 320 - Create Subpatch - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ON_PARENT - False - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 0 - - - - True - 2 - 2 - False - 0 - 0 - - - - True - Name: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - 5 - fill - expand - - - - - - True - Polyphony: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - 5 - fill - expand - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 - - - 1 - 2 - 1 - 2 - 4 - fill - - - - - - - True - True - True - True - True - 0 - - True - * - True - - - 1 - 2 - 0 - 1 - 4 - - - - - - 0 - True - True - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - True - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - GTK_BUTTONBOX_END - 4 - - - - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-ok - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Create - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - 0 - True - True - - - - - - - - GTK_FILE_CHOOSER_ACTION_OPEN - True - False - False - False - Load Subpatch - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ON_PARENT - False - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 24 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - True - gtk-open - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - 2 - 4 - False - 4 - 12 - - - - True - <b>Name: </b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - <b>Polyphony: </b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - Use the name stored in the patch file - True - Load from file - True - GTK_RELIEF_NORMAL - True - True - False - True - - - 1 - 2 - 0 - 1 - fill - - - - - - - True - Use the polyphony value stored in the patch file - True - Load from file - True - GTK_RELIEF_NORMAL - True - True - False - True - - - 1 - 2 - 1 - 2 - fill - - - - - - - True - False - 0 - - - - True - Specify a custom polyphony value for new patch - True - Specify: - True - GTK_RELIEF_NORMAL - True - False - False - True - load_subpatch_poly_from_file_radio - - - 0 - False - False - - - - - - True - False - Specify a custom polyphony value for new patch - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 1000 1 10 10 - - - 0 - False - True - - - - - 3 - 4 - 1 - 2 - fill - fill - - - - - - True - Set polyphony to the same value as the parent (containing) patch - True - Same as parent (?) - True - GTK_RELIEF_NORMAL - True - False - False - True - load_subpatch_poly_from_file_radio - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - False - 0 - - - - True - Specify the name for the new patch - True - Specify: - True - GTK_RELIEF_NORMAL - True - False - False - True - load_subpatch_name_from_file_radio - - - 0 - False - False - - - - - - True - False - Specify the name for the new patch - True - True - True - 0 - - True - * - True - - - 0 - False - True - - - - - 3 - 4 - 0 - 1 - fill - - - - - 0 - False - True - - - - - - - - GTK_FILE_CHOOSER_ACTION_OPEN - True - False - False - False - Load Patch - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ON_PARENT - False - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - - - - False - 24 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - True - gtk-open - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - 1 - 4 - False - 4 - 12 - - - - True - <b>Polyphony: </b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Use the same polyphony as the current patch - True - Keep current - True - GTK_RELIEF_NORMAL - True - True - False - True - - - 1 - 2 - 0 - 1 - fill - - - - - - - True - Use the polyphony value stored in the patch file - True - Load from file - True - GTK_RELIEF_NORMAL - True - False - False - True - load_patch_poly_from_current_radio - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - False - 0 - - - - True - True - Specify: - True - GTK_RELIEF_NORMAL - True - False - False - True - load_patch_poly_from_current_radio - - - 0 - False - False - - - - - - True - False - Specify a custom polyphony value for new patch - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 - - - 0 - False - True - - - - - 3 - 4 - 0 - 1 - fill - fill - - - - - 0 - False - True - - - - - - - - window1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - 2 - 2 - False - 0 - 0 - - - - True - False - 0 - - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - True - GTK_SHADOW_NONE - - - - True - False - 0 - - - - - - - - - - - 0 - True - True - - - - - - True - True - 0 - - - - Apply changed controls to all voices - True - All Voices - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - False - 5 - - - - True - Apply changed controls to one voice only - True - Specific Voice: - True - GTK_RELIEF_NORMAL - True - False - False - True - control_panel_all_voices_radio - - - 0 - False - False - - - - - - True - False - Voice control changes are applied to - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1 1 100 1 10 10 - - - 0 - True - True - - - - - 0 - False - False - - - - - 5 - False - True - - - - - 0 - 1 - 0 - 1 - - - - - - True - False - 0 - - - - 1 - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - - - - 0 - True - True - - - - - - True - False - 0 - - - - True - Enable audio processing for this patch - True - Run - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - True - - - - - - True - True - False - True - - - 0 - False - False - - - - - - True - False - 0 - - - - True - Polyphony: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - ? - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 10 - True - False - - - - - - True - True - False - True - - - 0 - False - False - - - - - - True - False - 0 - - - - True - Zoom: - False - True - GTK_JUSTIFY_LEFT - False - False - 0.469999998808 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - False - False - - - - - - 90 - True - True - False - GTK_POS_RIGHT - 1 - GTK_UPDATE_CONTINUOUS - False - 1.10638296604 0.25 2 0.25 0 0 - - - 0 - False - False - - - - - 0 - False - True - - - - - 0 - False - False - - - - - 0 - 1 - 1 - 2 - fill - - - - - - - - 8 - 400 - 180 - Error Messages - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 6 - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - Error messages from the engine since the last time "Clear" was pressed - True - False - False - False - GTK_JUSTIFY_LEFT - GTK_WRAP_WORD - False - 5 - 5 - 0 - 5 - 5 - 0 - - - - - - 0 - True - True - - - - - - True - GTK_BUTTONBOX_END - 6 - - - - True - False - True - True - gtk-clear - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - - - - - 0 - False - True - - - - - - - - 8 - Configuration - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 6 - - - - True - 2 - 2 - False - 0 - 0 - - - - True - <b>Patch Search Path: </b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - - - - - - True - <i>Example: /foo/bar:/home/john/patches:/usr/share/om/patches</i> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 1 - 2 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - 0 - True - False - - - - - - True - GTK_BUTTONBOX_END - 6 - - - - True - Save these settings for future sessions - True - gtk-save - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - - - - - - True - Apply these settings to this session only - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - - - - - 0 - False - True - - - - - - - - 8 - 400 - 200 - Patch Description - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ON_PARENT - False - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 6 - - - - True - False - 5 - - - - True - Author: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - * - False - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - A short description of the patch to be included in the patch file - True - True - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_WORD - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 0 - True - True - - - - - - True - GTK_BUTTONBOX_END - 5 - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - - - - - - True - Apply these changes to be saved the next time the patch is saved - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - - - - - 0 - False - False - - - - - - - - 250 - Rename - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ON_PARENT - False - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - 5 - True - False - 0 - - - - True - False - 0 - - - - True - New name: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - * - True - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - True - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 6 - False - True - - - - - - True - GTK_BUTTONBOX_END - 5 - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-ok - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Rename - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - 0 - False - True - - - - - - - - 6 - window1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 0 - - - - True - <b>Node</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - 12 - True - False - 6 - - - - True - False - 4 - - - - True - Path: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - False - False - - - - - - True - False - True - Polyphonic - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - 6 - True - True - - - - - - 240 - True - <b>Plugin</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - 12 - True - 3 - 2 - False - 6 - 10 - - - - True - - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 0 - 1 - fill - - - - - - - True - Type: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - URI: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 1 - 2 - fill - - - - - - - True - Name: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 2 - 3 - fill - - - - - - 0 - True - True - - - - - - - - True - OmGtk - Copyright (C) 2005-2006 Dave Robillard - A client for the Om modular synthesizer - Licensed under the GNU GPL, Version 2. - -See COPYING file included with Om, or http://www.gnu.org/licenses/gpl.txt for more information - False - http://om-synth.nongnu.org - - Author: - Dave Robillard <drobilla@connect.carelton.ca> - -Contributors: - Lars Luthman - DSSI enhancements, bugfixes - Mario Lang - SuperCollider bindings, bugfixes - Leonard Ritter - Python bindings - - Usability / UI Design: - Thorsten Wilms - translator-credits - om-icon.png - - - - 8 - 320 - 340 - Patches - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - 3 - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - All patches loaded in the engine - True - True - True - False - True - False - False - False - - - - - - - - 6 - Connect to Engine - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER - False - True - False - om-icon.png - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 6 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-quit - True - GTK_RELIEF_NORMAL - True - 0 - - - - - - True - False - True - True - gtk-disconnect - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - True - gtk-connect - True - GTK_RELIEF_NORMAL - True - -6 - - - - - 0 - False - False - GTK_PACK_END - - - - - - True - False - 0 - - - - True - False - 0 - - - - True - gtk-disconnect - 3 - 0.5 - 0.5 - 12 - 0 - - - 0 - False - True - - - - - - 5 - True - True - 0 - - - - True - GTK_PROGRESS_LEFT_TO_RIGHT - 0 - 0.10000000149 - - PANGO_ELLIPSIZE_NONE - - - 0 - False - False - - - - - - True - Not Connected - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - 0 - True - True - - - - - 0 - True - False - - - - - - True - - - 4 - True - True - - - - - - True - 3 - 2 - False - 8 - 0 - - - - True - False - 0 - - - - True - False - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 16180 1 65535 1 10 10 - - - 0 - False - False - - - - - 1 - 2 - 1 - 2 - 8 - fill - - - - - - True - False - 0 - - - - True - True - True - True - 0 - osc.udp://localhost:16180 - True - * - True - 28 - - - 0 - True - True - - - - - 1 - 2 - 0 - 1 - 8 - fill - fill - - - - - - True - True - Connect to running server at: - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - Launch and connect to server on port: - True - GTK_RELIEF_NORMAL - True - False - False - True - connect_server_radiobutton - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - False - True - Use internal engine - True - GTK_RELIEF_NORMAL - True - False - False - True - connect_server_radiobutton - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 2 - 3 - fill - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - - True - - - - True - Input - True - - - - True - gtk-connect - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - - True - Add an audio input to this patch - Audio - True - - - - - - - True - Add a control input (and a control slider for it) to this patch - Control - True - - - - - - - True - Add a MIDI input to this patch - MIDI - True - - - - - - - - - - - True - Output - True - - - - True - gtk-connect - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - - True - Add an audio output to this patch - Audio - True - - - - - - - True - Add a control output to this patch - Control - True - - - - - - - True - Add a MIDI output to this patch - MIDI - True - - - - - - - - - - - True - Load a plugin as a child of this patch - _Plugin... - True - - - - - True - gtk-execute - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - Load a patch as a child of this patch - Patch From _File... - True - - - - - True - gtk-open - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - Create a new (empty) patch as a child of this patch - _New Patch... - True - - - - - True - gtk-new - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - diff --git a/src/progs/gtk/om_gtk.gladep b/src/progs/gtk/om_gtk.gladep deleted file mode 100644 index a8bd18bd..00000000 --- a/src/progs/gtk/om_gtk.gladep +++ /dev/null @@ -1,9 +0,0 @@ - - - - - OmGtk - om_gtk - C++ - FALSE - diff --git a/src/progs/gtk/om_gtk.gladep.bak b/src/progs/gtk/om_gtk.gladep.bak deleted file mode 100644 index a8bd18bd..00000000 --- a/src/progs/gtk/om_gtk.gladep.bak +++ /dev/null @@ -1,9 +0,0 @@ - - - - - OmGtk - om_gtk - C++ - FALSE - diff --git a/src/progs/gtk/singletons.cpp b/src/progs/gtk/singletons.cpp deleted file mode 100644 index b5544af3..00000000 --- a/src/progs/gtk/singletons.cpp +++ /dev/null @@ -1,27 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "App.h" -#include "Store.h" -#include "Controller.h" - -namespace OmGtk -{ - App* App::_instance = 0; - Store* Store::_instance = 0; - Controller* Controller::_instance = 0; -} - diff --git a/src/progs/ingenuity/App.cpp b/src/progs/ingenuity/App.cpp new file mode 100644 index 00000000..2b506a97 --- /dev/null +++ b/src/progs/ingenuity/App.cpp @@ -0,0 +1,220 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" +#include "App.h" +#include +#include +#include +#include +#include +#include +#include "PatchView.h" +#include "OmModule.h" +#include "ControlPanel.h" +#include "SubpatchModule.h" +#include "OmFlowCanvas.h" +#include "GtkObjectController.h" +#include "PatchController.h" +#include "NodeController.h" +#include "PortController.h" +#include "LoadPluginWindow.h" +#include "PatchWindow.h" +#include "MessagesWindow.h" +#include "ConfigWindow.h" +#include "Controller.h" +#include "GladeFactory.h" +#include "util/Path.h" +#include "ObjectModel.h" +#include "PatchModel.h" +#include "PatchTreeWindow.h" +#include "Configuration.h" +#include "ConnectWindow.h" +#ifdef HAVE_LASH +#include "LashController.h" +#endif +using std::cerr; using std::cout; using std::endl; +using std::string; +namespace LibOmClient { class PluginModel; } +using namespace LibOmClient; + +namespace OmGtk { + +class OmPort; + +App::App() +: m_configuration(new Configuration()), + m_about_dialog(NULL), + m_enable_signal(true) +{ + Glib::RefPtr glade_xml = GladeFactory::new_glade_reference(); + + glade_xml->get_widget_derived("connect_win", m_connect_window); + //glade_xml->get_widget_derived("new_patch_win", m_new_patch_window); + //glade_xml->get_widget_derived("load_patch_win", m_load_patch_window); + glade_xml->get_widget_derived("config_win", m_config_window); + glade_xml->get_widget_derived("patch_tree_win", m_patch_tree_window); +// glade_xml->get_widget_derived("main_patches_treeview", m_objects_treeview); + glade_xml->get_widget("about_win", m_about_dialog); + + m_config_window->configuration(m_configuration); + + glade_xml->get_widget_derived("messages_win", m_messages_window); +} + + +App::~App() +{ +} + + +void +App::error_message(const string& str) +{ + m_messages_window->post(str); + m_messages_window->show(); + m_messages_window->raise(); +} + + +/* +bool +App::idle_callback() +{ + m_client_hooks->process_events(); + +#ifdef HAVE_LASH + //if (lash_controller->enabled()) + // lash_controller->process_events(); +#endif + + return true; +} +*/ + + +/******** Event Handlers ************/ + + +#if 0 +App::event_load_session() +{ + Gtk::FileChooserDialog* dialog + = new Gtk::FileChooserDialog(*m_main_window, "Load Session", Gtk::FILE_CHOOSER_ACTION_OPEN); + + dialog->add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); + dialog->add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK); + int result = dialog->run(); + string filename = dialog->get_filename(); + delete dialog; + + cout << result << endl; + + assert(result == Gtk::RESPONSE_OK || result == Gtk::RESPONSE_CANCEL || result == Gtk::RESPONSE_NONE); + + if (result == Gtk::RESPONSE_OK) + //configuration->load_session(filename); + _controller->load_session(filename); +} + + +void +App::event_save_session_as() +{ + Gtk::FileChooserDialog dialog(*m_main_window, "Save Session", Gtk::FILE_CHOOSER_ACTION_SAVE); + + /* + Gtk::VBox* box = dialog.get_vbox(); + Gtk::Label warning("Warning: Recursively saving will overwrite any subpatch files \ + without confirmation."); + box->pack_start(warning, false, false, 2); + Gtk::CheckButton recursive_checkbutton("Recursively save all subpatches"); + box->pack_start(recursive_checkbutton, false, false, 0); + recursive_checkbutton.show(); + */ + dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); + dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK); + + int result = dialog.run(); + //bool recursive = recursive_checkbutton.get_active(); + + assert(result == Gtk::RESPONSE_OK || result == Gtk::RESPONSE_CANCEL || result == Gtk::RESPONSE_NONE); + + if (result == Gtk::RESPONSE_OK) { + string filename = dialog.get_filename(); + if (filename.length() < 11 || filename.substr(filename.length()-10) != ".omsession") + filename += ".omsession"; + + bool confirm = false; + std::fstream fin; + fin.open(filename.c_str(), std::ios::in); + if (fin.is_open()) { // File exists + string msg = "File already exists! Are you sure you want to overwrite "; + msg += filename + "?"; + Gtk::MessageDialog confirm_dialog(*m_main_window, + msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_YES_NO, true); + if (confirm_dialog.run() == Gtk::RESPONSE_YES) + confirm = true; + else + confirm = false; + } else { // File doesn't exist + confirm = true; + } + fin.close(); + + if (confirm) { + _controller->save_session(filename); + } + } +} +#endif + +void +App::add_patch_window(PatchWindow* pw) +{ + m_windows.push_back(pw); +} + + +void +App::remove_patch_window(PatchWindow* pw) +{ + m_windows.erase(find(m_windows.begin(), m_windows.end(), pw)); +} + + +/** Returns the number of Patch windows currently visible. + */ +int +App::num_open_patch_windows() +{ + int ret = 0; + for (list::iterator i = m_windows.begin(); i != m_windows.end(); ++i) + if ((*i)->is_visible()) + ++ret; + + return ret; +} + +void +App::quit() +{ + Gtk::Main::quit(); +} + + +} // namespace OmGtk + diff --git a/src/progs/ingenuity/App.h b/src/progs/ingenuity/App.h new file mode 100644 index 00000000..71faf71c --- /dev/null +++ b/src/progs/ingenuity/App.h @@ -0,0 +1,118 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef OMGTKAPP_H +#define OMGTKAPP_H + +#include +#include +#include +#include +#include +#include +#include +#include +using std::string; using std::map; using std::list; +using std::cerr; using std::endl; + +namespace LibOmClient { class PatchModel; class PluginModel; } +using namespace LibOmClient; + +/** \defgroup OmGtk GTK Client + */ + +namespace OmGtk { + +class PatchWindow; +class GtkObjectController; +class PatchController; +class NodeController; +class PortController; +class LoadPatchWindow; +class MessagesWindow; +class ConfigWindow; +class OmGtkObject; +class OmModule; +class OmPort; +class OmFlowCanvas; +class PatchTreeView; +class PatchTreeWindow; +class ConnectWindow; +class Configuration; + + +/** Singleton master class most everything is contained within. + * + * This is a horrible god-object, but it's shrinking in size as things are + * moved out. Hopefully it will go away entirely some day.. + * + * \ingroup OmGtk + */ +class App +{ +public: + ~App(); + + void error_message(const string& msg); + + void quit(); + + void add_patch_window(PatchWindow* pw); + void remove_patch_window(PatchWindow* pw); + + int num_open_patch_windows(); + + ConnectWindow* connect_window() const { return m_connect_window; } + Gtk::Dialog* about_dialog() const { return m_about_dialog; } + ConfigWindow* configuration_dialog() const { return m_config_window; } + MessagesWindow* messages_dialog() const { return m_messages_window; } + PatchTreeWindow* patch_tree() const { return m_patch_tree_window; } + Configuration* configuration() const { return m_configuration; } + + static void instantiate() { if (!_instance) _instance = new App(); } + static inline App& instance() { assert(_instance); return *_instance; } + +protected: + App(); + static App* _instance; + + //bool connect_callback(); + //bool idle_callback(); + + Configuration* m_configuration; + + list m_windows; + + ConnectWindow* m_connect_window; + MessagesWindow* m_messages_window; + PatchTreeWindow* m_patch_tree_window; + ConfigWindow* m_config_window; + Gtk::Dialog* m_about_dialog; + Gtk::Button* m_engine_error_close_button; + + /** Used to avoid feedback loops with (eg) process checkbutton + * FIXME: Maybe this should be globally implemented at the Controller level, + * disable all command sending while handling events to avoid feedback + * issues with widget event callbacks? This same pattern is duplicated + * too much... */ + bool m_enable_signal; +}; + + +} // namespace OmGtk + +#endif // OMGTKAPP_H + diff --git a/src/progs/ingenuity/BreadCrumb.h b/src/progs/ingenuity/BreadCrumb.h new file mode 100644 index 00000000..2e30174a --- /dev/null +++ b/src/progs/ingenuity/BreadCrumb.h @@ -0,0 +1,68 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef BREADCRUMB_H +#define BREADCRUMB_H + +#include +#include "PatchWindow.h" +#include "PatchController.h" +#include "PatchModel.h" + +namespace OmGtk { + + +/** Breadcrumb button in a PatchWindow. + * + * \ingroup OmGtk + */ +class BreadCrumb : public Gtk::ToggleButton +{ +public: + BreadCrumb(PatchWindow* window, const Path& path) + : m_window(window) + , m_path(path) + { + set_border_width(0); + set_path(path); + signal_clicked().connect(sigc::bind(sigc::mem_fun( + m_window, &PatchWindow::breadcrumb_clicked), this)); + show_all(); + } + + //PatchController* patch() { return m_patch; } + + void set_path(const Path& path) + { + remove(); + const string text = (path == "/") ? "/" : path.name(); + Gtk::Label* lab = manage(new Gtk::Label(text)); + lab->set_padding(0, 0); + lab->show(); + add(*lab); + } + + Path& path() { return m_path; } + +private: + PatchWindow* m_window; + Path m_path; + //PatchController* m_patch; +}; + +} // namespace OmGtk + +#endif // BREADCRUMB_H diff --git a/src/progs/ingenuity/ConfigWindow.cpp b/src/progs/ingenuity/ConfigWindow.cpp new file mode 100644 index 00000000..38cc1adf --- /dev/null +++ b/src/progs/ingenuity/ConfigWindow.cpp @@ -0,0 +1,86 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "ConfigWindow.h" +#include +#include +#include +#include +#include "PatchController.h" +#include "NodeModel.h" +#include "OmFlowCanvas.h" +using std::cout; using std::cerr; using std::endl; + + +namespace OmGtk { + +ConfigWindow::ConfigWindow(BaseObjectType* cobject, const Glib::RefPtr& xml) +: Gtk::Window(cobject), + m_configuration(NULL) +{ + xml->get_widget("config_path_entry", m_path_entry); + xml->get_widget("config_save_button", m_save_button); + xml->get_widget("config_cancel_button", m_cancel_button); + xml->get_widget("config_ok_button", m_ok_button); + + m_save_button->signal_clicked().connect( sigc::mem_fun(this, &ConfigWindow::save_clicked)); + m_cancel_button->signal_clicked().connect(sigc::mem_fun(this, &ConfigWindow::cancel_clicked)); + m_ok_button->signal_clicked().connect( sigc::mem_fun(this, &ConfigWindow::ok_clicked)); +} + + +/** Sets the state manager for this window and initializes everything. + * + * This function MUST be called before using the window in any way! + */ +void +ConfigWindow::configuration(Configuration* sm) +{ + m_configuration = sm; + m_path_entry->set_text(sm->patch_path()); +} + + + +///// Event Handlers ////// + + +void +ConfigWindow::save_clicked() +{ + m_configuration->patch_path(m_path_entry->get_text()); + m_configuration->apply_settings(); + m_configuration->save_settings(); +} + + +void +ConfigWindow::cancel_clicked() +{ + hide(); +} + + +void +ConfigWindow::ok_clicked() +{ + m_configuration->patch_path(m_path_entry->get_text()); + m_configuration->apply_settings(); + hide(); +} + + +} // namespace OmGtk diff --git a/src/progs/ingenuity/ConfigWindow.h b/src/progs/ingenuity/ConfigWindow.h new file mode 100644 index 00000000..14f10a1b --- /dev/null +++ b/src/progs/ingenuity/ConfigWindow.h @@ -0,0 +1,63 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + +#ifndef CONFIGWINDOW_H +#define CONFIGWINDOW_H + +#include "PluginModel.h" +#include "Configuration.h" +#include +#include +#include +#include + +using std::list; +using LibOmClient::PluginModel; + +namespace OmGtk { + + +/** 'Configuration' window. + * + * Loaded by glade as a derived object. + * + * \ingroup OmGtk + */ +class ConfigWindow : public Gtk::Window +{ +public: + ConfigWindow(BaseObjectType* cobject, const Glib::RefPtr& xml); + + void configuration(Configuration* sm); + +private: + void save_clicked(); + void cancel_clicked(); + void ok_clicked(); + + Configuration* m_configuration; + + Gtk::Entry* m_path_entry; + Gtk::Button* m_save_button; + Gtk::Button* m_cancel_button; + Gtk::Button* m_ok_button; +}; + + +} // namespace OmGtk + +#endif // CONFIGWINDOW_H diff --git a/src/progs/ingenuity/Configuration.cpp b/src/progs/ingenuity/Configuration.cpp new file mode 100644 index 00000000..c71587e3 --- /dev/null +++ b/src/progs/ingenuity/Configuration.cpp @@ -0,0 +1,184 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "Configuration.h" +#include +#include +#include +#include +#include +#include "PortModel.h" +#include "PluginModel.h" +#include "PatchController.h" +#include "PatchModel.h" +#include "OmFlowCanvas.h" +#include "Controller.h" + +using std::cerr; using std::cout; using std::endl; +using std::map; using std::string; +using LibOmClient::PatchModel; + +namespace OmGtk { + +using namespace LibOmClient; + + +Configuration::Configuration() +: m_patch_path("/usr/share/om/patches:/usr/local/share/om/patches"), + m_audio_port_color( 0x394f66FF), + m_control_port_color(0x396639FF), + m_midi_port_color( 0x663939FF) +{ +} + + +Configuration::~Configuration() +{ +} + + +/** Loads settings from the rc file. Passing no parameter will load from + * the default location. + */ +void +Configuration::load_settings(string filename) +{ + if (filename == "") + filename = string(getenv("HOME")).append("/.omgtkrc"); + + std::ifstream is; + is.open(filename.c_str(), std::ios::in); + + if ( ! is.good()) { + cout << "[Configuration] Unable to open settings file " << filename << endl; + return; + } else { + cout << "[Configuration] Loading settings from " << filename << endl; + } + + string s; + + is >> s; + if (s != "file_version") { + cerr << "[Configuration] Corrupt settings file, load aborted." << endl; + is.close(); + return; + } + + is >> s; + if (s != "1") { + cerr << "[Configuration] Unknown settings file version number, load aborted." << endl; + is.close(); + return; + } + + is >> s; + if (s != "patch_path") { + cerr << "[Configuration] Corrupt settings file, load aborted." << endl; + is.close(); + return; + } + + is >> s; + m_patch_path = s; + + is.close(); +} + + +/** Saves settings to rc file. Passing no parameter will save to the + * default location. + */ +void +Configuration::save_settings(string filename) +{ + if (filename == "") + filename = string(getenv("HOME")).append("/.omgtkrc"); + + std::ofstream os; + os.open(filename.c_str(), std::ios::out); + + if ( ! os.good()) { + cout << "[Configuration] Unable to write to setting file " << filename << endl; + return; + } else { + cout << "[Configuration] Saving settings to " << filename << endl; + } + + os << "file_version 1" << endl; + os << "patch_path " << m_patch_path << endl; + + os.close(); +} + + +/** Applies the current loaded settings to whichever parts of the app + * need updating. + */ +void +Configuration::apply_settings() +{ + Controller::instance().set_patch_path(m_patch_path); +} + + +int +Configuration::get_port_color(const PortModel* pi) +{ + assert(pi != NULL); + + if (pi->is_control()) { + return m_control_port_color; + } else if (pi->is_audio()) { + return m_audio_port_color; + } else if (pi->is_midi()) { + return m_midi_port_color; + } + + cerr << "[Configuration] Unknown port type! Port will be bright red, this is an error." << endl; + return 0xFF0000FF; +} + +/* +Coord +Configuration::get_window_location(const string& id) +{ + return m_window_locations[id]; +} + + +void +Configuration::set_window_location(const string& id, Coord loc) +{ + m_window_locations[id] = loc; +} + + +Coord +Configuration::get_window_size(const string& id) +{ + return m_window_sizes[id]; +} + + +void +Configuration::set_window_size(const string& id, Coord size) +{ + m_window_sizes[id] = size; +}*/ + + +} // namespace OmGtk diff --git a/src/progs/ingenuity/Configuration.h b/src/progs/ingenuity/Configuration.h new file mode 100644 index 00000000..f17bffc6 --- /dev/null +++ b/src/progs/ingenuity/Configuration.h @@ -0,0 +1,76 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef CONFIG_H +#define CONFIG_H + +#include + +namespace LibOmClient { class PortModel; } +using LibOmClient::PortModel; +using std::string; + +struct Coord { double x; double y; }; + +namespace OmGtk { + +class Controller; + + +/** Singleton state manager for the entire app. + * + * Stores settings like color preferences, search paths, etc. + * (ie any user-defined preferences to be stoed in the rc file). + * + * \ingroup OmGtk + */ +class Configuration +{ +public: + Configuration(); + ~Configuration(); + + void load_settings(string filename = ""); + void save_settings(string filename = ""); + + void apply_settings(); + + string patch_path() { return m_patch_path; } + void patch_path(const string& path) { m_patch_path = path; } + + const string& patch_folder() { return m_patch_folder; } + void set_patch_folder(const string& f) { m_patch_folder = f; } + + int get_port_color(const PortModel* pi); + +private: + /** Search path for patch files. Colon delimited, as usual. */ + string m_patch_path; + + /** Most recent patch folder shown in open dialog */ + string m_patch_folder; + + int m_audio_port_color; + int m_control_port_color; + int m_midi_port_color; +}; + + +} // namespace OmGtk + +#endif // CONFIG_H + + diff --git a/src/progs/ingenuity/ConnectWindow.cpp b/src/progs/ingenuity/ConnectWindow.cpp new file mode 100644 index 00000000..a064c0bd --- /dev/null +++ b/src/progs/ingenuity/ConnectWindow.cpp @@ -0,0 +1,260 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "ConnectWindow.h" +#include +#include +#include +#include "interface/ClientKey.h" +#include "interface/ClientInterface.h" +#include "ThreadedSigClientInterface.h" +#include "Controller.h" +#include "OSCListener.h" +#include "Store.h" +#include "PatchController.h" +#include "PatchModel.h" + +namespace OmGtk { + + +ConnectWindow::ConnectWindow(BaseObjectType* cobject, const Glib::RefPtr& xml) +: Gtk::Dialog(cobject) +, _client(NULL) +{ + xml->get_widget("connect_icon", _icon); + xml->get_widget("connect_progress_bar", _progress_bar); + xml->get_widget("connect_progress_label", _progress_label); + xml->get_widget("connect_server_radiobutton", _server_radio); + xml->get_widget("connect_url_entry", _url_entry); + xml->get_widget("connect_launch_radiobutton", _launch_radio); + xml->get_widget("connect_port_spinbutton", _port_spinbutton); + xml->get_widget("connect_internal_radiobutton", _internal_radio); + xml->get_widget("connect_disconnect_button", _disconnect_button); + xml->get_widget("connect_connect_button", _connect_button); + xml->get_widget("connect_quit_button", _quit_button); + + _server_radio->signal_toggled().connect(sigc::mem_fun(this, &ConnectWindow::server_toggled)); + _launch_radio->signal_toggled().connect(sigc::mem_fun(this, &ConnectWindow::launch_toggled)); + _internal_radio->signal_clicked().connect(sigc::mem_fun(this, &ConnectWindow::internal_toggled)); + _disconnect_button->signal_clicked().connect(sigc::mem_fun(this, &ConnectWindow::disconnect)); + _connect_button->signal_clicked().connect(sigc::mem_fun(this, &ConnectWindow::connect)); + _quit_button->signal_clicked().connect(sigc::mem_fun(this, &ConnectWindow::quit)); +} + + +void +ConnectWindow::start(CountedPtr client) +{ + _client = client; + resize(100, 100); + show(); +} + + +void +ConnectWindow::connect() +{ + if (_server_radio->get_active()) { + Controller::instance().set_engine_url(_url_entry->get_text()); + Glib::signal_timeout().connect( + sigc::mem_fun(this, &ConnectWindow::gtk_callback), 100); + + } else if (_launch_radio->get_active()) { + int port = _port_spinbutton->get_value_as_int(); + char port_str[6]; + snprintf(port_str, 6, "%u", port); + const string port_arg = string("--port=").append(port_str); + Controller::instance().set_engine_url( + string("osc.udp://localhost:").append(port_str)); + + if (fork() == 0) { // child + cerr << "Executing 'om " << port_arg << "' ..." << endl; + execlp("om", port_arg.c_str(), 0); + } else { + Glib::signal_timeout().connect( + sigc::mem_fun(this, &ConnectWindow::gtk_callback), 100); + } + } + + _connect_button->set_sensitive(false); +} + + +void +ConnectWindow::disconnect() +{ + // Nope +} + + +void +ConnectWindow::quit() +{ + if (Controller::instance().is_attached()) { + Gtk::MessageDialog d(*this, "This will exit OmGtk, but the engine will " + "remain running (if it is remote).\n\nAre you sure you want to quit?", + true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE, true); + d.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); + d.add_button(Gtk::Stock::QUIT, Gtk::RESPONSE_CLOSE); + int ret = d.run(); + if (ret == Gtk::RESPONSE_CLOSE) + Gtk::Main::quit(); + } else { + Gtk::Main::quit(); + } +} + + +void +ConnectWindow::server_toggled() +{ + _url_entry->set_sensitive(true); + _port_spinbutton->set_sensitive(false); +} + + +void +ConnectWindow::launch_toggled() +{ + _url_entry->set_sensitive(false); + _port_spinbutton->set_sensitive(true); +} + + +void +ConnectWindow::internal_toggled() +{ + // Not quite yet... + _url_entry->set_sensitive(false); + _port_spinbutton->set_sensitive(false); +} + + +bool +ConnectWindow::gtk_callback() +{ + /* This isn't very nice (isn't threaded), but better than no dialog at + * all like before :) + */ + + // Timing stuff for repeated attach attempts + timeval now; + gettimeofday(&now, NULL); + static timeval last = now; + + static int stage = 0; + + /* Connecting to engine */ + if (stage == 0) { + // FIXME + //assert(!Controller::instance().is_attached()); + _progress_label->set_text(string("Connecting to engine at ").append( + Controller::instance().engine_url()).append("...")); + present(); + Controller::instance().attach(); + ++stage; + } else if (stage == 1) { + if (Controller::instance().is_attached()) { + Controller::instance().activate(); + ++stage; + } else { + const float ms_since_last = (now.tv_sec - last.tv_sec) * 1000.0f + + (now.tv_usec - last.tv_usec) * 0.001f; + if (ms_since_last > 1000) { + Controller::instance().attach(); + last = now; + } + } + } else if (stage == 2) { + _progress_label->set_text(string("Registering as client...")); + //Controller::instance().register_client(Controller::instance().client_hooks()); + // FIXME + //auto_ptr client(new ThreadedSigClientInterface(); + Controller::instance().register_client(ClientKey(), _client); + Controller::instance().load_plugins(); + ++stage; + } else if (stage == 3) { + // Register idle callback to process events and whatnot + // (Gtk refreshes at priority G_PRIORITY_HIGH_IDLE+20) + /*Glib::signal_timeout().connect( + sigc::mem_fun(this, &App::idle_callback), 100, G_PRIORITY_HIGH_IDLE);*/ + //Glib::signal_idle().connect(sigc::mem_fun(this, &App::idle_callback)); + /* Glib::signal_timeout().connect( + sigc::mem_fun((ThreadedSigClientInterface*)_client, &ThreadedSigClientInterface::emit_signals), + 5, G_PRIORITY_DEFAULT_IDLE);*/ + + _progress_label->set_text(string("Requesting plugins...")); + Controller::instance().request_plugins(); + ++stage; + } else if (stage == 4) { + // Wait for first plugins message + if (Store::instance().plugins().size() > 0) { + _progress_label->set_text(string("Receiving plugins...")); + ++stage; + } + } else if (stage == 5) { + // FIXME + /*if (Store::instance().plugins().size() < _client->num_plugins()) { + static char buf[32]; + snprintf(buf, 32, "%zu/%zu", Store::instance().plugins().size(), + ThreadedSigClientInterface::instance()->num_plugins()); + _progress_bar->set_text(Glib::ustring(buf)); + _progress_bar->set_fraction( + Store::instance().plugins().size() / (double)_client->num_plugins()); + } else {*/ + _progress_bar->set_text(""); + ++stage; + //} + } else if (stage == 6) { + _progress_label->set_text(string("Waiting for root patch...")); + Controller::instance().request_all_objects(); + ++stage; + } else if (stage == 7) { + if (Store::instance().num_objects() > 0) { + CountedPtr root = Store::instance().patch("/"); + assert(root); + PatchController* root_controller = new PatchController(root); + root_controller->show_patch_window(); + ++stage; + } + } else if (stage == 8) { + _progress_label->set_text(string("Connected to engine at ").append( + Controller::instance().engine_url())); + ++stage; + } else if (stage == 9) { + stage = -1; + hide(); + } + + if (stage != 5) // yeah, ew + _progress_bar->pulse(); + + if (stage == -1) { // finished connecting + _icon->set(Gtk::Stock::CONNECT, Gtk::ICON_SIZE_LARGE_TOOLBAR); + _progress_bar->set_fraction(1.0); + _url_entry->set_sensitive(false); + _connect_button->set_sensitive(false); + _port_spinbutton->set_sensitive(false); + _launch_radio->set_sensitive(false); + _internal_radio->set_sensitive(false); + return false; // deregister this callback + } else { + return true; + } +} + + +} // namespace OmGtk diff --git a/src/progs/ingenuity/ConnectWindow.h b/src/progs/ingenuity/ConnectWindow.h new file mode 100644 index 00000000..fe1e289a --- /dev/null +++ b/src/progs/ingenuity/ConnectWindow.h @@ -0,0 +1,73 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef CONNECT_WINDOW_H +#define CONNECT_WINDOW_H + +#include +#include +#include +#include "util/CountedPtr.h" +#include "interface/ClientInterface.h" + +namespace OmGtk { + +class App; +class Controller; + + +/** The initially visible "Connect to engine" window. + * + * This handles actually connecting to the engine and making sure everything + * is ready before really launching the app (eg wait for the root patch). + * + * \ingroup OmGtk + */ +class ConnectWindow : public Gtk::Dialog +{ +public: + ConnectWindow(BaseObjectType* cobject, const Glib::RefPtr& xml); + + void start(CountedPtr client); +private: + void server_toggled(); + void launch_toggled(); + void internal_toggled(); + + void disconnect(); + void connect(); + void quit(); + + bool gtk_callback(); + + CountedPtr _client; + Gtk::Image* _icon; + Gtk::ProgressBar* _progress_bar; + Gtk::Label* _progress_label; + Gtk::Entry* _url_entry; + Gtk::RadioButton* _server_radio; + Gtk::SpinButton* _port_spinbutton; + Gtk::RadioButton* _launch_radio; + Gtk::RadioButton* _internal_radio; + Gtk::Button* _disconnect_button; + Gtk::Button* _connect_button; + Gtk::Button* _quit_button; +}; + + +} // namespace OmGtk + +#endif // CONNECT_WINDOW_H diff --git a/src/progs/ingenuity/ControlGroups.cpp b/src/progs/ingenuity/ControlGroups.cpp new file mode 100644 index 00000000..ef94b75f --- /dev/null +++ b/src/progs/ingenuity/ControlGroups.cpp @@ -0,0 +1,418 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "ControlGroups.h" +#include "ControlPanel.h" +#include "PortModel.h" +#include "Controller.h" +#include +#include +using std::cerr; using std::cout; using std::endl; + +using namespace LibOmClient; + +namespace OmGtk { + +//////////////////// SliderControlGroup //////////////////////// + + +SliderControlGroup::SliderControlGroup(ControlPanel* panel, CountedPtr pm, bool separator) +: ControlGroup(panel, pm, separator), + m_enabled(true), + m_enable_signal(false), + m_name_label(pm->name(), 0.0, 0.0), + m_range_box(false, 0), + m_range_label("Range: "), + m_min_spinner(1.0, (pm->is_integer() ? 0 : 4)), // climb rate, digits + m_hyphen_label(" - "), + m_max_spinner(1.0, (pm->is_integer() ? 0 : 4)), + m_slider_box(false, 0), + m_value_spinner(1.0, (pm->is_integer() ? 0 : 4)), + m_slider(pm->user_min(), pm->user_max(), (pm->is_integer() ? 1.0 : 0.0001)) +{ + m_slider.set_increments(1.0, 10.0); + + // Compensate for crazy plugins + if (m_port_model->user_max() <= m_port_model->user_min()) { + m_port_model->user_max(m_port_model->user_min() + 1.0); + m_slider.set_range(m_port_model->user_min(), m_port_model->user_max()); + } + m_slider.property_draw_value() = false; + + set_name(pm->name()); + + m_name_label.property_use_markup() = true; + m_range_label.property_use_markup() = true; + + m_value_spinner.set_range(-99999, 99999); + m_value_spinner.set_update_policy(Gtk::UPDATE_ALWAYS); // allow entered values outside range + m_value_spinner.set_value(m_port_model->value()); + m_value_spinner.set_increments(1.0, 10.0); + m_value_spinner.set_digits(5); + m_value_spinner.signal_value_changed().connect( + sigc::mem_fun(*this, &SliderControlGroup::update_value_from_spinner)); + m_min_spinner.set_range(-99999, 99999); + m_min_spinner.set_value(m_port_model->user_min()); + m_min_spinner.set_increments(1.0, 10.0); + m_min_spinner.set_digits(5); + m_min_spinner.signal_value_changed().connect(sigc::mem_fun(*this, &SliderControlGroup::min_changed)); + m_max_spinner.set_range(-99999, 99999); + m_max_spinner.set_value(m_port_model->user_max()); + m_max_spinner.set_increments(1.0, 10.0); + m_max_spinner.set_digits(5); + m_max_spinner.signal_value_changed().connect(sigc::mem_fun(*this, &SliderControlGroup::max_changed)); + + m_slider.set_value(m_port_model->value()); + + m_slider.signal_event().connect( + sigc::mem_fun(*this, &SliderControlGroup::slider_pressed)); + + m_slider.signal_value_changed().connect( + sigc::mem_fun(*this, &SliderControlGroup::update_value_from_slider)); + + m_range_box.pack_start(m_range_label, false, false, 2); + m_range_box.pack_start(m_min_spinner, false, false, 1); + m_range_box.pack_start(m_hyphen_label, false, false, 1); + m_range_box.pack_start(m_max_spinner, false, false, 1); + + m_header_box.pack_start(m_name_label, true, true, 0); + m_header_box.pack_start(m_range_box, true, true, 2); + + m_slider_box.pack_start(m_value_spinner, false, false, 1); + m_slider_box.pack_start(m_slider, true, true, 5); + + pack_start(m_header_box, false, false, 0); + pack_start(m_slider_box, false, false, 0); + + update_range(); + + m_enable_signal = true; + + show_all(); +} + + +void +SliderControlGroup::set_name(const string& name) +{ + string name_label = ""; + name_label += name + ""; + m_name_label.set_markup(name_label); +} + + +void +SliderControlGroup::set_min(float val) +{ + m_enable_signal = false; + m_min_spinner.set_value(val); + m_enable_signal = true; +} + + +void +SliderControlGroup::set_max(float val) +{ + m_enable_signal = false; + m_max_spinner.set_value(val); + m_enable_signal = true; +} + + +void +SliderControlGroup::enable() +{ + m_slider.property_sensitive() = true; + m_min_spinner.property_sensitive() = true; + m_max_spinner.property_sensitive() = true; + m_value_spinner.property_sensitive() = true; + m_name_label.property_sensitive() = true; + m_range_label.property_sensitive() = true; +} + + +void +SliderControlGroup::disable() +{ + m_slider.property_sensitive() = false; + m_min_spinner.property_sensitive() = false; + m_max_spinner.property_sensitive() = false; + m_value_spinner.property_sensitive() = false; + m_name_label.property_sensitive() = false; + m_range_label.property_sensitive() = false; +} + + +void +SliderControlGroup::min_changed() +{ + double min = m_min_spinner.get_value(); + const double max = m_max_spinner.get_value(); + + if (min >= max) { + min = max - 1.0; + m_min_spinner.set_value(min); + } + + update_range(); +} + + +void +SliderControlGroup::max_changed() +{ + const double min = m_min_spinner.get_value(); + double max = m_max_spinner.get_value(); + + if (max <= min) { + max = min + 1.0; + m_max_spinner.set_value(max); + } + + update_range(); +} + + +void +SliderControlGroup::update_range() +{ + const double min = m_min_spinner.get_value(); + const double max = m_max_spinner.get_value(); + + assert(min < max); + m_slider.set_range(min, max); + + m_port_model->user_min(min); + m_port_model->user_max(max); + + if (m_enable_signal) { + char temp_buf[16]; + snprintf(temp_buf, 16, "%f", m_port_model->user_min()); + Controller::instance().set_metadata(m_port_model->path(), "user-min", temp_buf); + snprintf(temp_buf, 16, "%f", m_port_model->user_max()); + Controller::instance().set_metadata(m_port_model->path(), "user-max", temp_buf); + } +} + + +void +SliderControlGroup::update_value_from_slider() +{ + if (m_enable_signal) { + const float value = m_slider.get_value(); + // Prevent spinner signal from doing all this over again (slow) + m_enable_signal = false; + m_value_spinner.set_value(value); + m_control_panel->value_changed(m_port_model->path(), value); + m_port_model->value(value); + m_enable_signal = true; + } +} + + +void +SliderControlGroup::update_value_from_spinner() +{ + if (m_enable_signal) { + m_enable_signal = false; + const float value = m_value_spinner.get_value(); + if (value < m_min_spinner.get_value()) + m_min_spinner.set_value(value); + if (value > m_max_spinner.get_value()) + m_max_spinner.set_value(value); + + m_enable_signal = false; + update_range(); + m_slider.set_value(m_value_spinner.get_value()); + m_enable_signal = true; + + m_control_panel->value_changed(m_port_model->path(), value); + + m_port_model->value(value); + m_enable_signal = true; + } +} + + +/** Callback for when slider is grabbed so we can ignore set_control + * events for this port (and avoid nasty feedback issues). + */ +bool +SliderControlGroup::slider_pressed(GdkEvent* ev) +{ + //cerr << "Pressed: " << ev->type << endl; + if (ev->type == GDK_BUTTON_PRESS) { + m_enabled = false; + cerr << "SLIDER FIXME\n"; + //GtkClientInterface::instance()->set_ignore_port(m_port_model->path()); + } else if (ev->type == GDK_BUTTON_RELEASE) { + m_enabled = true; + cerr << "SLIDER FIXME\n"; + //GtkClientInterface::instance()->clear_ignore_port(); + } + + return false; +} + + +/////////////// IntegerControlGroup //////////////// + + +IntegerControlGroup::IntegerControlGroup(ControlPanel* panel, CountedPtr pm, bool separator) +: ControlGroup(panel, pm, separator), + m_enable_signal(false), + m_alignment(0.5, 0.5, 0.0, 0.0), + m_name_label(pm->name()), + m_spinner(1.0, 0) +{ + set_name(pm->name()); + + m_spinner.set_range(-99999, 99999); + m_spinner.set_value(m_port_model->value()); + m_spinner.signal_value_changed().connect( + sigc::mem_fun(*this, &IntegerControlGroup::update_value)); + m_spinner.set_increments(1, 10); + + m_alignment.add(m_spinner); + pack_start(m_name_label); + pack_start(m_alignment); + + m_enable_signal = true; + + show_all(); +} + + +void +IntegerControlGroup::set_name(const string& name) +{ + string name_label = ""; + name_label += name + ""; + m_name_label.set_markup(name_label); +} + + +void +IntegerControlGroup::set_value(float val) +{ + //cerr << "[IntegerControlGroup] Setting value to " << val << endl; + m_enable_signal = false; + m_spinner.set_value(val); + m_port_model->value(val); + m_enable_signal = true; +} + + +void +IntegerControlGroup::enable() +{ + m_spinner.property_sensitive() = true; + m_name_label.property_sensitive() = true; +} + + +void +IntegerControlGroup::disable() +{ + m_spinner.property_sensitive() = false; + m_name_label.property_sensitive() = false; +} + + +void +IntegerControlGroup::update_value() +{ + if (m_enable_signal) { + float value = m_spinner.get_value(); + m_control_panel->value_changed(m_port_model->path(), value); + m_port_model->value(value); + } +} + + +/////////////// ToggleControlGroup //////////////// + + +ToggleControlGroup::ToggleControlGroup(ControlPanel* panel, CountedPtr pm, bool separator) +: ControlGroup(panel, pm, separator), + m_enable_signal(false), + m_alignment(0.5, 0.5, 0.0, 0.0), + m_name_label(pm->name()) +{ + set_name(pm->name()); + + set_value(m_port_model->value()); + m_checkbutton.signal_toggled().connect( + sigc::mem_fun(*this, &ToggleControlGroup::update_value)); + + m_alignment.add(m_checkbutton); + pack_start(m_name_label); + pack_start(m_alignment); + + m_enable_signal = true; + + show_all(); +} + + +void +ToggleControlGroup::set_name(const string& name) +{ + string name_label = ""; + name_label += name + ""; + m_name_label.set_markup(name_label); +} + + +void +ToggleControlGroup::set_value(float val) +{ + //cerr << "[ToggleControlGroup] Setting value to " << val << endl; + m_enable_signal = false; + m_checkbutton.set_active( (val > 0.0f) ); + m_port_model->value(val); + m_enable_signal = true; +} + + +void +ToggleControlGroup::enable() +{ + m_checkbutton.property_sensitive() = true; + m_name_label.property_sensitive() = true; +} + + +void +ToggleControlGroup::disable() +{ + m_checkbutton.property_sensitive() = false; + m_name_label.property_sensitive() = false; +} + + +void +ToggleControlGroup::update_value() +{ + if (m_enable_signal) { + float value = m_checkbutton.get_active() ? 1.0f : 0.0f; + m_control_panel->value_changed(m_port_model->path(), value); + m_port_model->value(value); + } +} + + +} // namespace OmGtk diff --git a/src/progs/ingenuity/ControlGroups.h b/src/progs/ingenuity/ControlGroups.h new file mode 100644 index 00000000..3abd19e8 --- /dev/null +++ b/src/progs/ingenuity/ControlGroups.h @@ -0,0 +1,197 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef CONTROLGROUPS_H +#define CONTROLGROUPS_H + +#include +#include +#include +#include +#include "PortModel.h" +#include "util/CountedPtr.h" + + +namespace LibOmClient { class PortModel; } +using namespace LibOmClient; + +namespace OmGtk { + +class ControlPanel; + + +/** A group of controls in a NodeControlWindow. + * + * \ingroup OmGtk + */ +class ControlGroup : public Gtk::VBox +{ +public: + ControlGroup(ControlPanel* panel, CountedPtr pm, bool separator) + : Gtk::VBox(false, 0), + m_control_panel(panel), + m_port_model(pm), + m_has_separator(separator) + { + assert(m_port_model); + assert(panel); + + if (separator) { + m_separator = new Gtk::HSeparator(); + pack_start(*m_separator, false, false, 4); + } else { + m_separator = NULL; + } + } + + ~ControlGroup() { delete m_separator; } + + virtual void set_name(const string& name) {} + + virtual void set_value(float val) = 0; + + inline const CountedPtr port_model() const { return m_port_model; } + + virtual void set_min(float val) {} + virtual void set_max(float val) {} + + void remove_separator() { assert(m_has_separator); + remove(*m_separator); delete m_separator; } + + virtual void enable() {} + virtual void disable() {} + +protected: + ControlPanel* m_control_panel; + CountedPtr m_port_model; + bool m_has_separator; + Gtk::HSeparator* m_separator; +}; + + +/** A slider for a continuous control. + * + * \ingroup OmGtk + */ +class SliderControlGroup : public ControlGroup +{ +public: + SliderControlGroup(ControlPanel* panel, CountedPtr pm, bool separator); + + void set_name(const string& name); + + inline void set_value(const float val); + void set_min(float val); + void set_max(float val); + + void enable(); + void disable(); + +private: + void min_changed(); + void max_changed(); + void update_range(); + void update_value_from_slider(); + void update_value_from_spinner(); + + //void slider_grabbed(bool b); + + bool slider_pressed(GdkEvent* ev); + + bool m_enabled; + bool m_enable_signal; + + Gtk::HBox m_header_box; + Gtk::Label m_name_label; + Gtk::HBox m_range_box; + Gtk::Label m_range_label; + Gtk::SpinButton m_min_spinner; + Gtk::Label m_hyphen_label; + Gtk::SpinButton m_max_spinner; + Gtk::HBox m_slider_box; + Gtk::SpinButton m_value_spinner; + Gtk::HScale m_slider; +}; + + +inline void +SliderControlGroup::set_value(const float val) +{ + m_enable_signal = false; + if (m_enabled) { + m_slider.set_value(val); + m_value_spinner.set_value(val); + } + m_port_model->value(val); + m_enable_signal = true; +} + + + + +/** A spinbutton for integer controls. + * + * \ingroup OmGtk + */ +class IntegerControlGroup : public ControlGroup +{ +public: + IntegerControlGroup(ControlPanel* panel, CountedPtr pm, bool separator); + + void set_name(const string& name); + void set_value(float val); + + void enable(); + void disable(); + +private: + void update_value(); + + bool m_enable_signal; + Gtk::Alignment m_alignment; + Gtk::Label m_name_label; + Gtk::SpinButton m_spinner; +}; + + +/** A radio button for toggle controls. + * + * \ingroup OmGtk + */ +class ToggleControlGroup : public ControlGroup +{ +public: + ToggleControlGroup(ControlPanel* panel, CountedPtr pm, bool separator); + + void set_name(const string& name); + void set_value(float val); + + void enable(); + void disable(); + +private: + void update_value(); + + bool m_enable_signal; + Gtk::Alignment m_alignment; + Gtk::Label m_name_label; + Gtk::CheckButton m_checkbutton; +}; + + +} // namespace OmGtk + +#endif // CONTROLGROUPS_H diff --git a/src/progs/ingenuity/ControlPanel.cpp b/src/progs/ingenuity/ControlPanel.cpp new file mode 100644 index 00000000..a42e1121 --- /dev/null +++ b/src/progs/ingenuity/ControlPanel.cpp @@ -0,0 +1,284 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License alongCont + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "ControlPanel.h" +#include "PatchModel.h" +#include "NodeModel.h" +#include "PortModel.h" +#include "ControlGroups.h" +#include "PatchController.h" +#include "Controller.h" + +namespace OmGtk { + + +ControlPanel::ControlPanel(BaseObjectType* cobject, const Glib::RefPtr& xml) +: Gtk::VBox(cobject), + m_callback_enabled(true) +{ + xml->get_widget("control_panel_controls_box", m_control_box); + xml->get_widget("control_panel_voice_controls_box", m_voice_control_box); + xml->get_widget("control_panel_all_voices_radio", m_all_voices_radio); + xml->get_widget("control_panel_specific_voice_radio", m_specific_voice_radio); + xml->get_widget("control_panel_voice_spinbutton", m_voice_spinbutton); + + m_all_voices_radio->signal_toggled().connect(sigc::mem_fun(this, &ControlPanel::all_voices_selected)); + m_specific_voice_radio->signal_toggled().connect(sigc::mem_fun(this, &ControlPanel::specific_voice_selected)); + m_voice_spinbutton->signal_value_changed().connect(sigc::mem_fun(this, &ControlPanel::voice_selected)); + + show_all(); +} + + +ControlPanel::~ControlPanel() +{ + for (vector::iterator i = m_controls.begin(); i != m_controls.end(); ++i) + delete (*i); +} + + +void +ControlPanel::init(NodeController* node, size_t poly) +{ + assert(node != NULL); + assert(poly > 0); + + const CountedPtr node_model(node->node_model()); + + if (poly > 1) { + m_voice_spinbutton->set_range(0, poly - 1); + } else { + remove(*m_voice_control_box); + } + + for (PortModelList::const_iterator i = node_model->ports().begin(); + i != node_model->ports().end(); ++i) { + // FIXME: + if (*i) { + PortController* pc = (PortController*)((*i)->controller()); + assert(pc != NULL); + add_port(pc); + } else { + cerr << "WTF?\n"; + } + } + + m_callback_enabled = true; +} + + +ControlGroup* +ControlPanel::find_port(const Path& path) const +{ + for (vector::const_iterator cg = m_controls.begin(); cg != m_controls.end(); ++cg) + if ((*cg)->port_model()->path() == path) + return (*cg); + + return NULL; +} + + +/** Add a control to the panel for the given port. + */ +void +ControlPanel::add_port(PortController* port) +{ + assert(port); + assert(port->model()); + assert(port->control_panel() == NULL); + + const CountedPtr pm = port->port_model(); + + // Already have port, don't add another + if (find_port(pm->path()) != NULL) + return; + + // Add port + if (pm->is_control() && pm->is_input()) { + bool separator = (m_controls.size() > 0); + ControlGroup* cg = NULL; + if (pm->is_integer()) + cg = new IntegerControlGroup(this, pm, separator); + else if (pm->is_toggle()) + cg = new ToggleControlGroup(this, pm, separator); + else + cg = new SliderControlGroup(this, pm, separator); + + m_controls.push_back(cg); + m_control_box->pack_start(*cg, false, false, 0); + + if (pm->connected()) + cg->disable(); + else + cg->enable(); + } + + port->set_control_panel(this); + + Gtk::Requisition controls_size; + m_control_box->size_request(controls_size); + m_ideal_size.first = controls_size.width; + m_ideal_size.second = controls_size.height; + + Gtk::Requisition voice_size; + m_voice_control_box->size_request(voice_size); + m_ideal_size.first += voice_size.width; + m_ideal_size.second += voice_size.height; + + //cerr << "Setting ideal size to " << m_ideal_size.first + // << " x " << m_ideal_size.second << endl; +} + + +/** Remove the control for the given port. + */ +void +ControlPanel::remove_port(const Path& path) +{ + bool was_first = false; + for (vector::iterator cg = m_controls.begin(); cg != m_controls.end(); ++cg) { + if ((*cg)->port_model()->path() == path) { + m_control_box->remove(**cg); + if (cg == m_controls.begin()) + was_first = true; + m_controls.erase(cg); + break; + } + } + + if (was_first && m_controls.size() > 0) + (*m_controls.begin())->remove_separator(); +} + + +/** Rename the control for the given port. + */ +void +ControlPanel::rename_port(const Path& old_path, const Path& new_path) +{ + for (vector::iterator cg = m_controls.begin(); cg != m_controls.end(); ++cg) { + if ((*cg)->port_model()->path() == old_path) { + (*cg)->set_name(new_path.name()); + return; + } + } +} + + +/** Enable the control for the given port. + * + * Used when all connections to port are un-made. + */ +void +ControlPanel::enable_port(const Path& path) +{ + for (vector::iterator i = m_controls.begin(); i != m_controls.end(); ++i) { + if ((*i)->port_model()->path() == path) { + (*i)->enable(); + return; + } + } +} + + +/** Disable the control for the given port. + * + * Used when port is connected. + */ +void +ControlPanel::disable_port(const Path& path) +{ + for (vector::iterator i = m_controls.begin(); i != m_controls.end(); ++i) { + if ((*i)->port_model()->path() == path) { + (*i)->disable(); + return; + } + } +} + + +/** Callback for ControlGroups to notify this of a change. + */ +void +ControlPanel::value_changed(const Path& port_path, float val) +{ + if (m_callback_enabled) { + // Update patch control slider, if this is a control panel for a patch + // (or vice versa) + //if (m_mirror != NULL) + // m_mirror->set_port_value(port_path, val); + + if (m_all_voices_radio->get_active()) { + Controller::instance().set_port_value(port_path, val); + } else { + int voice = m_voice_spinbutton->get_value_as_int(); + Controller::instance().set_port_value(port_path, voice, val); + } + } +} + + +void +ControlPanel::set_range_min(const Path& port_path, float val) +{ + bool found = false; + for (vector::iterator i = m_controls.begin(); i != m_controls.end(); ++i) { + if ((*i)->port_model()->path() == port_path) { + found = true; + (*i)->set_min(val); + } + } + if (found == false) + cerr << "[ControlPanel::set_range_min] Unable to find control " << port_path << endl; +} + + +void +ControlPanel::set_range_max(const Path& port_path, float val) +{ + bool found = false; + for (vector::iterator i = m_controls.begin(); i != m_controls.end(); ++i) { + if ((*i)->port_model()->path() == port_path) { + found = true; + (*i)->set_max(val); + } + } + if (found == false) + cerr << "[ControlPanel::set_range_max] Unable to find control " << port_path << endl; +} + + +void +ControlPanel::all_voices_selected() +{ + m_voice_spinbutton->property_sensitive() = false; +} + + +void +ControlPanel::specific_voice_selected() +{ + m_voice_spinbutton->property_sensitive() = true; +} + + +void +ControlPanel::voice_selected() +{ +} + + +} // namespace OmGtk diff --git a/src/progs/ingenuity/ControlPanel.h b/src/progs/ingenuity/ControlPanel.h new file mode 100644 index 00000000..bae13c6c --- /dev/null +++ b/src/progs/ingenuity/ControlPanel.h @@ -0,0 +1,129 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef CONTROLPANEL_H +#define CONTROLPANEL_H + +#include +#include +#include +#include +#include +#include +#include +#include // for pair<> +#include "ControlGroups.h" +#include "util/Path.h" +#include "PortController.h" + +using std::vector; using std::string; using std::pair; +using std::cerr; using std::cout; using std::endl; + +namespace LibOmClient { +class PortModel; +class NodeModel; +} +using namespace LibOmClient; +using Om::Path; + +namespace OmGtk { + +class NodeController; +class PortController; + + +/** A group of controls for a node (or patch). + * + * Used by both NodeControlWindow and the main window (for patch controls). + * + * \ingroup OmGtk + */ +class ControlPanel : public Gtk::VBox { +public: + ControlPanel(BaseObjectType* cobject, const Glib::RefPtr& glade_xml); + virtual ~ControlPanel(); + + void init(NodeController* node, size_t poly); + + ControlGroup* find_port(const Path& path) const; + + void add_port(PortController* port); + void remove_port(const Path& path); + + void rename_port(const Path& old_path, const Path& new_path); + + void enable_port(const Path& path); + void disable_port(const Path& path); + + size_t num_controls() const { return m_controls.size(); } + pair ideal_size() const { return m_ideal_size; } + + // Callback for ControlGroup + void value_changed(const Path& port_path, float val); + + inline void set_control(const Path& port_path, float value); + void set_range_min(const Path& port_path, float value); + void set_range_max(const Path& port_path, float value); + +private: + void all_voices_selected(); + void specific_voice_selected(); + void voice_selected(); + + bool m_callback_enabled; + + pair m_ideal_size; + + vector m_controls; + Gtk::VBox* m_control_box; + Gtk::Box* m_voice_control_box; + Gtk::RadioButton* m_all_voices_radio; + Gtk::RadioButton* m_specific_voice_radio; + Gtk::SpinButton* m_voice_spinbutton; +}; + + +/** Set a port on this panel to a certain value. + * + * Profiling has shown this is performance critical. Needs to be made + * faster. + */ +inline void +ControlPanel::set_control(const Path& port_path, const float val) +{ + // FIXME: double lookup, ports should just have a pointer directly to + // their control group + + m_callback_enabled = false; + ControlGroup* cg = NULL; + + for (vector::iterator i = m_controls.begin(); i != m_controls.end(); ++i) { + cg = (*i); + if (cg->port_model()->path() == port_path) { + cg->set_value(val); + m_callback_enabled = true; + return; + } + } + + cerr << "[ControlPanel::set_control] Unable to find control " << port_path << endl; + m_callback_enabled = true; +} + + +} // namespace OmGtk + +#endif // CONTROLPANEL_H diff --git a/src/progs/ingenuity/Controller.cpp b/src/progs/ingenuity/Controller.cpp new file mode 100644 index 00000000..9f2a4cfe --- /dev/null +++ b/src/progs/ingenuity/Controller.cpp @@ -0,0 +1,171 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "PatchModel.h" +#include "PatchController.h" +#include "OSCModelEngineInterface.h" +#include "OSCListener.h" +#include "PatchLibrarian.h" +#include "Controller.h" +#include "Loader.h" +#include "interface/ClientKey.h" + +namespace OmGtk { + + +Controller::Controller(const string& engine_url) +: OSCModelEngineInterface(engine_url), + m_patch_librarian(new PatchLibrarian(this)), + m_loader(new Loader(m_patch_librarian)) +{ + m_loader->launch(); +} + + +Controller::~Controller() +{ + if (is_attached()) { + unregister_client(ClientKey()); // FIXME + detach(); + } + + delete m_loader; + delete m_patch_librarian; +} + + +/** "Attach" to the Om engine. + * See documentation OSCModelEngineInterface::attach. + */ +void +Controller::attach() +{ + OSCModelEngineInterface::attach(false); +} + +/* +void +Controller::register_client_and_wait() +{ +// int id = get_next_request_id(); +// set_wait_response_id(id); + OSCModelEngineInterface::register_client(); +// wait_for_response(); + cout << "[Controller] Registered with engine. maybe. fixme." << endl; +} +*/ +void Controller::set_engine_url(const string& url) { _engine_url = url; } + +void +Controller::create_node_from_model(const NodeModel* nm) +{ + //push_added_node(nm); + OSCModelEngineInterface::create_node_from_model(nm); + char temp_buf[16]; + snprintf(temp_buf, 16, "%f", nm->x()); + set_metadata(nm->path(), "module-x", temp_buf); + snprintf(temp_buf, 16, "%f", nm->y()); + set_metadata(nm->path(), "module-y", temp_buf); +} + +void +Controller::create_patch_from_model(const PatchModel* pm) +{ + //push_added_patch(pm); + + //int id = get_next_request_id(); + //set_wait_response_id(id); + OSCModelEngineInterface::create_patch_from_model(pm); + if (pm->parent()) { + // wait_for_response(); + char temp_buf[16]; + snprintf(temp_buf, 16, "%f", pm->x()); + set_metadata(pm->path(), "module-x", temp_buf); + snprintf(temp_buf, 16, "%f", pm->y()); + set_metadata(pm->path(), "module-y", temp_buf); + } + enable_patch(pm->path()); +} + + +void +Controller::set_patch_path(const string& path) +{ + m_patch_librarian->path(path); +} + + +/** Load patch in a seperate thread. + * This will return immediately and the patch will be loaded in the background. + * FIXME: merge parameter makes no sense, always true */ +void +Controller::load_patch(PatchModel* model, bool wait, bool merge) +{ + //push_added_patch(model); + m_loader->load_patch(model, wait, merge); +} + + +/** Load patch in a seperate thread. + * This will return immediately and the patch will be saved in the background. */ +void +Controller::save_patch(PatchModel* model, const string& filename, bool recursive) +{ + m_loader->save_patch(model, filename, recursive); +} + + +#if 0 +/** Returns the added node with the given path and removes it from the cache. + */ +NodeModel* +Controller::yank_added_node(const string& path) +{ + NodeModel* nm = NULL; + + for (list::iterator i = m_added_nodes.begin(); i != m_added_nodes.end(); ++i) { + if ((*i)->path() == path) { + nm = *i; + m_added_nodes.erase(i); + break; + } + } + + return nm; +} + + +/** Returns the added patch with the given path and removes it from the cache. + */ +PatchModel* +Controller::yank_added_patch(const string& path) +{ + PatchModel* pm = NULL; + + for (list::iterator i = m_added_patches.begin(); i != m_added_patches.end(); ++i) { + if ((*i)->path() == path) { + pm = *i; + m_added_patches.erase(i); + break; + } + } + + return pm; +} +#endif + +} // namespace OmGtk + diff --git a/src/progs/ingenuity/Controller.h b/src/progs/ingenuity/Controller.h new file mode 100644 index 00000000..cafa9ff5 --- /dev/null +++ b/src/progs/ingenuity/Controller.h @@ -0,0 +1,110 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef CONTROLLER_H +#define CONTROLLER_H + +#include +#include +#include +#include +#include "PluginModel.h" +#include "OSCModelEngineInterface.h" + +namespace LibOmClient { +class PatchModel; +class NodeModel; +class PatchLibrarian; +} + +using std::string; using std::list; +using namespace LibOmClient; + +namespace OmGtk { + +class PatchController; +class Loader; + + +/** Singleton engine controller for the entire app. + * + * This is hardly more than a trivial wrapper for OSCModelEngineInterface, suggesting something + * needs a rethink around here.. + * + * This needs to be either eliminated or the name changed to OmController. Probably + * best to keep around in case multiple engine control support comes around? + * + * \ingroup OmGtk + */ +class Controller : public OSCModelEngineInterface +{ +public: + ~Controller(); + + void attach(); + + //void register_client_and_wait(); + + void set_engine_url(const string& url); + + void create_node_from_model(const NodeModel* nm); + + void load_patch(PatchModel* model, bool wait = true, bool merge = false); + void save_patch(PatchModel* model, const string& filename, bool recursive); + + void create_patch_from_model(const PatchModel* pm); + + //void lash_restore_finished(); + + void set_patch_path(const string& path); + + /* + void push_added_node(NodeModel* nm) { m_added_nodes.push_back(nm); } + NodeModel* yank_added_node(const string& path); + + void push_added_patch(PatchModel* pm) { m_added_patches.push_back(pm); } + PatchModel* yank_added_patch(const string& path); + */ + + static void instantiate(const string& engine_url) + { if (!_instance) _instance = new Controller(engine_url); } + + inline static Controller& instance() { assert(_instance); return *_instance; } + +private: + Controller(const string& engine_url); + static Controller* _instance; + + PatchLibrarian* m_patch_librarian; + Loader* m_loader; + + /** Used to cache added nodes so client can remember some values when the + * new node notification comes (location, etc). Used to prevent the node + * jumping locations during the delay between new node and the module-x/y + * metadata notifications */ + //list m_added_nodes; + + /** Used to cache added patches in the same was as m_added_nodes. Used to + * rember filename so File->Save can work without prompting (filename can't + * be sent to the server as metadata, because a client on another machine + * doesn't want that information) */ + //list m_added_patches; +}; + + +} // namespace OmGtk + +#endif // CONTROLLER_H diff --git a/src/progs/ingenuity/DSSIController.cpp b/src/progs/ingenuity/DSSIController.cpp new file mode 100644 index 00000000..3159504a --- /dev/null +++ b/src/progs/ingenuity/DSSIController.cpp @@ -0,0 +1,280 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "DSSIController.h" +#include +#include +#include +#include +#include +#include "NodeModel.h" +#include "DSSIModule.h" +#include "Controller.h" + +namespace OmGtk { + + +DSSIController::DSSIController(CountedPtr model) +: NodeController(model), + m_banks_dirty(true) +{ + assert(model->plugin()->type() == PluginModel::DSSI); + Gtk::Menu::MenuList& items = m_menu.items(); + items[0].property_sensitive() = true; // "Show Control Window" item + + Gtk::Menu_Helpers::MenuElem program_elem("Select Program", m_program_menu); + items.push_front(program_elem); + m_program_menu_item = program_elem.get_child(); + m_program_menu_item->set_sensitive(false); + + items.push_front(Gtk::Menu_Helpers::MenuElem("Show Plugin GUI", + sigc::mem_fun(this, &DSSIController::show_gui))); +} + +void +DSSIController::program_add(int bank, int program, const string& name) +{ + node_model()->add_program(bank, program, name); + m_banks_dirty = true; +} + + +void +DSSIController::program_remove(int bank, int program) +{ + node_model()->remove_program(bank, program); + m_banks_dirty = true; +} + +/** Trivial wrapper of attempt_to_show_gui for libsigc + */ +void +DSSIController::show_gui() +{ + attempt_to_show_gui(); +} + + +void +DSSIController::update_program_menu() +{ + m_program_menu.items().clear(); + + const map >& banks = node_model()->get_programs(); + std::ostringstream oss; + + map >::const_iterator i; + for (i = banks.begin(); i != banks.end(); ++i) { + Gtk::Menu* bank_menu; + if (banks.size() > 1) + bank_menu = manage(new Gtk::Menu()); + else + bank_menu = &m_program_menu; + map::const_iterator j; + for (j = i->second.begin(); j != i->second.end(); ++j) { + oss.str(""); + oss << std::setw(3) << std::setfill('0') + << j->first << ' ' << j->second; + sigc::slot slt = bind( + bind(sigc::mem_fun(*this, &DSSIController::send_program_change), + j->first), i->first); + bank_menu->items().push_back( + Gtk::Menu_Helpers::MenuElem(oss.str(), slt)); + } + if (banks.size() > 1) { + oss.str(""); + oss << "Bank " << i->first; + m_program_menu.items().push_back( + Gtk::Menu_Helpers::MenuElem(oss.str(), *bank_menu)); + } + } + + // Disable the program menu if there are no programs + if (banks.size() == 0) + m_program_menu_item->set_sensitive(false); + else + m_program_menu_item->set_sensitive(true); + + m_banks_dirty = false; +} + + +void +DSSIController::send_program_change(int bank, int program) +{ + Controller::instance().set_program(node_model()->path(), bank, program); +} + + +void +DSSIController::create_module(OmFlowCanvas* canvas) +{ + //cerr << "Creating DSSI module " << m_model->path() << endl; + + assert(canvas != NULL); + assert(m_module == NULL); + + m_module = new DSSIModule(canvas, this); + create_all_ports(); + + m_module->move_to(node_model()->x(), node_model()->y()); +} + + + +/** Attempt to show the DSSI GUI for this plugin. + * + * Returns whether or not GUI was successfully loaded/shown. + */ +bool +DSSIController::attempt_to_show_gui() +{ + // Shamelessley "inspired by" jack-dssi-host + // Copyright 2004 Chris Cannam, Steve Harris and Sean Bolton. + + const bool verbose = false; + + string engine_url = Controller::instance().engine_url(); + // Hack off last character if it's a / + if (engine_url[engine_url.length()-1] == '/') + engine_url = engine_url.substr(0, engine_url.length()-1); + + const char* dllName = node_model()->plugin()->lib_name().c_str(); + const char* label = node_model()->plugin()->plug_label().c_str(); + const char* myName = "om_gtk"; + const string& oscUrl = engine_url + "/dssi" + node_model()->path(); + + struct dirent* entry = NULL; + char* dllBase = strdup(dllName); + char* subpath = NULL; + DIR* subdir = NULL; + char* filename = NULL; + struct stat buf; + int fuzzy = 0; + + char* env_dssi_path = getenv("DSSI_PATH"); + string dssi_path; + if (!env_dssi_path) { + cerr << "DSSI_PATH is empty. Assuming /usr/lib/dssi:/usr/local/lib/dssi." << endl; + dssi_path = "/usr/lib/dssi:/usr/local/lib/dssi"; + } else { + dssi_path = env_dssi_path; + } + + if (strlen(dllBase) > 3 && !strcasecmp(dllBase + strlen(dllBase) - 3, ".so")) { + dllBase[strlen(dllBase) - 3] = '\0'; + } + + + // This is pretty nasty, it loops through the path, even if the dllBase is absolute + while (dssi_path != "") { + string directory = dssi_path.substr(0, dssi_path.find(':')); + if (dssi_path.find(':') != string::npos) + dssi_path = dssi_path.substr(dssi_path.find(':')+1); + else + dssi_path = ""; + + if (*dllBase == '/') { + subpath = strdup(dllBase); + } else { + subpath = (char*)malloc(strlen(directory.c_str()) + strlen(dllBase) + 2); + sprintf(subpath, "%s/%s", directory.c_str(), dllBase); + } + + for (fuzzy = 0; fuzzy <= 1; ++fuzzy) { + + if (!(subdir = opendir(subpath))) { + if (verbose) { + fprintf(stderr, "%s: can't open plugin GUI directory \"%s\"\n", myName, subpath); + } + break; + } + + while ((entry = readdir(subdir))) { + + if (entry->d_name[0] == '.') + continue; + if (!strchr(entry->d_name, '_')) + continue; + + if (fuzzy) { + if (verbose) { + fprintf(stderr, "checking %s against %s\n", entry->d_name, dllBase); + } + if (strncmp(entry->d_name, dllBase, strlen(dllBase))) + continue; + } else { + if (verbose) { + fprintf(stderr, "checking %s against %s\n", entry->d_name, label); + } + if (strncmp(entry->d_name, label, strlen(label))) + continue; + } + + filename = (char*)malloc(strlen(subpath) + strlen(entry->d_name) + 2); + sprintf(filename, "%s/%s", subpath, entry->d_name); + + if (stat(filename, &buf)) { + perror("stat failed"); + free(filename); + continue; + } + + if ((S_ISREG(buf.st_mode) || S_ISLNK(buf.st_mode)) && + (buf.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) { + + if (verbose) { + fprintf(stderr, "%s: trying to execute GUI at \"%s\"\n", + myName, filename); + } + + if (fork() == 0) { + execlp(filename, filename, oscUrl.c_str(), dllName, label, + node_model()->name().c_str(), 0); + perror("exec failed"); + exit(1); + } + + free(filename); + free(subpath); + free(dllBase); + return true; + } + + free(filename); + } + } + } + + cerr << "Unable to launch DSSI GUI for " << node_model()->path() << endl; + + free(subpath); + free(dllBase); + return false; +} + + +void +DSSIController::show_menu(GdkEventButton* event) +{ + if (m_banks_dirty) + update_program_menu(); + NodeController::show_menu(event); +} + + +} // namespace OmGtk + diff --git a/src/progs/ingenuity/DSSIController.h b/src/progs/ingenuity/DSSIController.h new file mode 100644 index 00000000..71636db2 --- /dev/null +++ b/src/progs/ingenuity/DSSIController.h @@ -0,0 +1,79 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef DSSICONTROLLER_H +#define DSSICONTROLLER_H + +#include +#include +#include "util/Path.h" +#include "NodeController.h" + +using std::string; +using Om::Path; +using namespace LibOmClient; + +namespace LibOmClient { + class MetadataModel; + class NodeModel; + class PortModel; +} + +namespace OmGtk { + +class Controller; +class OmModule; +class NodeControlWindow; +class NodePropertiesWindow; +class PortController; +class OmFlowCanvas; +class DSSIModule; + +/* Controller for a DSSI node. + * + * \ingroup OmGtk + */ +class DSSIController : public NodeController +{ +public: + DSSIController(CountedPtr model); + + virtual ~DSSIController() {} + + void show_gui(); + bool attempt_to_show_gui(); + void program_add(int bank, int program, const string& name); + void program_remove(int bank, int program); + + void send_program_change(int bank, int program); + + void create_module(OmFlowCanvas* canvas); + + void show_menu(GdkEventButton* event); + +private: + void update_program_menu(); + + Gtk::Menu m_program_menu; + Glib::RefPtr m_program_menu_item; + + bool m_banks_dirty; +}; + + +} // namespace OmGtk + +#endif // DSSICONTROLLER_H diff --git a/src/progs/ingenuity/DSSIModule.cpp b/src/progs/ingenuity/DSSIModule.cpp new file mode 100644 index 00000000..bfdc06c4 --- /dev/null +++ b/src/progs/ingenuity/DSSIModule.cpp @@ -0,0 +1,38 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "DSSIModule.h" +#include "DSSIController.h" + +namespace OmGtk { + + +DSSIModule::DSSIModule(OmFlowCanvas* canvas, DSSIController* node) +: OmModule(canvas, static_cast(node)) +{ +} + + +void +DSSIModule::on_double_click(GdkEventButton* ev) +{ + DSSIController* const dc = static_cast(m_node); + if (!dc->attempt_to_show_gui()) + show_control_window(); +} + + +} // namespace OmGtk diff --git a/src/progs/ingenuity/DSSIModule.h b/src/progs/ingenuity/DSSIModule.h new file mode 100644 index 00000000..d27c8718 --- /dev/null +++ b/src/progs/ingenuity/DSSIModule.h @@ -0,0 +1,43 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef DSSIMODULE_H +#define DSSIMODULE_H + +#include "OmModule.h" + +namespace OmGtk { + +class DSSIController; + +/* Module for a DSSI node. + * + * \ingroup OmGtk + */ +class DSSIModule : public OmModule +{ +public: + DSSIModule(OmFlowCanvas* canvas, DSSIController* node); + virtual ~DSSIModule() {} + + void on_double_click(GdkEventButton* ev); +}; + + +} // namespace OmGtk + +#endif // DSSIMODULE_H + diff --git a/src/progs/ingenuity/GladeFactory.cpp b/src/progs/ingenuity/GladeFactory.cpp new file mode 100644 index 00000000..3b7a3a4d --- /dev/null +++ b/src/progs/ingenuity/GladeFactory.cpp @@ -0,0 +1,69 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "GladeFactory.h" +#include +#include +using std::cout; using std::cerr; using std::endl; +using std::ifstream; + +namespace OmGtk { + + +Glib::ustring GladeFactory::glade_filename = ""; + + +void +GladeFactory::find_glade_file() +{ + // Check for the .glade file in current directory + glade_filename = "./om_gtk.glade"; + ifstream fs(glade_filename.c_str()); + if (fs.fail()) { // didn't find it, check PKGDATADIR + fs.clear(); + glade_filename = PKGDATADIR; + glade_filename += "/om_gtk.glade"; + + fs.open(glade_filename.c_str()); + if (fs.fail()) { + cerr << "[GladeFactory] Unable to find om_gtk.glade in current directory or " << PKGDATADIR << "." << endl; + throw; + } + fs.close(); + } + cerr << "[GladeFactory] Loading widgets from " << glade_filename.c_str() << endl; +} + + +Glib::RefPtr +GladeFactory::new_glade_reference(const string& toplevel_widget) +{ + if (glade_filename == "") + find_glade_file(); + + try { + if (toplevel_widget == "") + return Gnome::Glade::Xml::create(glade_filename); + else + return Gnome::Glade::Xml::create(glade_filename, toplevel_widget.c_str()); + } catch (const Gnome::Glade::XmlError& ex) { + cerr << ex.what() << endl; + throw ex; + } +} + + +} // namespace OmGtk diff --git a/src/progs/ingenuity/GladeFactory.h b/src/progs/ingenuity/GladeFactory.h new file mode 100644 index 00000000..34b2af7a --- /dev/null +++ b/src/progs/ingenuity/GladeFactory.h @@ -0,0 +1,48 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef GLADEFACTORY_H +#define GLADEFACTORY_H + +#include +#include + +using std::string; + +namespace OmGtk { + + +/** Creates glade references, so various objects can create widgets. + * Purely static. + * + * \ingroup OmGtk + */ +class GladeFactory { +public: + static Glib::RefPtr + new_glade_reference(const string& toplevel_widget = ""); + +private: + GladeFactory() {} + + static void find_glade_file(); + static Glib::ustring glade_filename; +}; + + +} // namespace OmGtk + +#endif // GLADEFACTORY_H diff --git a/src/progs/ingenuity/GtkObjectController.cpp b/src/progs/ingenuity/GtkObjectController.cpp new file mode 100644 index 00000000..67e5e05e --- /dev/null +++ b/src/progs/ingenuity/GtkObjectController.cpp @@ -0,0 +1,31 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "GtkObjectController.h" + +namespace OmGtk { + + +GtkObjectController::GtkObjectController(CountedPtr model) +: m_model(model) +{ + assert(m_model); + model->metadata_update_sig.connect(sigc::mem_fun(this, &GtkObjectController::metadata_update)); +} + + +} // namespace OmGtk + diff --git a/src/progs/ingenuity/GtkObjectController.h b/src/progs/ingenuity/GtkObjectController.h new file mode 100644 index 00000000..fc58fab8 --- /dev/null +++ b/src/progs/ingenuity/GtkObjectController.h @@ -0,0 +1,83 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef GTKOBJECTCONTROLLER_H +#define GTKOBJECTCONTROLLER_H + +#include +#include + +#include "ObjectModel.h" +#include "ObjectController.h" +#include "util/CountedPtr.h" + +using std::string; + +using namespace LibOmClient; + +namespace OmGtk { + +class Controller; + + +/** Controller for an Om object. + * + * Management of the model and view are this object's responsibility. + * The view may not be created (ie in the case of patches which have never + * been shown and all their children). + * + * \ingroup OmGtk + */ +class GtkObjectController : public LibOmClient::ObjectController +{ +public: + GtkObjectController(CountedPtr model); + virtual ~GtkObjectController() {} + + /** Destroy object. + * + * Object must be safe to delete immediately following the return of + * this call. + */ + virtual void destroy() = 0; + +/* + virtual void add_to_store() = 0; + virtual void remove_from_store() = 0; +*/ + + /** Derived classes should override this to handle special metadata + * keys, then call this to set the model's metadata key. + */ + virtual void metadata_update(const string& key, const string& value) + { assert(m_model->get_metadata(key) != ""); } + + /** Rename object */ + virtual void set_path(const Path& new_path) + { m_model->set_path(new_path); } + + const Path& path() const { return m_model->path(); } + + CountedPtr model() const { return m_model; } + +protected: + CountedPtr m_model; ///< Model for this object +}; + + +} // namespace OmGtk + +#endif // GTKOBJECTCONTROLLER_H diff --git a/src/progs/ingenuity/LashController.cpp b/src/progs/ingenuity/LashController.cpp new file mode 100644 index 00000000..57fef609 --- /dev/null +++ b/src/progs/ingenuity/LashController.cpp @@ -0,0 +1,168 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "LashController.h" +#include "config.h" +#include +#include +#include +#include +#include +#include "App.h" +#include "PatchController.h" +#include "PatchModel.h" + +using std::cerr; using std::cout; using std::endl; +using std::string; + +namespace OmGtk { + + +LashController::LashController(lash_args_t* args) +: m_client(NULL) +{ + m_client = lash_init(args, PACKAGE_NAME, + /*LASH_Config_Data_Set|*/LASH_Config_File, LASH_PROTOCOL(2, 0)); + if (m_client == NULL) { + cerr << "[LashController] Failed to connect to LASH. Session management will not function." << endl; + } else { + cout << "[LashController] Lash initialised" << endl; + } + + lash_event_t* event = lash_event_new_with_type(LASH_Client_Name); + lash_event_set_string(event, "OmGtk"); + lash_send_event(m_client, event); +} + + +LashController::~LashController() +{ + if (m_client != NULL) { + lash_event_t* quit_event = lash_event_new_with_type(LASH_Quit); + lash_send_event(m_client, quit_event); + } +} + + +void +LashController::process_events() +{ + assert(m_client != NULL); + + lash_event_t* ev = NULL; + lash_config_t* conf = NULL; + + // Process events + while ((ev = lash_get_event(m_client)) != NULL) { + handle_event(ev); + lash_event_destroy(ev); + } + + // Process configs + while ((conf = lash_get_config(m_client)) != NULL) { + handle_config(conf); + lash_config_destroy(conf); + } +} + + +void +LashController::handle_event(lash_event_t* ev) +{ + assert(ev != NULL); + + LASH_Event_Type type = lash_event_get_type(ev); + const char* c_str = lash_event_get_string(ev); + string str = (c_str == NULL) ? "" : c_str; + + if (type == LASH_Save_File) { + cout << "[LashController] LASH Save File - " << str << endl; + save(str); + lash_send_event(m_client, lash_event_new_with_type(LASH_Save_File)); + } else if (type == LASH_Restore_File) { + cout << "[LashController] LASH Restore File - " << str << endl; + cerr << "LASH RESTORE NOT YET (RE)IMPLEMENTED." << endl; + /*_controller->load_session_blocking(str + "/session"); + _controller->lash_restore_finished(); + lash_send_event(m_client, lash_event_new_with_type(LASH_Restore_File)); + */ + /*} else if (type == LASH_Save_Data_Set) { + //cout << "[LashController] LASH Save Data Set - " << endl; + + // Tell LASH we're done + lash_send_event(m_client, lash_event_new_with_type(LASH_Save_Data_Set)); + */ + } else if (type == LASH_Quit) { + cout << "[LashController] LASH Quit" << endl; + m_client = NULL; + App::instance().quit(); + } else { + cerr << "[LashController] Unhandled LASH event, type: " << static_cast(type) << endl; + } +} + + +void +LashController::handle_config(lash_config_t* conf) +{ + assert(conf != NULL); + + const char* key = NULL; + const void* val = NULL; + size_t val_size = 0; + + cout << "[LashController] LASH Config. Key = " << key << endl; + + key = lash_config_get_key(conf); + val = lash_config_get_value(conf); + val_size = lash_config_get_value_size(conf); +} + +void +LashController::save(const string& dir) +{ + cerr << "LASH SAVING NOT YET (RE)IMPLEMENTED\n"; + /* + PatchController* pc = NULL; + + // Save every patch under dir with it's path as a filename + // (so the dir structure will resemble the patch heirarchy) + for (map::iterator i = m_app->patches().begin(); + i != m_app->patches().end(); ++i) { + pc = (*i).second; + pc->model()->filename(dir + pc->model()->path() + ".om"); + } + + // Create directories + for (map::iterator i = m_app->patches().begin(); + i != m_app->patches().end(); ++i) { + pc = (*i).second; + if (pc->model()->parent() != NULL) { + string path = Path::parent(pc->model()->path()).substr(1) + "/"; + while (path.find("/") != string::npos) { + mkdir(string(dir +"/"+ path.substr(0, path.find("/"))).c_str(), 0744); + path = path.substr(path.find("/")+1); + } + } + _controller->save_patch_blocking(pc->model(), pc->model()->filename(), false); + } + + //m_app->state_manager()->save(str + "/omgtkrc"); + _controller->save_session_blocking(dir + "/session"); + */ +} + +} // namespace OmGtk diff --git a/src/progs/ingenuity/LashController.h b/src/progs/ingenuity/LashController.h new file mode 100644 index 00000000..28a73068 --- /dev/null +++ b/src/progs/ingenuity/LashController.h @@ -0,0 +1,53 @@ +/* This file is part of OmGtk. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef LASHCONTROLLER_H +#define LASHCONTROLLER_H + +#include +#include +using std::string; + +namespace OmGtk { + +class App; + +/* Old and unused LASH controller. + * + * \ingroup OmGtk + */ +class LashController +{ +public: + LashController(lash_args_t* args); + ~LashController(); + + bool enabled() { return lash_enabled(m_client); } + void process_events(); + +private: + void save(const string& dir); + + lash_client_t* m_client; + + void handle_event(lash_event_t* conf); + void handle_config(lash_config_t* conf); +}; + + +} // namespace OmGtk + +#endif // LASHCONTROLLER_H diff --git a/src/progs/ingenuity/LoadPatchWindow.cpp b/src/progs/ingenuity/LoadPatchWindow.cpp new file mode 100644 index 00000000..bbf11dab --- /dev/null +++ b/src/progs/ingenuity/LoadPatchWindow.cpp @@ -0,0 +1,131 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "LoadPatchWindow.h" +#include +#include +#include "App.h" +#include "Configuration.h" +#include "PatchController.h" +#include "PatchModel.h" +#include "Controller.h" + +namespace OmGtk { + + +LoadPatchWindow::LoadPatchWindow(BaseObjectType* cobject, const Glib::RefPtr& xml) +: Gtk::FileChooserDialog(cobject), + m_patch_controller(NULL), + m_replace(true) +{ + xml->get_widget("load_patch_poly_from_current_radio", m_poly_from_current_radio); + xml->get_widget("load_patch_poly_from_file_radio", m_poly_from_file_radio); + xml->get_widget("load_patch_poly_from_user_radio", m_poly_from_user_radio); + xml->get_widget("load_patch_poly_spinbutton", m_poly_spinbutton); + xml->get_widget("load_patch_ok_button", m_ok_button); + xml->get_widget("load_patch_cancel_button", m_cancel_button); + + m_poly_from_current_radio->signal_toggled().connect(sigc::mem_fun(this, &LoadPatchWindow::poly_from_file_selected)); + m_poly_from_file_radio->signal_toggled().connect(sigc::mem_fun(this, &LoadPatchWindow::poly_from_file_selected)); + m_poly_from_user_radio->signal_toggled().connect(sigc::mem_fun(this, &LoadPatchWindow::poly_from_user_selected)); + m_ok_button->signal_clicked().connect(sigc::mem_fun(this, &LoadPatchWindow::ok_clicked)); + m_cancel_button->signal_clicked().connect(sigc::mem_fun(this, &LoadPatchWindow::cancel_clicked)); + + m_poly_from_current_radio->set_active(true); + + Gtk::FileFilter filt; + filt.add_pattern("*.om"); + filt.set_name("Om patch files (*.om)"); + set_filter(filt); + + // Add global examples directory to "shortcut folders" (bookmarks) + string examples_dir = PKGDATADIR; + examples_dir.append("/patches"); + DIR* d = opendir(examples_dir.c_str()); + if (d != NULL) + add_shortcut_folder(examples_dir); +} + + +/** Sets the patch controller for this window and initializes everything. + * + * This function MUST be called before using the window in any way! + */ +void +LoadPatchWindow::patch_controller(PatchController* pc) +{ + m_patch_controller = pc; +} + + +void +LoadPatchWindow::on_show() +{ + if (App::instance().configuration()->patch_folder().length() > 0) + set_current_folder(App::instance().configuration()->patch_folder()); + Gtk::FileChooserDialog::on_show(); +} + + +///// Event Handlers ////// + + +void +LoadPatchWindow::poly_from_file_selected() +{ + m_poly_spinbutton->property_sensitive() = false; +} + + +void +LoadPatchWindow::poly_from_user_selected() +{ + m_poly_spinbutton->property_sensitive() = true; +} + + +void +LoadPatchWindow::ok_clicked() +{ + // These values are interpreted by load_patch() as "not defined", ie load from file + string name = ""; + int poly = 0; + + if (m_poly_from_user_radio->get_active()) + poly = m_poly_spinbutton->get_value_as_int(); + + if (m_replace) + Controller::instance().clear_patch(m_patch_controller->model()->path()); + + PatchModel* pm = new PatchModel(m_patch_controller->model()->path(), poly); + pm->filename(get_filename()); + pm->set_metadata("filename", get_filename()); + pm->set_parent(m_patch_controller->patch_model()->parent()); + //Controller::instance().push_added_patch(pm); + Controller::instance().load_patch(pm, true, true); + + hide(); +} + + +void +LoadPatchWindow::cancel_clicked() +{ + hide(); +} + + +} // namespace OmGtk diff --git a/src/progs/ingenuity/LoadPatchWindow.h b/src/progs/ingenuity/LoadPatchWindow.h new file mode 100644 index 00000000..d6b3801b --- /dev/null +++ b/src/progs/ingenuity/LoadPatchWindow.h @@ -0,0 +1,73 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef LOADPATCHWINDOW_H +#define LOADPATCHWINDOW_H + +#include "PluginModel.h" + +#include +#include + +namespace OmGtk { + +class PatchController; + + +/** 'Load Patch' window. + * + * Loaded by glade as a derived object. Used for both "Load" and "Load Into" + * operations (the radio button state should be changed with the provided + * methods prior to presenting this window). + * + * This is not for loading subpatches. See @a LoadSubpatchWindow for that. + * + * \ingroup OmGtk + */ +class LoadPatchWindow : public Gtk::FileChooserDialog +{ +public: + LoadPatchWindow(BaseObjectType* cobject, const Glib::RefPtr& xml); + + void patch_controller(PatchController* pc); + + void set_replace() { m_replace = true; } + void set_merge() { m_replace = false; } + +protected: + void on_show(); + +private: + void poly_from_file_selected(); + void poly_from_user_selected(); + void ok_clicked(); + void cancel_clicked(); + + PatchController* m_patch_controller; + bool m_replace; + + Gtk::RadioButton* m_poly_from_current_radio; + Gtk::RadioButton* m_poly_from_file_radio; + Gtk::RadioButton* m_poly_from_user_radio; + Gtk::SpinButton* m_poly_spinbutton; + Gtk::Button* m_ok_button; + Gtk::Button* m_cancel_button; +}; + + +} // namespace OmGtk + +#endif // LOADPATCHWINDOW_H diff --git a/src/progs/ingenuity/LoadPluginWindow.cpp b/src/progs/ingenuity/LoadPluginWindow.cpp new file mode 100644 index 00000000..12f18148 --- /dev/null +++ b/src/progs/ingenuity/LoadPluginWindow.cpp @@ -0,0 +1,407 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "LoadPluginWindow.h" +#include +#include +#include +#include +#include "PatchController.h" +#include "NodeModel.h" +#include "Controller.h" +#include "App.h" +#include "PatchWindow.h" +#include "OmFlowCanvas.h" +#include "PatchModel.h" +#include "Store.h" +using std::cout; using std::cerr; using std::endl; + + +namespace OmGtk { + +LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject, const Glib::RefPtr& xml) +: Gtk::Window(cobject), + m_patch_controller(NULL), + m_has_shown(false), + m_plugin_name_offset(0), + m_new_module_x(0), + m_new_module_y(0) +{ + xml->get_widget("load_plugin_plugins_treeview", m_plugins_treeview); + xml->get_widget("load_plugin_polyphonic_checkbutton", m_polyphonic_checkbutton); + xml->get_widget("load_plugin_name_entry", m_node_name_entry); + xml->get_widget("load_plugin_clear_button", m_clear_button); + xml->get_widget("load_plugin_add_button", m_add_button); + xml->get_widget("load_plugin_close_button", m_close_button); + //xml->get_widget("load_plugin_ok_button", m_ok_button); + + xml->get_widget("load_plugin_filter_combo", m_filter_combo); + xml->get_widget("load_plugin_search_entry", m_search_entry); + + // Set up the plugins list + m_plugins_liststore = Gtk::ListStore::create(m_plugins_columns); + m_plugins_treeview->set_model(m_plugins_liststore); + m_plugins_treeview->append_column("Name", m_plugins_columns.m_col_name); + m_plugins_treeview->append_column("Type", m_plugins_columns.m_col_type); + m_plugins_treeview->append_column("URI", m_plugins_columns.m_col_uri); + //m_plugins_treeview->append_column("Library", m_plugins_columns.m_col_library); + //m_plugins_treeview->append_column("Label", m_plugins_columns.m_col_label); + + // This could be nicer.. store the TreeViewColumns locally maybe? + m_plugins_treeview->get_column(0)->set_sort_column(m_plugins_columns.m_col_name); + m_plugins_treeview->get_column(1)->set_sort_column(m_plugins_columns.m_col_type); + m_plugins_treeview->get_column(2)->set_sort_column(m_plugins_columns.m_col_uri); + //m_plugins_treeview->get_column(3)->set_sort_column(m_plugins_columns.m_col_library); + //m_plugins_treeview->get_column(4)->set_sort_column(m_plugins_columns.m_col_label); + for (int i=0; i < 3; ++i) + m_plugins_treeview->get_column(i)->set_resizable(true); + + // Set up the search criteria combobox + m_criteria_liststore = Gtk::ListStore::create(m_criteria_columns); + m_filter_combo->set_model(m_criteria_liststore); + Gtk::TreeModel::iterator iter = m_criteria_liststore->append(); + Gtk::TreeModel::Row row = *iter; + row[m_criteria_columns.m_col_label] = "Name contains: "; + row[m_criteria_columns.m_col_criteria] = CriteriaColumns::NAME; + m_filter_combo->set_active(iter); + iter = m_criteria_liststore->append(); row = *iter; + row[m_criteria_columns.m_col_label] = "Type contains: "; + row[m_criteria_columns.m_col_criteria] = CriteriaColumns::TYPE; + iter = m_criteria_liststore->append(); row = *iter; + row[m_criteria_columns.m_col_label] = "URI contains: "; + row[m_criteria_columns.m_col_criteria] = CriteriaColumns::URI; + /*iter = m_criteria_liststore->append(); row = *iter; + row[m_criteria_columns.m_col_label] = "Library contains: "; + row[m_criteria_columns.m_col_criteria] = CriteriaColumns::LIBRARY; + iter = m_criteria_liststore->append(); row = *iter; + row[m_criteria_columns.m_col_label] = "Label contains: "; + row[m_criteria_columns.m_col_criteria] = CriteriaColumns::LABEL;*/ + + m_clear_button->signal_clicked().connect( sigc::mem_fun(this, &LoadPluginWindow::clear_clicked)); + m_add_button->signal_clicked().connect( sigc::mem_fun(this, &LoadPluginWindow::add_clicked)); + m_close_button->signal_clicked().connect( sigc::mem_fun(this, &LoadPluginWindow::close_clicked)); + //m_ok_button->signal_clicked().connect( sigc::mem_fun(this, &LoadPluginWindow::ok_clicked)); + m_plugins_treeview->signal_row_activated().connect(sigc::mem_fun(this, &LoadPluginWindow::plugin_activated)); + m_search_entry->signal_activate().connect( sigc::mem_fun(this, &LoadPluginWindow::add_clicked)); + m_search_entry->signal_changed().connect( sigc::mem_fun(this, &LoadPluginWindow::filter_changed)); + + m_selection = m_plugins_treeview->get_selection(); + m_selection->signal_changed().connect(sigc::mem_fun(this, &LoadPluginWindow::plugin_selection_changed)); + + //m_add_button->grab_default(); +} + + +/** Sets the patch controller for this window and initializes everything. + * + * This function MUST be called before using the window in any way! + */ +void +LoadPluginWindow::patch_controller(PatchController* pc) +{ + m_patch_controller = pc; + + if (pc->patch_model()->poly() <= 1) + m_polyphonic_checkbutton->property_sensitive() = false; + else + m_polyphonic_checkbutton->property_sensitive() = true; + +} + + +/** Populates the plugin list on the first show. + * + * This is done here instead of construction time as the list population is + * really expensive and bogs down creation of a patch. This is especially + * important when many patch notifications are sent at one time from the + * engine. + */ +void +LoadPluginWindow::on_show() +{ + if (!m_has_shown) { + set_plugin_list(Store::instance().plugins()); + + // Center on patch window + int m_w, m_h; + get_size(m_w, m_h); + + int parent_x, parent_y, parent_w, parent_h; + m_patch_controller->window()->get_position(parent_x, parent_y); + m_patch_controller->window()->get_size(parent_w, parent_h); + + move(parent_x + parent_w/2 - m_w/2, parent_y + parent_h/2 - m_h/2); + + m_has_shown = true; + } + Gtk::Window::on_show(); +} + + +void +LoadPluginWindow::on_hide() +{ + m_new_module_x = 0; + m_new_module_y = 0; + Gtk::Window::on_hide(); +} + + +void +LoadPluginWindow::set_plugin_list(const std::map >& m) +{ + m_plugins_liststore->clear(); + + CountedPtr plugin = NULL; + for (std::map >::const_iterator i = m.begin(); i != m.end(); ++i) { + plugin = (*i).second; + + Gtk::TreeModel::iterator iter = m_plugins_liststore->append(); + Gtk::TreeModel::Row row = *iter; + + row[m_plugins_columns.m_col_name] = plugin->name(); + //row[m_plugins_columns.m_col_label] = plugin->plug_label(); + row[m_plugins_columns.m_col_type] = plugin->type_string(); + row[m_plugins_columns.m_col_uri] = plugin->uri(); + row[m_plugins_columns.m_col_label] = plugin->name(); + //row[m_plugins_columns.m_col_library] = plugin->lib_name(); + row[m_plugins_columns.m_col_plugin_model] = plugin; + } + + m_plugins_treeview->columns_autosize(); +} + + +void +LoadPluginWindow::add_plugin(CountedPtr plugin) +{ + Gtk::TreeModel::iterator iter = m_plugins_liststore->append(); + Gtk::TreeModel::Row row = *iter; + + row[m_plugins_columns.m_col_name] = plugin->name(); + //row[m_plugins_columns.m_col_label] = plugin->plug_label(); + row[m_plugins_columns.m_col_type] = plugin->type_string(); + row[m_plugins_columns.m_col_uri] = plugin->uri(); + row[m_plugins_columns.m_col_label] = plugin->name(); + //row[m_plugins_columns.m_col_library] = plugin->lib_name(); + row[m_plugins_columns.m_col_plugin_model] = plugin; +} + + + +///// Event Handlers ////// + + +void +LoadPluginWindow::plugin_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* col) +{ + add_clicked(); +} + + +void +LoadPluginWindow::plugin_selection_changed() +{ + m_plugin_name_offset = 0; + + m_node_name_entry->set_text(generate_module_name()); + + //Gtk::TreeModel::iterator iter = m_selection->get_selected(); + //Gtk::TreeModel::Row row = *iter; + //const PluginModel* plugin = row.get_value(m_plugins_columns.m_col_plugin_model); +} + + +/** Generate an automatic name for this Node. + * + * Offset is an offset of the number that will be appended to the plugin's + * label, needed if the user adds multiple plugins faster than the engine + * sends the notification back. + */ +string +LoadPluginWindow::generate_module_name(int offset) +{ + string name = ""; + + Gtk::TreeModel::iterator iter = m_selection->get_selected(); + + if (iter) { + Gtk::TreeModel::Row row = *iter; + CountedPtr plugin = row.get_value(m_plugins_columns.m_col_plugin_model); + char num_buf[3]; + for (uint i=0; i < 99; ++i) { + name = plugin->plug_label(); + if (name == "") + name = plugin->name().substr(0, plugin->name().find(' ')); + if (i+offset != 0) { + snprintf(num_buf, 3, "%d", i+offset+1); + name += "_"; + name += num_buf; + } + if (!m_patch_controller->patch_model()->get_node(name)) + break; + else + name = ""; + } + } + + return name; +} + + +void +LoadPluginWindow::add_clicked() +{ + Gtk::TreeModel::iterator iter = m_selection->get_selected(); + bool polyphonic = m_polyphonic_checkbutton->get_active(); + + if (iter) { // If anything is selected + Gtk::TreeModel::Row row = *iter; + CountedPtr plugin = row.get_value(m_plugins_columns.m_col_plugin_model); + string name = m_node_name_entry->get_text(); + if (name == "") { + name = generate_module_name(); + } + if (name == "") { + Gtk::MessageDialog dialog(*this, + "Unable to chose a default name for this node. Please enter a name.", + false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); + + dialog.run(); + } else { + const string path = m_patch_controller->model()->base_path() + name; + NodeModel* nm = new NodeModel(plugin, path); + nm->polyphonic(polyphonic); + + if (m_new_module_x == 0 && m_new_module_y == 0) { + m_patch_controller->get_new_module_location( + m_new_module_x, m_new_module_y); + } + nm->x(m_new_module_x); + nm->y(m_new_module_y); + + Controller::instance().create_node_from_model(nm); + ++m_plugin_name_offset; + m_node_name_entry->set_text(generate_module_name(m_plugin_name_offset)); + + // Set the next module location 20 over, for a cascade effect + m_new_module_x += 20; + m_new_module_y += 20; + } + } +} + + +void +LoadPluginWindow::close_clicked() +{ + hide(); +} + + +/* +void +LoadPluginWindow::ok_clicked() +{ + add_clicked(); + close_clicked(); +} +*/ + +void +LoadPluginWindow::filter_changed() +{ + m_plugins_liststore->clear(); + + string search = m_search_entry->get_text(); + transform(search.begin(), search.end(), search.begin(), toupper); + + // Get selected criteria + const Gtk::TreeModel::Row row = *(m_filter_combo->get_active()); + CriteriaColumns::Criteria criteria = row[m_criteria_columns.m_col_criteria]; + + string field; + + Gtk::TreeModel::Row model_row; + Gtk::TreeModel::iterator model_iter; + size_t num_visible = 0; + + + for (std::map >::const_iterator i = Store::instance().plugins().begin(); + i != Store::instance().plugins().end(); ++i) { + + const CountedPtr plugin = (*i).second; + + switch (criteria) { + case CriteriaColumns::NAME: + field = plugin->name(); break; + case CriteriaColumns::TYPE: + field = plugin->type_string(); break; + case CriteriaColumns::URI: + field = plugin->uri(); break; + /*case CriteriaColumns::LIBRARY: + field = plugin->lib_name(); break; + case CriteriaColumns::LABEL: + field = plugin->plug_label(); break;*/ + default: + throw; + } + + transform(field.begin(), field.end(), field.begin(), toupper); + + if (field.find(search) != string::npos) { + model_iter = m_plugins_liststore->append(); + model_row = *model_iter; + + model_row[m_plugins_columns.m_col_name] = plugin->name(); + //model_row[m_plugins_columns.m_col_label] = plugin->plug_label(); + model_row[m_plugins_columns.m_col_type] = plugin->type_string(); + model_row[m_plugins_columns.m_col_uri] = plugin->uri(); + model_row[m_plugins_columns.m_col_label] = plugin->plug_label(); + //model_row[m_plugins_columns.m_col_library] = plugin->lib_name(); + model_row[m_plugins_columns.m_col_plugin_model] = plugin; + + ++num_visible; + } + } + + if (num_visible == 1) { + m_selection->unselect_all(); + m_selection->select(model_iter); + } +} + + +void +LoadPluginWindow::clear_clicked() +{ + m_search_entry->set_text(""); + set_plugin_list(Store::instance().plugins()); +} + +bool +LoadPluginWindow::on_key_press_event(GdkEventKey* event) +{ + if (event->keyval == GDK_w && event->state & GDK_CONTROL_MASK) { + hide(); + return true; + } else { + return Gtk::Window::on_key_press_event(event); + } +} + + +} // namespace OmGtk diff --git a/src/progs/ingenuity/LoadPluginWindow.h b/src/progs/ingenuity/LoadPluginWindow.h new file mode 100644 index 00000000..8933cb7d --- /dev/null +++ b/src/progs/ingenuity/LoadPluginWindow.h @@ -0,0 +1,145 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + +#ifndef LOADPLUGINWINDOW_H +#define LOADPLUGINWINDOW_H + +#include "PluginModel.h" +#include +#include +#include +#include +#include "util/CountedPtr.h" + +using LibOmClient::PluginModel; + +namespace OmGtk { + +class PatchController; + +// Gtkmm _really_ needs to add some helper to abstract away this stupid nonsense + +/** Columns for the plugin list in the load plugin window. + * + * \ingroup OmGtk + */ +class ModelColumns : public Gtk::TreeModel::ColumnRecord +{ +public: + ModelColumns() { + add(m_col_name); + add(m_col_type); + add(m_col_uri); + add(m_col_label); + //add(m_col_library); + //add(m_col_label); + add(m_col_plugin_model); + } + + Gtk::TreeModelColumn m_col_name; + Gtk::TreeModelColumn m_col_type; + Gtk::TreeModelColumn m_col_uri; + + // Not displayed: + Gtk::TreeModelColumn m_col_label; + Gtk::TreeModelColumn > m_col_plugin_model; +}; + + +/** Column for the criteria combo box in the load plugin window. + * + * \ingroup OmGtk + */ +class CriteriaColumns : public Gtk::TreeModel::ColumnRecord +{ +public: + enum Criteria { NAME, TYPE, URI, }; + + CriteriaColumns() { add(m_col_label); add(m_col_criteria); } + + Gtk::TreeModelColumn m_col_label; + Gtk::TreeModelColumn m_col_criteria; +}; + + +/** 'Load Plugin' window. + * + * Loaded by glade as a derived object. + * + * \ingroup OmGtk + */ +class LoadPluginWindow : public Gtk::Window +{ +public: + LoadPluginWindow(BaseObjectType* cobject, const Glib::RefPtr& xml); + + void patch_controller(PatchController* pc); + void set_plugin_list(const std::map >& m); + + void set_next_module_location(int x, int y) + { m_new_module_x = x; m_new_module_y = y; } + + void add_plugin(CountedPtr plugin); + bool has_shown() const { return m_has_shown; } + +protected: + void on_show(); + void on_hide(); + bool on_key_press_event(GdkEventKey* event); + +private: + void add_clicked(); + void close_clicked(); + //void ok_clicked(); + void filter_changed(); + void clear_clicked(); + + void plugin_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* col); + void plugin_selection_changed(); + string generate_module_name(int offset = 0); + + PatchController* m_patch_controller; + bool m_has_shown; // plugin list only populated on show to speed patch window creation + + Glib::RefPtr m_plugins_liststore; + ModelColumns m_plugins_columns; + + Glib::RefPtr m_criteria_liststore; + CriteriaColumns m_criteria_columns; + + Glib::RefPtr m_selection; + + int m_plugin_name_offset; // see comments for generate_plugin_name + + int m_new_module_x; + int m_new_module_y; + + Gtk::TreeView* m_plugins_treeview; + Gtk::CheckButton* m_polyphonic_checkbutton; + Gtk::Entry* m_node_name_entry; + Gtk::Button* m_clear_button; + Gtk::Button* m_add_button; + Gtk::Button* m_close_button; + //Gtk::Button* m_ok_button; + Gtk::ComboBox* m_filter_combo; + Gtk::Entry* m_search_entry; +}; + + +} // namespace OmGtk + +#endif // LOADPLUGINWINDOW_H diff --git a/src/progs/ingenuity/LoadSubpatchWindow.cpp b/src/progs/ingenuity/LoadSubpatchWindow.cpp new file mode 100644 index 00000000..492d30d0 --- /dev/null +++ b/src/progs/ingenuity/LoadSubpatchWindow.cpp @@ -0,0 +1,177 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "LoadSubpatchWindow.h" +#include +#include +#include +#include "App.h" +#include "PatchController.h" +#include "NodeModel.h" +#include "Controller.h" +#include "PatchModel.h" +#include "Configuration.h" + +namespace OmGtk { + + +LoadSubpatchWindow::LoadSubpatchWindow(BaseObjectType* cobject, const Glib::RefPtr& xml) +: Gtk::FileChooserDialog(cobject), + m_patch_controller(NULL), + m_new_module_x(0), + m_new_module_y(0) +{ + xml->get_widget("load_subpatch_name_from_file_radio", m_name_from_file_radio); + xml->get_widget("load_subpatch_name_from_user_radio", m_name_from_user_radio); + xml->get_widget("load_subpatch_name_entry", m_name_entry); + xml->get_widget("load_subpatch_poly_from_file_radio", m_poly_from_file_radio); + xml->get_widget("load_subpatch_poly_from_parent_radio", m_poly_from_parent_radio); + xml->get_widget("load_subpatch_poly_from_user_radio", m_poly_from_user_radio); + xml->get_widget("load_subpatch_poly_spinbutton", m_poly_spinbutton); + xml->get_widget("load_subpatch_ok_button", m_ok_button); + xml->get_widget("load_subpatch_cancel_button", m_cancel_button); + + m_name_from_file_radio->signal_toggled().connect(sigc::mem_fun(this, &LoadSubpatchWindow::disable_name_entry)); + m_name_from_user_radio->signal_toggled().connect(sigc::mem_fun(this, &LoadSubpatchWindow::enable_name_entry)); + m_poly_from_file_radio->signal_toggled().connect(sigc::mem_fun(this, &LoadSubpatchWindow::disable_poly_spinner)); + m_poly_from_parent_radio->signal_toggled().connect(sigc::mem_fun(this, &LoadSubpatchWindow::disable_poly_spinner)); + m_poly_from_user_radio->signal_toggled().connect(sigc::mem_fun(this, &LoadSubpatchWindow::enable_poly_spinner)); + m_ok_button->signal_clicked().connect(sigc::mem_fun(this, &LoadSubpatchWindow::ok_clicked)); + m_cancel_button->signal_clicked().connect(sigc::mem_fun(this, &LoadSubpatchWindow::cancel_clicked)); + + Gtk::FileFilter filt; + filt.add_pattern("*.om"); + filt.set_name("Om patch files (*.om)"); + set_filter(filt); + + // Add global examples directory to "shortcut folders" (bookmarks) + string examples_dir = PKGDATADIR; + examples_dir.append("/patches"); + DIR* d = opendir(examples_dir.c_str()); + if (d != NULL) + add_shortcut_folder(examples_dir); +} + + +/** Sets the patch controller for this window and initializes everything. + * + * This function MUST be called before using the window in any way! + */ +void +LoadSubpatchWindow::patch_controller(PatchController* pc) +{ + m_patch_controller = pc; + + char temp_buf[4]; + snprintf(temp_buf, 4, "%zd", pc->patch_model()->poly()); + Glib::ustring txt = "Same as parent ("; + txt.append(temp_buf).append(")"); + m_poly_from_parent_radio->set_label(txt); +} + + +void +LoadSubpatchWindow::on_show() +{ + if (App::instance().configuration()->patch_folder().length() > 0) + set_current_folder(App::instance().configuration()->patch_folder()); + Gtk::FileChooserDialog::on_show(); +} + + +///// Event Handlers ////// + + + +void +LoadSubpatchWindow::disable_name_entry() +{ + m_name_entry->property_sensitive() = false; +} + + +void +LoadSubpatchWindow::enable_name_entry() +{ + m_name_entry->property_sensitive() = true; +} + + +void +LoadSubpatchWindow::disable_poly_spinner() +{ + m_poly_spinbutton->property_sensitive() = false; +} + + +void +LoadSubpatchWindow::enable_poly_spinner() +{ + m_poly_spinbutton->property_sensitive() = true; +} + + +void +LoadSubpatchWindow::ok_clicked() +{ + assert(m_patch_controller != NULL); + assert(m_patch_controller->model()); + + // These values are interpreted by load_patch() as "not defined", ie load from file + string name = ""; + int poly = 0; + + if (m_name_from_user_radio->get_active()) + name = m_name_entry->get_text(); + + if (m_poly_from_user_radio->get_active()) + poly = m_poly_spinbutton->get_value_as_int(); + else if (m_poly_from_parent_radio->get_active()) + poly = m_patch_controller->patch_model()->poly(); + + if (m_new_module_x == 0 && m_new_module_y == 0) { + m_patch_controller->get_new_module_location( + m_new_module_x, m_new_module_y); + } + + PatchModel* pm = new PatchModel(m_patch_controller->model()->base_path() + name, poly); + pm->filename(get_filename()); + pm->set_parent(m_patch_controller->model().get()); + pm->x(m_new_module_x); + pm->y(m_new_module_y); + if (name == "") + pm->set_path(""); + char temp_buf[16]; + snprintf(temp_buf, 16, "%d", m_new_module_x); + pm->set_metadata("module-x", temp_buf); + snprintf(temp_buf, 16, "%d", m_new_module_y); + pm->set_metadata("module-y", temp_buf); + Controller::instance().load_patch(pm); + + App::instance().configuration()->set_patch_folder(pm->filename().substr(0, pm->filename().find_last_of("/"))); + + hide(); +} + + +void +LoadSubpatchWindow::cancel_clicked() +{ + hide(); +} + + +} // namespace OmGtk diff --git a/src/progs/ingenuity/LoadSubpatchWindow.h b/src/progs/ingenuity/LoadSubpatchWindow.h new file mode 100644 index 00000000..e6685d94 --- /dev/null +++ b/src/progs/ingenuity/LoadSubpatchWindow.h @@ -0,0 +1,78 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + +#ifndef LOADSUBPATCHWINDOW_H +#define LOADSUBPATCHWINDOW_H + +#include "PluginModel.h" +#include +#include + + +namespace OmGtk { + +class PatchController; + + +/** 'Add Subpatch' window. + * + * Loaded by glade as a derived object. + * + * \ingroup OmGtk + */ +class LoadSubpatchWindow : public Gtk::FileChooserDialog +{ +public: + LoadSubpatchWindow(BaseObjectType* cobject, const Glib::RefPtr& xml); + + void patch_controller(PatchController* pc); + + void set_next_module_location(int x, int y) + { m_new_module_x = x; m_new_module_y = y; } + +protected: + void on_show(); + +private: + void disable_name_entry(); + void enable_name_entry(); + void disable_poly_spinner(); + void enable_poly_spinner(); + + void ok_clicked(); + void cancel_clicked(); + + PatchController* m_patch_controller; + + int m_new_module_x; + int m_new_module_y; + + Gtk::RadioButton* m_name_from_file_radio; + Gtk::RadioButton* m_name_from_user_radio; + Gtk::Entry* m_name_entry; + Gtk::RadioButton* m_poly_from_file_radio; + Gtk::RadioButton* m_poly_from_parent_radio; + Gtk::RadioButton* m_poly_from_user_radio; + Gtk::SpinButton* m_poly_spinbutton; + Gtk::Button* m_ok_button; + Gtk::Button* m_cancel_button; +}; + + +} // namespace OmGtk + +#endif // LOADSUBPATCHWINDOW_H diff --git a/src/progs/ingenuity/Loader.cpp b/src/progs/ingenuity/Loader.cpp new file mode 100644 index 00000000..71c4b18f --- /dev/null +++ b/src/progs/ingenuity/Loader.cpp @@ -0,0 +1,233 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "Loader.h" +#include +#include +#include +#include "PatchLibrarian.h" +#include "PatchModel.h" +#include "PatchController.h" +using std::cout; using std::endl; + +namespace OmGtk { + + +// LoadPatchEvent // + +void +LoadPatchEvent::execute() +{ + assert(m_patch_librarian != NULL); + m_patch_librarian->load_patch(m_patch_model, m_wait, m_merge); +} + + + +// SavePatchEvent // + +void +SavePatchEvent::execute() +{ + assert(m_patch_librarian != NULL); + m_patch_librarian->save_patch(m_patch_model, m_filename, m_recursive); +} + +/* +void +LoadSessionEvent::execute() +{ + std::ifstream is; + is.open(m_filename.c_str(), std::ios::in); + + if ( ! is.good()) { + cout << "[Loader] Unable to open session file " << m_filename << endl; + return; + } else { + cout << "[Loader] Loading session from " << m_filename << endl; + } + string s; + + is >> s; + if (s != "version") { + cout << "[Loader] Corrupt session file." << endl; + is.close(); + return; + } + + is >> s; + if (s != "1") { + cout << "[Loader] Unrecognised session file version." << endl; + is.close(); + return; + } + + while (!is.eof()) { + is >> s; + if (s == "") continue; + + if (s != "patch") { + //cerr << "[Loader] Corrupt session file, aborting session load." << endl; + break; + } else { + is >> s; + PatchModel* pm = new PatchModel("", 0); + if (s.substr(0, 1) != "/") + s = m_filename.substr(0, m_filename.find_last_of("/")+1) + s; + pm->filename(s); + pm->parent(NULL); + m_patch_librarian->load_patch(pm); + } + } + + is.close(); +} + + +void +SaveSessionEvent::execute() +{ + assert(m_filename != ""); + string dir = m_filename.substr(0, m_filename.find_last_of("/")); + + string patch_filename; + + std::ofstream os; + os.open(m_filename.c_str(), std::ios::out); + + if ( ! os.good()) { + cout << "[Loader] Unable to write to session file " << m_filename << endl; + return; + } else { + cout << "[Loader] Saving session to " << m_filename << endl; + } + + os << "version 1" << endl; + + for (map::iterator i = app->patches().begin(); + i != app->patches().end(); ++i) + { + if ((*i).second->model()->parent() == NULL) { + patch_filename = (*i).second->model()->filename(); + + // Make path relative if possible + if (patch_filename.length() > dir.length() && + patch_filename.substr(0, dir.length()) == dir) + patch_filename = patch_filename.substr(dir.length()+1); + + os << "patch " << patch_filename << endl; + } + } + + os.close(); +} +*/ + + +//////// Loader ////////// + + +Loader::Loader(PatchLibrarian* const patch_librarian) +: m_patch_librarian(patch_librarian), + m_event(NULL), + m_thread_exit_flag(false) +{ + assert(m_patch_librarian != NULL); + pthread_mutex_init(&m_mutex, NULL); + pthread_cond_init(&m_cond, NULL); +} + + +void +Loader::set_event(LoaderEvent* ev) +{ + assert(ev != NULL); + + pthread_mutex_lock(&m_mutex); + assert(m_event == NULL); + m_event = ev; + pthread_cond_signal(&m_cond); + pthread_mutex_unlock(&m_mutex); +} + + +void +Loader::launch() +{ + pthread_create(&m_thread, NULL, Loader::thread_function, this); +} + + +void* +Loader::thread_function(void* me) +{ + Loader* ct = static_cast(me); + return ct->m_thread_function(NULL); +} + + +void* +Loader::m_thread_function(void *) +{ + while ( ! m_thread_exit_flag) { + pthread_mutex_lock(&m_mutex); + pthread_cond_wait(&m_cond, &m_mutex); + + LoaderEvent* ev = m_event; + ev->execute(); + delete ev; + m_event = NULL; + + pthread_mutex_unlock(&m_mutex); + } + + pthread_exit(NULL); + return NULL; +} + + +void +Loader::load_patch(PatchModel* model, bool wait, bool merge) +{ + set_event(new LoadPatchEvent(m_patch_librarian, model, wait, merge)); +} + + +void +Loader::save_patch(PatchModel* model, const string& filename, bool recursive) +{ + cout << "[Loader] Saving patch " << filename << endl; + set_event(new SavePatchEvent(m_patch_librarian, model, filename, recursive)); +} + + +/* +void +Loader::load_session(const string& filename) +{ + set_event(new LoadSessionEvent(m_patch_librarian, filename)); +} + + +void +Loader::save_session(const string& filename) +{ + cout << "Saving session..." << endl; + set_event(new SaveSessionEvent(m_patch_librarian, filename)); +} +*/ + +} // namespace OmGtk diff --git a/src/progs/ingenuity/Loader.h b/src/progs/ingenuity/Loader.h new file mode 100644 index 00000000..28881c17 --- /dev/null +++ b/src/progs/ingenuity/Loader.h @@ -0,0 +1,154 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef LOADERTHREAD_H +#define LOADERTHREAD_H + +#include +#include +using std::string; + +namespace LibOmClient { + class PatchLibrarian; + class PatchModel; +} +using LibOmClient::PatchLibrarian; +using LibOmClient::PatchModel; + + +namespace OmGtk { + +/** Event to run in the Loader thread. + * + * \ingroup OmGtk + */ +class LoaderEvent +{ +public: + virtual void execute() = 0; + virtual ~LoaderEvent() {} +protected: + LoaderEvent() {} +}; + + +/** Loader thread patch loading event. + * + * \ingroup OmGtk + */ +class LoadPatchEvent : public LoaderEvent +{ +public: + LoadPatchEvent(PatchLibrarian* pl, PatchModel* model, bool wait, bool merge) + : m_patch_librarian(pl), m_patch_model(model), m_wait(wait), m_merge(merge) {} + virtual ~LoadPatchEvent() {} + void execute(); +private: + PatchLibrarian* m_patch_librarian; + PatchModel* m_patch_model; + bool m_wait; + bool m_merge; +}; + + +/** Loader thread patch loading event. + * + * \ingroup OmGtk + */ +class SavePatchEvent : public LoaderEvent +{ +public: + SavePatchEvent(PatchLibrarian* pl, PatchModel* pm, const string& filename, bool recursive) + : m_patch_librarian(pl), m_patch_model(pm), m_filename(filename), m_recursive(recursive) {} + virtual ~SavePatchEvent() {} + void execute(); +private: + PatchLibrarian* m_patch_librarian; + PatchModel* m_patch_model; + string m_filename; + bool m_recursive; +}; + +/* +class LoadSessionEvent : public LoaderEvent +{ +public: + LoadSessionEvent(PatchLibrarian* pl, const string& filename) + : m_patch_librarian(pl), m_filename(filename) {} + virtual ~LoadSessionEvent() {} + void execute(); +private: + PatchLibrarian* m_patch_librarian; + string m_filename; +}; + + +class SaveSessionEvent : public LoaderEvent +{ +public: + SaveSessionEvent(PatchLibrarian* pl, const string& filename) + : m_patch_librarian(pl), m_filename(filename) {} + virtual ~SaveSessionEvent() {} + void execute(); +private: + PatchLibrarian* m_patch_librarian; + string m_filename; +}; +*/ + +/** Thread for loading patch files. + * + * This is a seperate thread so it can send all the loading message without + * blocking everything else, so the app can respond to the incoming events + * caused as a result of the patch loading. + * + * \ingroup OmGtk + */ +class Loader +{ +public: + Loader(PatchLibrarian* const patch_librarian); + ~Loader() { m_thread_exit_flag = true; } + + void launch(); + void exit() { m_thread_exit_flag = true; } + + void load_patch(PatchModel* model, bool wait, bool merge); + void save_patch(PatchModel* model, const string& filename, bool recursive); + + //void load_session(const string& filename); + //void save_session(const string& filename); + + static void* thread_function(void* me); + +private: + void* m_thread_function(void*); + + void set_event(LoaderEvent* ev); + + PatchLibrarian* const m_patch_librarian; + LoaderEvent* m_event; + bool m_thread_exit_flag; + pthread_t m_thread; + pthread_mutex_t m_mutex; + pthread_cond_t m_cond; + +}; + + +} // namespace OmGtk + +#endif // LOADERRTHREAD_H diff --git a/src/progs/ingenuity/Makefile.am b/src/progs/ingenuity/Makefile.am new file mode 100644 index 00000000..bb42d575 --- /dev/null +++ b/src/progs/ingenuity/Makefile.am @@ -0,0 +1,95 @@ +if BUILD_GTK_CLIENT + +EXTRA_DIST = om_gtk.gladep +MAINTAINERCLEANFILES = Makefile.in + +sharefilesdir = $(pkgdatadir) +dist_sharefiles_DATA = om_gtk.glade om-icon.png + +AM_CXXFLAGS = -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/client -DPKGDATADIR=\"$(pkgdatadir)\" @GTKMM_CFLAGS@ @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @LOSC_CFLAGS@ @LASH_CFLAGS@ @FLOWCANVAS_CFLAGS@ -DWITH_RTTI +om_gtk_LDADD = @GTKMM_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @LOSC_LIBS@ @LASH_LIBS@ @FLOWCANVAS_LIBS@ ../../libs/client/libomclient.la +om_gtk_DEPENDENCIES = ../../libs/client/libomclient.la + + +bin_PROGRAMS = om_gtk +om_gtk_SOURCES = \ + cmdline.h \ + cmdline.c \ + main.cpp \ + singletons.cpp \ + ConnectWindow.h \ + ConnectWindow.cpp \ + App.h \ + App.cpp \ + Configuration.h \ + Configuration.cpp \ + GladeFactory.h \ + GladeFactory.cpp \ + Controller.h \ + Controller.cpp \ + GtkObjectController.h \ + GtkObjectController.cpp \ + PatchController.h \ + PatchController.cpp \ + NodeController.h \ + NodeController.cpp \ + PortController.h \ + PortController.cpp \ + DSSIController.h \ + DSSIController.cpp \ + LoadPluginWindow.h \ + LoadPluginWindow.cpp \ + LoadPatchWindow.h \ + LoadPatchWindow.cpp \ + MessagesWindow.h \ + MessagesWindow.cpp \ + LoadSubpatchWindow.h \ + LoadSubpatchWindow.cpp \ + NodeControlWindow.h \ + NodeControlWindow.cpp \ + ControlPanel.h \ + ControlPanel.cpp \ + ControlGroups.h \ + ControlGroups.cpp \ + PatchView.h \ + PatchView.cpp \ + PatchWindow.h \ + PatchWindow.cpp \ + BreadCrumb.h \ + OmFlowCanvas.h \ + OmFlowCanvas.cpp \ + ../../common/types.h \ + ../../common/Path.h \ + OmModule.h \ + OmModule.cpp \ + OmPortModule.h \ + OmPortModule.cpp \ + DSSIModule.h \ + DSSIModule.cpp \ + SubpatchModule.h \ + SubpatchModule.cpp \ + OmPort.h \ + OmPort.cpp \ + OmPatchPort.h \ + OmPatchPort.cpp \ + NewSubpatchWindow.h \ + NewSubpatchWindow.cpp \ + ConfigWindow.h \ + ConfigWindow.cpp \ + PatchPropertiesWindow.h \ + PatchPropertiesWindow.cpp \ + Loader.h \ + Loader.cpp \ + RenameWindow.h \ + RenameWindow.cpp \ + NodePropertiesWindow.h \ + NodePropertiesWindow.cpp \ + PatchTreeWindow.h \ + PatchTreeWindow.cpp + +if WITH_LASH +om_gtk_SOURCES += LashController.h LashController.cpp +endif + + +endif # WITH_GTK_CLIENT diff --git a/src/progs/ingenuity/MessagesWindow.cpp b/src/progs/ingenuity/MessagesWindow.cpp new file mode 100644 index 00000000..2f80df25 --- /dev/null +++ b/src/progs/ingenuity/MessagesWindow.cpp @@ -0,0 +1,64 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "MessagesWindow.h" +#include + +namespace OmGtk { +using std::string; + + +MessagesWindow::MessagesWindow(BaseObjectType* cobject, const Glib::RefPtr& glade_xml) +: Gtk::Window(cobject) +{ + glade_xml->get_widget("messages_textview", m_textview); + glade_xml->get_widget("messages_clear_button", m_clear_button); + glade_xml->get_widget("messages_close_button", m_close_button); + + m_clear_button->signal_clicked().connect(sigc::mem_fun(this, &MessagesWindow::clear_clicked)); + m_close_button->signal_clicked().connect(sigc::mem_fun(this, &MessagesWindow::close_clicked)); +} + + +void +MessagesWindow::post(const string& msg) +{ + Glib::RefPtr text_buf = m_textview->get_buffer(); + text_buf->insert(text_buf->end(), msg); + text_buf->insert(text_buf->end(), "\n"); + + if (!m_clear_button->is_sensitive()) + m_clear_button->set_sensitive(true); +} + + +void +MessagesWindow::close_clicked() +{ + hide(); +} + + +void +MessagesWindow::clear_clicked() +{ + Glib::RefPtr text_buf = m_textview->get_buffer(); + text_buf->erase(text_buf->begin(), text_buf->end()); + m_clear_button->set_sensitive(false); +} + + +} // namespace OmGtk diff --git a/src/progs/ingenuity/MessagesWindow.h b/src/progs/ingenuity/MessagesWindow.h new file mode 100644 index 00000000..70159e23 --- /dev/null +++ b/src/progs/ingenuity/MessagesWindow.h @@ -0,0 +1,55 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef MESSAGESWINDOW_H +#define MESSAGESWINDOW_H + +#include +#include +#include +using std::string; + + +namespace OmGtk { + + +/** Messages Window. + * + * Loaded by libglade as a derived object. + * This is shown when errors occur (ie during patch loading). + * + * \ingroup OmGtk + */ +class MessagesWindow : public Gtk::Window +{ +public: + MessagesWindow(BaseObjectType* cobject, const Glib::RefPtr& refGlade); + + void post(const string& str); + +private: + void clear_clicked(); + void close_clicked(); + + Gtk::TextView* m_textview; + Gtk::Button* m_clear_button; + Gtk::Button* m_close_button; +}; + + +} // namespace OmGtk + +#endif // MESSAGESWINDOW_H diff --git a/src/progs/ingenuity/NewSubpatchWindow.cpp b/src/progs/ingenuity/NewSubpatchWindow.cpp new file mode 100644 index 00000000..40960daa --- /dev/null +++ b/src/progs/ingenuity/NewSubpatchWindow.cpp @@ -0,0 +1,111 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "NewSubpatchWindow.h" +#include "PatchController.h" +#include "NodeModel.h" +#include "Controller.h" +#include "PatchModel.h" + +namespace OmGtk { + + +NewSubpatchWindow::NewSubpatchWindow(BaseObjectType* cobject, const Glib::RefPtr& xml) +: Gtk::Window(cobject), + m_new_module_x(0), + m_new_module_y(0) +{ + xml->get_widget("new_subpatch_name_entry", m_name_entry); + xml->get_widget("new_subpatch_message_label", m_message_label); + xml->get_widget("new_subpatch_polyphony_spinbutton", m_poly_spinbutton); + xml->get_widget("new_subpatch_ok_button", m_ok_button); + xml->get_widget("new_subpatch_cancel_button", m_cancel_button); + + m_name_entry->signal_changed().connect(sigc::mem_fun(this, &NewSubpatchWindow::name_changed)); + m_ok_button->signal_clicked().connect(sigc::mem_fun(this, &NewSubpatchWindow::ok_clicked)); + m_cancel_button->signal_clicked().connect(sigc::mem_fun(this, &NewSubpatchWindow::cancel_clicked)); + + m_ok_button->property_sensitive() = false; +} + + +/** Sets the patch controller for this window and initializes everything. + * + * This function MUST be called before using the window in any way! + */ +void +NewSubpatchWindow::patch_controller(PatchController* pc) +{ + m_patch_controller = pc; +} + + +/** Called every time the user types into the name input box. + * Used to display warning messages, and enable/disable the OK button. + */ +void +NewSubpatchWindow::name_changed() +{ + string name = m_name_entry->get_text(); + if (name.find("/") != string::npos) { + m_message_label->set_text("Name may not contain '/'"); + m_ok_button->property_sensitive() = false; + } else if (m_patch_controller->patch_model()->get_node(name)) { + m_message_label->set_text("An object already exists with that name."); + m_ok_button->property_sensitive() = false; + } else if (name.length() == 0) { + m_message_label->set_text(""); + m_ok_button->property_sensitive() = false; + } else { + m_message_label->set_text(""); + m_ok_button->property_sensitive() = true; + } +} + + +void +NewSubpatchWindow::ok_clicked() +{ + PatchModel* pm = new PatchModel( + m_patch_controller->model()->base_path() + m_name_entry->get_text(), + m_poly_spinbutton->get_value_as_int()); + + if (m_new_module_x == 0 && m_new_module_y == 0) { + m_patch_controller->get_new_module_location( + m_new_module_x, m_new_module_y); + } + + pm->set_parent(m_patch_controller->patch_model()); + pm->x(m_new_module_x); + pm->y(m_new_module_y); + char temp_buf[16]; + snprintf(temp_buf, 16, "%d", m_new_module_x); + pm->set_metadata("module-x", temp_buf); + snprintf(temp_buf, 16, "%d", m_new_module_y); + pm->set_metadata("module-y", temp_buf); + Controller::instance().create_patch_from_model(pm); + hide(); +} + + +void +NewSubpatchWindow::cancel_clicked() +{ + hide(); +} + + +} // namespace OmGtk diff --git a/src/progs/ingenuity/NewSubpatchWindow.h b/src/progs/ingenuity/NewSubpatchWindow.h new file mode 100644 index 00000000..eea37bfb --- /dev/null +++ b/src/progs/ingenuity/NewSubpatchWindow.h @@ -0,0 +1,67 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + +#ifndef NEWSUBPATCHWINDOW_H +#define NEWSUBPATCHWINDOW_H + +#include "PluginModel.h" +#include +#include + + +namespace OmGtk { + +class PatchController; + + +/** 'New Subpatch' window. + * + * Loaded by glade as a derived object. + * + * \ingroup OmGtk + */ +class NewSubpatchWindow : public Gtk::Window +{ +public: + NewSubpatchWindow(BaseObjectType* cobject, const Glib::RefPtr& xml); + + void patch_controller(PatchController* pc); + + void set_next_module_location(int x, int y) + { m_new_module_x = x; m_new_module_y = y; } + +private: + void name_changed(); + void ok_clicked(); + void cancel_clicked(); + + PatchController* m_patch_controller; + + int m_new_module_x; + int m_new_module_y; + + Gtk::Entry* m_name_entry; + Gtk::Label* m_message_label; + Gtk::SpinButton* m_poly_spinbutton; + Gtk::Button* m_ok_button; + Gtk::Button* m_cancel_button; +}; + + +} // namespace OmGtk + +#endif // NEWSUBPATCHWINDOW_H diff --git a/src/progs/ingenuity/NodeControlWindow.cpp b/src/progs/ingenuity/NodeControlWindow.cpp new file mode 100644 index 00000000..405a1f99 --- /dev/null +++ b/src/progs/ingenuity/NodeControlWindow.cpp @@ -0,0 +1,127 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License alongCont + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "NodeControlWindow.h" +#include "GladeFactory.h" +#include "NodeController.h" +#include "ControlGroups.h" +#include "PatchWindow.h" +#include +#include +using std::cerr; using std::cout; using std::endl; + +namespace OmGtk { + + +/** Create a node control window and load a new ControlPanel for it. + */ +NodeControlWindow::NodeControlWindow(NodeController* node, size_t poly) +: m_node(node), + m_position_stored(false), + m_x(0), m_y(0) +{ + assert(m_node != NULL); + + property_resizable() = true; + set_border_width(5); + + set_title(m_node->path() + " Controls"); + + Glib::RefPtr xml = GladeFactory::new_glade_reference("warehouse_win"); + xml->get_widget_derived("control_panel_vbox", m_control_panel); + m_control_panel->reparent(*this); + + m_control_panel->init(m_node, poly); + + show_all_children(); + resize(); + + // FIXME: not working + set_icon_from_file(string(PKGDATADIR) + "/om-icon.png"); + + m_callback_enabled = true; +} + + +/** Create a node control window and with an existing ControlPanel. + */ +NodeControlWindow::NodeControlWindow(NodeController* node, ControlPanel* panel) +: m_node(node), + m_control_panel(panel) +{ + assert(m_node != NULL); + + property_resizable() = true; + set_border_width(5); + + set_title(m_node->path() + " Controls"); + + m_control_panel->reparent(*this); + + show_all_children(); + resize(); + + m_callback_enabled = true; +} + + +NodeControlWindow::~NodeControlWindow() +{ + delete m_control_panel; +} + + +void +NodeControlWindow::resize() +{ + pair controls_size = m_control_panel->ideal_size(); + /*int width = 400; + int height = controls_size.second + + ((m_node->polyphonic()) ? 4 : 40);*/ + int width = controls_size.first; + int height = controls_size.second; + + if (height > property_screen().get_value()->get_height() - 64) + height = property_screen().get_value()->get_height() - 64; + if (width > property_screen().get_value()->get_width() - 64) + width = property_screen().get_value()->get_width() - 64; + + //cerr << "Resizing to: " << width << " x " << height << endl; + + Gtk::Window::resize(width, height); +} + + +void +NodeControlWindow::on_show() +{ + if (m_position_stored) + move(m_x, m_y); + + Gtk::Window::on_show(); +} + + +void +NodeControlWindow::on_hide() +{ + m_position_stored = true; + get_position(m_x, m_y); + Gtk::Window::on_hide(); +} + + +} // namespace OmGtk diff --git a/src/progs/ingenuity/NodeControlWindow.h b/src/progs/ingenuity/NodeControlWindow.h new file mode 100644 index 00000000..3f472b82 --- /dev/null +++ b/src/progs/ingenuity/NodeControlWindow.h @@ -0,0 +1,69 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + +#ifndef NODECONTROLWINDOW_H +#define NODECONTROLWINDOW_H + +#include +#include +#include +#include +#include +#include "ControlPanel.h" +using std::string; using std::vector; + +using namespace LibOmClient; + +namespace OmGtk { + +class ControlGroup; +class NodeController; + + +/** Window with controls (sliders) for all control-rate ports on a Node. + * + * \ingroup OmGtk + */ +class NodeControlWindow : public Gtk::Window +{ +public: + NodeControlWindow(NodeController* node, size_t poly); + NodeControlWindow(NodeController* node, ControlPanel* panel); + virtual ~NodeControlWindow(); + + ControlPanel* control_panel() const { return m_control_panel; } + + void resize(); + +protected: + void on_show(); + void on_hide(); + +private: + NodeController* m_node; + ControlPanel* m_control_panel; + bool m_callback_enabled; + + bool m_position_stored; + int m_x; + int m_y; +}; + + +} // namespace OmGtk + +#endif // NODECONTROLWINDOW_H diff --git a/src/progs/ingenuity/NodeController.cpp b/src/progs/ingenuity/NodeController.cpp new file mode 100644 index 00000000..c80bc9c4 --- /dev/null +++ b/src/progs/ingenuity/NodeController.cpp @@ -0,0 +1,394 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "NodeController.h" +#include +#include +#include "OmModule.h" +#include "NodeModel.h" +#include "PortModel.h" +#include "PortController.h" +#include "GtkObjectController.h" +#include "NodeControlWindow.h" +#include "OmModule.h" +#include "PatchController.h" +#include "OmFlowCanvas.h" +#include "RenameWindow.h" +#include "GladeFactory.h" +#include "Controller.h" +#include "PatchWindow.h" +#include "PatchModel.h" +#include "NodePropertiesWindow.h" +#include "Store.h" +using std::cerr; using std::endl; + +namespace OmGtk { + + +NodeController::NodeController(CountedPtr model) +: GtkObjectController(model), + m_controls_menuitem(NULL), + m_module(NULL), + m_control_window(NULL), + m_properties_window(NULL), + m_bridge_port(NULL) +{ + assert(!model->controller()); + model->set_controller(this); + + // Create port controllers + for (PortModelList::const_iterator i = node_model()->ports().begin(); + i != node_model()->ports().end(); ++i) { + assert(!(*i)->controller()); + assert((*i)->parent()); + assert((*i)->parent().get() == node_model().get()); + // FIXME: leak + PortController* const pc = new PortController(*i); + assert((*i)->controller() == pc); // PortController() does this + } + + // Build menu + + Gtk::Menu::MenuList& items = m_menu.items(); + + Gtk::Menu_Helpers::MenuElem controls_elem + = Gtk::Menu_Helpers::MenuElem("Controls", + sigc::mem_fun(this, &NodeController::show_control_window)); + m_controls_menuitem = controls_elem.get_child(); + items.push_back(controls_elem); + items.push_back(Gtk::Menu_Helpers::MenuElem("Properties", + sigc::mem_fun(this, &NodeController::show_properties_window))); + items.push_back(Gtk::Menu_Helpers::SeparatorElem()); + items.push_back(Gtk::Menu_Helpers::MenuElem("Rename...", + sigc::mem_fun(this, &NodeController::show_rename_window))); + items.push_back(Gtk::Menu_Helpers::MenuElem("Clone", + sigc::mem_fun(this, &NodeController::on_menu_clone))); + items.push_back(Gtk::Menu_Helpers::MenuElem("Disconnect All", + sigc::mem_fun(this, &NodeController::on_menu_disconnect_all))); + items.push_back(Gtk::Menu_Helpers::MenuElem("Destroy", + sigc::mem_fun(this, &NodeController::on_menu_destroy))); + + m_controls_menuitem->property_sensitive() = false; + + if (node_model()->plugin() && node_model()->plugin()->type() == PluginModel::Internal + && node_model()->plugin()->plug_label() == "midi_control_in") { + Gtk::Menu::MenuList& items = m_menu.items(); + items.push_back(Gtk::Menu_Helpers::MenuElem("Learn", + sigc::mem_fun(this, &NodeController::on_menu_learn))); + } + + model->new_port_sig.connect(sigc::mem_fun(this, &NodeController::add_port)); +} + + +NodeController::~NodeController() +{ +} + + +void +NodeController::create_module(OmFlowCanvas* canvas) +{ + //cerr << "Creating node module " << m_model->path() << endl; + + // If this is a DSSI plugin, DSSIController should be doing this + /*assert(node_model()->plugin()); + assert(node_model()->plugin()->type() != PluginModel::DSSI); + assert(canvas != NULL); + assert(m_module == NULL);*/ + + assert(canvas); + assert(node_model()); + m_module = new OmModule(canvas, this); + + create_all_ports(); + + m_module->move_to(node_model()->x(), node_model()->y()); +} + + +void +NodeController::set_path(const Path& new_path) +{ + cerr << "FIXME: rename\n"; + /* + remove_from_store(); + + // Rename ports + for (list::const_iterator i = node_model()->ports().begin(); + i != node_model()->ports().end(); ++i) { + GtkObjectController* const pc = (GtkObjectController*)((*i)->controller()); + assert(pc != NULL); + pc->set_path(m_model->path().base_path() + pc->model()->name()); + } + + // Handle bridge port, if this node represents one + if (m_bridge_port != NULL) + m_bridge_port->set_path(new_path); + + if (m_module != NULL) + m_module->canvas()->rename_module(node_model()->path().name(), new_path.name()); + + GtkObjectController::set_path(new_path); + + add_to_store(); + */ +} + + +void +NodeController::destroy() +{ + PatchController* pc = ((PatchController*)m_model->parent()->controller()); + assert(pc != NULL); + + //remove_from_store(); + //pc->remove_node(m_model->path().name()); + cerr << "FIXME: remove node\n"; + + if (m_bridge_port != NULL) + m_bridge_port->destroy(); + m_bridge_port = NULL; + + //if (m_module != NULL) + // delete m_module; +} + + +void +NodeController::metadata_update(const string& key, const string& value) +{ + //cout << "[NodeController] Metadata update: " << m_model->path() << endl; + + if (m_module != NULL) { + if (key == "module-x") { + float x = atof(value.c_str()); + //if (x > 0 && x < m_canvas->width()) + m_module->move_to(x, m_module->property_y().get_value()); + } else if (key == "module-y") { + float y = atof(value.c_str()); + //if (y > 0 && y < m_canvas->height()) + m_module->move_to(m_module->property_x().get_value(), y); + } + } + + if (m_bridge_port != NULL) + m_bridge_port->metadata_update(key, value); + + GtkObjectController::metadata_update(key, value); +} + + +void +NodeController::add_port(CountedPtr pm) +{ + assert(pm->parent().get() == node_model().get()); + assert(pm->parent() == node_model()); + assert(node_model()->get_port(pm->name()) == pm); + + cout << "[NodeController] Adding port " << pm->path() << endl; + + // FIXME: leak + PortController* pc = new PortController(pm); + assert(pm->controller() == pc); + //pc->add_to_store(); + + if (m_module != NULL) { + pc->create_port(m_module); + m_module->resize(); + + // Enable "Controls" menu item on module + if (has_control_inputs()) + enable_controls_menuitem(); + } + + if (m_control_window != NULL) { + assert(m_control_window->control_panel() != NULL); + m_control_window->control_panel()->add_port(pc); + m_control_window->resize(); + } +} + + +void +NodeController::show_control_window() +{ + size_t poly = 1; + if (node_model()->polyphonic()) + poly = ((PatchModel*)node_model()->parent().get())->poly(); + + if (!m_control_window) + m_control_window = new NodeControlWindow(this, poly); + + if (m_control_window->control_panel()->num_controls() > 0) + m_control_window->present(); +} + + +void +NodeController::on_menu_destroy() +{ + Controller::instance().destroy(node_model()->path()); +} + + +void +NodeController::show_rename_window() +{ + assert(node_model()->parent()); + + // FIXME: will this be magically cleaned up? + RenameWindow* win = NULL; + Glib::RefPtr xml = GladeFactory::new_glade_reference("rename_win"); + xml->get_widget_derived("rename_win", win); + + PatchController* parent = ((PatchController*)node_model()->parent()->controller()); + assert(parent != NULL); + + if (parent->window() != NULL) + win->set_transient_for(*parent->window()); + + win->set_object(this); + win->show(); +} + +void +NodeController::on_menu_clone() +{ + cerr << "FIXME: clone broken\n"; + /* + assert(node_model()); + //assert(m_parent != NULL); + //assert(m_parent->model() != NULL); + + string clone_name = node_model()->name(); + int i = 2; // postfix number (ie oldname_2) + + // Check if name already has a number postfix + if (clone_name.find_last_of("_") != string::npos) { + string name_postfix = clone_name.substr(clone_name.find_last_of("_")+1); + clone_name = clone_name.substr(0, clone_name.find_last_of("_")); + if (sscanf(name_postfix.c_str(), "%d", &i)) + ++i; + } + + char clone_postfix[4]; + for ( ; i < 100; ++i) { + snprintf(clone_postfix, 4, "_%d", i); + if (node_model()->parent_patch()->get_node(clone_name + clone_postfix) == NULL) + break; + } + + clone_name = clone_name + clone_postfix; + + const string path = node_model()->parent_patch()->base_path() + clone_name; + NodeModel* nm = new NodeModel(node_model()->plugin(), path); + nm->polyphonic(node_model()->polyphonic()); + nm->x(node_model()->x() + 20); + nm->y(node_model()->y() + 20); + Controller::instance().create_node_from_model(nm); + */ +} + + +void +NodeController::on_menu_learn() +{ + Controller::instance().midi_learn(node_model()->path()); +} + +void +NodeController::on_menu_disconnect_all() +{ + Controller::instance().disconnect_all(node_model()->path()); +} + + +void +NodeController::show_properties_window() +{ + PatchController* parent = ((PatchController*)node_model()->parent()->controller()); + assert(parent != NULL); + + if (m_properties_window == NULL) { + Glib::RefPtr xml = GladeFactory::new_glade_reference("node_properties_win"); + xml->get_widget_derived("node_properties_win", m_properties_window); + } + assert(m_properties_window != NULL); + assert(parent != NULL); + m_properties_window->set_node(node_model()); + if (parent->window() != NULL) + m_properties_window->set_transient_for(*parent->window()); + m_properties_window->show(); +} + + +/** Create all (visual) ports and add them to module (and resize it). + */ +void +NodeController::create_all_ports() +{ + assert(m_module != NULL); + + PortController* pc = NULL; + for (PortModelList::const_iterator i = node_model()->ports().begin(); + i != node_model()->ports().end(); ++i) { + pc = dynamic_cast((*i)->controller()); + // FIXME: leak + if (pc == NULL) + pc = new PortController(*i); + pc->create_port(m_module); + } + + m_module->resize(); + + if (has_control_inputs()) + enable_controls_menuitem(); +} + + +bool +NodeController::has_control_inputs() +{ + for (PortModelList::const_iterator i = node_model()->ports().begin(); + i != node_model()->ports().end(); ++i) + if ((*i)->is_input() && (*i)->is_control()) + return true; + + return false; +} + + +void +NodeController::enable_controls_menuitem() +{ + m_controls_menuitem->property_sensitive() = true; +} + + +void +NodeController::disable_controls_menuitem() +{ + m_controls_menuitem->property_sensitive() = false; + + if (m_control_window != NULL) + m_control_window->hide(); +} + + + +} // namespace OmGtk + diff --git a/src/progs/ingenuity/NodeController.h b/src/progs/ingenuity/NodeController.h new file mode 100644 index 00000000..0d87ad2d --- /dev/null +++ b/src/progs/ingenuity/NodeController.h @@ -0,0 +1,114 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef NODECONTROLLER_H +#define NODECONTROLLER_H + +#include +#include +#include "util/Path.h" +#include "GtkObjectController.h" +#include "NodeModel.h" + +using std::string; +using Om::Path; +using namespace LibOmClient; + +template class CountedPtr; + +namespace LibOmClient { + class MetadataModel; + class PortModel; +} + +namespace OmGtk { + +class Controller; +class OmModule; +class NodeControlWindow; +class NodePropertiesWindow; +class PortController; +class OmFlowCanvas; + +/** Controller for a Node. + * + * \ingroup OmGtk + */ +class NodeController : public GtkObjectController +{ +public: + NodeController(CountedPtr model); + virtual ~NodeController(); + + virtual void destroy(); + + virtual void metadata_update(const string& key, const string& value); + + virtual void create_module(OmFlowCanvas* canvas); + + void set_path(const Path& new_path); + + virtual void remove_port(const Path& path, bool resize_module) {} + + virtual void program_add(int bank, int program, const string& name) {} + virtual void program_remove(int bank, int program) {} + + OmModule* module() { return m_module; } + + void bridge_port(PortController* port) { m_bridge_port = port; } + PortController* as_port() { return m_bridge_port; } + + CountedPtr node_model() { return m_model; } + + NodeControlWindow* control_window() { return m_control_window; } + void control_window(NodeControlWindow* cw) { m_control_window = cw; } + + virtual void show_control_window(); + virtual void show_properties_window(); + void show_rename_window(); + + bool has_control_inputs(); + + virtual void show_menu(GdkEventButton* event) + { m_menu.popup(event->button, event->time); } + + virtual void enable_controls_menuitem(); + virtual void disable_controls_menuitem(); + +protected: + virtual void add_port(CountedPtr pm); + + void create_all_ports(); + + void on_menu_destroy(); + void on_menu_clone(); + void on_menu_learn(); + void on_menu_disconnect_all(); + + Gtk::Menu m_menu; + Glib::RefPtr m_controls_menuitem; + + OmModule* m_module; ///< View (module on a patch canvas) + + NodeControlWindow* m_control_window; + NodePropertiesWindow* m_properties_window; + PortController* m_bridge_port; +}; + + +} // namespace OmGtk + +#endif // NODECONTROLLER_H diff --git a/src/progs/ingenuity/NodePropertiesWindow.cpp b/src/progs/ingenuity/NodePropertiesWindow.cpp new file mode 100644 index 00000000..70fdf296 --- /dev/null +++ b/src/progs/ingenuity/NodePropertiesWindow.cpp @@ -0,0 +1,65 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "NodePropertiesWindow.h" +#include +#include +#include "NodeModel.h" +#include "PluginModel.h" + +namespace OmGtk { +using std::string; + + +NodePropertiesWindow::NodePropertiesWindow(BaseObjectType* cobject, const Glib::RefPtr& glade_xml) +: Gtk::Window(cobject) +, m_node_model(NULL) +{ + glade_xml->get_widget("node_properties_path_label", m_node_path_label); + glade_xml->get_widget("node_properties_polyphonic_checkbutton", m_node_polyphonic_toggle); + glade_xml->get_widget("node_properties_plugin_type_label", m_plugin_type_label); + glade_xml->get_widget("node_properties_plugin_uri_label", m_plugin_uri_label); + glade_xml->get_widget("node_properties_plugin_name_label", m_plugin_name_label); +} + + +/** Set the node this window is associated with. + * This function MUST be called before using this object in any way. + */ +void +NodePropertiesWindow::set_node(CountedPtr node_model) +{ + assert(node_model); + + m_node_model = node_model; + + set_title(node_model->path() + " Properties"); + + m_node_path_label->set_text(node_model->path()); + m_node_polyphonic_toggle->set_active(node_model->polyphonic()); + + CountedPtr pm = node_model->plugin(); + + if (pm) { + m_plugin_type_label->set_text(pm->type_string()); + m_plugin_uri_label->set_text(pm->uri()); + m_plugin_name_label->set_text(pm->name()); + } +} + + +} // namespace OmGtk + diff --git a/src/progs/ingenuity/NodePropertiesWindow.h b/src/progs/ingenuity/NodePropertiesWindow.h new file mode 100644 index 00000000..b7e018a1 --- /dev/null +++ b/src/progs/ingenuity/NodePropertiesWindow.h @@ -0,0 +1,55 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef NODEPROPERTIESWINDOW_H +#define NODEPROPERTIESWINDOW_H + +#include +#include +#include "util/CountedPtr.h" + +namespace LibOmClient { class NodeModel; } +using namespace LibOmClient; + +namespace OmGtk { + + +/** 'New Patch' Window. + * + * Loaded by libglade as a derived object. + * + * \ingroup OmGtk + */ +class NodePropertiesWindow : public Gtk::Window +{ +public: + NodePropertiesWindow(BaseObjectType* cobject, const Glib::RefPtr& refGlade); + + void set_node(CountedPtr node_model); + +private: + + CountedPtr m_node_model; + Gtk::Label* m_node_path_label; + Gtk::CheckButton* m_node_polyphonic_toggle; + Gtk::Label* m_plugin_type_label; + Gtk::Label* m_plugin_uri_label; + Gtk::Label* m_plugin_name_label; +}; + +} // namespace OmGtk + +#endif // NODEPROPERTIESWINDOW_H diff --git a/src/progs/ingenuity/OmFlowCanvas.cpp b/src/progs/ingenuity/OmFlowCanvas.cpp new file mode 100644 index 00000000..57b66998 --- /dev/null +++ b/src/progs/ingenuity/OmFlowCanvas.cpp @@ -0,0 +1,263 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "OmFlowCanvas.h" +#include +#include +#include "Controller.h" +#include "PatchController.h" +#include "PatchModel.h" +#include "PatchWindow.h" +#include "LoadPluginWindow.h" +#include "LoadSubpatchWindow.h" +#include "NewSubpatchWindow.h" +#include "OmPort.h" +#include "NodeModel.h" +#include "OmModule.h" +#include "GladeFactory.h" + +namespace OmGtk { + + +OmFlowCanvas::OmFlowCanvas(PatchController* controller, int width, int height) +: FlowCanvas(width, height), + m_patch_controller(controller), + m_last_click_x(0), + m_last_click_y(0) +{ + assert(controller != NULL); + + /*Gtk::Menu::MenuList& items = m_menu.items(); + items.push_back(Gtk::Menu_Helpers::MenuElem("Load Plugin...", + sigc::mem_fun(this, &OmFlowCanvas::menu_load_plugin))); + items.push_back(Gtk::Menu_Helpers::MenuElem("Load Subpatch...", + sigc::mem_fun(this, &OmFlowCanvas::menu_load_subpatch))); + items.push_back(Gtk::Menu_Helpers::MenuElem("New Subpatch...", + sigc::mem_fun(this, &OmFlowCanvas::menu_create_subpatch)));*/ + + Glib::RefPtr xml = GladeFactory::new_glade_reference(); + xml->get_widget("canvas_menu", m_menu); + + xml->get_widget("canvas_menu_add_audio_input", m_menu_add_audio_input); + xml->get_widget("canvas_menu_add_audio_output", m_menu_add_audio_output); + xml->get_widget("canvas_menu_add_control_input", m_menu_add_control_input); + xml->get_widget("canvas_menu_add_control_output", m_menu_add_control_output); + xml->get_widget("canvas_menu_add_midi_input", m_menu_add_midi_input); + xml->get_widget("canvas_menu_add_midi_output", m_menu_add_midi_output); + xml->get_widget("canvas_menu_load_plugin", m_menu_load_plugin); + xml->get_widget("canvas_menu_load_patch", m_menu_load_patch); + xml->get_widget("canvas_menu_new_patch", m_menu_new_patch); + + // Add port menu items + m_menu_add_audio_input->signal_activate().connect( + sigc::bind(sigc::mem_fun(this, &OmFlowCanvas::menu_add_port), + "audio_input", "AUDIO", false)); + m_menu_add_audio_output->signal_activate().connect( + sigc::bind(sigc::mem_fun(this, &OmFlowCanvas::menu_add_port), + "audio_output", "AUDIO", true)); + m_menu_add_control_input->signal_activate().connect( + sigc::bind(sigc::mem_fun(this, &OmFlowCanvas::menu_add_port), + "control_input", "CONTROL", false)); + m_menu_add_control_output->signal_activate().connect( + sigc::bind(sigc::mem_fun(this, &OmFlowCanvas::menu_add_port), + "control_output", "CONTROL", true)); + m_menu_add_midi_input->signal_activate().connect( + sigc::bind(sigc::mem_fun(this, &OmFlowCanvas::menu_add_port), + "midi_input", "MIDI", false)); + m_menu_add_midi_output->signal_activate().connect( + sigc::bind(sigc::mem_fun(this, &OmFlowCanvas::menu_add_port), + "midi_output", "MIDI", true)); + + m_menu_load_plugin->signal_activate().connect(sigc::mem_fun(this, &OmFlowCanvas::menu_load_plugin)); + m_menu_load_patch->signal_activate().connect(sigc::mem_fun(this, &OmFlowCanvas::menu_load_patch)); + m_menu_new_patch->signal_activate().connect(sigc::mem_fun(this, &OmFlowCanvas::menu_new_patch)); +} + + +void +OmFlowCanvas::connect(const Port* src_port, const Port* dst_port) +{ + assert(src_port != NULL); + assert(dst_port != NULL); + + const OmPort* const src = static_cast(src_port); + const OmPort* const dst = static_cast(dst_port); + + // Midi binding/learn shortcut + if (src->model()->type() == PortModel::MIDI && + dst->model()->type() == PortModel::CONTROL) + { + // FIXME: leaks? + PluginModel* pm = new PluginModel(PluginModel::Internal, "", "midi_control_in", ""); + NodeModel* nm = new NodeModel(pm, m_patch_controller->model()->base_path() + + src->name() + "-" + dst->name()); + nm->x(dst->module()->property_x() - dst->module()->width() - 20); + nm->y(dst->module()->property_y()); + Controller::instance().create_node_from_model(nm); + Controller::instance().connect(src->model()->path(), nm->path() + "/MIDI In"); + Controller::instance().connect(nm->path() + "/Out (CR)", dst->model()->path()); + Controller::instance().midi_learn(nm->path()); + + // Set control node range to port's user range + + Controller::instance().set_port_value_queued(nm->path().base_path() + "Min", + atof(dst->model()->get_metadata("user-min").c_str())); + Controller::instance().set_port_value_queued(nm->path().base_path() + "Max", + atof(dst->model()->get_metadata("user-max").c_str())); + } else { + Controller::instance().connect(src->model()->path(), + dst->model()->path()); + } +} + + +void +OmFlowCanvas::disconnect(const Port* src_port, const Port* dst_port) +{ + assert(src_port != NULL); + assert(dst_port != NULL); + + Controller::instance().disconnect(((OmPort*)src_port)->model()->path(), + ((OmPort*)dst_port)->model()->path()); +} + + +bool +OmFlowCanvas::canvas_event(GdkEvent* event) +{ + assert(event != NULL); + + switch (event->type) { + + case GDK_BUTTON_PRESS: + if (event->button.button == 3) { + m_last_click_x = (int)event->button.x; + m_last_click_y = (int)event->button.y; + show_menu(event); + } + break; + + /*case GDK_KEY_PRESS: + if (event->key.keyval == GDK_Delete) + destroy_selected(); + break; + */ + + default: + break; + } + + return FlowCanvas::canvas_event(event); +} + + +void +OmFlowCanvas::destroy_selected() +{ + for (list::iterator m = m_selected_modules.begin(); m != m_selected_modules.end(); ++m) + Controller::instance().destroy(((OmModule*)(*m))->node()->path()); +} + + +void +OmFlowCanvas::menu_add_port(const string& name, const string& type, bool is_output) +{ + const Path& path = m_patch_controller->path().base_path() + name; + Controller::instance().create_port(path, type, is_output); + + char temp_buf[16]; + snprintf(temp_buf, 16, "%d", m_last_click_x); + Controller::instance().set_metadata(path, "module-x", temp_buf); + snprintf(temp_buf, 16, "%d", m_last_click_y); + Controller::instance().set_metadata(path, "module-y", temp_buf); +} +/* +void +OmFlowCanvas::menu_add_audio_input() +{ + string name = "audio_in"; + Controller::instance().create_port(m_patch_controller->path().base_path() + name, "AUDIO", false); +} + + +void +OmFlowCanvas::menu_add_audio_output() +{ + string name = "audio_out"; + Controller::instance().create_port(m_patch_controller->path().base_path() + name, "AUDIO", true); +} + + +void +OmFlowCanvas::menu_add_control_input() +{ + string name = "control_in"; + Controller::instance().create_port(m_patch_controller->path().base_path() + name, "CONTROL", false); +} + + +void +OmFlowCanvas::menu_add_control_output() +{ + string name = "control_out"; + Controller::instance().create_port(m_patch_controller->path().base_path() + name, "CONTROL", true); +} + + +void +OmFlowCanvas::menu_add_midi_input() +{ + string name = "midi_in"; + Controller::instance().create_port(m_patch_controller->path().base_path() + name, "MIDI", false); +} + + +void +OmFlowCanvas::menu_add_midi_output() +{ + string name = "midi_out"; + Controller::instance().create_port(m_patch_controller->path().base_path() + name, "MIDI", true); +} +*/ + +void +OmFlowCanvas::menu_load_plugin() +{ + m_patch_controller->window()->load_plugin_window()->set_next_module_location( + m_last_click_x, m_last_click_y); + m_patch_controller->window()->load_plugin_window()->show(); +} + + +void +OmFlowCanvas::menu_load_patch() +{ + m_patch_controller->window()->load_subpatch_window()->set_next_module_location( + m_last_click_x, m_last_click_y); + m_patch_controller->window()->load_subpatch_window()->show(); +} + + +void +OmFlowCanvas::menu_new_patch() +{ + m_patch_controller->window()->new_subpatch_window()->set_next_module_location( + m_last_click_x, m_last_click_y); + m_patch_controller->window()->new_subpatch_window()->show(); +} + + +} // namespace OmGtk diff --git a/src/progs/ingenuity/OmFlowCanvas.h b/src/progs/ingenuity/OmFlowCanvas.h new file mode 100644 index 00000000..47cb9b2d --- /dev/null +++ b/src/progs/ingenuity/OmFlowCanvas.h @@ -0,0 +1,86 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef OMPATCHBAYAREA_H +#define OMPATCHBAYAREA_H + +#include +#include + + +using std::string; +using namespace LibFlowCanvas; + +using LibFlowCanvas::Port; + +namespace OmGtk { + +class OmModule; +class PatchController; + +/** Patch canvas widget. + * + * \ingroup OmGtk + */ +class OmFlowCanvas : public LibFlowCanvas::FlowCanvas +{ +public: + OmFlowCanvas(PatchController* controller, int width, int height); + + OmModule* find_module(const string& name) + { return (OmModule*)FlowCanvas::find_module(name); } + + void connect(const Port* src_port, const Port* dst_port); + void disconnect(const Port* src_port, const Port* dst_port); + + bool canvas_event(GdkEvent* event); + void destroy_selected(); + + void show_menu(GdkEvent* event) + { m_menu->popup(event->button.button, event->button.time); } + +private: + void menu_add_port(const string& name, const string& type, bool is_output); + /*void menu_add_audio_input(); + void menu_add_audio_output(); + void menu_add_control_input(); + void menu_add_control_output(); + void menu_add_midi_input(); + void menu_add_midi_output();*/ + void menu_load_plugin(); + void menu_new_patch(); + void menu_load_patch(); + + PatchController* m_patch_controller; + int m_last_click_x; + int m_last_click_y; + + Gtk::Menu* m_menu; + Gtk::MenuItem* m_menu_add_audio_input; + Gtk::MenuItem* m_menu_add_audio_output; + Gtk::MenuItem* m_menu_add_control_input; + Gtk::MenuItem* m_menu_add_control_output; + Gtk::MenuItem* m_menu_add_midi_input; + Gtk::MenuItem* m_menu_add_midi_output; + Gtk::MenuItem* m_menu_load_plugin; + Gtk::MenuItem* m_menu_load_patch; + Gtk::MenuItem* m_menu_new_patch; +}; + + +} // namespace OmGtk + +#endif // OMPATCHBAYAREA_H diff --git a/src/progs/ingenuity/OmModule.cpp b/src/progs/ingenuity/OmModule.cpp new file mode 100644 index 00000000..a6e6b09b --- /dev/null +++ b/src/progs/ingenuity/OmModule.cpp @@ -0,0 +1,85 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "OmModule.h" +#include +#include "Controller.h" +#include "OmFlowCanvas.h" +#include "PatchModel.h" +#include "NodeModel.h" +#include "OmPort.h" +#include "GladeFactory.h" +#include "RenameWindow.h" +#include "PatchController.h" +#include "PatchWindow.h" + +namespace OmGtk { + + +OmModule::OmModule(OmFlowCanvas* canvas, NodeController* node) +: LibFlowCanvas::Module(canvas, node->node_model()->name(), + node->node_model()->x(), node->node_model()->y()), + m_node(node) +{ + assert(m_node != NULL); + + /*if (node_model()->polyphonic() && node_model()->parent() != NULL + && node_model()->parent_patch()->poly() > 1) { + border_width(2.0); + }*/ + if (node->node_model()->polyphonic()) { + border_width(2.0); + } +} + + +void +OmModule::show_control_window() +{ + node()->show_control_window(); +} + + +void +OmModule::store_location() +{ + if (m_node->node_model()->x() == 0 || m_node->node_model()->y() == 0) + return; + + char temp_buf[16]; + + m_node->node_model()->x(property_x()); + snprintf(temp_buf, 16, "%f", m_node->node_model()->x()); + m_node->node_model()->set_metadata("module-x", temp_buf); // just in case? + Controller::instance().set_metadata(m_node->node_model()->path(), "module-x", temp_buf); + + m_node->node_model()->y(property_y()); + snprintf(temp_buf, 16, "%f", m_node->node_model()->y()); + m_node->node_model()->set_metadata("module-y", temp_buf); // just in case? + Controller::instance().set_metadata(m_node->node_model()->path(), "module-y", temp_buf); +} + + +void +OmModule::move_to(double x, double y) +{ + Module::move_to(x, y); + m_node->node_model()->x(x); + m_node->node_model()->y(y); + //store_location(); +} + +} // namespace OmGtk diff --git a/src/progs/ingenuity/OmModule.h b/src/progs/ingenuity/OmModule.h new file mode 100644 index 00000000..c4387b31 --- /dev/null +++ b/src/progs/ingenuity/OmModule.h @@ -0,0 +1,77 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + +#ifndef OMMODULE_H +#define OMMODULE_H + +#include +#include +#include +#include "NodeController.h" +using std::string; + +namespace LibOmClient { +class PortModel; +class NodeModel; +class ControlModel; +} +using namespace LibOmClient; + +namespace OmGtk { + +class PatchController; +class OmFlowCanvas; +class OmPort; + + +/** A module in a patch. + * + * This base class is extended for various types of modules - SubpatchModule, + * DSSIModule, etc. + * + * \ingroup OmGtk + */ +class OmModule : public LibFlowCanvas::Module +{ +public: + OmModule(OmFlowCanvas* canvas, NodeController* node); + virtual ~OmModule() {} + + virtual OmPort* port(const string& port_name) { + return (OmPort*)Module::port(port_name); + } + + virtual void store_location(); + void move_to(double x, double y); + + void on_right_click(GdkEventButton* event) { m_node->show_menu(event); } + + void show_control_window(); + + NodeController* node() const { return m_node; } + +protected: + virtual void on_double_click(GdkEventButton* ev) { show_control_window(); } + virtual void on_middle_click(GdkEventButton* ev) { show_control_window(); } + + NodeController* m_node; +}; + + +} // namespace OmGtk + +#endif // OMMODULE_H diff --git a/src/progs/ingenuity/OmPatchPort.cpp b/src/progs/ingenuity/OmPatchPort.cpp new file mode 100644 index 00000000..cab298b0 --- /dev/null +++ b/src/progs/ingenuity/OmPatchPort.cpp @@ -0,0 +1,57 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "OmPatchPort.h" +#include +#include +#include "PortModel.h" +#include "OmPortModule.h" +#include "ControlModel.h" +#include "Configuration.h" +#include "App.h" +using std::cerr; using std::endl; + +using namespace LibOmClient; + +namespace OmGtk { + +OmPatchPort::OmPatchPort(OmPortModule* module, CountedPtr pm) +: Port(module, pm->name(), !pm->is_input(), App::instance().configuration()->get_port_color(pm.get())), + m_port_model(pm) +{ + assert(module); + assert(m_port_model); +} + +#if 0 +void +OmPatchPort::set_name(const string& n) +{ + cerr << "********** OmPatchPort::set_name broken **********************" << endl; + + /* FIXME: move to PortController + string new_path = Path::parent(m_port_model->path()) +"/"+ n; + + for (list::iterator i = m_control_panels.begin(); i != m_control_panels.end(); ++i) + (*i)->rename_port(m_port_model->path(), new_path); + + Port::set_name(n); + m_port_model->path(new_path); + */ +} +#endif + +} // namespace OmGtk diff --git a/src/progs/ingenuity/OmPatchPort.h b/src/progs/ingenuity/OmPatchPort.h new file mode 100644 index 00000000..31db8300 --- /dev/null +++ b/src/progs/ingenuity/OmPatchPort.h @@ -0,0 +1,60 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef OMPATCHPORT_H +#define OMPATCHPORT_H + +#include +#include +#include +#include "util/CountedPtr.h" + +namespace LibOmClient { class PortModel; } +using namespace LibOmClient; +using namespace LibFlowCanvas; +using std::string; using std::list; + +namespace OmGtk { + +class FlowCanvas; +class PatchController; +class PatchWindow; +class OmPortModule; + + +/** A Port (on a pseudo node) in a patch canvas, to represent a port on that patch. + * + * \ingroup OmGtk + */ +class OmPatchPort : public LibFlowCanvas::Port +{ +public: + OmPatchPort(OmPortModule* module, CountedPtr pm); + + virtual ~OmPatchPort() {} + + //void set_name(const string& n); + + CountedPtr model() const { return m_port_model; } + +private: + CountedPtr m_port_model; +}; + + +} // namespace OmGtk + +#endif // OMPATCHPORT_H diff --git a/src/progs/ingenuity/OmPort.cpp b/src/progs/ingenuity/OmPort.cpp new file mode 100644 index 00000000..31b1f110 --- /dev/null +++ b/src/progs/ingenuity/OmPort.cpp @@ -0,0 +1,57 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "OmPort.h" +#include +#include +#include "PortModel.h" +#include "OmModule.h" +#include "ControlModel.h" +#include "Configuration.h" +#include "App.h" +using std::cerr; using std::endl; + +using namespace LibOmClient; + +namespace OmGtk { + +OmPort::OmPort(OmModule* module, CountedPtr pm) +: Port(module, pm->name(), pm->is_input(), App::instance().configuration()->get_port_color(pm.get())), + m_port_model(pm) +{ + assert(module); + assert(m_port_model); +} + +#if 0 +void +OmPort::set_name(const string& n) +{ + cerr << "********** OmPort::set_name broken **********************" << endl; + + /* FIXME: move to PortController + string new_path = Path::parent(m_port_model->path()) +"/"+ n; + + for (list::iterator i = m_control_panels.begin(); i != m_control_panels.end(); ++i) + (*i)->rename_port(m_port_model->path(), new_path); + + Port::set_name(n); + m_port_model->path(new_path); + */ +} +#endif + +} // namespace OmGtk diff --git a/src/progs/ingenuity/OmPort.h b/src/progs/ingenuity/OmPort.h new file mode 100644 index 00000000..ab4fe94f --- /dev/null +++ b/src/progs/ingenuity/OmPort.h @@ -0,0 +1,60 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef OMPORT_H +#define OMPORT_H + +#include +#include +#include +#include "util/CountedPtr.h" + +namespace LibOmClient { class PortModel; } +using namespace LibOmClient; +using namespace LibFlowCanvas; +using std::string; using std::list; + +namespace OmGtk { + +class FlowCanvas; +class PatchController; +class PatchWindow; +class OmModule; + + +/** A Port on an OmModule. + * + * \ingroup OmGtk + */ +class OmPort : public LibFlowCanvas::Port +{ +public: + OmPort(OmModule* module, CountedPtr pm); + + virtual ~OmPort() {} + + //void set_name(const string& n); + + CountedPtr model() const { return m_port_model; } + +private: + CountedPtr m_port_model; +}; + + +} // namespace OmGtk + +#endif // OMPORT_H diff --git a/src/progs/ingenuity/OmPortModule.cpp b/src/progs/ingenuity/OmPortModule.cpp new file mode 100644 index 00000000..67aba9d5 --- /dev/null +++ b/src/progs/ingenuity/OmPortModule.cpp @@ -0,0 +1,71 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "OmPortModule.h" +#include +#include "Controller.h" +#include "OmFlowCanvas.h" +#include "PatchModel.h" +#include "NodeModel.h" +#include "OmPort.h" +#include "GladeFactory.h" +#include "RenameWindow.h" +#include "PatchController.h" +#include "PatchWindow.h" + +namespace OmGtk { + + +OmPortModule::OmPortModule(OmFlowCanvas* canvas, PortController* port, double x, double y) +: LibFlowCanvas::Module(canvas, "", x, y), + m_port(port) +{ + assert(m_port != NULL); + + /*if (port_model()->polyphonic() && port_model()->parent() != NULL + && port_model()->parent_patch()->poly() > 1) { + border_width(2.0); + }*/ +} + + +void +OmPortModule::store_location() +{ + char temp_buf[16]; + + //m_port->port_model()->x(property_x()); + snprintf(temp_buf, 16, "%f", property_x().get_value()); + //m_port->port_model()->set_metadata("module-x", temp_buf); // just in case? + Controller::instance().set_metadata(m_port->port_model()->path(), "module-x", temp_buf); + + //m_port->port_model()->y(property_y()); + snprintf(temp_buf, 16, "%f", property_y().get_value()); + //m_port->port_model()->set_metadata("module-y", temp_buf); // just in case? + Controller::instance().set_metadata(m_port->port_model()->path(), "module-y", temp_buf); +} + + +void +OmPortModule::move_to(double x, double y) +{ + Module::move_to(x, y); + //m_port->port_model()->x(x); + //m_port->port_model()->y(y); + //store_location(); +} + +} // namespace OmGtk diff --git a/src/progs/ingenuity/OmPortModule.h b/src/progs/ingenuity/OmPortModule.h new file mode 100644 index 00000000..68b5e1c0 --- /dev/null +++ b/src/progs/ingenuity/OmPortModule.h @@ -0,0 +1,76 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + +#ifndef OMPORTMODULE_H +#define OMPORTMODULE_H + +#include +#include +#include +#include "PortController.h" +using std::string; + +namespace LibOmClient { +class PortModel; +class NodeModel; +class ControlModel; +} +using namespace LibOmClient; + +namespace OmGtk { + +class PatchController; +class PortController; +class OmFlowCanvas; +class OmPort; + + +/** A module in a patch. + * + * This base class is extended for various types of modules - SubpatchModule, + * DSSIModule, etc. + * + * \ingroup OmGtk + */ +class OmPortModule : public LibFlowCanvas::Module +{ +public: + OmPortModule(OmFlowCanvas* canvas, PortController* port, double x, double y); + virtual ~OmPortModule() {} + + //virtual OmPort* port(const string& port_name) { + // return (OmPort*)Module::port(port_name); + //} + + virtual void store_location(); + void move_to(double x, double y); + + //void on_right_click(GdkEventButton* event) { m_port->show_menu(event); } + + PortController* port() const { return m_port; } + +protected: + //virtual void on_double_click(GdkEventButton* ev) { show_control_window(); } + //virtual void on_middle_click(GdkEventButton* ev) { show_control_window(); } + + PortController* m_port; +}; + + +} // namespace OmGtk + +#endif // OMPORTMODULE_H diff --git a/src/progs/ingenuity/PatchController.cpp b/src/progs/ingenuity/PatchController.cpp new file mode 100644 index 00000000..44275cd8 --- /dev/null +++ b/src/progs/ingenuity/PatchController.cpp @@ -0,0 +1,760 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" +#include "PatchController.h" +#include +#include +#include "GladeFactory.h" +#include "Configuration.h" +#include "util/Path.h" +#include "ControlPanel.h" +#include "ConnectionModel.h" +#include "OmFlowCanvas.h" +#include "PatchView.h" +#include "flowcanvas/Module.h" +#include "PluginModel.h" +#include "Controller.h" +#include "SubpatchModule.h" +#include "DSSIModule.h" +#include "PatchWindow.h" +#include "NodeModel.h" +#include "OmModule.h" +#include "OmPortModule.h" +#include "OmPort.h" +#include "ControlModel.h" +#include "NodeControlWindow.h" +#include "NodeController.h" +#include "PortController.h" +#include "App.h" +#include "PatchTreeWindow.h" +#include "PatchPropertiesWindow.h" +#include "DSSIController.h" +#include "PatchModel.h" +#include "Store.h" + +using std::cerr; using std::cout; using std::endl; +using Om::Path; +using namespace LibOmClient; + +namespace OmGtk { + + +PatchController::PatchController(CountedPtr model) +: NodeController(model), + m_properties_window(NULL), + m_window(NULL), + m_patch_view(NULL), + m_patch_model(model), + m_module_x(0), + m_module_y(0) +{ + assert(model->path().length() > 0); + assert(model->controller() == this); // NodeController() does this + assert(m_patch_model == model); + +/* FIXME if (model->path() != "/") { + PatchController* parent = Store::instance().patch(model->path().parent()); + if (parent != NULL) + parent->add_subpatch(this); + else + cerr << "[PatchController] " << path() << " ERROR: Parent not found." << endl; + }*/ + + //model->new_port_sig.connect(sigc::mem_fun(this, &PatchController::add_port)); + model->new_node_sig.connect(sigc::mem_fun(this, &PatchController::add_node)); + model->removed_node_sig.connect(sigc::mem_fun(this, &PatchController::remove_node)); + model->new_connection_sig.connect(sigc::mem_fun(this, &PatchController::connection)); + model->removed_connection_sig.connect(sigc::mem_fun(this, &PatchController::disconnection)); +} + + +PatchController::~PatchController() +{ + if (m_patch_view != NULL) { + claim_patch_view(); + m_patch_view->hide(); + delete m_patch_view; + m_patch_view = NULL; + } + + if (m_control_window != NULL) { + m_control_window->hide(); + delete m_control_window; + m_control_window = NULL; + } + + if (m_window != NULL) { + m_window->hide(); + delete m_window; + m_window = NULL; + } +} + +/* +void +PatchController::add_to_store() +{ + Store::instance().add_object(this); +} + + +void +PatchController::remove_from_store() +{ + Store::instance().remove_object(this); +} +*/ + +void +PatchController::clear() +{ + // Destroy model + // Destroying nodes removes models from patch model, which invalidates any + // iterator to nodes, so avoid the iterator problem by doing it this way: + const NodeModelMap& nodes = patch_model()->nodes(); + size_t remaining = nodes.size(); + + while (remaining > 0) { + NodeController* const nc = (NodeController*)(*nodes.begin()).second->controller(); + assert(nc != NULL); + nc->destroy(); + assert(nodes.size() == remaining - 1); + --remaining; + } + assert(nodes.empty()); + + patch_model()->clear(); + + if (m_patch_view != NULL) { + assert(m_patch_view->canvas() != NULL); + m_patch_view->canvas()->destroy(); + } +} + + +void +PatchController::destroy() +{ + // Destroying nodes removes models from patch model, which invalidates any + // iterator to nodes, so avoid the iterator problem by doing it this way: + const NodeModelMap& nodes = patch_model()->nodes(); + size_t remaining = nodes.size(); + + while (remaining > 0) { + NodeController* const nc = (NodeController*) + (*nodes.begin()).second->controller(); + assert(nc != NULL); + nc->destroy(); + assert(nodes.size() == remaining - 1); + --remaining; + } + assert(nodes.empty()); + + //App::instance().remove_patch(this); + App::instance().patch_tree()->remove_patch(path()); + + // Delete all children models + //patch_model()->clear(); + + // Remove self from object store + //Store::instance().remove_object(this); + + // Delete self from parent (this will delete model) + /*if (patch_model()->parent() != NULL) { + PatchController* const parent = (PatchController*)patch_model()->parent()->controller(); + assert(parent != NULL); + parent->remove_node(name()); + } else { + //delete m_model; + }*/ +} + + +void +PatchController::metadata_update(const string& key, const string& value) +{ + NodeController::metadata_update(key, value); + + if (key == "filename") + patch_model()->filename(value); +} + + +void +PatchController::set_path(const Path& new_path) +{ + assert(m_model); + Path old_path = path(); + + // Rename nodes + for (NodeModelMap::const_iterator i = patch_model()->nodes().begin(); + i != patch_model()->nodes().end(); ++i) { + const NodeModel* const nm = (*i).second.get(); + assert(nm != NULL); + NodeController* const nc = ((NodeController*)nm->controller()); + assert(nc != NULL); + nc->set_path(new_path.base_path() + nc->node_model()->name()); + } + +#ifdef DEBUG + // Be sure ports were renamed by their bridge nodes + for (PortModelList::const_iterator i = node_model()->ports().begin(); + i != node_model()->ports().end(); ++i) { + GtkObjectController* const pc = (GtkObjectController*)((*i)->controller()); + assert(pc != NULL); + assert(pc->path().parent()== new_path); + } +#endif + + App::instance().patch_tree()->patch_renamed(old_path, new_path); + + if (m_window != NULL) + m_window->patch_renamed(new_path); + + if (m_control_window != NULL) + m_control_window->set_title(new_path + " Controls"); + + if (m_module != NULL) { + assert(m_module->canvas() != NULL); + m_module->canvas()->rename_module(old_path.name(), new_path.name()); + assert(m_module->name() == new_path.name()); + } + + PatchController* parent = dynamic_cast( + patch_model()->parent()->controller()); + + if (parent != NULL && parent->window() != NULL) + parent->window()->node_renamed(old_path, new_path); + + //remove_from_store(); + GtkObjectController::set_path(new_path); + //add_to_store(); + + if (old_path.name() != new_path.name()) + parent->patch_model()->rename_node(old_path, new_path); +} + + +void +PatchController::enable() +{ + if (m_patch_view != NULL) + m_patch_view->enabled(true); + + patch_model()->enabled(true); + + App::instance().patch_tree()->patch_enabled(m_model->path()); +} + + +void +PatchController::disable() +{ + if (m_patch_view != NULL) + m_patch_view->enabled(false); + + patch_model()->enabled(false); + + App::instance().patch_tree()->patch_disabled(m_model->path()); +} + + +void +PatchController::create_module(OmFlowCanvas* canvas) +{ + //cerr << "Creating patch module " << m_model->path() << endl; + + assert(canvas != NULL); + assert(m_module == NULL); + assert(!m_patch_view || canvas != m_patch_view->canvas()); + + m_module = new SubpatchModule(canvas, this); + + + m_menu.remove(m_menu.items()[4]); + + // Add navigation menu items + Gtk::Menu::MenuList& items = m_menu.items(); + items.push_front(Gtk::Menu_Helpers::SeparatorElem()); + items.push_front(Gtk::Menu_Helpers::MenuElem("Browse to Patch", + sigc::mem_fun((SubpatchModule*)m_module, &SubpatchModule::browse_to_patch))); + items.push_front(Gtk::Menu_Helpers::MenuElem("Open Patch in New Window", + sigc::mem_fun(this, &PatchController::show_patch_window))); + + create_all_ports(); + + m_module->move_to(node_model()->x(), node_model()->y()); +} + + +void +PatchController::create_view() +{ + assert(m_patch_view == NULL); + + Glib::RefPtr xml = GladeFactory::new_glade_reference(); + + xml->get_widget_derived("patch_view_vbox", m_patch_view); + assert(m_patch_view != NULL); + m_patch_view->patch_controller(this); + assert(m_patch_view->canvas() != NULL); + + // Create modules for nodes + for (NodeModelMap::const_iterator i = patch_model()->nodes().begin(); + i != patch_model()->nodes().end(); ++i) { + + NodeModel* const nm = (*i).second.get(); + + string val = nm->get_metadata("module-x"); + if (val != "") + nm->x(atof(val.c_str())); + val = nm->get_metadata("module-y"); + if (val != "") + nm->y(atof(val.c_str())); + + /* Set sane default coordinates if not set already yet */ + if (nm->x() == 0.0f && nm->y() == 0.0f) { + int x, y; + get_new_module_location(x, y); + nm->x(x); + nm->y(y); + } + + NodeController* nc = ((NodeController*)nm->controller()); + if (!nc) + nc = create_controller_for_node(nm); + + assert(nc); + assert(nm->controller() == nc); + + if (nc->module() == NULL); + nc->create_module(m_patch_view->canvas()); + assert(nc->module() != NULL); + m_patch_view->canvas()->add_module(nc->module()); + } + + // Create pseudo modules for ports (ports on this canvas, not on our module) + for (PortModelList::const_iterator i = patch_model()->ports().begin(); + i != patch_model()->ports().end(); ++i) { + PortController* const pc = dynamic_cast((*i)->controller()); + assert(pc); + if (pc->module() == NULL) + pc->create_module(m_patch_view->canvas(), 1600, 1200); + assert(pc->module() != NULL); + m_patch_view->canvas()->add_module(pc->module()); + pc->module()->resize(); + } + + + // Create connections + for (list >::const_iterator i = patch_model()->connections().begin(); + i != patch_model()->connections().end(); ++i) { + create_connection(*i); + } + + // Set run checkbox + m_patch_view->enabled(patch_model()->enabled()); +} + + +void +PatchController::show_properties_window() +{ + if (!m_properties_window) { + Glib::RefPtr glade_xml = GladeFactory::new_glade_reference(); + glade_xml->get_widget_derived("patch_properties_win", m_properties_window); + m_properties_window->patch_model(patch_model()); + } + + m_properties_window->show(); + +} + + +/** Create a connection in the view (canvas). + */ +void +PatchController::create_connection(CountedPtr cm) +{ + // Deal with messy anonymous nodes for this patch's own ports... + const Path& src_parent_path = cm->src_port_path().parent(); + const Path& dst_parent_path = cm->dst_port_path().parent(); + + const string& src_parent_name = + (src_parent_path == path()) ? "" : src_parent_path.name(); + const string& dst_parent_name = + (dst_parent_path == path()) ? "" : dst_parent_path.name(); + + m_patch_view->canvas()->add_connection( + src_parent_name, + cm->src_port_path().name(), + dst_parent_name, + cm->dst_port_path().name()); + + // Disable control slider from destination node control window + + cerr << "FIXME: create_connection\n"; + /*PortController* p = Store::instance().port(cm->dst_port_path()); + assert(p != NULL); + + if (p->control_panel() != NULL) + p->control_panel()->disable_port(p->path());*/ + + // FIXME: don't use canvas as a model (search object store) + /*OmModule* m = (OmModule*)m_patch_view->canvas()->find_module( + cm->dst_port_path().parent().name()); + + if (m != NULL) { + OmPort* p = m->port(cm->dst_port_path().name()); + if (p != NULL && p->connections().size() == 1) { + p->model()->connected(true); + assert(m->node_model()->controller() != NULL); + NodeControlWindow* cw = (((NodeController*) + m->node_model()->controller())->control_window()); + if (cw != NULL) + cw->control_panel()->disable_port(cm->dst_port_path()); + } + }*/ +} + + +NodeController* +PatchController::create_controller_for_node(CountedPtr node) +{ + assert(!node->controller()); + NodeController* nc = NULL; + + CountedPtr patch(node); + if (patch) { + assert(patch == node); + assert(patch->parent() == m_patch_model); + nc = new PatchController(patch); + } else { + assert(node->plugin()); + if (node->plugin()->type() == PluginModel::DSSI) + nc = new DSSIController(node); + else + nc = new NodeController(node); + } + + assert(node->controller() == nc); + return nc; +} + + +/** Add a child node to this patch. + * + * This is for plugin nodes and patches, and is responsible for creating the + * GtkObjectController for @a object (and through that the View if necessary) + */ +void +PatchController::add_node(CountedPtr object) +{ + assert(object); + assert(object->parent() == m_patch_model); + assert(patch_model()->get_node(object->name())); + + /*if (patch_model()->get_node(nm->name()) != NULL) { + cerr << "Ignoring existing\n"; + // Node already exists, ignore + //delete nm; + } else {*/ + + + CountedPtr node(object); + assert(node == object); + if (node) { + assert(node->parent() == m_patch_model); + + NodeController* nc = create_controller_for_node(node); + assert(nc); + assert(node->controller() == nc); + + if (m_patch_view != NULL) { + int x, y; + get_new_module_location(x, y); + node->x(x); + node->y(y); + + // Set zoom to 1.0 so module isn't messed up (Death to GnomeCanvas) + float old_zoom = m_patch_view->canvas()->zoom(); + if (old_zoom != 1.0) + m_patch_view->canvas()->zoom(1.0); + + if (nc->module() == NULL) + nc->create_module(m_patch_view->canvas()); + assert(nc->module() != NULL); + m_patch_view->canvas()->add_module(nc->module()); + nc->module()->resize(); + + // Reset zoom + if (old_zoom != 1.0) { + m_patch_view->canvas()->zoom(old_zoom); + nc->module()->zoom(old_zoom); + } + } + + } +} + + +/** Removes a node from this patch. + */ +void +PatchController::remove_node(const string& name) +{ + assert(name.find("/") == string::npos); + assert(!m_patch_model->get_node(name)); + + // Update breadcrumbs if necessary + if (m_window != NULL) + m_window->node_removed(name); + + if (m_patch_view != NULL) { + assert(m_patch_view->canvas() != NULL); + m_patch_view->canvas()->remove_module(name); + } +} + + +/** Add a port to this patch. + * + * Will add a port to the subpatch module and the control window, if they + * exist. + */ +void +PatchController::add_port(CountedPtr pm) +{ + assert(pm); + assert(pm->parent() == m_patch_model); + assert(patch_model()->get_port(pm->name())); + + cerr << "ADDING PORT " << pm->name() << "TO PATCH: " << patch_model()->path() << endl; + + //cerr << "[PatchController] Adding port " << pm->path() << endl; + + /*if (patch_model()->get_port(pm->name())) { + cerr << "[PatchController] Ignoring duplicate port " + << pm->path() << endl; + return; + }*/ + + //node_model()->add_port(pm); + // FIXME: leak + PortController* pc = new PortController(pm); + + // Handle bridge ports/nodes (this is uglier than it should be) + /*NodeController* nc = (NodeController*)Store::instance().node(pm->path())->controller(); + if (nc != NULL) + nc->bridge_port(pc); + */ + + // Create port on this patch's module (if there is one) + if (m_module != NULL) { + pc->create_port(m_module); + m_module->resize(); + } + + // Create port's (pseudo) module on this patch's canvas (if there is one) + if (m_patch_view != NULL) { + int x, y; + get_new_module_location(x, y); + + // Set zoom to 1.0 so module isn't messed up (Death to GnomeCanvas) + float old_zoom = m_patch_view->canvas()->zoom(); + if (old_zoom != 1.0) + m_patch_view->canvas()->zoom(1.0); + + if (pc->module() == NULL) + pc->create_module(m_patch_view->canvas(), x, y); + assert(pc->module() != NULL); + m_patch_view->canvas()->add_module(pc->module()); + pc->module()->resize(); + + // Reset zoom + if (old_zoom != 1.0) { + m_patch_view->canvas()->zoom(old_zoom); + pc->module()->zoom(old_zoom); + } + } + + if (m_control_window != NULL) { + assert(m_control_window->control_panel() != NULL); + m_control_window->control_panel()->add_port(pc); + m_control_window->resize(); + } + + // Enable "Controls" menuitem on module and patch window, if necessary + if (has_control_inputs()) + enable_controls_menuitem(); +} + + +/** Removes a port from this patch + */ +void +PatchController::remove_port(const Path& path, bool resize_module) +{ + assert(path.parent() == m_model->path()); + + //cerr << "[PatchController] Removing port " << path << endl; + + /* FIXME + if (m_control_panel != NULL) { + m_control_panel->remove_port(path); + if (m_control_window != NULL) { + assert(m_control_window->control_panel() == m_control_panel); + m_control_window->resize(); + } + }*/ + + // Remove port on module + if (m_module != NULL) { + assert(m_module->port(path.name()) != NULL); + m_module->remove_port(path.name(), resize_module); + assert(m_module->port(path.name()) == NULL); + } + + patch_model()->remove_port(path); + assert(patch_model()->get_port(path.name())); + + // Disable "Controls" menuitem on module and patch window, if necessary + if (!has_control_inputs()) + disable_controls_menuitem(); +} + + +void +PatchController::connection(CountedPtr cm) +{ + assert(cm); + + //patch_model()->add_connection(cm); + + if (m_patch_view != NULL) + create_connection(cm); +} + + + +void +PatchController::disconnection(const Path& src_port_path, const Path& dst_port_path) +{ + const string& src_node_name = src_port_path.parent().name(); + const string& src_port_name = src_port_path.name(); + const string& dst_node_name = dst_port_path.parent().name(); + const string& dst_port_name = dst_port_path.name(); + + if (m_patch_view != NULL) + m_patch_view->canvas()->remove_connection( + src_node_name, src_port_name, dst_node_name, dst_port_name); + + //patch_model()->remove_connection(src_port_path, dst_port_path); + + cerr << "FIXME: disconnection\n"; + /* + // Enable control slider in destination node control window + PortController* p = (PortController)Store::instance().port(dst_port_path)->controller(); + assert(p != NULL); + + if (p->control_panel() != NULL) + p->control_panel()->enable_port(p->path()); + */ +} + + +/** Try to guess a suitable location for a new module. + */ +void +PatchController::get_new_module_location(int& x, int& y) +{ + assert(m_patch_view != NULL); + assert(m_patch_view->canvas() != NULL); + m_patch_view->canvas()->get_scroll_offsets(x, y); + x += 20; + y += 20; +} + + +void +PatchController::show_patch_window() +{ + if (m_window == NULL) { + Glib::RefPtr xml = GladeFactory::new_glade_reference(); + + xml->get_widget_derived("patch_win", m_window); + assert(m_window != NULL); + + if (m_patch_view == NULL) + create_view(); + + m_window->patch_controller(this); + } + + assert(m_window != NULL); + m_window->present(); +} + + +/** Become the parent of the patch view. + * + * Steals the view away from whatever window is currently showing it. + */ +void +PatchController::claim_patch_view() +{ + assert(m_patch_view != NULL); + + m_patch_view->hide(); + m_patch_view->reparent(m_patch_view_bin); +} + + +void +PatchController::show_control_window() +{ + assert(patch_model()); + + if (m_control_window == NULL) + m_control_window = new NodeControlWindow(this, patch_model()->poly()); + + if (m_control_window->control_panel()->num_controls() > 0) + m_control_window->present(); +} + + +void +PatchController::enable_controls_menuitem() +{ + if (m_window != NULL) + m_window->menu_view_control_window()->property_sensitive() = true; + + NodeController::enable_controls_menuitem(); +} + + +void +PatchController::disable_controls_menuitem() +{ + if (m_window != NULL) + m_window->menu_view_control_window()->property_sensitive() = false; + + NodeController::disable_controls_menuitem(); +} + + +} // namespace OmGtk diff --git a/src/progs/ingenuity/PatchController.h b/src/progs/ingenuity/PatchController.h new file mode 100644 index 00000000..5fcee284 --- /dev/null +++ b/src/progs/ingenuity/PatchController.h @@ -0,0 +1,137 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef PATCHCONTROLLER_H +#define PATCHCONTROLLER_H + +#include +#include +#include "NodeController.h" +#include "PatchModel.h" +template class CountedPtr; + +namespace LibOmClient { +class PatchModel; +class NodeModel; +class PortModel; +class ControlModel; +class ConnectionModel; +} + +using std::string; +using namespace LibOmClient; + +namespace OmGtk { + +class PatchWindow; +class SubpatchModule; +class Controller; +class OmFlowCanvas; +class NodeControlWindow; +class PatchPropertiesWindow; +class ControlPanel; +class PatchView; +class NodeController; + + +/** Controller for a patch. + * + * A patch is different from a port or node because there are two + * representations in the Gtk client - the window and the module in the parent + * patch (if applicable). So, this is a master class that contains both of + * those representations, and acts as the recipient of all patch related + * events (being the controller). + * + * \ingroup OmGtk + */ +class PatchController : public NodeController +{ +public: + PatchController(CountedPtr model); + virtual ~PatchController(); + + /* + virtual void add_to_store(); + virtual void remove_from_store(); + */ + + virtual void destroy(); + + virtual void metadata_update(const string& key, const string& value); + + virtual void add_port(CountedPtr pm); + virtual void remove_port(const Path& path, bool resize_module); + + void connection(CountedPtr cm); + void disconnection(const Path& src_port_path, const Path& dst_port_path); + void clear(); + + void get_new_module_location(int& x, int& y); + + void show_control_window(); + void show_properties_window(); + void show_patch_window(); + + void claim_patch_view(); + + void create_module(OmFlowCanvas* canvas); + void create_view(); + + PatchView* view() const { return m_patch_view; } + PatchWindow* window() const { return m_window; } + void window(PatchWindow* pw) { m_window = pw; } + + inline string name() const { return m_model->name(); } + inline const Path& path() const { return m_model->path(); } + + void set_path(const Path& new_path); + + void enable(); + void disable(); + + CountedPtr patch_model() const { return m_patch_model; } + + void enable_controls_menuitem(); + void disable_controls_menuitem(); + +private: + void add_node(CountedPtr object); + void remove_node(const string& name); + + void create_connection(CountedPtr cm); + + NodeController* create_controller_for_node(CountedPtr node); + + PatchPropertiesWindow* m_properties_window; + + PatchWindow* m_window; ///< Patch Window currently showing m_patch_view + PatchView* m_patch_view; ///< View (canvas) of this patch + + CountedPtr m_patch_model; + + /** Invisible bin used to store patch view when not shown by a patch window */ + Gtk::Alignment m_patch_view_bin; + + // Coordinates for next added plugin (used by canvas menu) + // 0 means "not set", ie guess at the best location + int m_module_x; + int m_module_y; +}; + + +} // namespace OmGtk + +#endif // PATCHCONTROLLER_H diff --git a/src/progs/ingenuity/PatchPropertiesWindow.cpp b/src/progs/ingenuity/PatchPropertiesWindow.cpp new file mode 100644 index 00000000..a6a2b13d --- /dev/null +++ b/src/progs/ingenuity/PatchPropertiesWindow.cpp @@ -0,0 +1,73 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "PatchPropertiesWindow.h" +#include +#include "PatchModel.h" + +namespace OmGtk { +using std::string; + + +PatchPropertiesWindow::PatchPropertiesWindow(BaseObjectType* cobject, const Glib::RefPtr& glade_xml) +: Gtk::Window(cobject) +, m_patch_model(NULL) +{ + glade_xml->get_widget("properties_author_entry", m_author_entry); + glade_xml->get_widget("properties_description_textview", m_textview); + glade_xml->get_widget("properties_cancel_button", m_cancel_button); + glade_xml->get_widget("properties_ok_button", m_ok_button); + + m_cancel_button->signal_clicked().connect(sigc::mem_fun(this, &PatchPropertiesWindow::cancel_clicked)); + m_ok_button->signal_clicked().connect(sigc::mem_fun(this, &PatchPropertiesWindow::ok_clicked)); +} + + +/** Set the patch model this description is for. + * + * This function is a "post-constructor" - it MUST be called before using + * the window in any way. + */ +void +PatchPropertiesWindow::patch_model(CountedPtr patch_model) +{ + property_title() = patch_model->path() + " Properties"; + m_patch_model = patch_model; + m_author_entry->set_text(m_patch_model->get_metadata("author")); + m_textview->get_buffer()->set_text(m_patch_model->get_metadata("description")); +} + + +void +PatchPropertiesWindow::cancel_clicked() +{ + m_author_entry->set_text(m_patch_model->get_metadata("author")); + m_textview->get_buffer()->set_text(m_patch_model->get_metadata("description")); + hide(); +} + + +void +PatchPropertiesWindow::ok_clicked() +{ + m_patch_model->set_metadata("author", m_author_entry->get_text()); + m_patch_model->set_metadata("description", m_textview->get_buffer()->get_text()); + hide(); +} + + + +} // namespace OmGtk diff --git a/src/progs/ingenuity/PatchPropertiesWindow.h b/src/progs/ingenuity/PatchPropertiesWindow.h new file mode 100644 index 00000000..7cdbdbfe --- /dev/null +++ b/src/progs/ingenuity/PatchPropertiesWindow.h @@ -0,0 +1,60 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef PATCHPROPERTIESWINDOW_H +#define PATCHPROPERTIESWINDOW_H + +#include +#include +#include +#include "util/CountedPtr.h" +using std::string; + +namespace LibOmClient { class PatchModel; } +using LibOmClient::PatchModel; + +namespace OmGtk { + + +/** Patch Properties Window. + * + * Loaded by libglade as a derived object. + * + * \ingroup OmGtk + */ +class PatchPropertiesWindow : public Gtk::Window +{ +public: + PatchPropertiesWindow(BaseObjectType* cobject, const Glib::RefPtr& refGlade); + + void patch_model(CountedPtr patch_model); + + void cancel_clicked(); + void ok_clicked(); + +private: + CountedPtr m_patch_model; + + Gtk::Entry* m_author_entry; + Gtk::TextView* m_textview; + Gtk::Button* m_cancel_button; + Gtk::Button* m_ok_button; +}; + + +} // namespace OmGtk + +#endif // PATCHPROPERTIESWINDOW_H diff --git a/src/progs/ingenuity/PatchTreeWindow.cpp b/src/progs/ingenuity/PatchTreeWindow.cpp new file mode 100644 index 00000000..1ecab057 --- /dev/null +++ b/src/progs/ingenuity/PatchTreeWindow.cpp @@ -0,0 +1,252 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "PatchTreeWindow.h" +#include "Controller.h" +#include "PatchController.h" +#include "PatchWindow.h" +#include "SubpatchModule.h" +#include "PatchModel.h" +#include "util/Path.h" + +using Om::Path; + +namespace OmGtk { + + +PatchTreeWindow::PatchTreeWindow(BaseObjectType* cobject, + const Glib::RefPtr& xml) +: Gtk::Window(cobject), + m_enable_signal(true) +{ + xml->get_widget_derived("patches_treeview", m_patches_treeview); + + m_patch_treestore = Gtk::TreeStore::create(m_patch_tree_columns); + m_patches_treeview->set_window(this); + m_patches_treeview->set_model(m_patch_treestore); + Gtk::TreeViewColumn* name_col = Gtk::manage(new Gtk::TreeViewColumn( + "Patch", m_patch_tree_columns.name_col)); + Gtk::TreeViewColumn* enabled_col = Gtk::manage(new Gtk::TreeViewColumn( + "Run", m_patch_tree_columns.enabled_col)); + name_col->set_resizable(true); + name_col->set_expand(true); + + m_patches_treeview->append_column(*name_col); + m_patches_treeview->append_column(*enabled_col); + Gtk::CellRendererToggle* enabled_renderer = dynamic_cast( + m_patches_treeview->get_column_cell_renderer(1)); + enabled_renderer->property_activatable() = true; + + m_patch_tree_selection = m_patches_treeview->get_selection(); + + //m_patch_tree_selection->signal_changed().connect( + // sigc::mem_fun(this, &PatchTreeWindow::event_patch_selected)); + m_patches_treeview->signal_row_activated().connect( + sigc::mem_fun(this, &PatchTreeWindow::event_patch_activated)); + enabled_renderer->signal_toggled().connect( + sigc::mem_fun(this, &PatchTreeWindow::event_patch_enabled_toggled)); + + m_patches_treeview->columns_autosize(); +} + + +void +PatchTreeWindow::add_patch(PatchController* pc) +{ + const CountedPtr pm = pc->patch_model(); + + if (!pm->parent()) { + Gtk::TreeModel::iterator iter = m_patch_treestore->append(); + Gtk::TreeModel::Row row = *iter; + if (pm->path() == "/") { + string root_name = Controller::instance().engine_url(); + // Hack off trailing '/' if it's there (ugly) + //if (root_name.substr(root_name.length()-1,1) == "/") + // root_name = root_name.substr(0, root_name.length()-1); + //root_name.append(":/"); + row[m_patch_tree_columns.name_col] = root_name; + } else { + row[m_patch_tree_columns.name_col] = pm->path().name(); + } + row[m_patch_tree_columns.enabled_col] = false; + row[m_patch_tree_columns.patch_controller_col] = pc; + m_patches_treeview->expand_row(m_patch_treestore->get_path(iter), true); + } else { + Gtk::TreeModel::Children children = m_patch_treestore->children(); + Gtk::TreeModel::iterator c = find_patch(children, pm->parent()->path()); + + if (c != children.end()) { + Gtk::TreeModel::iterator iter = m_patch_treestore->append(c->children()); + Gtk::TreeModel::Row row = *iter; + row[m_patch_tree_columns.name_col] = pm->path().name(); + row[m_patch_tree_columns.enabled_col] = false; + row[m_patch_tree_columns.patch_controller_col] = pc; + m_patches_treeview->expand_row(m_patch_treestore->get_path(iter), true); + } + } +} + + +void +PatchTreeWindow::remove_patch(const Path& path) +{ + Gtk::TreeModel::iterator i = find_patch(m_patch_treestore->children(), path); + if (i != m_patch_treestore->children().end()) + m_patch_treestore->erase(i); +} + + +Gtk::TreeModel::iterator +PatchTreeWindow::find_patch(Gtk::TreeModel::Children root, const Path& path) +{ + PatchController* pc = NULL; + + for (Gtk::TreeModel::iterator c = root.begin(); c != root.end(); ++c) { + pc = (*c)[m_patch_tree_columns.patch_controller_col]; + if (pc->model()->path() == path) { + return c; + } else if ((*c)->children().size() > 0) { + Gtk::TreeModel::iterator ret = find_patch(c->children(), path); + if (ret != c->children().end()) + return ret; + } + } + return root.end(); +} + +/* +void +PatchTreeWindow::event_patch_selected() +{ + Gtk::TreeModel::iterator active = m_patch_tree_selection->get_selected(); + if (active) { + Gtk::TreeModel::Row row = *active; + PatchController* pc = row[m_patch_tree_columns.patch_controller_col]; + } +} +*/ + + +/** Show the context menu for the selected patch in the patches treeview. + */ +void +PatchTreeWindow::show_patch_menu(GdkEventButton* ev) +{ + Gtk::TreeModel::iterator active = m_patch_tree_selection->get_selected(); + if (active) { + Gtk::TreeModel::Row row = *active; + PatchController* pc = row[m_patch_tree_columns.patch_controller_col]; + if (pc != NULL) + pc->show_menu(ev); + } +} + + +void +PatchTreeWindow::event_patch_activated(const Gtk::TreeModel::Path& path, Gtk::TreeView::Column* col) +{ + Gtk::TreeModel::iterator active = m_patch_treestore->get_iter(path); + Gtk::TreeModel::Row row = *active; + PatchController* pc = row[m_patch_tree_columns.patch_controller_col]; + + pc->show_patch_window(); +} + + +void +PatchTreeWindow::event_patch_enabled_toggled(const Glib::ustring& path_str) +{ + Gtk::TreeModel::Path path(path_str); + Gtk::TreeModel::iterator active = m_patch_treestore->get_iter(path); + Gtk::TreeModel::Row row = *active; + + PatchController* pc = row[m_patch_tree_columns.patch_controller_col]; + Glib::ustring patch_path = pc->model()->path(); + + assert(pc != NULL); + + if ( ! pc->patch_model()->enabled()) { + if (m_enable_signal) + Controller::instance().enable_patch(patch_path); + pc->enable(); + row[m_patch_tree_columns.enabled_col] = true; + } else { + if (m_enable_signal) + Controller::instance().disable_patch(patch_path); + pc->disable(); + row[m_patch_tree_columns.enabled_col] = false; + } +} + + +void +PatchTreeWindow::patch_enabled(const Path& path) +{ + m_enable_signal = false; + + Gtk::TreeModel::iterator i + = find_patch(m_patch_treestore->children(), path); + + if (i != m_patch_treestore->children().end()) { + Gtk::TreeModel::Row row = *i; + row[m_patch_tree_columns.enabled_col] = true; + } else { + cerr << "[PatchTreeWindow] Unable to find patch " << path << endl; + } + + m_enable_signal = true; +} + + +void +PatchTreeWindow::patch_disabled(const Path& path) +{ + m_enable_signal = false; + + Gtk::TreeModel::iterator i + = find_patch(m_patch_treestore->children(), path); + + if (i != m_patch_treestore->children().end()) { + Gtk::TreeModel::Row row = *i; + row[m_patch_tree_columns.enabled_col] = false; + } else { + cerr << "[PatchTreeWindow] Unable to find patch " << path << endl; + } + + m_enable_signal = true; +} + + +void +PatchTreeWindow::patch_renamed(const Path& old_path, const Path& new_path) +{ + m_enable_signal = false; + + Gtk::TreeModel::iterator i + = find_patch(m_patch_treestore->children(), old_path); + + if (i != m_patch_treestore->children().end()) { + Gtk::TreeModel::Row row = *i; + row[m_patch_tree_columns.name_col] = new_path.name(); + } else { + cerr << "[PatchTreeWindow] Unable to find patch " << old_path << endl; + } + + m_enable_signal = true; +} + + +} // namespace OmGtk diff --git a/src/progs/ingenuity/PatchTreeWindow.h b/src/progs/ingenuity/PatchTreeWindow.h new file mode 100644 index 00000000..6733dc6f --- /dev/null +++ b/src/progs/ingenuity/PatchTreeWindow.h @@ -0,0 +1,105 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef PATCHTREEWINDOW_H +#define PATCHTREEWINDOW_H + +#include +#include +#include "util/Path.h" + + +using namespace Om; +using Om::Path; + +namespace OmGtk { + +class PatchWindow; +class PatchController; +class PatchTreeView; + + +/** Window with a TreeView of all loaded patches. + * + * \ingroup OmGtk + */ +class PatchTreeWindow : public Gtk::Window +{ +public: + PatchTreeWindow(BaseObjectType* cobject, const Glib::RefPtr& refGlade); + + void patch_enabled(const Path& path); + void patch_disabled(const Path& path); + void patch_renamed(const Path& old_path, const Path& new_path); + + void add_patch(PatchController* pc); + void remove_patch(const Path& path); + void show_patch_menu(GdkEventButton* ev); + +protected: + //void event_patch_selected(); + void event_patch_activated(const Gtk::TreeModel::Path& path, Gtk::TreeView::Column* col); + void event_patch_enabled_toggled(const Glib::ustring& path_str); + + Gtk::TreeModel::iterator find_patch(Gtk::TreeModel::Children root, const Path& path); + + PatchTreeView* m_patches_treeview; + + struct PatchTreeModelColumns : public Gtk::TreeModel::ColumnRecord + { + PatchTreeModelColumns() + { add(name_col); add(enabled_col); add(patch_controller_col); } + + Gtk::TreeModelColumn name_col; + Gtk::TreeModelColumn enabled_col; + Gtk::TreeModelColumn patch_controller_col; + }; + + bool m_enable_signal; + PatchTreeModelColumns m_patch_tree_columns; + Glib::RefPtr m_patch_treestore; + Glib::RefPtr m_patch_tree_selection; +}; + + +/** Derived TreeView class to support context menus for patches */ +class PatchTreeView : public Gtk::TreeView +{ +public: + PatchTreeView(BaseObjectType* cobject, const Glib::RefPtr& xml) + : Gtk::TreeView(cobject) + {} + + void set_window(PatchTreeWindow* win) { m_window = win; } + + bool on_button_press_event(GdkEventButton* ev) { + bool ret = Gtk::TreeView::on_button_press_event(ev); + + if ((ev->type == GDK_BUTTON_PRESS) && (ev->button == 3)) + m_window->show_patch_menu(ev); + + return ret; + } + +private: + PatchTreeWindow* m_window; + +}; // struct PatchTreeView + + +} // namespace OmGtk + +#endif // PATCHTREEWINDOW_H diff --git a/src/progs/ingenuity/PatchView.cpp b/src/progs/ingenuity/PatchView.cpp new file mode 100644 index 00000000..be9aa1d6 --- /dev/null +++ b/src/progs/ingenuity/PatchView.cpp @@ -0,0 +1,119 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "PatchView.h" +#include +#include +#include +#include "App.h" +#include "OmFlowCanvas.h" +#include "PatchController.h" +#include "LoadPluginWindow.h" +#include "PatchModel.h" +#include "NewSubpatchWindow.h" +#include "LoadSubpatchWindow.h" +#include "NodeControlWindow.h" +#include "PatchPropertiesWindow.h" +#include "PatchTreeWindow.h" +#include "Controller.h" + +namespace OmGtk { + + +PatchView::PatchView(BaseObjectType* cobject, const Glib::RefPtr& xml) +: Gtk::Box(cobject), + m_patch(NULL), + m_canvas(NULL), + m_enable_signal(true) +{ + property_visible() = false; + + xml->get_widget("patch_canvas_scrolledwindow", m_canvas_scrolledwindow); + xml->get_widget("patch_zoom_scale", m_zoom_slider); + xml->get_widget("patch_polyphony_label", m_polyphony_label); + xml->get_widget("patch_process_checkbutton", m_process_checkbutton); + + m_zoom_slider->signal_value_changed().connect( sigc::mem_fun(this, &PatchView::zoom_changed)); + m_process_checkbutton->signal_toggled().connect(sigc::mem_fun(this, &PatchView::process_toggled)); +} + + +/** Sets the patch controller for this window and initializes everything. + * + * This function MUST be called before using the window in any way! + */ +void +PatchView::patch_controller(PatchController* pc) +{ + //m_patch = new PatchController(pm, controller); + m_patch = pc; + + m_canvas = new OmFlowCanvas(pc, 1600*2, 1200*2); + + m_canvas_scrolledwindow->add(*m_canvas); + //m_canvas->show(); + //m_canvas_scrolledwindow->show(); + + char txt[4]; + snprintf(txt, 8, "%zd", pc->patch_model()->poly()); + m_polyphony_label->set_text(txt); + + //m_description_window->patch_model(pc->model()); +} + + +void +PatchView::show_control_window() +{ + if (m_patch != NULL) + m_patch->show_control_window(); +} + + +void +PatchView::zoom_changed() +{ + float z = m_zoom_slider->get_value(); + m_canvas->zoom(z); +} + + +void +PatchView::process_toggled() +{ + if (!m_enable_signal) + return; + + if (m_process_checkbutton->get_active()) { + Controller::instance().enable_patch(m_patch->model()->path()); + App::instance().patch_tree()->patch_enabled(m_patch->model()->path()); + } else { + Controller::instance().disable_patch(m_patch->model()->path()); + App::instance().patch_tree()->patch_disabled(m_patch->model()->path()); + } +} + + +void +PatchView::enabled(bool e) +{ + m_enable_signal = false; + m_process_checkbutton->set_active(e); + m_enable_signal = true; +} + + +} // namespace OmGtk diff --git a/src/progs/ingenuity/PatchView.h b/src/progs/ingenuity/PatchView.h new file mode 100644 index 00000000..82aee9c7 --- /dev/null +++ b/src/progs/ingenuity/PatchView.h @@ -0,0 +1,86 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef PATCHVIEW_H +#define PATCHVIEW_H + +#include +#include +#include +#include + +using std::string; + +namespace LibOmClient { +class PatchModel; +class NodeModel; +class PortModel; +class ControlModel; +class MetadataModel; +} +using namespace LibOmClient; + + +namespace OmGtk { + +class PatchController; +class OmFlowCanvas; +class LoadPluginWindow; +class NewSubpatchWindow; +class LoadSubpatchWindow; +class NewSubpatchWindow; +class NodeControlWindow; +class PatchDescriptionWindow; +class SubpatchModule; +class OmPort; + + +/** The patch specific contents of a PatchWindow (ie the canvas and whatever else). + * + * \ingroup OmGtk + */ +class PatchView : public Gtk::Box +{ +public: + PatchView(BaseObjectType* cobject, const Glib::RefPtr& glade_xml); + + void patch_controller(PatchController* pc); + + OmFlowCanvas* canvas() const { return m_canvas; } + PatchController* patch_controller() const { return m_patch; } + + void show_control_window(); + void zoom_changed(); + void process_toggled(); + + void enabled(bool e); + +private: + PatchController* m_patch; + OmFlowCanvas* m_canvas; + + Gtk::ScrolledWindow* m_canvas_scrolledwindow; + Gtk::HScale* m_zoom_slider; + Gtk::Label* m_polyphony_label; + Gtk::CheckButton* m_process_checkbutton; + + bool m_enable_signal; +}; + + +} // namespace OmGtk + +#endif // PATCHVIEW_H diff --git a/src/progs/ingenuity/PatchWindow.cpp b/src/progs/ingenuity/PatchWindow.cpp new file mode 100644 index 00000000..25fe156b --- /dev/null +++ b/src/progs/ingenuity/PatchWindow.cpp @@ -0,0 +1,583 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "PatchWindow.h" +#include +#include +#include +#include "App.h" +#include "PatchView.h" +#include "OmFlowCanvas.h" +#include "PatchController.h" +#include "LoadPluginWindow.h" +#include "PatchModel.h" +#include "NewSubpatchWindow.h" +#include "LoadPatchWindow.h" +#include "LoadSubpatchWindow.h" +#include "NodeControlWindow.h" +#include "PatchPropertiesWindow.h" +#include "ConfigWindow.h" +#include "MessagesWindow.h" +#include "PatchTreeWindow.h" +#include "Controller.h" +#include "BreadCrumb.h" +#include "Store.h" +#include "ConnectWindow.h" + +namespace OmGtk { + + +PatchWindow::PatchWindow(BaseObjectType* cobject, const Glib::RefPtr& xml) +: Gtk::Window(cobject), + m_patch(NULL), + m_load_plugin_window(NULL), + m_new_subpatch_window(NULL), + m_enable_signal(true), + m_position_stored(false), + m_x(0), + m_y(0) +{ + property_visible() = false; + + xml->get_widget("patch_win_vbox", m_vbox); + xml->get_widget("patch_win_viewport", m_viewport); + xml->get_widget("patch_win_breadcrumb_box", m_breadcrumb_box); + //xml->get_widget("patch_win_status_bar", m_status_bar); + //xml->get_widget("patch_open_menuitem", m_menu_open); + xml->get_widget("patch_import_menuitem", m_menu_import); + //xml->get_widget("patch_open_into_menuitem", m_menu_open_into); + xml->get_widget("patch_save_menuitem", m_menu_save); + xml->get_widget("patch_save_as_menuitem", m_menu_save_as); + xml->get_widget("patch_close_menuitem", m_menu_close); + xml->get_widget("patch_configuration_menuitem", m_menu_configuration); + xml->get_widget("patch_quit_menuitem", m_menu_quit); + xml->get_widget("patch_view_control_window_menuitem", m_menu_view_control_window); + xml->get_widget("patch_view_engine_window_menuitem", m_menu_view_engine_window); + xml->get_widget("patch_properties_menuitem", m_menu_view_patch_properties); + xml->get_widget("patch_fullscreen_menuitem", m_menu_fullscreen); + xml->get_widget("patch_clear_menuitem", m_menu_clear); + xml->get_widget("patch_destroy_menuitem", m_menu_destroy_patch); + /*xml->get_widget("patch_add_plugin_menuitem", m_menu_add_plugin); + xml->get_widget("patch_add_new_subpatch_menuitem", m_menu_new_subpatch); + xml->get_widget("patch_add_subpatch_from_file_menuitem", m_menu_load_subpatch);*/ + xml->get_widget("patch_view_messages_window_menuitem", m_menu_view_messages_window); + xml->get_widget("patch_view_patch_tree_window_menuitem", m_menu_view_patch_tree_window); + xml->get_widget("patch_help_about_menuitem", m_menu_help_about); + + xml->get_widget_derived("load_plugin_win", m_load_plugin_window); + xml->get_widget_derived("new_subpatch_win", m_new_subpatch_window); + xml->get_widget_derived("load_patch_win", m_load_patch_window); + xml->get_widget_derived("load_subpatch_win", m_load_subpatch_window); + + //m_load_plugin_window->set_transient_for(*this); + m_new_subpatch_window->set_transient_for(*this); + m_load_patch_window->set_transient_for(*this); + m_load_subpatch_window->set_transient_for(*this); + + m_menu_view_control_window->property_sensitive() = false; + //m_status_bar->push(Controller::instance().engine_url()); + //m_status_bar->pack_start(*Gtk::manage(new Gtk::Image(Gtk::Stock::CONNECT, Gtk::ICON_SIZE_MENU)), false, false); + + /*m_menu_open->signal_activate().connect( + sigc::mem_fun(this, &PatchWindow::event_open));*/ + m_menu_import->signal_activate().connect( + sigc::mem_fun(this, &PatchWindow::event_import)); + m_menu_save->signal_activate().connect( + sigc::mem_fun(this, &PatchWindow::event_save)); + m_menu_save_as->signal_activate().connect( + sigc::mem_fun(this, &PatchWindow::event_save_as)); + m_menu_close->signal_activate().connect( + sigc::mem_fun(this, &PatchWindow::event_close)); + m_menu_quit->signal_activate().connect( + sigc::mem_fun(this, &PatchWindow::event_quit)); + m_menu_configuration->signal_activate().connect( + sigc::mem_fun(App::instance().configuration_dialog(), &ConfigWindow::show)); + m_menu_fullscreen->signal_activate().connect( + sigc::mem_fun(this, &PatchWindow::event_fullscreen_toggled)); + m_menu_view_engine_window->signal_activate().connect( + sigc::mem_fun(this, &PatchWindow::event_show_engine)); + m_menu_view_control_window->signal_activate().connect( + sigc::mem_fun(this, &PatchWindow::event_show_controls)); + m_menu_view_patch_properties->signal_activate().connect( + sigc::mem_fun(this, &PatchWindow::event_show_properties)); + m_menu_destroy_patch->signal_activate().connect( + sigc::mem_fun(this, &PatchWindow::event_destroy)); + m_menu_clear->signal_activate().connect( + sigc::mem_fun(this, &PatchWindow::event_clear)); + /*m_menu_add_plugin->signal_activate().connect( + sigc::mem_fun(m_load_plugin_window, &LoadPluginWindow::present)); + m_menu_new_subpatch->signal_activate().connect( + sigc::mem_fun(m_new_subpatch_window, &NewSubpatchWindow::present)); + m_menu_load_subpatch->signal_activate().connect( + sigc::mem_fun(m_load_subpatch_window, &LoadSubpatchWindow::present));*/ + m_menu_view_messages_window->signal_activate().connect( + sigc::mem_fun(App::instance().messages_dialog(), &MessagesWindow::present)); + m_menu_view_patch_tree_window->signal_activate().connect( + sigc::mem_fun(App::instance().patch_tree(), &PatchTreeWindow::present)); + + // Temporary workaround for Gtkmm 2.4 (no AboutDialog) + if (App::instance().about_dialog() != NULL) + m_menu_help_about->signal_activate().connect( + sigc::mem_fun(App::instance().about_dialog(), &Gtk::Dialog::present)); + + App::instance().add_patch_window(this); +} + + +PatchWindow::~PatchWindow() +{ + App::instance().remove_patch_window(this); + + hide(); + + delete m_new_subpatch_window; + delete m_load_subpatch_window; +} + + +/** Sets the patch controller for this window and initializes everything. + * + * This function MUST be called before using the window in any way! + */ +void +PatchWindow::patch_controller(PatchController* pc) +{ + m_enable_signal = false; + + assert(pc != NULL); + assert(m_patch != pc); + assert(m_patch == NULL || + pc->model()->path() != m_patch->model()->path()); + + PatchController* old_pc = m_patch; + if (old_pc != NULL) { + assert(old_pc->window() == NULL || old_pc->window() == this); + old_pc->claim_patch_view(); + old_pc->window(NULL); + } + + m_patch = pc; + + if (pc->view() == NULL) + pc->create_view(); + assert(pc->view() != NULL); + + PatchView* const patch_view = pc->view(); + assert(patch_view != NULL); + patch_view->reparent(*m_viewport); + pc->window(this); + show_all(); + + assert(m_load_plugin_window != NULL); + assert(m_new_subpatch_window != NULL); + assert(m_load_patch_window != NULL); + assert(m_load_subpatch_window != NULL); + + m_load_patch_window->patch_controller(m_patch); + m_load_plugin_window->patch_controller(m_patch); + m_new_subpatch_window->patch_controller(m_patch); + m_load_subpatch_window->patch_controller(m_patch); + + m_menu_view_control_window->property_sensitive() = pc->has_control_inputs(); + + int width, height; + get_size(width, height); + patch_view->canvas()->scroll_to( + ((int)patch_view->canvas()->width() - width)/2, + ((int)patch_view->canvas()->height() - height)/2); + + set_title(m_patch->model()->path()); + + //m_properties_window->patch_model(pc->patch_model()); + + + // Setup breadcrumbs box + // FIXME: this is filthy + + // Moving to a parent patch, depress correct button + if (old_pc != NULL && + old_pc->model()->path().substr(0, pc->model()->path().length()) + == pc->model()->path()) { + for (list::iterator i = m_breadcrumbs.begin(); i != m_breadcrumbs.end(); ++i) { + if ((*i)->path() == pc->path()) + (*i)->set_active(true); + else if ((*i)->path() == old_pc->path()) + (*i)->set_active(false); + } + + // Rebuild breadcrumbs from scratch (yeah, laziness..) + } else { + rebuild_breadcrumbs(); + } + + if (pc->model()->path() == "/") + m_menu_destroy_patch->set_sensitive(false); + else + m_menu_destroy_patch->set_sensitive(true); + + assert(old_pc == NULL || old_pc->window() != this); + assert(m_patch == pc); + assert(m_patch->window() == this); + + m_enable_signal = true; +} + + +/** Destroys current breadcrumbs and rebuilds from scratch. + * + * (Needs to be called when a patch is cleared to eliminate children crumbs) + */ +void +PatchWindow::rebuild_breadcrumbs() +{ + // Empty existing breadcrumbs + for (list::iterator i = m_breadcrumbs.begin(); i != m_breadcrumbs.end(); ++i) + m_breadcrumb_box->remove(**i); + m_breadcrumbs.clear(); + + // Add new ones + string path = m_patch->path(); // To be chopped up, starting at the left + string but_name; // Name on breadcrumb button + string but_path; // Full path breadcrumb represents + + // Add root + assert(path[0] == '/'); + BreadCrumb* but = manage(new BreadCrumb(this, "/")); + m_breadcrumb_box->pack_start(*but, false, false, 1); + m_breadcrumbs.push_back(but); + path = path.substr(1); // hack off leading slash + + // Add the rest + while (path.length() > 0) { + if (path.find("/") != string::npos) { + but_name = path.substr(0, path.find("/")); + but_path += string("/") + path.substr(0, path.find("/")); + path = path.substr(path.find("/")+1); + } else { + but_name = path; + but_path += string("/") + path; + path = ""; + } + BreadCrumb* but = manage(new BreadCrumb(this, but_path));//Store::instance().patch(but_path))); + m_breadcrumb_box->pack_start(*but, false, false, 1); + m_breadcrumbs.push_back(but); + } + (*m_breadcrumbs.back()).set_active(true); + +} + + +void +PatchWindow::breadcrumb_clicked(BreadCrumb* crumb) +{ + if (m_enable_signal) { + // FIXME: check to be sure PatchModel exists, then controller - maybe + // even make a controller if there isn't one? + PatchController* const pc = dynamic_cast( + Store::instance().patch(crumb->path())->controller()); + assert(pc != NULL); + + if (pc == m_patch) { + crumb->set_active(true); + } else if (pc->window() != NULL && pc->window()->is_visible()) { + pc->show_patch_window(); + crumb->set_active(false); + } else { + patch_controller(pc); + } + } +} + + +void +PatchWindow::event_show_engine() +{ + if (m_patch) + App::instance().connect_window()->show(); +} + + +void +PatchWindow::event_show_controls() +{ + if (m_patch) + m_patch->show_control_window(); +} + + +void +PatchWindow::event_show_properties() +{ + if (m_patch) + m_patch->show_properties_window(); +} + + +/** Notification a node has been removed from the PatchView this window + * currently contains. + * + * This is used to update the breadcrumbs in case the Node is a patch which has + * a button present in the breadcrumbs that needs to be removed. + */ +void +PatchWindow::node_removed(const string& name) +{ + for (list::iterator i = m_breadcrumbs.begin(); i != m_breadcrumbs.end(); ++i) { + if ((*i)->path() == m_patch->model()->base_path() + name) { + for (list::iterator j = i; j != m_breadcrumbs.end(); ) { + BreadCrumb* bc = *j; + j = m_breadcrumbs.erase(j); + m_breadcrumb_box->remove(*bc); + } + break; + } + } +} + + +/** Same as @a node_removed, but for renaming. + */ +void +PatchWindow::node_renamed(const string& old_path, const string& new_path) +{ + for (list::iterator i = m_breadcrumbs.begin(); i != m_breadcrumbs.end(); ++i) { + if ((*i)->path() == old_path) + (*i)->set_path(new_path); + } +} + + +/** Notification the patch this window is currently showing was renamed. + */ +void +PatchWindow::patch_renamed(const string& new_path) +{ + set_title(new_path); + for (list::iterator i = m_breadcrumbs.begin(); i != m_breadcrumbs.end(); ++i) { + if ((*i)->path() == m_patch->path()) + (*i)->set_path(new_path); + } +} + +/* +void +PatchWindow::event_open() +{ + m_load_patch_window->set_replace(); + m_load_patch_window->present(); +} +*/ + +void +PatchWindow::event_import() +{ + m_load_patch_window->set_merge(); + m_load_patch_window->present(); +} + + +void +PatchWindow::event_save() +{ + PatchModel* const model = m_patch->patch_model().get(); + + if (model->filename() == "") + event_save_as(); + else + Controller::instance().save_patch(model, model->filename(), false); +} + + +void +PatchWindow::event_save_as() +{ + Gtk::FileChooserDialog dialog(*this, "Save Patch", Gtk::FILE_CHOOSER_ACTION_SAVE); + + Gtk::VBox* box = dialog.get_vbox(); + Gtk::Label warning("Warning: Recursively saving will overwrite any subpatch files \ + without confirmation."); + box->pack_start(warning, false, false, 2); + Gtk::CheckButton recursive_checkbutton("Recursively save all subpatches"); + box->pack_start(recursive_checkbutton, false, false, 0); + recursive_checkbutton.show(); + + dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); + dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK); + + // Set current folder to most sensible default + const string& current_filename = m_patch->patch_model()->filename(); + if (current_filename.length() > 0) + dialog.set_filename(current_filename); + else if (App::instance().configuration()->patch_folder().length() > 0) + dialog.set_current_folder(App::instance().configuration()->patch_folder()); + + int result = dialog.run(); + bool recursive = recursive_checkbutton.get_active(); + + assert(result == Gtk::RESPONSE_OK || result == Gtk::RESPONSE_CANCEL || result == Gtk::RESPONSE_NONE); + + if (result == Gtk::RESPONSE_OK) { + string filename = dialog.get_filename(); + if (filename.length() < 4 || filename.substr(filename.length()-3) != ".om") + filename += ".om"; + + bool confirm = false; + std::fstream fin; + fin.open(filename.c_str(), std::ios::in); + if (fin.is_open()) { // File exists + string msg = "File already exists! Are you sure you want to overwrite "; + msg += filename + "?"; + Gtk::MessageDialog confirm_dialog(*this, + msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_YES_NO, true); + if (confirm_dialog.run() == Gtk::RESPONSE_YES) + confirm = true; + else + confirm = false; + } else { // File doesn't exist + confirm = true; + } + fin.close(); + + if (confirm) { + Controller::instance().save_patch(m_patch->patch_model().get(), filename, recursive); + m_patch->patch_model()->filename(filename); + } + } + App::instance().configuration()->set_patch_folder(dialog.get_current_folder()); +} + + +void +PatchWindow::on_show() +{ + if (m_position_stored) + move(m_x, m_y); + + Gtk::Window::on_show(); +} + + +void +PatchWindow::on_hide() +{ + m_position_stored = true; + get_position(m_x, m_y); + Gtk::Window::on_hide(); +} + + +bool +PatchWindow::on_delete_event(GdkEventAny* ev) +{ + event_close(); + return true; // destroy window +} + + +bool +PatchWindow::on_key_press_event(GdkEventKey* event) +{ + if (event->keyval == GDK_Delete) { + if (m_patch != NULL && m_patch->view() != NULL) { + assert(m_patch->view()->canvas() != NULL); + m_patch->view()->canvas()->destroy_selected(); + } + return true; + } else { + return Gtk::Window::on_key_press_event(event); + } +} + + +void +PatchWindow::event_close() +{ + if (App::instance().num_open_patch_windows() > 1) { + hide(); + } else { + Gtk::MessageDialog d(*this, "This is the last remaining open patch " + "window. Closing this window will exit OmGtk (the engine will " + "remain running).\n\nAre you sure you want to quit?", + true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE, true); + d.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); + d.add_button(Gtk::Stock::QUIT, Gtk::RESPONSE_CLOSE); + int ret = d.run(); + if (ret == Gtk::RESPONSE_CLOSE) + App::instance().quit(); + else + d.hide(); + } +} + + +void +PatchWindow::event_quit() +{ + Gtk::MessageDialog d(*this, "Would you like to quit just OmGtk\nor kill the engine as well?", + true, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_NONE, true); + d.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); + + Gtk::Button* b = d.add_button(Gtk::Stock::REMOVE, 2); // kill + b->set_label("_Kill Engine"); + Gtk::Widget* kill_img = Gtk::manage(new Gtk::Image(Gtk::Stock::CLOSE, Gtk::ICON_SIZE_BUTTON)); + b->set_image(*kill_img); + + b = d.add_button(Gtk::Stock::QUIT, 1); // just exit + b->set_label("_Quit"); + Gtk::Widget* close_img = Gtk::manage(new Gtk::Image(Gtk::Stock::QUIT, Gtk::ICON_SIZE_BUTTON)); + b->set_image(*close_img); + + int ret = d.run(); + if (ret == 1) { + App::instance().quit(); + } else if (ret == 2) { + Controller::instance().quit(); + App::instance().quit(); + } + // Otherwise cancelled, do nothing +} + + +void +PatchWindow::event_destroy() +{ + Controller::instance().destroy(m_patch->model()->path()); +} + + +void +PatchWindow::event_clear() +{ + Controller::instance().clear_patch(m_patch->model()->path()); +} + +void +PatchWindow::event_fullscreen_toggled() +{ + // FIXME: ugh, use GTK signals to track state and now for sure + static bool is_fullscreen = false; + + if (!is_fullscreen) { + fullscreen(); + is_fullscreen = true; + } else { + unfullscreen(); + is_fullscreen = false; + } +} + + +} // namespace OmGtk diff --git a/src/progs/ingenuity/PatchWindow.h b/src/progs/ingenuity/PatchWindow.h new file mode 100644 index 00000000..0060b128 --- /dev/null +++ b/src/progs/ingenuity/PatchWindow.h @@ -0,0 +1,142 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef PATCHWINDOW_H +#define PATCHWINDOW_H + +#include +#include +#include +#include +#include + +using std::string; using std::list; + +namespace LibOmClient { +class PatchModel; +class NodeModel; +class PortModel; +class ControlModel; +class MetadataModel; +} +using namespace LibOmClient; + + +namespace OmGtk { + +class PatchController; +class OmFlowCanvas; +class PatchView; +class LoadPluginWindow; +class LoadPatchWindow; +class NewSubpatchWindow; +class LoadSubpatchWindow; +class NewSubpatchWindow; +class NodeControlWindow; +class PatchDescriptionWindow; +class SubpatchModule; +class OmPort; +class BreadCrumb; + + +/** A window for a patch. + * + * \ingroup OmGtk + */ +class PatchWindow : public Gtk::Window +{ +public: + PatchWindow(BaseObjectType* cobject, const Glib::RefPtr& glade_xml); + ~PatchWindow(); + + void patch_controller(PatchController* pc); + + PatchController* patch_controller() const { return m_patch; } + LoadPluginWindow* load_plugin_window() const { return m_load_plugin_window; } + LoadSubpatchWindow* load_subpatch_window() const { return m_load_subpatch_window; } + NewSubpatchWindow* new_subpatch_window() const { return m_new_subpatch_window; } + + // Breadcrumb management + void node_removed(const string& name); + void node_renamed(const string& old_path, const string& new_path); + void patch_renamed(const string& new_path); + void rebuild_breadcrumbs(); + void breadcrumb_clicked(BreadCrumb* crumb); + + Gtk::MenuItem* menu_view_control_window() { return m_menu_view_control_window; } + +protected: + void on_show(); + void on_hide(); + bool on_delete_event(GdkEventAny* ev); + bool on_key_press_event(GdkEventKey* event); + +private: + //void event_open(); + void event_import(); + void event_save(); + void event_save_as(); + void event_close(); + void event_quit(); + void event_destroy(); + void event_clear(); + void event_fullscreen_toggled(); + void event_show_properties(); + void event_show_controls(); + void event_show_engine(); + + PatchController* m_patch; + LoadPluginWindow* m_load_plugin_window; + LoadPatchWindow* m_load_patch_window; + NewSubpatchWindow* m_new_subpatch_window; + LoadSubpatchWindow* m_load_subpatch_window; + + bool m_enable_signal; + bool m_position_stored; + int m_x; + int m_y; + + //Gtk::MenuItem* m_menu_open; + Gtk::MenuItem* m_menu_import; + Gtk::MenuItem* m_menu_save; + Gtk::MenuItem* m_menu_save_as; + Gtk::MenuItem* m_menu_configuration; + Gtk::MenuItem* m_menu_close; + Gtk::MenuItem* m_menu_quit; + Gtk::MenuItem* m_menu_fullscreen; + Gtk::MenuItem* m_menu_clear; + Gtk::MenuItem* m_menu_destroy_patch; + Gtk::MenuItem* m_menu_view_engine_window; + Gtk::MenuItem* m_menu_view_control_window; + Gtk::MenuItem* m_menu_view_patch_properties; + /*Gtk::MenuItem* m_menu_add_plugin; + Gtk::MenuItem* m_menu_new_subpatch; + Gtk::MenuItem* m_menu_load_subpatch;*/ + Gtk::MenuItem* m_menu_view_messages_window; + Gtk::MenuItem* m_menu_view_patch_tree_window; + Gtk::MenuItem* m_menu_help_about; + + Gtk::VBox* m_vbox; + Gtk::Viewport* m_viewport; + Gtk::HBox* m_breadcrumb_box; + list m_breadcrumbs; + //Gtk::Statusbar* m_status_bar; +}; + + +} // namespace OmGtk + +#endif // PATCHWINDOW_H diff --git a/src/progs/ingenuity/PortController.cpp b/src/progs/ingenuity/PortController.cpp new file mode 100644 index 00000000..941e9a72 --- /dev/null +++ b/src/progs/ingenuity/PortController.cpp @@ -0,0 +1,174 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "PortController.h" +#include "OmModule.h" +#include "PortModel.h" +#include "ControlPanel.h" +#include "OmPort.h" +#include "OmPatchPort.h" +#include "Store.h" + +namespace OmGtk { + + +PortController::PortController(CountedPtr model) +: GtkObjectController(model), + m_module(NULL), + m_port(NULL), + m_control_panel(NULL) +{ + assert(model); + assert(model->parent()); + assert(model->controller() == NULL); + + model->set_controller(this); +} + +/* +void +PortController::add_to_store() +{ + Store::instance().add_object(this); +} + + +void +PortController::remove_from_store() +{ + Store::instance().remove_object(this); +} +*/ + +void +PortController::destroy() +{ + assert(m_model->parent()); + NodeController* parent = (NodeController*)m_model->parent()->controller(); + assert(parent != NULL); + + if (m_control_panel != NULL) + m_control_panel->remove_port(path()); + + parent->remove_port(path(), false); +} + + +void +PortController::create_module(OmFlowCanvas* canvas, double x, double y) +{ + cerr << "Creating port module " << m_model->path() << endl; + + assert(canvas); + assert(port_model()); + m_module = new OmPortModule(canvas, this, x, y); + + // FIXME: leak + m_patch_port = new OmPatchPort(m_module, port_model()); + m_module->add_port(m_patch_port, false); + + m_module->move_to(x, y); +} + + +void +PortController::metadata_update(const string& key, const string& value) +{ + // FIXME: double lookups + + //cerr << path() << ": " << key << " = " << value << endl; + + if (key == "user-min") { + port_model()->user_min(atof(value.c_str())); + if (m_control_panel != NULL) + m_control_panel->set_range_min(m_model->path(), atof(value.c_str())); + } else if (key == "user-max") { + port_model()->user_max(atof(value.c_str())); + if (m_control_panel != NULL) + m_control_panel->set_range_max(m_model->path(), atof(value.c_str())); + } + + if (m_module != NULL) { + if (key == "module-x") { + float x = atof(value.c_str()); + //if (x > 0 && x < m_canvas->width()) + m_module->move_to(x, m_module->property_y().get_value()); + } else if (key == "module-y") { + float y = atof(value.c_str()); + //if (y > 0 && y < m_canvas->height()) + m_module->move_to(m_module->property_x().get_value(), y); + } + } + + GtkObjectController::metadata_update(key, value); +} + + +void +PortController::control_change(float value) +{ + // FIXME: double lookups + + port_model()->value(value); + + if (m_control_panel != NULL) + m_control_panel->set_control(port_model()->path(), value); +} + + +/** "Register" a control panel that is monitoring this port. + * + * The OmPort will handle notifying the ControlPanel when state + * changes occur, etc. + */ +void +PortController::set_control_panel(ControlPanel* cp) +{ + assert(m_control_panel == NULL); + m_control_panel = cp; +} + + +void +PortController::set_path(const Path& new_path) +{ + // Change port name on module, if view exists + if (m_port != NULL) + m_port->set_name(new_path.name()); + + if (m_control_panel != NULL) + m_control_panel->rename_port(m_model->path(), new_path); + + m_model->set_path(new_path); +} + + +/** Create the visible port on a canvas module. + * + * Does not resize the module, caller's responsibility to do so if necessary. + */ +void +PortController::create_port(OmModule* module) +{ + assert(module != NULL); + + m_port = new OmPort(module, port_model()); + module->add_port(m_port, false); +} + + +} // namespace OmGtk + diff --git a/src/progs/ingenuity/PortController.h b/src/progs/ingenuity/PortController.h new file mode 100644 index 00000000..beffe875 --- /dev/null +++ b/src/progs/ingenuity/PortController.h @@ -0,0 +1,84 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef PORTCONTROLLER_H +#define PORTCONTROLLER_H + +#include +#include +#include "GtkObjectController.h" +#include "OmPortModule.h" + +using std::string; +using namespace LibOmClient; + +namespace LibOmClient { + class MetadataModel; + class PortModel; +} + +namespace OmGtk { + +class Controller; +class OmPort; +class OmPatchPort; +class ControlPanel; +class OmModule; +class OmPortModule; +class OmFlowCanvas; + + +/** Controller for a port on a (non-patch) node. + * + * \ingroup OmGtk + */ +class PortController : public GtkObjectController +{ +public: + PortController(CountedPtr model); + virtual ~PortController() {} + + virtual void destroy(); + + virtual void create_module(OmFlowCanvas* canvas, double x, double y); + OmPortModule* module() { return m_module; } +/* + virtual void add_to_store(); + virtual void remove_from_store(); +*/ + virtual void metadata_update(const string& key, const string& value); + + void create_port(OmModule* module); + void set_path(const Path& new_path); + + void control_change(float value); + + ControlPanel* control_panel() const { return m_control_panel; } + void set_control_panel(ControlPanel* cp); + + CountedPtr port_model() const { return m_model; } + +private: + OmPatchPort* m_patch_port; ///< Port on m_module + OmPortModule* m_module; ///< Port pseudo-module (for patch ports only) + OmPort* m_port; ///< Port on some other canvas module + ControlPanel* m_control_panel; ///< Control panel that contains this port +}; + + +} // namespace OmGtk + +#endif // PORTCONTROLLER_H diff --git a/src/progs/ingenuity/RenameWindow.cpp b/src/progs/ingenuity/RenameWindow.cpp new file mode 100644 index 00000000..bc010c15 --- /dev/null +++ b/src/progs/ingenuity/RenameWindow.cpp @@ -0,0 +1,113 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "RenameWindow.h" +#include +#include +#include "Controller.h" +#include "ObjectModel.h" +#include "GtkObjectController.h" +#include "Store.h" +using std::string; + +namespace OmGtk { + + +RenameWindow::RenameWindow(BaseObjectType* cobject, const Glib::RefPtr& glade_xml) +: Gtk::Window(cobject) +{ + glade_xml->get_widget("rename_name_entry", m_name_entry); + glade_xml->get_widget("rename_message_label", m_message_label); + glade_xml->get_widget("rename_cancel_button", m_cancel_button); + glade_xml->get_widget("rename_ok_button", m_ok_button); + + m_name_entry->signal_changed().connect(sigc::mem_fun(this, &RenameWindow::name_changed)); + m_cancel_button->signal_clicked().connect(sigc::mem_fun(this, &RenameWindow::cancel_clicked)); + m_ok_button->signal_clicked().connect(sigc::mem_fun(this, &RenameWindow::ok_clicked)); + + m_ok_button->property_sensitive() = false; +} + + +/** Set the object this window is renaming. + * This function MUST be called before using this object in any way. + */ +void +RenameWindow::set_object(GtkObjectController* object) +{ + m_object = object; + m_name_entry->set_text(object->path().name()); +} + + +/** Called every time the user types into the name input box. + * Used to display warning messages, and enable/disable the rename button. + */ +void +RenameWindow::name_changed() +{ + assert(m_name_entry); + assert(m_message_label); + assert(m_object->model()); + assert(m_object->model()->parent()); + + string name = m_name_entry->get_text(); + if (name.find("/") != string::npos) { + m_message_label->set_text("Name may not contain '/'"); + m_ok_button->property_sensitive() = false; + //} else if (m_object->parent()->patch_model()->get_node(name) != NULL) { + } else if (Store::instance().object(m_object->model()->parent()->base_path() + name)) { + m_message_label->set_text("An object already exists with that name."); + m_ok_button->property_sensitive() = false; + } else if (name.length() == 0) { + m_message_label->set_text(""); + m_ok_button->property_sensitive() = false; + } else { + m_message_label->set_text(""); + m_ok_button->property_sensitive() = true; + } +} + + +void +RenameWindow::cancel_clicked() +{ + cout << "cancel\n"; + m_name_entry->set_text(""); + hide(); +} + + +/** Rename the object. + * + * It shouldn't be possible for this to be called with an invalid name set + * (since the Rename button should be deactivated). This is just shinification + * though - the engine will handle invalid names gracefully. + */ +void +RenameWindow::ok_clicked() +{ + string name = m_name_entry->get_text(); + assert(name.length() > 0); + assert(name.find("/") == string::npos); + + Controller::instance().rename(m_object->model()->path(), name); + + hide(); +} + + +} // namespace OmGtk diff --git a/src/progs/ingenuity/RenameWindow.h b/src/progs/ingenuity/RenameWindow.h new file mode 100644 index 00000000..d73999dd --- /dev/null +++ b/src/progs/ingenuity/RenameWindow.h @@ -0,0 +1,57 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef RENAMEWINDOW_H +#define RENAMEWINDOW_H + +#include +#include + + +namespace OmGtk { + +class GtkObjectController; + + +/** 'New Patch' Window. + * + * Loaded by libglade as a derived object. + * + * \ingroup OmGtk + */ +class RenameWindow : public Gtk::Window +{ +public: + RenameWindow(BaseObjectType* cobject, const Glib::RefPtr& refGlade); + + void set_object(GtkObjectController* object); + +private: + void name_changed(); + void cancel_clicked(); + void ok_clicked(); + + GtkObjectController* m_object; + + Gtk::Entry* m_name_entry; + Gtk::Label* m_message_label; + Gtk::Button* m_cancel_button; + Gtk::Button* m_ok_button; +}; + +} // namespace OmGtk + +#endif // RENAMEWINDOW_H diff --git a/src/progs/ingenuity/SubpatchModule.cpp b/src/progs/ingenuity/SubpatchModule.cpp new file mode 100644 index 00000000..ce4d72b9 --- /dev/null +++ b/src/progs/ingenuity/SubpatchModule.cpp @@ -0,0 +1,102 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "SubpatchModule.h" +#include +#include +#include "OmModule.h" +#include "NodeControlWindow.h" +#include "PatchModel.h" +#include "PatchWindow.h" +#include "OmFlowCanvas.h" +#include "PatchController.h" +#include "OmPort.h" +#include "Controller.h" +using std::cerr; using std::cout; using std::endl; + +namespace OmGtk { + + +SubpatchModule::SubpatchModule(OmFlowCanvas* canvas, PatchController* patch) +: OmModule(canvas, patch), + m_patch(patch) +{ + assert(canvas != NULL); + assert(patch != NULL); +} + + +void +SubpatchModule::add_om_port(PortModel* pm, bool resize_to_fit) +{ + OmPort* port = new OmPort(this, pm); + + port->signal_event().connect( + sigc::bind(sigc::mem_fun(m_canvas, &OmFlowCanvas::port_event), port)); + + Module::add_port(port, resize_to_fit); +} + + +void +SubpatchModule::on_double_click(GdkEventButton* event) +{ + assert(m_patch != NULL); + + // If window is visible + if (m_patch->window() != NULL + && m_patch->window()->is_visible()) { + m_patch->show_patch_window(); // just raise it + // No window visible + } else { + if (event->state & GDK_SHIFT_MASK) + m_patch->show_patch_window(); // open a new window + else + browse_to_patch(); + } +} + + + +/** Browse to this patch in current (parent's) window. */ +void +SubpatchModule::browse_to_patch() +{ + assert(m_patch->model()->parent()); + PatchController* pc = (PatchController*)m_patch->model()->parent()->controller(); + assert(pc != NULL); + assert(pc->window() != NULL); + + assert(pc->window() != NULL); + pc->window()->patch_controller(m_patch); +} + + + +void +SubpatchModule::show_dialog() +{ + m_patch->show_control_window(); +} + + +void +SubpatchModule::menu_remove() +{ + Controller::instance().destroy(m_patch->model()->path()); +} + +} // namespace OmGtk diff --git a/src/progs/ingenuity/SubpatchModule.h b/src/progs/ingenuity/SubpatchModule.h new file mode 100644 index 00000000..38d7c685 --- /dev/null +++ b/src/progs/ingenuity/SubpatchModule.h @@ -0,0 +1,69 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + +#ifndef SUBPATCHMODULE_H +#define SUBPATCHMODULE_H + +#include +#include +#include "OmModule.h" +#include "PatchController.h" +using std::string; using std::list; + +namespace LibOmClient { +class PatchModel; +class NodeModel; +class PortModel; +class PatchWindow; +} +using namespace LibOmClient; + +namespace OmGtk { + +class OmFlowCanvas; +class NodeControlWindow; +class PatchController; + + +/** A module to represent a subpatch + * + * \ingroup OmGtk + */ +class SubpatchModule : public OmModule +{ +public: + SubpatchModule(OmFlowCanvas* canvas, PatchController* controller); + virtual ~SubpatchModule() {} + + void add_om_port(PortModel* pm, bool resize=true); + + void on_double_click(GdkEventButton* ev); + + void show_dialog(); + void browse_to_patch(); + void menu_remove(); + + PatchController* patch() { return m_patch; } + +protected: + PatchController* m_patch; +}; + + +} // namespace OmGtk + +#endif // SUBPATCHMODULE_H diff --git a/src/progs/ingenuity/cmdline.c b/src/progs/ingenuity/cmdline.c new file mode 100644 index 00000000..11fcd108 --- /dev/null +++ b/src/progs/ingenuity/cmdline.c @@ -0,0 +1,149 @@ +/* + File autogenerated by gengetopt version 2.10 + generated with the following command: + gengetopt + + The developers of gengetopt consider the fixed text that goes in all + gengetopt output files to be in the public domain: + we make no copyright claims on it. +*/ + + +#include +#include +#include + +/* If we use autoconf. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "getopt.h" + +#include "cmdline.h" + +void +cmdline_parser_print_version (void) +{ + printf ("%s %s\n", CMDLINE_PARSER_PACKAGE, CMDLINE_PARSER_VERSION); +} + +void +cmdline_parser_print_help (void) +{ + cmdline_parser_print_version (); + printf("\n" + "Usage: %s [OPTIONS]...\n", CMDLINE_PARSER_PACKAGE); + printf(" -h --help Print help and exit\n"); + printf(" -V --version Print version and exit\n"); + printf(" -uSTRING --engine-url=STRING Om engine URL to connect to\n"); + printf(" -pINT --client-port=INT Client port to listen on\n"); +} + + +static char *gengetopt_strdup (const char *s); + +/* gengetopt_strdup() */ +/* strdup.c replacement of strdup, which is not standard */ +char * +gengetopt_strdup (const char *s) +{ + char *result = (char*)malloc(strlen(s) + 1); + if (result == (char*)0) + return (char*)0; + strcpy(result, s); + return result; +} + +int +cmdline_parser (int argc, char * const *argv, struct gengetopt_args_info *args_info) +{ + int c; /* Character of the parsed option. */ + int missing_required_options = 0; + + args_info->help_given = 0 ; + args_info->version_given = 0 ; + args_info->engine_url_given = 0 ; + args_info->client_port_given = 0 ; +#define clear_args() { \ + args_info->engine_url_arg = NULL; \ +} + + clear_args(); + + optarg = 0; + optind = 1; + opterr = 1; + optopt = '?'; + + while (1) + { + int option_index = 0; + char *stop_char; + + static struct option long_options[] = { + { "help", 0, NULL, 'h' }, + { "version", 0, NULL, 'V' }, + { "engine-url", 1, NULL, 'u' }, + { "client-port", 1, NULL, 'p' }, + { NULL, 0, NULL, 0 } + }; + + stop_char = 0; + c = getopt_long (argc, argv, "hVu:p:", long_options, &option_index); + + if (c == -1) break; /* Exit from `while (1)' loop. */ + + switch (c) + { + case 'h': /* Print help and exit. */ + clear_args (); + cmdline_parser_print_help (); + exit (EXIT_SUCCESS); + + case 'V': /* Print version and exit. */ + clear_args (); + cmdline_parser_print_version (); + exit (EXIT_SUCCESS); + + case 'u': /* Om engine URL to connect to. */ + if (args_info->engine_url_given) + { + fprintf (stderr, "%s: `--engine-url' (`-u') option given more than once\n", CMDLINE_PARSER_PACKAGE); + clear_args (); + exit (EXIT_FAILURE); + } + args_info->engine_url_given = 1; + args_info->engine_url_arg = gengetopt_strdup (optarg); + break; + + case 'p': /* Client port to listen on. */ + if (args_info->client_port_given) + { + fprintf (stderr, "%s: `--client-port' (`-p') option given more than once\n", CMDLINE_PARSER_PACKAGE); + clear_args (); + exit (EXIT_FAILURE); + } + args_info->client_port_given = 1; + args_info->client_port_arg = strtol (optarg,&stop_char,0); + break; + + + case 0: /* Long option with no short option */ + + case '?': /* Invalid option. */ + /* `getopt_long' already printed an error message. */ + exit (EXIT_FAILURE); + + default: /* bug: option not considered. */ + fprintf (stderr, "%s: option unknown: %c\n", CMDLINE_PARSER_PACKAGE, c); + abort (); + } /* switch */ + } /* while */ + + + if ( missing_required_options ) + exit (EXIT_FAILURE); + + return 0; +} diff --git a/src/progs/ingenuity/cmdline.ggo b/src/progs/ingenuity/cmdline.ggo new file mode 100644 index 00000000..d62cf521 --- /dev/null +++ b/src/progs/ingenuity/cmdline.ggo @@ -0,0 +1,7 @@ +# Process this file with gengetopt -u to generate the necessary code (in cmdline.h, cmdline.c) + +package "om_gtk - A GUI client for the Om realtime modular synthesizer" + +option "engine-url" u "Om engine URL to connect to" string no +option "client-port" p "Client port to listen on" int no + diff --git a/src/progs/ingenuity/cmdline.h b/src/progs/ingenuity/cmdline.h new file mode 100644 index 00000000..e404ac2e --- /dev/null +++ b/src/progs/ingenuity/cmdline.h @@ -0,0 +1,45 @@ +/* cmdline.h */ + +/* File autogenerated by gengetopt version 2.10 */ + +#ifndef CMDLINE_H +#define CMDLINE_H + +/* If we use autoconf. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#ifndef CMDLINE_PARSER_PACKAGE +#define CMDLINE_PARSER_PACKAGE "om_gtk - A GUI client for the Om realtime modular synthesizer" +#endif + +#ifndef CMDLINE_PARSER_VERSION +#define CMDLINE_PARSER_VERSION VERSION +#endif + +struct gengetopt_args_info +{ + char * engine_url_arg; /* Om engine URL to connect to. */ + int client_port_arg; /* Client port to listen on. */ + + int help_given ; /* Whether help was given. */ + int version_given ; /* Whether version was given. */ + int engine_url_given ; /* Whether engine-url was given. */ + int client_port_given ; /* Whether client-port was given. */ + +} ; + +int cmdline_parser (int argc, char * const *argv, struct gengetopt_args_info *args_info); + +void cmdline_parser_print_help(void); +void cmdline_parser_print_version(void); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ +#endif /* CMDLINE_H */ diff --git a/src/progs/ingenuity/main.cpp b/src/progs/ingenuity/main.cpp new file mode 100644 index 00000000..5ee848fb --- /dev/null +++ b/src/progs/ingenuity/main.cpp @@ -0,0 +1,98 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" +#include "cmdline.h" +#include "ConnectWindow.h" +#include "App.h" +#include "Store.h" +#include "Controller.h" +#include "Configuration.h" +#ifdef HAVE_LASH + #include "LashController.h" +#endif +#include "ThreadedSigClientInterface.h" +#include "OSCListener.h" +using Om::Shared::ClientInterface; + +using namespace OmGtk; + + +class OSCSigEmitter : public OSCListener, public ThreadedSigClientInterface { +public: + OSCSigEmitter(size_t queue_size, int listen_port) + : Om::Shared::ClientInterface() + , OSCListener(listen_port) + , ThreadedSigClientInterface(queue_size) + { + Glib::signal_timeout().connect( + sigc::mem_fun((ThreadedSigClientInterface*)this, + &ThreadedSigClientInterface::emit_signals), + 5, G_PRIORITY_DEFAULT_IDLE); + } +}; + + +int +main(int argc, char** argv) +{ + string engine_url = "osc.udp://localhost:16180"; + int client_port = 0; + + /* **** Parse command line options **** */ + gengetopt_args_info args_info; + if (cmdline_parser (argc, argv, &args_info) != 0) + return 1; + + if (args_info.engine_url_given) + engine_url = args_info.engine_url_arg; + if (args_info.client_port_given) + client_port = args_info.client_port_arg; + + // FIXME: + client_port = 16181; + + Gnome::Canvas::init(); + Gtk::Main gtk_main(argc, argv); + + OSCSigEmitter* emitter = new OSCSigEmitter(1024, 16181); + + /* Instantiate all singletons */ + App::instantiate(); + Store::instantiate(*(SigClientInterface*)emitter); + + Controller::instantiate(engine_url); + + /* Load settings */ + App::instance().configuration()->load_settings(); + App::instance().configuration()->apply_settings(); + + #ifdef HAVE_LASH + lash_args_t* lash_args = lash_extract_args(&argc, &argv); + #endif + + //gtk_main.signal_quit().connect(sigc::ptr_fun(cleanup)); + + #ifdef HAVE_LASH + LashController* lash_controller = new LashController(lash_args); + #endif + + App::instance().connect_window()->start(CountedPtr(emitter)); + gtk_main.run(); + + return 0; +} + diff --git a/src/progs/ingenuity/om-icon.png b/src/progs/ingenuity/om-icon.png new file mode 100644 index 00000000..b26dd942 Binary files /dev/null and b/src/progs/ingenuity/om-icon.png differ diff --git a/src/progs/ingenuity/om_gtk.glade b/src/progs/ingenuity/om_gtk.glade new file mode 100644 index 00000000..17736ce2 --- /dev/null +++ b/src/progs/ingenuity/om_gtk.glade @@ -0,0 +1,3651 @@ + + + + + + + 1 + Om + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + 640 + 480 + True + False + om-icon.png + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + + + + True + False + 0 + + + + True + GTK_PACK_DIRECTION_LTR + GTK_PACK_DIRECTION_LTR + + + + True + _File + True + + + + + + + True + Load a patch into the current patch (merge with existing contents). + _Import + True + + + + + True + gtk-open + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + + + + + + True + Save this patch + gtk-save + True + + + + + + + True + Save this patch to a specific filename + gtk-save-as + True + + + + + + + True + + + + + + True + Configure OmGtk + Confi_guration + True + + + + + + True + gtk-preferences + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + + + + + + True + Close this window (patch will not be destroyed) + gtk-close + True + + + + + + + True + + + + + + True + Quit OmGtk (Om engine will continue running) + gtk-quit + True + + + + + + + + + + + True + _Patch + True + + + + + + + True + gtk-fullscreen + True + + + + + + + True + + + + + + True + View/Edit controls for this patch + _Controls + True + + + + + + True + gtk-preferences + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + View/Edit properties for this patch + gtk-properties + True + + + + + + + True + Remove all objects from patch + gtk-clear + True + + + + + + + True + Destoy this patch (remove it from the engine) + _Destroy + True + + + + + True + gtk-delete + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + + + + + True + _Windows + True + + + + + + + + True + Connect to, Disconnect from, or Launch Engine + _Engine + True + + + + + + True + gtk-connect + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + View all patches in the engine as a heirarchial list + _Patch Tree + True + + + + + + True + gtk-index + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + View error messages from the engine + _Messages + True + + + + + + True + gtk-dialog-error + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + + + + + True + _Help + True + + + + + + + + True + Right-click the canvas to add objects + True + + + + + True + gtk-info + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + + + + + + True + gtk-about + True + + + + + + + + + + 0 + False + False + + + + + + True + False + 0 + + + + + + + 0 + False + False + + + + + + True + True + GTK_POLICY_NEVER + GTK_POLICY_NEVER + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + True + GTK_SHADOW_NONE + + + + + + + + + 0 + True + True + + + + + + + + 8 + Load Plugin + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + False + 640 + 480 + True + False + om-icon.png + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + + + + True + False + 10 + + + + True + False + 10 + + + + True + False + 5 + + + + True + False + 1 + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + True + All plugins available for loading + True + True + True + True + True + False + False + False + + + + + 0 + True + True + + + + + + True + 3 + 3 + False + 12 + 0 + + + + True + Clear filter text (show all plugins) + True + gtk-clear + True + GTK_RELIEF_NORMAL + True + + + 2 + 3 + 0 + 1 + fill + + + + + + + True + Module Name: + False + True + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + Close dialog + True + gtk-close + True + GTK_RELIEF_NORMAL + True + + + 2 + 3 + 2 + 3 + fill + + + + + + + True + + + 1 + 2 + 1 + 2 + fill + + + + + + True + + + 0 + 1 + 1 + 2 + fill + fill + + + + + + True + + + 2 + 3 + 1 + 2 + fill + fill + + + + + + True + False + 0 + + + + True + Name of new Module + True + True + True + 0 + + True + * + False + + + 0 + True + True + + + + + + True + True + Polyphonic + True + GTK_RELIEF_NORMAL + True + True + False + True + + + 8 + False + False + + + + + + True + Add selected plugin to patch + True + gtk-add + True + GTK_RELIEF_NORMAL + True + + + 0 + False + False + + + + + 1 + 2 + 2 + 3 + 6 + fill + fill + + + + + + True + Search string to filter plugin list + True + True + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + 6 + + + + + + + True + Name contains: + False + True + + + 0 + 1 + 0 + 1 + fill + fill + + + + + 0 + False + False + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + + 8 + 320 + Create Subpatch + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + False + True + False + om-icon.png + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + + + + True + False + 0 + + + + True + 2 + 2 + False + 0 + 0 + + + + True + Name: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + 5 + fill + expand + + + + + + True + Polyphony: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + 5 + fill + expand + + + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 0 100 1 10 10 + + + 1 + 2 + 1 + 2 + 4 + fill + + + + + + + True + True + True + True + True + 0 + + True + * + True + + + 1 + 2 + 0 + 1 + 4 + + + + + + 0 + True + True + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + True + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + GTK_BUTTONBOX_END + 4 + + + + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + + + + + + True + True + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-ok + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Create + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + + + 0 + True + True + + + + + + + + GTK_FILE_CHOOSER_ACTION_OPEN + True + False + False + False + Load Subpatch + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + False + True + False + om-icon.png + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + + + + True + False + 24 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + -6 + + + + + + True + True + True + True + gtk-open + True + GTK_RELIEF_NORMAL + True + -5 + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + 2 + 4 + False + 4 + 12 + + + + True + <b>Name: </b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + <b>Polyphony: </b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + Use the name stored in the patch file + True + Load from file + True + GTK_RELIEF_NORMAL + True + True + False + True + + + 1 + 2 + 0 + 1 + fill + + + + + + + True + Use the polyphony value stored in the patch file + True + Load from file + True + GTK_RELIEF_NORMAL + True + True + False + True + + + 1 + 2 + 1 + 2 + fill + + + + + + + True + False + 0 + + + + True + Specify a custom polyphony value for new patch + True + Specify: + True + GTK_RELIEF_NORMAL + True + False + False + True + load_subpatch_poly_from_file_radio + + + 0 + False + False + + + + + + True + False + Specify a custom polyphony value for new patch + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 0 1000 1 10 10 + + + 0 + False + True + + + + + 3 + 4 + 1 + 2 + fill + fill + + + + + + True + Set polyphony to the same value as the parent (containing) patch + True + Same as parent (?) + True + GTK_RELIEF_NORMAL + True + False + False + True + load_subpatch_poly_from_file_radio + + + 2 + 3 + 1 + 2 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 2 + 3 + 0 + 1 + fill + + + + + + + True + False + 0 + + + + True + Specify the name for the new patch + True + Specify: + True + GTK_RELIEF_NORMAL + True + False + False + True + load_subpatch_name_from_file_radio + + + 0 + False + False + + + + + + True + False + Specify the name for the new patch + True + True + True + 0 + + True + * + True + + + 0 + False + True + + + + + 3 + 4 + 0 + 1 + fill + + + + + 0 + False + True + + + + + + + + GTK_FILE_CHOOSER_ACTION_OPEN + True + False + False + False + Load Patch + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + False + True + False + om-icon.png + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + + + + False + 24 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + -6 + + + + + + True + True + True + True + gtk-open + True + GTK_RELIEF_NORMAL + True + -5 + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + 1 + 4 + False + 4 + 12 + + + + True + <b>Polyphony: </b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + Use the same polyphony as the current patch + True + Keep current + True + GTK_RELIEF_NORMAL + True + True + False + True + + + 1 + 2 + 0 + 1 + fill + + + + + + + True + Use the polyphony value stored in the patch file + True + Load from file + True + GTK_RELIEF_NORMAL + True + False + False + True + load_patch_poly_from_current_radio + + + 2 + 3 + 0 + 1 + fill + + + + + + + True + False + 0 + + + + True + True + Specify: + True + GTK_RELIEF_NORMAL + True + False + False + True + load_patch_poly_from_current_radio + + + 0 + False + False + + + + + + True + False + Specify a custom polyphony value for new patch + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 0 100 1 10 10 + + + 0 + False + True + + + + + 3 + 4 + 0 + 1 + fill + fill + + + + + 0 + False + True + + + + + + + + window1 + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + + + + True + 2 + 2 + False + 0 + 0 + + + + True + False + 0 + + + + True + True + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + True + GTK_SHADOW_NONE + + + + True + False + 0 + + + + + + + + + + + 0 + True + True + + + + + + True + True + 0 + + + + Apply changed controls to all voices + True + All Voices + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + False + 5 + + + + True + Apply changed controls to one voice only + True + Specific Voice: + True + GTK_RELIEF_NORMAL + True + False + False + True + control_panel_all_voices_radio + + + 0 + False + False + + + + + + True + False + Voice control changes are applied to + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 1 1 100 1 10 10 + + + 0 + True + True + + + + + 0 + False + False + + + + + 5 + False + True + + + + + 0 + 1 + 0 + 1 + + + + + + True + False + 0 + + + + 1 + True + True + GTK_POLICY_ALWAYS + GTK_POLICY_ALWAYS + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + + + + 0 + True + True + + + + + + True + False + 0 + + + + True + Enable audio processing for this patch + True + Run + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + True + + + + + + True + True + False + True + + + 0 + False + False + + + + + + True + False + 0 + + + + True + Polyphony: + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + ? + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 10 + True + False + + + + + + True + True + False + True + + + 0 + False + False + + + + + + True + False + 0 + + + + True + Zoom: + False + True + GTK_JUSTIFY_LEFT + False + False + 0.469999998808 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 2 + False + False + + + + + + 90 + True + True + False + GTK_POS_RIGHT + 1 + GTK_UPDATE_CONTINUOUS + False + 1.10638296604 0.25 2 0.25 0 0 + + + 0 + False + False + + + + + 0 + False + True + + + + + 0 + False + False + + + + + 0 + 1 + 1 + 2 + fill + + + + + + + + 8 + 400 + 180 + Error Messages + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + om-icon.png + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + + + + True + False + 6 + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + Error messages from the engine since the last time "Clear" was pressed + True + False + False + False + GTK_JUSTIFY_LEFT + GTK_WRAP_WORD + False + 5 + 5 + 0 + 5 + 5 + 0 + + + + + + 0 + True + True + + + + + + True + GTK_BUTTONBOX_END + 6 + + + + True + False + True + True + gtk-clear + True + GTK_RELIEF_NORMAL + True + + + + + + True + True + gtk-close + True + GTK_RELIEF_NORMAL + True + + + + + 0 + False + True + + + + + + + + 8 + Configuration + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + om-icon.png + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + + + + True + False + 6 + + + + True + 2 + 2 + False + 0 + 0 + + + + True + <b>Patch Search Path: </b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + + + + + + + True + <i>Example: /foo/bar:/home/john/patches:/usr/share/om/patches</i> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 1 + 2 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + 0 + True + False + + + + + + True + GTK_BUTTONBOX_END + 6 + + + + True + Save these settings for future sessions + True + gtk-save + True + GTK_RELIEF_NORMAL + True + + + + + + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + + + + + + True + Apply these settings to this session only + True + gtk-ok + True + GTK_RELIEF_NORMAL + True + + + + + 0 + False + True + + + + + + + + 8 + 400 + 200 + Patch Description + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + False + True + False + om-icon.png + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + + + + True + False + 6 + + + + True + False + 5 + + + + True + Author: + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + True + True + 0 + + True + * + False + + + 0 + True + True + + + + + 0 + False + False + + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + A short description of the patch to be included in the patch file + True + True + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_WORD + True + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + 0 + True + True + + + + + + True + GTK_BUTTONBOX_END + 5 + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + + + + + + True + Apply these changes to be saved the next time the patch is saved + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + True + + + + + 0 + False + False + + + + + + + + 250 + Rename + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + False + True + False + om-icon.png + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + + + + 5 + True + False + 0 + + + + True + False + 0 + + + + True + New name: + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + True + True + 0 + + True + * + True + + + 0 + True + True + + + + + 0 + True + True + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + True + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 6 + False + True + + + + + + True + GTK_BUTTONBOX_END + 5 + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + + + + + + True + True + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-ok + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Rename + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + + + 0 + False + True + + + + + + + + 6 + window1 + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + om-icon.png + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + + + + True + False + 0 + + + + True + <b>Node</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + 12 + True + False + 6 + + + + True + False + 4 + + + + True + Path: + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + - + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 0 + False + False + + + + + + True + False + True + Polyphonic + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + 6 + True + True + + + + + + 240 + True + <b>Plugin</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + 12 + True + 3 + 2 + False + 6 + 10 + + + + True + - + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 0 + 1 + fill + + + + + + + True + Type: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + URI: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + - + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 1 + 2 + fill + + + + + + + True + Name: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + - + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 2 + 3 + fill + + + + + + 0 + True + True + + + + + + + + True + OmGtk + Copyright (C) 2005-2006 Dave Robillard + A client for the Om modular synthesizer + Licensed under the GNU GPL, Version 2. + +See COPYING file included with Om, or http://www.gnu.org/licenses/gpl.txt for more information + False + http://om-synth.nongnu.org + + Author: + Dave Robillard <drobilla@connect.carelton.ca> + +Contributors: + Lars Luthman - DSSI enhancements, bugfixes + Mario Lang - SuperCollider bindings, bugfixes + Leonard Ritter - Python bindings + + Usability / UI Design: + Thorsten Wilms + translator-credits + om-icon.png + + + + 8 + 320 + 340 + Patches + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + om-icon.png + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + + + + 3 + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + All patches loaded in the engine + True + True + True + False + True + False + False + False + + + + + + + + 6 + Connect to Engine + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER + False + True + False + om-icon.png + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + True + + + + True + False + 6 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-quit + True + GTK_RELIEF_NORMAL + True + 0 + + + + + + True + False + True + True + gtk-disconnect + True + GTK_RELIEF_NORMAL + True + -6 + + + + + + True + True + True + True + gtk-connect + True + GTK_RELIEF_NORMAL + True + -6 + + + + + 0 + False + False + GTK_PACK_END + + + + + + True + False + 0 + + + + True + False + 0 + + + + True + gtk-disconnect + 3 + 0.5 + 0.5 + 12 + 0 + + + 0 + False + True + + + + + + 5 + True + True + 0 + + + + True + GTK_PROGRESS_LEFT_TO_RIGHT + 0 + 0.10000000149 + + PANGO_ELLIPSIZE_NONE + + + 0 + False + False + + + + + + True + Not Connected + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + True + + + + + 0 + True + True + + + + + 0 + True + False + + + + + + True + + + 4 + True + True + + + + + + True + 3 + 2 + False + 8 + 0 + + + + True + False + 0 + + + + True + False + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 16180 1 65535 1 10 10 + + + 0 + False + False + + + + + 1 + 2 + 1 + 2 + 8 + fill + + + + + + True + False + 0 + + + + True + True + True + True + 0 + osc.udp://localhost:16180 + True + * + True + 28 + + + 0 + True + True + + + + + 1 + 2 + 0 + 1 + 8 + fill + fill + + + + + + True + True + Connect to running server at: + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + True + Launch and connect to server on port: + True + GTK_RELIEF_NORMAL + True + False + False + True + connect_server_radiobutton + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + False + True + Use internal engine + True + GTK_RELIEF_NORMAL + True + False + False + True + connect_server_radiobutton + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 2 + 3 + fill + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + + True + + + + True + Input + True + + + + True + gtk-connect + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + + True + Add an audio input to this patch + Audio + True + + + + + + + True + Add a control input (and a control slider for it) to this patch + Control + True + + + + + + + True + Add a MIDI input to this patch + MIDI + True + + + + + + + + + + + True + Output + True + + + + True + gtk-connect + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + + True + Add an audio output to this patch + Audio + True + + + + + + + True + Add a control output to this patch + Control + True + + + + + + + True + Add a MIDI output to this patch + MIDI + True + + + + + + + + + + + True + Load a plugin as a child of this patch + _Plugin... + True + + + + + True + gtk-execute + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + Load a patch as a child of this patch + Patch From _File... + True + + + + + True + gtk-open + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + Create a new (empty) patch as a child of this patch + _New Patch... + True + + + + + True + gtk-new + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + diff --git a/src/progs/ingenuity/om_gtk.gladep b/src/progs/ingenuity/om_gtk.gladep new file mode 100644 index 00000000..a8bd18bd --- /dev/null +++ b/src/progs/ingenuity/om_gtk.gladep @@ -0,0 +1,9 @@ + + + + + OmGtk + om_gtk + C++ + FALSE + diff --git a/src/progs/ingenuity/om_gtk.gladep.bak b/src/progs/ingenuity/om_gtk.gladep.bak new file mode 100644 index 00000000..a8bd18bd --- /dev/null +++ b/src/progs/ingenuity/om_gtk.gladep.bak @@ -0,0 +1,9 @@ + + + + + OmGtk + om_gtk + C++ + FALSE + diff --git a/src/progs/ingenuity/singletons.cpp b/src/progs/ingenuity/singletons.cpp new file mode 100644 index 00000000..e3d113dc --- /dev/null +++ b/src/progs/ingenuity/singletons.cpp @@ -0,0 +1,27 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "App.h" +#include "Store.h" +#include "Controller.h" + +namespace OmGtk +{ + App* App::_instance = 0; + Store* Store::_instance = 0; + Controller* Controller::_instance = 0; +} + diff --git a/src/progs/om/Makefile.am b/src/progs/om/Makefile.am deleted file mode 100644 index 2689088e..00000000 --- a/src/progs/om/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/engine -I$(top_srcdir)/src/libs/engine/events -fno-exceptions -fno-rtti - -MAINTAINERCLEANFILES = Makefile.in - -# -# Stand-alone engine -# -if BUILD_ENGINE - -bin_PROGRAMS = om -om_DEPENDENCIES = ../../libs/engine/libom.la -om_LDADD = @JACK_LIBS@ @LOSC_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @SLV2_LIBS@ -lrt ../../libs/engine/libom.la - -om_SOURCES = \ - main.cpp \ - cmdline.h \ - cmdline.c - -endif # BUILD_ENGINE - - -## -## Jack internal client -## -#if BUILD_IN_PROCESS_ENGINE -# -# -## FIXME: broken -# -# -## FIXME: Figure out how to get this properly -#omdir = $(prefix)/lib/jack -# -#om_la_CFLAGS = -fPIC -#om_LTLIBRARIES = om.la -#om_la_LDFLAGS = -module -avoid-version @JACK_LIBS@ @LOSC_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @SLV2_LIBS@ -#om_la_SOURCES = OmInProcess.cpp -# -#endif # BUILD_IN_PROCESS_ENGINE - - - - diff --git a/src/progs/om/cmdline.c b/src/progs/om/cmdline.c deleted file mode 100644 index 6b7ddf6a..00000000 --- a/src/progs/om/cmdline.c +++ /dev/null @@ -1,150 +0,0 @@ -/* - File autogenerated by gengetopt version 2.10 - generated with the following command: - gengetopt - - The developers of gengetopt consider the fixed text that goes in all - gengetopt output files to be in the public domain: - we make no copyright claims on it. -*/ - - -#include -#include -#include - -/* If we use autoconf. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "getopt.h" - -#include "cmdline.h" - -void -cmdline_parser_print_version (void) -{ - printf ("%s %s\n", CMDLINE_PARSER_PACKAGE, CMDLINE_PARSER_VERSION); -} - -void -cmdline_parser_print_help (void) -{ - cmdline_parser_print_version (); - printf("\n" - "Usage: %s [OPTIONS]...\n", CMDLINE_PARSER_PACKAGE); - printf(" -h --help Print help and exit\n"); - printf(" -V --version Print version and exit\n"); - printf(" -pSTRING --port=STRING OSC port to listen on (default='16180')\n"); - printf(" -i --in-jackd Run engine as in-process JACK client (default=off)\n"); -} - - -static char *gengetopt_strdup (const char *s); - -/* gengetopt_strdup() */ -/* strdup.c replacement of strdup, which is not standard */ -char * -gengetopt_strdup (const char *s) -{ - char *result = (char*)malloc(strlen(s) + 1); - if (result == (char*)0) - return (char*)0; - strcpy(result, s); - return result; -} - -int -cmdline_parser (int argc, char * const *argv, struct gengetopt_args_info *args_info) -{ - int c; /* Character of the parsed option. */ - int missing_required_options = 0; - - args_info->help_given = 0 ; - args_info->version_given = 0 ; - args_info->port_given = 0 ; - args_info->in_jackd_given = 0 ; -#define clear_args() { \ - args_info->port_arg = gengetopt_strdup("16180") ;\ - args_info->in_jackd_flag = 0;\ -} - - clear_args(); - - optarg = 0; - optind = 1; - opterr = 1; - optopt = '?'; - - while (1) - { - int option_index = 0; - char *stop_char; - - static struct option long_options[] = { - { "help", 0, NULL, 'h' }, - { "version", 0, NULL, 'V' }, - { "port", 1, NULL, 'p' }, - { "in-jackd", 0, NULL, 'i' }, - { NULL, 0, NULL, 0 } - }; - - stop_char = 0; - c = getopt_long (argc, argv, "hVp:i", long_options, &option_index); - - if (c == -1) break; /* Exit from `while (1)' loop. */ - - switch (c) - { - case 'h': /* Print help and exit. */ - clear_args (); - cmdline_parser_print_help (); - exit (EXIT_SUCCESS); - - case 'V': /* Print version and exit. */ - clear_args (); - cmdline_parser_print_version (); - exit (EXIT_SUCCESS); - - case 'p': /* OSC port to listen on. */ - if (args_info->port_given) - { - fprintf (stderr, "%s: `--port' (`-p') option given more than once\n", CMDLINE_PARSER_PACKAGE); - clear_args (); - exit (EXIT_FAILURE); - } - args_info->port_given = 1; - args_info->port_arg = gengetopt_strdup (optarg); - break; - - case 'i': /* Run engine as in-process JACK client. */ - if (args_info->in_jackd_given) - { - fprintf (stderr, "%s: `--in-jackd' (`-i') option given more than once\n", CMDLINE_PARSER_PACKAGE); - clear_args (); - exit (EXIT_FAILURE); - } - args_info->in_jackd_given = 1; - args_info->in_jackd_flag = !(args_info->in_jackd_flag); - break; - - - case 0: /* Long option with no short option */ - - case '?': /* Invalid option. */ - /* `getopt_long' already printed an error message. */ - exit (EXIT_FAILURE); - - default: /* bug: option not considered. */ - fprintf (stderr, "%s: option unknown: %c\n", CMDLINE_PARSER_PACKAGE, c); - abort (); - } /* switch */ - } /* while */ - - - if ( missing_required_options ) - exit (EXIT_FAILURE); - - return 0; -} diff --git a/src/progs/om/cmdline.ggo b/src/progs/om/cmdline.ggo deleted file mode 100644 index 8c006ca7..00000000 --- a/src/progs/om/cmdline.ggo +++ /dev/null @@ -1,7 +0,0 @@ -# Process this file with gengetopt -u to generate the necessary code (in cmdline.h, cmdline.c) - -package "Om - An OSC controlled realtime modular synthesizer" - -option "port" p "OSC port to listen on" string default="16180" no -option "in-jackd" i "Run engine as in-process JACK client" flag off - diff --git a/src/progs/om/cmdline.h b/src/progs/om/cmdline.h deleted file mode 100644 index fe36a969..00000000 --- a/src/progs/om/cmdline.h +++ /dev/null @@ -1,45 +0,0 @@ -/* cmdline.h */ - -/* File autogenerated by gengetopt version 2.10 */ - -#ifndef CMDLINE_H -#define CMDLINE_H - -/* If we use autoconf. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#ifndef CMDLINE_PARSER_PACKAGE -#define CMDLINE_PARSER_PACKAGE "Om - An OSC controlled realtime modular synthesizer" -#endif - -#ifndef CMDLINE_PARSER_VERSION -#define CMDLINE_PARSER_VERSION VERSION -#endif - -struct gengetopt_args_info -{ - char * port_arg; /* OSC port to listen on (default='16180'). */ - int in_jackd_flag; /* Run engine as in-process JACK client (default=off). */ - - int help_given ; /* Whether help was given. */ - int version_given ; /* Whether version was given. */ - int port_given ; /* Whether port was given. */ - int in_jackd_given ; /* Whether in-jackd was given. */ - -} ; - -int cmdline_parser (int argc, char * const *argv, struct gengetopt_args_info *args_info); - -void cmdline_parser_print_help(void); -void cmdline_parser_print_version(void); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ -#endif /* CMDLINE_H */ diff --git a/src/progs/om/main.cpp b/src/progs/om/main.cpp deleted file mode 100644 index a69c7e76..00000000 --- a/src/progs/om/main.cpp +++ /dev/null @@ -1,153 +0,0 @@ -/* This file is part of Om. Copyright (C) 2006 Dave Robillard. - * - * Om is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Om is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include -#include -#include -#include "config.h" -#include "util.h" -#include "cmdline.h" -#include "Om.h" -#include "OmApp.h" -#ifdef HAVE_LASH -#include "LashDriver.h" -#endif -#ifdef BUILD_IN_PROCESS_ENGINE -#include -#include -#endif - -using std::cout; using std::endl; using std::cerr; - - -void -catch_int(int) -{ - signal(SIGINT, catch_int); - signal(SIGTERM, catch_int); - - std::cout << "[Main] Om interrupted." << std::endl; - Om::om->quit(); -} - - -#ifdef BUILD_IN_PROCESS_ENGINE - -jack_client_t* jack_client; -jack_intclient_t jack_intclient; - - -void -unload_in_process_engine(int) -{ - jack_status_t status; - int ret = EXIT_SUCCESS; - - cout << "Unloading..."; - status = jack_internal_client_unload(jack_client, jack_intclient); - if (status & JackFailure) { - cout << "failed" << endl; - ret = EXIT_FAILURE; - } else { - cout << "done" << endl; - } - jack_client_close(jack_client); - exit(ret); -} - - -int -load_in_process_engine(const char* port) -{ - int ret = EXIT_SUCCESS; - - jack_status_t status; - - if ((jack_client = jack_client_open("om_load", JackNoStartServer, - &status)) != NULL) { - jack_intclient = - jack_internal_client_load(jack_client, "Om", - (jack_options_t)(JackLoadName|JackLoadInit), - &status, "om", port); - if (status == 0) { - cout << "Engine loaded" << endl; - signal(SIGINT, unload_in_process_engine); - signal(SIGTERM, unload_in_process_engine); - - while (1) { - sleep(1); - } - } else if (status & JackFailure) { - cerr << "Could not load om.so" << endl; - ret = EXIT_FAILURE; - } - - jack_client_close(jack_client); - } else { - cerr << "jack_client_open failed" << endl; - ret = EXIT_FAILURE; - } -} - -#endif // BUILD_IN_PROCESS_ENGINE - - -int -main(int argc, char** argv) -{ -#ifdef HAVE_LASH - lash_args_t* lash_args = lash_extract_args(&argc, &argv); -#endif - - int ret = EXIT_SUCCESS; - - /* Parse command line options */ - gengetopt_args_info args_info; - if (cmdline_parser (argc, argv, &args_info) != 0) - return EXIT_FAILURE; - - - if (args_info.in_jackd_flag) { -#ifdef BUILD_IN_PROCESS_ENGINE - ret = load_in_process_engine(args_info.port_arg); -#else - cerr << "In-process Jack client support not enabled in this build." << endl; - ret = EXIT_FAILURE; -#endif // JACK_IN_PROCESS_ENGINE - } else { - signal(SIGINT, catch_int); - signal(SIGTERM, catch_int); - - Om::set_denormal_flags(); - - Om::om = new Om::OmApp(args_info.port_arg); - -#ifdef HAVE_LASH - Om::lash_driver = new Om::LashDriver(Om::om, lash_args); -#endif - - Om::om->main(); - -#ifdef HAVE_LASH - delete Om::lash_driver; -#endif - - delete Om::om; - } - - return ret; -} - diff --git a/src/progs/patch_loader/new_patch_loader.cpp b/src/progs/patch_loader/new_patch_loader.cpp index 8884e85b..c25f0f6e 100644 --- a/src/progs/patch_loader/new_patch_loader.cpp +++ b/src/progs/patch_loader/new_patch_loader.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2005 Dave Robillard. +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include diff --git a/src/progs/patch_loader/patch_loader.cpp b/src/progs/patch_loader/patch_loader.cpp index e8579ed7..637299bf 100644 --- a/src/progs/patch_loader/patch_loader.cpp +++ b/src/progs/patch_loader/patch_loader.cpp @@ -1,4 +1,4 @@ -/* This file is part of Om. Copyright (C) 2005 Dave Robillard. +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. * * Om is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/src/progs/python/OSC.py b/src/progs/python/OSC.py index 74eb5880..ea93dc52 100755 --- a/src/progs/python/OSC.py +++ b/src/progs/python/OSC.py @@ -4,23 +4,22 @@ # Copyright (C) 2002 Daniel Holth, Clinton McChesney # Modified by Leonard Ritter # -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. +# This library is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published +# by the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. # -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. +# This library is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public +# License for more details. # -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU Lesser General Public License +# along with this library; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -# For questions regarding this module contact -# Daniel Holth or visit -# http://www.stetson.edu/~ProctoLogic/ +# For questions regarding this module contact Daniel Holth +# or visit http://www.stetson.edu/~ProctoLogic/ import socket import struct diff --git a/src/progs/python/ingen.py b/src/progs/python/ingen.py new file mode 100644 index 00000000..25c05fea --- /dev/null +++ b/src/progs/python/ingen.py @@ -0,0 +1,636 @@ +#!/usr/bin/python +# +# Python bindings for Ingen +# Copyright (C) 2005 Leonard Ritter +# Copyright (C) 2006 Dave Robillard + +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +import os,sys,thread,time + +from OSC import OSCMessage, decodeOSC + +from twisted.internet.protocol import DatagramProtocol +from twisted.internet import reactor + +INGEN_CALL_TIMEOUT = 5 +INGEN_CALL_POLLTIME = 0.1 + +class TreeElement: + def __init__(self,environment,parent,name): + self.environment = environment + self.parent = parent + self.name = name + self.metadata = {} + + def __del__(self): + print "'%s': gone" % self.name + + def removeChild(self, child): + pass + + def remove(self): + self.parent.removeChild(self.name) + self.parent = None + del self + + def getParent(self): + return self.parent + + def getName(self): + return self.name + + def getPath(self): + if self.parent: + return self.parent.getPath() + "/" + self.name + else: + return self.name + + def getDepth(self): + if self.parent: + return self.parent.getDepth() + 1 + else: + return 0 + + def setMetaData(self,key,value): + if (not self.metadata.has_key(value)) or (self.metadata[key] != value): + print "||| '%s': '%s' = '%s'" % (self.getPath(), key, value) + self.metadata[key] = value + +class Port(TreeElement): + def __init__(self,environment,parent,name): + TreeElement.__init__(self,environment,parent,name) + self.porttype = "" + self.direction = "" + self.hint = "" + self.defaultvalue = 0.0 + self.minvalue = 0.0 + self.maxvalue = 0.0 + self.value = 0.0 + self.connections = {} + print "*** '%s': new port" % self.getPath() + + def remove(self): + for connection in self.getConnections(): + connection.remove() + TreeElement.remove(self) + + def getConnections(self): + return self.connections + + def addConnection(self,target,connection): + self.connections[target] = connection + + def removeConnection(self,target): + del self.connections[target] + + def setPortType(self,porttype): + if self.porttype != porttype: + print "*** '%s': changing porttype from '%s' to '%s'" % (self.getPath(), self.porttype, porttype) + self.porttype = porttype + + def setDirection(self,direction): + if self.direction != direction: + print "*** '%s': changing direction from '%s' to '%s'" % (self.getPath(), self.direction, direction) + self.direction = direction + + def setHint(self,hint): + if self.hint != hint: + print "*** '%s': changing hint from '%s' to '%s'" % (self.getPath(), self.hint, hint) + self.hint = hint + + def setDefaultValue(self,defaultvalue): + if self.defaultvalue != defaultvalue: + print "*** '%s': changing defaultvalue from '%.3f' to '%.3f'" % (self.getPath(), self.defaultvalue, defaultvalue) + self.defaultvalue = defaultvalue + + def setMinValue(self,minvalue): + if self.minvalue != minvalue: + print "*** '%s': changing minvalue from '%.3f' to '%.3f'" % (self.getPath(), self.minvalue, minvalue) + self.minvalue = minvalue + + def setMaxValue(self,maxvalue): + if self.maxvalue != maxvalue: + print "*** '%s': changing maxvalue from '%.3f' to '%.3f'" % (self.getPath(), self.maxvalue, maxvalue) + self.maxvalue = maxvalue + + def setValue(self,value): + if self.value != value: + print "*** '%s': changing value from '%.3f' to '%.3f'" % (self.getPath(), self.value, value) + self.value = value + +class Node(TreeElement): + def __init__(self,environment,parent,name): + TreeElement.__init__(self,environment,parent,name) + self.ports = {} + self.polyphonic = 0 + self.plugintype = "" + self.libname = "" + self.pluginlabel = "" + print "+++ '%s': new node" % self.getPath() + + def remove(self): + for port in self.getPorts(): + port.remove() + TreeElement.remove(self) + + def removeChild(self, child): + del self.ports[child] + + def getPorts(self): + return self.ports.values() + + def setPluginLabel(self,pluginlabel): + if pluginlabel != self.pluginlabel: + print "+++ '%s': changing pluginlabel from '%s' to '%s'" % (self.getPath(), self.pluginlabel, pluginlabel) + self.pluginlabel = pluginlabel + + def setLibName(self,libname): + if libname != self.libname: + print "+++ '%s': changing libname from '%s' to '%s'" % (self.getPath(), self.libname, libname) + self.libname = libname + + def setPluginType(self,plugintype): + if plugintype != self.plugintype: + print "+++ '%s': changing plugintype from '%s' to '%s'" % (self.getPath(), self.plugintype, plugintype) + self.plugintype = plugintype + + def setPolyphonic(self,polyphonic): + if polyphonic != self.polyphonic: + print "+++ '%s': changing polyphony from %i to %i" % (self.getPath(), self.polyphonic, polyphonic) + self.polyphonic = polyphonic + + def hasPort(self,name): + return self.ports.has_key(name) + + def getPort(self,name,mustexist=False): + if not self.hasPort(name): + if mustexist: + return None + self.ports[name] = self.environment.getPortClass()(self.environment,self,name) + return self.ports[name] + +class Patch(Node): + def __init__(self,environment,parent,name): + Node.__init__(self,environment,parent,name) + self.nodes = {} + self.patches = {} + self.poly = 0 + self.enabled = False + print "### '%s': new patch" % self.getPath() + + def remove(self): + for patch in self.getPatches(): + patch.remove() + for node in self.getNodes(): + node.remove() + Node.remove(self) + + def removeChild(self, child): + if self.hasNode(child): + del self.nodes[child] + elif self.hasPatch(child): + del self.patches[child] + else: + Node.removeChild(self,child) + + def getPatches(self): + return self.patches.values() + + def getNodes(self): + return self.nodes.values() + + def getEnabled(self): + return self.enabled + + def setEnabled(self,enabled): + if enabled != self.enabled: + print "### '%s': changing enabled from %s to %s" % (self.getPath(), str(self.enabled), str(enabled)) + enabled = self.enabled + + def getPoly(self): + return self.poly + + def setPoly(self,poly): + if poly != self.poly: + print "### '%s': changing polyphony from %i to %i" % (self.getPath(), self.poly, poly) + self.poly = poly + + def hasNode(self,name): + return self.nodes.has_key(name) + + def getNode(self,name,mustexist=False): + if not self.hasNode(name): + if mustexist: + return None + self.nodes[name] = self.environment.getNodeClass()(self.environment,self,name) + return self.nodes[name] + + def hasPatch(self,name): + return self.patches.has_key(name) + + def getPatch(self,name,mustexist=False): + if not self.hasPatch(name): + if mustexist: + return None + self.patches[name] = self.environment.getPatchClass()(self.environment,self,name) + return self.patches[name] + +class Connection: + def __init__(self,environment,srcport,dstport): + self.environment = environment + self.srcport = srcport + self.dstport = dstport + self.srcport.addConnection(self.dstport,self) + self.dstport.addConnection(self.srcport,self) + print ">>> '%s'->'%s': new connection" % (self.srcport.getPath(),self.dstport.getPath()) + + def __del__(self): + print "connection gone" + + def remove(self): + self.srcport.removeConnection(self.dstport) + self.dstport.removeConnection(self.srcport) + del self + + def getSrcPort(self): + return self.srcport + + def getDstPort(self): + return self.dstport + + def getPortPair(self): + return self.srcport, self.dstport + +class Environment: + def __init__(self): + self.omPatch = self.getPatchClass()(self,None,"") + self.enabled = False + self.connections = {} + + def getConnectionClass(self): + return Connection + + def getPatchClass(self): + return Patch + + def getNodeClass(self): + return Node + + def getPortClass(self): + return Port + + def getConnection(self,srcportpath,dstportpath,mustexist=False): + srcport = self.getPort(srcportpath,True) + if not srcport: + return None + dstport = self.getPort(dstportpath,True) + if not dstport: + return None + if not self.connections.has_key((srcport,dstport)): + if mustexist: + return None + self.connections[(srcport,dstport)] = self.getConnectionClass()(self,srcport,dstport) + return self.connections[(srcport,dstport)] + + def getConnections(self): + return self.connections.values() + + def getPatch(self,path,mustexist=False): + elements = path.split("/") + currentPatch = None + for element in elements: + if element == "": + currentPatch = self.omPatch + else: + currentPatch = currentPatch.getPatch(element,mustexist) + if not currentPatch: + break + return currentPatch + + def getNode(self,path,mustexist=False): + elements = path.split("/") + basepath = "/".join(elements[:-1]) + nodename = elements[-1] + patch = self.getPatch(basepath,True) + if patch: + return patch.getNode(nodename,mustexist) + return None + + def getPort(self,path,mustexist=False): + elements = path.split("/") + basepath = "/".join(elements[:-1]) + portname = elements[-1] + node = self.getNode(basepath,True) + if node: + return node.getPort(portname,mustexist) + patch = self.getPatch(basepath,True) + if patch: + return patch.getPort(portname,mustexist) + return None + + def getObject(self,path): + patch = self.getPatch(path,True) + if patch: + return patch + node = self.getNode(path,True) + if node: + return node + return self.getPort(path,True) + + def printPatch(self,patch=None): + if not patch: + patch = self.omPatch + print patch.getDepth()*' ' + "### " + patch.getPath() + for node in patch.getNodes(): + print node.getDepth()*' ' + "+++ " + node.getPath() + for port in node.getPorts(): + print port.getDepth()*' ' + "*** " + port.getPath() + for port in patch.getPorts(): + print port.getDepth()*' ' + "*** " + port.getPath() + for subpatch in patch.getPatches(): + self.printPatch(subpatch) + + def printConnections(self): + for connection in self.getConnections(): + print ">>> %s -> %s" % (connection.getSrcPort().getPath(), connection.getDstPort().getPath()) + + #~ /om/engine_enabled - Notification engine's DSP has been enabled. + def __ingen__engine_enabled(self): + self.enabled = True + + #~ /om/engine_disabled - Notification engine's DSP has been disabled. + def __ingen__engine_disabled(self): + self.enabled = False + + #~ /om/new_node - Notification of a new node's creation. + #~ * path (string) - Path of the new node + #~ * polyphonic (integer-boolean) - Node is polyphonic (1 for yes, 0 for no) + #~ * type (string) - Type of plugin (LADSPA, DSSI, Internal, Patch) + #~ * lib-name (string) - Name of library if a plugin (ie cmt.so) + #~ * plug-label (string) - Label of plugin in library (ie adsr_env) + + #~ * New nodes are sent as a blob. The first message in the blob will be this one (/om/new_node), followed by a series of /om/new_port commands, followed by /om/new_node_end. + def __ingen__new_node(self,path,polyphonic,plugintype,libname,pluginlabel): + node = self.getNode(path) + node.setPolyphonic(polyphonic) + node.setPluginType(plugintype) + node.setLibName(libname) + node.setPluginLabel(pluginlabel) + + def __ingen__new_node_end(self): + pass + + #~ /om/node_removal - Notification of a node's destruction. + #~ * path (string) - Path of node (which no longer exists) + def __ingen__node_removal(self,path): + node = self.getNode(path) + node.remove() + + #~ /om/new_port - Notification of a node's destruction. + + #~ * path (string) - Path of new port + #~ * type (string) - Type of port (CONTROL or AUDIO) + #~ * direction (string) - Direction of data flow (INPUT or OUTPUT) + #~ * hint (string) - Hint (INTEGER, LOGARITHMIC, TOGGLE, or NONE) + #~ * default-value (float) - Default (initial) value + #~ * min-value (float) - Suggested minimum value + #~ * min-value (float) - Suggested maximum value + + #~ * Note that in the event of loading a patch, this message could be followed immediately by a control change, meaning the default-value is not actually the current value of the port (ahem, Lachlan). + #~ * The minimum and maximum values are suggestions only, they are not enforced in any way, and going outside them is perfectly fine. Also note that the port ranges in om_gtk are not these ones! Those ranges are set as metadata. + def __ingen__new_port(self,path,porttype,direction,hint,defaultvalue,minvalue,maxvalue): + port = self.getPort(path) + port.setPortType(porttype) + port.setDirection(direction) + port.setHint(hint) + port.setDefaultValue(defaultvalue) + port.setMinValue(minvalue) + port.setMaxValue(maxvalue) + + #~ /om/port_removal - Notification of a port's destruction. + #~ * path (string) - Path of port (which no longer exists) + def __ingen__port_removal(self,path): + port = self.getPort(path) + port.remove() + + #~ /om/patch_destruction - Notification of a patch's destruction. + #~ * path (string) - Path of patch (which no longer exists) + def __ingen__patch_destruction(self,path): + patch = self.getPatch(path) + patch.remove() + + #~ /om/patch_enabled - Notification a patch's DSP processing has been enabled. + #~ * path (string) - Path of enabled patch + def __ingen__patch_enabled(self,path): + patch = self.getPatch(path) + patch.setEnabled(True) + + #~ /om/patch_disabled - Notification a patch's DSP processing has been disabled. + #~ * path (string) - Path of disabled patch + def __ingen__patch_disabled(self,path): + patch = self.getPatch(path) + patch.setEnabled(False) + + #~ /om/new_connection - Notification a new connection has been made. + #~ * src-path (string) - Path of the source port + #~ * dst-path (string) - Path of the destination port + def __ingen__new_connection(self,srcpath,dstpath): + self.getConnection(srcpath,dstpath) + + #~ /om/disconnection - Notification a connection has been unmade. + #~ * src-path (string) - Path of the source port + #~ * dst-path (string) - Path of the destination port + def __ingen__disconnection(self,srcpath,dstpath): + connection = self.getConnection(srcpath,dstpath) + portpair = connection.getPortPair() + connection.remove() + del self.connections[portpair] + + #~ /om/metadata/update - Notification of a piece of metadata. + #~ * path (string) - Path of the object associated with metadata (can be a node, patch, or port) + #~ * key (string) + #~ * value (string) + def __ingen__metadata__update(self,path,key,value): + object = self.getObject(path) + object.setMetaData(key,value) + + #~ /om/control_change - Notification the value of a port has changed + #~ * path (string) - Path of port + #~ * value (float) - New value of port + #~ * This will only send updates for values set by clients of course - not values changing because of connections to other ports! + def __ingen__control_change(self,path,value): + port = self.getPort(path) + port.setValue(value) + + #~ /om/new_patch - Notification of a new patch + #~ * path (string) - Path of new patch + #~ * poly (int) - Polyphony of new patch (not a boolean like new_node) + def __ingen__new_patch(self,path,poly): + patch = self.getPatch(path) + patch.setPoly(poly) + +class SocketError: + pass + +class Call: + pass + +class ClientProxy: + def __init__(self, om, name, is_async = False): + self.name = name + self.om = om + self.is_async = is_async + + def __call__(self, *args): + if (self.is_async): + self.om.sendMsg(self.name, *args) + return True + + result = self.om.sendMsgBlocking(self.name, *args) + if not result: + return None + if result[0] == "/om/response/ok": + return True + print "ERROR: %s" % result[1][1] + return False + + def __getattr__(self, name): + if (name[:2] == "__") and (name[-2:] == "__"): # special function + raise AttributeError, name + if name in self.__dict__: + raise AttributeError, name + if name == 'async': + return ClientProxy(self.om, self.name, True) + else: + return ClientProxy(self.om, self.name + '/' + name) + +class Client(DatagramProtocol, ClientProxy): + def __init__(self): + ClientProxy.__init__(self, self, "/om") + + def startProtocol(self): + self.transport.connect("127.0.0.1", 16180) + host = self.transport.getHost() + self.host = host.host + self.port = host.port + self.environment = None + self.handlers = {} + self.calls = {} + #print "opened port at %s" % (str((self.host,self.port))) + self.nextPacketNumber = 1 + + def setEnvironment(self, environment): + self.handlers = {} + self.environment = environment + for name in dir(self.environment): + element = getattr(self.environment,name) + if (type(element).__name__ == 'instancemethod') and (element.__name__[:6] == "__ingen__"): + handlername = element.__name__.replace("__","/") + print "registering handler for '%s'" % handlername + self.handlers[handlername] = element + + def getEnvironment(self): + return self.environment + + def connectionRefused(self): + print "Noone listening, aborting." + os._exit(-1) + + def messageReceived(self, (msg, args)): + if msg == "/om/error": + print "ERROR: %r" % args + return + if msg == "/om/response/ok": + omcall = self.calls[args[0]] + omcall.result = (msg,args) + omcall.done = True + return + if msg == "/om/response/error": + omcall = self.calls[args[0]] + omcall.result = (msg,args) + omcall.done = True + return + if msg == "#bundle": + for arg in args: + self.messageReceived(arg) + return + if self.handlers.has_key(msg): + try: + self.handlers[msg](*args) + except: + a,b,c = sys.exc_info() + sys.excepthook(a,b,c) + print "with '%s'" % repr((msg,args)) + return + print "no handler for '%s'" % repr((msg,args)) + + def datagramReceived(self, data, (host, port)): + self.messageReceived(decodeOSC(data)) + + def getPacketNumber(self): + packetNumber = self.nextPacketNumber + self.nextPacketNumber = (self.nextPacketNumber + 1) + return packetNumber + + def sendMsg(self,msg,*args): + packetNumber = self.getPacketNumber() + print "Sending %r (#%i)..." % (msg,packetNumber) + omcall = Call() + omcall.result = None + omcall.done = False + self.calls[packetNumber] = omcall + message = OSCMessage() + message.setAddress(msg) + message.append(packetNumber) + for arg in args: + message.append(arg) + self.transport.write(message.getBinary()) + time.sleep(0.01) + return True + + def sendMsgBlocking(self,msg,*args): + packetNumber = self.getPacketNumber() + print "Sending %r (#%i)..." % (msg,packetNumber) + omcall = Call() + omcall.result = None + omcall.done = False + self.calls[packetNumber] = omcall + message = OSCMessage() + message.setAddress(msg) + message.append(packetNumber) + for arg in args: + message.append(arg) + self.transport.write(message.getBinary()) + now = time.time() + while not omcall.done: + time.sleep(INGEN_CALL_POLLTIME) + distance = time.time() - now + if distance > INGEN_CALL_TIMEOUT: + print "timeout" + break + del self.calls[packetNumber] + return omcall.result + + def getAddressAsString(self): + return "osc.udp://%s:%d" % (self.host, self.port) + + + +def startClient(func): + om = Client() + reactor.listenUDP(0, om) + thread.start_new_thread(func,(om,)) + reactor.run() diff --git a/src/progs/python/ingenecho.py b/src/progs/python/ingenecho.py new file mode 100644 index 00000000..7ed2cef5 --- /dev/null +++ b/src/progs/python/ingenecho.py @@ -0,0 +1,40 @@ +#!/usr/bin/python +# +# Python bindings for Om +# Copyright (C) 2005 Leonard Ritter +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +import omsynth +import os,time,sys + +def main(om): + om.setEnvironment(omsynth.Environment()) + om.engine.activate() + om.engine.register_client(om.getAddressAsString()) + om.request.all_objects(om.getAddressAsString()) + + om.request.all_objects() + time.sleep(3) + om.getEnvironment().printPatch() + om.getEnvironment().printConnections() + print "omecho will now monitor and mirror changes in the structure" + print "hit return to exit when youre done" + sys.stdin.readline() + om.engine.unregister_client(om.getAddressAsString()) + os._exit(0) + +if __name__ == "__main__": + omsynth.startClient(main) diff --git a/src/progs/python/omecho.py b/src/progs/python/omecho.py deleted file mode 100644 index c0d2d3b1..00000000 --- a/src/progs/python/omecho.py +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/python -# -# Python bindings for Om -# Copyright (C) 2005 Leonard Ritter -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -import omsynth -import os,time,sys - -def main(om): - om.setEnvironment(omsynth.Environment()) - om.engine.activate() - om.engine.register_client(om.getAddressAsString()) - om.request.all_objects(om.getAddressAsString()) - - om.request.all_objects() - time.sleep(3) - om.getEnvironment().printPatch() - om.getEnvironment().printConnections() - print "omecho will now monitor and mirror changes in the structure" - print "hit return to exit when youre done" - sys.stdin.readline() - om.engine.unregister_client(om.getAddressAsString()) - os._exit(0) - -if __name__ == "__main__": - omsynth.startClient(main) diff --git a/src/progs/python/omsynth.py b/src/progs/python/omsynth.py deleted file mode 100644 index d7cfa5ab..00000000 --- a/src/progs/python/omsynth.py +++ /dev/null @@ -1,635 +0,0 @@ -#!/usr/bin/python -# -# Python bindings for Om -# Copyright (C) 2005 Leonard Ritter -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -import os,sys,thread,time - -from OSC import OSCMessage, decodeOSC - -from twisted.internet.protocol import DatagramProtocol -from twisted.internet import reactor - -OM_CALL_TIMEOUT = 5 -OM_CALL_POLLTIME = 0.1 - -class TreeElement: - def __init__(self,environment,parent,name): - self.environment = environment - self.parent = parent - self.name = name - self.metadata = {} - - def __del__(self): - print "'%s': gone" % self.name - - def removeChild(self, child): - pass - - def remove(self): - self.parent.removeChild(self.name) - self.parent = None - del self - - def getParent(self): - return self.parent - - def getName(self): - return self.name - - def getPath(self): - if self.parent: - return self.parent.getPath() + "/" + self.name - else: - return self.name - - def getDepth(self): - if self.parent: - return self.parent.getDepth() + 1 - else: - return 0 - - def setMetaData(self,key,value): - if (not self.metadata.has_key(value)) or (self.metadata[key] != value): - print "||| '%s': '%s' = '%s'" % (self.getPath(), key, value) - self.metadata[key] = value - -class Port(TreeElement): - def __init__(self,environment,parent,name): - TreeElement.__init__(self,environment,parent,name) - self.porttype = "" - self.direction = "" - self.hint = "" - self.defaultvalue = 0.0 - self.minvalue = 0.0 - self.maxvalue = 0.0 - self.value = 0.0 - self.connections = {} - print "*** '%s': new port" % self.getPath() - - def remove(self): - for connection in self.getConnections(): - connection.remove() - TreeElement.remove(self) - - def getConnections(self): - return self.connections - - def addConnection(self,target,connection): - self.connections[target] = connection - - def removeConnection(self,target): - del self.connections[target] - - def setPortType(self,porttype): - if self.porttype != porttype: - print "*** '%s': changing porttype from '%s' to '%s'" % (self.getPath(), self.porttype, porttype) - self.porttype = porttype - - def setDirection(self,direction): - if self.direction != direction: - print "*** '%s': changing direction from '%s' to '%s'" % (self.getPath(), self.direction, direction) - self.direction = direction - - def setHint(self,hint): - if self.hint != hint: - print "*** '%s': changing hint from '%s' to '%s'" % (self.getPath(), self.hint, hint) - self.hint = hint - - def setDefaultValue(self,defaultvalue): - if self.defaultvalue != defaultvalue: - print "*** '%s': changing defaultvalue from '%.3f' to '%.3f'" % (self.getPath(), self.defaultvalue, defaultvalue) - self.defaultvalue = defaultvalue - - def setMinValue(self,minvalue): - if self.minvalue != minvalue: - print "*** '%s': changing minvalue from '%.3f' to '%.3f'" % (self.getPath(), self.minvalue, minvalue) - self.minvalue = minvalue - - def setMaxValue(self,maxvalue): - if self.maxvalue != maxvalue: - print "*** '%s': changing maxvalue from '%.3f' to '%.3f'" % (self.getPath(), self.maxvalue, maxvalue) - self.maxvalue = maxvalue - - def setValue(self,value): - if self.value != value: - print "*** '%s': changing value from '%.3f' to '%.3f'" % (self.getPath(), self.value, value) - self.value = value - -class Node(TreeElement): - def __init__(self,environment,parent,name): - TreeElement.__init__(self,environment,parent,name) - self.ports = {} - self.polyphonic = 0 - self.plugintype = "" - self.libname = "" - self.pluginlabel = "" - print "+++ '%s': new node" % self.getPath() - - def remove(self): - for port in self.getPorts(): - port.remove() - TreeElement.remove(self) - - def removeChild(self, child): - del self.ports[child] - - def getPorts(self): - return self.ports.values() - - def setPluginLabel(self,pluginlabel): - if pluginlabel != self.pluginlabel: - print "+++ '%s': changing pluginlabel from '%s' to '%s'" % (self.getPath(), self.pluginlabel, pluginlabel) - self.pluginlabel = pluginlabel - - def setLibName(self,libname): - if libname != self.libname: - print "+++ '%s': changing libname from '%s' to '%s'" % (self.getPath(), self.libname, libname) - self.libname = libname - - def setPluginType(self,plugintype): - if plugintype != self.plugintype: - print "+++ '%s': changing plugintype from '%s' to '%s'" % (self.getPath(), self.plugintype, plugintype) - self.plugintype = plugintype - - def setPolyphonic(self,polyphonic): - if polyphonic != self.polyphonic: - print "+++ '%s': changing polyphony from %i to %i" % (self.getPath(), self.polyphonic, polyphonic) - self.polyphonic = polyphonic - - def hasPort(self,name): - return self.ports.has_key(name) - - def getPort(self,name,mustexist=False): - if not self.hasPort(name): - if mustexist: - return None - self.ports[name] = self.environment.getPortClass()(self.environment,self,name) - return self.ports[name] - -class Patch(Node): - def __init__(self,environment,parent,name): - Node.__init__(self,environment,parent,name) - self.nodes = {} - self.patches = {} - self.poly = 0 - self.enabled = False - print "### '%s': new patch" % self.getPath() - - def remove(self): - for patch in self.getPatches(): - patch.remove() - for node in self.getNodes(): - node.remove() - Node.remove(self) - - def removeChild(self, child): - if self.hasNode(child): - del self.nodes[child] - elif self.hasPatch(child): - del self.patches[child] - else: - Node.removeChild(self,child) - - def getPatches(self): - return self.patches.values() - - def getNodes(self): - return self.nodes.values() - - def getEnabled(self): - return self.enabled - - def setEnabled(self,enabled): - if enabled != self.enabled: - print "### '%s': changing enabled from %s to %s" % (self.getPath(), str(self.enabled), str(enabled)) - enabled = self.enabled - - def getPoly(self): - return self.poly - - def setPoly(self,poly): - if poly != self.poly: - print "### '%s': changing polyphony from %i to %i" % (self.getPath(), self.poly, poly) - self.poly = poly - - def hasNode(self,name): - return self.nodes.has_key(name) - - def getNode(self,name,mustexist=False): - if not self.hasNode(name): - if mustexist: - return None - self.nodes[name] = self.environment.getNodeClass()(self.environment,self,name) - return self.nodes[name] - - def hasPatch(self,name): - return self.patches.has_key(name) - - def getPatch(self,name,mustexist=False): - if not self.hasPatch(name): - if mustexist: - return None - self.patches[name] = self.environment.getPatchClass()(self.environment,self,name) - return self.patches[name] - -class Connection: - def __init__(self,environment,srcport,dstport): - self.environment = environment - self.srcport = srcport - self.dstport = dstport - self.srcport.addConnection(self.dstport,self) - self.dstport.addConnection(self.srcport,self) - print ">>> '%s'->'%s': new connection" % (self.srcport.getPath(),self.dstport.getPath()) - - def __del__(self): - print "connection gone" - - def remove(self): - self.srcport.removeConnection(self.dstport) - self.dstport.removeConnection(self.srcport) - del self - - def getSrcPort(self): - return self.srcport - - def getDstPort(self): - return self.dstport - - def getPortPair(self): - return self.srcport, self.dstport - -class Environment: - def __init__(self): - self.omPatch = self.getPatchClass()(self,None,"") - self.enabled = False - self.connections = {} - - def getConnectionClass(self): - return Connection - - def getPatchClass(self): - return Patch - - def getNodeClass(self): - return Node - - def getPortClass(self): - return Port - - def getConnection(self,srcportpath,dstportpath,mustexist=False): - srcport = self.getPort(srcportpath,True) - if not srcport: - return None - dstport = self.getPort(dstportpath,True) - if not dstport: - return None - if not self.connections.has_key((srcport,dstport)): - if mustexist: - return None - self.connections[(srcport,dstport)] = self.getConnectionClass()(self,srcport,dstport) - return self.connections[(srcport,dstport)] - - def getConnections(self): - return self.connections.values() - - def getPatch(self,path,mustexist=False): - elements = path.split("/") - currentPatch = None - for element in elements: - if element == "": - currentPatch = self.omPatch - else: - currentPatch = currentPatch.getPatch(element,mustexist) - if not currentPatch: - break - return currentPatch - - def getNode(self,path,mustexist=False): - elements = path.split("/") - basepath = "/".join(elements[:-1]) - nodename = elements[-1] - patch = self.getPatch(basepath,True) - if patch: - return patch.getNode(nodename,mustexist) - return None - - def getPort(self,path,mustexist=False): - elements = path.split("/") - basepath = "/".join(elements[:-1]) - portname = elements[-1] - node = self.getNode(basepath,True) - if node: - return node.getPort(portname,mustexist) - patch = self.getPatch(basepath,True) - if patch: - return patch.getPort(portname,mustexist) - return None - - def getObject(self,path): - patch = self.getPatch(path,True) - if patch: - return patch - node = self.getNode(path,True) - if node: - return node - return self.getPort(path,True) - - def printPatch(self,patch=None): - if not patch: - patch = self.omPatch - print patch.getDepth()*' ' + "### " + patch.getPath() - for node in patch.getNodes(): - print node.getDepth()*' ' + "+++ " + node.getPath() - for port in node.getPorts(): - print port.getDepth()*' ' + "*** " + port.getPath() - for port in patch.getPorts(): - print port.getDepth()*' ' + "*** " + port.getPath() - for subpatch in patch.getPatches(): - self.printPatch(subpatch) - - def printConnections(self): - for connection in self.getConnections(): - print ">>> %s -> %s" % (connection.getSrcPort().getPath(), connection.getDstPort().getPath()) - - #~ /om/engine_enabled - Notification engine's DSP has been enabled. - def __om__engine_enabled(self): - self.enabled = True - - #~ /om/engine_disabled - Notification engine's DSP has been disabled. - def __om__engine_disabled(self): - self.enabled = False - - #~ /om/new_node - Notification of a new node's creation. - #~ * path (string) - Path of the new node - #~ * polyphonic (integer-boolean) - Node is polyphonic (1 for yes, 0 for no) - #~ * type (string) - Type of plugin (LADSPA, DSSI, Internal, Patch) - #~ * lib-name (string) - Name of library if a plugin (ie cmt.so) - #~ * plug-label (string) - Label of plugin in library (ie adsr_env) - - #~ * New nodes are sent as a blob. The first message in the blob will be this one (/om/new_node), followed by a series of /om/new_port commands, followed by /om/new_node_end. - def __om__new_node(self,path,polyphonic,plugintype,libname,pluginlabel): - node = self.getNode(path) - node.setPolyphonic(polyphonic) - node.setPluginType(plugintype) - node.setLibName(libname) - node.setPluginLabel(pluginlabel) - - def __om__new_node_end(self): - pass - - #~ /om/node_removal - Notification of a node's destruction. - #~ * path (string) - Path of node (which no longer exists) - def __om__node_removal(self,path): - node = self.getNode(path) - node.remove() - - #~ /om/new_port - Notification of a node's destruction. - - #~ * path (string) - Path of new port - #~ * type (string) - Type of port (CONTROL or AUDIO) - #~ * direction (string) - Direction of data flow (INPUT or OUTPUT) - #~ * hint (string) - Hint (INTEGER, LOGARITHMIC, TOGGLE, or NONE) - #~ * default-value (float) - Default (initial) value - #~ * min-value (float) - Suggested minimum value - #~ * min-value (float) - Suggested maximum value - - #~ * Note that in the event of loading a patch, this message could be followed immediately by a control change, meaning the default-value is not actually the current value of the port (ahem, Lachlan). - #~ * The minimum and maximum values are suggestions only, they are not enforced in any way, and going outside them is perfectly fine. Also note that the port ranges in om_gtk are not these ones! Those ranges are set as metadata. - def __om__new_port(self,path,porttype,direction,hint,defaultvalue,minvalue,maxvalue): - port = self.getPort(path) - port.setPortType(porttype) - port.setDirection(direction) - port.setHint(hint) - port.setDefaultValue(defaultvalue) - port.setMinValue(minvalue) - port.setMaxValue(maxvalue) - - #~ /om/port_removal - Notification of a port's destruction. - #~ * path (string) - Path of port (which no longer exists) - def __om__port_removal(self,path): - port = self.getPort(path) - port.remove() - - #~ /om/patch_destruction - Notification of a patch's destruction. - #~ * path (string) - Path of patch (which no longer exists) - def __om__patch_destruction(self,path): - patch = self.getPatch(path) - patch.remove() - - #~ /om/patch_enabled - Notification a patch's DSP processing has been enabled. - #~ * path (string) - Path of enabled patch - def __om__patch_enabled(self,path): - patch = self.getPatch(path) - patch.setEnabled(True) - - #~ /om/patch_disabled - Notification a patch's DSP processing has been disabled. - #~ * path (string) - Path of disabled patch - def __om__patch_disabled(self,path): - patch = self.getPatch(path) - patch.setEnabled(False) - - #~ /om/new_connection - Notification a new connection has been made. - #~ * src-path (string) - Path of the source port - #~ * dst-path (string) - Path of the destination port - def __om__new_connection(self,srcpath,dstpath): - self.getConnection(srcpath,dstpath) - - #~ /om/disconnection - Notification a connection has been unmade. - #~ * src-path (string) - Path of the source port - #~ * dst-path (string) - Path of the destination port - def __om__disconnection(self,srcpath,dstpath): - connection = self.getConnection(srcpath,dstpath) - portpair = connection.getPortPair() - connection.remove() - del self.connections[portpair] - - #~ /om/metadata/update - Notification of a piece of metadata. - #~ * path (string) - Path of the object associated with metadata (can be a node, patch, or port) - #~ * key (string) - #~ * value (string) - def __om__metadata__update(self,path,key,value): - object = self.getObject(path) - object.setMetaData(key,value) - - #~ /om/control_change - Notification the value of a port has changed - #~ * path (string) - Path of port - #~ * value (float) - New value of port - #~ * This will only send updates for values set by clients of course - not values changing because of connections to other ports! - def __om__control_change(self,path,value): - port = self.getPort(path) - port.setValue(value) - - #~ /om/new_patch - Notification of a new patch - #~ * path (string) - Path of new patch - #~ * poly (int) - Polyphony of new patch (not a boolean like new_node) - def __om__new_patch(self,path,poly): - patch = self.getPatch(path) - patch.setPoly(poly) - -class SocketError: - pass - -class Call: - pass - -class ClientProxy: - def __init__(self, om, name, is_async = False): - self.name = name - self.om = om - self.is_async = is_async - - def __call__(self, *args): - if (self.is_async): - self.om.sendMsg(self.name, *args) - return True - - result = self.om.sendMsgBlocking(self.name, *args) - if not result: - return None - if result[0] == "/om/response/ok": - return True - print "ERROR: %s" % result[1][1] - return False - - def __getattr__(self, name): - if (name[:2] == "__") and (name[-2:] == "__"): # special function - raise AttributeError, name - if name in self.__dict__: - raise AttributeError, name - if name == 'async': - return ClientProxy(self.om, self.name, True) - else: - return ClientProxy(self.om, self.name + '/' + name) - -class Client(DatagramProtocol, ClientProxy): - def __init__(self): - ClientProxy.__init__(self, self, "/om") - - def startProtocol(self): - self.transport.connect("127.0.0.1", 16180) - host = self.transport.getHost() - self.host = host.host - self.port = host.port - self.environment = None - self.handlers = {} - self.calls = {} - #print "opened port at %s" % (str((self.host,self.port))) - self.nextPacketNumber = 1 - - def setEnvironment(self, environment): - self.handlers = {} - self.environment = environment - for name in dir(self.environment): - element = getattr(self.environment,name) - if (type(element).__name__ == 'instancemethod') and (element.__name__[:6] == "__om__"): - handlername = element.__name__.replace("__","/") - print "registering handler for '%s'" % handlername - self.handlers[handlername] = element - - def getEnvironment(self): - return self.environment - - def connectionRefused(self): - print "Noone listening, aborting." - os._exit(-1) - - def messageReceived(self, (msg, args)): - if msg == "/om/error": - print "ERROR: %r" % args - return - if msg == "/om/response/ok": - omcall = self.calls[args[0]] - omcall.result = (msg,args) - omcall.done = True - return - if msg == "/om/response/error": - omcall = self.calls[args[0]] - omcall.result = (msg,args) - omcall.done = True - return - if msg == "#bundle": - for arg in args: - self.messageReceived(arg) - return - if self.handlers.has_key(msg): - try: - self.handlers[msg](*args) - except: - a,b,c = sys.exc_info() - sys.excepthook(a,b,c) - print "with '%s'" % repr((msg,args)) - return - print "no handler for '%s'" % repr((msg,args)) - - def datagramReceived(self, data, (host, port)): - self.messageReceived(decodeOSC(data)) - - def getPacketNumber(self): - packetNumber = self.nextPacketNumber - self.nextPacketNumber = (self.nextPacketNumber + 1) - return packetNumber - - def sendMsg(self,msg,*args): - packetNumber = self.getPacketNumber() - print "Sending %r (#%i)..." % (msg,packetNumber) - omcall = Call() - omcall.result = None - omcall.done = False - self.calls[packetNumber] = omcall - message = OSCMessage() - message.setAddress(msg) - message.append(packetNumber) - for arg in args: - message.append(arg) - self.transport.write(message.getBinary()) - time.sleep(0.01) - return True - - def sendMsgBlocking(self,msg,*args): - packetNumber = self.getPacketNumber() - print "Sending %r (#%i)..." % (msg,packetNumber) - omcall = Call() - omcall.result = None - omcall.done = False - self.calls[packetNumber] = omcall - message = OSCMessage() - message.setAddress(msg) - message.append(packetNumber) - for arg in args: - message.append(arg) - self.transport.write(message.getBinary()) - now = time.time() - while not omcall.done: - time.sleep(OM_CALL_POLLTIME) - distance = time.time() - now - if distance > OM_CALL_TIMEOUT: - print "timeout" - break - del self.calls[packetNumber] - return omcall.result - - def getAddressAsString(self): - return "osc.udp://%s:%d" % (self.host, self.port) - - - -def startClient(func): - om = Client() - reactor.listenUDP(0, om) - thread.start_new_thread(func,(om,)) - reactor.run() diff --git a/src/progs/python/scripts/flatten.py b/src/progs/python/scripts/flatten.py index eaf8084d..530e4291 100755 --- a/src/progs/python/scripts/flatten.py +++ b/src/progs/python/scripts/flatten.py @@ -2,7 +2,7 @@ ############################################################################### # -# flatten.py - a python script that merges all subpatches in an Om patch +# flatten.py - a python script that merges all subpatches in an Ingen patch # into the parent patch # # Copyright (C) 2005 Lars Luthman @@ -19,11 +19,11 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################### -import omsynth +import ingen import os,time,sys @@ -200,7 +200,7 @@ def flatten(om, patch): def main(om): - om.setEnvironment(omsynth.Environment()) + om.setEnvironment(ingen.Environment()) om.engine.activate.async() om.engine.load_plugins.async() om.request.all_objects(om.getAddressAsString()) @@ -225,7 +225,7 @@ if len(sys.argv) > 1: print "%p"; os._exit(0) else: - omsynth.startClient(main) + ingen.startClient(main) else: print "Which patch do you want to flatten?" diff --git a/src/progs/python/scripts/sillysinepatch.py b/src/progs/python/scripts/sillysinepatch.py index ac51a080..dcb37a97 100644 --- a/src/progs/python/scripts/sillysinepatch.py +++ b/src/progs/python/scripts/sillysinepatch.py @@ -15,13 +15,13 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -import omsynth +import ingen import os,time,sys def main(om): - om.setEnvironment(omsynth.Environment()) + om.setEnvironment(ingen.Environment()) om.engine.activate() om.engine.load_plugins() om.engine.register_client(om.getAddressAsString()) @@ -38,4 +38,4 @@ def main(om): os._exit(0) if __name__ == "__main__": - omsynth.startClient(main) + ingen.startClient(main) diff --git a/src/progs/server/Makefile.am b/src/progs/server/Makefile.am new file mode 100644 index 00000000..9ba20719 --- /dev/null +++ b/src/progs/server/Makefile.am @@ -0,0 +1,43 @@ +AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/engine -I$(top_srcdir)/src/libs/engine/events -fno-exceptions -fno-rtti + +MAINTAINERCLEANFILES = Makefile.in + +# +# Stand-alone engine +# +if BUILD_ENGINE + +bin_PROGRAMS = ingen +om_DEPENDENCIES = ../../libs/engine/libingen.la +om_LDADD = @JACK_LIBS@ @LOSC_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @SLV2_LIBS@ -lrt ../../libs/engine/libingen.la + +om_SOURCES = \ + main.cpp \ + cmdline.h \ + cmdline.c + +endif # BUILD_ENGINE + + +## +## Jack internal client +## +#if BUILD_IN_PROCESS_ENGINE +# +# +## FIXME: broken +# +# +## FIXME: Figure out how to get this properly +#omdir = $(prefix)/lib/jack +# +#om_la_CFLAGS = -fPIC +#om_LTLIBRARIES = om.la +#om_la_LDFLAGS = -module -avoid-version @JACK_LIBS@ @LOSC_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @SLV2_LIBS@ +#om_la_SOURCES = OmInProcess.cpp +# +#endif # BUILD_IN_PROCESS_ENGINE + + + + diff --git a/src/progs/server/cmdline.c b/src/progs/server/cmdline.c new file mode 100644 index 00000000..6b7ddf6a --- /dev/null +++ b/src/progs/server/cmdline.c @@ -0,0 +1,150 @@ +/* + File autogenerated by gengetopt version 2.10 + generated with the following command: + gengetopt + + The developers of gengetopt consider the fixed text that goes in all + gengetopt output files to be in the public domain: + we make no copyright claims on it. +*/ + + +#include +#include +#include + +/* If we use autoconf. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "getopt.h" + +#include "cmdline.h" + +void +cmdline_parser_print_version (void) +{ + printf ("%s %s\n", CMDLINE_PARSER_PACKAGE, CMDLINE_PARSER_VERSION); +} + +void +cmdline_parser_print_help (void) +{ + cmdline_parser_print_version (); + printf("\n" + "Usage: %s [OPTIONS]...\n", CMDLINE_PARSER_PACKAGE); + printf(" -h --help Print help and exit\n"); + printf(" -V --version Print version and exit\n"); + printf(" -pSTRING --port=STRING OSC port to listen on (default='16180')\n"); + printf(" -i --in-jackd Run engine as in-process JACK client (default=off)\n"); +} + + +static char *gengetopt_strdup (const char *s); + +/* gengetopt_strdup() */ +/* strdup.c replacement of strdup, which is not standard */ +char * +gengetopt_strdup (const char *s) +{ + char *result = (char*)malloc(strlen(s) + 1); + if (result == (char*)0) + return (char*)0; + strcpy(result, s); + return result; +} + +int +cmdline_parser (int argc, char * const *argv, struct gengetopt_args_info *args_info) +{ + int c; /* Character of the parsed option. */ + int missing_required_options = 0; + + args_info->help_given = 0 ; + args_info->version_given = 0 ; + args_info->port_given = 0 ; + args_info->in_jackd_given = 0 ; +#define clear_args() { \ + args_info->port_arg = gengetopt_strdup("16180") ;\ + args_info->in_jackd_flag = 0;\ +} + + clear_args(); + + optarg = 0; + optind = 1; + opterr = 1; + optopt = '?'; + + while (1) + { + int option_index = 0; + char *stop_char; + + static struct option long_options[] = { + { "help", 0, NULL, 'h' }, + { "version", 0, NULL, 'V' }, + { "port", 1, NULL, 'p' }, + { "in-jackd", 0, NULL, 'i' }, + { NULL, 0, NULL, 0 } + }; + + stop_char = 0; + c = getopt_long (argc, argv, "hVp:i", long_options, &option_index); + + if (c == -1) break; /* Exit from `while (1)' loop. */ + + switch (c) + { + case 'h': /* Print help and exit. */ + clear_args (); + cmdline_parser_print_help (); + exit (EXIT_SUCCESS); + + case 'V': /* Print version and exit. */ + clear_args (); + cmdline_parser_print_version (); + exit (EXIT_SUCCESS); + + case 'p': /* OSC port to listen on. */ + if (args_info->port_given) + { + fprintf (stderr, "%s: `--port' (`-p') option given more than once\n", CMDLINE_PARSER_PACKAGE); + clear_args (); + exit (EXIT_FAILURE); + } + args_info->port_given = 1; + args_info->port_arg = gengetopt_strdup (optarg); + break; + + case 'i': /* Run engine as in-process JACK client. */ + if (args_info->in_jackd_given) + { + fprintf (stderr, "%s: `--in-jackd' (`-i') option given more than once\n", CMDLINE_PARSER_PACKAGE); + clear_args (); + exit (EXIT_FAILURE); + } + args_info->in_jackd_given = 1; + args_info->in_jackd_flag = !(args_info->in_jackd_flag); + break; + + + case 0: /* Long option with no short option */ + + case '?': /* Invalid option. */ + /* `getopt_long' already printed an error message. */ + exit (EXIT_FAILURE); + + default: /* bug: option not considered. */ + fprintf (stderr, "%s: option unknown: %c\n", CMDLINE_PARSER_PACKAGE, c); + abort (); + } /* switch */ + } /* while */ + + + if ( missing_required_options ) + exit (EXIT_FAILURE); + + return 0; +} diff --git a/src/progs/server/cmdline.ggo b/src/progs/server/cmdline.ggo new file mode 100644 index 00000000..8c006ca7 --- /dev/null +++ b/src/progs/server/cmdline.ggo @@ -0,0 +1,7 @@ +# Process this file with gengetopt -u to generate the necessary code (in cmdline.h, cmdline.c) + +package "Om - An OSC controlled realtime modular synthesizer" + +option "port" p "OSC port to listen on" string default="16180" no +option "in-jackd" i "Run engine as in-process JACK client" flag off + diff --git a/src/progs/server/cmdline.h b/src/progs/server/cmdline.h new file mode 100644 index 00000000..fe36a969 --- /dev/null +++ b/src/progs/server/cmdline.h @@ -0,0 +1,45 @@ +/* cmdline.h */ + +/* File autogenerated by gengetopt version 2.10 */ + +#ifndef CMDLINE_H +#define CMDLINE_H + +/* If we use autoconf. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#ifndef CMDLINE_PARSER_PACKAGE +#define CMDLINE_PARSER_PACKAGE "Om - An OSC controlled realtime modular synthesizer" +#endif + +#ifndef CMDLINE_PARSER_VERSION +#define CMDLINE_PARSER_VERSION VERSION +#endif + +struct gengetopt_args_info +{ + char * port_arg; /* OSC port to listen on (default='16180'). */ + int in_jackd_flag; /* Run engine as in-process JACK client (default=off). */ + + int help_given ; /* Whether help was given. */ + int version_given ; /* Whether version was given. */ + int port_given ; /* Whether port was given. */ + int in_jackd_given ; /* Whether in-jackd was given. */ + +} ; + +int cmdline_parser (int argc, char * const *argv, struct gengetopt_args_info *args_info); + +void cmdline_parser_print_help(void); +void cmdline_parser_print_version(void); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ +#endif /* CMDLINE_H */ diff --git a/src/progs/server/main.cpp b/src/progs/server/main.cpp new file mode 100644 index 00000000..e1fe9d6a --- /dev/null +++ b/src/progs/server/main.cpp @@ -0,0 +1,153 @@ +/* This file is part of Om. Copyright (C) 2006 Dave Robillard. + * + * Om is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Om is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include +#include +#include "config.h" +#include "util.h" +#include "cmdline.h" +#include "Om.h" +#include "OmApp.h" +#ifdef HAVE_LASH +#include "LashDriver.h" +#endif +#ifdef BUILD_IN_PROCESS_ENGINE +#include +#include +#endif + +using std::cout; using std::endl; using std::cerr; + + +void +catch_int(int) +{ + signal(SIGINT, catch_int); + signal(SIGTERM, catch_int); + + std::cout << "[Main] Om interrupted." << std::endl; + Om::om->quit(); +} + + +#ifdef BUILD_IN_PROCESS_ENGINE + +jack_client_t* jack_client; +jack_intclient_t jack_intclient; + + +void +unload_in_process_engine(int) +{ + jack_status_t status; + int ret = EXIT_SUCCESS; + + cout << "Unloading..."; + status = jack_internal_client_unload(jack_client, jack_intclient); + if (status & JackFailure) { + cout << "failed" << endl; + ret = EXIT_FAILURE; + } else { + cout << "done" << endl; + } + jack_client_close(jack_client); + exit(ret); +} + + +int +load_in_process_engine(const char* port) +{ + int ret = EXIT_SUCCESS; + + jack_status_t status; + + if ((jack_client = jack_client_open("om_load", JackNoStartServer, + &status)) != NULL) { + jack_intclient = + jack_internal_client_load(jack_client, "Om", + (jack_options_t)(JackLoadName|JackLoadInit), + &status, "om", port); + if (status == 0) { + cout << "Engine loaded" << endl; + signal(SIGINT, unload_in_process_engine); + signal(SIGTERM, unload_in_process_engine); + + while (1) { + sleep(1); + } + } else if (status & JackFailure) { + cerr << "Could not load om.so" << endl; + ret = EXIT_FAILURE; + } + + jack_client_close(jack_client); + } else { + cerr << "jack_client_open failed" << endl; + ret = EXIT_FAILURE; + } +} + +#endif // BUILD_IN_PROCESS_ENGINE + + +int +main(int argc, char** argv) +{ +#ifdef HAVE_LASH + lash_args_t* lash_args = lash_extract_args(&argc, &argv); +#endif + + int ret = EXIT_SUCCESS; + + /* Parse command line options */ + gengetopt_args_info args_info; + if (cmdline_parser (argc, argv, &args_info) != 0) + return EXIT_FAILURE; + + + if (args_info.in_jackd_flag) { +#ifdef BUILD_IN_PROCESS_ENGINE + ret = load_in_process_engine(args_info.port_arg); +#else + cerr << "In-process Jack client support not enabled in this build." << endl; + ret = EXIT_FAILURE; +#endif // JACK_IN_PROCESS_ENGINE + } else { + signal(SIGINT, catch_int); + signal(SIGTERM, catch_int); + + Om::set_denormal_flags(); + + Om::om = new Om::OmApp(args_info.port_arg); + +#ifdef HAVE_LASH + Om::lash_driver = new Om::LashDriver(Om::om, lash_args); +#endif + + Om::om->main(); + +#ifdef HAVE_LASH + delete Om::lash_driver; +#endif + + delete Om::om; + } + + return ret; +} + diff --git a/src/progs/supercollider/Ingen.sc b/src/progs/supercollider/Ingen.sc new file mode 100644 index 00000000..cb366d58 --- /dev/null +++ b/src/progs/supercollider/Ingen.sc @@ -0,0 +1,746 @@ +// TODO: +// * Keep track of established connections. +Om : Model { + classvar <>program = "om", <>patchLoader = "om_patch_loader"; + classvar <>oscURL, uiClass; + var loadIntoJack = true; + var allocator, requestResponders, requestHandlers, notificationResponders; + var creatingNode, newNodeEnd; + var OmInternalNode, + \LADSPA -> OmLADSPANode, + \DSSI -> OmDSSINode + ]; + uiClass = OmEmacsUI + } + *new { | netaddr | + ^super.new.init(netaddr) + } + gui { ^uiClass.new(this) } + init { |netaddr| + addr = netaddr ? NetAddr("127.0.0.1", 16180); + onNewPatch = IdentityDictionary.new; + allocator = StackNumberAllocator(0,1024); + requestHandlers = IdentityDictionary.new; + requestResponders = [ + "response/ok" -> {|id| + requestHandlers.removeAt(id).value; allocator.free(id) }, + "response/error" -> {|id,text| + requestHandlers.removeAt(id); + allocator.free(id); + ("Om"+text).error } + ].collect({|a| + var func = a.value; + OSCresponder(addr, "/om/"++a.key, {|time,resp,msg| + func.value(*msg[1..]) + }) + }); + notificationResponders = [ + "new_patch" -> {|path,poly| + var func = onNewPatch.removeAt(path); + if (func.notNil) { + func.value(this.getPatch(path,false).prSetPoly(poly)) + } + }, + "metadata/update" -> {|path,key,value| + this.getObject(path).metadata.prSetMetadata(key, value) }, + "new_node" -> {|path,poly,type,lib,label| + var patchPath, nodeName, patch, node; + var lastSlash = path.asString.inject(nil,{|last,char,i| + if(char==$/,i,last) + }); + if (lastSlash.notNil) { + patchPath = path.asString.copyFromStart(lastSlash-1); + nodeName = path.asString.copyToEnd(lastSlash+1); + patch = this.getPatch(patchPath); + if (patch.notNil) { + if (patch.hasNode(nodeName).not) { + node = nodeTypeMap[type].new + (nodeName, patch, poly, label, lib); + creatingNode = node; + patch.nodes[nodeName.asSymbol] = node; + patch.changed(\newNode, node); + } { + if (patch.getNode(nodeName).class != nodeTypeMap[type]) { + ("Om sent an existng node with differing type"+path).warn + } + } + } { + ("Om tried to create node in non-existing patch"+patchPath).warn + } + } { + ("Invalid path in node creation"+path).warn + } + }, + "new_node_end" -> { + newNodeEnd.value(creatingNode); + newNodeEnd = nil; + creatingNode = nil }, + "new_port" -> {|path,type,dir,hint,def,min,max| + var basePath, portName, parent, port; + var lastSlash = path.asString.inject(nil,{|last,char,i| + if(char==$/,i,last) + }); + if (lastSlash.notNil) { + basePath = path.asString.copyFromStart(lastSlash-1); + portName = path.asString.copyToEnd(lastSlash+1); + parent = this.getNode(basePath) ? this.getPatch(basePath); + if (parent.notNil) { + if (parent.hasPort(portName).not) { + port = OmPort.new(portName, parent, type, dir, hint, def, min, max); + parent.ports[portName.asSymbol] = port; + parent.changed(\newPort, port) + } { + if (parent.getPort(portName).porttype != type) { + ("Om tried to create an already existing port with differing type" + +path).warn + } + } + } { + ("Om tried to create port on non-existing object"+basePath).warn + } + } { + ("Invalid path in port creation"+path).warn + } + }, + "control_change" -> {|path,value| + this.getPort(path).prSetValue(value) }, + "patch_enabled" -> {|path| this.getPatch(path).prSetEnabled(true) }, + "patch_disabled" -> {|path| this.getPatch(path).prSetEnabled(false) }, + "plugin" -> {|lib,label,name,type| + plugins.add(Event.new(4,nil,pluginParentEvent).putAll( + (type:type, lib:lib, label:label, name:name))) }, + "node_removal" -> {|path| + var node = this.getNode(path); + if (node.notNil) { + node.parent.nodes.removeAt(node.name.asSymbol).free + } { + ("Om attempting to remove non-existing node"+path).warn + } + }, + "port_removal" -> {|path| + var port = this.getPort(path); + if (port.notNil) { + port.parent.ports.removeAt(port.name.asSymbol).free + } { + ("Om attempting to remove non-existing port"+path).warn + } + }, + "patch_destruction" -> {|path| + var patch = this.getPatch(path); + if (patch.notNil) { + patch.parent.patches.removeAt(patch.name.asSymbol).free + } { + ("Om attempting to remove non-existing patch"+path).warn + } + }, + "program_add" -> {|path,bank,program,name| + var node = this.getNode(path); + if (node.respondsTo(\prProgramAdd)) { + node.prProgramAdd(bank,program,name) + } { + ("Om tried to add program info to"+node).warn + } + } + ].collect({|a| + var func = a.value; + OSCresponder(addr, "/om/"++a.key, {|time,resp,msg| + func.value(*msg[1..]) + }) + }); + pluginParentEvent = Event.new(2,nil,nil).putAll(( + engine:this, + new:{|self,path,poly=1,handler|self.engine.createNode(path?("/"++self.name),self.type,self.lib,self.label,poly,created:handler)} + )); + } + *waitForBoot {|func| ^this.new.waitForBoot(func) } + waitForBoot {|func| + var r, id = 727; + requestHandlers[id] = { + r.stop; + booting=false; + this.changed(\running, true); + func.value(this) + }; + if (booting.not) {this.boot}; + r = Routine.run { + 50.do { + 0.1.wait; + addr.sendMsg("/om/ping", id) + }; + requestHandlers.removeAt(id); + "Om engine boot failed".error; + } + } + getPatch {|path, mustExist=true| + var elements, currentPatch; + if (path.class == Array) { elements = path + } { elements = path.asString.split($/) }; + elements.do{|elem| + if (elem=="") { + currentPatch = root + } { + currentPatch = currentPatch.getPatch(elem,mustExist); + if (currentPatch.isNil) { ^nil } + } + }; + ^currentPatch; + } + getNode {|path| + var basePath, nodeName, patch; + if (path.class == Array) { basePath = path + } { basePath = path.asString.split($/) }; + nodeName = basePath.pop; + patch = this.getPatch(basePath,true); + if (patch.notNil) { + ^patch.getNode(nodeName) + }; + ^nil + } + getPort {|path| + var basePath, portName, node, patch; + basePath = path.asString.split($/); + portName = basePath.pop; + node = this.getNode(basePath.copy); + if (node.notNil) { ^node.getPort(portName) }; + patch = this.getPatch(basePath,true); + if (patch.notNil) { ^patch.getPort(portName) }; + ^nil + } + getObject {|path| + var patch,node,port; + patch = this.getPatch(path,true); + if (patch.notNil) { ^patch }; + node = this.getNode(path); + if (node.notNil) { ^node }; + port = this.getPort(path,true); + if (port.notNil) { ^port }; + ^nil + } + at {|path|^this.getObject(path.asString)} + *boot {|func| + ^Om.new.waitForBoot {|e| + e.activate { + e.register { + e.loadPlugins { + e.requestPlugins { + e.requestAllObjects { + func.value(e) + } + } + } + } + } + } + } + boot { + requestResponders.do({|resp| resp.add}); + booting = true; + if (addr.addr == 2130706433) { + if (loadIntoJack) { + ("jack_load"+"-i"+addr.port+"Om"+"om").unixCmd + } { + (program+"-p"+addr.port).unixCmd + } + } { + "You have to manually boot Om now".postln + } + } + loadPatch {|patchPath| (patchLoader + patchPath).unixCmd } + activate { | handler | + this.sendReq("engine/activate", { + root = OmPatch("",nil,this); + this.changed(\newPatch, root); + handler.value + }) + } + register { | handler | + this.sendReq("engine/register_client", { + registered=true; + notificationResponders.do({|resp| resp.add}); + this.changed(\registered, registered); + handler.value(this) + }) + } + unregister { | handler | + this.sendReq("engine/unregister_client", { + registered=false; + notificationResponders.do({|resp| resp.remove}); + this.changed(\registered, registered); + handler.value(this) + }) + } + registered_ {|flag| + if (flag and: registered.not) { + this.register + } { + if (flag.not and: registered) { + this.unregister + } + } + } + loadPlugins { | handler | this.sendReq("engine/load_plugins", handler) } + requestPlugins {|handler| + var startTime = Main.elapsedTime; + plugins = Set.new; + this.sendReq("request/plugins", { + ("Received info about"+plugins.size+"plugins in"+(Main.elapsedTime-startTime)+"seconds").postln; + this.changed(\plugins, plugins); + handler.value(this); + }) + } + requestAllObjects { |handler| + this.sendReq("request/all_objects", handler) + } + createPatch { | path, poly=1, handler | + onNewPatch[path.asSymbol] = handler; + this.sendReq("synth/create_patch", nil, path.asString, poly.asInteger) + } + createNode { | path, type='LADSPA', lib, label, poly=1, created, handler | + newNodeEnd = created; + this.sendReq("synth/create_node",handler,path,type,lib,label,poly) + } + createAudioInput { | path, handler | + this.createNode(path,"Internal","","audio_input",0,handler) + } + createAudioOutput {|path,handler| + this.createNode(path,"Internal","","audio_output",0,handler) + } + createMIDIInput {|path,handler| + this.createNode(path,"Internal","","midi_input",1,handler) + } + createMIDIOutput {|path,handler| + this.createNode(path,"Internal","","midi_output",1,handler) + } + createNoteIn {|path| this.createNode(path,"Internal","","note_in") } + connect {|fromPath,toPath,handler| + this.sendReq("synth/connect",handler,fromPath.asString,toPath.asString) + } + disconnect { | fromPath, toPath, handler | + this.sendReq("synth/disconnect",handler,fromPath.asString,toPath.asString) + } + disconnectAll { | path, handler | + this.sendReq("synth/disconnect_all",handler,path); + } + sendReq { | path, handler...args | + var id = allocator.alloc; + requestHandlers[id] = handler; + addr.sendMsg("/om/"++path, id, *args) + } + quit { + if (loadIntoJack) { + ("jack_unload"+"Om").unixCmd; + booting=false; + requestResponders.do(_.remove); + notificationResponders.do(_.remove); + this.changed(\running, false); + } { + this.sendReq("engine/quit", { + booting=false; + requestResponders.do(_.remove); + notificationResponders.do(_.remove); + this.changed(\running, false); + }) + } + } + ping {| n=1, func | + var id, result, start; + id = allocator.alloc; + result = 0; + requestHandlers[id] = { + var end; + end = Main.elapsedTime; + result=max((end-start).postln,result); + n=n-1; + if (n > 0) { + start = Main.elapsedTime; + addr.sendMsg("/om/ping", id) + } { + allocator.free(id); + func.value(result) + } + }; + start = Main.elapsedTime; + addr.sendMsg("/om/ping", id) + } + setPortValue {|path, val| this.getPort(path.asString).value=val } + jackConnect {|path, jackPort| + this.getPort(path).jackConnect(jackPort) + } + noteOn {|path, note, vel| + var patch,node; + patch = this.getPatch(path,true); + if (patch.notNil) { patch.noteOn(note,vel) }; + node = this.getNode(path); + if (node.notNil) { node.noteOn(note,vel) }; + } + noteOff {|path, note| + var patch,node; + patch = this.getPatch(path,true); + if (patch.notNil) { patch.noteOff(note) }; + node = this.getNode(path); + if (node.notNil) { node.noteOff(note) }; + } + matchPlugins{ | label, lib, name, type | + ^plugins.select{ |p| + label.matchItem(p.label) and: { + lib.matchItem(p.lib) and: { + name.matchItem(p.name) and: { + type.matchItem(p.type) + } + } + } + } + } + dssiMsg {|path,reqType="program" ...args| + addr.sendMsg("/dssi"++path++$/++reqType,*args) + } +} + +OmMetadata { + var object, dict; + *new {|obj|^super.new.metadataInit(obj)} + metadataInit {|obj| + dict=Dictionary.new; + object=obj + } + put {|key,val| + object.engine.sendReq("metadata/set", nil, + object.path, key.asString, val.asString) + } + at {|key|^dict.at(key.asSymbol)} + prSetMetadata {|key,val| + dict.put(key,val); + object.changed(\metadata, key, val) + } +} + +OmObject : Model { + var program = "om", <>patchLoader = "om_patch_loader"; - classvar <>oscURL, uiClass; - var loadIntoJack = true; - var allocator, requestResponders, requestHandlers, notificationResponders; - var creatingNode, newNodeEnd; - var OmInternalNode, - \LADSPA -> OmLADSPANode, - \DSSI -> OmDSSINode - ]; - uiClass = OmEmacsUI - } - *new { | netaddr | - ^super.new.init(netaddr) - } - gui { ^uiClass.new(this) } - init { |netaddr| - addr = netaddr ? NetAddr("127.0.0.1", 16180); - onNewPatch = IdentityDictionary.new; - allocator = StackNumberAllocator(0,1024); - requestHandlers = IdentityDictionary.new; - requestResponders = [ - "response/ok" -> {|id| - requestHandlers.removeAt(id).value; allocator.free(id) }, - "response/error" -> {|id,text| - requestHandlers.removeAt(id); - allocator.free(id); - ("Om"+text).error } - ].collect({|a| - var func = a.value; - OSCresponder(addr, "/om/"++a.key, {|time,resp,msg| - func.value(*msg[1..]) - }) - }); - notificationResponders = [ - "new_patch" -> {|path,poly| - var func = onNewPatch.removeAt(path); - if (func.notNil) { - func.value(this.getPatch(path,false).prSetPoly(poly)) - } - }, - "metadata/update" -> {|path,key,value| - this.getObject(path).metadata.prSetMetadata(key, value) }, - "new_node" -> {|path,poly,type,lib,label| - var patchPath, nodeName, patch, node; - var lastSlash = path.asString.inject(nil,{|last,char,i| - if(char==$/,i,last) - }); - if (lastSlash.notNil) { - patchPath = path.asString.copyFromStart(lastSlash-1); - nodeName = path.asString.copyToEnd(lastSlash+1); - patch = this.getPatch(patchPath); - if (patch.notNil) { - if (patch.hasNode(nodeName).not) { - node = nodeTypeMap[type].new - (nodeName, patch, poly, label, lib); - creatingNode = node; - patch.nodes[nodeName.asSymbol] = node; - patch.changed(\newNode, node); - } { - if (patch.getNode(nodeName).class != nodeTypeMap[type]) { - ("Om sent an existng node with differing type"+path).warn - } - } - } { - ("Om tried to create node in non-existing patch"+patchPath).warn - } - } { - ("Invalid path in node creation"+path).warn - } - }, - "new_node_end" -> { - newNodeEnd.value(creatingNode); - newNodeEnd = nil; - creatingNode = nil }, - "new_port" -> {|path,type,dir,hint,def,min,max| - var basePath, portName, parent, port; - var lastSlash = path.asString.inject(nil,{|last,char,i| - if(char==$/,i,last) - }); - if (lastSlash.notNil) { - basePath = path.asString.copyFromStart(lastSlash-1); - portName = path.asString.copyToEnd(lastSlash+1); - parent = this.getNode(basePath) ? this.getPatch(basePath); - if (parent.notNil) { - if (parent.hasPort(portName).not) { - port = OmPort.new(portName, parent, type, dir, hint, def, min, max); - parent.ports[portName.asSymbol] = port; - parent.changed(\newPort, port) - } { - if (parent.getPort(portName).porttype != type) { - ("Om tried to create an already existing port with differing type" - +path).warn - } - } - } { - ("Om tried to create port on non-existing object"+basePath).warn - } - } { - ("Invalid path in port creation"+path).warn - } - }, - "control_change" -> {|path,value| - this.getPort(path).prSetValue(value) }, - "patch_enabled" -> {|path| this.getPatch(path).prSetEnabled(true) }, - "patch_disabled" -> {|path| this.getPatch(path).prSetEnabled(false) }, - "plugin" -> {|lib,label,name,type| - plugins.add(Event.new(4,nil,pluginParentEvent).putAll( - (type:type, lib:lib, label:label, name:name))) }, - "node_removal" -> {|path| - var node = this.getNode(path); - if (node.notNil) { - node.parent.nodes.removeAt(node.name.asSymbol).free - } { - ("Om attempting to remove non-existing node"+path).warn - } - }, - "port_removal" -> {|path| - var port = this.getPort(path); - if (port.notNil) { - port.parent.ports.removeAt(port.name.asSymbol).free - } { - ("Om attempting to remove non-existing port"+path).warn - } - }, - "patch_destruction" -> {|path| - var patch = this.getPatch(path); - if (patch.notNil) { - patch.parent.patches.removeAt(patch.name.asSymbol).free - } { - ("Om attempting to remove non-existing patch"+path).warn - } - }, - "program_add" -> {|path,bank,program,name| - var node = this.getNode(path); - if (node.respondsTo(\prProgramAdd)) { - node.prProgramAdd(bank,program,name) - } { - ("Om tried to add program info to"+node).warn - } - } - ].collect({|a| - var func = a.value; - OSCresponder(addr, "/om/"++a.key, {|time,resp,msg| - func.value(*msg[1..]) - }) - }); - pluginParentEvent = Event.new(2,nil,nil).putAll(( - engine:this, - new:{|self,path,poly=1,handler|self.engine.createNode(path?("/"++self.name),self.type,self.lib,self.label,poly,created:handler)} - )); - } - *waitForBoot {|func| ^this.new.waitForBoot(func) } - waitForBoot {|func| - var r, id = 727; - requestHandlers[id] = { - r.stop; - booting=false; - this.changed(\running, true); - func.value(this) - }; - if (booting.not) {this.boot}; - r = Routine.run { - 50.do { - 0.1.wait; - addr.sendMsg("/om/ping", id) - }; - requestHandlers.removeAt(id); - "Om engine boot failed".error; - } - } - getPatch {|path, mustExist=true| - var elements, currentPatch; - if (path.class == Array) { elements = path - } { elements = path.asString.split($/) }; - elements.do{|elem| - if (elem=="") { - currentPatch = root - } { - currentPatch = currentPatch.getPatch(elem,mustExist); - if (currentPatch.isNil) { ^nil } - } - }; - ^currentPatch; - } - getNode {|path| - var basePath, nodeName, patch; - if (path.class == Array) { basePath = path - } { basePath = path.asString.split($/) }; - nodeName = basePath.pop; - patch = this.getPatch(basePath,true); - if (patch.notNil) { - ^patch.getNode(nodeName) - }; - ^nil - } - getPort {|path| - var basePath, portName, node, patch; - basePath = path.asString.split($/); - portName = basePath.pop; - node = this.getNode(basePath.copy); - if (node.notNil) { ^node.getPort(portName) }; - patch = this.getPatch(basePath,true); - if (patch.notNil) { ^patch.getPort(portName) }; - ^nil - } - getObject {|path| - var patch,node,port; - patch = this.getPatch(path,true); - if (patch.notNil) { ^patch }; - node = this.getNode(path); - if (node.notNil) { ^node }; - port = this.getPort(path,true); - if (port.notNil) { ^port }; - ^nil - } - at {|path|^this.getObject(path.asString)} - *boot {|func| - ^Om.new.waitForBoot {|e| - e.activate { - e.register { - e.loadPlugins { - e.requestPlugins { - e.requestAllObjects { - func.value(e) - } - } - } - } - } - } - } - boot { - requestResponders.do({|resp| resp.add}); - booting = true; - if (addr.addr == 2130706433) { - if (loadIntoJack) { - ("jack_load"+"-i"+addr.port+"Om"+"om").unixCmd - } { - (program+"-p"+addr.port).unixCmd - } - } { - "You have to manually boot Om now".postln - } - } - loadPatch {|patchPath| (patchLoader + patchPath).unixCmd } - activate { | handler | - this.sendReq("engine/activate", { - root = OmPatch("",nil,this); - this.changed(\newPatch, root); - handler.value - }) - } - register { | handler | - this.sendReq("engine/register_client", { - registered=true; - notificationResponders.do({|resp| resp.add}); - this.changed(\registered, registered); - handler.value(this) - }) - } - unregister { | handler | - this.sendReq("engine/unregister_client", { - registered=false; - notificationResponders.do({|resp| resp.remove}); - this.changed(\registered, registered); - handler.value(this) - }) - } - registered_ {|flag| - if (flag and: registered.not) { - this.register - } { - if (flag.not and: registered) { - this.unregister - } - } - } - loadPlugins { | handler | this.sendReq("engine/load_plugins", handler) } - requestPlugins {|handler| - var startTime = Main.elapsedTime; - plugins = Set.new; - this.sendReq("request/plugins", { - ("Received info about"+plugins.size+"plugins in"+(Main.elapsedTime-startTime)+"seconds").postln; - this.changed(\plugins, plugins); - handler.value(this); - }) - } - requestAllObjects { |handler| - this.sendReq("request/all_objects", handler) - } - createPatch { | path, poly=1, handler | - onNewPatch[path.asSymbol] = handler; - this.sendReq("synth/create_patch", nil, path.asString, poly.asInteger) - } - createNode { | path, type='LADSPA', lib, label, poly=1, created, handler | - newNodeEnd = created; - this.sendReq("synth/create_node",handler,path,type,lib,label,poly) - } - createAudioInput { | path, handler | - this.createNode(path,"Internal","","audio_input",0,handler) - } - createAudioOutput {|path,handler| - this.createNode(path,"Internal","","audio_output",0,handler) - } - createMIDIInput {|path,handler| - this.createNode(path,"Internal","","midi_input",1,handler) - } - createMIDIOutput {|path,handler| - this.createNode(path,"Internal","","midi_output",1,handler) - } - createNoteIn {|path| this.createNode(path,"Internal","","note_in") } - connect {|fromPath,toPath,handler| - this.sendReq("synth/connect",handler,fromPath.asString,toPath.asString) - } - disconnect { | fromPath, toPath, handler | - this.sendReq("synth/disconnect",handler,fromPath.asString,toPath.asString) - } - disconnectAll { | path, handler | - this.sendReq("synth/disconnect_all",handler,path); - } - sendReq { | path, handler...args | - var id = allocator.alloc; - requestHandlers[id] = handler; - addr.sendMsg("/om/"++path, id, *args) - } - quit { - if (loadIntoJack) { - ("jack_unload"+"Om").unixCmd; - booting=false; - requestResponders.do(_.remove); - notificationResponders.do(_.remove); - this.changed(\running, false); - } { - this.sendReq("engine/quit", { - booting=false; - requestResponders.do(_.remove); - notificationResponders.do(_.remove); - this.changed(\running, false); - }) - } - } - ping {| n=1, func | - var id, result, start; - id = allocator.alloc; - result = 0; - requestHandlers[id] = { - var end; - end = Main.elapsedTime; - result=max((end-start).postln,result); - n=n-1; - if (n > 0) { - start = Main.elapsedTime; - addr.sendMsg("/om/ping", id) - } { - allocator.free(id); - func.value(result) - } - }; - start = Main.elapsedTime; - addr.sendMsg("/om/ping", id) - } - setPortValue {|path, val| this.getPort(path.asString).value=val } - jackConnect {|path, jackPort| - this.getPort(path).jackConnect(jackPort) - } - noteOn {|path, note, vel| - var patch,node; - patch = this.getPatch(path,true); - if (patch.notNil) { patch.noteOn(note,vel) }; - node = this.getNode(path); - if (node.notNil) { node.noteOn(note,vel) }; - } - noteOff {|path, note| - var patch,node; - patch = this.getPatch(path,true); - if (patch.notNil) { patch.noteOff(note) }; - node = this.getNode(path); - if (node.notNil) { node.noteOff(note) }; - } - matchPlugins{ | label, lib, name, type | - ^plugins.select{ |p| - label.matchItem(p.label) and: { - lib.matchItem(p.lib) and: { - name.matchItem(p.name) and: { - type.matchItem(p.type) - } - } - } - } - } - dssiMsg {|path,reqType="program" ...args| - addr.sendMsg("/dssi"++path++$/++reqType,*args) - } -} - -OmMetadata { - var object, dict; - *new {|obj|^super.new.metadataInit(obj)} - metadataInit {|obj| - dict=Dictionary.new; - object=obj - } - put {|key,val| - object.engine.sendReq("metadata/set", nil, - object.path, key.asString, val.asString) - } - at {|key|^dict.at(key.asSymbol)} - prSetMetadata {|key,val| - dict.put(key,val); - object.changed(\metadata, key, val) - } -} - -OmObject : Model { - var