summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-02-16 19:33:10 +0000
committerDavid Robillard <d@drobilla.net>2011-02-16 19:33:10 +0000
commit2c312daa5bf150e8314e0a48769afb184dd95f54 (patch)
treeb9182f140cccb2eb424f79e1951015b02dd1ae49
parent4777248a1bb15e0833d688d8c8a7c81db0bf02ac (diff)
downloadingen-2c312daa5bf150e8314e0a48769afb184dd95f54.tar.gz
ingen-2c312daa5bf150e8314e0a48769afb184dd95f54.tar.bz2
ingen-2c312daa5bf150e8314e0a48769afb184dd95f54.zip
Use simpler, single, file extensions.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2963 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/gui/ThreadedLoader.cpp3
-rw-r--r--src/serialisation/names.hpp4
-rw-r--r--src/shared/Configuration.cpp4
3 files changed, 6 insertions, 5 deletions
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp
index afc90f89..cd5e5ce6 100644
--- a/src/gui/ThreadedLoader.cpp
+++ b/src/gui/ThreadedLoader.cpp
@@ -20,6 +20,7 @@
#include "module/World.hpp"
#include "module/Module.hpp"
#include "module/ingen_module.hpp"
+#include "serialisation/names.hpp"
#include "App.hpp"
#include "ThreadedLoader.hpp"
#include "client/PatchModel.hpp"
@@ -137,7 +138,7 @@ ThreadedLoader::save_patch_event(SharedPtr<PatchModel> model, const string& file
{
if (App::instance().serialiser()) {
Serialiser::Record r(model, filename);
- if (filename.find(".ing.lv2") != string::npos)
+ if (filename.find(INGEN_BUNDLE_EXT) != string::npos)
App::instance().serialiser()->write_bundle(r);
else
App::instance().serialiser()->to_file(r);
diff --git a/src/serialisation/names.hpp b/src/serialisation/names.hpp
index ff25faa1..7644e9db 100644
--- a/src/serialisation/names.hpp
+++ b/src/serialisation/names.hpp
@@ -18,7 +18,7 @@
#ifndef INGEN_SERIALISATION_NAMES_HPP
#define INGEN_SERIALISATION_NAMES_HPP
-#define INGEN_PATCH_FILE_EXT ".ing.ttl"
-#define INGEN_BUNDLE_EXT ".ing.lv2"
+#define INGEN_PATCH_FILE_EXT ".ttl"
+#define INGEN_BUNDLE_EXT ".ingen"
#endif // INGEN_SERIALISATION_NAMES_HPP
diff --git a/src/shared/Configuration.cpp b/src/shared/Configuration.cpp
index bd6a5b50..2a2db5d3 100644
--- a/src/shared/Configuration.cpp
+++ b/src/shared/Configuration.cpp
@@ -34,8 +34,8 @@ Configuration::Configuration()
" ingen -e # Run an engine, listen for OSC\n"
" ingen -g # Run a GUI, connect via OSC\n"
" ingen -eg # Run an engine and a GUI in one process\n"
- " ingen -egl patch.ing.ttl # Run an engine and a GUI and load a patch file\n"
- " ingen -egl patch.ing.lv2 # Run an engine and a GUI and load a patch bundle")
+ " ingen -egl patch.ttl # Run an engine and a GUI and load a patch file\n"
+ " ingen -egl patch.ingen # Run an engine and a GUI and load a patch bundle")
{
add("client-port", 'C', "Client OSC port", Atom::INT, Atom())
.add("connect", 'c', "Connect to engine URI", Atom::STRING, "osc.udp://localhost:16180")