diff options
Diffstat (limited to 'src/gui')
34 files changed, 117 insertions, 91 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp index f2eaed47..ce6158d7 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -29,12 +29,12 @@ #include "module/global.hpp" #include "module/Module.hpp" #include "module/World.hpp" +#include "engine/Engine.hpp" #include "interface/EngineInterface.hpp" #include "serialisation/serialisation.hpp" #include "client/ObjectModel.hpp" #include "client/PatchModel.hpp" #include "client/ClientStore.hpp" -#include "engine/Engine.hpp" #include "shared/runtime_paths.hpp" #include "NodeModule.hpp" #include "ControlPanel.hpp" @@ -56,6 +56,8 @@ using namespace std; using namespace Ingen::Client; +namespace Raul { class Deletable; } + namespace Ingen { namespace Client { class PluginModel; } } namespace Ingen { diff --git a/src/gui/BreadCrumb.hpp b/src/gui/BreadCrumb.hpp index 62900a23..5de175c0 100644 --- a/src/gui/BreadCrumb.hpp +++ b/src/gui/BreadCrumb.hpp @@ -21,8 +21,8 @@ #include <gtkmm.h> #include "raul/Path.hpp" #include "raul/SharedPtr.hpp" -#include "PatchView.hpp" #include "client/PatchModel.hpp" +#include "PatchView.hpp" namespace Ingen { namespace GUI { diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 4e65a618..c21a462c 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -36,17 +36,20 @@ #include "client/OSCClientReceiver.hpp" #include "client/OSCEngineSender.hpp" #endif -#include "client/ThreadedSigClientInterface.hpp" #include "client/ClientStore.hpp" #include "client/PatchModel.hpp" +#include "client/ThreadedSigClientInterface.hpp" #include "module/Module.hpp" #include "App.hpp" #include "WindowFactory.hpp" #include "ConnectWindow.hpp" + using Ingen::QueuedEngineInterface; -using Ingen::Client::ThreadedSigClientInterface; +using namespace Ingen::Client; using namespace std; +namespace Raul { class Deletable; } + namespace Ingen { namespace GUI { diff --git a/src/gui/ControlPanel.cpp b/src/gui/ControlPanel.cpp index 4bec3606..87167b3f 100644 --- a/src/gui/ControlPanel.cpp +++ b/src/gui/ControlPanel.cpp @@ -16,7 +16,6 @@ */ #include "interface/EngineInterface.hpp" -#include "client/PatchModel.hpp" #include "client/NodeModel.hpp" #include "client/PortModel.hpp" #include "client/PluginModel.hpp" diff --git a/src/gui/ControlPanel.hpp b/src/gui/ControlPanel.hpp index 579531d8..c43d59ac 100644 --- a/src/gui/ControlPanel.hpp +++ b/src/gui/ControlPanel.hpp @@ -26,16 +26,18 @@ #include <gtkmm.h> #include <libglademm/xml.h> #include <libglademm.h> -#include "raul/Path.hpp" #include "Controls.hpp" -namespace Ingen { namespace Client { +namespace Raul { class Path; } + +namespace Ingen { + +namespace Client { class PortModel; class NodeModel; -} } +} using namespace Ingen::Client; -namespace Ingen { namespace GUI { diff --git a/src/gui/Controls.cpp b/src/gui/Controls.cpp index 70d0ebc2..d76f4e17 100644 --- a/src/gui/Controls.cpp +++ b/src/gui/Controls.cpp @@ -15,8 +15,6 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config.h" - #include <cmath> #include <iostream> #include <algorithm> diff --git a/src/gui/LoadPatchWindow.hpp b/src/gui/LoadPatchWindow.hpp index 22d2509a..a946275f 100644 --- a/src/gui/LoadPatchWindow.hpp +++ b/src/gui/LoadPatchWindow.hpp @@ -22,12 +22,15 @@ #include <gtkmm.h> #include "raul/SharedPtr.hpp" #include "interface/GraphObject.hpp" -#include "client/PluginModel.hpp" -#include "client/PatchModel.hpp" -using Ingen::Client::PatchModel; + using namespace Ingen::Shared; namespace Ingen { + +namespace Client { class PatchModel; class PluginModel; } +using Ingen::Client::PluginModel; +using Ingen::Client::PatchModel; + namespace GUI { diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp index 5036427e..c82fed23 100644 --- a/src/gui/LoadPluginWindow.cpp +++ b/src/gui/LoadPluginWindow.cpp @@ -20,7 +20,6 @@ #include <algorithm> #include <ctype.h> #include "interface/EngineInterface.hpp" -#include "client/NodeModel.hpp" #include "client/PatchModel.hpp" #include "client/ClientStore.hpp" #include "App.hpp" diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp index 0faf4eb9..e9be576a 100644 --- a/src/gui/LoadPluginWindow.hpp +++ b/src/gui/LoadPluginWindow.hpp @@ -24,14 +24,16 @@ #include "raul/SharedPtr.hpp" #include "raul/Table.hpp" #include "interface/GraphObject.hpp" -#include "client/PatchModel.hpp" -#include "client/PluginModel.hpp" #include "client/ClientStore.hpp" -using Ingen::Client::PluginModel; -using Ingen::Client::PatchModel; + using namespace Ingen::Shared; namespace Ingen { + +namespace Client { class PatchModel; class PluginModel; } +using Ingen::Client::PluginModel; +using Ingen::Client::PatchModel; + namespace GUI { diff --git a/src/gui/LoadRemotePatchWindow.hpp b/src/gui/LoadRemotePatchWindow.hpp index e343fc64..d6d26725 100644 --- a/src/gui/LoadRemotePatchWindow.hpp +++ b/src/gui/LoadRemotePatchWindow.hpp @@ -22,12 +22,13 @@ #include <gtkmm.h> #include "raul/SharedPtr.hpp" #include "interface/GraphObject.hpp" -#include "client/PatchModel.hpp" -#include "client/PluginModel.hpp" using namespace Ingen::Shared; -using Ingen::Client::PatchModel; namespace Ingen { + +namespace Client { class PatchModel; } +using Ingen::Client::PatchModel; + namespace GUI { diff --git a/src/gui/LoadSubpatchWindow.hpp b/src/gui/LoadSubpatchWindow.hpp index e3d138c3..559df05c 100644 --- a/src/gui/LoadSubpatchWindow.hpp +++ b/src/gui/LoadSubpatchWindow.hpp @@ -21,13 +21,14 @@ #include <libglademm/xml.h> #include <gtkmm.h> #include "raul/SharedPtr.hpp" -#include "client/PatchModel.hpp" -#include "client/PluginModel.hpp" #include "interface/GraphObject.hpp" using namespace Ingen::Shared; -using Ingen::Client::PatchModel; namespace Ingen { + +namespace Client { class PatchModel; } +using Ingen::Client::PatchModel; + namespace GUI { diff --git a/src/gui/NewSubpatchWindow.cpp b/src/gui/NewSubpatchWindow.cpp index 9fd7be07..a8a13508 100644 --- a/src/gui/NewSubpatchWindow.cpp +++ b/src/gui/NewSubpatchWindow.cpp @@ -17,7 +17,6 @@ #include "App.hpp" #include "interface/EngineInterface.hpp" -#include "client/NodeModel.hpp" #include "client/PatchModel.hpp" #include "client/ClientStore.hpp" #include "NewSubpatchWindow.hpp" diff --git a/src/gui/NewSubpatchWindow.hpp b/src/gui/NewSubpatchWindow.hpp index b3482fdd..3c685d3f 100644 --- a/src/gui/NewSubpatchWindow.hpp +++ b/src/gui/NewSubpatchWindow.hpp @@ -22,12 +22,13 @@ #include <gtkmm.h> #include "raul/SharedPtr.hpp" #include "interface/GraphObject.hpp" -#include "client/PatchModel.hpp" -#include "client/PluginModel.hpp" using namespace Ingen::Shared; -using Ingen::Client::PatchModel; namespace Ingen { + +namespace Client { class PatchModel; } +using Ingen::Client::PatchModel; + namespace GUI { @@ -52,7 +53,7 @@ private: void cancel_clicked(); GraphObject::Variables _initial_data; - SharedPtr<PatchModel> _patch; + SharedPtr<PatchModel> _patch; Gtk::Entry* _name_entry; Gtk::Label* _message_label; diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp index 8e6f03ac..468364d1 100644 --- a/src/gui/NodeMenu.cpp +++ b/src/gui/NodeMenu.cpp @@ -19,12 +19,13 @@ #include <gtkmm.h> #include "interface/EngineInterface.hpp" #include "client/NodeModel.hpp" +#include "client/PluginModel.hpp" #include "App.hpp" #include "NodeMenu.hpp" #include "WindowFactory.hpp" using namespace std; -using std::cerr; using std::endl; +using namespace Ingen::Client; namespace Ingen { namespace GUI { diff --git a/src/gui/NodeMenu.hpp b/src/gui/NodeMenu.hpp index c37dc415..cbe39c2f 100644 --- a/src/gui/NodeMenu.hpp +++ b/src/gui/NodeMenu.hpp @@ -20,7 +20,6 @@ #include <string> #include <gtkmm.h> -#include "raul/Path.hpp" #include "raul/SharedPtr.hpp" #include "client/NodeModel.hpp" #include "ObjectMenu.hpp" diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index 016a9b01..846c5736 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -16,10 +16,11 @@ */ #include <cassert> +#include "config.h" #include "raul/Atom.hpp" #include "interface/EngineInterface.hpp" -#include "client/NodeModel.hpp" #include "client/PatchModel.hpp" +#include "client/NodeModel.hpp" #include "client/PluginUI.hpp" #include "App.hpp" #include "GladeFactory.hpp" diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp index 85ae8027..d5c9ff79 100644 --- a/src/gui/NodeModule.hpp +++ b/src/gui/NodeModule.hpp @@ -23,11 +23,12 @@ #include "raul/SharedPtr.hpp" #include "Port.hpp" -class Atom; +namespace Raul { class Atom; } namespace Ingen { namespace Client { - class PortModel; class NodeModel; + class PluginUI; + class PortModel; } } using namespace Ingen::Client; @@ -76,12 +77,12 @@ protected: void set_selected(bool b); void rename(); - void set_variable(const std::string& key, const Atom& value); + void set_variable(const std::string& key, const Raul::Atom& value); void set_property(const std::string& predicate, const Raul::Atom& value); void add_port(SharedPtr<PortModel> port, bool resize=true); - void value_changed(uint32_t index, const Atom& value); + void value_changed(uint32_t index, const Raul::Atom& value); void initialise_gui_values(); void create_menu(); diff --git a/src/gui/ObjectMenu.hpp b/src/gui/ObjectMenu.hpp index 838b8052..d1f6b5fe 100644 --- a/src/gui/ObjectMenu.hpp +++ b/src/gui/ObjectMenu.hpp @@ -21,7 +21,6 @@ #include <string> #include <gtkmm.h> #include <libglademm/xml.h> -#include "raul/Path.hpp" #include "raul/SharedPtr.hpp" #include "client/ObjectModel.hpp" using Ingen::Client::ObjectModel; diff --git a/src/gui/PatchCanvas.hpp b/src/gui/PatchCanvas.hpp index f257da4e..f435eadc 100644 --- a/src/gui/PatchCanvas.hpp +++ b/src/gui/PatchCanvas.hpp @@ -18,17 +18,15 @@ #ifndef PATCHCANVAS_H #define PATCHCANVAS_H -#include "config.h" - #include <string> #include <map> #include <boost/shared_ptr.hpp> +#include "config.h" #include "flowcanvas/Canvas.hpp" #include "flowcanvas/Module.hpp" #include "raul/SharedPtr.hpp" #include "raul/Path.hpp" #include "client/ConnectionModel.hpp" -#include "client/PatchModel.hpp" #include "interface/GraphObject.hpp" #include "NodeModule.hpp" @@ -38,11 +36,14 @@ using namespace Ingen::Shared; using std::string; using FlowCanvas::Port; using Ingen::Client::ConnectionModel; -using Ingen::Client::PatchModel; using Ingen::Client::NodeModel; using Ingen::Client::PortModel; namespace Ingen { + +namespace Client { class PatchModel; } +using Ingen::Client::PatchModel; + namespace GUI { class NodeModule; diff --git a/src/gui/PatchPortModule.hpp b/src/gui/PatchPortModule.hpp index 5e655e3e..60a50738 100644 --- a/src/gui/PatchPortModule.hpp +++ b/src/gui/PatchPortModule.hpp @@ -22,9 +22,9 @@ #include <boost/enable_shared_from_this.hpp> #include <libgnomecanvasmm.h> #include "flowcanvas/Module.hpp" -#include "raul/Atom.hpp" #include "Port.hpp" -using std::string; + +namespace Raul { class Atom; } namespace Ingen { namespace Client { class PortModel; diff --git a/src/gui/PatchTreeWindow.hpp b/src/gui/PatchTreeWindow.hpp index 6fcea6d9..6c8794e7 100644 --- a/src/gui/PatchTreeWindow.hpp +++ b/src/gui/PatchTreeWindow.hpp @@ -20,14 +20,16 @@ #include <gtkmm.h> #include <libglademm.h> -#include "raul/Path.hpp" -namespace Ingen { namespace Client { +namespace Raul { class Path; } + +namespace Ingen { + +namespace Client { class ClientStore; -} } +} using Ingen::Client::ClientStore; -namespace Ingen { namespace GUI { class PatchWindow; diff --git a/src/gui/PatchView.hpp b/src/gui/PatchView.hpp index a392c767..474060f1 100644 --- a/src/gui/PatchView.hpp +++ b/src/gui/PatchView.hpp @@ -24,21 +24,22 @@ #include <libglademm.h> #include <libgnomecanvasmm.h> #include "raul/SharedPtr.hpp" -#include "raul/Atom.hpp" -namespace Ingen { namespace Client { +namespace Raul { class Atom; } +namespace FlowCanvas { class Port; class Item; } + +namespace Ingen { + +namespace Client { class PortModel; class MetadataModel; class PatchModel; class ObjectModel; -} } +} using namespace Ingen::Client; -namespace FlowCanvas { class Port; class Item; } - -namespace Ingen { namespace GUI { - + class PatchCanvas; class LoadPluginWindow; class NewSubpatchWindow; diff --git a/src/gui/PatchWindow.hpp b/src/gui/PatchWindow.hpp index 007d51b7..a8d0cca0 100644 --- a/src/gui/PatchWindow.hpp +++ b/src/gui/PatchWindow.hpp @@ -23,18 +23,19 @@ #include <gtkmm.h> #include <libglademm/xml.h> #include <libglademm.h> -#include "raul/Path.hpp" #include "raul/SharedPtr.hpp" -namespace Ingen { namespace Client { +namespace Raul { class Path; } + +namespace Ingen { + +namespace Client { class PatchModel; class PortModel; class ObjectModel; -} } +} using namespace Ingen::Client; - -namespace Ingen { namespace GUI { class LoadPluginWindow; diff --git a/src/gui/Port.hpp b/src/gui/Port.hpp index e826c7dc..e3801424 100644 --- a/src/gui/Port.hpp +++ b/src/gui/Port.hpp @@ -23,12 +23,14 @@ #include "flowcanvas/Port.hpp" #include "raul/SharedPtr.hpp" #include "raul/WeakPtr.hpp" -#include "raul/Atom.hpp" -namespace Ingen { namespace Client { class PortModel; } } -using Ingen::Client::PortModel; +namespace Raul { class Atom; } namespace Ingen { + +namespace Client { class PortModel; } +using Ingen::Client::PortModel; + namespace GUI { diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp index 195d6af3..11c1243a 100644 --- a/src/gui/PortMenu.cpp +++ b/src/gui/PortMenu.cpp @@ -19,6 +19,7 @@ #include <gtkmm.h> #include "raul/SharedPtr.hpp" #include "interface/EngineInterface.hpp" +#include "client/PatchModel.hpp" #include "client/PortModel.hpp" #include "App.hpp" #include "PortMenu.hpp" diff --git a/src/gui/PortMenu.hpp b/src/gui/PortMenu.hpp index a7df2117..d617e01f 100644 --- a/src/gui/PortMenu.hpp +++ b/src/gui/PortMenu.hpp @@ -20,7 +20,6 @@ #include <string> #include <gtkmm.h> -#include "raul/Path.hpp" #include "raul/SharedPtr.hpp" #include "client/PortModel.hpp" #include "ObjectMenu.hpp" diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp index b8e05b20..d407f6db 100644 --- a/src/gui/SubpatchModule.cpp +++ b/src/gui/SubpatchModule.cpp @@ -27,7 +27,6 @@ #include "PatchCanvas.hpp" #include "Port.hpp" #include "WindowFactory.hpp" -using std::cerr; using std::cout; using std::endl; namespace Ingen { namespace GUI { @@ -80,7 +79,7 @@ SubpatchModule::browse_to_patch() void SubpatchModule::show_dialog() { - cerr << "FIXME: dialog\n"; + std::cerr << "FIXME: dialog" << std::endl; //m_patch->show_control_window(); } diff --git a/src/gui/SubpatchModule.hpp b/src/gui/SubpatchModule.hpp index 11c53a69..b01e1e29 100644 --- a/src/gui/SubpatchModule.hpp +++ b/src/gui/SubpatchModule.hpp @@ -22,7 +22,6 @@ #include <string> #include <libgnomecanvasmm.h> #include "raul/SharedPtr.hpp" -#include "client/PatchModel.hpp" #include "PatchPortModule.hpp" #include "NodeModule.hpp" using std::string; using std::list; diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp index ec39abf3..cf9265db 100644 --- a/src/gui/ThreadedLoader.cpp +++ b/src/gui/ThreadedLoader.cpp @@ -20,9 +20,9 @@ #include "module/global.hpp" #include "module/World.hpp" #include "module/Module.hpp" -#include "client/PatchModel.hpp" #include "App.hpp" #include "ThreadedLoader.hpp" +#include "client/PatchModel.hpp" using namespace std; diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp index 50e5deb1..c0e30a63 100644 --- a/src/gui/ThreadedLoader.hpp +++ b/src/gui/ThreadedLoader.hpp @@ -26,7 +26,6 @@ #include "raul/Slave.hpp" #include <glibmm/thread.h> #include "interface/EngineInterface.hpp" -#include "client/PatchModel.hpp" #include "client/DeprecatedLoader.hpp" #include "serialisation/Serialiser.hpp" #include "serialisation/Parser.hpp" diff --git a/src/gui/UploadPatchWindow.hpp b/src/gui/UploadPatchWindow.hpp index 4c3cfdfc..c81a278e 100644 --- a/src/gui/UploadPatchWindow.hpp +++ b/src/gui/UploadPatchWindow.hpp @@ -25,11 +25,13 @@ #include "raul/SharedPtr.hpp" #include "raul/Thread.hpp" #include "raul/AtomicInt.hpp" -#include "client/PatchModel.hpp" #include "client/PluginModel.hpp" -using Ingen::Client::PatchModel; namespace Ingen { + +namespace Client { class PatchModel; } +using Ingen::Client::PatchModel; + namespace GUI { class UploadPatchWindow; diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp index f7678554..b831db05 100644 --- a/src/gui/WindowFactory.cpp +++ b/src/gui/WindowFactory.cpp @@ -16,20 +16,22 @@ */ #include "config.h" -#include "WindowFactory.hpp" +#include "client/PatchModel.hpp" #include "App.hpp" -#include "PatchWindow.hpp" #include "GladeFactory.hpp" -#include "PatchPropertiesWindow.hpp" -#include "NodePropertiesWindow.hpp" -#include "PortPropertiesWindow.hpp" -#include "NodeControlWindow.hpp" -#include "LoadPluginWindow.hpp" #include "LoadPatchWindow.hpp" +#include "LoadPluginWindow.hpp" #include "LoadRemotePatchWindow.hpp" #include "LoadSubpatchWindow.hpp" -#include "RenameWindow.hpp" #include "NewSubpatchWindow.hpp" +#include "NodeControlWindow.hpp" +#include "NodePropertiesWindow.hpp" +#include "PatchPropertiesWindow.hpp" +#include "PatchView.hpp" +#include "PatchWindow.hpp" +#include "PortPropertiesWindow.hpp" +#include "RenameWindow.hpp" +#include "WindowFactory.hpp" #ifdef HAVE_CURL #include "UploadPatchWindow.hpp" #endif diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp index 487cbdb4..79da3902 100644 --- a/src/gui/WindowFactory.hpp +++ b/src/gui/WindowFactory.hpp @@ -22,24 +22,33 @@ #include <gtkmm.h> #include "raul/SharedPtr.hpp" #include "interface/GraphObject.hpp" -#include "client/PatchModel.hpp" -#include "PatchView.hpp" -using Ingen::Client::PatchModel; using namespace Ingen::Shared; +namespace Raul { class Path; } + namespace Ingen { + +namespace Client { class PatchModel; class NodeModel; class ObjectModel; } +using Ingen::Client::PatchModel; +using Ingen::Client::NodeModel; +using Ingen::Client::ObjectModel; + namespace GUI { -class PatchWindow; +class LoadPatchWindow; +class LoadPluginWindow; +class LoadRemotePatchWindow; +class LoadSubpatchWindow; +class NewSubpatchWindow; class NodeControlWindow; -class PatchPropertiesWindow; class NodePropertiesWindow; +class PatchPropertiesWindow; +class PatchView; +class PatchWindow; class PortPropertiesWindow; -class LoadPatchWindow; -class LoadRemotePatchWindow; -class UploadPatchWindow; class RenameWindow; +class UploadPatchWindow; /** Manager/Factory for all windows. @@ -78,8 +87,8 @@ public: void clear(); private: - typedef std::map<Path, PatchWindow*> PatchWindowMap; - typedef std::map<Path, NodeControlWindow*> ControlWindowMap; + typedef std::map<Raul::Path, PatchWindow*> PatchWindowMap; + typedef std::map<Raul::Path, NodeControlWindow*> ControlWindowMap; PatchWindow* new_patch_window(SharedPtr<PatchModel> patch, SharedPtr<PatchView> view); diff --git a/src/gui/gui.hpp b/src/gui/gui.hpp index b6f12add..d4e8f399 100644 --- a/src/gui/gui.hpp +++ b/src/gui/gui.hpp @@ -18,9 +18,7 @@ #ifndef INGEN_GUI_H #define INGEN_GUI_H -#include "config.h" #include "module/global.hpp" -#include "raul/SharedPtr.hpp" namespace Ingen { |