diff options
| author | David Robillard <d@drobilla.net> | 2007-12-06 00:02:08 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-12-06 00:02:08 +0000 |
| commit | e19c643153b32983cfeb319356dbbc2f7798c4b7 (patch) | |
| tree | b12eef6afc36e079482fe5a72f22df149cbe5d2d /src | |
| parent | a96b70b1c92b7f2622ebeff9d34c92ba089997f1 (diff) | |
| download | machina-e19c643153b32983cfeb319356dbbc2f7798c4b7.tar.gz machina-e19c643153b32983cfeb319356dbbc2f7798c4b7.tar.bz2 machina-e19c643153b32983cfeb319356dbbc2f7798c4b7.zip | |
Rename uselessley verbose MachineMutation.[ch]pp
git-svn-id: http://svn.drobilla.net/lad/machina@953 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/Makefile.am | 2 | ||||
| -rw-r--r-- | src/engine/Mutation.cpp (renamed from src/engine/MachineMutation.cpp) | 2 | ||||
| -rw-r--r-- | src/engine/machina/Makefile.am | 2 | ||||
| -rw-r--r-- | src/engine/machina/Mutation.hpp (renamed from src/engine/machina/MachineMutation.hpp) | 0 | ||||
| -rw-r--r-- | src/gui/MachinaCanvas.cpp | 4 | ||||
| -rw-r--r-- | src/gui/MachinaGUI.cpp | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am index 010affa..20f02e9 100644 --- a/src/engine/Makefile.am +++ b/src/engine/Makefile.am @@ -10,7 +10,7 @@ libmachina_la_SOURCES = \ Edge.cpp \ Action.cpp \ Machine.cpp \ - MachineMutation.cpp \ + Mutation.cpp \ Loader.cpp \ MidiAction.cpp \ ActionFactory.cpp \ diff --git a/src/engine/MachineMutation.cpp b/src/engine/Mutation.cpp index 3c899bc..c861810 100644 --- a/src/engine/MachineMutation.cpp +++ b/src/engine/Mutation.cpp @@ -19,7 +19,7 @@ #include <cstdlib> #include "machina/Edge.hpp" #include "machina/Machine.hpp" -#include "machina/MachineMutation.hpp" +#include "machina/Mutation.hpp" #include "machina/ActionFactory.hpp" using namespace std; diff --git a/src/engine/machina/Makefile.am b/src/engine/machina/Makefile.am index de99845..f8666e1 100644 --- a/src/engine/machina/Makefile.am +++ b/src/engine/machina/Makefile.am @@ -11,8 +11,8 @@ libmachinainclude_HEADERS = \ Loader.hpp \ Machine.hpp \ MachineBuilder.hpp \ - MachineMutation.hpp \ MidiAction.hpp \ + Mutation.hpp \ Node.hpp \ Recorder.hpp \ SMFDriver.hpp \ diff --git a/src/engine/machina/MachineMutation.hpp b/src/engine/machina/Mutation.hpp index 0a9731c..0a9731c 100644 --- a/src/engine/machina/MachineMutation.hpp +++ b/src/engine/machina/Mutation.hpp diff --git a/src/gui/MachinaCanvas.cpp b/src/gui/MachinaCanvas.cpp index fb6ae94..1323bb4 100644 --- a/src/gui/MachinaCanvas.cpp +++ b/src/gui/MachinaCanvas.cpp @@ -193,8 +193,8 @@ MachinaCanvas::build(SharedPtr<Machina::Machine> machine) add_connection(c); } - while (Gtk::Main::events_pending()) - Gtk::Main::iteration(false); + //while (Gtk::Main::events_pending()) + // Gtk::Main::iteration(false); } arrange(); diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp index 3749d3a..8e0b68a 100644 --- a/src/gui/MachinaGUI.cpp +++ b/src/gui/MachinaGUI.cpp @@ -24,7 +24,7 @@ #include <libglademm/xml.h> #include <redlandmm/Model.hpp> #include <machina/Machine.hpp> -#include <machina/MachineMutation.hpp> +#include <machina/Mutation.hpp> #include <machina/SMFDriver.hpp> #include "GladeXml.hpp" #include "MachinaGUI.hpp" |