Changeset 2525

Timestamp:

03/04/10 20:46:06 (6 months ago)

Author:

drobilla

Message:

Shrink extensions (to .ing.lv2 and .ing.ttl) and move definitions to central place so they aren't littered everywhere.

Location:

trunk/ingen/src

Files:

• gui/LoadPatchWindow.cpp (modified) (2 diffs)
• gui/PatchWindow.cpp (modified) (3 diffs)
• gui/ThreadedLoader.cpp (modified) (1 diff)
• gui/UploadPatchWindow.cpp (modified) (2 diffs)
• ingen/main.cpp (modified) (1 diff)
• serialisation/Parser.cpp (modified) (2 diffs)
• serialisation/Serialiser.cpp (modified) (2 diffs)

trunk/ingen/src/gui/LoadPatchWindow.cpp

@@ -27 +27 @@
 #include "client/ClientStore.hpp"
 #include "shared/runtime_paths.hpp"
+#include "serialisation/names.hpp"
 #include "App.hpp"
 #include "LoadPatchWindow.hpp"
@@ -75 +76 @@
 
         Gtk::FileFilter filt;
-        filt.add_pattern("*.ingen.ttl");
-        filt.set_name("Ingen patch files (*.ingen.ttl)");
-        filt.add_pattern("*.ingen.lv2");
-        filt.set_name("Ingen bundles (*.ingen.lv2)");
+        filt.add_pattern("*" INGEN_PATCH_FILE_EXT);
+        filt.set_name("Ingen patch files (*" INGEN_PATCH_FILE_EXT ")");
+        filt.add_pattern("*" INGEN_BUNDLE_EXT);
+        filt.set_name("Ingen bundles (*" INGEN_BUNDLE_EXT ")");
         filt.add_pattern("*.om");
         filt.set_name("Om patch files (*.om)");

trunk/ingen/src/gui/PatchWindow.cpp

@@ -27 +27 @@
 #include "client/PatchModel.hpp"
 #include "client/ClientStore.hpp"
+#include "serialisation/names.hpp"
 #include "App.hpp"
 #include "PatchCanvas.hpp"
@@ -429 +430 @@
 
                 Gtk::FileFilter filt;
-                filt.add_pattern("*.ingen.lv2");
+                filt.add_pattern("*" INGEN_BUNDLE_EXT);
                 filt.set_name("Ingen bundles");
                 dialog.set_filter(filt);
@@ -447 +448 @@
 
                 if (basename.find('.') == string::npos) {
-                        filename += ".ingen.lv2";
-                        basename += ".ingen.lv2";
-                } else if (filename.substr(filename.length() - 10) != ".ingen.lv2") {
+                        filename += INGEN_BUNDLE_EXT;
+                        basename += INGEN_BUNDLE_EXT;
+                } else if (filename.substr(filename.length() - 10) != INGEN_BUNDLE_EXT) {
                         Gtk::MessageDialog error_dialog(*this,
-"<b>" "Ingen patches must be saved to Ingen bundles (*.ingen.lv2)." "</b>",
+"<b>" "Ingen patches must be saved to Ingen bundles (*" INGEN_BUNDLE_EXT ")." "</b>",
                                         true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
                         error_dialog.run();

trunk/ingen/src/gui/ThreadedLoader.cpp

@@ -138 +138 @@
         if (App::instance().serialiser()) {
                 Serialiser::Record r(model, filename);
-                if (filename.find(".ingen") != string::npos)
+                if (filename.find(".ing.lv2") != string::npos)
                         App::instance().serialiser()->write_bundle(r);
                 else

trunk/ingen/src/gui/UploadPatchWindow.cpp

@@ -28 +28 @@
 #include "interface/EngineInterface.hpp"
 #include "serialisation/Serialiser.hpp"
+#include "serialisation/names.hpp"
 #include "client/PatchModel.hpp"
 #include "UploadPatchWindow.hpp"
@@ -255 +256 @@
 
         const string uri = string("http://rdf.drobilla.net/ingen_patches/")
-                .append(symbol).append(".ingen.ttl");
+                .append(symbol).append(INGEN_PATCH_FILE_EXT);
 
         const string str = s.to_string(_patch, uri, extra_rdf);

trunk/ingen/src/ingen/main.cpp

@@ -75 +75 @@
         "  ingen -g                     # Run a GUI, connect via OSC\n"
         "  ingen -eg                    # Run an engine and a GUI in one process\n"
-        "  ingen -egl patch.ingen.ttl   # Run an engine and a GUI and load a patch");
+        "  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");
 
         conf.add("client-port", 'C', "Client OSC port", Atom::INT, Atom())

trunk/ingen/src/serialisation/Parser.cpp

@@ -33 +33 @@
 #include "shared/LV2URIMap.hpp"
 #include "Parser.hpp"
+#include "names.hpp"
 
 #define LOG(s) s << "[Parser] "
@@ -87 +88 @@
 
         const std::string filename(Glib::filename_from_uri(document_uri));
-        const size_t      ext = filename.find(".ingen.lv2");
-        if (ext == filename.length() - 10
-                        || (ext == filename.length() - 11 && filename[filename.length() - 1] == '/')) {
+        const size_t      ext = filename.find(INGEN_BUNDLE_EXT);
+        const size_t      ext_len = strlen(INGEN_BUNDLE_EXT);
+        if (ext == filename.length() - ext_len
+                        || (ext == filename.length() - ext_len - 1 && filename[filename.length() - 1] == '/')) {
                 std::string basename(Glib::path_get_basename(filename));
                 basename = basename.substr(0, basename.find('.'));
-                document_uri += "/" + basename + ".ingen.ttl";
+                document_uri += "/" + basename + INGEN_PATCH_FILE_EXT;
         }
 

trunk/ingen/src/serialisation/Serialiser.cpp

@@ -48 +48 @@
 #include "shared/LV2URIMap.hpp"
 #include "Serialiser.hpp"
+#include "names.hpp"
 
 #define LOG(s) s << "[Serialiser] "
@@ -133 +134 @@
         string symbol = uri_to_symbol(record.uri);
 
-        const string root_file = bundle_uri + symbol + ".ingen.ttl";
+        const string root_file = bundle_uri + symbol + INGEN_PATCH_FILE_EXT;
         start_to_filename(root_file);
         serialise(object);
         finish();
-        records.push_back(Record(object, bundle_uri + symbol + ".ingen.ttl"));
+        records.push_back(Record(object, bundle_uri + symbol + INGEN_PATCH_FILE_EXT));
         write_manifest(bundle_uri, records);
 }